From f3ea3b75ae77b5950196642467fa4f55134cf7cb Mon Sep 17 00:00:00 2001 From: Aron Griffis Date: Tue, 2 Aug 2005 14:50:09 +0000 Subject: Bump rev to push out mozilla-launcher.eclass change which sets MOZ_PLUGIN_PATH correctly in /usr/bin/mozilla-bin #100378 (Portage version: 2.0.51.22-r2) --- www-client/mozilla-bin/ChangeLog | 10 ++- www-client/mozilla-bin/Manifest | 12 +-- .../mozilla-bin/files/digest-mozilla-bin-1.7.10 | 1 - .../mozilla-bin/files/digest-mozilla-bin-1.7.10-r1 | 1 + .../mozilla-bin/files/digest-mozilla-bin-1.7.7 | 1 - .../mozilla-bin/files/digest-mozilla-bin-1.7.8 | 1 - .../mozilla-bin/mozilla-bin-1.7.10-r1.ebuild | 69 ++++++++++++++++ www-client/mozilla-bin/mozilla-bin-1.7.10.ebuild | 69 ---------------- www-client/mozilla-bin/mozilla-bin-1.7.7.ebuild | 96 ---------------------- www-client/mozilla-bin/mozilla-bin-1.7.8.ebuild | 94 --------------------- 10 files changed, 81 insertions(+), 273 deletions(-) delete mode 100644 www-client/mozilla-bin/files/digest-mozilla-bin-1.7.10 create mode 100644 www-client/mozilla-bin/files/digest-mozilla-bin-1.7.10-r1 delete mode 100644 www-client/mozilla-bin/files/digest-mozilla-bin-1.7.7 delete mode 100644 www-client/mozilla-bin/files/digest-mozilla-bin-1.7.8 create mode 100644 www-client/mozilla-bin/mozilla-bin-1.7.10-r1.ebuild delete mode 100644 www-client/mozilla-bin/mozilla-bin-1.7.10.ebuild delete mode 100644 www-client/mozilla-bin/mozilla-bin-1.7.7.ebuild delete mode 100644 www-client/mozilla-bin/mozilla-bin-1.7.8.ebuild (limited to 'www-client') diff --git a/www-client/mozilla-bin/ChangeLog b/www-client/mozilla-bin/ChangeLog index d0a37a93efef..80d323c7d4ef 100644 --- a/www-client/mozilla-bin/ChangeLog +++ b/www-client/mozilla-bin/ChangeLog @@ -1,6 +1,14 @@ # 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.17 2005/07/25 02:53:46 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/ChangeLog,v 1.18 2005/08/02 14:50:09 agriffis Exp $ + +*mozilla-bin-1.7.10-r1 (02 Aug 2005) + + 02 Aug 2005; Aron Griffis -mozilla-bin-1.7.7.ebuild, + -mozilla-bin-1.7.8.ebuild, -mozilla-bin-1.7.10.ebuild, + +mozilla-bin-1.7.10-r1.ebuild: + Bump rev to push out mozilla-launcher.eclass change which sets + MOZ_PLUGIN_PATH correctly in /usr/bin/mozilla-bin #100378 25 Jul 2005; Aron Griffis mozilla-bin-1.7.7.ebuild, mozilla-bin-1.7.8.ebuild, mozilla-bin-1.7.10.ebuild: diff --git a/www-client/mozilla-bin/Manifest b/www-client/mozilla-bin/Manifest index 2636030755f5..7e1de9b65962 100644 --- a/www-client/mozilla-bin/Manifest +++ b/www-client/mozilla-bin/Manifest @@ -1,20 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 972ef38e03fa3e03d5764c6fda0e0162 mozilla-bin-1.7.10-r1.ebuild 1779 MD5 f6b8adc21c191d2e9930ce909a698056 mozilla-bin-1.7.8.ebuild 2457 MD5 972ef38e03fa3e03d5764c6fda0e0162 mozilla-bin-1.7.10.ebuild 1779 MD5 e6803c92214cc7e3c401b880990f57a6 ChangeLog 4188 MD5 365acec966fe7c3d625d91a37030e8cc mozilla-bin-1.7.7.ebuild 2573 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 MD5 95b88f89e551260cea8f775e958cdc35 files/digest-mozilla-bin-1.7.10 86 +MD5 95b88f89e551260cea8f775e958cdc35 files/digest-mozilla-bin-1.7.10-r1 86 MD5 0a9038db6a51fe374f3ed16e1d67b169 files/digest-mozilla-bin-1.7.7 85 MD5 81b8c7f06b94f097490dbf02e98a2449 files/digest-mozilla-bin-1.7.8 85 MD5 6d52ff4ce4567db1cad08ea40157a65d files/mozilla-bin-icon.png 2350 MD5 d364a8d78e0bde072fc1b38931778760 files/mozilla-bin.desktop 188 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFC5FRGBXaUFmZvwyMRAp4fAKCu0BBHq4p89KI30dObsDcABjoK0ACeKkEf -yXIF1crfz7cQSUi0otEFZvM= -=Qf/P ------END PGP SIGNATURE----- diff --git a/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.10 b/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.10 deleted file mode 100644 index d8a2a285265d..000000000000 --- a/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.10 +++ /dev/null @@ -1 +0,0 @@ -MD5 6258208531f2bbe9b042e3562c54248d mozilla-i686-pc-linux-gnu-1.7.10.tar.gz 13885695 diff --git a/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.10-r1 b/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.10-r1 new file mode 100644 index 000000000000..d8a2a285265d --- /dev/null +++ b/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.10-r1 @@ -0,0 +1 @@ +MD5 6258208531f2bbe9b042e3562c54248d mozilla-i686-pc-linux-gnu-1.7.10.tar.gz 13885695 diff --git a/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.7 b/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.7 deleted file mode 100644 index c5a41d57e986..000000000000 --- a/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.7 +++ /dev/null @@ -1 +0,0 @@ -MD5 aec83f475c3bf9232ae7dc3f0563d771 mozilla-i686-pc-linux-gnu-1.7.7.tar.gz 13888040 diff --git a/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.8 b/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.8 deleted file mode 100644 index 7f7471fcf586..000000000000 --- a/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.8 +++ /dev/null @@ -1 +0,0 @@ -MD5 115233cf01789cf3148b8d6c31b3a972 mozilla-i686-pc-linux-gnu-1.7.8.tar.gz 13890638 diff --git a/www-client/mozilla-bin/mozilla-bin-1.7.10-r1.ebuild b/www-client/mozilla-bin/mozilla-bin-1.7.10-r1.ebuild new file mode 100644 index 000000000000..22316cc6c602 --- /dev/null +++ b/www-client/mozilla-bin/mozilla-bin-1.7.10-r1.ebuild @@ -0,0 +1,69 @@ +# 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-r1.ebuild,v 1.1 2005/08/02 14:50:09 agriffis Exp $ + +inherit eutils mozilla-launcher multilib + +IUSE="" + +DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC" +HOMEPAGE="http://www.mozilla.org" +SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla${PV}/mozilla-i686-pc-linux-gnu-${PV}.tar.gz" +RESTRICT="nostrip" + +KEYWORDS="amd64 x86" +SLOT="0" +LICENSE="MPL-1.1 NPL-1.1" + +DEPEND="virtual/libc" +RDEPEND="virtual/x11 + x86? ( + >=sys-libs/lib-compat-1.0-r2 + =x11-libs/gtk+-1.2* + ) + amd64? ( + >=app-emulation/emul-linux-x86-baselibs-1.0 + >=app-emulation/emul-linux-x86-gtklibs-1.0 + ) + virtual/x11 + >=www-client/mozilla-launcher-1.41" + +S=${WORKDIR}/mozilla + +# This is a binary x86 package => ABI=x86 +# Please keep this in future versions +# Danny van Dyk 2005/03/26 +has_multilib_profile && ABI="x86" + +src_install() { + declare MOZILLA_FIVE_HOME=/opt/mozilla + + # Install mozilla in /opt + dodir ${MOZILLA_FIVE_HOME%/*} + mv ${S} ${D}${MOZILLA_FIVE_HOME} + + # 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 + doins ${FILESDIR}/mozilla-bin-icon.png + insinto /usr/share/applications + doins ${FILESDIR}/mozilla-bin.desktop +} + +pkg_preinst() { + declare MOZILLA_FIVE_HOME=/opt/mozilla + + # Remove entire installed instance to prevent all kinds of + # problems... see bug 44772 for example + rm -rf "${ROOT}${MOZILLA_FIVE_HOME}" +} + +pkg_postinst() { + update_mozilla_launcher_symlinks +} + +pkg_postrm() { + update_mozilla_launcher_symlinks +} diff --git a/www-client/mozilla-bin/mozilla-bin-1.7.10.ebuild b/www-client/mozilla-bin/mozilla-bin-1.7.10.ebuild deleted file mode 100644 index ae8cc3135d14..000000000000 --- a/www-client/mozilla-bin/mozilla-bin-1.7.10.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# 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.5 2005/07/25 02:53:46 agriffis Exp $ - -inherit eutils mozilla-launcher multilib - -IUSE="" - -DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC" -HOMEPAGE="http://www.mozilla.org" -SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla${PV}/mozilla-i686-pc-linux-gnu-${PV}.tar.gz" -RESTRICT="nostrip" - -KEYWORDS="amd64 x86" -SLOT="0" -LICENSE="MPL-1.1 NPL-1.1" - -DEPEND="virtual/libc" -RDEPEND="virtual/x11 - x86? ( - >=sys-libs/lib-compat-1.0-r2 - =x11-libs/gtk+-1.2* - ) - amd64? ( - >=app-emulation/emul-linux-x86-baselibs-1.0 - >=app-emulation/emul-linux-x86-gtklibs-1.0 - ) - virtual/x11 - >=www-client/mozilla-launcher-1.41" - -S=${WORKDIR}/mozilla - -# This is a binary x86 package => ABI=x86 -# Please keep this in future versions -# Danny van Dyk 2005/03/26 -has_multilib_profile && ABI="x86" - -src_install() { - declare MOZILLA_FIVE_HOME=/opt/mozilla - - # Install mozilla in /opt - dodir ${MOZILLA_FIVE_HOME%/*} - mv ${S} ${D}${MOZILLA_FIVE_HOME} - - # 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 - doins ${FILESDIR}/mozilla-bin-icon.png - insinto /usr/share/applications - doins ${FILESDIR}/mozilla-bin.desktop -} - -pkg_preinst() { - declare MOZILLA_FIVE_HOME=/opt/mozilla - - # Remove entire installed instance to prevent all kinds of - # problems... see bug 44772 for example - rm -rf "${ROOT}${MOZILLA_FIVE_HOME}" -} - -pkg_postinst() { - update_mozilla_launcher_symlinks -} - -pkg_postrm() { - update_mozilla_launcher_symlinks -} diff --git a/www-client/mozilla-bin/mozilla-bin-1.7.7.ebuild b/www-client/mozilla-bin/mozilla-bin-1.7.7.ebuild deleted file mode 100644 index dff8a56881e5..000000000000 --- a/www-client/mozilla-bin/mozilla-bin-1.7.7.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# 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.7.ebuild,v 1.3 2005/07/25 02:53:46 agriffis Exp $ - -inherit nsplugins eutils mozilla-launcher multilib - -IUSE="" - -# handle _rc versions -MY_PV=${PV/_alpha/a} # handle alpha -MY_PV=${MY_PV/_beta/b} # handle beta -MY_PV=${MY_PV/_rc/rc} # handle rc - -MY_PN=${PN/-bin/} -S=${WORKDIR}/mozilla -DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC" -HOMEPAGE="http://www.mozilla.org" -# Mirrors have it in one of the following places, depending on what -# mirror you check and when you check it... :-( -SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla${PV}/mozilla-i686-pc-linux-gnu-${PV}.tar.gz" -RESTRICT="nostrip" - -KEYWORDS="amd64 x86" -SLOT="0" -LICENSE="MPL-1.1 NPL-1.1" - -DEPEND="virtual/libc" -RDEPEND="virtual/x11 - x86? ( - >=sys-libs/lib-compat-1.0-r2 - =x11-libs/gtk+-1.2* - ) - amd64? ( - >=app-emulation/emul-linux-x86-baselibs-1.0 - >=app-emulation/emul-linux-x86-gtklibs-1.0 - ) - virtual/x11 - >=www-client/mozilla-launcher-1.28" - -# This is a binary x86 package => ABI=x86 -# Please keep this in future versions -# Danny van Dyk 2005/03/26 -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 - - # 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 - -export MOZILLA_LAUNCHER=mozilla-bin -exec /usr/libexec/mozilla-launcher "\$@" -EOF - chmod 0755 ${D}/usr/bin/mozilla-bin - - # Install icon and .desktop for menu entry - insinto /usr/share/pixmaps - doins ${FILESDIR}/mozilla-bin-icon.png - insinto /usr/share/applications - doins ${FILESDIR}/mozilla-bin.desktop -} - -pkg_preinst() { - export MOZILLA_FIVE_HOME=${ROOT}/opt/mozilla - - # Remove the old plugins dir - pkg_mv_plugins ${MOZILLA_FIVE_HOME}/plugins - - # Remove entire installed instance to prevent all kinds of - # problems... see bug 44772 for example - rm -rf "${MOZILLA_FIVE_HOME}" -} - -pkg_postinst() { - export MOZILLA_FIVE_HOME=${ROOT}/opt/mozilla - - update_mozilla_launcher_symlinks -} - -pkg_postrm() { - update_mozilla_launcher_symlinks -} diff --git a/www-client/mozilla-bin/mozilla-bin-1.7.8.ebuild b/www-client/mozilla-bin/mozilla-bin-1.7.8.ebuild deleted file mode 100644 index 9b3dd22334e9..000000000000 --- a/www-client/mozilla-bin/mozilla-bin-1.7.8.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# 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.8.ebuild,v 1.4 2005/07/25 02:53:46 agriffis Exp $ - -inherit nsplugins eutils mozilla-launcher multilib - -IUSE="" - -# handle _rc versions -MY_PV=${PV/_alpha/a} # handle alpha -MY_PV=${MY_PV/_beta/b} # handle beta -MY_PV=${MY_PV/_rc/rc} # handle rc - -MY_PN=${PN/-bin/} -S=${WORKDIR}/mozilla -DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC" -HOMEPAGE="http://www.mozilla.org" -SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla${PV}/mozilla-i686-pc-linux-gnu-${PV}.tar.gz" -RESTRICT="nostrip" - -KEYWORDS="amd64 x86" -SLOT="0" -LICENSE="MPL-1.1 NPL-1.1" - -DEPEND="virtual/libc" -RDEPEND="virtual/x11 - x86? ( - >=sys-libs/lib-compat-1.0-r2 - =x11-libs/gtk+-1.2* - ) - amd64? ( - >=app-emulation/emul-linux-x86-baselibs-1.0 - >=app-emulation/emul-linux-x86-gtklibs-1.0 - ) - virtual/x11 - >=www-client/mozilla-launcher-1.28" - -# This is a binary x86 package => ABI=x86 -# Please keep this in future versions -# Danny van Dyk 2005/03/26 -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 - - # 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 - -export MOZILLA_LAUNCHER=mozilla-bin -exec /usr/libexec/mozilla-launcher "\$@" -EOF - chmod 0755 ${D}/usr/bin/mozilla-bin - - # Install icon and .desktop for menu entry - insinto /usr/share/pixmaps - doins ${FILESDIR}/mozilla-bin-icon.png - insinto /usr/share/applications - doins ${FILESDIR}/mozilla-bin.desktop -} - -pkg_preinst() { - export MOZILLA_FIVE_HOME=${ROOT}/opt/mozilla - - # Remove the old plugins dir - pkg_mv_plugins ${MOZILLA_FIVE_HOME}/plugins - - # Remove entire installed instance to prevent all kinds of - # problems... see bug 44772 for example - rm -rf "${MOZILLA_FIVE_HOME}" -} - -pkg_postinst() { - export MOZILLA_FIVE_HOME=${ROOT}/opt/mozilla - - update_mozilla_launcher_symlinks -} - -pkg_postrm() { - update_mozilla_launcher_symlinks -} -- cgit v1.2.3-65-gdbad