Revision bump, add patch to add support for gthread, thanks to Alex Rostovtsev for pulling the patch from Fedora's RPM. (bug #203820)

Package-Manager: portage-2.1.4_rc14

5 files changed, 124 insertions, 16 deletions

diff --git a/net-www/nspluginwrapper/ChangeLog b/net-www/nspluginwrapper/ChangeLog
index 37ecc0ff3fc4..2e3827a30ef9 100644
--- a/net-www/nspluginwrapper/ChangeLog
+++ b/net-www/nspluginwrapper/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-www/nspluginwrapper
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/ChangeLog,v 1.14 2007/08/28 13:33:48 chutzpah Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/ChangeLog,v 1.15 2008/01/10 15:06:42 chutzpah Exp $
+
+*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)
 
diff --git a/net-www/nspluginwrapper/Manifest b/net-www/nspluginwrapper/Manifest
index 8a8d60cfb0bf..5919eb349098 100644
--- a/net-www/nspluginwrapper/Manifest
+++ b/net-www/nspluginwrapper/Manifest
@@ -1,20 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX nspluginwrapper-0.9.91.5-g_thread_init.patch 1294 RMD160 7dd5ddc17d09752d9f6cf3c1291e656ba774ee54 SHA1 b1bc0bd1f4fd1f147cbe7ebe1007f4b6843515db SHA256 541fdbfbfa69060f2fb7dbc2320a696f615dea6aa3a5aa7f74ebfa3d4252aa1c
+MD5 8a4db37c98b579d945fd581655b5a79a files/nspluginwrapper-0.9.91.5-g_thread_init.patch 1294
+RMD160 7dd5ddc17d09752d9f6cf3c1291e656ba774ee54 files/nspluginwrapper-0.9.91.5-g_thread_init.patch 1294
+SHA256 541fdbfbfa69060f2fb7dbc2320a696f615dea6aa3a5aa7f74ebfa3d4252aa1c files/nspluginwrapper-0.9.91.5-g_thread_init.patch 1294
 DIST nspluginwrapper-0.9.91.4.tar.bz2 259969 RMD160 ff5f6b63cb1a15730a22f4976d165e39b32c69b9 SHA1 44a9e35a67f6e8a295d0d8a200cfab95c82bdf47 SHA256 18e8626ff72ecead57c744f6177b0d22754e3328ba673f9aec642706f4ccd679
 DIST nspluginwrapper-0.9.91.5.tar.bz2 273331 RMD160 8f88f3f3e5703f02130c1c3bb3627e07eb7eb7ca SHA1 f5f0126741fec8db2340e6f58d7390cd8c9ca862 SHA256 c1262aff6b223e3d92d422cb814106a07eafbad3f5df645c27af7988e93e6b60
 EBUILD nspluginwrapper-0.9.91.4.ebuild 1955 RMD160 1f6cea8ccb3174f864d6764ee82d7247e967ce0b SHA1 0dfc77f17a99256d603682f1dc269382b1a11412 SHA256 f60adf50e09fbdbec269a1214bd2254a18401c6691e52fa5f36f668dd37b2591
 MD5 c220fafeb4983e0bfee9f147fe2574e3 nspluginwrapper-0.9.91.4.ebuild 1955
 RMD160 1f6cea8ccb3174f864d6764ee82d7247e967ce0b nspluginwrapper-0.9.91.4.ebuild 1955
 SHA256 f60adf50e09fbdbec269a1214bd2254a18401c6691e52fa5f36f668dd37b2591 nspluginwrapper-0.9.91.4.ebuild 1955
+EBUILD nspluginwrapper-0.9.91.5-r1.ebuild 2079 RMD160 ca5699f12712972179ba6ffc34ef5f45243071e2 SHA1 7023bacd3edd2445d13d15b71213ee02810e92d8 SHA256 2656ad48de216cf2099160dcc71462ff8d6bffa4e129391709d78306cc3b6e48
+MD5 63fb5ee0e280a3485f4cf766b0e389b8 nspluginwrapper-0.9.91.5-r1.ebuild 2079
+RMD160 ca5699f12712972179ba6ffc34ef5f45243071e2 nspluginwrapper-0.9.91.5-r1.ebuild 2079
+SHA256 2656ad48de216cf2099160dcc71462ff8d6bffa4e129391709d78306cc3b6e48 nspluginwrapper-0.9.91.5-r1.ebuild 2079
 EBUILD nspluginwrapper-0.9.91.5.ebuild 1956 RMD160 d1a3a6ee5ebc5b4496c667e2f398609293dc5e47 SHA1 4785a7073314fee153b2ce3650d0f5b533b7c772 SHA256 48fd05def94ce6e96e97bc404918dcb11925c61025b47dc3e11a37ba5b84f860
 MD5 3beb55b5517896bb2fe9420d9dac2326 nspluginwrapper-0.9.91.5.ebuild 1956
 RMD160 d1a3a6ee5ebc5b4496c667e2f398609293dc5e47 nspluginwrapper-0.9.91.5.ebuild 1956
 SHA256 48fd05def94ce6e96e97bc404918dcb11925c61025b47dc3e11a37ba5b84f860 nspluginwrapper-0.9.91.5.ebuild 1956
