Revision bump. Apply upstream patches for various bugs. Remove old.

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

4 files changed, 26 insertions, 49 deletions

diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog
index 67f7936d25ff..e9f05b90b485 100644
--- a/x11-drivers/xf86-video-ati/ChangeLog
+++ b/x11-drivers/xf86-video-ati/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-ati
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.77 2009/03/21 00:37:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.78 2009/03/31 15:03:50 scarabeus Exp $
+
+*xf86-video-ati-6.12.1-r1 (31 Mar 2009)
+
+  31 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  -xf86-video-ati-6.11.0.ebuild, -xf86-video-ati-6.12.1.ebuild,
+  +xf86-video-ati-6.12.1-r1.ebuild:
+  Revision bump. Apply upstream patches for various bugs. Remove old.
 
 *xf86-video-ati-6.12.1 (21 Mar 2009)
 
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index dfaabdc7f3a8..cd4c92b00145 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -10,13 +10,12 @@ AUX 6.8.0/0134-Disable-the-setting-of-HARDWARE_CURSOR_BIT_ORDER_MSB.patch 1048 R
 AUX old_hw_data/ati.xinf 2028 RMD160 0f57c7452bbf9d2d8d0a96f6f480b98e8a5c6d5f SHA1 51dc48aba9d3e2613d230837d369ebcab86b4c5c SHA256 79540e91ab1baf462ded22a5ef0f3cff0d95bef22db4ec13ea7101dbff29aa74
 AUX old_hw_data/r128.xinf 2491 RMD160 02f5ae030596643bdc2ce4982ee47fdbdf656f95 SHA1 cee72fd687711845f4fc435cac00b715fc19b1d3 SHA256 d8f50f12b291d526353aa5d76c95137dafbff22bf47cbb751b686252d104279b
 AUX radeon.xinf 12504 RMD160 48b32c2d4acc1edff0e814a173ecce1b6026ba7c SHA1 1f4d98536d013d3ac6999781578d381bbd94023f SHA256 f23555826bfce07dfaafba60957e347e36fdb694c71bc3ad39d172e3863e7c96
-DIST xf86-video-ati-6.11.0.tar.bz2 833773 RMD160 e8ff02eb3730ea127d2dbafb65138ec73f1044df SHA1 fbcba3a7c495e0d08e3a43a05c3277666206ff7b SHA256 601920d4260c6155d248034f6e75418f08b6e06a6cd0dca5dadee403a6720ea8
+DIST 6.12.1-patches-01.tar.bz2 14334 RMD160 dcd4248ea6e5b63be7a0c888185175964318b178 SHA1 d24404367d2f0eac6426cf1266f8b345f8a37cd0 SHA256 5fab74ecfde6ec785c42ed4f417995ecf6ce03e0627bfbb01dc8986399b75378
 DIST xf86-video-ati-6.12.1.tar.bz2 896448 RMD160 928c0b24c906a53e0df5da651831dd86581dd703 SHA1 946095af982eedbdcb21ab2e664d70477211ff2c SHA256 b1637b11344f080ff5366799892e8bea0427087166d4db761e8dd4ecadb8b574
 DIST xf86-video-ati-6.6.3.tar.bz2 723083 RMD160 a1c24c13ea88fa38f34e3f0540b53082ab2ae129 SHA1 b911df1f4b41ad37028c708e2c95e5a729a32ede SHA256 d08a429e1fb1620ae81839181a4dc6cd579d52fc440d44d7bba36d19be355780
 DIST xf86-video-ati-6.8.0.tar.bz2 901737 RMD160 8414af2de5f21f4106a25631cfb8a4a206f5b0dd SHA1 b6974237b6ae9b45b32fc37f31a3fee7358230d3 SHA256 3863851e3c85d25cc38941eec63e866656806821b028519ae32ab8b276664fba
