From d63b02f75b1c6b0d571ef0bdab242cc3d1322229 Mon Sep 17 00:00:00 2001 From: Aron Griffis Date: Fri, 22 Jul 2005 18:31:34 +0000 Subject: Depend on mozilla-launcher-1.41 for new nsplugins goodness, remove the calls to src_mv_plugins and pkg_mv_plugins. Use install_mozilla_launcher_stub instead of installing it ourselves. (Portage version: 2.0.51.22-r2) --- www-client/mozilla-bin/ChangeLog | 7 +++- www-client/mozilla-bin/mozilla-bin-1.7.10.ebuild | 42 +++++++----------------- 2 files changed, 17 insertions(+), 32 deletions(-) (limited to 'www-client/mozilla-bin') diff --git a/www-client/mozilla-bin/ChangeLog b/www-client/mozilla-bin/ChangeLog index 4b0547384896..bc1692b99361 100644 --- a/www-client/mozilla-bin/ChangeLog +++ b/www-client/mozilla-bin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/mozilla-bin # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/ChangeLog,v 1.14 2005/07/22 17:20:03 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/ChangeLog,v 1.15 2005/07/22 18:31:34 agriffis Exp $ + + 22 Jul 2005; Aron Griffis mozilla-bin-1.7.10.ebuild: + Depend on mozilla-launcher-1.41 for new nsplugins goodness, remove the calls + to src_mv_plugins and pkg_mv_plugins. Use install_mozilla_launcher_stub + instead of installing it ourselves. *mozilla-bin-1.7.10 (22 Jul 2005) diff --git a/www-client/mozilla-bin/mozilla-bin-1.7.10.ebuild b/www-client/mozilla-bin/mozilla-bin-1.7.10.ebuild index 14b97a94670c..8fc56f786bd6 100644 --- a/www-client/mozilla-bin/mozilla-bin-1.7.10.ebuild +++ b/www-client/mozilla-bin/mozilla-bin-1.7.10.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/mozilla-bin-1.7.10.ebuild,v 1.1 2005/07/22 17:20:03 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/mozilla-bin-1.7.10.ebuild,v 1.2 2005/07/22 18:31:34 agriffis Exp $ -inherit nsplugins eutils mozilla-launcher +inherit eutils mozilla-launcher IUSE="" @@ -33,7 +33,7 @@ RDEPEND="virtual/x11 >=app-emulation/emul-linux-x86-gtklibs-1.0 ) virtual/x11 - >=www-client/mozilla-launcher-1.28" + >=www-client/mozilla-launcher-1.41" # This is a binary x86 package => ABI=x86 # Please keep this in future versions @@ -41,29 +41,14 @@ RDEPEND="virtual/x11 has_multilib_profile && ABI="x86" src_install() { - # Install mozilla in /opt - dodir /opt - mv ${S} ${D}/opt/mozilla - - # Plugin path setup (rescuing the existing plugins) - src_mv_plugins /opt/mozilla/plugins - - # Fixing permissions - chown -R root:root ${D}/opt/mozilla + declare MOZILLA_FIVE_HOME=/opt/mozilla - # mozilla-launcher-1.8 supports -bin versions - dodir /usr/bin - cat <${D}/usr/bin/mozilla-bin -#!/bin/sh -# -# Stub script to run mozilla-launcher. We used to use a symlink here but -# OOo brokenness makes it necessary to use a stub instead: -# http://bugs.gentoo.org/show_bug.cgi?id=78890 + # Install mozilla in /opt + dodir ${MOZILLA_FIVE_HOME%/*} + mv ${S} ${D}${MOZILLA_FIVE_HOME} -export MOZILLA_LAUNCHER=mozilla-bin -exec /usr/libexec/mozilla-launcher "\$@" -EOF - chmod 0755 ${D}/usr/bin/mozilla-bin + # Install /usr/bin/mozilla-bin + install_mozilla_launcher_stub mozilla-bin ${MOZILLA_FIVE_HOME} # Install icon and .desktop for menu entry insinto /usr/share/pixmaps @@ -73,19 +58,14 @@ EOF } pkg_preinst() { - export MOZILLA_FIVE_HOME=${ROOT}/opt/mozilla - - # Remove the old plugins dir - pkg_mv_plugins ${MOZILLA_FIVE_HOME}/plugins + declare MOZILLA_FIVE_HOME=/opt/mozilla # Remove entire installed instance to prevent all kinds of # problems... see bug 44772 for example - rm -rf "${MOZILLA_FIVE_HOME}" + rm -rf "${ROOT}${MOZILLA_FIVE_HOME}" } pkg_postinst() { - export MOZILLA_FIVE_HOME=${ROOT}/opt/mozilla - update_mozilla_launcher_symlinks } -- cgit v1.2.3-65-gdbad