Move to EAPI=2, per bug #130919.

(Portage version: 2.2_rc38/cvs/Linux i686)

7 files changed, 70 insertions, 26 deletions

diff --git a/x11-drivers/xf86-video-sis/ChangeLog b/x11-drivers/xf86-video-sis/ChangeLog
index 8dd74e2f82bb..a5e7cb552114 100644
--- a/x11-drivers/xf86-video-sis/ChangeLog
+++ b/x11-drivers/xf86-video-sis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-sis
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/ChangeLog,v 1.40 2009/08/03 15:33:08 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/ChangeLog,v 1.41 2009/08/21 06:43:38 scarabeus Exp $
+
+  21 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  xf86-video-sis-0.9.1-r1.ebuild, xf86-video-sis-0.9.3.ebuild,
+  xf86-video-sis-0.9.4.ebuild, xf86-video-sis-0.10.0.ebuild,
+  xf86-video-sis-0.10.1.ebuild, xf86-video-sis-0.10.2.ebuild:
+  Move to EAPI=2, per bug #130919.
 
 *xf86-video-sis-0.10.2 (03 Aug 2009)
 
diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.0.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.0.ebuild
index 50497e212f53..358125ba25fb 100644
--- a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.0.ebuild
+++ b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.0.ebuild
@@ -1,6 +1,8 @@
 # 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-sis/xf86-video-sis-0.10.0.ebuild,v 1.6 2009/05/04 16:32:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.0.ebuild,v 1.7 2009/08/21 06:43:38 scarabeus Exp $
+
+EAPI="2"
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -11,7 +13,9 @@ inherit x-modular
 DESCRIPTION="SiS and XGI video driver"
 KEYWORDS="amd64 ~ia64 ~ppc x86 ~x86-fbsd"
 IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
+RDEPEND="dri? ( x11-base/xorg-server[-minimal] )
+	!dri? ( x11-base/xorg-server )
+"
 DEPEND="${RDEPEND}
 	x11-proto/fontsproto
 	x11-proto/randrproto
@@ -22,8 +26,10 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86miscproto
 	x11-proto/xineramaproto
 	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
