From: Patrick McLean Date: Mon, 20 Nov 2006 20:51:14 +0000 (+0000) Subject: Version bump, rework ebuild somewhat since the new version has a more automated build... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1f7afb60850f5d5221f164551b182dea7522cbbc;p=gentoo.git Version bump, rework ebuild somewhat since the new version has a more automated build system. Remove the "-v" from the calls to nspluginwrapper so merging and unmerging doesn't print useless verbose info about the plugins being installed. Package-Manager: portage-2.1.2_rc1-r6 --- diff --git a/net-www/nspluginwrapper/ChangeLog b/net-www/nspluginwrapper/ChangeLog index f10bd1ef8e78..36a536c73ac6 100644 --- a/net-www/nspluginwrapper/ChangeLog +++ b/net-www/nspluginwrapper/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-www/nspluginwrapper # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/ChangeLog,v 1.5 2006/11/13 15:29:21 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/ChangeLog,v 1.6 2006/11/20 20:51:14 chutzpah Exp $ + +*nspluginwrapper-0.9.90.4 (20 Nov 2006) + + 20 Nov 2006; Patrick McLean + +files/nspluginwrapper-0.9.90.4-gentoo.patch, + +nspluginwrapper-0.9.90.4.ebuild: + Version bump, rework ebuild somewhat since the new version has a more + automated build system. Remove the "-v" from the calls to nspluginwrapper so + merging and unmerging doesn't print useless verbose info about the plugins + being installed. 13 Nov 2006; Patrick McLean nspluginwrapper-0.9.90.3.ebuild: diff --git a/net-www/nspluginwrapper/Manifest b/net-www/nspluginwrapper/Manifest index b3cbbae9e69d..c68056831d64 100644 --- a/net-www/nspluginwrapper/Manifest +++ b/net-www/nspluginwrapper/Manifest @@ -2,15 +2,24 @@ AUX nspluginwrapper-0.9.90.3-gentoo.patch 2105 RMD160 469406b7935e59ef77835a0af0 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 3326 RMD160 143343871875c343ce8fe2461acce6cc80da277e SHA1 617c2c0eda4fca1a79785fa622e54666009257ac SHA256 f4a6e4cdd36e7095589ad698fd0f78137f9f05f499ff758630d9f00ea1bae0f7 +MD5 1a2e924b72d901b45ec56dd48b88f2ae files/nspluginwrapper-0.9.90.4-gentoo.patch 3326 +RMD160 143343871875c343ce8fe2461acce6cc80da277e files/nspluginwrapper-0.9.90.4-gentoo.patch 3326 +SHA256 f4a6e4cdd36e7095589ad698fd0f78137f9f05f499ff758630d9f00ea1bae0f7 files/nspluginwrapper-0.9.90.4-gentoo.patch 3326 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 -MISC ChangeLog 1338 RMD160 6d3c3e9513aca7a64ac55947838da9c89ec8b4e6 SHA1 7998164c3210a1400d635ee3e43675d3d6e7fc49 SHA256 08d1f49e13736f19287bd54ea2e7ba1c7da8037e8db16cab4b6658a6146e7ead -MD5 78cc457f29ef536b4dc815a61e9a1cf8 ChangeLog 1338 -RMD160 6d3c3e9513aca7a64ac55947838da9c89ec8b4e6 ChangeLog 1338 -SHA256 08d1f49e13736f19287bd54ea2e7ba1c7da8037e8db16cab4b6658a6146e7ead ChangeLog 1338 +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 1763 RMD160 093928a4973c3cb27c160a2f12c882a1cd6990cf SHA1 29f00b522712bfadf8f9c9dc3b2d40f48f63d4b9 SHA256 73df82e7aa53298ee175ca73901ab594d2ac2365711fe1014b4de7f395a456db +MD5 8258cd3fc25f83e50bb549304396e836 ChangeLog 1763 +RMD160 093928a4973c3cb27c160a2f12c882a1cd6990cf ChangeLog 1763 +SHA256 73df82e7aa53298ee175ca73901ab594d2ac2365711fe1014b4de7f395a456db ChangeLog 1763 MISC metadata.xml 253 RMD160 37a89adccd0388cf014f6768a21b1ec09252d21c SHA1 fa43576fb2327afb837b5b2ea57dc6ab8525494b SHA256 0b0d878d1f93316b2966ec90c1f80c46fe67fb3f5647b28f7c30d9647dbb1854 MD5 4e28c7cb2cc3b16b52de1ff9c15aad48 metadata.xml 253 RMD160 37a89adccd0388cf014f6768a21b1ec09252d21c metadata.xml 253 @@ -18,3 +27,6 @@ SHA256 0b0d878d1f93316b2966ec90c1f80c46fe67fb3f5647b28f7c30d9647dbb1854 metadata 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 diff --git a/net-www/nspluginwrapper/files/digest-nspluginwrapper-0.9.90.4 b/net-www/nspluginwrapper/files/digest-nspluginwrapper-0.9.90.4 new file mode 100644 index 000000000000..6d063ce6faee --- /dev/null +++ b/net-www/nspluginwrapper/files/digest-nspluginwrapper-0.9.90.4 @@ -0,0 +1,3 @@ +MD5 f58719896386ede49f652a5c73f9dfc0 nspluginwrapper-0.9.90.4.tar.bz2 88255 +RMD160 a5dd422106215f1ab0fd9985a6999a4b8fab9da4 nspluginwrapper-0.9.90.4.tar.bz2 88255 +SHA256 bd0fb5f82eb70c0c1a434a2f12403a31510a5d7e09c068936349c8572045f3ed nspluginwrapper-0.9.90.4.tar.bz2 88255 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 new file mode 100644 index 000000000000..6f24778999bc --- /dev/null +++ b/net-www/nspluginwrapper/files/nspluginwrapper-0.9.90.4-gentoo.patch @@ -0,0 +1,90 @@ +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-20 14:12:16.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) { +@@ -208,17 +208,18 @@ + } + 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" ++ 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) { +@@ -227,9 +228,10 @@ + } + 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" ++ 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 + +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-20 14:16:35.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.90.4.ebuild b/net-www/nspluginwrapper/nspluginwrapper-0.9.90.4.ebuild new file mode 100644 index 000000000000..6c59cdb89616 --- /dev/null +++ b/net-www/nspluginwrapper/nspluginwrapper-0.9.90.4.ebuild @@ -0,0 +1,74 @@ +# 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.4.ebuild,v 1.1 2006/11/20 20:51:14 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" + +# 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() { + econf --with-biarch \ + --with-lib32=$(ABI=x86 get_libdir) \ + --with-lib64=$(get_libdir) || die + emake || die +} + +src_install() { + emake DESTDIR="${D}" DONT_STRIP=yes install || die + + inst_plugin /usr/$(get_libdir)/nspluginwrapper/x86_64/npwrapper.so + dosym /usr/$(get_libdir)/nspluginwrapper/x86_64/npconfig /usr/bin/nspluginwrapper + + dodoc NEWS README TODO ChangeLog +} + +pkg_postinst() { + einfo "Auto installing 32bit plugins..." + nspluginwrapper -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 -a -r +} + +pkg_postrm() { + if [[ -x /usr/bin/nspluginwrapper ]]; then + einfo "Auto installing 32bit plugins..." + nspluginwrapper -a -i + fi +}