Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/fordfrog:master commit in: dev-util/netbeans/
Date: Wed, 05 Oct 2016 10:19:40
Message-Id: 1475662758.190529aae5aa755f166af2971503d8e00e251192.fordfrog@gentoo
1 commit: 190529aae5aa755f166af2971503d8e00e251192
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 5 10:19:18 2016 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 5 10:19:18 2016 +0000
6 URL: https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=190529aa
7
8 dev-util/netbeans: changed linguas_ to l10n_, improved locales code and added localized desktop entries
9
10 Package-Manager: portage-2.3.1
11
12 dev-util/netbeans/Manifest | 3 +-
13 dev-util/netbeans/netbeans-9999_p20161004.ebuild | 196 +++++++++++------------
14 2 files changed, 99 insertions(+), 100 deletions(-)
15
16 diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
17 index 4c424b9..2a2a016 100644
18 --- a/dev-util/netbeans/Manifest
19 +++ b/dev-util/netbeans/Manifest
20 @@ -6,6 +6,7 @@ DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99e
21 DIST netbeans-l10n-8.0.1-20141110.tar.bz2 12065358 SHA256 542d325cbc6e0e617f6076e964e37803ec322b6d0ee4724a6d2127f2f480fb24 SHA512 28242dcbe7bcbc6a9abce15dfe6fd6140a275a417d96ff28228315bdc0ce8110ede899a1815e2fdf9115b48221d50cd3ff5b71a15d36316d04d81f66e9c0cac4 WHIRLPOOL 0318caea3463d3f7bb8876774b1cc9467dadd9bc36497a9304ed12900e2fabdc4dcdfec0b9eaee27bb36c39e9caff3743c5a42ad4c3a432205a716832688c4d6
22 DIST netbeans-l10n-8.1-20151105.tar.bz2 11945028 SHA256 33e86aa7315021d28fdb64790233327d7599c98bcf3ab9d936b6fe924884325a SHA512 eb3163eaa8add417a0e8ac3ed4923a6e4992a80eaac00a01eed24e0e1ceb8a5cbd308659bcf0e5e1192ac8e84a79ea36744ad6b2589d60891b03b37102e9435d WHIRLPOOL f214a865bfd8c54341fb9d538da6db4d9b24906b0d94b3ee6cbf4a525e8842d28e852febb2f34c4c31f989d1b6baf750480bc2f04d94bcd7a8bdb8c9553ef590
23 DIST netbeans-l10n-9999-20131010.tar.bz2 12440242 SHA256 64c48605820ec1f35e38c34b48cc16cd40c053d085d50819d4b4e9a80453dfa9 SHA512 7d4d61fa61710186fefd90721598ec635db7c6249ce6fc484fd5813636220f163b60230349c984c398c87e083d2d629c531fe5b4cea3752ebbcaa9823b701a02 WHIRLPOOL 10506e3a3004d6c0ab17b05507f72db2c25d2713c3233a7f5478da27d3b1261b5fb6d5f71cbf369858668ca2d1219dad1900c6c42d3f250adcc935e846e56b09
24 +DIST netbeans-l10n-9999-20160920.tar.bz2 12724225 SHA256 f7bf8748874b30e7553c0f63492d556d24764bb4c8ea0083ade37707db0db0d1 SHA512 777160e22f648cd4c6343b51212c1a1ab5de31e84a36b8581dc3742aec7933122edc5215292ddb43df69960b6baaa8670b1b204c4728772627347b2bdcfa6254 WHIRLPOOL 9de45a38286d003e549da4eba2e1379c349d0aed4025e9c0697942a2596087994b428cf8843f3dbf2ac09524bc41aaa5ac1e7c810c78207a220af143cdc794ae
25 DIST netbeans-trunk-nightly-201609050002-src.zip 217295386 SHA256 df1a8f4790a433bbb86bc1afbc1bf4a847bea70291e456d20f83cdd7cd7117af SHA512 cfe82a76935ad833f5669533732a2f41edcfb5bf023d50d6cbcf7fdd7029d35633f25dde37d7d684ffdf4c703c3bddabdddcfa66e3badb19f3027bbbaa4086f3 WHIRLPOOL 34a726ac4390780ec4a288fdc45a5e1866c3c93ac67f6660be76c7b5977353eed1e3c55d4f23471b0ede3d84adbb84d9dfb49bb844dacce1c8078eed05b157fb
26 DIST netbeans-trunk-nightly-201609060002-src.zip 217295403 SHA256 1c48337b8c19a6b3781a5bf607099937a1e849a626052f41990b42f6d113e5d1 SHA512 6a695c4a5561e1c66227b81de19d5d338619ad2fc958cef4c4cc9efa76251de68bc0103a6f6668074ac4082d57b431095aac88fef1825fde498bb80ea4dfb080 WHIRLPOOL 68ebf36208076a0126b08778b34adf3dd630b287de4c4395380d66d069ad1057ee12d9a049ec29208ca97bce0eb2a48dc7ac1e602016a6d1947b5ddeaba57685
27 DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc0f67d55cea4ac4e8c91cc411da8acfa82a39353fb834435744 SHA512 80e73226d8d6d16081637604eb5ddefa388142c99354611dee713ec765c699a7f945c90d35655458728166a4ea4981137a04984c7f8c9838393241dc70016d5b WHIRLPOOL b52f8eca33fbf94453744e59adb2b3cd44853a97fc8e7b108604d430dafac0d33f802085182f2cd0abbc0df84fb0c391084dfe00520f3c5fe8303e8d3ad03bbf
28 @@ -65,5 +66,5 @@ EBUILD netbeans-9999_p20160930.ebuild 6939 SHA256 63a623b6b31c3182a03a0b16c1e4fc
29 EBUILD netbeans-9999_p20161001.ebuild 6939 SHA256 8da2108defec70e60e9478e11492f4956bcb856eb33826419c1e873ee6c2a6b3 SHA512 e4a1c849390f830edb44563b96b5ea3bb278236277ae8939b8625b07d023459448fb32f0d18300a55120a4ef24e519080c22acedd2814f3664f603198f1b1498 WHIRLPOOL 86d5a34bcb671c758a763916a72a1f8af933c7a99b25f3b251518206dea8336bd0fbe7c40a9ef8a21b4c7bcfa8d23d7923965c2b3e0193f949de7be5e8b343c8
30 EBUILD netbeans-9999_p20161002.ebuild 6939 SHA256 cff7a29699ff709aedf8a05736eabfff563825d61a13f4cac09711e2ae5bf36e SHA512 4fc1b43610dea2c7b661609b9fe5aa68a04363b087aea1e82125b3e1050344f8486ddee96062d489a2ab854fcc4310ef757e5671590f46d075429a3b220e6645 WHIRLPOOL b4fa838903770ea332deedd4c72a428ca0af47ee09ae61feac1c2dd27d000624882aec62448aed6fdce803a2e309734e905b4deaf8f7cb584d9d9ce65ac80560
31 EBUILD netbeans-9999_p20161003.ebuild 6939 SHA256 8b9ca9ba7adaa5c451245a68a0cf6fdb6aabd327d84f95a16cad517c1de27b6c SHA512 278931546dd1600618f337f7f08c0b27f7b30dfbf978e4305308011f393b66eb02ddc5258ebef041f1f687c2c293d1477cf676596f27bb3210fe7d2696fa9937 WHIRLPOOL 496276e1b8c8fa386a43e204c44923c9194ba6d313ca1f7e4279664c6c46132c8fc796ac413eba8887a830caee2e3b4aedf16d6544cb7085b05b1ee20caf9543
32 -EBUILD netbeans-9999_p20161004.ebuild 6939 SHA256 caec86f398d15c95f1930fa955bc5175ebd35c5264cb8f2cf4b97edd1b0a2b2b SHA512 cf4719eff97bd7bc72dfb5ebd6214e25dd61a07234e278fb24d769c285dd21fcddc9cf5a309566814615b14e378dcf42aa55b6e1c82c8784b547254cd83b112e WHIRLPOOL 6c575e22bb1308955419902803a915cf5875c1eadbbbbf8f1ecc5c9739899cb4f1be83fdbb6bb883f605a7f84840cd809b2293f049e1fec4948c90362ec309d9
33 +EBUILD netbeans-9999_p20161004.ebuild 6690 SHA256 a60833a04deb677aba2341fefe7d1da3f11f4268037a092aedb23281ba54476b SHA512 dd61ff09d998b21d1e8cf5b2f09028e407492e1fd614b3780bdbe86d6804e884aac4bb3b57058aa0d204d1139170969072e4c2155e7b7f7b30a8c4c58a10fa5d WHIRLPOOL 1fd9ddc67948f90ee9c212e4088b317c9de0a806985f10543f92a8a71b02ee5c089ee0a23dd9c9220c246aac8e27a6e6c9c5ae8eaf495f1ee2d42b9ce48cd453
34 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834
35
36 diff --git a/dev-util/netbeans/netbeans-9999_p20161004.ebuild b/dev-util/netbeans/netbeans-9999_p20161004.ebuild
37 index 8fafa9a..cab464e 100644
38 --- a/dev-util/netbeans/netbeans-9999_p20161004.ebuild
39 +++ b/dev-util/netbeans/netbeans-9999_p20161004.ebuild
40 @@ -10,43 +10,43 @@ HOMEPAGE="http://netbeans.org/"
41 SLOT="9999"
42 SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-10-04_00-02-33/zip/netbeans-trunk-nightly-201610040002-src.zip"
43 PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
44 -L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20131010.tar.bz2"
45 +L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20160920.tar.bz2"
46 ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
47 -SRC_URI="linguas_af? ( ${ALL_URLS} )
48 - linguas_ar? ( ${ALL_URLS} )
49 - linguas_ar_SA? ( ${ALL_URLS} )
50 - linguas_bg? ( ${ALL_URLS} )
51 - linguas_ca? ( ${ALL_URLS} )
52 - linguas_cs? ( ${ALL_URLS} )
53 - linguas_de? ( ${ALL_URLS} )
54 - linguas_el? ( ${ALL_URLS} )
55 - linguas_es? ( ${ALL_URLS} )
56 - linguas_es_CO? ( ${ALL_URLS} )
57 - linguas_fil? ( ${ALL_URLS} )
58 - linguas_fr? ( ${ALL_URLS} )
59 - linguas_gl? ( ${ALL_URLS} )
60 - linguas_hi_IN? ( ${ALL_URLS} )
61 - linguas_id_ID? ( ${ALL_URLS} )
62 - linguas_it? ( ${ALL_URLS} )
63 - linguas_ja? ( ${ALL_URLS} )
64 - linguas_ko? ( ${ALL_URLS} )
65 - linguas_lt? ( ${ALL_URLS} )
66 - linguas_nl_BE? ( ${ALL_URLS} )
67 - linguas_nl_NL? ( ${ALL_URLS} )
68 - linguas_pl? ( ${ALL_URLS} )
69 - linguas_pt_BR? ( ${ALL_URLS} )
70 - linguas_pt_PT? ( ${ALL_URLS} )
71 - linguas_ro? ( ${ALL_URLS} )
72 - linguas_ru? ( ${ALL_URLS} )
73 - linguas_si? ( ${ALL_URLS} )
74 - linguas_sq? ( ${ALL_URLS} )
75 - linguas_sr? ( ${ALL_URLS} )
76 - linguas_sv? ( ${ALL_URLS} )
77 - linguas_ta_IN? ( ${ALL_URLS} )
78 - linguas_tr? ( ${ALL_URLS} )
79 - linguas_vi? ( ${ALL_URLS} )
80 - linguas_zh_CN? ( ${ALL_URLS} )
81 - linguas_zh_TW? ( ${ALL_URLS} )
82 +SRC_URI="l10n_af? ( ${ALL_URLS} )
83 + l10n_ar-EG? ( ${ALL_URLS} )
84 + l10n_ar-SA? ( ${ALL_URLS} )
85 + l10n_bg? ( ${ALL_URLS} )
86 + l10n_ca? ( ${ALL_URLS} )
87 + l10n_cs? ( ${ALL_URLS} )
88 + l10n_de? ( ${ALL_URLS} )
89 + l10n_el? ( ${ALL_URLS} )
90 + l10n_es? ( ${ALL_URLS} )
91 + l10n_es-CO? ( ${ALL_URLS} )
92 + l10n_fil-PH? ( ${ALL_URLS} )
93 + l10n_fr? ( ${ALL_URLS} )
94 + l10n_gl-ES? ( ${ALL_URLS} )
95 + l10n_hi-IN? ( ${ALL_URLS} )
96 + l10n_id-ID? ( ${ALL_URLS} )
97 + l10n_it? ( ${ALL_URLS} )
98 + l10n_ja? ( ${ALL_URLS} )
99 + l10n_ko? ( ${ALL_URLS} )
100 + l10n_lt? ( ${ALL_URLS} )
101 + l10n_nl-BE? ( ${ALL_URLS} )
102 + l10n_nl-NL? ( ${ALL_URLS} )
103 + l10n_pl? ( ${ALL_URLS} )
104 + l10n_pt-BR? ( ${ALL_URLS} )
105 + l10n_pt-PT? ( ${ALL_URLS} )
106 + l10n_ro? ( ${ALL_URLS} )
107 + l10n_ru? ( ${ALL_URLS} )
108 + l10n_si? ( ${ALL_URLS} )
109 + l10n_sq? ( ${ALL_URLS} )
110 + l10n_sr? ( ${ALL_URLS} )
111 + l10n_sv? ( ${ALL_URLS} )
112 + l10n_ta-IN? ( ${ALL_URLS} )
113 + l10n_tr? ( ${ALL_URLS} )
114 + l10n_vi? ( ${ALL_URLS} )
115 + l10n_zh-CN? ( ${ALL_URLS} )
116 + l10n_zh-TW? ( ${ALL_URLS} )
117 "
118 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
119 KEYWORDS="~amd64 ~x86"
120 @@ -66,43 +66,43 @@ IUSE_NETBEANS_MODULES="
121 +netbeans_modules_profiler
122 netbeans_modules_webcommon
123 +netbeans_modules_websvccommon"
124 -IUSE_LINGUAS="
125 - linguas_af
126 - linguas_ar
127 - linguas_ar_SA
128 - linguas_bg
129 - linguas_ca
130 - linguas_cs
131 - linguas_de
132 - linguas_el
133 - linguas_es
134 - linguas_es_CO
135 - linguas_fil
136 - linguas_fr
137 - linguas_gl
138 - linguas_hi_IN
139 - linguas_id_ID
140 - linguas_it
141 - linguas_ja
142 - linguas_ko
143 - linguas_lt
144 - linguas_nl_BE
145 - linguas_nl_NL
146 - linguas_pl
147 - linguas_pt_BR
148 - linguas_pt_PT
149 - linguas_ro
150 - linguas_ru
151 - linguas_si
152 - linguas_sq
153 - linguas_sr
154 - linguas_sv
155 - linguas_ta_IN
156 - linguas_tr
157 - linguas_vi
158 - linguas_zh_CN
159 - linguas_zh_TW"
160 -IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_LINGUAS}"
161 +IUSE_L10N="
162 + l10n_af
163 + l10n_ar-EG
164 + l10n_ar-SA
165 + l10n_bg
166 + l10n_ca
167 + l10n_cs
168 + l10n_de
169 + l10n_el
170 + l10n_es
171 + l10n_es-CO
172 + l10n_fil-PH
173 + l10n_fr
174 + l10n_gl-ES
175 + l10n_hi-IN
176 + l10n_id-ID
177 + l10n_it
178 + l10n_ja
179 + l10n_ko
180 + l10n_lt
181 + l10n_nl-BE
182 + l10n_nl-NL
183 + l10n_pl
184 + l10n_pt-BR
185 + l10n_pt-PT
186 + l10n_ro
187 + l10n_ru
188 + l10n_si
189 + l10n_sq
190 + l10n_sr
191 + l10n_sv
192 + l10n_ta-IN
193 + l10n_tr
194 + l10n_vi
195 + l10n_zh-CN
196 + l10n_zh-TW"
197 +IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_L10N}"
198 S="${WORKDIR}"
199
200 DEPEND=">=virtual/jdk-1.7
201 @@ -133,22 +133,15 @@ JAVA_PKG_BSFIX="off"
202 NBLOCALES=""
203
204 pkg_setup() {
205 - for lingua in ${IUSE_LINGUAS} ; do
206 - local lang=${lingua/linguas_/}
207 -
208 - if [[ "${lang}" = "ar" ]] ; then
209 - lang="ar_EG,ar_SA"
210 - elif [[ "${lang}" = "es" ]] ; then
211 - lang="es,es_CO"
212 - elif [[ "${lang}" = "fil" ]] ; then
213 - lang="fil_PH"
214 - elif [[ "${lang}" = "gl" ]] ; then
215 - lang="gl_ES"
216 - elif [[ "${lang}" = "id_ID" ]] ; then
217 - lang="in_ID"
218 - fi
219 -
220 + for lingua in ${IUSE_L10N} ; do
221 if use ${lingua} ; then
222 + local lang=${lingua/l10n_/}
223 + lang=${lang/-/_}
224 +
225 + case ${lang} in
226 + id-ID) lang="in_ID";;
227 + esac
228 +
229 if [ -z "${NBLOCALES}" ] ; then
230 NBLOCALES="${lang}"
231 else
232 @@ -225,6 +218,21 @@ src_install() {
233 fi
234
235 popd >/dev/null || die
236 +
237 + make_desktop_entry "netbeans-${SLOT} --locale en" "Netbeans ${PV} en" netbeans-${SLOT} Development
238 +
239 + for lingua in ${IUSE_L10N}; do
240 + if use ${lingua} ; then
241 + local locale=${lingua/l10n_/}
242 + locale=${locale/-/:}
243 +
244 + case ${locale} in
245 + id:ID) lang="in:ID";;
246 + esac
247 +
248 + make_desktop_entry "netbeans-${SLOT} --locale ${locale}" "Netbeans ${PV} ${locale}" netbeans-${SLOT} Development
249 + fi
250 + done
251 fi
252 }
253
254 @@ -237,17 +245,7 @@ pkg_postinst() {
255 einfo "${PN}-${SLOT} --locale pt:BR"
256 fi
257
258 - if use linguas_ar ; then
259 - einfo
260 - einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant."
261 - fi
262 -
263 - if use linguas_es ; then
264 - einfo
265 - einfo "You selected Spanish locale so you can choose either es or es:CO variant."
266 - fi
267 -
268 - if use linguas_id_ID ; then
269 + if use l10n_id_ID ; then
270 einfo
271 einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
272 fi