Remove support for 32-bit install

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

4 files changed, 18 insertions, 127 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/Manifest b/www-plugins/mplayerplug-in/Manifest
index a96c38b871ee..25db60f5319c 100644
--- a/www-plugins/mplayerplug-in/Manifest
+++ b/www-plugins/mplayerplug-in/Manifest
@@ -1,6 +1,3 @@
------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
@@ -10,14 +7,7 @@ AUX mplayerplug-in-xulrunner-config-in.patch 5391 RMD160 c00f52dd9045ad6dd061fa4
 AUX mplayerplug-in_xulrunner-1.9.patch 1159 RMD160 4999a043cb3b670b93f583c1aac0acf648662d69 SHA1 f1ac5d22f655aa5c10407353b41d660d54d935c6 SHA256 37581f5b52860442ce4e4f58220f193f2488ec2897e0519b4ec41d1aa7a56b98
 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 3919 RMD160 9ea16be1723186863414e0674fd5cebeaa61634e SHA1 2420c46d8f5cbe39fe64c0ac478e6090a908d041 SHA256 a359ed64b62ab5d6e5213055db0de0fee51ebce10bd6ae32de6ca5d8d8a87b4a
-EBUILD mplayerplug-in-3.55.ebuild 4204 RMD160 6e0432b6b1ab031dbb311fa42d893e722b26b3d1 SHA1 05cf9628435d1c2b1cf665a35e8d9b2ad937cd50 SHA256 ad70a45101be7a0562ce2df4b2dfcb70ec8845dd6c574157861bee109ff9eecc
-MISC ChangeLog 19182 RMD160 ccccdea9f24e76d6cbad9f19c719d848a3a0bd74 SHA1 f33a4cb0afd327b1a5236027e8386d66f59d8b73 SHA256 704c24e530ed64fad08ab65f1b0a263eb9d7be213eb6ce78bd07e67688aa4eb4
+EBUILD mplayerplug-in-3.50.ebuild 2667 RMD160 d6cfab79d3adecdddc2bb3a907a9c3118b11e91b SHA1 c948efd16f2eebc8af70bb04952af0f923e4c357 SHA256 d8aa8ba7918e08480991ba430cd98d8bb89bbe73832c2b5c23b396b3c04e1135
+EBUILD mplayerplug-in-3.55-r1.ebuild 2857 RMD160 e0fd81cdbc943fc6113de459e2419271679e81cf SHA1 222086b3158647d06f077747aeed80296a02d0d9 SHA256 b8aaf64afcd12701505fe2e26ff9f909549a0ca346f068a0645fc70a99dd5a92
+MISC ChangeLog 19400 RMD160 d297823a7fd374546c66019c0ce2f5ddb3ff8e5a SHA1 ff928b289d3f145b3b73d1f39c6d06e0cc2f2226 SHA256 38635f47c2f2b0fdcbaf5f2138ddd5bdc9bdafce30be55e003289180cbaabba3
 MISC metadata.xml 484 RMD160 10cb6522943293a3f18bd8ff4a4c741c5b8cd0ff SHA1 6b21b9c86fa0d3868a4c3cd7deadaf0330732a43 SHA256 05564b260deb500bf9c0ee6e9038ffdf3e6f84b4ed58b84331ea67e03dd997f1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAknfY8YACgkQOeoy/oIi7uzkmACg6b0BuO7kJqG5YS2A1lmdaVCY
-7uQAoKO6ngIGMbIoW6uA5BI2n0ypZbpA
-=YbZh
------END PGP SIGNATURE-----
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
 }