-MISC ChangeLog 3476 RMD160 7b73e55c42df305c8df0906e5c55631d5a4a4f19 SHA1 896a4f5c080664bc770ed781d88c99b8be350712 SHA256 446e73a0bbf7ec61d2b965a82c995f5b35be2dd4aa3a859eacb6e4a2d84eb234
-MD5 d5708ec7f4ab8bdce305d03a22af15b8 ChangeLog 3476
-RMD160 7b73e55c42df305c8df0906e5c55631d5a4a4f19 ChangeLog 3476
-SHA256 446e73a0bbf7ec61d2b965a82c995f5b35be2dd4aa3a859eacb6e4a2d84eb234 ChangeLog 3476
+MISC ChangeLog 3805 RMD160 818b1587dbb65cf578401d9512fb12674dc7a435 SHA1 207f2f36a3cafab50a9bcc22a670651c8eb48ffe SHA256 a9488180843dd4e54f639bc80e2556e644f8b3c30efbfdcf6373127ea2cbb29b
+MD5 3120092360812e9a52f193a8b3d63391 ChangeLog 3805
+RMD160 818b1587dbb65cf578401d9512fb12674dc7a435 ChangeLog 3805
+SHA256 a9488180843dd4e54f639bc80e2556e644f8b3c30efbfdcf6373127ea2cbb29b ChangeLog 3805
 MISC metadata.xml 253 RMD160 37a89adccd0388cf014f6768a21b1ec09252d21c SHA1 fa43576fb2327afb837b5b2ea57dc6ab8525494b SHA256 0b0d878d1f93316b2966ec90c1f80c46fe67fb3f5647b28f7c30d9647dbb1854
 MD5 4e28c7cb2cc3b16b52de1ff9c15aad48 metadata.xml 253
 RMD160 37a89adccd0388cf014f6768a21b1ec09252d21c metadata.xml 253
