diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2008-04-19 19:29:32 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2008-04-19 19:29:32 +0000 |
| commit | 0e0b9d144baf9b534e166784ec409d4f35545538 (patch) | |
| tree | 78680faf7b974ec4bd3aaac69a8922a506e754c0 /www-client | |
| parent | Fixing avidemux' qt:4 dep (diff) | |
| download | historical-0e0b9d144baf9b534e166784ec409d4f35545538.tar.gz historical-0e0b9d144baf9b534e166784ec409d4f35545538.tar.bz2 historical-0e0b9d144baf9b534e166784ec409d4f35545538.zip | |
Fix collision, bug #218455
Package-Manager: portage-2.1.5_rc5
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/mozilla-firefox-bin/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/mozilla-firefox-bin/Manifest | 4 | ||||
| -rw-r--r-- | www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0_beta5.ebuild | 11 |
3 files changed, 15 insertions, 6 deletions
diff --git a/www-client/mozilla-firefox-bin/ChangeLog b/www-client/mozilla-firefox-bin/ChangeLog index 6d393b79a1d6..4a8b06386548 100644 --- a/www-client/mozilla-firefox-bin/ChangeLog +++ b/www-client/mozilla-firefox-bin/ChangeLog @@ -1,6 +1,10 @@ # 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.134 2008/04/19 14:38:12 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.135 2008/04/19 19:29:32 armin76 Exp $ + + 19 Apr 2008; Raúl Porcel <armin76@gentoo.org> + mozilla-firefox-bin-3.0_beta5.ebuild: + Fix collision, bug #218455 19 Apr 2008; Raúl Porcel <armin76@gentoo.org> -mozilla-firefox-bin-2.0.0.13.ebuild, mozilla-firefox-bin-2.0.0.14.ebuild, diff --git a/www-client/mozilla-firefox-bin/Manifest b/www-client/mozilla-firefox-bin/Manifest index 1514f9e4d4e4..02626411c807 100644 --- a/www-client/mozilla-firefox-bin/Manifest +++ b/www-client/mozilla-firefox-bin/Manifest @@ -91,6 +91,6 @@ DIST mozilla-firefox-3.0b5-uk.xpi 121035 RMD160 c528aca3916143ef5e4e3abd1a52e511 DIST mozilla-firefox-3.0b5-zh-CN.xpi 105442 RMD160 af6c4bd210e97dede151e77a7c45f63163456d10 SHA1 d5e3e2c9162d073f6f6f6fb662ab9a46eb55e264 SHA256 2cc84ef6d2d0a79b582fc2dbf43960248bb5c46c595cbb5d2e54e76c4d6dea74 DIST mozilla-firefox-3.0b5-zh-TW.xpi 118197 RMD160 c4ac7f0df4dffe4b7971214e4e4254bd26147b5c SHA1 4ff7ce170d25338e6b10c3bdc49b098f3a8a48ce SHA256 f0f3ca016a25b2245bc5f97d16628a5ef28dd71d925f528016a2c5807ed84216 EBUILD mozilla-firefox-bin-2.0.0.14.ebuild 4512 RMD160 65b82b321bd05176e3b5385553b5558ef767160c SHA1 d76ae2bb3b5344f469733b52d4dc90782793fc7f SHA256 9bb62d27e0be62dddbdf4255581b5c4a8ef247d65748bd1e1237ac67c87825ea -EBUILD mozilla-firefox-bin-3.0_beta5.ebuild 4244 RMD160 7c5a154cf270b9fe0ff9288e98a7fdcde5a399dd SHA1 5aad9d1845f48a9d8718dfd14e4b192ade132246 SHA256 c29309d4261b50ceaa3f2fcfe5d6441ea05b5f454a45566ca62971617c867ca0 -MISC ChangeLog 26652 RMD160 20af40b5711015714bdc75381a02f86a06d99997 SHA1 d10a04fd8f239b8418ea814b7250d1cd51520b07 SHA256 b14fbb468f29359fa1705375f89fb65a18e672f24ea8d859ae7f3fb55abbc1db +EBUILD mozilla-firefox-bin-3.0_beta5.ebuild 4303 RMD160 34f44c5f7bb4694a43006560d109ae658662aad9 SHA1 6992e05c658a90781151f4e869ae0f0f935bd28e SHA256 326b92b6f3a078da316753fe8560e3001f16f4b7d54e1b3877af8c2410872f85 +MISC ChangeLog 26771 RMD160 27647c70c53f392825da27abc7c824cc883b7960 SHA1 0ae1f451bf1eaa0217178e3a76e32f56487ebc74 SHA256 5b0e57909c5f618221ff54962ec5f416d065adabb2e65ca61bea855ed17c69c6 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0_beta5.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0_beta5.ebuild index 0c66bc1a9920..040515475c55 100644 --- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0_beta5.ebuild +++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0_beta5.ebuild @@ -1,8 +1,8 @@ # 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_beta5.ebuild,v 1.4 2008/04/19 15:58:14 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0_beta5.ebuild,v 1.5 2008/04/19 19:29:32 armin76 Exp $ -inherit eutils multilib mozextension +inherit eutils mozilla-launcher multilib mozextension LANGS="af ar be ca cs de el en-GB en-US es-AR es-ES eu fi fr fy-NL gu-IN he hu id it ja ka ko ku lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sq sv-SE tr uk zh-CN zh-TW" NOSHORTLANGS="en-GB es-AR pt-BR zh-CN" @@ -118,7 +118,6 @@ src_install() { # Create /usr/bin/firefox-bin make_wrapper firefox-bin "${MOZILLA_FIVE_HOME}/firefox-bin" - dosym /usr/bin/firefox-bin /usr/bin/firefox # Install icon and .desktop for menu entry doicon "${FILESDIR}"/icon/${PN}-icon.png @@ -142,4 +141,10 @@ pkg_preinst() { pkg_postinst() { use amd64 && einfo "NB: You just installed a 32-bit firefox" + update_mozilla_launcher_symlinks } + +pkg_postrm() { + update_mozilla_launcher_symlinks +} + |