Version bump, clean out versions 0.9.91.5 and 1.1.0.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64

6 files changed, 12 insertions, 149 deletions

diff --git a/net-www/nspluginwrapper/ChangeLog b/net-www/nspluginwrapper/ChangeLog
index a7e70c483b2e..6764bd84d290 100644
--- a/net-www/nspluginwrapper/ChangeLog
+++ b/net-www/nspluginwrapper/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/nspluginwrapper
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/ChangeLog,v 1.20 2008/10/02 03:19:56 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/ChangeLog,v 1.21 2008/10/15 15:56:48 chutzpah Exp $
+
+  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)
 
diff --git a/net-www/nspluginwrapper/Manifest b/net-www/nspluginwrapper/Manifest
index 72f2d7400f6a..17c97bf71532 100644
--- a/net-www/nspluginwrapper/Manifest
+++ b/net-www/nspluginwrapper/Manifest
@@ -1,21 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX nspluginwrapper-0.9.91.5-g_thread_init.patch 1294 RMD160 7dd5ddc17d09752d9f6cf3c1291e656ba774ee54 SHA1 b1bc0bd1f4fd1f147cbe7ebe1007f4b6843515db SHA256 541fdbfbfa69060f2fb7dbc2320a696f615dea6aa3a5aa7f74ebfa3d4252aa1c
 AUX nspluginwrapper-1.1.0-quiet-64bit-plugin-warnings.patch 567 RMD160 5bb8443a462de16ece2d94bc4b2f0b0ad06c97fe SHA1 dae3cadf82aa577080a0e680ec005086632c0d61 SHA256 62901e936c70567237422c2293c4ed4fc83f4b6189c310a380cb228e9bb38e63
-AUX nspluginwrapper-1.1.0-windowless-crash.patch 1392 RMD160 d853f820ef5b3d3b0d76b5cd7821e6499a24d438 SHA1 7bed1cce6907efb46cf51bec8d288103de09b918 SHA256 9dbd9b9f6d3722c5c589ea0588d5b9ce401c916fab092bc2995f842ba6eb0b94
-DIST nspluginwrapper-0.9.91.5.tar.bz2 273331 RMD160 8f88f3f3e5703f02130c1c3bb3627e07eb7eb7ca SHA1 f5f0126741fec8db2340e6f58d7390cd8c9ca862 SHA256 c1262aff6b223e3d92d422cb814106a07eafbad3f5df645c27af7988e93e6b60
 DIST nspluginwrapper-1.0.0.tar.bz2 271028 RMD160 d3b5a5d1dd314e5331ffc877fb9621d6566087c6 SHA1 ef551fb508835b3358355477be794a34e9f64135 SHA256 e5c4661eb91d05fc3da2f4ccf6e0769e8cd097ac232ffc6afe16e645729a02d5
-DIST nspluginwrapper-1.1.0.tar.bz2 304485 RMD160 70fb7ba9425eff569e5b8b17d0f817b91883e26a SHA1 48e548ac7ef7e12ffb2784752bb321141921cda6 SHA256 ec660115a5ab30003d35ef3df301aca167d0212aaf1921bd52c9cda900446177
-EBUILD nspluginwrapper-0.9.91.5-r1.ebuild 2077 RMD160 1dce1a7999c2c48021533d544dfaf12df5b1a9d8 SHA1 0d60f11f40aab11b273e1355b60fdf0c62e26f2e SHA256 bec5accc7bdca0402a5c9e12a4ce1f0e2d6521e895636733e10f59df4f2c2e90
+DIST nspluginwrapper-1.1.2.tar.bz2 313055 RMD160 7bcfa58aa0992eb9e3972d7fdcbfd0e8fbe38858 SHA1 6aea3a82a188bbe875f26349999009104ed49cee SHA256 aa3f96c6098340b5b438cbe0e79c2e6d8ec2a5a59a06fd112a8d5e722ef4025f
 EBUILD nspluginwrapper-1.0.0.ebuild 1959 RMD160 349baa0220bf9fed5553fe22c005ffece334459d SHA1 ed4194b5cbb674d9a14f8cea911a476411f450d7 SHA256 cca609775cf6b28bb8ea5be214ee367dddcbd90687880ce86cc492c1e04c39d7
