Fixing as-needed issues and respecting LDFLAGS wrt bug 321867. Committed with ssuominen blessing

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

6 files changed, 292 insertions, 84 deletions

diff --git a/www-plugins/nspluginwrapper/ChangeLog b/www-plugins/nspluginwrapper/ChangeLog
index a9bc623f8fed..186e6d5af728 100644
--- a/www-plugins/nspluginwrapper/ChangeLog
+++ b/www-plugins/nspluginwrapper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-plugins/nspluginwrapper
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.5 2010/06/20 10:07:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.6 2010/06/20 11:30:09 xarthisius Exp $
+
+  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)
 
diff --git a/www-plugins/nspluginwrapper/Manifest b/www-plugins/nspluginwrapper/Manifest
index 7a3e334336d2..b7d8199b2ceb 100644
--- a/www-plugins/nspluginwrapper/Manifest
+++ b/www-plugins/nspluginwrapper/Manifest
@@ -4,23 +4,24 @@ 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
 AUX nspluginwrapper-1.2.2-respect-ldflags.patch 823 RMD160 15717dab32c80cd66702c5a88431b9218d0f11b5 SHA1 e7902088653b1fe9e3836676e178f8122b5ba8d4 SHA256 4efb0473338ff86c0f6f02729b92c8d74a53f97ad69717e449c2224572468416
+AUX nspluginwrapper-1.3.0-asneeded.patch 10974 RMD160 e253df834037d73668742fa06fb2fbaa7a70a5d3 SHA1 81cbdfcf38005a65232e13410a33ca180d7d2003 SHA256 2e7b367aaf17ead0aff1d2c6def3bee225538041191143f9dcbf11530a9d4b9a
 AUX nspluginwrapper-1.3.0-fix-npident-array-sending.patch 5839 RMD160 75cc5acd80b31b014c15149308b61aeb9193fc5d SHA1 c4efb846c429d958619b76abdd82e45d3e3dfa3f SHA256 8bb55b845017b60912c62c4abadc50a3f0397ddf470599b8453b97d9e69f8cd5
 AUX nspluginwrapper-1.3.0-fortify.patch 541 RMD160 89c49f7bca2c64972e4f8ee5172b3dec12c26f65 SHA1 65312992cd23be4ebac2ae302d6770770ae6e4d6 SHA256 e76dcb361f0ce78f01fcd64a6f18baa4479a163d56253261bf32e47a8a35aa90
 AUX nspluginwrapper-1.3.0-gdk-native-windows.patch 526 RMD160 e254dfc264828d6b1cc11adc73fe5666fbf27072 SHA1 ebe6ce5fa8cd8df4d98bbd5ec298500141f0fda0 SHA256 b616b16549fb1c61a43504da4b81b14ea2649239ff9ef5e7bfb3c58471f6fd1a
 AUX nspluginwrapper-1.3.0-inst-crash.patch 592 RMD160 814f5f7491eb96539f78ac4c742cec030dd6263d SHA1 52c75e510332241568ec7e78a6d9032cf98164fa SHA256 5d724a73978ebffdb082eaf01ffbb2bb98aae4aad8433b56da3f73c2610515c3
