From b5dd9353d2ec21dd4ec8fe9c41169be0664bcaeb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ra=C3=BAl=20Porcel?= Date: Wed, 14 Feb 2007 18:44:54 +0000 Subject: [PATCH] Fix .desktop files, bug 147735, and drop monolithic X deps and virtual/libc Package-Manager: portage-2.1.2-r9 --- www-client/mozilla-firefox-bin/ChangeLog | 10 ++++- www-client/mozilla-firefox-bin/Manifest | 40 +++++++++--------- ...-icon.png => mozilla-firefox-bin-icon.png} | Bin ...in.desktop => mozilla-firefox-bin.desktop} | 0 .../mozilla-firefox-bin-1.5.0.9.ebuild | 18 +++----- .../mozilla-firefox-bin-2.0.0.1.ebuild | 18 +++----- 6 files changed, 43 insertions(+), 43 deletions(-) rename www-client/mozilla-firefox-bin/files/icon/{mozillafirefox-bin-icon.png => mozilla-firefox-bin-icon.png} (100%) rename www-client/mozilla-firefox-bin/files/icon/{mozillafirefox-bin.desktop => mozilla-firefox-bin.desktop} (100%) 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 + +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 mozilla-firefox-bin-1.5.0.9.ebuild, mozilla-firefox-bin-2.0.0.1.ebuild: diff --git a/www-client/mozilla-firefox-bin/Manifest b/www-client/mozilla-firefox-bin/Manifest index c3734f7b9be7..4f80ccf99c13 100644 --- a/www-client/mozilla-firefox-bin/Manifest +++ b/www-client/mozilla-firefox-bin/Manifest @@ -6,14 +6,14 @@ AUX 71firefox-bin 22 RMD160 ad8d15a66d2f0d4b161808ca864f4d7c50faabd5 SHA1 937734 MD5 712d276ccee57b18a6db7cb5d4fc17d2 files/71firefox-bin 22 RMD160 ad8d15a66d2f0d4b161808ca864f4d7c50faabd5 files/71firefox-bin 22 SHA256 2df8e74b89bfdad94bf1e534149b308b6905d1c3bfb6c927278d2ef5cb0f2fa4 files/71firefox-bin 22 -AUX icon/mozillafirefox-bin-icon.png 3979 RMD160 7d8f39974e9853dcdd4af05142c9b57ae187ab45 SHA1 4f009c0be2fb48bb2d95422bbde96d8e10e6dd9d SHA256 064ddf97649424540df1d4a4727ee4c08d6b2b7389621855601aec58241ac67e -MD5 bff260036c5dcca45da3218517fb33d8 files/icon/mozillafirefox-bin-icon.png 3979 -RMD160 7d8f39974e9853dcdd4af05142c9b57ae187ab45 files/icon/mozillafirefox-bin-icon.png 3979 -SHA256 064ddf97649424540df1d4a4727ee4c08d6b2b7389621855601aec58241ac67e files/icon/mozillafirefox-bin-icon.png 3979 -AUX icon/mozillafirefox-bin.desktop 205 RMD160 72241526519cb166de467564555fea6a2d4b1ae7 SHA1 1b0fd00dfca45491535849616c2cb4b3ae99e33a SHA256 3f71757002addf0c2cb454c06f30718287a09e4f725e70c4f18b93adbe184a12 -MD5 6a086739213fbf97e86f7f3f550dd1e5 files/icon/mozillafirefox-bin.desktop 205 -RMD160 72241526519cb166de467564555fea6a2d4b1ae7 files/icon/mozillafirefox-bin.desktop 205 -SHA256 3f71757002addf0c2cb454c06f30718287a09e4f725e70c4f18b93adbe184a12 files/icon/mozillafirefox-bin.desktop 205 +AUX icon/mozilla-firefox-bin-icon.png 3979 RMD160 7d8f39974e9853dcdd4af05142c9b57ae187ab45 SHA1 4f009c0be2fb48bb2d95422bbde96d8e10e6dd9d SHA256 064ddf97649424540df1d4a4727ee4c08d6b2b7389621855601aec58241ac67e +MD5 bff260036c5dcca45da3218517fb33d8 files/icon/mozilla-firefox-bin-icon.png 3979 +RMD160 7d8f39974e9853dcdd4af05142c9b57ae187ab45 files/icon/mozilla-firefox-bin-icon.png 3979 +SHA256 064ddf97649424540df1d4a4727ee4c08d6b2b7389621855601aec58241ac67e files/icon/mozilla-firefox-bin-icon.png 3979 +AUX icon/mozilla-firefox-bin.desktop 205 RMD160 72241526519cb166de467564555fea6a2d4b1ae7 SHA1 1b0fd00dfca45491535849616c2cb4b3ae99e33a SHA256 3f71757002addf0c2cb454c06f30718287a09e4f725e70c4f18b93adbe184a12 +MD5 6a086739213fbf97e86f7f3f550dd1e5 files/icon/mozilla-firefox-bin.desktop 205 +RMD160 72241526519cb166de467564555fea6a2d4b1ae7 files/icon/mozilla-firefox-bin.desktop 205 +SHA256 3f71757002addf0c2cb454c06f30718287a09e4f725e70c4f18b93adbe184a12 files/icon/mozilla-firefox-bin.desktop 205 DIST firefox-1.5.0.9.tar.gz 8485188 RMD160 4f5bf39a254b59f5affc87ead5fc34708cd5e589 SHA1 7ca0f0a844b9009c9964f8f1122f4833d9dad111 SHA256 e84de27c958aff7c1721821b3c8effe59aa75fac181284ae30013e4eb2279e48 DIST firefox-2.0.0.1.tar.gz 9639378 RMD160 5a8de21c80e90507ecb8c66ee7ad3248e8582c8d SHA1 0647a1992ecd4a89a84bdd1dedbf7f058c9b24a5 SHA256 89aa2817a0533b4658de5676a5146377db788a740045e932a1daea38ce15f33a DIST mozilla-firefox-1.5.0.9-ar.xpi 153694 RMD160 94576ebb1fe7af13255a1ff8030342ed844f7337 SHA1 0d1df5ad94af5591957d896f51fcf3d61a4029a6 SHA256 8f68a1e18d2291a8846172a6b278ac140804bc295b5f7dcd16b9bbb19f411ed2 @@ -92,18 +92,18 @@ DIST mozilla-firefox-2.0.0.1-sv-SE.xpi 165979 RMD160 4e7f91ff66b178fd4eb949ef464 DIST mozilla-firefox-2.0.0.1-tr.xpi 148762 RMD160 4347cdbe5e1e2ee04d76f3ac87dbf1c4cb958d13 SHA1 bea5b6b5c4f0591f00f47adfa2654218758f96bd SHA256 10d5c7459a530b867ba891c50ba186c6c5d93bcdc05bbcaa25157b8caa6ae79c DIST mozilla-firefox-2.0.0.1-zh-CN.xpi 142718 RMD160 99363893c8590ee4ca3a632dfd8a76d0e60af5ea SHA1 2fc537a3c619b53949007acab0a86b1bc9a8772f SHA256 4f25a4a20c4a13c6be4af49986657d0f4dc46c5b3b114c4f299310d9bd305d63 DIST mozilla-firefox-2.0.0.1-zh-TW.xpi 142025 RMD160 2838e4da75aea7ae27c4ecf3efeaceca45c6c867 SHA1 6dcaf950b9dfdf4b35d867d5cf59112d2675ba17 SHA256 135855969082bb419938402ca1229390d1450f747f31a273719cec674fdb61b7 -EBUILD mozilla-firefox-bin-1.5.0.9.ebuild 3943 RMD160 d2a5b9454c9f97e8b1406dd3de1fbb264a19e315 SHA1 7cc3514e54b357ce681d71aa1e7eddd8f642c4b7 SHA256 b10a27b94a5fb05df5a72ca194522e0a8fcbb641937f8b1fbed5420f08af4a76 -MD5 c84adb2979456c1262a54939012378cd mozilla-firefox-bin-1.5.0.9.ebuild 3943 -RMD160 d2a5b9454c9f97e8b1406dd3de1fbb264a19e315 mozilla-firefox-bin-1.5.0.9.ebuild 3943 -SHA256 b10a27b94a5fb05df5a72ca194522e0a8fcbb641937f8b1fbed5420f08af4a76 mozilla-firefox-bin-1.5.0.9.ebuild 3943 -EBUILD mozilla-firefox-bin-2.0.0.1.ebuild 4222 RMD160 eba34cac8dbfec6a825a8422c4b818308896600b SHA1 c76359d154b53edf890c017acd73d6a0bc18ae29 SHA256 40fc8b3e5cde0895d01684d73697d3034d4a4be9fbbd983b371d2c194b13c41d -MD5 81dc15f17cae7f83eeaf45d7fd6bfd92 mozilla-firefox-bin-2.0.0.1.ebuild 4222 -RMD160 eba34cac8dbfec6a825a8422c4b818308896600b mozilla-firefox-bin-2.0.0.1.ebuild 4222 -SHA256 40fc8b3e5cde0895d01684d73697d3034d4a4be9fbbd983b371d2c194b13c41d mozilla-firefox-bin-2.0.0.1.ebuild 4222 -MISC ChangeLog 17255 RMD160 194f955794189e6840c5c95b3f988447ce6de060 SHA1 dceda3590c01d6c600288eeac9d53fb7ba6ba661 SHA256 8e85ac22b24233c93a6e0ca5da2dbcd99d01f99827780539355d83dc904db00c -MD5 9844b9699fe3e9af041a58a8509f64d5 ChangeLog 17255 -RMD160 194f955794189e6840c5c95b3f988447ce6de060 ChangeLog 17255 -SHA256 8e85ac22b24233c93a6e0ca5da2dbcd99d01f99827780539355d83dc904db00c ChangeLog 17255 +EBUILD mozilla-firefox-bin-1.5.0.9.ebuild 3901 RMD160 4ddfeab0a692292768c6a336df14ef52b845cee5 SHA1 4080173189f255baa829660d387ddc74fc967a2d SHA256 0272b488d857d97963e7904decffa9eb058b87ffa17d8ad33702cee3a5725394 +MD5 3fe65e0fc4fdd5e01751f464b11a50f3 mozilla-firefox-bin-1.5.0.9.ebuild 3901 +RMD160 4ddfeab0a692292768c6a336df14ef52b845cee5 mozilla-firefox-bin-1.5.0.9.ebuild 3901 +SHA256 0272b488d857d97963e7904decffa9eb058b87ffa17d8ad33702cee3a5725394 mozilla-firefox-bin-1.5.0.9.ebuild 3901 +EBUILD mozilla-firefox-bin-2.0.0.1.ebuild 4180 RMD160 b3d17d7627601e06dc646611a40b26ed9e72ff1b SHA1 eecd1b7cba91739b70b2353013b3b0e4d29670dd SHA256 64376fa4a3700b49e5fd25da78e125d388dc1cb837107bcf7ef76849cfa909c5 +MD5 5d8f0ef7781f182a63f5ec058ecbd3b1 mozilla-firefox-bin-2.0.0.1.ebuild 4180 +RMD160 b3d17d7627601e06dc646611a40b26ed9e72ff1b mozilla-firefox-bin-2.0.0.1.ebuild 4180 +SHA256 64376fa4a3700b49e5fd25da78e125d388dc1cb837107bcf7ef76849cfa909c5 mozilla-firefox-bin-2.0.0.1.ebuild 4180 +MISC ChangeLog 17629 RMD160 444dfd679cc9c0772ad25092cd823614dffd500f SHA1 9765c1350233ed1683e67bc2ff2f4d8885fcdbce SHA256 c841828e2e93c4df8b0e0630997f7e22c297071de93affda9b42780ea82264f0 +MD5 e054383835e513b81eebf8cb12f75813 ChangeLog 17629 +RMD160 444dfd679cc9c0772ad25092cd823614dffd500f ChangeLog 17629 +SHA256 c841828e2e93c4df8b0e0630997f7e22c297071de93affda9b42780ea82264f0 ChangeLog 17629 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160 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 similarity index 100% rename from www-client/mozilla-firefox-bin/files/icon/mozillafirefox-bin-icon.png rename to 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 similarity index 100% rename from www-client/mozilla-firefox-bin/files/icon/mozillafirefox-bin.desktop rename to 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 -- 2.26.2