Split apart funcs according to EAPI-2 #256117 by Arfrever Frehtes Taifersar Arahesis.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 28 insertions, 15 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 703b345ae5a2..55ade445fa46 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.243 2009/01/24 11:17:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.244 2009/01/24 15:05:06 vapier Exp $
+
+  24 Jan 2009; Mike Frysinger <vapier@gentoo.org> wine-1.1.13.ebuild,
+  wine-9999.ebuild:
+  Split apart funcs according to EAPI-2 #256117 by Arfrever Frehtes
+  Taifersar Arahesis.
 
   24 Jan 2009; Alexis Ballier <aballier@gentoo.org> wine-1.1.0.ebuild,
   wine-1.1.1.ebuild, wine-1.1.2.ebuild:
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 29e98ee3b0dc..ecfbd075c64d 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -58,7 +58,7 @@ EBUILD wine-1.1.1.ebuild 3773 RMD160 b1db2a1b2278d525a89fc845be20bc16dd060ea4 SH
 EBUILD wine-1.1.10.ebuild 3804 RMD160 ee577d39198c00427121c733629fc88d6d65486e SHA1 b476d4ddefbb11ffef9e63dd18496809308b359c SHA256 053dc83a2e4955b57e72ce55e070bcce6c331184f05458332c78a8d3de493596
 EBUILD wine-1.1.11.ebuild 3804 RMD160 a098381a83157a96a9908bf0bb2d5ac7897f788b SHA1 c76b100a03c7af8f6e2e15a441fcde3b547a4423 SHA256 684a2719a53c5b38dbecbdbcb8bc47ec3b7c228ef9dccf0e2afdf986c0cee85f
 EBUILD wine-1.1.12.ebuild 3821 RMD160 186e9be0cd68f8f27f1c33148689da066ad12ff1 SHA1 09ddbf648de8d51f6f97b128d841e773eb256291 SHA256 c53cf987178e8fb5c46b876797ad73fd41654f394f889b4b401948cdc10324d8
-EBUILD wine-1.1.13.ebuild 3169 RMD160 52d30bb5c13a3ae21f30a491d5ed788cd893399d SHA1 51dbd7922313f385231b2b2e254429bb9d9f14d9 SHA256 cd1a0270bcf2bd51da105e8f0bd623fb26b856be4166b9d766e85b0bc4779aca
+EBUILD wine-1.1.13.ebuild 3217 RMD160 7915fa3ecb2b8a7ab6d8454125780b29eef3551a SHA1 fe706fa3a2feac28d31d465383b64f0e93a96547 SHA256 124b501971fffbc0e767d2f06204f92886b7c2766d147ee60dfd96e5617542c8
 EBUILD wine-1.1.2.ebuild 3773 RMD160 6063e652407012797fe4ced42709f10f3a09017a SHA1 4b2fb9982b7814a3055534fded4cb77416376d1b SHA256 48e202ba68c92a2b89c57f000bf8f2bdce8dd4cd845f654ca996b2b86b7d2fe0
 EBUILD wine-1.1.3.ebuild 3771 RMD160 405748e8500186063a36a73543eb42469cb22c3b SHA1 a2e53e15212156cfea9dfcfd4967b4dcf38b44b5 SHA256 10eeccb5e3538ed51f5474794ccf26a3bb0796f98ece280f5c1f4d358bc0e6dd
 EBUILD wine-1.1.4.ebuild 3797 RMD160 422178d66cfd5cd8aa2afc1646c8301c886158c0 SHA1 e42cdbbfe01494cdac912caab3a9c93e7ab1a15c SHA256 eac167e43c9cfff73621cdbb44fbd44140458a034c4c6ccce0c7a40a8c58a7a1
@@ -67,13 +67,13 @@ EBUILD wine-1.1.6.ebuild 3780 RMD160 1ca272eaabbecad06e5df3d3b754782ba5e8466a SH
 EBUILD wine-1.1.7.ebuild 3803 RMD160 3458f03183f516a3d739a8e7fef6af12a9920aa2 SHA1 877b31cde58aa7afff9eb1a86be19ec34a89349a SHA256 acee2687927db6dedc7aa41a34302d9ab12f80f98931007effd65012c632e26c
 EBUILD wine-1.1.8.ebuild 3803 RMD160 3b5b162c0e508f11c4d049f0a1c00d53d3e2d0b3 SHA1 6b75f3159e53f78968a3cb540a646068b51bfb67 SHA256 db3c86e95438438f2893a3a74166dc279f8d0c0d7993bedccbc4066276d67e53
 EBUILD wine-1.1.9.ebuild 3803 RMD160 68fbbb1dc13b572772de20aeb93c2fa640669a8b SHA1 9686113d28a1f432efb355a8c8d370878c809aa7 SHA256 323f69fc0649ea25bd01470b88b08daeb8d50b756f6324cdeb1e2bcdae757839