-EBUILD xf86-video-ati-6.11.0.ebuild 1182 RMD160 a908e3c9a3df7ddf051773b368acbc4e864c5219 SHA1 aa92c7488884458ee07efc8536b3083215672ff8 SHA256 348ebcb531424818db80c07bd8a0a4b64935252078263847819b2fad4a5896b2
-EBUILD xf86-video-ati-6.12.1.ebuild 1184 RMD160 8aa09a37bf9b4531d47789dce12c0fb2768af734 SHA1 43576386c4cbbe0f9ef83d801300260676fd0d8f SHA256 739c8094172fcb1003be4407ae46e53643eccc88ad4d5987b676667af1873a82
+EBUILD xf86-video-ati-6.12.1-r1.ebuild 1486 RMD160 261b2a7d7101b6645b2a0853925465b55345141d SHA1 6670870d4049d71bf4b3236685b0cfc5a9797f7d SHA256 0c38d2a5d568d8c1574f6068ece4460cab20a7e2fa7ffc0da406baed6f17650d
 EBUILD xf86-video-ati-6.6.3.ebuild 922 RMD160 a8fbe5fad6d3cdd0ce85bc147fc957c65a8b2b45 SHA1 5e83f8bf905b50763dfc69028f64d04cacdbe26c SHA256 8dbd40a6f5d8e87b2013e81051fd7cd2874f9a1c19379c9bdf53367ae82dedb9
 EBUILD xf86-video-ati-6.8.0-r1.ebuild 1622 RMD160 7999e82cffaf6f808ddfd81b77d8a22df35c3ebd SHA1 04a81f6d0411cf0b4269a0a0cd0c5ca964e730de SHA256 f9ae7a367557d2e586bbd4f5c7f178508468be58239606ff610c878a712b8767
-MISC ChangeLog 15522 RMD160 6eec46ddefb10a3a262ac06f581ad06ff99503bf SHA1 afcc5529e63ccaaa07faf55f3336874a4093f795 SHA256 934028f43a6c96756c27aa47c30eda45a5b5992cd2f90e1cdbd0773bb20c32bf
+MISC ChangeLog 15786 RMD160 4f662f76264fc1de1f2b7ecad0654f3bb0887789 SHA1 8b593e051448db0212451038d58a885de84a1856 SHA256 61fe07f85d0630df04982a51a61f2db90f8f73873b448005a3e952b008b58c67
 MISC metadata.xml 248 RMD160 cd03ee11e8c21ba22717305780d821549335a397 SHA1 4f893793186c0aa6214bb5092f97868bbda6f8b5 SHA256 64ccac620d70982408e05b4b61b818f4ca934afa73457b4a7a1a5a729f3ff1b6
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.11.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.1-r1.ebuild
index 3232ebd62186..083154301057 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.11.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.11.0.ebuild,v 1.2 2009/03/13 15:25:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.1-r1.ebuild,v 1.1 2009/03/31 15:03:50 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -12,6 +12,10 @@ DESCRIPTION="ATI video driver"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="dri"
 
+SRC_PATCHES="http://dev.gentooexperimental.org/~scarabeus/${PV}-patches-01.tar.bz2"
+SRC_URI="${SRC_URI}
+	${SRC_PATCHES}"
+
 RDEPEND=">=x11-base/xorg-server-1.2"
 DEPEND="${RDEPEND}
 	>=x11-misc/util-macros-1.1.3
@@ -30,6 +34,16 @@ CONFIGURE_OPTIONS="$(use_enable dri)"
 
 PATCHES=""
 
+src_unpack() {
+	x-modular_src_unpack
+	if [[ -n "${SRC_PATCHES}" ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/patches" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+}
+
 pkg_postinst() {
 	x-modular_pkg_postinst
 
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.1.ebuild
deleted file mode 100644
index 5b23e15d9026..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.1.ebuild,v 1.1 2009/03/21 00:37:31 scarabeus Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular eutils
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.2"
-DEPEND="${RDEPEND}
-	>=x11-misc/util-macros-1.1.3
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xf86miscproto
-	x11-proto/xproto
-	dri? ( x11-proto/glproto
-			x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
-
-CONFIGURE_OPTIONS="$(use_enable dri)"
-
-PATCHES=""
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-
-	ewarn "If you have a mach64 or r128 video card, read this"
-	ewarn "The mach64 and r128 drivers moved to their own packages,"
-	ewarn "xf86-video-mach64 and xf86-video-r128. If these weren't installed"
-	ewarn "automatically by xorg-server and you have one of these cards,"
-	ewarn "check your VIDEO_CARDS settings."
-	ebeep
-	epause
-}