From: Stefan Schweizer Date: Mon, 9 Oct 2006 09:52:40 +0000 (+0000) Subject: Better handling of SHORTLANGS X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3992af5c4a659ebbc4d23c8a6358b5a6bdfa083c;p=gentoo.git Better handling of SHORTLANGS Package-Manager: portage-2.1.2_pre2-r6 --- diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog index d6eb4a8886ab..b06b34497d82 100644 --- a/www-client/mozilla-firefox/ChangeLog +++ b/www-client/mozilla-firefox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/mozilla-firefox # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.192 2006/10/07 22:21:19 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.193 2006/10/09 09:52:40 genstef Exp $ + + 09 Oct 2006; Stefan Schweizer + mozilla-firefox-2.0_rc2.ebuild: + Better handling of SHORTLANGS 07 Oct 2006; Stefan Schweizer Manifest: fix digest, thanks brad diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest index cc1446bb1298..d78c81f7655e 100644 --- a/www-client/mozilla-firefox/Manifest +++ b/www-client/mozilla-firefox/Manifest @@ -162,14 +162,14 @@ EBUILD mozilla-firefox-1.5.0.7.ebuild 9530 RMD160 682a824c87c1fa3885795e29de7e6c MD5 009921ccc2d07dc7b680334d52b5a547 mozilla-firefox-1.5.0.7.ebuild 9530 RMD160 682a824c87c1fa3885795e29de7e6cd4f125d3b1 mozilla-firefox-1.5.0.7.ebuild 9530 SHA256 c3d98ad2848ad054155b8261d839336cdc21771886f04c09decbad6832b8e019 mozilla-firefox-1.5.0.7.ebuild 9530 -EBUILD mozilla-firefox-2.0_rc2.ebuild 7530 RMD160 0129e0a6e0fd90a5affb0ebfb1488c87858a1503 SHA1 2db657ac3288d478aed32c692332d9282060bf7e SHA256 c50c1bdb8e10e2fb65b9fcffedbe270b08902e15ee8a36b9da46a46157d2dee1 -MD5 f2143a173220d016c8f506a7f58d12c5 mozilla-firefox-2.0_rc2.ebuild 7530 -RMD160 0129e0a6e0fd90a5affb0ebfb1488c87858a1503 mozilla-firefox-2.0_rc2.ebuild 7530 -SHA256 c50c1bdb8e10e2fb65b9fcffedbe270b08902e15ee8a36b9da46a46157d2dee1 mozilla-firefox-2.0_rc2.ebuild 7530 -MISC ChangeLog 51514 RMD160 03f55d0ddeb776f0a4a99b8869f92458c18d7c2b SHA1 0f46aea88aec67d396a251d75c46e0e917bc1e90 SHA256 aa9ea170b0f69975e2a0915c1b7375cd2644d333c63f322b7f12f1b192be279f -MD5 76a2f93276f84c407fd00f15dc875aa0 ChangeLog 51514 -RMD160 03f55d0ddeb776f0a4a99b8869f92458c18d7c2b ChangeLog 51514 -SHA256 aa9ea170b0f69975e2a0915c1b7375cd2644d333c63f322b7f12f1b192be279f ChangeLog 51514 +EBUILD mozilla-firefox-2.0_rc2.ebuild 7655 RMD160 04255561750b2df105267bfb88eacb15f511e7c1 SHA1 04768f0ed35ab643db265362e7a9323b55faef85 SHA256 b54dc64792e1bed3799ad0a6052504455c107fe855941abef530657d13f04ddb +MD5 82021f9dac7a36bbafc1fc08cbf314d4 mozilla-firefox-2.0_rc2.ebuild 7655 +RMD160 04255561750b2df105267bfb88eacb15f511e7c1 mozilla-firefox-2.0_rc2.ebuild 7655 +SHA256 b54dc64792e1bed3799ad0a6052504455c107fe855941abef530657d13f04ddb mozilla-firefox-2.0_rc2.ebuild 7655 +MISC ChangeLog 51634 RMD160 b7fc0a9b74aa3c01ff37ca304cb00d969c1728e4 SHA1 88d075d60f1972348a8ca052c06b6953fb51c6c9 SHA256 1318af330522911ec9f7378ecaf151554ff28d654d2fc185badef729a6c34aa7 +MD5 67625689dc2709a130b722fb6f170ad2 ChangeLog 51634 +RMD160 b7fc0a9b74aa3c01ff37ca304cb00d969c1728e4 ChangeLog 51634 +SHA256 1318af330522911ec9f7378ecaf151554ff28d654d2fc185badef729a6c34aa7 ChangeLog 51634 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/mozilla-firefox-2.0_rc2.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild index db2cd645d0a4..d842af85bea1 100644 --- a/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild +++ b/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild,v 1.1 2006/10/07 17:43:53 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0_rc2.ebuild,v 1.2 2006/10/09 09:52:40 genstef Exp $ inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools PATCH="mozilla-firefox-2.0_rc1-patches-1.4" -LANGS="ar be bg ca cs da de el en-GB es-AR es-ES eu fi fr ga-IE gu-IN hu it ja ko -lt mk mn nb-NO nl pa-IN pl pt-BR ru sk sl sv-SE tr zh-CN zh-TW" -SHORTLANGS="fy-NL pt-PT nn-NO" +LANGS="ar be bg ca cs da de el en-GB es-AR es-ES eu fi fy-NL fr ga-IE gu-IN hu it ja ko +lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr zh-CN zh-TW" MY_PV=${PV/_} DESCRIPTION="Firefox Web Browser" @@ -31,11 +30,13 @@ for X in ${LANGS} ; do SRC_URI="${SRC_URI} linguas_${X/-/_}? ( http://gentooexperimental.org/~genstef/dist/${P}-xpi/${P}-${X}.xpi )" IUSE="${IUSE} linguas_${X/-/_}" -done -for X in ${SHORTLANGS} ; do - SRC_URI="${SRC_URI} - linguas_${X%%-*}? ( http://gentooexperimental.org/~genstef/dist/${P}-xpi/${P}-${X}.xpi )" - IUSE="${IUSE} linguas_${X%%-*}" + # english is handled internally + if [ "${#X}" == 5 ] && [ "${X}" != "en-GB" ] && [ "${X}" != "es-AR" ] && \ + [ "${X}" != "pt-BR" ] && [ "${X}" != "zh-TW" ]; then + SRC_URI="${SRC_URI} + linguas_${X%%-*}? ( http://gentooexperimental.org/~genstef/dist/${P}-xpi/${P}-${X}.xpi )" + IUSE="${IUSE} linguas_${X%%-*}" + fi done RDEPEND="java? ( virtual/jre )