Version bump.

(Portage version: 2.1.2.3)

4 files changed, 76 insertions, 96 deletions

diff --git a/net-www/nspluginwrapper/ChangeLog b/net-www/nspluginwrapper/ChangeLog
index ab0113f6efa6..fb0f0b5799b7 100644
--- a/net-www/nspluginwrapper/ChangeLog
+++ b/net-www/nspluginwrapper/ChangeLog
@@ -1,6 +1,13 @@
 # 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.11 2007/03/09 01:39:35 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/ChangeLog,v 1.12 2007/04/08 23:23:06 chutzpah Exp $
+
+*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)
 
diff --git a/net-www/nspluginwrapper/files/digest-nspluginwrapper-0.9.91.4 b/net-www/nspluginwrapper/files/digest-nspluginwrapper-0.9.91.4
new file mode 100644
index 000000000000..128a359f9227
--- /dev/null
+++ b/net-www/nspluginwrapper/files/digest-nspluginwrapper-0.9.91.4
@@ -0,0 +1,3 @@
+MD5 76df5586c229844d28b5db40368e8912 nspluginwrapper-0.9.91.4.tar.bz2 259969
+RMD160 ff5f6b63cb1a15730a22f4976d165e39b32c69b9 nspluginwrapper-0.9.91.4.tar.bz2 259969
+SHA256 18e8626ff72ecead57c744f6177b0d22754e3328ba673f9aec642706f4ccd679 nspluginwrapper-0.9.91.4.tar.bz2 259969
diff --git a/net-www/nspluginwrapper/files/nspluginwrapper-0.9.90.4-gentoo.patch b/net-www/nspluginwrapper/files/nspluginwrapper-0.9.90.4-gentoo.patch
deleted file mode 100644
index aec56a1e4aaa..000000000000
--- a/net-www/nspluginwrapper/files/nspluginwrapper-0.9.90.4-gentoo.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff -ur nspluginwrapper-0.9.90.4-orig/configure nspluginwrapper-0.9.90.4/configure
---- nspluginwrapper-0.9.90.4-orig/configure	2006-11-19 02:40:07.000000000 -0500
-+++ nspluginwrapper-0.9.90.4/configure	2006-11-22 10:54:17.000000000 -0500
-@@ -198,8 +198,8 @@
- 
- # check for 32-bit Glib 2.0 compile CFLAGS (assumed Linux system)
- if test "$biarch" = "yes"; then
--    GLIB_CFLAGS_32=`echo "$GLIB_CFLAGS" | sed -e "s|/$lib64\([ /]\)|/$lib32\1|g"`
--    GLIB_LDFLAGS_32=`echo "$GLIB_LDFLAGS" | sed -e "s|/$lib64\([ /]\)|/$lib32\1|g"`
-+    GLIB_CFLAGS_32="$GLIB_CFLAGS"
-+    GLIB_LDFLAGS_32="-L/emul/linux/x86/usr/lib $GLIB_LDFLAGS"
-     cat > $TMPC << EOF
- #include <glib.h>
- int main(void) {
-@@ -207,18 +207,19 @@
-     return 0;
- }
- EOF
--    if ! $cc $CFLAGS_32 $GLIB_CFLAGS_32 $GLIB_LDFLAGS_32 $TMPC -o $TMPE > /dev/null 2>&1; then
--        echo "32-bit GLIB 2.0 environment not usable, disabling bi-arch build"
-+    if ! $cc $CFLAGS_32 $GLIB_CFLAGS_32 $GLIB_LDFLAGS_32 $TMPC -o $TMPE > /dev/null; then
-+        echo "32-bit GLIB 2.0 environment not usable, bi-arch support unavailable"
-         rm -f $TMPC
--        biarch="no"
-+	# On gentoo, we want to die when biarch isn't available
-+	exit 2
-     fi
-     rm -f $TMPC $TMPE
- fi
- 
- # check for 32-bit GTK+ 2.0 compile CFLAGS (assumed Linux system)
- if test "$biarch" = "yes"; then
--    GTK_CFLAGS_32=`echo "$GTK_CFLAGS" | sed -e "s|/$lib64\([ /]\)|/$lib32\1|g"`
--    GTK_LDFLAGS_32=`echo "$GTK_LDFLAGS" | sed -e "s|/$lib64\([ /]\)|/$lib32\1|g"`
-+    GTK_CFLAGS_32="$GTK_CFLAGS"
-+    GTK_LDFLAGS_32="-L/emul/linux/x86/usr/lib $GTK_LDFLAGS"
-     cat > $TMPC << EOF
- #include <gtk/gtk.h>
- int main(void) {
-@@ -226,10 +227,11 @@
-     return 0;
- }
- EOF
--    if ! $cc $CFLAGS_32 $GTK_CFLAGS_32 $GTK_LDFLAGS_32 $TMPC -o $TMPE > /dev/null 2>&1; then
--        echo "32-bit GTK+ 2.0 environment not usable, disabling bi-arch build"
-+    if ! $cc $CFLAGS_32 $GTK_CFLAGS_32 $GTK_LDFLAGS_32 $TMPC -o $TMPE > /dev/null; then
-+        echo "32-bit GTK+ 2.0 environment not usable, bi-arch support unavailable"
-         rm -f $TMPC
--        biarch="no"
-+	# On gentoo, we want to die when biarch isn't available
-+	exit 2
-     fi
-     rm -f $TMPC $TMPE
- fi
-@@ -365,7 +367,7 @@
- echo "VERSION=$VERSION" >>$config_mak
- echo "#define NPW_VERSION \"$VERSION\"" >> $config_h
- 
--pkglibdir="$prefix/lib/$PACKAGE"
-+pkglibdir="$prefix/$lib64/$PACKAGE"
- echo "pkglibdir=$pkglibdir" >> $config_mak
- echo "#define NPW_LIBDIR \"$pkglibdir\"" >> $config_h
- 
-Only in nspluginwrapper-0.9.90.4-orig/: nspluginwrapper-0.9.90.4
-diff -ur nspluginwrapper-0.9.90.4-orig/src/npw-config.c nspluginwrapper-0.9.90.4/src/npw-config.c
---- nspluginwrapper-0.9.90.4-orig/src/npw-config.c	2006-11-19 02:40:07.000000000 -0500
-+++ nspluginwrapper-0.9.90.4/src/npw-config.c	2006-11-22 10:53:48.000000000 -0500
-@@ -80,17 +80,7 @@
- 
- static const char *get_system_mozilla_plugin_dir(void)
- {
--  static const char default_dir[] = LIBDIR "/mozilla/plugins";
--  const char *dir;
--
--  if (access("/etc/SuSE-release", F_OK) == 0) {
--	dir = LIBDIR "/firefox/plugins";			// new plugins location (10.1?)
--	if (access(dir, F_OK) != 0)
--	  dir = "/opt/MozillaFirefox/lib/plugins";	// XXX not lib64 aware?
--  }
--  else
--	dir = default_dir;							// Mandriva Linux
--
-+  static const char dir[] = LIBDIR "/nsbrowser/plugins";
-   return dir;
- }
- 
-@@ -109,6 +99,8 @@
- static const char **get_mozilla_plugin_dirs(void)
- {
-   static const char *default_dirs[] = {
-+	"/usr/lib32/nsbrowser/plugins",
-+	"/usr/lib64/nsbrowser/plugins",
- 	"/usr/lib/mozilla/plugins",
- 	"/usr/lib64/mozilla/plugins",
- 	"/usr/lib/browser-plugins",
diff --git a/net-www/nspluginwrapper/nspluginwrapper-0.9.91.4.ebuild b/net-www/nspluginwrapper/nspluginwrapper-0.9.91.4.ebuild
new file mode 100644
index 000000000000..58f3767f149a
--- /dev/null
+++ b/net-www/nspluginwrapper/nspluginwrapper-0.9.91.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2007 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.4.ebuild,v 1.1 2007/04/08 23:23:06 chutzpah Exp $
+
+inherit 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/setarch"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+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
+}