@@ -25,10 +30,6 @@ SHA256 852f83ed88f26a1a8fb8d0467801b4a0d28bc45c95f9501cd4358902a1675226 files/di
 MD5 8f03b1767fab5359815bd27da7e89f42 files/digest-nspluginwrapper-0.9.91.5 277
 RMD160 eb3d4ab61494d78d04d76969466e39088033eff4 files/digest-nspluginwrapper-0.9.91.5 277
 SHA256 969b85b240ad7b28b95efb0aa024f05be469f0f4b9cf2a30702bc33294ab5975 files/digest-nspluginwrapper-0.9.91.5 277
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
-
-iD8DBQFG1CN+Wt/XSf2CZdkRAumUAJ9slJZHhyCqfzqU7cD8rmPT2GRqaACfaCXN
-KzSoHcxllKCx7E7RJWUSn+Y=
-=AxVx
------END PGP SIGNATURE-----
+MD5 8f03b1767fab5359815bd27da7e89f42 files/digest-nspluginwrapper-0.9.91.5-r1 277
+RMD160 eb3d4ab61494d78d04d76969466e39088033eff4 files/digest-nspluginwrapper-0.9.91.5-r1 277
+SHA256 969b85b240ad7b28b95efb0aa024f05be469f0f4b9cf2a30702bc33294ab5975 files/digest-nspluginwrapper-0.9.91.5-r1 277
diff --git a/net-www/nspluginwrapper/files/digest-nspluginwrapper-0.9.91.5-r1 b/net-www/nspluginwrapper/files/digest-nspluginwrapper-0.9.91.5-r1
new file mode 100644
index 000000000000..5ad972c3655f
--- /dev/null
+++ b/net-www/nspluginwrapper/files/digest-nspluginwrapper-0.9.91.5-r1
@@ -0,0 +1,3 @@
+MD5 052e5fecc36a087d1f7200bd1e44f2f0 nspluginwrapper-0.9.91.5.tar.bz2 273331
+RMD160 8f88f3f3e5703f02130c1c3bb3627e07eb7eb7ca nspluginwrapper-0.9.91.5.tar.bz2 273331
+SHA256 c1262aff6b223e3d92d422cb814106a07eafbad3f5df645c27af7988e93e6b60 nspluginwrapper-0.9.91.5.tar.bz2 273331
diff --git a/net-www/nspluginwrapper/files/nspluginwrapper-0.9.91.5-g_thread_init.patch b/net-www/nspluginwrapper/files/nspluginwrapper-0.9.91.5-g_thread_init.patch
new file mode 100644
index 000000000000..775f1b19ff5a
--- /dev/null
+++ b/net-www/nspluginwrapper/files/nspluginwrapper-0.9.91.5-g_thread_init.patch
@@ -0,0 +1,24 @@
+diff -ru nspluginwrapper-0.9.91.5.orig/Makefile nspluginwrapper-0.9.91.5/Makefile
+--- nspluginwrapper-0.9.91.5.orig/Makefile	2007-12-30 14:32:16.110109991 -0500
++++ nspluginwrapper-0.9.91.5/Makefile	2007-12-30 14:36:03.471424598 -0500
+@@ -96,7 +96,7 @@
+ 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_LDFLAGS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -lgthread-2.0 -ldl -lglib-2.0 -lX11 -lXt
+ else
+ npviewer_CFLAGS += $(GTK_CFLAGS)
+ npviewer_LDFLAGS = $(GTK_LDFLAGS) $(X_LDFLAGS)
+diff -ru nspluginwrapper-0.9.91.5.orig/src/npw-viewer.c nspluginwrapper-0.9.91.5/src/npw-viewer.c
+--- nspluginwrapper-0.9.91.5.orig/src/npw-viewer.c	2007-12-30 14:32:16.138105720 -0500
++++ nspluginwrapper-0.9.91.5/src/npw-viewer.c	2007-12-30 14:32:29.974994816 -0500
+@@ -3001,6 +3001,7 @@
+   XtToolkitInitialize();
+   x_app_context = XtCreateApplicationContext();
+   x_display = XtOpenDisplay(x_app_context, NULL, "npw-viewer", "npw-viewer", NULL, 0, &argc, argv);
++  g_thread_init(NULL);
+   gtk_init(&argc, &argv);
+ 
+   // Initialize RPC communication channel
+Only in nspluginwrapper-0.9.91.5/src: npw-viewer.c.orig
diff --git a/net-www/nspluginwrapper/nspluginwrapper-0.9.91.5-r1.ebuild b/net-www/nspluginwrapper/nspluginwrapper-0.9.91.5-r1.ebuild
new file mode 100644
index 000000000000..906d852457ed
--- /dev/null
+++ b/net-www/nspluginwrapper/nspluginwrapper-0.9.91.5-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/nspluginwrapper-0.9.91.5-r1.ebuild,v 1.1 2008/01/10 15:06:42 chutzpah Exp $
+
+inherit eutils nsplugins flag-o-matic 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/nspluginwrapper/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2
+	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"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-g_thread_init.patch" || die "epatch failed"
+}
+
+src_compile() {
+	econf --with-biarch \
+		--with-lib32=$(ABI=x86 get_libdir) \
+		--with-lib64=$(get_libdir) \
+		--pkglibdir=/usr/$(get_libdir)/${PN} || die
+	emake || die
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" DONT_STRIP=yes install || die
+
+	inst_plugin /usr/$(get_libdir)/nspluginwrapper/x86_64/linux/npwrapper.so
+	dosym /usr/$(get_libdir)/nspluginwrapper/x86_64/linux/npconfig /usr/bin/nspluginwrapper
+
+	dodoc NEWS README TODO ChangeLog
+}
+
+pkg_postinst() {
+	einfo "Auto installing 32bit plugins..."
+	nspluginwrapper -a -i
+	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..."
+	nspluginwrapper -a -r
+}
+
+pkg_postrm() {
+	if [[ -x /usr/bin/nspluginwrapper ]]; then
+		einfo "Auto installing 32bit plugins..."
+		nspluginwrapper -a -i
+	fi
+}