Transfer all ebuilds to eapi2. Depend on xorg-server with -minimal useflag. Per bug #274916.

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

9 files changed, 55 insertions, 33 deletions

diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog
index 0819ab4c9f4c..c84607004636 100644
--- a/x11-drivers/xf86-video-ati/ChangeLog
+++ b/x11-drivers/xf86-video-ati/ChangeLog
@@ -1,6 +1,14 @@
 # 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.89 2009/06/23 20:02:22 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.90 2009/06/26 11:08:29 scarabeus Exp $
+
+  26 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  xf86-video-ati-6.6.3.ebuild, xf86-video-ati-6.8.0-r1.ebuild,
+  xf86-video-ati-6.9.0.ebuild, xf86-video-ati-6.10.0.ebuild,
+  xf86-video-ati-6.11.0.ebuild, xf86-video-ati-6.12.1-r1.ebuild,
+  xf86-video-ati-6.12.2.ebuild:
+  Transfer all ebuilds to eapi2. Depend on xorg-server with -minimal
+  useflag. Per bug #274916.
 
   23 Jun 2009; Tobias Klausmann <klausman@gentoo.org>
   xf86-video-ati-6.12.2.ebuild:
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index b0738d17620b..5145834edc47 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -18,12 +18,12 @@ DIST xf86-video-ati-6.12.2.tar.bz2 902480 RMD160 79f6be946e121a9a27240f1a6b05b7d
 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 1462 RMD160 0d65099133c9ccd723d9e4b3c9ece504d5a11160 SHA1 6184130572fdc1de450dff5c511d2512f804c23f SHA256 40cecfc1f51bb070242cf559cc27c7db4d776bf8c3b89772d1cc6d1b446a1d13
-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
-EBUILD xf86-video-ati-6.9.0.ebuild 1463 RMD160 bf9a41109d6d3a4cbe88bd0f3fec7e6a35bf03cd SHA1 297190100a68b4fcc51415b1dc5f89692758f9bf SHA256 f9751bc6b8870d039048cfa7b02f545d6bcc07d6bbeb4f7e9621ec0139e5677e
-MISC ChangeLog 17582 RMD160 2357a77651e4ca092e9f20dff3e568f6859c448f SHA1 d26dba0d88de22f76f5839244a96fbcf80be2d63 SHA256 fa045a31531f9c7c4eeab67de1846b2978a08024fe80aa0da497f6bc6337caeb
+EBUILD xf86-video-ati-6.10.0.ebuild 1484 RMD160 81a19f804901ff075457e9f14b653c4ce2cadd41 SHA1 e39afdf46bded8d2af48c357ba39d9a86d5161ae SHA256 f40a85f5c3cf3f66a7b7465dabf9c1a7aa2cb4e23b26b9287fd3e264cb077fb1
+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.6.3.ebuild 924 RMD160 6e8adb74d030ebe90b19546d067724a77fc23134 SHA1 30a6b302d0a24957d48a832e0be13c33fa2fd98e SHA256 10b2e4626f3f2dcabc56289f51b15254a40bb2e5490b94e34d2c10ec55eff407
+EBUILD xf86-video-ati-6.8.0-r1.ebuild 1623 RMD160 73236d9663b3703d9c8c68389802f0ff5ef7b6c9 SHA1 7670f70fdf05a422759466ea90a41ee81d6309bc SHA256 531330cf7bbda7b6d79687119eeb64c46572d8fa3a4a438dce06d9143099463e
+EBUILD xf86-video-ati-6.9.0.ebuild 1483 RMD160 0445a5c6afa5dec3d682bd127d6b0ce73bd0202a SHA1 e40682dcdf15707be25207ce594150bf1fff8edb SHA256 2cd88701bc8da5c6e0e572974aa500d50c7f53dc9a862cae01bf93bc98be76d1
+MISC ChangeLog 17957 RMD160 d9188f0597175a51e371351384e0b8a98f6c2c00 SHA1 a188955c4d292d3d4b106940698dfe8866926895 SHA256 b9f4dfd0dba5452f04c2f76c2dd7728891b1e196e0984bedf36bb1c50017e1a3
 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
index 855ef0156107..5e5a7bda68ff 100644
--- 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
@@ -1,10 +1,12 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.10.0.ebuild,v 1.6 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"
@@ -16,7 +18,7 @@ IUSE=""
 SRC_URI="${SRC_URI}
 	${SRC_PATCHES}"
 
-RDEPEND=">=x11-base/xorg-server-1.2"
+RDEPEND=">=x11-base/xorg-server-1.2[-minimal]"
 DEPEND="${RDEPEND}
 	>=x11-libs/libdrm-2
 	>=x11-misc/util-macros-1.1.3
@@ -34,8 +36,8 @@ CONFIGURE_OPTIONS="--enable-dri"
 
 #PATCHES=""
 
