diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2008-09-08 16:09:32 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2008-09-08 16:09:32 +0000 |
| commit | 493ae35bc578ba5474a73942047b0c1dde91d4e7 (patch) | |
| tree | 9d5d017af9fecae673bbd75e5a83f067dd04992e /www-client | |
| parent | Version bump (diff) | |
| download | gentoo-2-493ae35bc578ba5474a73942047b0c1dde91d4e7.tar.gz gentoo-2-493ae35bc578ba5474a73942047b0c1dde91d4e7.tar.bz2 gentoo-2-493ae35bc578ba5474a73942047b0c1dde91d4e7.zip | |
Use provided icons instead of our own, bug #236970
(Portage version: 2.1.4.4)
Diffstat (limited to 'www-client')
4 files changed, 22 insertions, 16 deletions
diff --git a/www-client/mozilla-firefox-bin/ChangeLog b/www-client/mozilla-firefox-bin/ChangeLog index 4f253163f5c1..66a99e4b3dde 100644 --- a/www-client/mozilla-firefox-bin/ChangeLog +++ b/www-client/mozilla-firefox-bin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-client/mozilla-firefox-bin # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.159 2008/09/07 16:37:10 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.160 2008/09/08 16:09:32 armin76 Exp $ + + 08 Sep 2008; Raúl Porcel <armin76@gentoo.org> + mozilla-firefox-bin-3.0.1-r1.ebuild, + mozilla-firefox-bin-3.1_alpha1.ebuild, + mozilla-firefox-bin-3.1_alpha2.ebuild: + Use provided icons instead of our own, bug #236970 07 Sep 2008; Raúl Porcel <armin76@gentoo.org> mozilla-firefox-bin-3.1_alpha2.ebuild: diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.1-r1.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.1-r1.ebuild index 1a0ff05ebfa9..ce3af0da0a66 100644 --- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.1-r1.ebuild +++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.1-r1.ebuild,v 1.2 2008/08/29 11:16:43 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.1-r1.ebuild,v 1.3 2008/09/08 16:09:32 armin76 Exp $ inherit eutils mozilla-launcher multilib mozextension @@ -94,6 +94,10 @@ src_unpack() { src_install() { declare MOZILLA_FIVE_HOME=/opt/firefox + # Install icon and .desktop for menu entry + newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png + domenu "${FILESDIR}"/icon/${PN}.desktop + # Install firefox in /opt dodir ${MOZILLA_FIVE_HOME%/*} mv "${S}" "${D}"${MOZILLA_FIVE_HOME} @@ -121,10 +125,6 @@ exec /opt/firefox/firefox "\$@" EOF fperms 0755 /usr/bin/firefox-bin - # Install icon and .desktop for menu entry - doicon "${FILESDIR}"/icon/${PN}-icon.png - domenu "${FILESDIR}"/icon/${PN}.desktop - # revdep-rebuild entry insinto /etc/revdep-rebuild doins "${FILESDIR}"/10firefox-bin diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.1_alpha1.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.1_alpha1.ebuild index 358ce5b81286..323d1831e283 100644 --- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.1_alpha1.ebuild +++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.1_alpha1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.1_alpha1.ebuild,v 1.2 2008/08/29 11:16:43 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.1_alpha1.ebuild,v 1.3 2008/09/08 16:09:32 armin76 Exp $ inherit eutils mozilla-launcher multilib mozextension @@ -98,6 +98,10 @@ src_unpack() { src_install() { declare MOZILLA_FIVE_HOME=/opt/firefox + # Install icon and .desktop for menu entry + newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png + domenu "${FILESDIR}"/icon/${PN}.desktop + # Install firefox in /opt dodir ${MOZILLA_FIVE_HOME%/*} mv "${S}" "${D}"${MOZILLA_FIVE_HOME} @@ -125,10 +129,6 @@ exec /opt/firefox/firefox "\$@" EOF fperms 0755 /usr/bin/firefox-bin - # Install icon and .desktop for menu entry - doicon "${FILESDIR}"/icon/${PN}-icon.png - domenu "${FILESDIR}"/icon/${PN}.desktop - # revdep-rebuild entry insinto /etc/revdep-rebuild doins "${FILESDIR}"/10firefox-bin diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.1_alpha2.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.1_alpha2.ebuild index fa255f704237..11651c5994c1 100644 --- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.1_alpha2.ebuild +++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.1_alpha2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.1_alpha2.ebuild,v 1.3 2008/09/07 17:03:39 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.1_alpha2.ebuild,v 1.4 2008/09/08 16:09:32 armin76 Exp $ inherit eutils mozilla-launcher multilib mozextension @@ -100,6 +100,10 @@ src_unpack() { src_install() { declare MOZILLA_FIVE_HOME=/opt/firefox + # Install icon and .desktop for menu entry + newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png + domenu "${FILESDIR}"/icon/${PN}.desktop + # Install firefox in /opt dodir ${MOZILLA_FIVE_HOME%/*} mv "${S}" "${D}"${MOZILLA_FIVE_HOME} @@ -127,10 +131,6 @@ exec /opt/firefox/firefox "\$@" EOF fperms 0755 /usr/bin/firefox-bin - # Install icon and .desktop for menu entry - doicon "${FILESDIR}"/icon/${PN}-icon.png - domenu "${FILESDIR}"/icon/${PN}.desktop - # revdep-rebuild entry insinto /etc/revdep-rebuild doins "${FILESDIR}"/10firefox-bin |