Move to EAPI=2, per bug #130919.

Package-Manager: portage-2.2_rc38/cvs/Linux i686

8 files changed, 87 insertions, 33 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/Manifest b/x11-drivers/xf86-video-sis/Manifest
index 8e98842be75b..2cae3be06d02 100644
--- a/x11-drivers/xf86-video-sis/Manifest
+++ b/x11-drivers/xf86-video-sis/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX sis.xinf 1234 RMD160 04bcfe33f7966c9d0b9e76a998bc867744fe390b SHA1 4f88d3b4ad07372ea7febf6450838f4beaa652bd SHA256 37d7a6cd88bfea59a7b8fcfb683bb4b27afc861414c1816ab7469d1696fd61d6
 AUX xf86-video-sis-assert.patch 642 RMD160 e45e10b99ea120bb7039628f526a35b60004ea2b SHA1 b1459ff63202375218372460a39fc67cbe772434 SHA256 9a43aa0171d470c9a0e4b6934538180d8ea2c23ab6e874e6c4eab8c6e5a64204
 DIST xf86-video-sis-0.10.0.tar.bz2 630049 RMD160 5f84d17770f5a86bdedf5987e47ccf49cede8278 SHA1 ec3fc258186d7de221ad875d7762c91f598b8c57 SHA256 bcc0dcde5d469cc2500676e0ad29dcd12b1370066289902387ead762260e4b40
@@ -6,11 +9,18 @@ DIST xf86-video-sis-0.10.2.tar.bz2 642160 RMD160 ba5773d307af3c5d1b6820c48d29341
 DIST xf86-video-sis-0.9.1.tar.bz2 615954 RMD160 311e2ba46212ff992bba7ecfc389f7e281253934 SHA1 e427ce3f7a4d3387d736ea27779f60c197783843 SHA256 56b275fcc24fa9bf82b25867c79ce5b720a83aedfc5707ebe392099932e679be
 DIST xf86-video-sis-0.9.3.tar.bz2 617592 RMD160 797104eab78486411a876def8e87870946fbe273 SHA1 fb386185a91bbc6764445ef251d4a0216ec9b9d0 SHA256 898ee8fb16fff89ba8ac5c83b9f5a2371084719db0cf034140427229191436f6
 DIST xf86-video-sis-0.9.4.tar.bz2 619166 RMD160 635a61fa5dd05d2344c277e2167b17ca5b3e0f17 SHA1 0ff33b7217e36cca350eb8117c42fcf6c37f8659 SHA256 50856446841526fc393af6bae0fbc39c20bb07e60056a676d0bc620446b593ac