-src_unpack() {
-	x-modular_src_unpack
+src_prepare() {
+	x-modular_src_prepare
 	if [[ -n "${SRC_PATCHES}" ]]; then
 		EPATCH_FORCE="yes" \
 		EPATCH_SOURCE="${WORKDIR}/patches" \
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
index debf8d1251fc..c78ad8039068 100644
--- 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
@@ -1,10 +1,12 @@
 # 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 $
+# $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"
 
+EAPI=2
+
 inherit x-modular eutils
 
 DESCRIPTION="ATI video driver"
@@ -16,7 +18,7 @@ IUSE=""
 SRC_URI="${SRC_URI}
 	${SRC_PATCHES}"
 
-RDEPEND=">=x11-base/xorg-server-1.2"
+RDEPEND=">=x11-base/xorg-server-1.2[-minimal]"
 DEPEND="${RDEPEND}
 	>=x11-libs/libdrm-2
 	>=x11-misc/util-macros-1.1.3
@@ -34,8 +36,8 @@ CONFIGURE_OPTIONS="--enable-dri"
 
 #PATCHES=""
 
-src_unpack() {
-	x-modular_src_unpack
+src_prepare() {
+	x-modular_src_prepare
 	if [[ -n "${SRC_PATCHES}" ]]; then
 		EPATCH_FORCE="yes" \
 		EPATCH_SOURCE="${WORKDIR}/patches" \
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.1-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.1-r1.ebuild
index 1d6ea1ddb40e..9a0ced6fb3cc 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.1-r1.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.1-r1.ebuild
@@ -1,10 +1,12 @@
 # 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-r1.ebuild,v 1.9 2009/05/14 17:18:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.1-r1.ebuild,v 1.10 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"
@@ -16,7 +18,7 @@ SRC_PATCHES="http://dev.gentooexperimental.org/~scarabeus/${PV}-patches-01.tar.b
 SRC_URI="${SRC_URI}
 	${SRC_PATCHES}"
 
-RDEPEND=">=x11-base/xorg-server-1.2"
+RDEPEND=">=x11-base/xorg-server-1.2[-minimal]"
 DEPEND="${RDEPEND}
 	>=x11-libs/libdrm-2
 	>=x11-misc/util-macros-1.1.3
@@ -34,8 +36,8 @@ CONFIGURE_OPTIONS="--enable-dri"
 
 #PATCHES=""
 
-src_unpack() {
-	x-modular_src_unpack
+src_prepare() {
+	x-modular_src_prepare
 	if [[ -n "${SRC_PATCHES}" ]]; then
 		EPATCH_FORCE="yes" \
 		EPATCH_SOURCE="${WORKDIR}/patches" \
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
index 43c19c4adf9e..797c6f5afcc6 100644
--- 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
@@ -1,10 +1,12 @@
 # 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.4 2009/06/23 20:02:22 klausman Exp $
+# $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"
@@ -16,7 +18,7 @@ IUSE=""
 SRC_URI="${SRC_URI}
 	${SRC_PATCHES}"
 
-RDEPEND=">=x11-base/xorg-server-1.2"
+RDEPEND=">=x11-base/xorg-server-1.2[-minimal]"
 DEPEND="${RDEPEND}
 	>=x11-libs/libdrm-2
 	>=x11-misc/util-macros-1.1.3
@@ -34,8 +36,8 @@ CONFIGURE_OPTIONS="--enable-dri"
 
 #PATCHES=""
 
-src_unpack() {
-	x-modular_src_unpack
+src_prepare() {
+	x-modular_src_prepare
 	if [[ -n "${SRC_PATCHES}" ]]; then
 		EPATCH_FORCE="yes" \
 		EPATCH_SOURCE="${WORKDIR}/patches" \
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.3.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.3.ebuild
index 442c22001489..3633e7de8f1d 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.3.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.3.ebuild
@@ -1,10 +1,12 @@
 # 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.6.3.ebuild,v 1.16 2009/05/14 17:19:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.3.ebuild,v 1.17 2009/06/26 11:08:29 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
 
+EAPI="2"
+
 inherit x-modular
 
 DESCRIPTION="ATI video driver"
@@ -12,7 +14,7 @@ DESCRIPTION="ATI video driver"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=x11-base/xorg-server-1.0.99"
+RDEPEND=">=x11-base/xorg-server-1.0.99[-minimal]"
 DEPEND="${RDEPEND}
 	>=x11-libs/libdrm-2
 	x11-proto/glproto
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0-r1.ebuild
index eeabd56cfeac..d0299418076c 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0-r1.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0-r1.ebuild
@@ -1,10 +1,12 @@
 # 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.8.0-r1.ebuild,v 1.13 2009/05/14 17:18:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0-r1.ebuild,v 1.14 2009/06/26 11:08:29 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
 
+EAPI="2"
+
 inherit x-modular
 
 DESCRIPTION="ATI video driver"
@@ -12,7 +14,7 @@ DESCRIPTION="ATI video driver"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=x11-base/xorg-server-1.2"
+RDEPEND=">=x11-base/xorg-server-1.2[-minimal]"
 DEPEND="${RDEPEND}
 	>=x11-libs/libdrm-2
 	x11-proto/fontsproto
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
index 06830cfa82e6..59cb6c1bcf86 100644
--- 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
@@ -1,10 +1,12 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.9.0.ebuild,v 1.7 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"
@@ -16,7 +18,7 @@ IUSE=""
 SRC_URI="${SRC_URI}
 	${SRC_PATCHES}"
 
-RDEPEND=">=x11-base/xorg-server-1.2"
+RDEPEND=">=x11-base/xorg-server-1.2[-minimal]"
 DEPEND="${RDEPEND}
 	>=x11-libs/libdrm-2
 	>=x11-misc/util-macros-1.1.3
@@ -34,8 +36,8 @@ CONFIGURE_OPTIONS="--enable-dri"
 
 #PATCHES=""
 
-src_unpack() {
-	x-modular_src_unpack
+src_prepare() {
+	x-modular_src_prepare
 	if [[ -n "${SRC_PATCHES}" ]]; then
 		EPATCH_FORCE="yes" \
 		EPATCH_SOURCE="${WORKDIR}/patches" \