-AUX nspluginwrapper-1.3.0-ldflags.patch 777 RMD160 541c4914e2eb9068cc34875b62d2684434888180 SHA1 6573c681fb22e414ff550923fbc68182eb99839c SHA256 f32779cfd46dccb60ba7b708ba17ca4644a56ecef52abf6ad1c7174a3ec9021f
-AUX nspluginwrapper-1.3.0-make.patch 2663 RMD160 1b98f3eb96f9171c92c31a45810de55b8f1972cb SHA1 c69528dcb79a3de9f1fc85d8d4a9d62bb3e32e6c SHA256 1a7d5dfc0f75575ab2a019c2674df1024372626eb7280ed6cad791362db97707
 AUX nspluginwrapper-1.3.0-offsetof.patch 245 RMD160 63003f206042d1c303c09f46d73714e3f366d26b SHA1 90423132c6f9d08cca27667d9f8619a0c5c97391 SHA256 b087e057c2b6a0d49d5b3ee28deb9deb6d2b24490876a08d982c11730d92eb16
 DIST nspluginwrapper-1.2.2.tar.bz2 327947 RMD160 d5aa265966f87c51bb9ea4f2a079a87b74fdcbf3 SHA1 be581c39dcc1a8d9a5b3f81e4650f553a30cf249 SHA256 4e6cbb7aeda1c9f0d6e5a17e729160b5d3f3e7048f90353238806289752175c3
 DIST nspluginwrapper_1.3.0.orig.tar.gz 431176 RMD160 4d01263a010b155e578901913648ed1202f49629 SHA1 4558ed89411e53965cbbf974bf881ac88cff863d SHA256 0af7e2ae4c6258d5c17addbcc4658b84c979860da843873f0d15d90ee9a8259d
 EBUILD nspluginwrapper-1.2.2-r2.ebuild 2678 RMD160 bfa815b401b451d325d7d7519fd1e7f5cc45210e SHA1 cc37fe900554f0257a49b2e4320f63fc1bf009ee SHA256 0498e1cc647e57d4c84e348fcaf55381d85568c76ab2590c0736876801e4b749
