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

(Portage version: 2.2_rc33/cvs/Linux x86_64)

8 files changed, 47 insertions, 25 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/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" \