Revison bump, apply upstream patches. Drop older releases.

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

5 files changed, 33 insertions, 101 deletions

diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog
index 0a45fca47677..906b30a51def 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.100 2009/12/27 18:02:14 josejx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.101 2010/01/11 15:14:18 scarabeus Exp $
+
+*xf86-video-ati-6.12.4-r1 (11 Jan 2010)
+
+  11 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-ati-6.11.0.ebuild, -xf86-video-ati-6.12.2.ebuild,
+  xf86-video-ati-6.12.4.ebuild, +xf86-video-ati-6.12.4-r1.ebuild:
+  Revison bump, apply upstream patches. Drop older releases.
 
   27 Dec 2009; Joseph Jezak <josejx@gentoo.org> ChangeLog:
   Marked ppc stable for bug #294958.
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index cfff1ac628aa..920480459119 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -1,24 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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 6.12.1-patches-01.tar.bz2 14334 RMD160 dcd4248ea6e5b63be7a0c888185175964318b178 SHA1 d24404367d2f0eac6426cf1266f8b345f8a37cd0 SHA256 5fab74ecfde6ec785c42ed4f417995ecf6ce03e0627bfbb01dc8986399b75378
-DIST xf86-video-ati-6.11.0.tar.bz2 833773 RMD160 e8ff02eb3730ea127d2dbafb65138ec73f1044df SHA1 fbcba3a7c495e0d08e3a43a05c3277666206ff7b SHA256 601920d4260c6155d248034f6e75418f08b6e06a6cd0dca5dadee403a6720ea8
+DIST 6.12.4-patches-01.tar.bz2 7753 RMD160 0750c097d6e13174a51d244789abde69d0c7bb73 SHA1 f500f72c8c19ee1948105b456e49884fc7a0d20c SHA256 886d2a995c4e165b1d19bccd6dc7ed45ccdf228ed036cd5ecc0fcd973721a600
 DIST xf86-video-ati-6.12.1.tar.bz2 896448 RMD160 928c0b24c906a53e0df5da651831dd86581dd703 SHA1 946095af982eedbdcb21ab2e664d70477211ff2c SHA256 b1637b11344f080ff5366799892e8bea0427087166d4db761e8dd4ecadb8b574
-DIST xf86-video-ati-6.12.2.tar.bz2 902480 RMD160 79f6be946e121a9a27240f1a6b05b7dce0714a2f SHA1 a09a579ece160e714774d3a54da3e1f2bc48ec36 SHA256 1beebba17719f7b9bfbbede156dc33a2dd29ed164657badcb62c7149cfae2750
 DIST xf86-video-ati-6.12.4.tar.bz2 915124 RMD160 c1d6700bfe52977c863eb05cc63dfad52d405c00 SHA1 efd9b9392787251756bbce6afc9715c417dae68f SHA256 cfde066a7087a19b624f79e95cb9a6c97a847b8802cf38d4ae6022758bf338f6
-EBUILD xf86-video-ati-6.11.0.ebuild 1484 RMD160 e8795f835eca83c1a70fcb8762057905636629ad SHA1 006e704a7d49ca15805ddb751faaa795cfa7d6f8 SHA256 0f5556f7624bb1a6b97cf1cfd81cd601022ccfa0b8927cadf0b4d7de4a8ee349
 EBUILD xf86-video-ati-6.12.1-r1.ebuild 1481 RMD160 bad497bcc3e15e9be1059fece3de84258114e3f4 SHA1 63b1123941b2735f4bdf740050ff08f3f40ce98d SHA256 bac9e5e47ccead0adbe3c06171d595cfe3b40a23ce3dd27901c47cec2a6a6c0c
-EBUILD xf86-video-ati-6.12.2.ebuild 1483 RMD160 0e5ffd38ab64eef6ec8dd234ca3feb0f01005d38 SHA1 f42a876b394701702fb624db611214eae5268364 SHA256 414bd2845c6b4e27ab61e7371bd5b144d95f6acdcfdabe8693b33d4a9ab0f786
-EBUILD xf86-video-ati-6.12.4.ebuild 1474 RMD160 4d839a486990070f31b20f6deaf594569b6286c2 SHA1 2029f760121ab9e81d0fdab2539278e6d21efd4e SHA256 b8fe285aa458472c3826ea62864d5e7a479e2bda5bc2c3adaabf15c156dd78d0
-MISC ChangeLog 19973 RMD160 e18321a059dcc3f677ee2adaa1fc2a4a8ae13864 SHA1 5ae1a2711edc393dedaa361ba3becf4e77350345 SHA256 143d0e3de88020d35644c032f0533572ab6a7c26c9f5bb7ffdad97164d8c3403
+EBUILD xf86-video-ati-6.12.4-r1.ebuild 1532 RMD160 ed7a98cc9be52e57d169d52ed92d13b2b163f6da SHA1 9724875ad18ff3e3dd255f42ee8264828a18750d SHA256 ff40c794345ed8437bf38b145d3080b6bae725116f94615cc9477c5b27c01200
+EBUILD xf86-video-ati-6.12.4.ebuild 1419 RMD160 074883ff5028559e733b8d971b81c227423923b3 SHA1 68d1ca88722b4674f0860c72c91bb3485b66d5d7 SHA256 30e29dc7825f8b4f75ef5f144d910e15320e35e477cb4c6b3f7e9866fd6a8023
+MISC ChangeLog 20264 RMD160 46310ce4bb23d29e43573ca820230c75aaddbef9 SHA1 eec9bcf08b441e6fd270b1eb53bfeff3f4cd3b72 SHA256 fb5472aad1373e45ab5036017a023331d6fb3ba82ea941f52622f6263eff7d18
 MISC metadata.xml 248 RMD160 cd03ee11e8c21ba22717305780d821549335a397 SHA1 4f893793186c0aa6214bb5092f97868bbda6f8b5 SHA256 64ccac620d70982408e05b4b61b818f4ca934afa73457b4a7a1a5a729f3ff1b6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks3oNQACgkQcsIHjyDViGRVYgCfdpgBBPVjyco9NCLaqb/vApcw
