Added workaround so duplicate 32bit wrappers are not installed (or more precicely, immediately removed) for multilib systems which may have identical 32bit and 64bit plugins installed simultaneously, such as >=net-www/netscape-flash-10.0.22.87

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

4 files changed, 58 insertions, 29 deletions

diff --git a/net-www/nspluginwrapper/ChangeLog b/net-www/nspluginwrapper/ChangeLog
index 6a81859a1a4c..340fb7ae3e42 100644
--- a/net-www/nspluginwrapper/ChangeLog
+++ b/net-www/nspluginwrapper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/nspluginwrapper
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/ChangeLog,v 1.25 2009/02/03 00:05:59 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/ChangeLog,v 1.26 2009/02/25 19:22:44 lack Exp $
+
+  25 Feb 2009; Jim Ramsay <lack@gentoo.org> nspluginwrapper-1.0.0.ebuild,
+  nspluginwrapper-1.2.2.ebuild:
+  Added workaround so duplicate 32bit wrappers are not installed (or more
+  precicely, immediately removed) for multilib systems which may have
+  identical 32bit and 64bit plugins installed simultaneously, such as
+  >=net-www/netscape-flash-10.0.22.87
 
   03 Feb 2009; Patrick McLean <chutzpah@gentoo.org>
   nspluginwrapper-1.2.2.ebuild:
diff --git a/net-www/nspluginwrapper/Manifest b/net-www/nspluginwrapper/Manifest
index f4cf266dcac3..4c3aea380fa7 100644
--- a/net-www/nspluginwrapper/Manifest
+++ b/net-www/nspluginwrapper/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX nspluginwrapper-1.1.0-quiet-64bit-plugin-warnings.patch 567 RMD160 5bb8443a462de16ece2d94bc4b2f0b0ad06c97fe SHA1 dae3cadf82aa577080a0e680ec005086632c0d61 SHA256 62901e936c70567237422c2293c4ed4fc83f4b6189c310a380cb228e9bb38e63
 DIST nspluginwrapper-1.0.0.tar.bz2 271028 RMD160 d3b5a5d1dd314e5331ffc877fb9621d6566087c6 SHA1 ef551fb508835b3358355477be794a34e9f64135 SHA256 e5c4661eb91d05fc3da2f4ccf6e0769e8cd097ac232ffc6afe16e645729a02d5
 DIST nspluginwrapper-1.2.2.tar.bz2 327947 RMD160 d5aa265966f87c51bb9ea4f2a079a87b74fdcbf3 SHA1 be581c39dcc1a8d9a5b3f81e4650f553a30cf249 SHA256 4e6cbb7aeda1c9f0d6e5a17e729160b5d3f3e7048f90353238806289752175c3
-EBUILD nspluginwrapper-1.0.0.ebuild 1959 RMD160 349baa0220bf9fed5553fe22c005ffece334459d SHA1 ed4194b5cbb674d9a14f8cea911a476411f450d7 SHA256 cca609775cf6b28bb8ea5be214ee367dddcbd90687880ce86cc492c1e04c39d7
-EBUILD nspluginwrapper-1.2.2.ebuild 1927 RMD160 4f042eefe9dd29c9e37cf2a1e38c80d7ebcaea46 SHA1 adb30a4a5f3826cc1056aa3efb4a8acb496704de SHA256 1e2a6f4dabdb6c25ff0da07e594593fed9bac13d3abeb64d7dbb2a3527b2935f
-MISC ChangeLog 5675 RMD160 81346bacfcc030fb5530621e7a4df90088a88c5c SHA1 196292759714766cea7d3b075f2d953dde559719 SHA256 4e358f34a5e35122de7bc25048cefb5c2a27084abb01ba865b201b9c53ddc2ac
+EBUILD nspluginwrapper-1.0.0.ebuild 2397 RMD160 633c1d09a7942bc28a61c2c1d558cfeb6770be21 SHA1 2e305109c43e6b0d227cb77c237ffc293fdb19fc SHA256 599867c5b994a4d07c9c0654cb385e806fedabf0eaa63ed67afb1accdfc83853
+EBUILD nspluginwrapper-1.2.2.ebuild 2384 RMD160 b887878cfbdca4c2e39731d98102d25bd756872e SHA1 fd8732be285b0c1e8993e80f7a5347122aaed736 SHA256 ce37487b586a4b9fcc09560a250e2395cee9faf870125c7fdc6371a7917d56dd
+MISC ChangeLog 6030 RMD160 38c6de4efe6520da45e9de6c1b567e183cb688ef SHA1 25306fd4ae5f573b1c720f6a547fb8a1c8fbf82f SHA256 43e6cefd101daf18d88fda010140d842f37296ff45d4fb6d3c45547535907547
 MISC metadata.xml 253 RMD160 37a89adccd0388cf014f6768a21b1ec09252d21c SHA1 fa43576fb2327afb837b5b2ea57dc6ab8525494b SHA256 0b0d878d1f93316b2966ec90c1f80c46fe67fb3f5647b28f7c30d9647dbb1854
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmHiloACgkQWt/XSf2CZdnJzQCgj/nIHO1agmeUTfEMqKmTDR0h
-JgYAn11wGVzzcw/McomHypkNsd4PHrao
-=gqOv
------END PGP SIGNATURE-----
diff --git a/net-www/nspluginwrapper/nspluginwrapper-1.0.0.ebuild b/net-www/nspluginwrapper/nspluginwrapper-1.0.0.ebuild
index 21610edc5073..093f72750fb7 100644
--- a/net-www/nspluginwrapper/nspluginwrapper-1.0.0.ebuild
+++ b/net-www/nspluginwrapper/nspluginwrapper-1.0.0.ebuild
@@ -1,6 +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/nspluginwrapper/nspluginwrapper-1.0.0.ebuild,v 1.2 2008/10/02 03:16:56 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/nspluginwrapper-1.0.0.ebuild,v 1.3 2009/02/25 19:22:44 lack Exp $
 
 inherit eutils nsplugins flag-o-matic multilib
 
