From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D97A1138330 for ; Wed, 5 Oct 2016 10:19:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59625E08E9; Wed, 5 Oct 2016 10:19:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2A35CE08E9 for ; Wed, 5 Oct 2016 10:19:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 615D934106F for ; Wed, 5 Oct 2016 10:19:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B1C8C248D for ; Wed, 5 Oct 2016 10:19:33 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1475662758.190529aae5aa755f166af2971503d8e00e251192.fordfrog@gentoo> Subject: [gentoo-commits] dev/fordfrog:master commit in: dev-util/netbeans/ X-VCS-Repository: dev/fordfrog X-VCS-Files: dev-util/netbeans/Manifest dev-util/netbeans/netbeans-9999_p20161004.ebuild X-VCS-Directories: dev-util/netbeans/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 190529aae5aa755f166af2971503d8e00e251192 X-VCS-Branch: master Date: Wed, 5 Oct 2016 10:19:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c5b1299e-7092-4561-b750-65f3dc657654 X-Archives-Hash: d02a5aaf0e2c9b0e672efb26e467294e commit: 190529aae5aa755f166af2971503d8e00e251192 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Oct 5 10:19:18 2016 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Wed Oct 5 10:19:18 2016 +0000 URL: https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=190529aa dev-util/netbeans: changed linguas_ to l10n_, improved locales code and added localized desktop entries Package-Manager: portage-2.3.1 dev-util/netbeans/Manifest | 3 +- dev-util/netbeans/netbeans-9999_p20161004.ebuild | 196 +++++++++++------------ 2 files changed, 99 insertions(+), 100 deletions(-) diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest index 4c424b9..2a2a016 100644 --- a/dev-util/netbeans/Manifest +++ b/dev-util/netbeans/Manifest @@ -6,6 +6,7 @@ DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99e DIST netbeans-l10n-8.0.1-20141110.tar.bz2 12065358 SHA256 542d325cbc6e0e617f6076e964e37803ec322b6d0ee4724a6d2127f2f480fb24 SHA512 28242dcbe7bcbc6a9abce15dfe6fd6140a275a417d96ff28228315bdc0ce8110ede899a1815e2fdf9115b48221d50cd3ff5b71a15d36316d04d81f66e9c0cac4 WHIRLPOOL 0318caea3463d3f7bb8876774b1cc9467dadd9bc36497a9304ed12900e2fabdc4dcdfec0b9eaee27bb36c39e9caff3743c5a42ad4c3a432205a716832688c4d6 DIST netbeans-l10n-8.1-20151105.tar.bz2 11945028 SHA256 33e86aa7315021d28fdb64790233327d7599c98bcf3ab9d936b6fe924884325a SHA512 eb3163eaa8add417a0e8ac3ed4923a6e4992a80eaac00a01eed24e0e1ceb8a5cbd308659bcf0e5e1192ac8e84a79ea36744ad6b2589d60891b03b37102e9435d WHIRLPOOL f214a865bfd8c54341fb9d538da6db4d9b24906b0d94b3ee6cbf4a525e8842d28e852febb2f34c4c31f989d1b6baf750480bc2f04d94bcd7a8bdb8c9553ef590 DIST netbeans-l10n-9999-20131010.tar.bz2 12440242 SHA256 64c48605820ec1f35e38c34b48cc16cd40c053d085d50819d4b4e9a80453dfa9 SHA512 7d4d61fa61710186fefd90721598ec635db7c6249ce6fc484fd5813636220f163b60230349c984c398c87e083d2d629c531fe5b4cea3752ebbcaa9823b701a02 WHIRLPOOL 10506e3a3004d6c0ab17b05507f72db2c25d2713c3233a7f5478da27d3b1261b5fb6d5f71cbf369858668ca2d1219dad1900c6c42d3f250adcc935e846e56b09 +DIST netbeans-l10n-9999-20160920.tar.bz2 12724225 SHA256 f7bf8748874b30e7553c0f63492d556d24764bb4c8ea0083ade37707db0db0d1 SHA512 777160e22f648cd4c6343b51212c1a1ab5de31e84a36b8581dc3742aec7933122edc5215292ddb43df69960b6baaa8670b1b204c4728772627347b2bdcfa6254 WHIRLPOOL 9de45a38286d003e549da4eba2e1379c349d0aed4025e9c0697942a2596087994b428cf8843f3dbf2ac09524bc41aaa5ac1e7c810c78207a220af143cdc794ae DIST netbeans-trunk-nightly-201609050002-src.zip 217295386 SHA256 df1a8f4790a433bbb86bc1afbc1bf4a847bea70291e456d20f83cdd7cd7117af SHA512 cfe82a76935ad833f5669533732a2f41edcfb5bf023d50d6cbcf7fdd7029d35633f25dde37d7d684ffdf4c703c3bddabdddcfa66e3badb19f3027bbbaa4086f3 WHIRLPOOL 34a726ac4390780ec4a288fdc45a5e1866c3c93ac67f6660be76c7b5977353eed1e3c55d4f23471b0ede3d84adbb84d9dfb49bb844dacce1c8078eed05b157fb DIST netbeans-trunk-nightly-201609060002-src.zip 217295403 SHA256 1c48337b8c19a6b3781a5bf607099937a1e849a626052f41990b42f6d113e5d1 SHA512 6a695c4a5561e1c66227b81de19d5d338619ad2fc958cef4c4cc9efa76251de68bc0103a6f6668074ac4082d57b431095aac88fef1825fde498bb80ea4dfb080 WHIRLPOOL 68ebf36208076a0126b08778b34adf3dd630b287de4c4395380d66d069ad1057ee12d9a049ec29208ca97bce0eb2a48dc7ac1e602016a6d1947b5ddeaba57685 DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc0f67d55cea4ac4e8c91cc411da8acfa82a39353fb834435744 SHA512 80e73226d8d6d16081637604eb5ddefa388142c99354611dee713ec765c699a7f945c90d35655458728166a4ea4981137a04984c7f8c9838393241dc70016d5b WHIRLPOOL b52f8eca33fbf94453744e59adb2b3cd44853a97fc8e7b108604d430dafac0d33f802085182f2cd0abbc0df84fb0c391084dfe00520f3c5fe8303e8d3ad03bbf @@ -65,5 +66,5 @@ EBUILD netbeans-9999_p20160930.ebuild 6939 SHA256 63a623b6b31c3182a03a0b16c1e4fc EBUILD netbeans-9999_p20161001.ebuild 6939 SHA256 8da2108defec70e60e9478e11492f4956bcb856eb33826419c1e873ee6c2a6b3 SHA512 e4a1c849390f830edb44563b96b5ea3bb278236277ae8939b8625b07d023459448fb32f0d18300a55120a4ef24e519080c22acedd2814f3664f603198f1b1498 WHIRLPOOL 86d5a34bcb671c758a763916a72a1f8af933c7a99b25f3b251518206dea8336bd0fbe7c40a9ef8a21b4c7bcfa8d23d7923965c2b3e0193f949de7be5e8b343c8 EBUILD netbeans-9999_p20161002.ebuild 6939 SHA256 cff7a29699ff709aedf8a05736eabfff563825d61a13f4cac09711e2ae5bf36e SHA512 4fc1b43610dea2c7b661609b9fe5aa68a04363b087aea1e82125b3e1050344f8486ddee96062d489a2ab854fcc4310ef757e5671590f46d075429a3b220e6645 WHIRLPOOL b4fa838903770ea332deedd4c72a428ca0af47ee09ae61feac1c2dd27d000624882aec62448aed6fdce803a2e309734e905b4deaf8f7cb584d9d9ce65ac80560 EBUILD netbeans-9999_p20161003.ebuild 6939 SHA256 8b9ca9ba7adaa5c451245a68a0cf6fdb6aabd327d84f95a16cad517c1de27b6c SHA512 278931546dd1600618f337f7f08c0b27f7b30dfbf978e4305308011f393b66eb02ddc5258ebef041f1f687c2c293d1477cf676596f27bb3210fe7d2696fa9937 WHIRLPOOL 496276e1b8c8fa386a43e204c44923c9194ba6d313ca1f7e4279664c6c46132c8fc796ac413eba8887a830caee2e3b4aedf16d6544cb7085b05b1ee20caf9543 -EBUILD netbeans-9999_p20161004.ebuild 6939 SHA256 caec86f398d15c95f1930fa955bc5175ebd35c5264cb8f2cf4b97edd1b0a2b2b SHA512 cf4719eff97bd7bc72dfb5ebd6214e25dd61a07234e278fb24d769c285dd21fcddc9cf5a309566814615b14e378dcf42aa55b6e1c82c8784b547254cd83b112e WHIRLPOOL 6c575e22bb1308955419902803a915cf5875c1eadbbbbf8f1ecc5c9739899cb4f1be83fdbb6bb883f605a7f84840cd809b2293f049e1fec4948c90362ec309d9 +EBUILD netbeans-9999_p20161004.ebuild 6690 SHA256 a60833a04deb677aba2341fefe7d1da3f11f4268037a092aedb23281ba54476b SHA512 dd61ff09d998b21d1e8cf5b2f09028e407492e1fd614b3780bdbe86d6804e884aac4bb3b57058aa0d204d1139170969072e4c2155e7b7f7b30a8c4c58a10fa5d WHIRLPOOL 1fd9ddc67948f90ee9c212e4088b317c9de0a806985f10543f92a8a71b02ee5c089ee0a23dd9c9220c246aac8e27a6e6c9c5ae8eaf495f1ee2d42b9ce48cd453 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834 diff --git a/dev-util/netbeans/netbeans-9999_p20161004.ebuild b/dev-util/netbeans/netbeans-9999_p20161004.ebuild index 8fafa9a..cab464e 100644 --- a/dev-util/netbeans/netbeans-9999_p20161004.ebuild +++ b/dev-util/netbeans/netbeans-9999_p20161004.ebuild @@ -10,43 +10,43 @@ HOMEPAGE="http://netbeans.org/" SLOT="9999" SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-10-04_00-02-33/zip/netbeans-trunk-nightly-201610040002-src.zip" PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2" -L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20131010.tar.bz2" +L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20160920.tar.bz2" ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}" -SRC_URI="linguas_af? ( ${ALL_URLS} ) - linguas_ar? ( ${ALL_URLS} ) - linguas_ar_SA? ( ${ALL_URLS} ) - linguas_bg? ( ${ALL_URLS} ) - linguas_ca? ( ${ALL_URLS} ) - linguas_cs? ( ${ALL_URLS} ) - linguas_de? ( ${ALL_URLS} ) - linguas_el? ( ${ALL_URLS} ) - linguas_es? ( ${ALL_URLS} ) - linguas_es_CO? ( ${ALL_URLS} ) - linguas_fil? ( ${ALL_URLS} ) - linguas_fr? ( ${ALL_URLS} ) - linguas_gl? ( ${ALL_URLS} ) - linguas_hi_IN? ( ${ALL_URLS} ) - linguas_id_ID? ( ${ALL_URLS} ) - linguas_it? ( ${ALL_URLS} ) - linguas_ja? ( ${ALL_URLS} ) - linguas_ko? ( ${ALL_URLS} ) - linguas_lt? ( ${ALL_URLS} ) - linguas_nl_BE? ( ${ALL_URLS} ) - linguas_nl_NL? ( ${ALL_URLS} ) - linguas_pl? ( ${ALL_URLS} ) - linguas_pt_BR? ( ${ALL_URLS} ) - linguas_pt_PT? ( ${ALL_URLS} ) - linguas_ro? ( ${ALL_URLS} ) - linguas_ru? ( ${ALL_URLS} ) - linguas_si? ( ${ALL_URLS} ) - linguas_sq? ( ${ALL_URLS} ) - linguas_sr? ( ${ALL_URLS} ) - linguas_sv? ( ${ALL_URLS} ) - linguas_ta_IN? ( ${ALL_URLS} ) - linguas_tr? ( ${ALL_URLS} ) - linguas_vi? ( ${ALL_URLS} ) - linguas_zh_CN? ( ${ALL_URLS} ) - linguas_zh_TW? ( ${ALL_URLS} ) +SRC_URI="l10n_af? ( ${ALL_URLS} ) + l10n_ar-EG? ( ${ALL_URLS} ) + l10n_ar-SA? ( ${ALL_URLS} ) + l10n_bg? ( ${ALL_URLS} ) + l10n_ca? ( ${ALL_URLS} ) + l10n_cs? ( ${ALL_URLS} ) + l10n_de? ( ${ALL_URLS} ) + l10n_el? ( ${ALL_URLS} ) + l10n_es? ( ${ALL_URLS} ) + l10n_es-CO? ( ${ALL_URLS} ) + l10n_fil-PH? ( ${ALL_URLS} ) + l10n_fr? ( ${ALL_URLS} ) + l10n_gl-ES? ( ${ALL_URLS} ) + l10n_hi-IN? ( ${ALL_URLS} ) + l10n_id-ID? ( ${ALL_URLS} ) + l10n_it? ( ${ALL_URLS} ) + l10n_ja? ( ${ALL_URLS} ) + l10n_ko? ( ${ALL_URLS} ) + l10n_lt? ( ${ALL_URLS} ) + l10n_nl-BE? ( ${ALL_URLS} ) + l10n_nl-NL? ( ${ALL_URLS} ) + l10n_pl? ( ${ALL_URLS} ) + l10n_pt-BR? ( ${ALL_URLS} ) + l10n_pt-PT? ( ${ALL_URLS} ) + l10n_ro? ( ${ALL_URLS} ) + l10n_ru? ( ${ALL_URLS} ) + l10n_si? ( ${ALL_URLS} ) + l10n_sq? ( ${ALL_URLS} ) + l10n_sr? ( ${ALL_URLS} ) + l10n_sv? ( ${ALL_URLS} ) + l10n_ta-IN? ( ${ALL_URLS} ) + l10n_tr? ( ${ALL_URLS} ) + l10n_vi? ( ${ALL_URLS} ) + l10n_zh-CN? ( ${ALL_URLS} ) + l10n_zh-TW? ( ${ALL_URLS} ) " LICENSE="|| ( CDDL GPL-2-with-linking-exception )" KEYWORDS="~amd64 ~x86" @@ -66,43 +66,43 @@ IUSE_NETBEANS_MODULES=" +netbeans_modules_profiler netbeans_modules_webcommon +netbeans_modules_websvccommon" -IUSE_LINGUAS=" - linguas_af - linguas_ar - linguas_ar_SA - linguas_bg - linguas_ca - linguas_cs - linguas_de - linguas_el - linguas_es - linguas_es_CO - linguas_fil - linguas_fr - linguas_gl - linguas_hi_IN - linguas_id_ID - linguas_it - linguas_ja - linguas_ko - linguas_lt - linguas_nl_BE - linguas_nl_NL - linguas_pl - linguas_pt_BR - linguas_pt_PT - linguas_ro - linguas_ru - linguas_si - linguas_sq - linguas_sr - linguas_sv - linguas_ta_IN - linguas_tr - linguas_vi - linguas_zh_CN - linguas_zh_TW" -IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_LINGUAS}" +IUSE_L10N=" + l10n_af + l10n_ar-EG + l10n_ar-SA + l10n_bg + l10n_ca + l10n_cs + l10n_de + l10n_el + l10n_es + l10n_es-CO + l10n_fil-PH + l10n_fr + l10n_gl-ES + l10n_hi-IN + l10n_id-ID + l10n_it + l10n_ja + l10n_ko + l10n_lt + l10n_nl-BE + l10n_nl-NL + l10n_pl + l10n_pt-BR + l10n_pt-PT + l10n_ro + l10n_ru + l10n_si + l10n_sq + l10n_sr + l10n_sv + l10n_ta-IN + l10n_tr + l10n_vi + l10n_zh-CN + l10n_zh-TW" +IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_L10N}" S="${WORKDIR}" DEPEND=">=virtual/jdk-1.7 @@ -133,22 +133,15 @@ JAVA_PKG_BSFIX="off" NBLOCALES="" pkg_setup() { - for lingua in ${IUSE_LINGUAS} ; do - local lang=${lingua/linguas_/} - - if [[ "${lang}" = "ar" ]] ; then - lang="ar_EG,ar_SA" - elif [[ "${lang}" = "es" ]] ; then - lang="es,es_CO" - elif [[ "${lang}" = "fil" ]] ; then - lang="fil_PH" - elif [[ "${lang}" = "gl" ]] ; then - lang="gl_ES" - elif [[ "${lang}" = "id_ID" ]] ; then - lang="in_ID" - fi - + for lingua in ${IUSE_L10N} ; do if use ${lingua} ; then + local lang=${lingua/l10n_/} + lang=${lang/-/_} + + case ${lang} in + id-ID) lang="in_ID";; + esac + if [ -z "${NBLOCALES}" ] ; then NBLOCALES="${lang}" else @@ -225,6 +218,21 @@ src_install() { fi popd >/dev/null || die + + make_desktop_entry "netbeans-${SLOT} --locale en" "Netbeans ${PV} en" netbeans-${SLOT} Development + + for lingua in ${IUSE_L10N}; do + if use ${lingua} ; then + local locale=${lingua/l10n_/} + locale=${locale/-/:} + + case ${locale} in + id:ID) lang="in:ID";; + esac + + make_desktop_entry "netbeans-${SLOT} --locale ${locale}" "Netbeans ${PV} ${locale}" netbeans-${SLOT} Development + fi + done fi } @@ -237,17 +245,7 @@ pkg_postinst() { einfo "${PN}-${SLOT} --locale pt:BR" fi - if use linguas_ar ; then - einfo - einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant." - fi - - if use linguas_es ; then - einfo - einfo "You selected Spanish locale so you can choose either es or es:CO variant." - fi - - if use linguas_id_ID ; then + if use l10n_id_ID ; then einfo einfo "You selected Indonesian locale which has locale code in:ID in Netbeans." fi