-JngAoLSxhBAk8/DPEx4yLObUPjQB74k+
-=qI0d
------END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.2.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.2.ebuild
deleted file mode 100644
index 797c6f5afcc6..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.2.ebuild
+++ /dev/null
@@ -1,59 +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.2.ebuild,v 1.5 2009/06/26 11:08:29 scarabeus Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-EAPI=2
-
-inherit x-modular eutils
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-#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[-minimal]"
-DEPEND="${RDEPEND}
-	>=x11-libs/libdrm-2
-	>=x11-misc/util-macros-1.1.3
-	x11-proto/fontsproto
-	x11-proto/glproto
-	x11-proto/randrproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xf86driproto
-	x11-proto/xf86miscproto
-	x11-proto/xproto
-"
-CONFIGURE_OPTIONS="--enable-dri"
-
-#PATCHES=""
-
-src_prepare() {
-	x-modular_src_prepare
-	if [[ -n "${SRC_PATCHES}" ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-}
-
-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
-}
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.4-r1.ebuild
index c78ad8039068..12d17053002c 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.4-r1.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.5 2009/06/26 11:08:29 scarabeus Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.4-r1.ebuild,v 1.1 2010/01/11 15:14:18 scarabeus Exp $
 
 EAPI=2
 
+SNAPSHOT="yes"
 inherit x-modular eutils
 
 DESCRIPTION="ATI video driver"
@@ -14,14 +12,13 @@ DESCRIPTION="ATI video driver"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-#SRC_PATCHES="http://dev.gentooexperimental.org/~scarabeus/${PV}-patches-01.tar.bz2"
+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[-minimal]"
 DEPEND="${RDEPEND}
 	>=x11-libs/libdrm-2
-	>=x11-misc/util-macros-1.1.3
 	x11-proto/fontsproto
 	x11-proto/glproto
 	x11-proto/randrproto
@@ -34,26 +31,30 @@ DEPEND="${RDEPEND}
 "
 CONFIGURE_OPTIONS="--enable-dri"
 
-#PATCHES=""
-
 src_prepare() {
-	x-modular_src_prepare
 	if [[ -n "${SRC_PATCHES}" ]]; then
 		EPATCH_FORCE="yes" \
 		EPATCH_SOURCE="${WORKDIR}/patches" \
 		EPATCH_SUFFIX="patch" \
 		epatch
 	fi
+	x-modular_src_prepare
+}
+
+pkg_preinst() {
+	if has_version '<x11-drivers/xf86-video-ati-6.10.0'; then
+		SHOW_WARNING="true"
+	fi
 }
 
 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
+	if [[ ${SHOW_WARNING} == true ]]; then
+		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."
+	fi
 }
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.4.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.4.ebuild
index b68afe0af28b..da5017ed0f9f 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.4.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.4.ebuild,v 1.6 2009/12/15 19:28:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.4.ebuild,v 1.7 2010/01/11 15:14:18 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -21,7 +21,6 @@ SRC_URI="${SRC_URI}
 RDEPEND=">=x11-base/xorg-server-1.2[-minimal]"
 DEPEND="${RDEPEND}
 	>=x11-libs/libdrm-2
-	>=x11-misc/util-macros-1.1.3
 	x11-proto/fontsproto
 	x11-proto/glproto
 	x11-proto/randrproto
@@ -34,8 +33,6 @@ DEPEND="${RDEPEND}
 "
 CONFIGURE_OPTIONS="--enable-dri"
 
-#PATCHES=""
-
 src_prepare() {
 	x-modular_src_prepare
 	if [[ -n "${SRC_PATCHES}" ]]; then
@@ -54,6 +51,4 @@ pkg_postinst() {
 	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
 }