Version bump, clean out versions 0.9.91.5 and 1.1.0.

(Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64)

5 files changed, 6 insertions, 139 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/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() {