Cleanup multilib handling in src_compile.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 69 insertions, 60 deletions

diff --git a/net-www/mplayerplug-in/ChangeLog b/net-www/mplayerplug-in/ChangeLog
index 6e2a6dcba4d0..f27429d74a32 100644
--- a/net-www/mplayerplug-in/ChangeLog
+++ b/net-www/mplayerplug-in/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/mplayerplug-in
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.112 2008/09/19 06:09:01 josejx Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.113 2009/03/09 00:19:04 vapier Exp $
+
+  09 Mar 2009; Mike Frysinger <vapier@gentoo.org>
+  mplayerplug-in-3.55.ebuild:
+  Cleanup multilib handling in src_compile.
 
 *mplayerplug-in-3.55 (19 Sep 2008)
 
diff --git a/net-www/mplayerplug-in/Manifest b/net-www/mplayerplug-in/Manifest
index 461f0c993302..ea330764e4da 100644
--- a/net-www/mplayerplug-in/Manifest
+++ b/net-www/mplayerplug-in/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mplayerplug-in-3.40-cflags.patch 662 RMD160 fd888c192db5c19209895d592e9b60be01e07c50 SHA1 6546337c488adb3f22e512e085aa2a80fe7fef20 SHA256 e08de6a6d285defc5644af50a692303fb83b8d14c62f7742764f6773eee5194b
 AUX mplayerplug-in-3.50-seamonkey.patch 678 RMD160 c0e78c924738cd262d2a69021f6861b76feddc56 SHA1 3617ad7aa47a8735f22bdd7fbab14e2c6ec877b8 SHA256 e691dcb0f50f7a0ea5bdc5a8fbb94f90067035c57831140026729179c91dca26
 AUX mplayerplug-in-3.55-gcc4.patch 425 RMD160 37faee824abbbdbd511b9c450d920751f64e025a SHA1 b7713da070a777ed34fef1f4d42ca5d36aa8b0e4 SHA256 33a9c591aaa157f37303019ec826e1bb31c35aa76e5c59279508888606b3fc5b
@@ -8,6 +11,13 @@ AUX mplayerplug-in_xulrunner-1.9.patch 1159 RMD160 4999a043cb3b670b93f583c1aac0a
 DIST mplayerplug-in-3.50.tar.gz 452730 RMD160 6eb61df0c06e1b9f6118be4f75bf05648bb8dbd8 SHA1 54e5d7a3b33f503830183545f7bc278d37cb89d5 SHA256 046b8e65ee4e4568453b7749d7e60f521a87c2f9990f46d021da283e285f4c02
 DIST mplayerplug-in-3.55.tar.gz 281845 RMD160 e01224b14883a93211745be0a329a3f524f39d8c SHA1 69726d4e16523b1a39c284efee081c31b0ea7f7f SHA256 ba5affde4c5d5a89c8bf987ae9326daabbf8ea8279fccd589474e5157fc67b7e
 EBUILD mplayerplug-in-3.50.ebuild 3921 RMD160 e50ba9732ae251ad38915014e3ad88f4bfc40362 SHA1 9b0c1840252185afe5c3a6ec09ce12065f747888 SHA256 ba2c924424b4b835b5250ae4557e7bf3f62dab09c547531d7ab6eb8a3ebe2f63
-EBUILD mplayerplug-in-3.55.ebuild 4390 RMD160 ed54c4514ce38cf3a99cb13236409a582bb6f5ea SHA1 94a675b7789da60660aa0920a938b421455eff5c SHA256 741da1ace0d867e929bf7ad7e676d7b98eb772b3b1bca1d2f180c9d11718b9f4
-MISC ChangeLog 18568 RMD160 1572eda591523c2ffbfd491a618517783e08d939 SHA1 2e5fcd6a32ffb3e3b6162f82c0411ae04a106f08 SHA256 02266293d16f8c75379dded283cdcee8f69db3285a6d1b8c81f21d5a6cbffa1b
+EBUILD mplayerplug-in-3.55.ebuild 4203 RMD160 de4b0ccd84f441083627f449661ad9ac8af1d4ac SHA1 6dfefa6d5e6a15c58249ed38f9965365ad547a91 SHA256 5faa92bbccde8ef4d2b3189e8b8e45a76197eb3be4e9f10fae8400e08e03b9e5
+MISC ChangeLog 18693 RMD160 0db40615bac6ad4908f9f24684a1659962075dfc SHA1 ed46cafa99413c0ee00114cfe72d060dc3d05111 SHA256 f490fb4ed101b98816735ddb35d4f11186654c2a69480253f57dcdcc4dfc7932
 MISC metadata.xml 484 RMD160 10cb6522943293a3f18bd8ff4a4c741c5b8cd0ff SHA1 6b21b9c86fa0d3868a4c3cd7deadaf0330732a43 SHA256 05564b260deb500bf9c0ee6e9038ffdf3e6f84b4ed58b84331ea67e03dd997f1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkm0YH4ACgkQn/5bYzqsSmHB9gCfe7MjGUaaiiIVxaxroR/wWBAb