+	dri? (
+		x11-proto/xf86driproto
+		>=x11-libs/libdrm-2
+	)"
 
 pkg_setup() {
 	CONFIGURE_OPTIONS="$(use_enable dri)"
diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.1.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.1.ebuild
index 45ea5bc2ea4d..bc6d47ddb733 100644
--- a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.1.ebuild
+++ b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.1.ebuild
@@ -1,6 +1,8 @@
 # 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-sis/xf86-video-sis-0.10.1.ebuild,v 1.3 2009/05/04 16:32:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.1.ebuild,v 1.4 2009/08/21 06:43:38 scarabeus Exp $
+
+EAPI="2"
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -11,7 +13,9 @@ inherit x-modular
 DESCRIPTION="SiS and XGI video driver"
 KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
 IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
+RDEPEND="dri? ( x11-base/xorg-server[-minimal] )
+	!dri? ( x11-base/xorg-server )
+"
 DEPEND="${RDEPEND}
 	x11-proto/fontsproto
 	x11-proto/randrproto
@@ -22,8 +26,10 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86miscproto
 	x11-proto/xineramaproto
 	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
+	dri? (
+		x11-proto/xf86driproto
+		>=x11-libs/libdrm-2
+	)"
 
 pkg_setup() {
 	CONFIGURE_OPTIONS="$(use_enable dri)"
diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.2.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.2.ebuild
index 517d7cd5f197..b16625623495 100644
--- a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.2.ebuild
+++ b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.2.ebuild
@@ -1,6 +1,8 @@
 # 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-sis/xf86-video-sis-0.10.2.ebuild,v 1.1 2009/08/03 15:33:08 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.2.ebuild,v 1.2 2009/08/21 06:43:38 scarabeus Exp $
+
+EAPI="2"
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -10,7 +12,9 @@ inherit x-modular
 DESCRIPTION="SiS and XGI video driver"
 KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
 IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
+RDEPEND="dri? ( x11-base/xorg-server[-minimal] )
+	!dri? ( x11-base/xorg-server )
+"
 DEPEND="${RDEPEND}
 	x11-proto/fontsproto
 	x11-proto/randrproto
@@ -21,8 +25,10 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86miscproto
 	x11-proto/xineramaproto
 	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
+	dri? (
+		x11-proto/xf86driproto
+		>=x11-libs/libdrm-2
+	)"
 
 pkg_setup() {
 	CONFIGURE_OPTIONS="$(use_enable dri)"
diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild
index eef6db63d83d..53e1133fe8dd 100644
--- a/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild
+++ b/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild
@@ -1,6 +1,8 @@
 # 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-sis/xf86-video-sis-0.9.1-r1.ebuild,v 1.8 2009/05/04 16:32:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild,v 1.9 2009/08/21 06:43:38 scarabeus Exp $
+
+EAPI="2"
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -10,7 +12,9 @@ inherit x-modular
 DESCRIPTION="SiS and XGI video driver"
 KEYWORDS="amd64 ia64 ppc x86 ~x86-fbsd"
 IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
+RDEPEND="dri? ( x11-base/xorg-server[-minimal] )
+	!dri? ( x11-base/xorg-server )
+"
 DEPEND="${RDEPEND}
 	x11-proto/fontsproto
 	x11-proto/randrproto
@@ -21,11 +25,15 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86miscproto
 	x11-proto/xineramaproto
 	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
+	dri? (
+		x11-proto/xf86driproto
+		>=x11-libs/libdrm-2
+	)"
 
 pkg_setup() {
 	CONFIGURE_OPTIONS="$(use_enable dri)"
 }
 
-PATCHES="${FILESDIR}/${PN}-assert.patch"
+PATCHES=(
+	"${FILESDIR}/${PN}-assert.patch"
+)
diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.3.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.3.ebuild
index 2ff14d5a9b1c..69a177001ed9 100644
--- a/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.3.ebuild
+++ b/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.3.ebuild
@@ -1,6 +1,8 @@
 # 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-sis/xf86-video-sis-0.9.3.ebuild,v 1.9 2009/05/04 16:32:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.3.ebuild,v 1.10 2009/08/21 06:43:38 scarabeus Exp $
+
+EAPI="2"
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -11,7 +13,9 @@ inherit x-modular
 DESCRIPTION="SiS and XGI video driver"
 KEYWORDS="amd64 ia64 ppc x86 ~x86-fbsd"
 IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
+RDEPEND="dri? ( x11-base/xorg-server[-minimal] )
+	!dri? ( x11-base/xorg-server )
+"
 DEPEND="${RDEPEND}
 	x11-proto/fontsproto
 	x11-proto/randrproto
@@ -22,8 +26,10 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86miscproto
 	x11-proto/xineramaproto
 	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
+	dri? (
+		x11-proto/xf86driproto
+		>=x11-libs/libdrm-2
+	)"
 
 pkg_setup() {
 	CONFIGURE_OPTIONS="$(use_enable dri)"
diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.4.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.4.ebuild
index 90e4c9f2b83f..e59a7fc03d28 100644
--- a/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.4.ebuild
+++ b/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.4.ebuild
@@ -1,6 +1,8 @@
 # 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-sis/xf86-video-sis-0.9.4.ebuild,v 1.6 2009/05/04 16:32:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.4.ebuild,v 1.7 2009/08/21 06:43:38 scarabeus Exp $
+
+EAPI="2"
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -11,7 +13,9 @@ inherit x-modular
 DESCRIPTION="SiS and XGI video driver"
 KEYWORDS="~amd64 ~ia64 ~ppc x86 ~x86-fbsd"
 IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
+RDEPEND="dri? ( x11-base/xorg-server[-minimal] )
+	!dri? ( x11-base/xorg-server )
+"
 DEPEND="${RDEPEND}
 	x11-proto/fontsproto
 	x11-proto/randrproto
@@ -22,8 +26,10 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86miscproto
 	x11-proto/xineramaproto
 	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
+	dri? (
+		x11-proto/xf86driproto
+		>=x11-libs/libdrm-2
+	)"
 
 pkg_setup() {
 	CONFIGURE_OPTIONS="$(use_enable dri)"