From 1c292ca4d5bc931de536ff5edf563cd4c0269f86 Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Thu, 4 Jan 2007 00:18:03 +0000 Subject: [PATCH] Version bump, changed installation dir of plugins as per suggestion made by Christian Birchinger , bug #159157. Clean out older version. Package-Manager: portage-2.1.2_rc4-r5 --- net-www/nspluginwrapper/Manifest | 38 +++----- .../files/digest-nspluginwrapper-0.9.90.3 | 3 - .../nspluginwrapper-0.9.90.3-gentoo.patch | 50 ---------- .../nspluginwrapper-0.9.90.3.ebuild | 94 ------------------- 4 files changed, 12 insertions(+), 173 deletions(-) delete mode 100644 net-www/nspluginwrapper/files/digest-nspluginwrapper-0.9.90.3 delete mode 100644 net-www/nspluginwrapper/files/nspluginwrapper-0.9.90.3-gentoo.patch delete mode 100644 net-www/nspluginwrapper/nspluginwrapper-0.9.90.3.ebuild diff --git a/net-www/nspluginwrapper/Manifest b/net-www/nspluginwrapper/Manifest index 919148b99752..6afd71b1fbc5 100644 --- a/net-www/nspluginwrapper/Manifest +++ b/net-www/nspluginwrapper/Manifest @@ -1,42 +1,28 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX nspluginwrapper-0.9.90.3-gentoo.patch 2105 RMD160 469406b7935e59ef77835a0af0a7e9aba06832d1 SHA1 cf99704cf7bcb04a74e685a676006aea43fe1574 SHA256 32b2edeb3bc1533bc93217178e952e572b77c28cf380e10327024d718d0abe7c -MD5 99c0c63392eedc59c8987bba8c436e66 files/nspluginwrapper-0.9.90.3-gentoo.patch 2105 -RMD160 469406b7935e59ef77835a0af0a7e9aba06832d1 files/nspluginwrapper-0.9.90.3-gentoo.patch 2105 -SHA256 32b2edeb3bc1533bc93217178e952e572b77c28cf380e10327024d718d0abe7c files/nspluginwrapper-0.9.90.3-gentoo.patch 2105 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.90.3.tar.bz2 84722 RMD160 a3f466656faafd8b165e7b06373905a7f3bbcb60 SHA1 b3f17377cc682d335b971cfe986e4a408293b81f SHA256 bfac222d5f5c5d7922358d774a23b20d4604886f8a334f94c411a0372e0bf5da DIST nspluginwrapper-0.9.90.4.tar.bz2 88255 RMD160 a5dd422106215f1ab0fd9985a6999a4b8fab9da4 SHA1 998982b7a32baa1f92ad67b093da2d97d5689f79 SHA256 bd0fb5f82eb70c0c1a434a2f12403a31510a5d7e09c068936349c8572045f3ed -EBUILD nspluginwrapper-0.9.90.3.ebuild 2526 RMD160 7f13e32c6c89206f0f09882e95882637ce4d4672 SHA1 156fac5c593674966c8318980721ff09312572a3 SHA256 df443272d1d7bb3b2d653e2f5066e7529fcf432d7a2454308e9ebc24d3364756 -MD5 47d55da896157eb2fadb5a94b7e9641f nspluginwrapper-0.9.90.3.ebuild 2526 -RMD160 7f13e32c6c89206f0f09882e95882637ce4d4672 nspluginwrapper-0.9.90.3.ebuild 2526 -SHA256 df443272d1d7bb3b2d653e2f5066e7529fcf432d7a2454308e9ebc24d3364756 nspluginwrapper-0.9.90.3.ebuild 2526 +DIST nspluginwrapper-0.9.91.2.tar.bz2 256748 RMD160 3745e772bcdf450dbcc6c98469615ccdea4cc7a5 SHA1 a9a5d83457189fc744187608d2cee56bf3171650 SHA256 43899df6d305f48066044edaec8b1963f06ccd229327a0bd14840cf9c5c1ca62 EBUILD nspluginwrapper-0.9.90.4.ebuild 2075 RMD160 4dc1f3a6dd4aece5dccef866dd58025611e21da4 SHA1 ad1aa347fddc8f3f16bea7146ef66529a4e122f9 SHA256 07b70891a61c4d526e8df3bde59229e74417705a6f20499e28f40ba2398a7d3b MD5 8a4fef7fa3244d965b3dfcc17eacd89c nspluginwrapper-0.9.90.4.ebuild 2075 RMD160 4dc1f3a6dd4aece5dccef866dd58025611e21da4 nspluginwrapper-0.9.90.4.ebuild 2075 SHA256 07b70891a61c4d526e8df3bde59229e74417705a6f20499e28f40ba2398a7d3b nspluginwrapper-0.9.90.4.ebuild 2075 -MISC ChangeLog 1965 RMD160 c9932df6e2b480f52fc545556e30712981cf5f4a SHA1 080381d8b89435eb07b9e555b9cb4c65465a7be9 SHA256 9d30aae6de01e65469d1079f743b36a9ca39046e4bf927a6246df5ee9a5b112c -MD5 52f3c1ce9c66efc575f1ab1225a90da2 ChangeLog 1965 -RMD160 c9932df6e2b480f52fc545556e30712981cf5f4a ChangeLog 1965 -SHA256 9d30aae6de01e65469d1079f743b36a9ca39046e4bf927a6246df5ee9a5b112c ChangeLog 1965 +EBUILD nspluginwrapper-0.9.91.2.ebuild 2049 RMD160 11be9460880dca3766ef8982d906a2e70527d69b SHA1 c9df8666c2c7d0fd082fe1b350535007ce61b8f8 SHA256 f74d53882d10666383ace81e0dc4c63d2fef5d62f9476ebedb4c60b593cf3bda +MD5 63dc59fffd6781d6760375aa023d9197 nspluginwrapper-0.9.91.2.ebuild 2049 +RMD160 11be9460880dca3766ef8982d906a2e70527d69b nspluginwrapper-0.9.91.2.ebuild 2049 +SHA256 f74d53882d10666383ace81e0dc4c63d2fef5d62f9476ebedb4c60b593cf3bda nspluginwrapper-0.9.91.2.ebuild 2049 +MISC ChangeLog 2338 RMD160 c3b0f361ee927eab4ce47075889b12fcf330a5cd SHA1 aedba006565c5b2b2de08b139ca6526fdbe44d75 SHA256 4737301c589ad19577994307103ef7e14718f335a8a11c4ac6f5ddbdd31f962d +MD5 e3ec70f91d1d6f0df851b4134b40099e ChangeLog 2338 +RMD160 c3b0f361ee927eab4ce47075889b12fcf330a5cd ChangeLog 2338 +SHA256 4737301c589ad19577994307103ef7e14718f335a8a11c4ac6f5ddbdd31f962d ChangeLog 2338 MISC metadata.xml 253 RMD160 37a89adccd0388cf014f6768a21b1ec09252d21c SHA1 fa43576fb2327afb837b5b2ea57dc6ab8525494b SHA256 0b0d878d1f93316b2966ec90c1f80c46fe67fb3f5647b28f7c30d9647dbb1854 MD5 4e28c7cb2cc3b16b52de1ff9c15aad48 metadata.xml 253 RMD160 37a89adccd0388cf014f6768a21b1ec09252d21c metadata.xml 253 SHA256 0b0d878d1f93316b2966ec90c1f80c46fe67fb3f5647b28f7c30d9647dbb1854 metadata.xml 253 -MD5 397888db9d6eeda3e65a6207fe603d6f files/digest-nspluginwrapper-0.9.90.3 274 -RMD160 8eeb904e4353e813032c6078efc21bfa28e780d8 files/digest-nspluginwrapper-0.9.90.3 274 -SHA256 51a00327c66f935d5fada6fd50a72ceed17653f33e602c32ce313ba18268fc04 files/digest-nspluginwrapper-0.9.90.3 274 MD5 161f42760672d29d5d08f1e6378fc5d0 files/digest-nspluginwrapper-0.9.90.4 274 RMD160 fba56222f919cdf664da74f3bf3c7591699e00f8 files/digest-nspluginwrapper-0.9.90.4 274 SHA256 77f8ec491c306d7889de155a6fd2f660036b41245d39debbf8726b0aaa33f0c8 files/digest-nspluginwrapper-0.9.90.4 274 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFZHPSWt/XSf2CZdkRAq1MAKCV8J6w3c//gFKUvdrIUczRvxfnigCfSSEk -RXT0eAeadRbHnR7N2zzKSvs= -=huIq ------END PGP SIGNATURE----- +MD5 df5a6baa7cbca76d3cdad106ed812141 files/digest-nspluginwrapper-0.9.91.2 277 +RMD160 aee32990904f8781a7ccc3d99975e45725151813 files/digest-nspluginwrapper-0.9.91.2 277 +SHA256 48a9210d884a758d9f3e6eb06bccedd947473372763fbc8b9d348269a8b88dde files/digest-nspluginwrapper-0.9.91.2 277 diff --git a/net-www/nspluginwrapper/files/digest-nspluginwrapper-0.9.90.3 b/net-www/nspluginwrapper/files/digest-nspluginwrapper-0.9.90.3 deleted file mode 100644 index c9d633bd0692..000000000000 --- a/net-www/nspluginwrapper/files/digest-nspluginwrapper-0.9.90.3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 71f9f0642fd082e676f9c2dfc1953a73 nspluginwrapper-0.9.90.3.tar.bz2 84722 -RMD160 a3f466656faafd8b165e7b06373905a7f3bbcb60 nspluginwrapper-0.9.90.3.tar.bz2 84722 -SHA256 bfac222d5f5c5d7922358d774a23b20d4604886f8a334f94c411a0372e0bf5da nspluginwrapper-0.9.90.3.tar.bz2 84722 diff --git a/net-www/nspluginwrapper/files/nspluginwrapper-0.9.90.3-gentoo.patch b/net-www/nspluginwrapper/files/nspluginwrapper-0.9.90.3-gentoo.patch deleted file mode 100644 index 7e6f92367818..000000000000 --- a/net-www/nspluginwrapper/files/nspluginwrapper-0.9.90.3-gentoo.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -ur nspluginwrapper-0.9.90.1-orig/Makefile nspluginwrapper-0.9.90.1/Makefile ---- nspluginwrapper-0.9.90.1-orig/Makefile 2006-10-19 09:33:49.000000000 -0400 -+++ nspluginwrapper-0.9.90.1/Makefile 2006-10-19 09:34:11.000000000 -0400 -@@ -35,7 +35,7 @@ - npviewer_LDFLAGS = -L/usr/X11R6/$(lib) -lX11 -lXext -lXt -ldl -lpthread - npviewer_LDFLAGS += $(GTK_LDFLAGS) - ifeq ($(ARCH),i386) --npviewer_LDFLAGS += -Wl,-shared -+npviewer_LDFLAGS += -Wl,-shared -L/emul/linux/x86/usr/lib - endif - - npconfig_PROGRAM = npconfig -diff -ur nspluginwrapper-0.9.90.1-orig/configure nspluginwrapper-0.9.90.1/configure ---- nspluginwrapper-0.9.90.1-orig/configure 2006-10-19 09:33:49.000000000 -0400 -+++ nspluginwrapper-0.9.90.1/configure 2006-10-19 10:15:31.000000000 -0400 -@@ -260,7 +260,7 @@ - echo "VERSION=$VERSION" >>$config_mak - echo "#define NPW_VERSION \"$VERSION\"" >> $config_h - --pkglibdir="$prefix/lib/$PACKAGE" -+pkglibdir="$prefix/$lib/$PACKAGE" - echo "pkglibdir=$pkglibdir" >> $config_mak - echo "#define NPW_LIBDIR \"$pkglibdir\"" >> $config_h - -diff -ur nspluginwrapper-0.9.90.1-orig/src/npw-config.c nspluginwrapper-0.9.90.1/src/npw-config.c ---- nspluginwrapper-0.9.90.1-orig/src/npw-config.c 2006-10-19 09:33:49.000000000 -0400 -+++ nspluginwrapper-0.9.90.1/src/npw-config.c 2006-10-19 09:34:11.000000000 -0400 -@@ -80,11 +80,11 @@ - - static const char *get_system_mozilla_plugin_dir(void) - { -- static const char default_dir[] = LIBDIR "/mozilla/plugins"; -+ static const char default_dir[] = LIBDIR "/nsbrowser/plugins"; - const char *dir; - - if (access("/etc/SuSE-release", F_OK) == 0) { -- dir = LIBDIR "/firefox/plugins"; // new plugins location (10.1?) -+ dir = LIBDIR "/nsbrowser/plugins"; // new plugins location (10.1?) - if (access(dir, F_OK) != 0) - dir = "/opt/MozillaFirefox/lib/plugins"; // XXX not lib64 aware? - } -@@ -109,6 +109,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.90.3.ebuild b/net-www/nspluginwrapper/nspluginwrapper-0.9.90.3.ebuild deleted file mode 100644 index ffdcf5ce483c..000000000000 --- a/net-www/nspluginwrapper/nspluginwrapper-0.9.90.3.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/nspluginwrapper-0.9.90.3.ebuild,v 1.5 2006/11/13 15:29:21 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" - -TARGET_CPU="i386" -TARGET_ABI="x86" - -# I don't know how to get rid of these textrels -QA_TEXTRELS_amd64="usr/$(get_libdir)/nspluginwrapper/i386/npviewer.bin" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-gentoo.patch -} - -src_compile() { - append-flags "-std=c99" - - ./configure \ - --prefix=/usr \ - --with-lib=$(get_libdir) \ - --with-cc=$(tc-getCC) \ - --target-cpu=${TARGET_CPU} || die - emake || die - - mkdir build-${TARGET_CPU}-linux - cd build-${TARGET_CPU}-linux - ABI="${TARGET_ABI}" linux32 ../configure \ - --prefix=/usr \ - --with-lib=$(get_libdir) \ - --with-cc=$(tc-getCC) \ - --target-cpu=${TARGET_CPU} || die - ABI="${TARGET_ABI}" linux32 emake npviewer.bin || die -} - -src_install() { - emake DESTDIR="${D}" DONT_STRIP=yes install || die - - cd build-${TARGET_CPU}-linux - ABI="${TARGET_ABI}" emake DESTDIR="${D}" DONT_STRIP=yes install.viewer || die - cd "${S}" - - inst_plugin /usr/lib/nspluginwrapper/x86_64/npwrapper.so - dosym /usr/lib/nspluginwrapper/x86_64/npconfig /usr/bin/nspluginwrapper - - dodoc NEWS README TODO -} - -pkg_postinst() { - einfo "Auto installing 32bit plugins" - nspluginwrapper -v -a -i - einfo "Any 32bit plugins you currently have installed have now been" - einfo "configured to work in a 64bit browser. Any plugins you install in" - einfo "the future will first need to be setup with:" - einfo " \"nspluginwrapper -i \"" - einfo "before they will function in a 64bit browser" - einfo -} - -# 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 -v -a -r -} - -pkg_postrm() { - if [[ -x /usr/bin/nspluginwrapper ]]; then - einfo "Auto installing 32bit plugins" - nspluginwrapper -v -a -i - fi -} -- 2.26.2