+6K0AoIMSyhfRsI6syHDrL6WARJzWx6AQ
+=K+gO
+-----END PGP SIGNATURE-----
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.55.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.55.ebuild
index 901a1ee0a22b..a76127716a16 100644
--- a/net-www/mplayerplug-in/mplayerplug-in-3.55.ebuild
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.55.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.55.ebuild,v 1.1 2008/09/19 06:09:01 josejx Exp $
-
-WANT_AUTOCONF="latest"
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.55.ebuild,v 1.2 2009/03/09 00:19:04 vapier Exp $
 
 inherit eutils multilib autotools flag-o-matic
 
@@ -16,29 +14,29 @@ KEYWORDS="~alpha ~amd64 -hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gtk divx firefox gmedia multilib nls quicktime realmedia seamonkey wmp xulrunner"
 
 LANGS="cs da de en_US es fr hu it ja ko nb nl pl pt_BR ru sk se tr wa zh_CN"
-for X in ${LANGS}; do IUSE="${IUSE} linguas_${X}"; done
+IUSE="${IUSE} $(printf 'linguas_%s ' ${LANGS})"
 
 RDEPEND=">=media-video/mplayer-1.0_pre5
-		xulrunner? ( net-libs/xulrunner )
-		!xulrunner? ( firefox? ( www-client/mozilla-firefox ) )
-		!xulrunner? ( !firefox? ( seamonkey? ( =www-client/seamonkey-1* ) ) )
-		x11-libs/libXpm
-		x11-proto/xextproto
-		gtk? (
-			>=x11-libs/gtk+-2.2.0
-			dev-libs/atk
-			>=dev-libs/glib-2.2.0
-			>=x11-libs/pango-1.2.1
-		)"
+	xulrunner? ( net-libs/xulrunner )
+	!xulrunner? ( firefox? ( www-client/mozilla-firefox ) )
+	!xulrunner? ( !firefox? ( seamonkey? ( =www-client/seamonkey-1* ) ) )
+	x11-libs/libXpm
+	x11-proto/xextproto
+	gtk? (
+		>=x11-libs/gtk+-2.2.0
+		dev-libs/atk
+		>=dev-libs/glib-2.2.0
+		>=x11-libs/pango-1.2.1
+	)"
 DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		multilib? (
-				amd64? (
-					app-emulation/emul-linux-x86-xlibs
-					app-emulation/emul-linux-x86-baselibs
-					app-emulation/emul-linux-x86-gtklibs
-				)
-		)"
+	dev-util/pkgconfig
+	multilib? (
+		amd64? (
+			app-emulation/emul-linux-x86-xlibs
+			app-emulation/emul-linux-x86-baselibs
+			app-emulation/emul-linux-x86-gtklibs
+		)
+	)"
 
 pkg_setup() {
 	### Mozilla Firefox 3.0 doesn't install the pkg config files
@@ -60,10 +58,7 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
-	# Add -fno-strict-aliasing to ensure correct compilation
-	append-flags -fno-strict-aliasing
-
+_src_compile() {
 	local myconf
 
 	# We force gtk2 now because moz only compiles against gtk2
@@ -74,46 +69,46 @@ src_compile() {
 		myconf="${myconf} --enable-x"
 	fi
 
+	# Media Playback Support (bug #145517)
+	econf \
+		${myconf} \
+		"$@" \
+		$(use_enable divx dvx) \
+		$(use_enable gmedia gmp) \
+		$(use_enable realmedia rm) \
+		$(use_enable quicktime qt) \
+		$(use_enable wmp) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_compile() {
+	# Add -fno-strict-aliasing to ensure correct compilation
+	append-flags -fno-strict-aliasing
+
 	# Build the 32bit plugin
-	if use amd64 && has_multilib_profile; then
+	if use amd64 && has_multilib_profile ; then
 		einfo "Building 32-bit plugin"
-		oldabi="${ABI}"
-		ABI="x86"
-		econf \
-			${myconf} \
-			--x-libraries=/usr/lib32/ \
-			--enable-x86_64 \
-			${myconf2} \
-			$(use_enable divx dvx) \
-			$(use_enable gmedia gmp) \
-			$(use_enable realmedia rm) \
-			$(use_enable quicktime qt) \
-			$(use_enable wmp) \
-			|| die "econf failed"
-
-		emake || die "emake failed"
+
+		local oldabi=${ABI}
+		multilib_toolchain_setup x86
+		_src_compile \
+			--x-libraries=/usr/$(get_libdir) \
+			--enable-force32
 
 		# Save the 32bit plugins
 		mkdir lib32
 		mv mplayerplug-in*.so lib32
 		mv mplayerplug-in*.xpt lib32
-		ABI="${oldabi}"
+
+		multilib_toolchain_setup ${oldabi}
 		emake -j1 clean || die "emake clean failed"
 
 		einfo "Building 64-bit plugin"
 	fi
 
-	# Media Playback Support (bug #145517)
-	econf \
-		${myconf} \
-		$(use_enable divx dvx) \
-		$(use_enable gmedia gmp) \
-		$(use_enable realmedia rm) \
-		$(use_enable quicktime qt) \
-		$(use_enable wmp) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
+	_src_compile
 }
 
 src_install() {