Remove support for 32-bit install

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 15 insertions, 114 deletions

diff --git a/www-plugins/mplayerplug-in/ChangeLog b/www-plugins/mplayerplug-in/ChangeLog
index 35a61f08e56d..e5ebacf96412 100644
--- a/www-plugins/mplayerplug-in/ChangeLog
+++ b/www-plugins/mplayerplug-in/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-plugins/mplayerplug-in
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/mplayerplug-in/ChangeLog,v 1.1 2009/04/10 15:19:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/mplayerplug-in/ChangeLog,v 1.2 2009/05/29 21:04:47 beandog Exp $
+
+*mplayerplug-in-3.55-r1 (29 May 2009)
+
+  29 May 2009; Steve Dibb <beandog@gentoo.org> mplayerplug-in-3.50.ebuild,
+  -mplayerplug-in-3.55.ebuild, +mplayerplug-in-3.55-r1.ebuild:
+  Remove support for 32-bit install
 
   10 Apr 2009; Ulrich Mueller <ulm@gentoo.org>
   +files/mplayerplug-in-3.40-cflags.patch, +files/mplayerplug-in-gcc4.patch,
diff --git a/www-plugins/mplayerplug-in/mplayerplug-in-3.50.ebuild b/www-plugins/mplayerplug-in/mplayerplug-in-3.50.ebuild
index fcdef3fe862c..857abf15948b 100644
--- a/www-plugins/mplayerplug-in/mplayerplug-in-3.50.ebuild
+++ b/www-plugins/mplayerplug-in/mplayerplug-in-3.50.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/www-plugins/mplayerplug-in/mplayerplug-in-3.50.ebuild,v 1.1 2009/04/10 15:19:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/mplayerplug-in/mplayerplug-in-3.50.ebuild,v 1.2 2009/05/29 21:04:47 beandog Exp $
 
 inherit eutils multilib autotools
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 -hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="gtk divx firefox gmedia multilib nls quicktime realmedia seamonkey wmp xulrunner"
+IUSE="gtk divx firefox gmedia 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
@@ -29,16 +29,9 @@ RDEPEND=">=media-video/mplayer-1.0_pre5
 			>=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"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
@@ -61,35 +54,6 @@ src_compile() {
 		myconf="${myconf} --enable-x"
 	fi
 
-	# Build the 32bit plugin
-	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"
-
-		# Save the 32bit plugins
-		mkdir lib32
-		mv mplayerplug-in*.so lib32
-		mv mplayerplug-in*.xpt lib32
-		ABI="${oldabi}"
-		emake -j1 clean || die "emake clean failed"
-
-		einfo "Building 64-bit plugin"
-	fi
-
 	# Media Playback Support (bug #145517)
 	econf \
 		${myconf} \
@@ -117,21 +81,6 @@ src_install() {
 		fi
 	done
 
-	if use amd64 && has_multilib_profile; then
-		oldabi="${ABI}"
-		ABI="x86"
-		exeinto /usr/$(get_libdir)/${plugindir}
-		insinto /usr/$(get_libdir)/${plugindir}
-
-		for plugin in ${PLUGINS}; do
-			if [ -e "mplayerplug-${plugin}.so" ]; then
-				doexe "lib32/mplayerplug-${plugin}.so" || die "plugin mplayerplug-${plugin} failed"
-				doins "lib32/mplayerplug-${plugin}.xpt" || die "plugin mplayerplug-${plugin} xpt failed"
-			fi
-		done
-		ABI="${oldabi}"
-	fi
-
 	if use nls; then
 		local WANT_LANGS
 		for X in ${LANGS}; do
diff --git a/www-plugins/mplayerplug-in/mplayerplug-in-3.55.ebuild b/www-plugins/mplayerplug-in/mplayerplug-in-3.55-r1.ebuild
index 22d6f9b12e50..bf1c49bdb69d 100644
--- a/www-plugins/mplayerplug-in/mplayerplug-in-3.55.ebuild
+++ b/www-plugins/mplayerplug-in/mplayerplug-in-3.55-r1.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/www-plugins/mplayerplug-in/mplayerplug-in-3.55.ebuild,v 1.1 2009/04/10 15:19:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/mplayerplug-in/mplayerplug-in-3.55-r1.ebuild,v 1.1 2009/05/29 21:04:47 beandog Exp $
 
 inherit eutils multilib autotools flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 -hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk divx firefox gmedia multilib nls quicktime realmedia seamonkey wmp xulrunner"
+IUSE="gtk divx firefox gmedia 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"
 IUSE="${IUSE} $(printf 'linguas_%s ' ${LANGS})"
@@ -29,14 +29,7 @@ RDEPEND=">=media-video/mplayer-1.0_pre5
 		>=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"
 
 pkg_setup() {
 	### Mozilla Firefox 3.0 doesn't install the pkg config files
@@ -87,27 +80,6 @@ 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
-		einfo "Building 32-bit plugin"
-
-		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
-
-		multilib_toolchain_setup ${oldabi}
-		emake -j1 clean || die "emake clean failed"
-
-		einfo "Building 64-bit plugin"
-	fi
-
 	_src_compile
 }
 
@@ -125,34 +97,8 @@ src_install() {
 		fi
 	done
 
-	if use amd64 && has_multilib_profile; then
-		oldabi="${ABI}"
-		ABI="x86"
-		exeinto /usr/$(get_libdir)/${plugindir}
-		insinto /usr/$(get_libdir)/${plugindir}
-
-		for plugin in ${PLUGINS}; do
-			if [ -e "mplayerplug-${plugin}.so" ]; then
-				doexe "lib32/mplayerplug-${plugin}.so" || die "plugin mplayerplug-${plugin} failed"
-				doins "lib32/mplayerplug-${plugin}.xpt" || die "plugin mplayerplug-${plugin} xpt failed"
-			fi
-		done
-		ABI="${oldabi}"
-	fi
-
-	if use nls; then
-		local WANT_LANGS
-		for X in ${LANGS}; do
-			if use linguas_${X}; then
-				WANT_LANGS="${WANT_LANGS} ${X}"
-			fi
-		done
-		emake -C po LANGUAGES="${WANT_LANGS# }" DESTDIR="${D}" install \
-			|| die "Translation installation failed"
-	fi
-
 	insinto /etc
 	doins mplayerplug-in.conf
 
-	dodoc ChangeLog INSTALL README DOCS/tech/*.txt
+	dodoc ChangeLog README
 }