Revision bump, workaround to fix bug #374169. Drop version 1.3 as 1.4.4 is stable and has a security fix.

(Portage version: 2.1.10.4/cvs/Linux x86_64)

7 files changed, 26 insertions, 880 deletions

diff --git a/www-plugins/nspluginwrapper/ChangeLog b/www-plugins/nspluginwrapper/ChangeLog
index e8b18fbf92d3..a72980429882 100644
--- a/www-plugins/nspluginwrapper/ChangeLog
+++ b/www-plugins/nspluginwrapper/ChangeLog
@@ -1,280 +1,16 @@
 # ChangeLog for www-plugins/nspluginwrapper
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.20 2011/07/05 07:49:27 hwoarang Exp $
-
-  05 Jul 2011; Markos Chandras <hwoarang@gentoo.org>
-  nspluginwrapper-1.4.4.ebuild:
-  Stable on amd64 wrt bug #373971
-
-  04 Jul 2011; Patrick McLean <chutzpah@gentoo.org>
-  nspluginwrapper-1.4.4.ebuild:
-  Update homepage.
-
-  04 Jul 2011; Patrick McLean <chutzpah@gentoo.org>
-  -nspluginwrapper-1.2.2-r2.ebuild, -files/nspluginwrapper-1.2.2-gcc44.patch,
-  -files/nspluginwrapper-1.2.2-npidentifiers.patch,
-  -files/nspluginwrapper-1.2.2-respect-ldflags.patch,
-  -files/nspluginwrapper-1.4.0-parallel-make.patch:
-  Really remove older versions.
-
-*nspluginwrapper-1.4.4 (04 Jul 2011)
-
-  04 Jul 2011; Patrick McLean <chutzpah@gentoo.org>
-  -nspluginwrapper-1.4.0-r1.ebuild, -nspluginwrapper-1.4.2.ebuild,
-  +nspluginwrapper-1.4.4.ebuild,
-  +files/nspluginwrapper-1.4.4-compile-on-hardened.patch:
-  Version bump, includes fix for bug #373971. Also add patch to compile on
-  hardened (Bug #368777). Clean out some older versions.
-
-*nspluginwrapper-1.4.2 (17 Jun 2011)
-
-  17 Jun 2011; Patrick McLean <chutzpah@gentoo.org>
-  +nspluginwrapper-1.4.2.ebuild,
-  +files/nspluginwrapper-1.4.2-parallel-make.patch:
-  Version bump (bug #371705). Forward port the parallel make patch, it appears
-  upstream has the old version.
-
-  30 May 2011; Patrick McLean <chutzpah@gentoo.org>
-  nspluginwrapper-1.4.0-r1.ebuild:
-  Create lib64 nsplugins dir on src_install (bug #369221).
-
-  26 May 2011; Patrick McLean <chutzpah@gentoo.org>
-  nspluginwrapper-1.4.0-r1.ebuild,
-  files/nspluginwrapper-1.4.0-parallel-make.patch:
-  A new approach to the parallel make patch, it should be more reliable now.
-  Thanks to Cardoe for the suggestion.
-
-  26 May 2011; Patrick McLean <chutzpah@gentoo.org>
-  files/nspluginwrapper-1.4.0-parallel-make.patch:
-  Update parallel make patch, it appears that the earlier one failed on some
-  systems (bug #368665).
-
-*nspluginwrapper-1.4.0-r1 (25 May 2011)
-
-  25 May 2011; Patrick McLean <chutzpah@gentoo.org>
-  -nspluginwrapper-1.4.0.ebuild, +nspluginwrapper-1.4.0-r1.ebuild:
-  Revision bump: Don't install npwrapper.so as a plugin, as it is just a
-  placeholder (see comment #4 on bug #365987).
-
-*nspluginwrapper-1.4.0 (24 May 2011)
-
-  24 May 2011; Patrick McLean <chutzpah@gentoo.org>
-  +nspluginwrapper-1.4.0.ebuild,
-  +files/nspluginwrapper-1.4.0-parallel-make.patch:
-  Version bump, bug #365987. Clean dependency on setarch as it is no longer in
-  the tree. Add patch to make installation work with parallel make.
-
-  27 Mar 2011; Pacho Ramos <pacho@gentoo.org> nspluginwrapper-1.2.2-r2.ebuild,
-  nspluginwrapper-1.3.0.ebuild:
-  Pin dependencies to proper slots.
-
-  30 Jul 2010; Markos Chandras <hwoarang@gentoo.org>
-  nspluginwrapper-1.3.0.ebuild:
-  Stable on amd64 wrt bug #329679
-
-  20 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
-  files/nspluginwrapper-1.3.0-asneeded.patch:
-  Adding missing bits fixing bug 269250
-
-  20 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
-  nspluginwrapper-1.3.0.ebuild, +files/nspluginwrapper-1.3.0-asneeded.patch,
-  -files/nspluginwrapper-1.3.0-ldflags.patch,
-  -files/nspluginwrapper-1.3.0-make.patch:
-  Fixing as-needed issues and respecting LDFLAGS wrt bug 321867
-
-*nspluginwrapper-1.3.0 (20 Jun 2010)
-
-  20 Jun 2010; Pacho Ramos <pacho@gentoo.org> -nspluginwrapper-1.0.0.ebuild,
-  -nspluginwrapper-1.2.2.ebuild, -nspluginwrapper-1.2.2-r1.ebuild,
-  +nspluginwrapper-1.3.0.ebuild,
-  +files/nspluginwrapper-1.3.0-fix-npident-array-sending.patch,
-  +files/nspluginwrapper-1.3.0-fortify.patch,
-  +files/nspluginwrapper-1.3.0-gdk-native-windows.patch,
-  +files/nspluginwrapper-1.3.0-inst-crash.patch,
-  +files/nspluginwrapper-1.3.0-ldflags.patch,
-  +files/nspluginwrapper-1.3.0-make.patch,
-  +files/nspluginwrapper-1.3.0-offsetof.patch:
-  Version bump to 1.3.0 (provided by most distributions) with bugfixes over
-  1.2.2. Also including some patches from Mandriva, Fedora and OpenSUSE to
-  set GDK_NATIVE_WINDOWS=1 (bug #324773 by Alexander E. Patrakov), LDFLAGS
-  fixes, prevent some crashes and others. Removing old versions.
-
-  13 Feb 2010; Pacho Ramos <pacho@gentoo.org>
-  nspluginwrapper-1.2.2-r2.ebuild:
-  amd64 stable, bug 302510
-
-*nspluginwrapper-1.2.2-r2 (21 Aug 2009)
-
-  21 Aug 2009; Patrick McLean <chutzpah@gentoo.org>
-  +nspluginwrapper-1.2.2-r2.ebuild,
-  +files/nspluginwrapper-1.2.2-respect-ldflags.patch:
-  Add patch and modify ebuild to properly respect LDFLAGS (bug #278607).
-
-*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:
-  Package moved from net-www to www-plugins, bug 265569. Remove unused patch
-  file.
-
-  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:
-  Remove 64bit patch as it doesn't apply anymore, and its not needed.
-
-*nspluginwrapper-1.2.2 (02 Feb 2009)
-
-  02 Feb 2009; Patrick McLean <chutzpah@gentoo.org>
-  -nspluginwrapper-1.1.4.ebuild, -nspluginwrapper-1.1.10.ebuild,
-  +nspluginwrapper-1.2.2.ebuild:
-  Version bump (bug #256257). Clean out beta versions.
-
-*nspluginwrapper-1.1.10 (16 Dec 2008)
-
-  16 Dec 2008; Patrick McLean <chutzpah@gentoo.org>
-  +nspluginwrapper-1.1.10.ebuild:
-  Version bump.
-
-*nspluginwrapper-1.1.4 (19 Nov 2008)
-
-  19 Nov 2008; Patrick McLean <chutzpah@gentoo.org>
-  -nspluginwrapper-1.1.2.ebuild, +nspluginwrapper-1.1.4.ebuild:
-  Version bump, add build dep on net-misc/curl (bug #241222).
-
-  15 Oct 2008; Patrick McLean <chutzpah@gentoo.org> ChangeLog:
-  Version bump, clean out versions 0.9.91.5 and 1.1.0.
-
-*nspluginwrapper-1.1.0-r1 (02 Oct 2008)
-
-  02 Oct 2008; Patrick McLean <chutzpah@gentoo.org>
-  +files/nspluginwrapper-1.1.0-quiet-64bit-plugin-warnings.patch,
-  +files/nspluginwrapper-1.1.0-windowless-crash.patch,
-  nspluginwrapper-1.0.0.ebuild, -nspluginwrapper-1.1.0.ebuild,
-  +nspluginwrapper-1.1.0-r1.ebuild:
-  Revbump 1.1.0, add patch that should fix crash bug and patch to quiet
-  warnings about 64 bit plugins. Drop original revision of 1.1.0. Stabilize
-  1.0.0.
-
-*nspluginwrapper-1.1.0 (30 Jul 2008)
-
-  30 Jul 2008; Patrick McLean <chutzpah@gentoo.org>
-  -nspluginwrapper-0.9.91.4.ebuild, -nspluginwrapper-0.9.91.5.ebuild,
-  +nspluginwrapper-1.1.0.ebuild:
-  Version bump, clean up ebuild slightly. Clean out older versions.
-
-*nspluginwrapper-1.0.0 (05 Jul 2008)
-
-  05 Jul 2008; Piotr Jaroszyński <peper@gentoo.org>
-  +nspluginwrapper-1.0.0.ebuild:
-  Add 1.0.0.
-
-  01 Mar 2008; Christoph Mende <angelos@gentoo.org>
-  nspluginwrapper-0.9.91.5-r1.ebuild:
-  Stable on amd64, bug #210991
-
-*nspluginwrapper-0.9.91.5-r1 (10 Jan 2008)
-
-  10 Jan 2008; Patrick McLean <chutzpah@gentoo.org>
-  +files/nspluginwrapper-0.9.91.5-g_thread_init.patch,
-  +nspluginwrapper-0.9.91.5-r1.ebuild:
-  Revision bump, add patch to add support for gthread, thanks to Alex
-  Rostovtsev for pulling the patch from Fedora's RPM. (bug #203820)
-
-*nspluginwrapper-0.9.91.5 (28 Aug 2007)
-
-  28 Aug 2007; Patrick McLean <chutzpah@gentoo.org>
-  -nspluginwrapper-0.9.91.2.ebuild, -nspluginwrapper-0.9.91.3.ebuild,
-  nspluginwrapper-0.9.91.4.ebuild, +nspluginwrapper-0.9.91.5.ebuild:
-  Version bump, update ebuilds to depend on sys-apps/setarch or
-  sys-apps/util-linux-2.13 (bug #190476). Clean out older versions.
-
-  12 May 2007; Steve Dibb <beandog@gentoo.org>
-  nspluginwrapper-0.9.91.4.ebuild:
-  amd64 stable, bug 178059
-
-*nspluginwrapper-0.9.91.4 (09 Apr 2007)
-
-  09 Apr 2007; Patrick McLean <chutz@gentoo.org>
-  -files/nspluginwrapper-0.9.90.4-gentoo.patch,
-  +nspluginwrapper-0.9.91.4.ebuild:
-  Version bump.
-
-*nspluginwrapper-0.9.91.3 (09 Mar 2007)
-
-  09 Mar 2007; Patrick McLean <chutzpah@gentoo.org>
-  +nspluginwrapper-0.9.91.3.ebuild:
-  Version bump.
-
-  08 Jan 2007; Patrick McLean <chutzpah@gentoo.org>
-  -nspluginwrapper-0.9.90.4.ebuild, nspluginwrapper-0.9.91.2.ebuild:
-  Remove TEXTREL line and delete old version.
-
-  05 Jan 2007; Patrick McLean <chutzpah@gentoo.org>
-  nspluginwrapper-0.9.91.2.ebuild:
-  Change einfo to elog for message about how to use/install plugins.
-
-*nspluginwrapper-0.9.91.2 (04 Jan 2007)
-
-  04 Jan 2007; Patrick McLean <chutzpah@gentoo.org>
-  -files/nspluginwrapper-0.9.90.3-gentoo.patch,
-  -nspluginwrapper-0.9.90.3.ebuild, +nspluginwrapper-0.9.91.2.ebuild:
-  Version bump, changed installation dir of plugins as per suggestion made by
-  Christian Birchinger <joker@gentoo.org>, bug #159157. Clean out older
-  version.
-
-  22 Nov 2006; Patrick McLean <chutzpah@gentoo.org>
-  files/nspluginwrapper-0.9.90.4-gentoo.patch:
-  Adjust the configure patch so it will print out a little more information
-  when bi-arch is broken.
-
-*nspluginwrapper-0.9.90.4 (20 Nov 2006)
-
-  20 Nov 2006; Patrick McLean <chutzpah@gentoo.org>
-  +files/nspluginwrapper-0.9.90.4-gentoo.patch,
-  +nspluginwrapper-0.9.90.4.ebuild:
-  Version bump, rework ebuild somewhat since the new version has a more
-  automated build system. Remove the "-v" from the calls to nspluginwrapper so
-  merging and unmerging doesn't print useless verbose info about the plugins
-  being installed.
-
-  13 Nov 2006; Patrick McLean <chutzpah@gentoo.org>
-  nspluginwrapper-0.9.90.3.ebuild:
-  Clean up error message on unmerge, remove block against eselect-compiler
-  since it's masked anyway.
-
-  23 Oct 2006; Patrick McLean <chutzpah@gentoo.org> ChangeLog:
-  Remove flash9 soundlibs einfo since net-www/netscape-flash-9* depends on it
-  now.
-
-  22 Oct 2006; Patrick McLean <chutzpah@gentoo.org>
-  nspluginwrapper-0.9.90.3.ebuild:
-  Add dep on app-emulation/emul-linux-x86-gtklibs, this should fix bug #152216.
-
-  20 Oct 2006; Patrick McLean <chutzpah@gentoo.org>
-  nspluginwrapper-0.9.90.3.ebuild:
-  Add an einfo to pkg_postinst about needing to install
-  app-emulation/emul-linux-x86-soundlibs for sound with flash 9.
-
-*nspluginwrapper-0.9.90.3 (20 Oct 2006)
-
-  20 Oct 2006; Patrick McLean <chutzpah@gentoo.org>
-  +files/nspluginwrapper-0.9.90.3-gentoo.patch, +metadata.xml,
-  +nspluginwrapper-0.9.90.3.ebuild:
-  Initial version. Ebuild originally written by Herbie Hopkins
-  <herbs@gentoo.org>, also had contributions from Ahmed Ammar
-  <b33fc0d3@gmail.com> and Matsuu Takuto matsuu@gentoo.org. Closes bug
-  #138454.
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.21 2011/07/11 15:00:41 chutzpah Exp $
+
+*nspluginwrapper-1.4.4-r1 (11 Jul 2011)
+
+  11 Jul 2011; Patrick McLean <chutzpah@gentoo.org>
+  -nspluginwrapper-1.3.0.ebuild, -files/nspluginwrapper-1.3.0-asneeded.patch,
+  -files/nspluginwrapper-1.3.0-fix-npident-array-sending.patch,
+  -files/nspluginwrapper-1.3.0-fortify.patch,
+  -files/nspluginwrapper-1.3.0-inst-crash.patch,
+  -files/nspluginwrapper-1.3.0-offsetof.patch,
+  +nspluginwrapper-1.4.4-r1.ebuild:
+  Revision bump, workaround to fix bug #374169. Drop version 1.3 as 1.4.4 is
+  stable and has a security fix.
 
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-asneeded.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-asneeded.patch
deleted file mode 100644
index a24e45dce62c..000000000000
--- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-asneeded.patch
+++ /dev/null
@@ -1,367 +0,0 @@
-Fixing as-needed issues, respect LDFLAGS and use system libs
-
-http://bugs.gentoo.org/show_bug.cgi?id=321867
-http://bugs.gentoo.org/show_bug.cgi?id=269250
-
---- configure
-+++ configure
-@@ -465,7 +465,7 @@
- # check for Glib 2.0 compile CFLAGS
- if $pkgconfig --exists glib-2.0; then
-     GLIB_CFLAGS=`$pkgconfig --cflags glib-2.0`
--    GLIB_LDFLAGS=`$pkgconfig --libs glib-2.0`
-+    GLIB_LIBS=`$pkgconfig --libs glib-2.0`
-     GLIB_VERSION=`$pkgconfig --modversion glib-2.0`
- else
-     echo "GLIB 2.0 environment not found"
-@@ -478,7 +478,7 @@
-     return 0;
- }
- EOF
--if ! $cc $CFLAGS $GLIB_CFLAGS $GLIB_LDFLAGS $TMPC -o $TMPE > /dev/null 2>&1; then
-+if ! $cc $CFLAGS $LDFLAGS $GLIB_CFLAGS $TMPC -o $TMPE $GLIB_LIBS > /dev/null 2>&1; then
-     echo "GLIB 2.0 environment not usable"
-     rm -f $TMPC
-     exit 1
-@@ -489,7 +489,7 @@
- if test "$build_viewer" = "yes" -o "$build_player" = "yes"; then
-     if $pkgconfig --exists gtk+-2.0; then
- 	GTK_CFLAGS=`$pkgconfig --cflags gtk+-2.0`
--	GTK_LDFLAGS=`$pkgconfig --libs gtk+-2.0`
-+	GTK_LIBS=`$pkgconfig --libs gtk+-2.0`
- 	GTK_VERSION=`$pkgconfig --modversion gtk+-2.0`
-     else
- 	echo "GTK+ 2.0 environment not found"
-@@ -502,7 +502,7 @@
-     return 0;
- }
- EOF
--    if ! $cc $CFLAGS $GTK_CFLAGS $GTK_LDFLAGS $TMPC -o $TMPE > /dev/null 2>&1; then
-+    if ! $cc $CFLAGS $LDFLAGS $GTK_CFLAGS $TMPC -o $TMPE $GTK_LIBS > /dev/null 2>&1; then
- 	echo "GTK+ 2.0 environment not usable"
- 	rm -f $TMPC
- 	exit 1
-@@ -514,12 +514,12 @@
- if test "$build_player" = "yes"; then
-     if $pkgconfig --exists libcurl; then
- 	CURL_CFLAGS=`$pkgconfig --cflags libcurl`
--	CURL_LDFLAGS=`$pkgconfig --libs libcurl`
-+	CURL_LIBS=`$pkgconfig --libs libcurl`
-     else
- 	curlconfig=`which curl-config`
- 	if test -n "$curlconfig"; then
- 	    CURL_CFLAGS=`$curlconfig --cflags`
--	    CURL_LDFLAGS=`$curlconfig --libs`
-+	    CURL_LIBS=`$curlconfig --libs`
- 	else
- 	    echo "cURL environment not found"
- 	    exit 1
-@@ -532,7 +532,7 @@
-     return 0;
- }
- EOF
--    if ! $cc $CFLAGS $CURL_CFLAGS $CURL_LDFLAGS $TMPC -o $TMPE > /dev/null 2>&1; then
-+    if ! $cc $CFLAGS $LDFLAGS $CURL_CFLAGS $TMPC -o $TMPE $CURL_LIBS > /dev/null 2>&1; then
- 	echo "cURL environment not usable"
- 	rm -f $TMPC
- 	exit 1
-@@ -559,10 +559,6 @@
- 	fi
-     fi
- done
--if test -z "$x_base_dir"; then
--    echo "X11/Xt environment not found"
--    exit 1
--fi
- 
- # big/little endian test
- cat > $TMPC << EOF
-@@ -763,12 +759,13 @@
- echo "CC=$cc" >> $config_mak
- echo "CXX=$cxx" >> $config_mak
- echo "CFLAGS=$CFLAGS" >> $config_mak
-+echo "LDFLAGS=$LDFLAGS" >> $config_mak
- echo "GLIB_CFLAGS=$GLIB_CFLAGS" >> $config_mak
--echo "GLIB_LDFLAGS=$GLIB_LDFLAGS" >> $config_mak
-+echo "GLIB_LIBS=$GLIB_LIBS" >> $config_mak
- echo "GTK_CFLAGS=$GTK_CFLAGS" >> $config_mak
--echo "GTK_LDFLAGS=$GTK_LDFLAGS" >> $config_mak
-+echo "GTK_LIBS=$GTK_LIBS" >> $config_mak
- echo "CURL_CFLAGS=$CURL_CFLAGS" >> $config_mak
--echo "CURL_LDFLAGS=$CURL_LDFLAGS" >> $config_mak
-+echo "CURL_LIBS=$CURL_LIBS" >> $config_mak
- if test "$build_biarch" = "yes"; then
- echo "LDFLAGS_32=-m32" >> $config_mak
- echo "CFLAGS_32=$CFLAGS_32" >> $config_mak
---- Makefile
-+++ Makefile
-@@ -41,6 +41,8 @@
- STRIP_OPT = -s
- endif
- 
-+USE_SYSTEM_LIBS=1
-+
- LN_S = ln -sf
- 
- ifeq ($(LD_soname),)
-@@ -51,16 +53,16 @@
- endif
- 
- ifneq (,$(findstring $(OS),linux))
--libdl_LDFLAGS = -ldl
-+libdl_LIBS = -ldl
- endif
- 
--libpthread_LDFLAGS = -lpthread
-+libpthread_LIBS = -lpthread
- ifeq ($(OS),dragonfly)
- libpthread_LDFLAGS = -pthread
- endif
- 
- ifneq (,$(findstring $(OS),solaris))
--libsocket_LDFLAGS = -lsocket -lnsl
-+libsocket_LIBS = -lsocket -lnsl
- endif
- 
- PIC_CFLAGS = -fPIC
-@@ -71,7 +73,7 @@
- endif
- 
- X_CFLAGS  = -I$(x11prefix)/include
--X_LDFLAGS = -L$(x11prefix)/$(lib64) -lX11 -lXt
-+X_LIBS = -L$(x11prefix)/$(lib64) -lX11 -lXt
- ifneq (,$(findstring $(OS),netbsd dragonfly))
- X_LDFLAGS += -Wl,--rpath,$(x11prefix)/$(lib64)
- endif
-@@ -79,6 +81,11 @@
- ARCH_32 = $(ARCH)
- ifeq ($(build_biarch), yes)
- ARCH_32 = $(TARGET_ARCH)
-+endif
-+
-+ifneq (1, $(USE_SYSTEM_LIBS))
-+
-+ifeq ($(build_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
-@@ -107,8 +115,9 @@
- npwrapper_SOURCES = $(npwrapper_RAWSRCS:%.c=$(SRC_PATH)/src/%.c)
- npwrapper_OBJECTS = $(npwrapper_RAWSRCS:%.c=npwrapper-%.os)
- npwrapper_CFLAGS  = $(CFLAGS) $(X_CFLAGS) $(MOZILLA_CFLAGS) $(GLIB_CFLAGS)
--npwrapper_LDFLAGS = $(X_LDFLAGS) $(libpthread_LDFLAGS) $(libsocket_LDFLAGS)
--npwrapper_LDFLAGS += $(GLIB_LDFLAGS)
-+npwrapper_LDFLAGS = $(libpthread_LDFLAGS)
-+npwrapper_LIBS = $(X_LIBS) $(libpthread_LIBS) $(libsocket_LIBS)
-+npwrapper_LIBS += $(GLIB_LIBS)
- 
- npviewer_PROGRAM = npviewer.bin
- npviewer_RAWSRCS = npw-viewer.c npw-common.c npw-malloc.c npw-rpc.c rpc.c debug.c utils.c npruntime.c
-@@ -116,17 +125,23 @@
- npviewer_OBJECTS = $(npviewer_RAWSRCS:%.c=npviewer-%.o)
- ifeq ($(build_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)
--npviewer_LDFLAGS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -ldl -lglib-2.0 -lX11 -lXt
-+else
-+npviewer_CFLAGS += $(shell pkg-config --cflags gtk+-2.0 glib-2.0)
-+npviewer_LDFLAGS = $(LDFLAGS_32)
-+endif
-+npviewer_LIBS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -ldl -lglib-2.0 -lX11 -lXt
- else
- npviewer_CFLAGS += $(GTK_CFLAGS)
--npviewer_LDFLAGS = $(GTK_LDFLAGS) $(X_LDFLAGS)
-+npviewer_LIBS = $(GTK_LIBS) $(X_LIBS)
- endif
- npviewer_CFLAGS  += $(MOZILLA_CFLAGS)
--npviewer_LDFLAGS += $(libdl_LDFLAGS) $(libpthread_LDFLAGS) -lgthread-2.0
-+npviewer_LDFLAGS += $(libpthread_LDFLAGS)
-+npviewer_LIBS += $(libdl_LIBS) $(libpthread_LIBS) -lgthread-2.0
- ifeq ($(TARGET_OS):$(TARGET_ARCH),linux:i386)
- npviewer_MAPFILE = $(SRC_PATH)/src/npw-viewer.map
- endif
-@@ -137,18 +152,19 @@
- ifeq ($(TARGET_OS):$(TARGET_ARCH),linux:i386)
- npviewer_SOURCES += $(SRC_PATH)/src/cxxabi-compat.cpp
- npviewer_OBJECTS += npviewer-cxxabi-compat.o
--npviewer_LDFLAGS += -lsupc++
-+npviewer_LIBS += -lsupc++
- endif
- ifeq ($(TARGET_OS):$(TARGET_ARCH),solaris:i386)
--npviewer_LDFLAGS += $(libsocket_LDFLAGS)
-+npviewer_LIBS += $(libsocket_LIBS)
- endif
- 
- npplayer_PROGRAM  = npplayer
- npplayer_SOURCES  = npw-player.c debug.c rpc.c utils.c glibcurl.c gtk2xtbin.c $(tidy_SOURCES)
- npplayer_OBJECTS  = $(npplayer_SOURCES:%.c=npplayer-%.o)
- npplayer_CFLAGS   = $(GTK_CFLAGS) $(MOZILLA_CFLAGS) $(CURL_CFLAGS) $(X_CFLAGS)
--npplayer_LDFLAGS  = $(GTK_LDFLAGS) $(CURL_LDFLAGS) $(X_LDFLAGS)
--npplayer_LDFLAGS += -lgthread-2.0 $(libpthread_LDFLAGS) $(libsocket_LDFLAGS)
-+npplayer_LDFLAGS  = $(libpthread_LDFLAGS)
-+npplayer_LIBS  = $(GTK_LIBS) $(CURL_LIBS) $(X_LIBS)
-+npplayer_LIBS += -lgthread-2.0 $(libpthread_LIBS) $(libsocket_LIBS)
- 
- libxpcom_LIBRARY = libxpcom.so
- libxpcom_RAWSRCS = libxpcom.c debug.c
-@@ -156,8 +172,11 @@
- libxpcom_OBJECTS = $(libxpcom_RAWSRCS:%.c=libxpcom-%.o)
- libxpcom_CFLAGS  = $(PIC_CFLAGS)
- ifeq ($(build_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
-@@ -165,21 +184,25 @@
- libnoxshm_SOURCES = $(libnoxshm_RAWSRCS:%.c=$(SRC_PATH)/src/%.c)
- libnoxshm_OBJECTS = $(libnoxshm_RAWSRCS:%.c=libnoxshm-%.o)
- libnoxshm_CFLAGS  = $(PIC_CFLAGS)
--ifeq ($(biarch),yes)
-+ifeq ($(build_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
- npconfig_RAWSRCS = npw-config.c
- npconfig_SOURCES = $(npconfig_RAWSRCS:%.c=$(SRC_PATH)/src/%.c)
- npconfig_OBJECTS = $(npconfig_RAWSRCS:%.c=npconfig-%.o)
--npconfig_LDFLAGS = $(libdl_LDFLAGS)
-+npconfig_LIBS = $(libdl_LIBS)
- ifneq (,$(findstring $(OS),netbsd dragonfly))
- # We will try to dlopen() the native plugin library. If that lib is
- # linked against libpthread, then so must our program too.
- # XXX use the ELF decoder for native plugins too?
--npconfig_LDFLAGS += $(libpthread_LDFLAGS)
-+npconfig_LDFLAGS = $(libpthread_LDFLAGS)
-+npconfig_LIBS += $(libpthread_LIBS)
- endif
- 
- nploader_PROGRAM = npviewer.sh
-@@ -192,7 +215,8 @@
- test_rpc_client_CPPFLAGS = $(CPPFLAGS) -I$(SRC_PATH)/src -DBUILD_CLIENT -DNPW_COMPONENT_NAME="\"Client\""
- test_rpc_server_CPPFLAGS = $(CPPFLAGS) -I$(SRC_PATH)/src -DBUILD_SERVER -DNPW_COMPONENT_NAME="\"Server\""
- test_rpc_CFLAGS			 = -I$(SRC_PATH)/src $(GLIB_CFLAGS)
--test_rpc_LDFLAGS		 = $(GLIB_LDFLAGS) $(libpthread_LDFLAGS) $(libsocket_LDFLAGS)
-+test_rpc_LIBS		 = $(GLIB_LIBS) $(libpthread_LIBS) $(libsocket_LIBS)
-+test_rpc_LDFLAGS   = $(libpthread_LDFLAGS)
- test_rpc_RAWPROGS		 = \
- 	test-rpc-types \
- 	test-rpc-nested-1 \
-@@ -230,6 +254,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,13 +268,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
-+	rm -f $(TARGETS) *.o *.os]
-+ifneq (1, $(USE_SYSTEM_LIBS))
- 	rm -rf $(LSB_OBJ_DIR)
--
-+endif
- distclean: clean
- 	rm -f config-host.* config.*
- 
-@@ -364,13 +391,13 @@
- 	svn commit -m "Generated by svn2cl." ChangeLog
- 
- $(npwrapper_LIBRARY): $(npwrapper_OBJECTS)
--	$(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LDFLAGS)
-+	$(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_LDFLAGS) $(LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LIBS)
- 
- npwrapper-%.os: $(SRC_PATH)/src/%.c
- 	$(CC) -o $@ -c $< $(PIC_CFLAGS) $(CPPFLAGS) $(npwrapper_CFLAGS) -DBUILD_WRAPPER
- 
- $(npviewer_PROGRAM): $(npviewer_OBJECTS) $(npviewer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS)
--	$(CC) $(LDFLAGS_32) -o $@ $(npviewer_OBJECTS) $(npviewer_LDFLAGS)
-+	$(CC) $(LDFLAGS_32) -o $@ $(npviewer_LDFLAGS) $(LDFLAGS) $(npviewer_OBJECTS) $(npviewer_LIBS)
- 
- npviewer-%.o: $(SRC_PATH)/src/%.c
- 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER
-@@ -379,7 +406,7 @@
- 	$(CXX) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER
- 
- $(npplayer_PROGRAM): $(npplayer_OBJECTS) $(npplayer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS)
--	$(CC) $(LDFLAGS) -o $@ $(npplayer_OBJECTS) $(npplayer_LDFLAGS)
-+	$(CC) $(LDFLAGS) -o $@ $(npplayer_LDFLAGS) $(npplayer_OBJECTS) $(npplayer_LIBS)
- 
- npplayer-%.o: $(SRC_PATH)/src/%.c
- 	$(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER
-@@ -387,19 +414,19 @@
- 	$(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER
- 
- $(libxpcom_LIBRARY): $(libxpcom_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
--	$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,$(LD_soname),libxpcom.so
-+	$(CC) $(LDFLAGS) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_LDFLAGS) $(libxpcom_OBJECTS) $(libxpcom_LIBS) -Wl,$(LD_soname),libxpcom.so
- 
- libxpcom-%.o: $(SRC_PATH)/src/%.c
- 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libxpcom_CFLAGS) -DBUILD_XPCOM
- 
- $(libnoxshm_LIBRARY): $(libnoxshm_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
--	$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,$(LD_soname),libnoxshm.so
-+	$(CC) $(LDFLAGS) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_LDFLAGS) $(libnoxshm_OBJECTS) $(libnoxshm_LIBS) -Wl,$(LD_soname),libnoxshm.so
- 
- libnoxshm-%.o: $(SRC_PATH)/src/%.c
- 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libnoxshm_CFLAGS)
- 
- $(npconfig_PROGRAM): $(npconfig_OBJECTS)
--	$(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS)
-+	$(CC) -o $@ $(npconfig_LDFLAGS) $(LDFLAGS) $(npconfig_OBJECTS) $(npconfig_LIBS)
- 
- npconfig-%.o: $(SRC_PATH)/src/%.c
- 	$(CC) -o $@ -c $< $(CPPFLAGS) $(CFLAGS)
-@@ -425,18 +452,18 @@
- 	$(LN_S) libgcc_s.so $@
- 
- $(LSB_OBJ_DIR)/%.so: $(LSB_OBJ_DIR)/%.o
--	$(CC) $(LDFLAGS_32) -nostdlib $(DSO_LDFLAGS) $< -o $@ \
-+	$(CC) $(LDFLAGS) $(LDFLAGS_32) -nostdlib $(DSO_LDFLAGS) $< -o $@ \
- 		-Wl,--version-script,$(patsubst $(LSB_OBJ_DIR)/%.o,$(LSB_SRC_DIR)/%.Version,$<) \
- 		-Wl,-soname,`grep "$(patsubst $(LSB_OBJ_DIR)/%.o,%,$<) " $(LSB_SRC_DIR)/LibNameMap.txt | cut -f2 -d' '`
- 
- test-rpc-%-client: test-rpc-%-client.o $(test_rpc_client_OBJECTS)
--	$(CC) -o $@ $< $(test_rpc_client_OBJECTS) $(test_rpc_LDFLAGS)
-+	$(CC) $(test_rpc_LDFLAGS) -o $@ $< $(test_rpc_client_OBJECTS) $(test_rpc_LIBS)
- test-rpc-%-client.o: $(SRC_PATH)/tests/test-rpc-%.c
- 	$(CC) -o $@ -c $< $(test_rpc_client_CPPFLAGS) $(test_rpc_CFLAGS)
- %-client.o: $(SRC_PATH)/src/%.c
- 	$(CC) -o $@ -c $< $(test_rpc_client_CPPFLAGS) $(test_rpc_CFLAGS)
- test-rpc-%-server: test-rpc-%-server.o $(test_rpc_server_OBJECTS)
--	$(CC) -o $@ $< $(test_rpc_server_OBJECTS) $(test_rpc_LDFLAGS)
-+	$(CC) $(test_rpc_LDFLAGS) -o $@ $< $(test_rpc_server_OBJECTS) $(test_rpc_LIBS)
- test-rpc-%-server.o: $(SRC_PATH)/tests/test-rpc-%.c
- 	$(CC) -o $@ -c $< $(test_rpc_server_CPPFLAGS) $(test_rpc_CFLAGS)
- %-server.o: $(SRC_PATH)/src/%.c
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-fix-npident-array-sending.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-fix-npident-array-sending.patch
deleted file mode 100644
index 568a4ea1f79a..000000000000
--- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-fix-npident-array-sending.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-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/files/nspluginwrapper-1.3.0-fortify.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-fortify.patch
deleted file mode 100644
index e0b077f67251..000000000000
--- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-fortify.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- nspluginwrapper-1.3.0/lsb-build/stub_libs/libc_nonshared.c.fortify	2008-12-20 23:34:55.000000000 +0100
-+++ nspluginwrapper-1.3.0/lsb-build/stub_libs/libc_nonshared.c	2010-03-30 16:03:51.000000000 +0200
-@@ -98,3 +98,16 @@
- 
-   _fini ();
- }
-+
-+int
-+__sprintf_chk (char *str, int flags, size_t size, const char *format, ...)
-+{
-+	__builtin_va_list ap;
-+	int result;
-+	__builtin_va_start(ap, format);
-+	result = __builtin_vsnprintf(str, size, format, ap);
-+	__builtin_va_end(ap);
-+	return result;
-+}
-+
-+void __stack_chk_fail_local (void) {}
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-inst-crash.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-inst-crash.patch
deleted file mode 100644
index 60f6b1e0f5e5..000000000000
--- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-inst-crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up nspluginwrapper-1.3.0/src/npw-common.h.old nspluginwrapper-1.3.0/src/npw-common.h
---- nspluginwrapper-1.3.0/src/npw-common.h.old	2009-01-02 15:22:29.000000000 +0100
-+++ nspluginwrapper-1.3.0/src/npw-common.h	2009-11-10 09:58:34.000000000 +0100
-@@ -115,7 +115,7 @@ npw_plugin_instance_is_valid(void *ptr)
- static inline NPW_PluginInstance *
- _npw_get_plugin_instance (NPP instance)
- {
--  return (NPW_PluginInstance *)instance->_NPW_INSTANCE_PRIVATE_DATA;
-+  return instance ? (NPW_PluginInstance *)instance->_NPW_INSTANCE_PRIVATE_DATA : NULL;
- }
- 
- static inline NPW_PluginInstance *
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-offsetof.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-offsetof.patch
deleted file mode 100644
index 93e3e174adac..000000000000
--- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-offsetof.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lsb-build/headers/stddef.h
-+++ lsb-build/headers/stddef.h
-@@ -7,7 +7,7 @@
- #endif
- 
- 
--#define offsetof(TYPE,MEMBER)	((size_t)&((TYPE*)0)->MEMBER)
-+#define offsetof(TYPE,MEMBER)	__builtin_offsetof(TYPE,MEMBER)
- 
- #if !defined(__cplusplus)
- 
diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.3.0.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r1.ebuild
index 509af534a37c..9abdb3294522 100644
--- a/www-plugins/nspluginwrapper/nspluginwrapper-1.3.0.ebuild
+++ b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r1.ebuild
@@ -1,26 +1,25 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.3.0.ebuild,v 1.4 2011/03/27 10:16:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r1.ebuild,v 1.1 2011/07/11 15:00:41 chutzpah Exp $
 
 EAPI=2
 
-inherit eutils nsplugins multilib flag-o-matic
+inherit eutils multilib nsplugins flag-o-matic
 
 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"
-SRC_URI="mirror://debian/pool/contrib/n/${PN}/${P/-/_}.orig.tar.gz"
+HOMEPAGE="http://nspluginwrapper.org/"
+SRC_URI="http://web.mit.edu/davidben/Public/nspluginwrapper/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2: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 )"
+	>=sys-apps/util-linux-2.13"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -45,12 +44,10 @@ autoinstall() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-gdk-native-windows.patch"
-	epatch "${FILESDIR}/${P}-inst-crash.patch"
-	epatch "${FILESDIR}/${P}-fix-npident-array-sending.patch"
-	epatch "${FILESDIR}/${P}-fortify.patch"
-	epatch "${FILESDIR}/${P}-offsetof.patch"
-	epatch "${FILESDIR}/${P}-asneeded.patch"
+	epatch "${FILESDIR}/${PN}-1.3.0-gdk-native-windows.patch"
+	epatch "${FILESDIR}/${PN}-1.4.2-parallel-make.patch"
+	epatch "${FILESDIR}/${P}-compile-on-hardened.patch"
+	sed -i -r "s:^libnoxshm_LDFLAGS = :libnoxshm_LDFLAGS = -L/usr/$(ABI=x86 get_libdir)/ :" Makefile
 }
 
 src_configure() {
@@ -68,12 +65,12 @@ src_compile() {
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	emake 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}"
+	keepdir "/usr/$(get_libdir)/${PLUGINS_DIR}"
 
-	dodoc NEWS README TODO ChangeLog
+	dodoc NEWS README TODO
 }
 
 pkg_postinst() {