-EBUILD nspluginwrapper-1.3.0.ebuild 2933 RMD160 9a61c10169574025743103112163b3eeba961df3 SHA1 96c27817a284ce7cb1ceec671bfe4d7ec7d31c93 SHA256 84f127f0c465c7eed0a4d4303ded5392e753ee4ded5501dc901ce54a5b8aa794
-MISC ChangeLog 7839 RMD160 59055f9700ed044b2da6aa75e9ec7ddc6199ee14 SHA1 f98de00d0ae754887dad96141ea8fa32d3b416d2 SHA256 668c894ae490f95997e5189fb9296b5f7b6df7808aa614f562785d723e9955d9
+EBUILD nspluginwrapper-1.3.0.ebuild 2901 RMD160 154e9e93ac1e3158eeac94a4ccf2338c920b2ba9 SHA1 6bbe9e90f4fbddbcf3e54bc8bb7fc1b0dcb65d84 SHA256 e396e979cb6566be420795d9b7859935ea5a4fbfc19d15497a05e3678981722b
+MISC ChangeLog 8129 RMD160 fb0a5f466e606382a7e4d1e04551e494bddb8145 SHA1 fbac7180c87fceeedb9f471cb92bc06487715376 SHA256 d09c16a4c43bffac48d56f679e23db919131d2ed321b5d4917b887acff576c36
 MISC metadata.xml 253 RMD160 37a89adccd0388cf014f6768a21b1ec09252d21c SHA1 fa43576fb2327afb837b5b2ea57dc6ab8525494b SHA256 0b0d878d1f93316b2966ec90c1f80c46fe67fb3f5647b28f7c30d9647dbb1854
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEUEARECAAYFAkwd6E4ACgkQCaWpQKGI+9QvnQCdEffkhJc8bkMX9kMylz599xEc
-pTEAmOez7buP6PjB9vAKgtSKg2HMDPI=
-=rtuT
+iJwEAQECAAYFAkwd+8sACgkQIiMqcbOVdxQitgQAnj8JO5Qy9r/VIizgo6y0Xz1X
++26Svu+2JmrdLlEe4TU3T8mGBVuLHOG9T3oWscBzqQEgj25hISKoJmmWAaJXEKlp
+mcgsLCuFmpEiL6LcNMpiU6x0lbKBGlZRx+TJ9poLsEEJMRR9mpBKGwAQ6s3Kdr0Y
+7RT6LPblagFX1x+BGR4=
+=Oy+v
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-asneeded.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-asneeded.patch
new file mode 100644
index 000000000000..5ea09e53d54a
--- /dev/null
+++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-asneeded.patch
@@ -0,0 +1,275 @@
+Fixing as-needed issues and respect LDFLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=321867
+
+--- 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
+@@ -51,16 +51,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 +71,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
+@@ -107,8 +107,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
+@@ -120,13 +121,14 @@
+ 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
++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 +139,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
+@@ -174,12 +177,13 @@
+ 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 +196,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 \
+@@ -364,13 +369,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 +384,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 +392,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 +430,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-ldflags.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-ldflags.patch
deleted file mode 100644
index e8922e651179..000000000000
--- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up nspluginwrapper-1.3.0/configure.conf nspluginwrapper-1.3.0/configure
---- nspluginwrapper-1.3.0/configure.conf	2009-01-02 15:22:29.000000000 +0100
-+++ nspluginwrapper-1.3.0/configure	2009-01-07 12:06:21.000000000 +0100
-@@ -559,10 +559,6 @@ for dir in $x_base_dirs; do
- 	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,6 +759,7 @@ echo "COMPILER=$compiler" >> $config_mak
- 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 "GTK_CFLAGS=$GTK_CFLAGS" >> $config_mak
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-make.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-make.patch
deleted file mode 100644
index 13587225b484..000000000000
--- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.3.0-make.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -up nspluginwrapper-1.3.0/Makefile.make nspluginwrapper-1.3.0/Makefile
---- nspluginwrapper-1.3.0/Makefile.make	2009-01-02 15:22:29.000000000 +0100
-+++ nspluginwrapper-1.3.0/Makefile	2009-01-07 13:00:40.000000000 +0100
-@@ -364,13 +364,13 @@ changelog.commit: changelog
- 	svn commit -m "Generated by svn2cl." ChangeLog
- 
- $(npwrapper_LIBRARY): $(npwrapper_OBJECTS)
--	$(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LDFLAGS)
-+	$(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LDFLAGS) $(LDFLAGS)
- 
- 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_OBJECTS) $(npviewer_LDFLAGS) $(LDFLAGS)
- 
- npviewer-%.o: $(SRC_PATH)/src/%.c
- 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER
-@@ -387,19 +387,19 @@ npplayer-%.o: $(SRC_PATH)/src/tidy/%.c
- 	$(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_OBJECTS) $(libxpcom_LDFLAGS) -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_OBJECTS) $(libnoxshm_LDFLAGS) -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_OBJECTS) $(npconfig_LDFLAGS) $(LDFLAGS)
- 
- npconfig-%.o: $(SRC_PATH)/src/%.c
- 	$(CC) -o $@ -c $< $(CPPFLAGS) $(CFLAGS)
-@@ -425,7 +425,7 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ
- 	$(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' '`
- 
diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.3.0.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.3.0.ebuild
index fca9fcb4f2c3..dcb5a3d860a2 100644
--- a/www-plugins/nspluginwrapper/nspluginwrapper-1.3.0.ebuild
+++ b/www-plugins/nspluginwrapper/nspluginwrapper-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.1 2010/06/20 10:07:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.3.0.ebuild,v 1.2 2010/06/20 11:30:09 xarthisius Exp $
 
 EAPI=2
 
@@ -46,12 +46,11 @@ autoinstall() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-gdk-native-windows.patch"
-	epatch "${FILESDIR}/${P}-ldflags.patch"
 	epatch "${FILESDIR}/${P}-inst-crash.patch"
-	epatch "${FILESDIR}/${P}-make.patch"
 	epatch "${FILESDIR}/${P}-fix-npident-array-sending.patch"
 	epatch "${FILESDIR}/${P}-fortify.patch"
 	epatch "${FILESDIR}/${P}-offsetof.patch"
+	epatch "${FILESDIR}/${P}-asneeded.patch"
 }
 
 src_configure() {