-EBUILD nspluginwrapper-1.1.0-r1.ebuild 2113 RMD160 91d4acefea6084750f7f2f390172a925c8876057 SHA1 3906dd16e756fdfa125d49e38733b1a2ff990ee9 SHA256 c98bf53e1f315c70ad07c740d7b83c866993bd9236f9f1b25c171ffa9b8842e1
-MISC ChangeLog 4798 RMD160 ee519eb9a9aeb2780508a98415f4865b8520e572 SHA1 365874acd76d7edcc9b5fa0a63acee5c56ff65a6 SHA256 e52e60949e661278e9abd3216d300aa69095e7f9a56a5cedc18dee364db47ddc
+EBUILD nspluginwrapper-1.1.2.ebuild 2038 RMD160 f9fc60bfc81230cfdf3720b8f348dfc39ae11c2c SHA1 5e9806866ed5544d4281f5f2897002f9d69eb995 SHA256 777da343ef9942d292da21fcef2f4abf60ff5a517729e5afaa72568161f6fb5a
+MISC ChangeLog 4917 RMD160 ca4a3f5a079bf725a484673436651b69a72370c8 SHA1 afa1415de69d2621eb2ff2313c0e2317a69e6c3a SHA256 411dc12664a70856e5475192d826630a101914014c6f8ae283febb89beb907f6
 MISC metadata.xml 253 RMD160 37a89adccd0388cf014f6768a21b1ec09252d21c SHA1 fa43576fb2327afb837b5b2ea57dc6ab8525494b SHA256 0b0d878d1f93316b2966ec90c1f80c46fe67fb3f5647b28f7c30d9647dbb1854
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjkPf4ACgkQWt/XSf2CZdl1CACfQDK1EJ8LxNkgIZfYrsx2K2QI
-32UAniUX46S+A8SQCj3r/xhRPv+5460V
-=3eoI
+iEYEARECAAYFAkj2Es4ACgkQWt/XSf2CZdkvFgCfbsC8WYja0rmfH2Smq86QRi5e
+fZUAn2qwezP5U4LLxx/Xe14NE0VgtaLU
+=0ntD
 -----END PGP SIGNATURE-----
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
deleted file mode 100644
index 775f1b19ff5a..000000000000
--- a/net-www/nspluginwrapper/files/nspluginwrapper-0.9.91.5-g_thread_init.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/files/nspluginwrapper-1.1.0-windowless-crash.patch b/net-www/nspluginwrapper/files/nspluginwrapper-1.1.0-windowless-crash.patch
deleted file mode 100644
index b80538ff4eb9..000000000000
--- a/net-www/nspluginwrapper/files/nspluginwrapper-1.1.0-windowless-crash.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-2008-09-30  Gwenole Beauchesne  <gb.public@free.fr>
-
-	* src/npw-rpc (do_send_NPSetWindowCallbackStruct): Check for
-	NULL visual.
-	* src/npw-viewer.c (create_window_attributes): Get system
-	visual when we are passed a 0 visual ID.
-
-Index: src/npw-viewer.c
-===================================================================
---- src/npw-viewer.c	(revision 645)
-+++ src/npw-viewer.c	(revision 646)
-@@ -358,7 +358,11 @@
- {
-   if (ws_info == NULL)
- 	return -1;
--  GdkVisual *gdk_visual = gdkx_visual_get((uintptr_t)ws_info->visual);
-+  GdkVisual *gdk_visual;
-+  if (ws_info->visual)
-+	gdk_visual = gdkx_visual_get((uintptr_t)ws_info->visual);
-+  else
-+	gdk_visual = gdk_visual_get_system();
-   if (gdk_visual == NULL) {
- 	npw_printf("ERROR: could not reconstruct XVisual from visualID\n");
- 	return -2;
-Index: src/npw-rpc.c
-===================================================================
---- src/npw-rpc.c	(revision 645)
-+++ src/npw-rpc.c	(revision 646)
-@@ -381,7 +381,7 @@
- 	  return error;
- 	if ((error = rpc_message_send_int32(message, ws_info->type)) < 0)
- 	  return error;
--	if ((error = rpc_message_send_uint32(message, XVisualIDFromVisual(ws_info->visual))) < 0)
-+	if ((error = rpc_message_send_uint32(message, ws_info->visual ? XVisualIDFromVisual(ws_info->visual) : 0)) < 0)
- 	  return error;
- 	if ((error = rpc_message_send_uint32(message, ws_info->colormap)) < 0)
- 	  return error;
diff --git a/net-www/nspluginwrapper/nspluginwrapper-0.9.91.5-r1.ebuild b/net-www/nspluginwrapper/nspluginwrapper-0.9.91.5-r1.ebuild
deleted file mode 100644
index 4441c949ccfb..000000000000
--- a/net-www/nspluginwrapper/nspluginwrapper-0.9.91.5-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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.2 2008/03/01 14:04:07 angelos 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
-}
diff --git a/net-www/nspluginwrapper/nspluginwrapper-1.1.0-r1.ebuild b/net-www/nspluginwrapper/nspluginwrapper-1.1.2.ebuild
index 158d6c84c80a..161403e70707 100644
--- a/net-www/nspluginwrapper/nspluginwrapper-1.1.0-r1.ebuild
+++ b/net-www/nspluginwrapper/nspluginwrapper-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # 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-1.1.0-r1.ebuild,v 1.1 2008/10/02 03:16:56 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/nspluginwrapper-1.1.2.ebuild,v 1.1 2008/10/15 15:56:48 chutzpah Exp $
 
 inherit eutils nsplugins multilib
 
@@ -24,11 +24,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# should fix some crashing
-	epatch "${FILESDIR}/${P}-windowless-crash.patch"
-
 	# bug #238403
-	epatch "${FILESDIR}/${P}-quiet-64bit-plugin-warnings.patch"
+	epatch "${FILESDIR}/${PN}-1.1.0-quiet-64bit-plugin-warnings.patch"
 }
 
 src_compile() {