From b89dea1f5cd4a718bc0873d3b38808e0b44535a3 Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Sun, 8 Apr 2007 23:23:06 +0000 Subject: [PATCH] Version bump. Package-Manager: portage-2.1.2.3 --- net-www/nspluginwrapper/ChangeLog | 9 +- net-www/nspluginwrapper/Manifest | 30 +++--- .../files/digest-nspluginwrapper-0.9.91.4 | 3 + .../nspluginwrapper-0.9.90.4-gentoo.patch | 95 ------------------- .../nspluginwrapper-0.9.91.4.ebuild | 65 +++++++++++++ 5 files changed, 88 insertions(+), 114 deletions(-) create mode 100644 net-www/nspluginwrapper/files/digest-nspluginwrapper-0.9.91.4 delete mode 100644 net-www/nspluginwrapper/files/nspluginwrapper-0.9.90.4-gentoo.patch create mode 100644 net-www/nspluginwrapper/nspluginwrapper-0.9.91.4.ebuild 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 + -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/Manifest b/net-www/nspluginwrapper/Manifest index 732601f7764b..ddc1f0fe4d37 100644 --- a/net-www/nspluginwrapper/Manifest +++ b/net-www/nspluginwrapper/Manifest @@ -1,12 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX nspluginwrapper-0.9.90.4-gentoo.patch 3602 RMD160 f180da0a78c122d1f98f354eccd148b0c8a06513 SHA1 2b127bd69143fd9bb550c888f015e05846c0a290 SHA256 99015dffab1a2f8910523f127e612400e7392968f301ddc0a0a7b37b3b072305 -MD5 96c25901a5d9a25432b97742b2ed911d files/nspluginwrapper-0.9.90.4-gentoo.patch 3602 -RMD160 f180da0a78c122d1f98f354eccd148b0c8a06513 files/nspluginwrapper-0.9.90.4-gentoo.patch 3602 -SHA256 99015dffab1a2f8910523f127e612400e7392968f301ddc0a0a7b37b3b072305 files/nspluginwrapper-0.9.90.4-gentoo.patch 3602 DIST nspluginwrapper-0.9.91.2.tar.bz2 256748 RMD160 3745e772bcdf450dbcc6c98469615ccdea4cc7a5 SHA1 a9a5d83457189fc744187608d2cee56bf3171650 SHA256 43899df6d305f48066044edaec8b1963f06ccd229327a0bd14840cf9c5c1ca62 DIST nspluginwrapper-0.9.91.3.tar.bz2 257648 RMD160 660d928b508c342003f9ff3483ce8b8d25919e90 SHA1 bcd1e1a2260de022c6d5bc2bff802c8d381805d2 SHA256 3672dcf615f0a0c4a4bafc6e97cd134ad84ea402f916d0c3accff8e9a0aa6c8e +DIST nspluginwrapper-0.9.91.4.tar.bz2 259969 RMD160 ff5f6b63cb1a15730a22f4976d165e39b32c69b9 SHA1 44a9e35a67f6e8a295d0d8a200cfab95c82bdf47 SHA256 18e8626ff72ecead57c744f6177b0d22754e3328ba673f9aec642706f4ccd679 EBUILD nspluginwrapper-0.9.91.2.ebuild 1922 RMD160 069f1dd989e8ba6df49cf275152beedfea8dd433 SHA1 2f35c60113072f9f8c79b823e6993f8238a0cd1a SHA256 386c8f55940355ce9e1db96d0a8be241cc4a75fe17a329d40215aad9e8eff62c MD5 259fc7b140d02c669809b48ad3eccf4e nspluginwrapper-0.9.91.2.ebuild 1922 RMD160 069f1dd989e8ba6df49cf275152beedfea8dd433 nspluginwrapper-0.9.91.2.ebuild 1922 @@ -15,10 +9,14 @@ EBUILD nspluginwrapper-0.9.91.3.ebuild 1922 RMD160 7ae7c344345dc646ab37383eeb262 MD5 4930c7911fda8d697c793a374a7d5c59 nspluginwrapper-0.9.91.3.ebuild 1922 RMD160 7ae7c344345dc646ab37383eeb262f99efa34aa9 nspluginwrapper-0.9.91.3.ebuild 1922 SHA256 99829bc489102b754049e04c4c1a868842dc5ca2c8196ad6208ddb9176f1757a nspluginwrapper-0.9.91.3.ebuild 1922 -MISC ChangeLog 2810 RMD160 e9b0f8038c7d67f4fc4572191a502b4f05c243b7 SHA1 7f97f186cff8a65ab81315afbb68baba23f3a1f7 SHA256 74cb15489e6ecdf725404cef255848db7f5871ae22a5d7cb5a0dab464cc32c1d -MD5 5e6284ff2f18a9ef370c3ae9c5b3057c ChangeLog 2810 -RMD160 e9b0f8038c7d67f4fc4572191a502b4f05c243b7 ChangeLog 2810 -SHA256 74cb15489e6ecdf725404cef255848db7f5871ae22a5d7cb5a0dab464cc32c1d ChangeLog 2810 +EBUILD nspluginwrapper-0.9.91.4.ebuild 1922 RMD160 3466a17505453116a40f1e932162abebc4a8d148 SHA1 b39179b9fe1456023679e29881daaa0162722dd3 SHA256 233815ca84ac2ea1dea7f433bc13e65a7da6e317bdc7b6307668e2c1848bf0bb +MD5 d855e14d1fb054478739f301a0727b01 nspluginwrapper-0.9.91.4.ebuild 1922 +RMD160 3466a17505453116a40f1e932162abebc4a8d148 nspluginwrapper-0.9.91.4.ebuild 1922 +SHA256 233815ca84ac2ea1dea7f433bc13e65a7da6e317bdc7b6307668e2c1848bf0bb nspluginwrapper-0.9.91.4.ebuild 1922 +MISC ChangeLog 3001 RMD160 ea848a0be0ac9819b92e44447295932ece4a756c SHA1 28dabadbf9ee9b913ba73ac84a241a2ead28260c SHA256 c9d612745d063af4b053934106b1366b5e0bb480f2b0e8c513c9d1cf5774a9f1 +MD5 cf2665ba21c29d6a6d59395399bc7362 ChangeLog 3001 +RMD160 ea848a0be0ac9819b92e44447295932ece4a756c ChangeLog 3001 +SHA256 c9d612745d063af4b053934106b1366b5e0bb480f2b0e8c513c9d1cf5774a9f1 ChangeLog 3001 MISC metadata.xml 253 RMD160 37a89adccd0388cf014f6768a21b1ec09252d21c SHA1 fa43576fb2327afb837b5b2ea57dc6ab8525494b SHA256 0b0d878d1f93316b2966ec90c1f80c46fe67fb3f5647b28f7c30d9647dbb1854 MD5 4e28c7cb2cc3b16b52de1ff9c15aad48 metadata.xml 253 RMD160 37a89adccd0388cf014f6768a21b1ec09252d21c metadata.xml 253 @@ -29,10 +27,6 @@ SHA256 48a9210d884a758d9f3e6eb06bccedd947473372763fbc8b9d348269a8b88dde files/di MD5 dfbe47dc7aa51aecb29d19ed51ec7d7c files/digest-nspluginwrapper-0.9.91.3 277 RMD160 e8d12c1c2d6c2db59b54acdb4a0a9d2898e0f293 files/digest-nspluginwrapper-0.9.91.3 277 SHA256 76176a4ef17d49fd57fee36202fc2c92f05b1f39829eccd093bc4d18dad9377f files/digest-nspluginwrapper-0.9.91.3 277 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFF8LruWt/XSf2CZdkRAmJLAJ43x6CcWOvgibXLFClSi7Tsc7bBtgCcCH5I -B2GNSR5sXtbZBiI/xhzGRUo= -=9lG5 ------END PGP SIGNATURE----- +MD5 88d8bb444f3f9f6aa51272161f85aa22 files/digest-nspluginwrapper-0.9.91.4 277 +RMD160 847ff4baa710076f522b48753e44c77f6c1f4c85 files/digest-nspluginwrapper-0.9.91.4 277 +SHA256 852f83ed88f26a1a8fb8d0467801b4a0d28bc45c95f9501cd4358902a1675226 files/digest-nspluginwrapper-0.9.91.4 277 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 - 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 - 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 \"" + 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 +} -- 2.26.2