From b06f5dae25823fda859cfc85c96cb38d226812e2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ra=C3=BAl=20Porcel?= Date: Thu, 19 Apr 2007 19:54:42 +0000 Subject: [PATCH] Fix NOSHORTLANG variable, bug 175236 Package-Manager: portage-2.1.2.4 --- mail-client/mozilla-thunderbird-bin/ChangeLog | 6 +- mail-client/mozilla-thunderbird-bin/Manifest | 16 ++--- .../mozilla-thunderbird-bin-2.0.0.0.ebuild | 61 +++++++++++-------- 3 files changed, 48 insertions(+), 35 deletions(-) diff --git a/mail-client/mozilla-thunderbird-bin/ChangeLog b/mail-client/mozilla-thunderbird-bin/ChangeLog index a97f1e27965d..f9e06b44f204 100644 --- a/mail-client/mozilla-thunderbird-bin/ChangeLog +++ b/mail-client/mozilla-thunderbird-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-client/mozilla-thunderbird-bin # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.70 2007/04/18 22:01:11 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.71 2007/04/19 19:54:42 armin76 Exp $ + + 19 Apr 2007; Raúl Porcel + mozilla-thunderbird-bin-2.0.0.0.ebuild: + Fix NOSHORTLANG variable, bug 175236 *mozilla-thunderbird-bin-2.0.0.0 (18 Apr 2007) diff --git a/mail-client/mozilla-thunderbird-bin/Manifest b/mail-client/mozilla-thunderbird-bin/Manifest index 7c3bae90fadf..8a065a9495cc 100644 --- a/mail-client/mozilla-thunderbird-bin/Manifest +++ b/mail-client/mozilla-thunderbird-bin/Manifest @@ -84,14 +84,14 @@ EBUILD mozilla-thunderbird-bin-1.5.0.10.ebuild 4040 RMD160 9e9df965e9c1e4de6a3d4 MD5 a6d1f0f742387dce6d12d91e78432993 mozilla-thunderbird-bin-1.5.0.10.ebuild 4040 RMD160 9e9df965e9c1e4de6a3d473d531fdbbd33500a8c mozilla-thunderbird-bin-1.5.0.10.ebuild 4040 SHA256 6d5ad644c369208935b72d73a93c08e27b49c24f8a9e75f0ac8b912a50909efd mozilla-thunderbird-bin-1.5.0.10.ebuild 4040 -EBUILD mozilla-thunderbird-bin-2.0.0.0.ebuild 4055 RMD160 de5fa53fcc4c5b75a6d438b399e29a5213845664 SHA1 224d26262336fda1b1c3bda8a6c2db7b129c4ce8 SHA256 5b42f61c3893fdc25f7b1db7d1f7042ce3eaf706911e40c441c7c2a447896cf9 -MD5 b4b50222bdd22f10247c791a28587942 mozilla-thunderbird-bin-2.0.0.0.ebuild 4055 -RMD160 de5fa53fcc4c5b75a6d438b399e29a5213845664 mozilla-thunderbird-bin-2.0.0.0.ebuild 4055 -SHA256 5b42f61c3893fdc25f7b1db7d1f7042ce3eaf706911e40c441c7c2a447896cf9 mozilla-thunderbird-bin-2.0.0.0.ebuild 4055 -MISC ChangeLog 14345 RMD160 6e93d87a7e6266b5f7d0a37790f42dcb57b2a485 SHA1 f57444c5c569ee2a4051f90952ebf1e3bc19ed09 SHA256 75724a2f48a26d250cdcd5a153c16d166a5166f2c381eb17e93c502de48633f9 -MD5 e3c81972319b2f32e8a4330cee5ec3e8 ChangeLog 14345 -RMD160 6e93d87a7e6266b5f7d0a37790f42dcb57b2a485 ChangeLog 14345 -SHA256 75724a2f48a26d250cdcd5a153c16d166a5166f2c381eb17e93c502de48633f9 ChangeLog 14345 +EBUILD mozilla-thunderbird-bin-2.0.0.0.ebuild 4580 RMD160 469a43da92bf6ec61f486342bad268e2e6dead05 SHA1 6f6b571ce5252c46c265a423dd86af84db3df541 SHA256 2d24aa9f8cddb5f0467c1b7565528b372f40507232297284f14f9d7230b4e1fe +MD5 fad5266b7574985515f4f007cb01d2eb mozilla-thunderbird-bin-2.0.0.0.ebuild 4580 +RMD160 469a43da92bf6ec61f486342bad268e2e6dead05 mozilla-thunderbird-bin-2.0.0.0.ebuild 4580 +SHA256 2d24aa9f8cddb5f0467c1b7565528b372f40507232297284f14f9d7230b4e1fe mozilla-thunderbird-bin-2.0.0.0.ebuild 4580 +MISC ChangeLog 14476 RMD160 d3af7208da516292f07622542ad538ce8e65a72d SHA1 e2ab3439c922f9766ca2881a0c69e8451e3bb7a8 SHA256 73bf4b8e86cd39b78471dca76a9d304793d798e617a7ab6b3a34ccdfd9b39711 +MD5 c7b574f2b8d58dacac683b9cfb5264af ChangeLog 14476 +RMD160 d3af7208da516292f07622542ad538ce8e65a72d ChangeLog 14476 +SHA256 73bf4b8e86cd39b78471dca76a9d304793d798e617a7ab6b3a34ccdfd9b39711 ChangeLog 14476 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160 diff --git a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-2.0.0.0.ebuild b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-2.0.0.0.ebuild index e38d08f2d0d2..d1a831d7ed29 100644 --- a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-2.0.0.0.ebuild +++ b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-2.0.0.0.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-2.0.0.0.ebuild,v 1.1 2007/04/18 22:01:11 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-2.0.0.0.ebuild,v 1.2 2007/04/19 19:54:42 armin76 Exp $ inherit eutils mozilla-launcher multilib mozextension LANGS="be bg ca cs da de el en-GB es-AR es-ES eu fi fr ga-IE hu it ja lt mk nb-NO nl pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr zh-CN zh-TW" -SHORTLANGS="es-ES nb-NO pt-BR sv-SE zh-TW" +NOSHORTLANGS="en-GB es-AR pt-BR zh-TW" DESCRIPTION="The Mozilla Thunderbird Mail & News Reader" SRC_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/linux-i686/en-US/thunderbird-${PV}.tar.gz" @@ -23,7 +23,7 @@ for X in ${LANGS} ; do done for X in ${SHORTLANGS} ; do - SRC_URI="${SRC_URI} linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin}-xpi//${P/-bin}-${X}.xpi )" + SRC_URI="${SRC_URI} linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin}-xpi//${P/-bin/}-${X}.xpi )" IUSE="${IUSE} linguas_${X%%-*}" done @@ -44,37 +44,46 @@ RDEPEND="x11-libs/libXrender S=${WORKDIR}/thunderbird +for X in ${LANGS} ; do + SRC_URI="${SRC_URI} + linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P/-bin/}-${X}.xpi )" + IUSE="${IUSE} linguas_${X/-/_}" + # english is handled internally + if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then + SRC_URI="${SRC_URI} + linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P/-bin}-${X}.xpi )" + IUSE="${IUSE} linguas_${X%%-*}" + fi +done + +pkg_setup() { + # This is a binary x86 package => ABI=x86 + # Please keep this in future versions + # Danny van Dyk 2005/03/26 + has_multilib_profile && ABI="x86" +} + linguas() { - linguas= - local LANG + local LANG SLANG for LANG in ${LINGUAS}; do - if hasq ${LANG} en en_US; then - hasq en ${linguas} || \ - linguas="${linguas:+"${linguas} "}en" + if has ${LANG} en en_US; then + has en ${linguas} || linguas="${linguas:+"${linguas} "}en" continue - elif hasq ${LANG} ${LANGS//-/_}; then - hasq ${LANG//_/-} ${linguas} || \ - linguas="${linguas:+"${linguas} "}${LANG//_/-}" + elif has ${LANG} ${LANGS//-/_}; then + has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}" continue - else - local SLANG - for SLANG in ${SHORTLANGS}; do - if [[ ${LANG} == ${SLANG%%-*} ]]; then - hasq ${SLANG} ${linguas} || \ - linguas="${linguas:+"${linguas} "}${SLANG}" + elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then + for X in ${LANGS}; do + if [[ "${X}" == "${LANG}-"* ]] && \ + [[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then + has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}" continue 2 fi done fi - ewarn "Sorry, but mozilla-thunderbird does not support the ${LANG} LINGUA" + ewarn "Sorry, but mozilla-firefox does not support the ${LANG} LINGUA" done -} - -pkg_setup() { - # This is a binary x86 package => ABI=x86 - # Please keep this in future versions - # Danny van Dyk 2005/03/26 - has_multilib_profile && ABI="x86" + einfo "Selected language packs (first will be default): $linguas" } src_unpack() { @@ -146,4 +155,4 @@ pkg_postinst() { pkg_postrm() { update_mozilla_launcher_symlinks -} +} \ No newline at end of file -- 2.26.2