-EBUILD wine-9999.ebuild 3168 RMD160 0afa007615fa1d9417a2834149a122d94b89feab SHA1 a76d29d39c8f4f1dadc4a034a3541628484e87e5 SHA256 6f6050d8aae9a920e3fc191cbe7a66cfe91bab4d4cbecd8a5d1f8d61903f3821
-MISC ChangeLog 43053 RMD160 2a2b16e62b8966f9959d4bf59c9d1bfbfc9a9391 SHA1 16069eba93d2f08b1b1d94e475ab8582932b2c04 SHA256 101b0249918c93cfbb379a92ecb844a0233518b31feacdfdb0124aee9f4aef4e
+EBUILD wine-9999.ebuild 3216 RMD160 26de9444f29059e83298e5f0fbaa4c9fef721f40 SHA1 ec735825ebeac5712c1ee0dfd43c51c0e41fbc63 SHA256 d3b3078928d1cac2ab0794cb1835e81e33b6c52d20637ce801972699b93aa75c
+MISC ChangeLog 43232 RMD160 c2d55b4e1d9ddce3d35d7bb501f080504af9c18c SHA1 2df89c62c4fe10c49b9c45292928ec059392134f SHA256 d55352eb7e07adc3560630174639b2a65fb6ba062f2b61299a816402aa167f6f
 MISC metadata.xml 1096 RMD160 dd98baf26a65f2e3b26b5f7e4579917fc1941c03 SHA1 42cb8cdb97d6029a2e058b454d9b4b407dcd98c2 SHA256 9fb6d3d784ce20e787198725d118bfc8ebe5056a7df9364bb5a83993059205c1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkl6+MsACgkQvFcC4BYPU0oiiwCfSOfjpsGH3kdQDiY1XDJiIeFI
-jIQAnA2B+349Gq0hzsifgWooMHm2oP9b
-=uYPB
+iEYEARECAAYFAkl7LigACgkQn/5bYzqsSmEoEACfeHqYAlYH6Ljr+oDJEpgQW1lg
+B14AoJwtMSN8vSPf2g1EEQZF9nlHEHUK
+=0nNO
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.1.13.ebuild b/app-emulation/wine/wine-1.1.13.ebuild
index 1b5899463e9e..20fbf3544653 100644
--- a/app-emulation/wine/wine-1.1.13.ebuild
+++ b/app-emulation/wine/wine-1.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.13.ebuild,v 1.4 2009/01/21 08:52:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.13.ebuild,v 1.5 2009/01/24 15:05:06 vapier Exp $
 
 EAPI="2"
 
@@ -24,7 +24,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 xml +X"
+IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -78,13 +78,14 @@ src_unpack() {
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
-	cd "${S}"
+}
 
+src_prepare() {
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
 
-src_compile() {
+src_configure() {
 	export LDCONFIG=/bin/true
 
 	# XXX: should check out these flags too:
@@ -116,6 +117,9 @@ src_compile() {
 		|| die "configure failed"
 
 	emake -j1 depend || die "depend"
+}
+
+src_compile() {
 	emake all || die "all"
 }
 
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 7cee4770cd15..58727c2787e7 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.29 2009/01/21 08:52:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.30 2009/01/24 15:05:06 vapier Exp $
 
 EAPI="2"
 
@@ -24,7 +24,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 xml +X"
+IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -78,13 +78,14 @@ src_unpack() {
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
-	cd "${S}"
+}
 
+src_prepare() {
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
 
-src_compile() {
+src_configure() {
 	export LDCONFIG=/bin/true
 
 	# XXX: should check out these flags too:
@@ -116,6 +117,9 @@ src_compile() {
 		|| die "configure failed"
 
 	emake -j1 depend || die "depend"
+}
+
+src_compile() {
 	emake all || die "all"
 }