diff options
author | Raúl Porcel <armin76@gentoo.org> | 2007-02-14 18:44:54 +0000 |
---|---|---|
committer | Raúl Porcel <armin76@gentoo.org> | 2007-02-14 18:44:54 +0000 |
commit | acb67ed1ec5474e96419f5d4b17507d506a358a0 (patch) | |
tree | 79b79afb21028231fb50338c10bd073fdf79a8f4 /www-client | |
parent | Forcing -j1 for emake in src_install because because of File exists error, as... (diff) | |
download | gentoo-2-acb67ed1ec5474e96419f5d4b17507d506a358a0.tar.gz gentoo-2-acb67ed1ec5474e96419f5d4b17507d506a358a0.tar.bz2 gentoo-2-acb67ed1ec5474e96419f5d4b17507d506a358a0.zip |
Fix .desktop files, bug 147735, and drop monolithic X deps and virtual/libc
(Portage version: 2.1.2-r9)
Diffstat (limited to 'www-client')
-rw-r--r-- | www-client/mozilla-firefox-bin/ChangeLog | 10 | ||||
-rw-r--r-- | www-client/mozilla-firefox-bin/files/icon/mozilla-firefox-bin-icon.png (renamed from www-client/mozilla-firefox-bin/files/icon/mozillafirefox-bin-icon.png) | bin | 3979 -> 3979 bytes | |||
-rw-r--r-- | www-client/mozilla-firefox-bin/files/icon/mozilla-firefox-bin.desktop (renamed from www-client/mozilla-firefox-bin/files/icon/mozillafirefox-bin.desktop) | 0 | ||||
-rw-r--r-- | www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.5.0.9.ebuild | 18 | ||||
-rw-r--r-- | www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.1.ebuild | 18 |
5 files changed, 23 insertions, 23 deletions
diff --git a/www-client/mozilla-firefox-bin/ChangeLog b/www-client/mozilla-firefox-bin/ChangeLog index 80125e2343e2..54ca8a96d4e3 100644 --- a/www-client/mozilla-firefox-bin/ChangeLog +++ b/www-client/mozilla-firefox-bin/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for www-client/mozilla-firefox-bin # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.69 2007/01/11 15:17:51 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.70 2007/02/14 18:44:54 armin76 Exp $ + + 14 Feb 2007; Raúl Porcel <armin76@gentoo.org> + +files/icon/mozilla-firefox-bin.desktop, + +files/icon/mozilla-firefox-bin-icon.png, + -files/icon/mozillafirefox-bin.desktop, + -files/icon/mozillafirefox-bin-icon.png, + mozilla-firefox-bin-1.5.0.9.ebuild, mozilla-firefox-bin-2.0.0.1.ebuild: + Fix .desktop files, bug 147735, and drop monolithic X deps and virtual/libc 11 Jan 2007; Raúl Porcel <armin76@gentoo.org> mozilla-firefox-bin-1.5.0.9.ebuild, mozilla-firefox-bin-2.0.0.1.ebuild: diff --git a/www-client/mozilla-firefox-bin/files/icon/mozillafirefox-bin-icon.png b/www-client/mozilla-firefox-bin/files/icon/mozilla-firefox-bin-icon.png Binary files differindex b7ff7197cad1..b7ff7197cad1 100644 --- a/www-client/mozilla-firefox-bin/files/icon/mozillafirefox-bin-icon.png +++ b/www-client/mozilla-firefox-bin/files/icon/mozilla-firefox-bin-icon.png diff --git a/www-client/mozilla-firefox-bin/files/icon/mozillafirefox-bin.desktop b/www-client/mozilla-firefox-bin/files/icon/mozilla-firefox-bin.desktop index 1a0ed4169087..1a0ed4169087 100644 --- a/www-client/mozilla-firefox-bin/files/icon/mozillafirefox-bin.desktop +++ b/www-client/mozilla-firefox-bin/files/icon/mozilla-firefox-bin.desktop diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.5.0.9.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.5.0.9.ebuild index bcd44ce43811..1d739c2f88e9 100644 --- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.5.0.9.ebuild +++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.5.0.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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-1.5.0.9.ebuild,v 1.5 2007/01/11 15:17:51 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.5.0.9.ebuild,v 1.6 2007/02/14 18:44:54 armin76 Exp $ inherit eutils mozilla-launcher multilib mozextension @@ -28,12 +28,9 @@ for X in ${SHORTLANGS} ; do done DEPEND="app-arch/unzip" -RDEPEND="|| ( ( x11-libs/libXrender - x11-libs/libXt - x11-libs/libXmu - ) - virtual/x11 - ) +RDEPEND="x11-libs/libXrender + x11-libs/libXt + x11-libs/libXmu x86? ( >=x11-libs/gtk+-2.2 =virtual/libstdc++-3.3 @@ -43,8 +40,7 @@ RDEPEND="|| ( ( x11-libs/libXrender >=app-emulation/emul-linux-x86-gtklibs-1.0 app-emulation/emul-linux-x86-compat ) - >=www-client/mozilla-launcher-1.41 - virtual/libc" + >=www-client/mozilla-launcher-1.41" S=${WORKDIR}/firefox @@ -113,9 +109,9 @@ src_install() { # Install icon and .desktop for menu entry insinto /usr/share/pixmaps - doins ${FILESDIR}/icon/mozillafirefox-bin-icon.png + doins ${FILESDIR}/icon/mozilla-firefox-bin-icon.png insinto /usr/share/applications - doins ${FILESDIR}/icon/mozillafirefox-bin.desktop + doins ${FILESDIR}/icon/mozilla-firefox-bin.desktop # revdep-rebuild entry insinto /etc/revdep-rebuild diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.1.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.1.ebuild index dfdb57f951ae..fe17a865ee1d 100644 --- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.1.ebuild +++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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-2.0.0.1.ebuild,v 1.5 2007/01/11 15:17:51 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.1.ebuild,v 1.6 2007/02/14 18:44:54 armin76 Exp $ inherit eutils mozilla-launcher multilib mozextension @@ -30,12 +30,9 @@ for X in ${LANGS} ; do done DEPEND="app-arch/unzip" -RDEPEND="|| ( ( x11-libs/libXrender - x11-libs/libXt - x11-libs/libXmu - ) - virtual/x11 - ) +RDEPEND="x11-libs/libXrender + x11-libs/libXt + x11-libs/libXmu x86? ( >=x11-libs/gtk+-2.2 =virtual/libstdc++-3.3 @@ -45,8 +42,7 @@ RDEPEND="|| ( ( x11-libs/libXrender >=app-emulation/emul-linux-x86-gtklibs-1.0 app-emulation/emul-linux-x86-compat ) - >=www-client/mozilla-launcher-1.41 - virtual/libc" + >=www-client/mozilla-launcher-1.41" S=${WORKDIR}/firefox @@ -116,9 +112,9 @@ src_install() { # Install icon and .desktop for menu entry insinto /usr/share/pixmaps - doins ${FILESDIR}/icon/mozillafirefox-bin-icon.png + doins ${FILESDIR}/icon/mozilla-firefox-bin-icon.png insinto /usr/share/applications - doins ${FILESDIR}/icon/mozillafirefox-bin.desktop + doins ${FILESDIR}/icon/mozilla-firefox-bin.desktop # revdep-rebuild entry insinto /etc/revdep-rebuild |