diff options
author | 2006-11-20 20:51:14 +0000 | |
---|---|---|
committer | 2006-11-20 20:51:14 +0000 | |
commit | 70a3547eafc2ddb2eb8c259db70f81d5b761342a (patch) | |
tree | 33413663dc04060641fd87c78f722762ee72cb45 /net-www/nspluginwrapper | |
parent | Mask new emul-linux-x86-gtklibs/baselibs pending resolution of bugs 155794, 1... (diff) | |
download | gentoo-2-70a3547eafc2ddb2eb8c259db70f81d5b761342a.tar.gz gentoo-2-70a3547eafc2ddb2eb8c259db70f81d5b761342a.tar.bz2 gentoo-2-70a3547eafc2ddb2eb8c259db70f81d5b761342a.zip |
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.
(Portage version: 2.1.2_rc1-r6)
Diffstat (limited to 'net-www/nspluginwrapper')
4 files changed, 178 insertions, 1 deletions
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 <chutzpah@gentoo.org> + +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 <chutzpah@gentoo.org> nspluginwrapper-0.9.90.3.ebuild: 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 <glib.h> + 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 <gtk/gtk.h> + 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 <path-to-32bit-plugin>\"" + 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 +} |