From: Ioannis Aslanidis Date: Sun, 10 Dec 2006 15:32:32 +0000 (+0000) Subject: Improved LINGUAS support so that it is handled gracefully and does not die. See bug... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=47aa9088c6cdb1d49afd2e742c79c898f2409823;p=gentoo.git Improved LINGUAS support so that it is handled gracefully and does not die. See bug #137297#c23 for details. Package-Manager: portage-2.1.2_rc3-r1 --- diff --git a/kde-base/kde-i18n/ChangeLog b/kde-base/kde-i18n/ChangeLog index 82a47456926e..ee0babe3d2b8 100644 --- a/kde-base/kde-i18n/ChangeLog +++ b/kde-base/kde-i18n/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for kde-base/kde-i18n # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/ChangeLog,v 1.124 2006/12/06 12:28:04 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/ChangeLog,v 1.125 2006/12/10 15:32:32 deathwing00 Exp $ + + 10 Dec 2006; Ioannis Aslanidis + kde-i18n-3.5.5.ebuild: + Removed death message when there were issues with the LINGUAS environment + variable. Now, if LINGUAS is not set or it contains _only_ unsupported + languages, an informative message is shown and the package works the same + way as if LINGUAS had only the 'en' locale code. When there is only the 'en' + locale code, the ebuild marks itself as installed, even if it doesn't + actually pull anything. Complements bug #137297. 06 Dec 2006; kde-i18n-3.5.5.ebuild: Stable on Alpha. diff --git a/kde-base/kde-i18n/Manifest b/kde-base/kde-i18n/Manifest index 1342d243b72b..2213a464099b 100644 --- a/kde-base/kde-i18n/Manifest +++ b/kde-base/kde-i18n/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST kde-i18n-af-3.5.2.tar.bz2 1527575 RMD160 0c5444aa926bb8a34288ebd4b59231c4945cf26c SHA1 600d72535d39d997e60ac7a89de0b202d28b7c57 SHA256 16af770758c452c39ae831d57593b218470686ad2af519428db738fbcb2851a8 DIST kde-i18n-af-3.5.5.tar.bz2 1542197 RMD160 2b5c656f706272fc9bf46cc8a0417cedf460e45f SHA1 8363d1129f4428b5c7c2e2f519f44babf191e8c7 SHA256 e516767fe1282cace605f1383fdf448c34c38a03f900a20606408bc55941cdee DIST kde-i18n-ar-3.5.2.tar.bz2 1647711 RMD160 3677a3a995031720d01ea60abd19eb6f104bc4a8 SHA1 18faa2cda50a2c4b8ab274557dbe0b79c53e10c9 SHA256 f4ba6d127f4515f9ce7ba3f63d08505f28d350e3ba71fd3847ad1285051a62c9 @@ -130,14 +133,14 @@ EBUILD kde-i18n-3.5.2-r1.ebuild 1872 RMD160 9c633659c6cf47e3b3cb5999a6702d7b814a MD5 8856260723b57e3eed865769837ffbf7 kde-i18n-3.5.2-r1.ebuild 1872 RMD160 9c633659c6cf47e3b3cb5999a6702d7b814a586b kde-i18n-3.5.2-r1.ebuild 1872 SHA256 b040e2cf5e92219ce03c77b8f36bb8751262b893eb7cccbd02e4729fdbc3c519 kde-i18n-3.5.2-r1.ebuild 1872 -EBUILD kde-i18n-3.5.5.ebuild 1893 RMD160 b216ccf115437018abeebea6462fbf36e4e7eec1 SHA1 53c81f262cb4473cbd8808e0497fa8763156215f SHA256 772a4a821f704106e6af489dec4e623f59936f374b8278ec26973abd6405e299 -MD5 25cb6cbeac671865bd3326c818038160 kde-i18n-3.5.5.ebuild 1893 -RMD160 b216ccf115437018abeebea6462fbf36e4e7eec1 kde-i18n-3.5.5.ebuild 1893 -SHA256 772a4a821f704106e6af489dec4e623f59936f374b8278ec26973abd6405e299 kde-i18n-3.5.5.ebuild 1893 -MISC ChangeLog 14689 RMD160 4cb06fed29340131c7cba1fdab0683195e2d7003 SHA1 e2ee57719931ac9ef109bb947c648e6eb3af92c9 SHA256 7c2d727367dcae48b02a91a981d1f0dcfe00e0469f85964a58bcd14bfd6d340b -MD5 333da8484f6c2eff308f9a5fc2e696d0 ChangeLog 14689 -RMD160 4cb06fed29340131c7cba1fdab0683195e2d7003 ChangeLog 14689 -SHA256 7c2d727367dcae48b02a91a981d1f0dcfe00e0469f85964a58bcd14bfd6d340b ChangeLog 14689 +EBUILD kde-i18n-3.5.5.ebuild 1994 RMD160 89cda9b15d31c9d012821a208d7f2e992cda60a6 SHA1 47c0475f265c355e878b3d501ace8f431eb3f29d SHA256 2457c49e5b27a8721edcc9bc5415343f9839cf22732837c24336d893be169fea +MD5 2118ebe57e1a229f04d44a96c66dc30d kde-i18n-3.5.5.ebuild 1994 +RMD160 89cda9b15d31c9d012821a208d7f2e992cda60a6 kde-i18n-3.5.5.ebuild 1994 +SHA256 2457c49e5b27a8721edcc9bc5415343f9839cf22732837c24336d893be169fea kde-i18n-3.5.5.ebuild 1994 +MISC ChangeLog 15205 RMD160 1b64a79320095ae350bcc794f3f37ac543b979d6 SHA1 0e4eb7b2af57fbd0bc2e5637a4253dba1c4549d7 SHA256 762cf63dc070b8f4c708cc4650dd269eff559076bbbd6306e171b442e98f08ac +MD5 0946e33abdad61fa1f6c4708ea15bf35 ChangeLog 15205 +RMD160 1b64a79320095ae350bcc794f3f37ac543b979d6 ChangeLog 15205 +SHA256 762cf63dc070b8f4c708cc4650dd269eff559076bbbd6306e171b442e98f08ac ChangeLog 15205 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -148,3 +151,10 @@ SHA256 972b50559d35ec1c2386858dd87832716c2776ce587fd328667ec4611471e884 files/di MD5 ba956f321fee0560da73189c6765d5c7 files/digest-kde-i18n-3.5.5 16895 RMD160 72a8e1c5a1584e5e1165ff97185ed005e31d2b49 files/digest-kde-i18n-3.5.5 16895 SHA256 42c879493ff624b996c4b127f0e8a447db801f43c8903a33c9406e1417ce7739 files/digest-kde-i18n-3.5.5 16895 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFFfCibQVeVlgLp4x8RAm2xAJwIYwPiMldlBwavdSVbD9He84a9OwCfWIzE +obeQxTUndJxjnUiIxWpqvsA= +=w2f5 +-----END PGP SIGNATURE----- diff --git a/kde-base/kde-i18n/kde-i18n-3.5.5.ebuild b/kde-base/kde-i18n/kde-i18n-3.5.5.ebuild index 7cb959706474..6cf60a09b0b6 100644 --- a/kde-base/kde-i18n/kde-i18n-3.5.5.ebuild +++ b/kde-base/kde-i18n/kde-i18n-3.5.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.5.5.ebuild,v 1.14 2006/12/06 12:28:04 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.5.5.ebuild,v 1.15 2006/12/10 15:32:32 deathwing00 Exp $ inherit kde @@ -24,16 +24,17 @@ for X in ${LANGS} ; do done src_unpack() { - if [[ -z "${A}" && "${LINGUAS}" != "en" ]]; then + if [[ -z "${LINGUAS}" ]] || [[ -z "${A}" && "${LINGUAS}" != "en" ]]; then echo - eerror "You must set the LINGUAS environment variable to a list of valid" - eerror "language codes, one for each language you would like to install." - eerror "e.g.: LINGUAS=\"sv de pt\"" - eerror "" - eerror "The available language codes are:" + ewarn "You either have the LINGUAS environment variable unset or it" + ewarn "contains languages not supported by kde-base/kde-i18n." + ewarn "Because of that, kde-i18n will not add any kind of language" + ewarn "support." + echo + einfo "If you didn't intend this to happen, the available language" + einfo "codes are:" echo "${LANGS}" echo - die fi # Override kde_src_unpack.