Use upstream patch instead.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-emulation/vice/ChangeLog b/app-emulation/vice/ChangeLog
index 36577056d168a167e188d96f51b7d17c34533559..1f875266aadfd35a7f231a74bcf21d81aa2483aa 100644 (file)
--- a/app-emulation/vice/ChangeLog
+++ b/app-emulation/vice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/vice
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.69 2010/03/23 23:58:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.70 2010/03/24 14:15:43 ssuominen Exp $
+
+  24 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  files/vice-2.2-xshm.patch:
+  Use upstream patch instead.
 
   23 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> vice-2.2.ebuild,
   +files/vice-2.2-xshm.patch:

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 8c367b9f9a0a45d6b0c2e40ae48fb2c9c17cc998..8f48730913134647aa1612d9bc693e62506646b3 100644 (file)
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,11 +1,11 @@
 AUX vice-2.1-gcc44.patch 218 RMD160 3d14faf8527894b83de5a0c7cf70b811b4364d62 SHA1 9db442b6fed66c760953b0a2ca5167a1f0f44512 SHA256 1816007ac07855bed75ff40bbaead7bb83b6392c338a7a24dbef9bdff7d46b08
 AUX vice-2.1-xshm.patch 421 RMD160 f40abf65680d82814b4de19d5ee0d85897c35c4c SHA1 4e0274f77ee4558370bd46fe98951589cb550ee9 SHA256 62a993fde4dfcea206d448c46f38cb3da5dad462d9e1f250dacb2df44f0fd0c7
-AUX vice-2.2-xshm.patch 1446 RMD160 ea45a730556653a3f5fdfded8c19878e9bb0899c SHA1 27d59a0e19e4805ab8fc9ba55b3f4be09ef8f235 SHA256 f45ce309c85bc2465fbb3ea8f4b6a52a383d88b0e23e7294e3ebb4e0a867333b
+AUX vice-2.2-xshm.patch 1691 RMD160 b5a99eb56e6f89404da4ac7fb72c123beb500a52 SHA1 731b29e46f30411d532cf57ea674b48acfe7cb7e SHA256 58d6aeaebec1fe4a52a434b8f6874b67aa7ebea40339796f1b164726a864e27a
 DIST vice-1.22.tar.gz 6088483 RMD160 ca93fc424e617e38f27e288ebcdfbab2aa3659db SHA1 55e0047824f64173539e03ddd2d5ab51cd581fbb SHA256 cd45ce3eea98ce70ae03002a4d02bb3188c982ee7fb7435ac8777bc8a780ef01
 DIST vice-2.1.tar.gz 8097482 RMD160 218a3b111d9c3bfcea06cea30299f7b471a57232 SHA1 0adf7a1d13c7b3af7b8d2d21c17b6dc0f055ff67 SHA256 dc42df924bd4b4ab4af43e372d873a79ea035059f31f2f5c297c234b1c532c66
 DIST vice-2.2.tar.gz 9597027 RMD160 d3fb33deb776ffcae297df413849437fb4e49840 SHA1 88ec1f4fefc708957b242805a28ca9b26a3e2738 SHA256 5d581bf817c97f1887651f92e73dd1f5e3c14627fa86fc70732491be7cba1551
 EBUILD vice-1.22.ebuild 2171 RMD160 c42fb2d1ee264c4c0a7297000a647d50314a4b9c SHA1 aa6d8fd1904f38a90faae780da7c0037bcabdf98 SHA256 b46fb1d48a91e82e9f5feb92cdcdd063e87225f210692b3d859acd2a0b6158fb
 EBUILD vice-2.1.ebuild 2344 RMD160 4a8b58b6c1a5f3699c1ca6ed068f4f65dbde49d8 SHA1 f2756f2c258aa375d5f407fa20626a6d89ce5e6a SHA256 4a67708222d8681afb1ac3cf34f744beda052d135d9b41b822a62a91d3d61476
 EBUILD vice-2.2.ebuild 2769 RMD160 82855a8cff139e0d6b5a4727269180f294fb1e92 SHA1 61b02a43c61f544bdc19f2471ff35592c59d1bbc SHA256 86b5e475dc5b02f2dadb71915e4d5d3332a053350b411ea6cf7c9518e6c5cab1
-MISC ChangeLog 9053 RMD160 c5113dfc7cef3e2785cfa7163024c984ca44eb36 SHA1 bcc9bf92c08264b30c976def7890315a5c90a802 SHA256 db70c65343b67299cd912e1a06185c0c24140fe83efcc16ab43946fcb57b6a1c
+MISC ChangeLog 9167 RMD160 7f317b467140d706b8151fd8e324a65b90877df9 SHA1 08379466103173723a2741d727b2686153a02bc2 SHA256 646fcfba3eac58ed24817112aba0580014fbcdd52cc13dd21d6833529a2e0816
 MISC metadata.xml 435 RMD160 c42033c72993639752c9896313af9d4eed93dbf0 SHA1 c2169618d71e24e641986340a93951dd7b67c0be SHA256 a1266afc9cbc0c3667071465a168b2f18289d1dd293eb54e11954813c05ffebd

diff --git a/app-emulation/vice/files/vice-2.2-xshm.patch b/app-emulation/vice/files/vice-2.2-xshm.patch
index 0839f15e90059ef76908c09fee99182bced9ad4e..e0bc39601df692c39aa721c74d1f1554d9b5ea23 100644 (file)
--- a/app-emulation/vice/files/vice-2.2-xshm.patch
+++ b/app-emulation/vice/files/vice-2.2-xshm.patch
@@ -1,7 +1,4 @@
-Check for xextproto 7.1.1 and include headers for X_ShmAttach.
-
-https://sourceforge.net/tracker/?func=detail&aid=2935150&group_id=223021&atid=1057617
-http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=0a4c4c5fe8ebad2dd13f5770bd90a194eebb2890
+Patch from upstream trunk for xextproto >= 7.0.99.1 compability.
 
 --- configure.in
 +++ configure.in
@@ -10,13 +7,25 @@ http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=0a4c4c5fe8eb
                     LINK_X_LIBS="-lXext $LINK_X_LIBS"],,$X_LIBS)
  
 +    PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
-+                 HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
-+               HAVE_XEXTPROTO_71="no")
++                HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
++                HAVE_XEXTPROTO_71="no")
 +    AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
 +
      AC_MSG_CHECKING(for X11/extensions/Xvlib.h)
      AC_TRY_LINK([#include <X11/Xlib.h>
                   #include <X11/extensions/Xvlib.h>],
+@@ -2391,6 +2396,11 @@
+   AC_DEFINE(HAS_TRANSLATION,,[Enable internationalization support])
+ fi
+ 
++dnl Handle the xextproto conditinal for the systems that don't use it
++if test x"$is_unix_x11" != "xyes" -o x"$enable_sdlui" = "xyes" -o x"$enable_gnomeui" = "xyes"; then
++    AM_CONDITIONAL(HAVE_XEXTPROTO_71, false)
++fi
++
+ dnl CBM4Linux/OpenCBM
+ AC_MSG_CHECKING([for OpenCBM support])
+ if test x"$enable_realdevice" != "xno"; then
 --- src/arch/unix/x11/xaw/x11video.c
 +++ src/arch/unix/x11/xaw/x11video.c
 @@ -56,6 +56,7 @@