revert previous commit

Package-Manager: portage-2.1

4 files changed, 22 insertions, 44 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index c5bfb7dc48fa..4329e6d6c7b3 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,10 +1,6 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.144 2006/06/10 22:39:15 eradicator Exp $
-
-  10 Jun 2006; Jeremy Huddleston <eradicator@gentoo.org> wine-0.9.10.ebuild,
-  wine-0.9.15.ebuild:
-  Fixed to compile properly on amd64 with eselect-compiler. Closes bug #128772.
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.145 2006/06/10 22:52:19 vapier Exp $
 
 *wine-0.9.15 (09 Jun 2006)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 273f207d7da1..b6fcc769e66b 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -104,10 +104,10 @@ EBUILD wine-0.9.1.ebuild 4161 RMD160 f7138f6592011e0255c2ff00fd9fb2f737c6b68c SH
 MD5 61beb6308c5939d8868885bd01f81227 wine-0.9.1.ebuild 4161
 RMD160 f7138f6592011e0255c2ff00fd9fb2f737c6b68c wine-0.9.1.ebuild 4161
 SHA256 1e938dc1fa681a24126e5aa334dc73e3a02a5410781bbea641d5fbf0ca61401e wine-0.9.1.ebuild 4161
-EBUILD wine-0.9.10.ebuild 3674 RMD160 9ae7dea62d17d80befecacc4e7423bb927ae6278 SHA1 5a7b7a6cbda5a5803a9e6f64b0d5478574dccfb5 SHA256 6522d720b010ed3fa362aaac34e84900176aa5371ca3200f6b181b36b01d5115
-MD5 0869a39829637a18236b454b9a33df72 wine-0.9.10.ebuild 3674
-RMD160 9ae7dea62d17d80befecacc4e7423bb927ae6278 wine-0.9.10.ebuild 3674
-SHA256 6522d720b010ed3fa362aaac34e84900176aa5371ca3200f6b181b36b01d5115 wine-0.9.10.ebuild 3674
+EBUILD wine-0.9.10.ebuild 3489 RMD160 1a171b650c151d05b6d72686bec7c250c45efebf SHA1 8f2c639aa9582f6984a9390daa1b652222b39dd2 SHA256 5e29c49a2d782a98b9183bebfd85afa3389ba8103b37127f2bfc0aa24e364750
+MD5 412680e229e442e8091769c3c23ea199 wine-0.9.10.ebuild 3489
+RMD160 1a171b650c151d05b6d72686bec7c250c45efebf wine-0.9.10.ebuild 3489
+SHA256 5e29c49a2d782a98b9183bebfd85afa3389ba8103b37127f2bfc0aa24e364750 wine-0.9.10.ebuild 3489
 EBUILD wine-0.9.11.ebuild 3568 RMD160 c3c8bd1b737c86356bd27bd7bcf3fb19b01f9f88 SHA1 2023a45792af2abde8a3728f7fdb390b82f0171c SHA256 d569beed9f2ebdc6baff72538d187ec41910d461d6fec9512661c649a24f33ba
 MD5 0255c8689ab8318c63d22c0f4bbd379d wine-0.9.11.ebuild 3568
 RMD160 c3c8bd1b737c86356bd27bd7bcf3fb19b01f9f88 wine-0.9.11.ebuild 3568
@@ -124,10 +124,10 @@ EBUILD wine-0.9.14.ebuild 3504 RMD160 d5c8d844063f087c7d57546e817743ac523b2607 S
 MD5 f4529ad5ee3a65bec4e6012c1bcd9feb wine-0.9.14.ebuild 3504
 RMD160 d5c8d844063f087c7d57546e817743ac523b2607 wine-0.9.14.ebuild 3504
 SHA256 78e15296858a473a146ff83cddfd7085faa64b496995b5221fdb4969727dd6af wine-0.9.14.ebuild 3504
-EBUILD wine-0.9.15.ebuild 3865 RMD160 e7e3bf3a2d0f5ecd1ca49b262d605c31375d9f19 SHA1 1d29c7bf53b5a68c30879c502cddcbf9c2ac063f SHA256 0e90b41a772bbdb4e626128c8d188a777ef73f3fe275ac0d2a47f356c3f13e33
-MD5 c83e5f43c3db68c66f2a9b0c6ab69324 wine-0.9.15.ebuild 3865
-RMD160 e7e3bf3a2d0f5ecd1ca49b262d605c31375d9f19 wine-0.9.15.ebuild 3865
-SHA256 0e90b41a772bbdb4e626128c8d188a777ef73f3fe275ac0d2a47f356c3f13e33 wine-0.9.15.ebuild 3865
+EBUILD wine-0.9.15.ebuild 3545 RMD160 9c75fafec3b29844898d4ff808c7be20079e3c0b SHA1 7eaa62aea571c753092569783f729e8ac4b3fb9a SHA256 5ed50840595183113b55478b39ff86ef4d8fbb7d63eba86a30ab76c6f1a3dde3
+MD5 6c600ecba85953e8da3d7d5957e4f239 wine-0.9.15.ebuild 3545
+RMD160 9c75fafec3b29844898d4ff808c7be20079e3c0b wine-0.9.15.ebuild 3545
+SHA256 5ed50840595183113b55478b39ff86ef4d8fbb7d63eba86a30ab76c6f1a3dde3 wine-0.9.15.ebuild 3545
 EBUILD wine-0.9.2.ebuild 4161 RMD160 32af02785815020bd693318786246cd46ea8107b SHA1 dd7227f031650079f361acd77b55e7b13761ee29 SHA256 aa516a61dd7eaa622a5b0e8cd74646371371f13a2118cf6989f88eb7a75e2268
 MD5 0e8a939a0799b82181ee17f084caf7eb wine-0.9.2.ebuild 4161
 RMD160 32af02785815020bd693318786246cd46ea8107b wine-0.9.2.ebuild 4161