@@ -20,6 +20,26 @@ RDEPEND=">=x11-libs/gtk+-2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+autoinstall() {
+	if [[ -x /usr/bin/${PN} ]]; then
+		einfo "Auto installing 32bit plugins..."
+		${PN} -a -i
+		ls /usr/lib64/nsbrowser/plugins
+
+		# Remove wrappers if equivalent 64-bit plugins exist
+		# TODO: May be better to patch nspluginwrapper so it doesn't create
+		#       duplicate wrappers in the first place...
+		local DIR64="${ROOT}/usr/lib64/nsbrowser/plugins/"
+		for f in "${DIR64}"/npwrapper.*.so; do
+			local PLUGIN=${f##*/npwrapper.}
+			if [[ -f ${DIR64}/${PLUGIN} ]]; then
+				einfo "  Removing duplicate wrapper for native 64-bit ${PLUGIN}"
+				${PN} -r "${f}"
+			fi
+		done
+	fi
+}
+
 src_compile() {
 	econf --with-biarch \
 		--with-lib32=$(ABI=x86 get_libdir) \
@@ -38,8 +58,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "Auto installing 32bit plugins..."
-	nspluginwrapper -a -i
+	autoinstall
 	elog "Any 32bit plugins you currently have installed have now been"
 	elog "configured to work in a 64bit browser. Any plugins you install in"
 	elog "the future will first need to be setup with:"
@@ -58,8 +77,5 @@ pkg_prerm() {
 }
 
 pkg_postrm() {
-	if [[ -x /usr/bin/nspluginwrapper ]]; then
-		einfo "Auto installing 32bit plugins..."
-		nspluginwrapper -a -i
-	fi
+	autoinstall
 }
diff --git a/net-www/nspluginwrapper/nspluginwrapper-1.2.2.ebuild b/net-www/nspluginwrapper/nspluginwrapper-1.2.2.ebuild
index 63d35aa0bb90..9c6138dadea3 100644
--- a/net-www/nspluginwrapper/nspluginwrapper-1.2.2.ebuild
+++ b/net-www/nspluginwrapper/nspluginwrapper-1.2.2.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/net-www/nspluginwrapper/nspluginwrapper-1.2.2.ebuild,v 1.2 2009/02/03 00:05:59 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/nspluginwrapper-1.2.2.ebuild,v 1.3 2009/02/25 19:22:44 lack Exp $
 
 inherit eutils nsplugins multilib
 
@@ -21,6 +21,26 @@ RDEPEND=">=x11-libs/gtk+-2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+autoinstall() {
+	if [[ -x /usr/bin/${PN} ]]; then
+		einfo "Auto installing 32bit plugins..."
+		${PN} -a -i
+		ls /usr/lib64/nsbrowser/plugins
+
+		# Remove wrappers if equivalent 64-bit plugins exist
+		# TODO: May be better to patch nspluginwrapper so it doesn't create
+		#       duplicate wrappers in the first place...
+		local DIR64="${ROOT}/usr/lib64/nsbrowser/plugins/"
+		for f in "${DIR64}"/npwrapper.*.so; do
+			local PLUGIN=${f##*/npwrapper.}
+			if [[ -f ${DIR64}/${PLUGIN} ]]; then
+				einfo "  Removing duplicate wrapper for native 64-bit ${PLUGIN}"
+				${PN} -r "${f}"
+			fi
+		done
+	fi
+}
+
 src_compile() {
 	econf --with-biarch \
 		--with-lib32=$(ABI=x86 get_libdir) \
@@ -41,8 +61,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "Auto installing 32bit plugins..."
-	${PN} -a -i
+	autoinstall
 	elog "Any 32bit plugins you currently have installed have now been"
 	elog "configured to work in a 64bit browser. Any plugins you install in"
 	elog "the future will first need to be setup with:"
@@ -61,8 +80,5 @@ pkg_prerm() {
 }
 
 pkg_postrm() {
-	if [[ -x /usr/bin/${PN} ]]; then
-		einfo "Auto installing 32bit plugins..."
-		${PN} --auto --install
-	fi
+	autoinstall
 }