-EBUILD xf86-video-sis-0.10.0.ebuild 799 RMD160 0f0b4eda183cec431924449e11d2a0b452ea0ff6 SHA1 14a7e87a353c067aaf9a5abb61236b3f774858d4 SHA256 2cb6edebcb347751f95c0143447671aa08b9d7433ee50bf977b2dd2b62a7d324
-EBUILD xf86-video-sis-0.10.1.ebuild 801 RMD160 48d932aa81a0e8c9fa1923a5ecf1d1644b4f9597 SHA1 421416a385a46e0672fe39501381a50d9a43792d SHA256 d6205f10ee46d58896f688156e708f2b09bc93dbfeffa1ab92e78cfea12b8f6e
-EBUILD xf86-video-sis-0.10.2.ebuild 787 RMD160 24ad7e3d0720c932e6b350fbc30e8bcbcf9fe710 SHA1 c78a4fe6d18ca11192fa9bb05a6830299ac4925e SHA256 d8f830568c15b72e1f59a6b6bdfd161d2a5c5b3e13cf1a5598e0606fdd5a9297
-EBUILD xf86-video-sis-0.9.1-r1.ebuild 832 RMD160 acd98bc907d10220735fd56ee39b47bb55aeb105 SHA1 fd9c5950b4f0f9e2f58a16427fe325d2c2ef0cfc SHA256 522cf14b94dc7e2acb05611a89556cc58802f25805382be2f82e3cb4f6ecec3a
-EBUILD xf86-video-sis-0.9.3.ebuild 796 RMD160 9db3d4f57295b0083273e376c8eae927e47ac3c0 SHA1 0cdc252b9a1f25ec52db8894aa09fe27f0ea73e5 SHA256 26288e4bf0a3c0fe16e4fbecf27bd18fbc8161b47844e727344ba7b0bcc891c6
-EBUILD xf86-video-sis-0.9.4.ebuild 799 RMD160 8e08c9bec31a040288f869b22499f028ebac0262 SHA1 c16e07c7ca787cc4dbd8e980f2a57679cfe03bad SHA256 f948078021e6f0078392bd6636831678f784c9ae0c863ab716da470030a0a737
-MISC ChangeLog 6081 RMD160 65750b3c836cb62de472b776fd7481a8d18c79f1 SHA1 54807b484d23372ba3a160358cab41b205a60081 SHA256 26cecaeaf9644b7d8479da545e7428bcc20127ac412a8b53e5fdb51753877a20
+EBUILD xf86-video-sis-0.10.0.ebuild 854 RMD160 747955aba99d7ba5c46f8755cc62c4d32f791f22 SHA1 b79e79734d40dbd2aef76d98469daaf777fb3766 SHA256 b2c6b97f55511a33d046a13a54d131379e34108e27d46ae76a861f9f0d61c66d
+EBUILD xf86-video-sis-0.10.1.ebuild 856 RMD160 03c88ae7255d077ad8ffb02f355d58286d96820d SHA1 ddaf915dfc0192eed4cdc556b16df03a7fd0c7f4 SHA256 beb3e060641b14b8151c0ac24eadd548954721958bd593859b4f9358c78bc571
+EBUILD xf86-video-sis-0.10.2.ebuild 847 RMD160 099f75640b2e85a1e6f8f436fef07675d52a39e0 SHA1 57b3066818118def4696cee2a875857431755461 SHA256 39b1ee93568b714ad1b017321646b357aba89809d7ae50f0d71159ca39844cd5
+EBUILD xf86-video-sis-0.9.1-r1.ebuild 892 RMD160 4b75dbb6817dedaf8a5213d45ee316cd9cb270e5 SHA1 bcfc6174ec5c55b46f1b1e1dd60d6c3802ff3bcf SHA256 d3d23ff15120de0ea2f9012f00e2e95e62e0b09e7ef866dc9bf76fcebf89a7f6
+EBUILD xf86-video-sis-0.9.3.ebuild 852 RMD160 f886579b2a9c3999899254ac4b9372eaa3efd58e SHA1 92ef478ddd2ca6e0f7d2abf42759bffa221d0107 SHA256 6b17ad922546d09f8315631d7c908979bd2e149cea6c2d8b83d0d8f5c6ffabdf
+EBUILD xf86-video-sis-0.9.4.ebuild 854 RMD160 4fd6d784a3f33dc40faab9c5ad42e8511c625cfd SHA1 f3d339b2914846a12ca2e3b60e2284dc4b864796 SHA256 d4c16769277887de931983483f194f1fb9d97fff0f640e3c48568169e5b0f324
+MISC ChangeLog 6363 RMD160 1d90d197b719b3862650fe8958fb3f70edaa16fb SHA1 86e28c9dc9aa4b8991d19e0256dfc8d2796b3ca2 SHA256 7d0216bd648c93a7df3b198011cd3a94e229350ecca32214e9ebbc6535448a1e
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqOQiYACgkQHB6c3gNBRYeqvgCePbFy6D9U/P5BouF9LSPDGlt9
+a9UAoIo2XVnZjUJVqLP0XvxwdFz7TsTL
+=eIKX
+-----END PGP SIGNATURE-----
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)"