Version bump. Drop patched version.

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

3 files changed, 31 insertions, 21 deletions

diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog
index 54b227d788e7..f92bc6f5102c 100644
--- a/x11-drivers/xf86-video-ati/ChangeLog
+++ b/x11-drivers/xf86-video-ati/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-ati
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.102 2010/02/21 16:51:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.103 2010/03/03 08:47:01 scarabeus Exp $
+
+*xf86-video-ati-6.12.5 (03 Mar 2010)
+
+  03 Mar 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-ati-6.12.4-r1.ebuild, +xf86-video-ati-6.12.5.ebuild:
+  Version bump. Drop patched version.
 
   21 Feb 2010; Raúl Porcel <armin76@gentoo.org>
   xf86-video-ati-6.12.1-r1.ebuild:
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index a1ff95fc8fb6..cde0e32e3f00 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -1,12 +1,22 @@
+-----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 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.4.tar.bz2 915124 RMD160 c1d6700bfe52977c863eb05cc63dfad52d405c00 SHA1 efd9b9392787251756bbce6afc9715c417dae68f SHA256 cfde066a7087a19b624f79e95cb9a6c97a847b8802cf38d4ae6022758bf338f6
+DIST xf86-video-ati-6.12.5.tar.bz2 921574 RMD160 f086a8a48c8e55c757e825b84c60ddf503a57ec1 SHA1 e73f70393801dc32220270088c85d404c2f14c28 SHA256 7400a4fe608dfa34f829eb5f60ab6145e29c4bd94c4899eaba169fc62f63d8db
 EBUILD xf86-video-ati-6.12.1-r1.ebuild 1478 RMD160 6aa16a6d30a8508e3be4a5995b2e2570be6fe71c SHA1 febc3ee77f2895542e3ed5fd62fa4aae22033197 SHA256 d2d9aee8ce442bf2ad794130d169cd93cae880dd55d1bcf5201b2e2b5fe32b83
-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 20385 RMD160 cc266c3e5e91cc8e33b4bd7aae49aabcd5732391 SHA1 6ce7d31187457131afbc2884d32a6e0779b7d540 SHA256 3ddfadec22aab93d9c69472e4214e01e2bccbd81f88151436e65e21af5d51a14
+EBUILD xf86-video-ati-6.12.5.ebuild 1426 RMD160 00d41cbb79e3d38ed361d299c273cef5751968de SHA1 dd4f0ee667888cf941b8b86c9ba94db514c73352 SHA256 8536e5595a8e2e6c6b8b210721977f05138b77fa448a1a1e038b76b3f24b8bb0
+MISC ChangeLog 20586 RMD160 db784e411799946e0b5c962331fed545d2596d0e SHA1 b9f4e4aa3b51bf07c7e02083b0bbc94990cacb89 SHA256 0f25a17610db6f604d7196275f0abe38f84eb6e1f8560ba8af8cb2c604e22c10
 MISC metadata.xml 248 RMD160 cd03ee11e8c21ba22717305780d821549335a397 SHA1 4f893793186c0aa6214bb5092f97868bbda6f8b5 SHA256 64ccac620d70982408e05b4b61b818f4ca934afa73457b4a7a1a5a729f3ff1b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuOIg4ACgkQHB6c3gNBRYeZcACfa/qu6bb+NSnZs4SypPbEXXyU
+v5IAoI01ucDlVwxdXrSMZS50o25xaFVL
+=rkwp
+-----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.4-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.5.ebuild
index 12d17053002c..169545cb64b7 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.4-r1.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.5.ebuild
@@ -1,10 +1,12 @@
 # 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-r1.ebuild,v 1.1 2010/01/11 15:14:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.5.ebuild,v 1.1 2010/03/03 08:47:01 scarabeus Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
 
 EAPI=2
 
-SNAPSHOT="yes"
 inherit x-modular eutils
 
 DESCRIPTION="ATI video driver"
@@ -12,7 +14,7 @@ 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}"
 
@@ -32,29 +34,21 @@ DEPEND="${RDEPEND}
 CONFIGURE_OPTIONS="--enable-dri"
 
 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
 
-	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
+	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."
 }