@@ -208,10 +208,10 @@ EBUILD wine-9999.ebuild 3523 RMD160 0181971699654ce130406ef82eed75021f4951c1 SHA
 MD5 16ce84a9773603dbe63a7218befa7b79 wine-9999.ebuild 3523
 RMD160 0181971699654ce130406ef82eed75021f4951c1 wine-9999.ebuild 3523
 SHA256 e08dfbc889806d6eb63eda6d255f29afb2921123703cd04682533e817f60e182 wine-9999.ebuild 3523
-MISC ChangeLog 27251 RMD160 e5e3170c69daa8420a22b2d8f1c36838f6db566f SHA1 b65020f2f8645af2a8e2808bd6f568edde663efb SHA256 17ab7022758afee542ad8b5b2f4f498a0e93b50d9cea06e58a9aa1122da62d80
-MD5 807b406c5a3ad9e98461be0caa6bc371 ChangeLog 27251
-RMD160 e5e3170c69daa8420a22b2d8f1c36838f6db566f ChangeLog 27251
-SHA256 17ab7022758afee542ad8b5b2f4f498a0e93b50d9cea06e58a9aa1122da62d80 ChangeLog 27251
+MISC ChangeLog 27067 RMD160 4986a736509c507545d208f17cd8f19796db26aa SHA1 3339fd4dec87ad460e2b9dbf4a7f520a852e9056 SHA256 8fa9fd354506b2573a86e6f0854a045690810d1e96ff7d33f60215e6cb9b82b3
+MD5 6dbe410d2cd4ac049b00ac0e6d938c93 ChangeLog 27067
+RMD160 4986a736509c507545d208f17cd8f19796db26aa ChangeLog 27067
+SHA256 8fa9fd354506b2573a86e6f0854a045690810d1e96ff7d33f60215e6cb9b82b3 ChangeLog 27067
 MISC metadata.xml 791 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de SHA1 331dfb5419d6b26502b33bc4e00a2fa4b3301a1a SHA256 6ad20d106c155d738b1ac41ccdb5ee8495c42129fd53308e641414e345d7e018
 MD5 78959654c62738e9d3ff3302e974d98a metadata.xml 791
 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de metadata.xml 791
@@ -300,7 +300,7 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEi0oeOpjtAl+gMRURAj3zAKDDanc2e3rW4jaiFvtdo0aSabXXMgCgxil6
-ojRYgj/xl+uGVmYiLgXVGO4=
-=QJmI
+iD8DBQFEi04k2+ySkm8kpY0RAv1cAJ9XilPnMbTxBB1WJ8X0to9TztzWHgCfbm1c
+VKHaYKmL/7smMTgyrhIqcb4=
+=b64+
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-0.9.10.ebuild b/app-emulation/wine/wine-0.9.10.ebuild
index dcd55ee019d9..65cb24fff30f 100644
--- a/app-emulation/wine/wine-0.9.10.ebuild
+++ b/app-emulation/wine/wine-0.9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.10.ebuild,v 1.4 2006/06/10 22:39:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.10.ebuild,v 1.5 2006/06/10 22:52:19 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -60,15 +60,7 @@ DEPEND="${RDEPEND}
 	sys-devel/flex"
 
 pkg_setup() {
-	if use amd64 ; then
-		has_multilib_profile || die "Your profile does not support compilation of wine."
-
-		export ABI=x86
-		if has_version app-admin/eselect-compiler ; then
-			CHOST=$(get_abi_CHOST ${ABI})
-			CBUILD=${CHOST}
-		fi
-	fi
+	use amd64 && has_multilib_profile && export ABI=x86
 }
 
 src_unpack() {
diff --git a/app-emulation/wine/wine-0.9.15.ebuild b/app-emulation/wine/wine-0.9.15.ebuild
index 1de833f11dfe..0046377c3fa6 100644
--- a/app-emulation/wine/wine-0.9.15.ebuild
+++ b/app-emulation/wine/wine-0.9.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.15.ebuild,v 1.2 2006/06/10 22:39:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.15.ebuild,v 1.3 2006/06/10 22:52:19 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -60,6 +60,9 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex"
 
+# this will not build as 64bit code
+export ABI=x86
+
 src_unpack() {
 	unpack wine-${PV}.tar.bz2
 	cd "${S}"
@@ -102,19 +105,6 @@ src_compile() {
 
 	strip-flags
 
-	if use amd64 ; then
-		# If we don't want --enable-win64, then we need override the
-		# toolchain.  If we do --enable-win64, then configure takes
-		# care of it for us
-
-		export CHOST="i686-pc-linux-gnu"
-		export CBUILD="${CHOST}"
-
-		# This should be handled by eselect-binutils in the future:
-		export LD="$(tc-getLD) -m elf_i386"
-		export AS="$(tc-getAS) --32"
-	fi
-
 	#	$(use_enable amd64 win64)
 	econf \
 		CC="$(tc-getCC)" \