Stabilize 1.2.2, add 1.2.2-r1 with gcc44 patch (bug #269250, thanks to hubertstar@gmail.com for patch).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 390 insertions, 9 deletions

diff --git a/www-plugins/nspluginwrapper/ChangeLog b/www-plugins/nspluginwrapper/ChangeLog
index bf60ab8bbda4..13bf957a8382 100644
--- a/www-plugins/nspluginwrapper/ChangeLog
+++ b/www-plugins/nspluginwrapper/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-plugins/nspluginwrapper
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.1 2009/04/09 21:06:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.2 2009/07/20 20:26:05 chutzpah Exp $
+
+*nspluginwrapper-1.2.2-r1 (20 Jul 2009)
+
+  20 Jul 2009; Patrick McLean <chutzpah@gentoo.org>
+  nspluginwrapper-1.2.2.ebuild, +nspluginwrapper-1.2.2-r1.ebuild,
+  +files/nspluginwrapper-1.2.2-gcc44.patch,
+  +files/nspluginwrapper-1.2.2-npidentifiers.patch:
+  Stabilize 1.2.2, add 1.2.2-r1 with gcc44 patch (bug #269250, thanks to
+  hubertstar@gmail.com for patch).
 
   09 Apr 2009; Ulrich Mueller <ulm@gentoo.org> +metadata.xml,
   +nspluginwrapper-1.0.0.ebuild, +nspluginwrapper-1.2.2.ebuild:
diff --git a/www-plugins/nspluginwrapper/Manifest b/www-plugins/nspluginwrapper/Manifest
index e1235078b628..5378e4d54e58 100644
--- a/www-plugins/nspluginwrapper/Manifest
+++ b/www-plugins/nspluginwrapper/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX nspluginwrapper-1.2.2-gcc44.patch 3085 RMD160 f6e8508449e66c80f5aad5d40233b0d941bf20d7 SHA1 14a2cea1f14f30bd6d9ce78f3dec21a704fd2998 SHA256 678b7f359fdca751e7a2a12de2cc06a1b4c650f57f204b580a400d54b061752e
+AUX nspluginwrapper-1.2.2-npidentifiers.patch 5839 RMD160 75cc5acd80b31b014c15149308b61aeb9193fc5d SHA1 c4efb846c429d958619b76abdd82e45d3e3dfa3f SHA256 8bb55b845017b60912c62c4abadc50a3f0397ddf470599b8453b97d9e69f8cd5
 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 2400 RMD160 c5eb90d99f1ffa6082a196af90a24a7e85b7f14f SHA1 dbee596e2c67ce76ba027ba3487b659fabd04d38 SHA256 1147c4670b7cdf28026fae04a33bcdb0e8d5cb4bee7b2dcf71b9727143eced2a
-EBUILD nspluginwrapper-1.2.2.ebuild 2387 RMD160 5da06cf279418e3431e8629b8f1c96e7251e944e SHA1 2f3aeb521c3939e27fc10c9ab00ca87048e11d54 SHA256 80aa699289b815491ef19dfc7e759bd8efeb06dcff8714aaa94f298326db72ed
-MISC ChangeLog 6248 RMD160 c28af37920a4099445701a3be19b9dd854ec7cce SHA1 62c9be3b12824c962afb56a7033e4d4fe90d1b7e SHA256 9237c7353e4d1bc6e6b4d26585f9cf8955873b87df2670082f1522b13519d4e3
+EBUILD nspluginwrapper-1.2.2-r1.ebuild 2567 RMD160 018c45e22a8bc3697edd1f5b73cb565bc51ad5d4 SHA1 4a4cba781bfb454afccb5637908c74ce848608df SHA256 6269fc0621885b0344a56cf7ac5679a30f288e116f11855fee7002bc13e64e71
+EBUILD nspluginwrapper-1.2.2.ebuild 2391 RMD160 b8db5ff9cb5a6c2583877a7b8b3775ad26ec6504 SHA1 d84a56652505af9578ad68bd955b0d6c23161ad8 SHA256 0656a04823aef66245e4f82cd810bdb6b5d86b82b4ce66abf0efd3a10af5d0bd
+MISC ChangeLog 6617 RMD160 9358be45e5f342b97cdcd18a7f47ffc367cbf051 SHA1 bf72fe360141a8e5a462cbb6c0172547b2081c22 SHA256 3f222611c1d24f4aa48cccfb847472573ee591347827f3538efd3c2bcb05ee6e
 MISC metadata.xml 253 RMD160 37a89adccd0388cf014f6768a21b1ec09252d21c SHA1 fa43576fb2327afb837b5b2ea57dc6ab8525494b SHA256 0b0d878d1f93316b2966ec90c1f80c46fe67fb3f5647b28f7c30d9647dbb1854
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkneY7EACgkQOeoy/oIi7uzZrQCfTKI18DGTbaxSzukQB7OTrM4P
-V5AAnjZefyByugfIrtAU+lN4dhznlMOG
-=eBKH
+iEYEARECAAYFAkpk0wAACgkQWt/XSf2CZdmtPACeMo+L1pcuuhkAY3b+7DELrdM0
+ETEAn1aOxzmVK73wAM+P0ioQbcg0Jgqj
+=DZ7U
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.2.2-gcc44.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.2.2-gcc44.patch
new file mode 100644
index 000000000000..e5d5007543c7
--- /dev/null
+++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.2.2-gcc44.patch
@@ -0,0 +1,98 @@
+diff -aur nspluginwrapper-1.2.2/Makefile nspluginwrapper-1.2.2-new/Makefile
+--- nspluginwrapper-1.2.2/Makefile	2009-01-02 16:54:10.000000000 +0800
++++ nspluginwrapper-1.2.2-new/Makefile	2009-06-26 20:20:20.866502278 +0800
+@@ -41,6 +41,8 @@
+ STRIP_OPT = -s
+ endif
+ 
++USE_SYSTEM_LIBS = 1
++
+ LN_S = ln -sf
+ 
+ ifeq ($(LD_soname),)
+@@ -79,6 +81,11 @@
+ ARCH_32 = $(ARCH)
+ ifeq ($(biarch), yes)
+ ARCH_32 = $(TARGET_ARCH)
++endif
++
++ifneq (1, $(USE_SYSTEM_LIBS))
++
++ifeq ($(biarch), yes)
+ LSB_LIBS = $(LSB_OBJ_DIR)/libc.so $(LSB_OBJ_DIR)/libgcc_s_32.so
+ LSB_LIBS += $(LSB_CORE_STUBS:%=$(LSB_OBJ_DIR)/%.so)
+ LSB_LIBS += $(LSB_CORE_STATIC_STUBS:%=$(LSB_OBJ_DIR)/%.a)
+@@ -92,6 +99,7 @@
+ LSB_CORE_STUBS = $(shell cat $(LSB_SRC_DIR)/core_filelist)
+ LSB_CORE_STATIC_STUBS = $(shell cat $(LSB_SRC_DIR)/core_static_filelist)
+ LSB_DESKTOP_STUBS = $(shell cat $(LSB_SRC_DIR)/desktop_filelist)
++endif
+ 
+ ifeq (i386,$(TARGET_ARCH))
+ TARGET_ELF_ARCH = elf32-i386
+@@ -116,10 +124,15 @@
+ npviewer_OBJECTS = $(npviewer_RAWSRCS:%.c=npviewer-%.o)
+ ifeq ($(biarch),yes)
+ npviewer_CFLAGS  = $(CFLAGS_32)
++ifneq (1, $(USE_SYSTEM_LIBS))
+ npviewer_CFLAGS += -I$(LSB_INC_DIR)
+ npviewer_CFLAGS += -I$(LSB_INC_DIR)/glib-2.0
+ npviewer_CFLAGS += -I$(LSB_INC_DIR)/gtk-2.0
+ npviewer_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR)
++else
++npviewer_CFLAGS += $(shell pkg-config --cflags gtk+-2.0 glib-2.0)
++npviewer_LDFLAGS = $(LDFLAGS_32)
++endif
+ npviewer_LDFLAGS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -ldl -lglib-2.0 -lX11 -lXt
+ else
+ npviewer_CFLAGS += $(GTK_CFLAGS)
+@@ -156,8 +169,11 @@
+ libxpcom_OBJECTS = $(libxpcom_RAWSRCS:%.c=libxpcom-%.o)
+ libxpcom_CFLAGS  = $(PIC_CFLAGS)
+ ifeq ($(biarch),yes)
++libxpcom_LDFLAGS = $(LDFLAGS_32)
++ifneq (1, $(USE_SYSTEM_LIBS))
+ libxpcom_CFLAGS += -I$(LSB_INC_DIR)
+-libxpcom_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR)
++libxpcom_LDFLAGS += -L$(LSB_OBJ_DIR)
++endif
+ endif
+ 
+ libnoxshm_LIBRARY = libnoxshm.so
+@@ -166,8 +182,11 @@
+ libnoxshm_OBJECTS = $(libnoxshm_RAWSRCS:%.c=libnoxshm-%.o)
+ libnoxshm_CFLAGS  = $(PIC_CFLAGS)
+ ifeq ($(biarch),yes)
++libnoxshm_LDFLAGS = $(LDFLAGS_32)
++ifneq (1, $(USE_SYSTEM_LIBS))
+ libnoxshm_CFLAGS += -I$(LSB_INC_DIR)
+-libnoxshm_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR)
++libnoxshm_LDFLAGS += -L$(LSB_OBJ_DIR)
++endif
+ endif
+ 
+ npconfig_PROGRAM = npconfig
+@@ -230,6 +249,7 @@
+ FILES		+= $(wildcard tests/*.html)
+ FILES		+= $(wildcard tests/*.c tests/*.h)
+ FILES		+= $(wildcard npapi/*.h npapi/nspr/*.h npapi/nspr/obsolete/*.h)
++ifneq (1, $(USE_SYSTEM_LIBS))
+ FILES		+= $(LSB_TOP_DIR)/headers/core_filelist
+ FILES		+= $(addprefix $(LSB_TOP_DIR)/headers/,$(shell cat $(LSB_TOP_DIR)/headers/core_filelist))
+ FILES		+= $(LSB_TOP_DIR)/headers/desktop_filelist
+@@ -243,12 +263,15 @@
+ FILES		+= $(patsubst %,$(LSB_SRC_DIR)/%.c,$(LSB_CORE_STATIC_STUBS))
+ FILES		+= $(patsubst %,$(LSB_SRC_DIR)/%.c,$(LSB_DESKTOP_STUBS))
+ FILES		+= $(patsubst %,$(LSB_SRC_DIR)/%.Version,$(LSB_DESKTOP_STUBS))
++endif
+ 
+ all: $(TARGETS)
+ 
+ clean:
+ 	rm -f $(TARGETS) *.o *.os
++ifneq (1, $(USE_SYSTEM_LIBS))
+ 	rm -rf $(LSB_OBJ_DIR)
++endif
+ 
+ distclean: clean
+ 	rm -f config-host.* config.*
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.2.2-npidentifiers.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.2.2-npidentifiers.patch
new file mode 100644
index 000000000000..568a4ea1f79a
--- /dev/null
+++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.2.2-npidentifiers.patch
@@ -0,0 +1,178 @@
+Index: src/npw-viewer.c
+===================================================================
+--- src/npw-viewer.c	(revision 942)
++++ src/npw-viewer.c	(working copy)
+@@ -2059,7 +2059,7 @@
+ 								RPC_METHOD_NPN_INVOKE,
+ 								RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, methodName,
++								RPC_TYPE_NP_IDENTIFIER, &methodName,
+ 								RPC_TYPE_ARRAY, RPC_TYPE_NP_VARIANT, argCount, args,
+ 								RPC_TYPE_INVALID);
+ 
+@@ -2249,7 +2249,7 @@
+ 								RPC_METHOD_NPN_GET_PROPERTY,
+ 								RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, propertyName,
++								RPC_TYPE_NP_IDENTIFIER, &propertyName,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+@@ -2311,7 +2311,7 @@
+ 								RPC_METHOD_NPN_SET_PROPERTY,
+ 								RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, propertyName,
++								RPC_TYPE_NP_IDENTIFIER, &propertyName,
+ 								RPC_TYPE_NP_VARIANT, value,
+ 								RPC_TYPE_INVALID);
+ 
+@@ -2370,7 +2370,7 @@
+ 								RPC_METHOD_NPN_REMOVE_PROPERTY,
+ 								RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, propertyName,
++								RPC_TYPE_NP_IDENTIFIER, &propertyName,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+@@ -2427,7 +2427,7 @@
+ 								RPC_METHOD_NPN_HAS_PROPERTY,
+ 								RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, propertyName,
++								RPC_TYPE_NP_IDENTIFIER, &propertyName,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+@@ -2484,7 +2484,7 @@
+ 								RPC_METHOD_NPN_HAS_METHOD,
+ 								RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, methodName,
++								RPC_TYPE_NP_IDENTIFIER, &methodName,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+@@ -2780,7 +2780,7 @@
+ 
+   int error = rpc_method_invoke(g_rpc_connection,
+ 								RPC_METHOD_NPN_IDENTIFIER_IS_STRING,
+-								RPC_TYPE_NP_IDENTIFIER, identifier,
++								RPC_TYPE_NP_IDENTIFIER, &identifier,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+@@ -2838,7 +2838,7 @@
+ 
+   int error = rpc_method_invoke(g_rpc_connection,
+ 								RPC_METHOD_NPN_UTF8_FROM_IDENTIFIER,
+-								RPC_TYPE_NP_IDENTIFIER, identifier,
++								RPC_TYPE_NP_IDENTIFIER, &identifier,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+@@ -2902,7 +2902,7 @@
+ 
+   int error = rpc_method_invoke(g_rpc_connection,
+ 								RPC_METHOD_NPN_INT_FROM_IDENTIFIER,
+-								RPC_TYPE_NP_IDENTIFIER, identifier,
++								RPC_TYPE_NP_IDENTIFIER, &identifier,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+Index: src/npw-wrapper.c
+===================================================================
+--- src/npw-wrapper.c	(revision 942)
++++ src/npw-wrapper.c	(working copy)
+@@ -1528,7 +1528,7 @@
+ 	free(name);
+ 
+   return rpc_method_send_reply(connection,
+-							   RPC_TYPE_NP_IDENTIFIER, ident,
++							   RPC_TYPE_NP_IDENTIFIER, &ident,
+ 							   RPC_TYPE_INVALID);
+ }
+ 
+@@ -1601,7 +1601,7 @@
+   NPIdentifier ident = g_NPN_GetIntIdentifier(intid);
+ 
+   return rpc_method_send_reply(connection,
+-							   RPC_TYPE_NP_IDENTIFIER, ident,
++							   RPC_TYPE_NP_IDENTIFIER, &ident,
+ 							   RPC_TYPE_INVALID);
+ }
+ 
+Index: src/npruntime.c
+===================================================================
+--- src/npruntime.c	(revision 942)
++++ src/npruntime.c	(working copy)
+@@ -221,7 +221,7 @@
+   int error = rpc_method_invoke(g_rpc_connection,
+ 								RPC_METHOD_NPCLASS_HAS_METHOD,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, name,
++								RPC_TYPE_NP_IDENTIFIER, &name,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+@@ -327,7 +327,7 @@
+   int error = rpc_method_invoke(g_rpc_connection,
+ 								RPC_METHOD_NPCLASS_INVOKE,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, name,
++								RPC_TYPE_NP_IDENTIFIER, &name,
+ 								RPC_TYPE_ARRAY, RPC_TYPE_NP_VARIANT, argCount, args,
+ 								RPC_TYPE_INVALID);
+ 
+@@ -509,7 +509,7 @@
+   int error = rpc_method_invoke(g_rpc_connection,
+ 								RPC_METHOD_NPCLASS_HAS_PROPERTY,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, name,
++								RPC_TYPE_NP_IDENTIFIER, &name,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+@@ -599,7 +599,7 @@
+   int error = rpc_method_invoke(g_rpc_connection,
+ 								RPC_METHOD_NPCLASS_GET_PROPERTY,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, name,
++								RPC_TYPE_NP_IDENTIFIER, &name,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+@@ -684,7 +684,7 @@
+   int error = rpc_method_invoke(g_rpc_connection,
+ 								RPC_METHOD_NPCLASS_SET_PROPERTY,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, name,
++								RPC_TYPE_NP_IDENTIFIER, &name,
+ 								RPC_TYPE_NP_VARIANT, value,
+ 								RPC_TYPE_INVALID);
+ 
+@@ -763,7 +763,7 @@
+   int error = rpc_method_invoke(g_rpc_connection,
+ 								RPC_METHOD_NPCLASS_REMOVE_PROPERTY,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, name,
++								RPC_TYPE_NP_IDENTIFIER, &name,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+Index: src/npw-rpc.c
+===================================================================
+--- src/npw-rpc.c	(revision 942)
++++ src/npw-rpc.c	(working copy)
+@@ -1252,7 +1252,7 @@
+ // the browser side
+ static int do_send_NPIdentifier(rpc_message_t *message, void *p_value)
+ {
+-  NPIdentifier ident = (NPIdentifier)p_value;
++  NPIdentifier ident = *(NPIdentifier *)p_value;
+   int id = 0;
+   if (ident) {
+ #ifdef BUILD_WRAPPER
diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.2.2-r1.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..20a82be30913
--- /dev/null
+++ b/www-plugins/nspluginwrapper/nspluginwrapper-1.2.2-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.2.2-r1.ebuild,v 1.1 2009/07/20 20:26:05 chutzpah Exp $
+
+EAPI=2
+
+inherit eutils nsplugins multilib
+
+DESCRIPTION="Netscape Plugin Wrapper - Load 32bit plugins on 64bit browser"
+HOMEPAGE="http://www.gibix.net/projects/nspluginwrapper/"
+SRC_URI="http://www.gibix.net/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2
+	net-misc/curl
+	app-emulation/emul-linux-x86-xlibs
+	app-emulation/emul-linux-x86-gtklibs
+	|| ( >=sys-apps/util-linux-2.13 sys-apps/setarch )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+autoinstall() {
+	if [[ -x /usr/bin/${PN} ]]; then
+		einfo "Auto installing 32bit plugins..."
+		${PN} -a -i
+		ls /usr/$(get_libdir)/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/$(get_libdir)/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_prepare() {
+	epatch "${FILESDIR}/${P}-gcc44.patch"
+	epatch "${FILESDIR}/${P}-npidentifiers.patch"
+}
+
+src_configure() {
+	econf --enable-biarch \
+		--target-cpu=i386 \
+		--with-lib32=$(ABI=x86 get_libdir) \
+		--with-lib64=$(get_libdir) \
+		--pkglibdir=/usr/$(get_libdir)/${PN}
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+	inst_plugin "/usr/$(get_libdir)/${PN}/x86_64/linux/npwrapper.so"
+	dosym "/usr/$(get_libdir)/${PN}/x86_64/linux/npconfig" "/usr/bin/${PN}"
+
+	dodoc NEWS README TODO ChangeLog
+}
+
+pkg_postinst() {
+	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:"
+	elog "  \"nspluginwrapper -i <path-to-32bit-plugin>\""
+	elog "before they will function in a 64bit browser"
+	elog
+}
+
+# this is terribly ugly, but without a way to query portage as to whether
+# we are upgrading/reinstalling a package versus unmerging, I can't think of
+# a better way
+
+pkg_prerm() {
+	einfo "Removing wrapper plugins..."
+	${PN} --auto --remove
+}
+
+pkg_postrm() {
+	autoinstall
+}
diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.2.2.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.2.2.ebuild
index aab821f88dab..e0e6639d4b38 100644
--- a/www-plugins/nspluginwrapper/nspluginwrapper-1.2.2.ebuild
+++ b/www-plugins/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/www-plugins/nspluginwrapper/nspluginwrapper-1.2.2.ebuild,v 1.1 2009/04/09 21:06:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.2.2.ebuild,v 1.2 2009/07/20 20:26:05 chutzpah Exp $
 
 inherit eutils nsplugins multilib
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.gibix.net/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2