Restore back some versions of the driver to let users choose. Per bug #264461.

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

5 files changed, 185 insertions, 2 deletions

diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog
index 57189f3bc831..4969585d162d 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.87 2009/05/14 17:18:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.88 2009/05/14 17:42:41 scarabeus Exp $
+
+  14 May 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +xf86-video-ati-6.9.0.ebuild, +xf86-video-ati-6.10.0.ebuild,
+  +xf86-video-ati-6.11.0.ebuild:
+  Restore back some versions of the driver to let users choose. Per bug
+  #264461.
 
   14 May 2009; Tomas Chvatal <scarabeus@gentoo.org>
   xf86-video-ati-6.6.3.ebuild, xf86-video-ati-6.8.0-r1.ebuild,
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index a1a6ea881ad9..52e6663944c3 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -11,13 +11,19 @@ AUX old_hw_data/ati.xinf 2028 RMD160 0f57c7452bbf9d2d8d0a96f6f480b98e8a5c6d5f SH
 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.10.0.tar.bz2 823540 RMD160 d3ad3696a68deba52c3aa28c0fe925109108e41a SHA1 ebcd64be211bc9d8853da420efa85196c3ddf157 SHA256 dd92bfff4e10d79f98844a9c2962ee9bb8d0cfd863e1e764941749aabe6d4ebd
+DIST xf86-video-ati-6.11.0.tar.bz2 833773 RMD160 e8ff02eb3730ea127d2dbafb65138ec73f1044df SHA1 fbcba3a7c495e0d08e3a43a05c3277666206ff7b SHA256 601920d4260c6155d248034f6e75418f08b6e06a6cd0dca5dadee403a6720ea8
 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.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
+DIST xf86-video-ati-6.9.0.tar.bz2 777455 RMD160 7c990dc8c770865d6c8a45e4861207c1dda07a13 SHA1 558f94b76e1b4c3c4429ab1fdc3e3c8523e414dc SHA256 682cd1916c386c192dd83d22d07529a247e72a1052c4a008c5466a155413d7c2
+EBUILD xf86-video-ati-6.10.0.ebuild 1464 RMD160 a6a17218ed13ab9d565bb5252e02462513545457 SHA1 69bc522865c7dcd1c6534e1f7a1071793e3a03be SHA256 dd3b173551129b359e990a58eeb463061214f5703b032026fefa585c1eefcf39
+EBUILD xf86-video-ati-6.11.0.ebuild 1464 RMD160 38db1c6de56edf7db779407522feffb25b0db9f3 SHA1 92a3f716d2e02085886a4386fb885c498f67e70d SHA256 c45a24863f3972c40169f04cbf79430f0ecdaf49ee44c2e88063072dcddf75bc
 EBUILD xf86-video-ati-6.12.1-r1.ebuild 1460 RMD160 4d9c30a1f02d0990f5f62c8889c71f543607cad8 SHA1 1c3dcc8043ee8caaf0a23964db8a3a7c65f5d153 SHA256 3a406925216fc1107cf1805f49cf72bc2d970fe0810d1e018573ac011231d48b
 EBUILD xf86-video-ati-6.12.2.ebuild 1464 RMD160 04682812cc8afabca06b19a67612e595d0b24ee7 SHA1 37ce229aaf8be927f6a74e5b25eb2d58a3a4a6b1 SHA256 267244a5275a688e7eb7887d15deb55c236c7e5f476e4fdd94d2180261ede751
 EBUILD xf86-video-ati-6.6.3.ebuild 904 RMD160 ca1aa9a8310f2a4d8741aa53f0017190daee732b SHA1 1c03ce75de7861084676b289ec19ae2e96c75a32 SHA256 6ddcb44811d40eb0cde28fb315894d33e41828c8bb804d983db7156f1ecbdc00
 EBUILD xf86-video-ati-6.8.0-r1.ebuild 1603 RMD160 664f69acc26a4266c0c2f6695d75c3ee747e5086 SHA1 d6b111b36fadee016648239dd25738d2257c9688 SHA256 22b919cc788a52aaba81e84144117fbf6e7bb2ca93a3f4412d6171a8394a0756
-MISC ChangeLog 17213 RMD160 04f0819fa6010a7244e43790f0123356887d51b5 SHA1 69a3546aaf453774646ddfa87d1f32b7c620a94c SHA256 af6ffd79f766629a25e580f40b861ec8689449c9952e5748434df2122c677ab5
+EBUILD xf86-video-ati-6.9.0.ebuild 1463 RMD160 bf9a41109d6d3a4cbe88bd0f3fec7e6a35bf03cd SHA1 297190100a68b4fcc51415b1dc5f89692758f9bf SHA256 f9751bc6b8870d039048cfa7b02f545d6bcc07d6bbeb4f7e9621ec0139e5677e
+MISC ChangeLog 17445 RMD160 052f67f4edf814900d0e61ac5031ed6f057bf0dd SHA1 d6dd34bbf9257942a280da5121de65248cb46ad8 SHA256 cb149a14b5e390813470a2743306beafcaf77b742b60445093531c7a04f114d6
 MISC metadata.xml 248 RMD160 cd03ee11e8c21ba22717305780d821549335a397 SHA1 4f893793186c0aa6214bb5092f97868bbda6f8b5 SHA256 64ccac620d70982408e05b4b61b818f4ca934afa73457b4a7a1a5a729f3ff1b6
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.10.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.10.0.ebuild
new file mode 100644
index 000000000000..855ef0156107
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.10.0.ebuild
@@ -0,0 +1,57 @@
+# 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.10.0.ebuild,v 1.5 2009/05/14 17:42:41 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=""
+
+#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-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_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
+
+	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.11.0.ebuild
new file mode 100644
index 000000000000..debf8d1251fc
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.11.0.ebuild
@@ -0,0 +1,57 @@
+# 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.4 2009/05/14 17:42:41 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=""
+
+#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-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_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
+
+	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.9.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.9.0.ebuild
new file mode 100644
index 000000000000..06830cfa82e6
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.9.0.ebuild
@@ -0,0 +1,57 @@
+# 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.9.0.ebuild,v 1.6 2009/05/14 17:42:41 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=""
+
+#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-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_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
+
+	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
+}