1 |
commit: ce68826d2295ca6f5ff70c7f0767b3fe7036731e |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 6 09:07:32 2016 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 6 09:07:32 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce68826d |
7 |
|
8 |
dev-util/netbeans: fixed eapi 6 issue and reverted l10n changes |
9 |
|
10 |
Package-Manager: portage-2.3.1 |
11 |
|
12 |
dev-util/netbeans/netbeans-8.2.ebuild | 93 ++++++++++++++--------------------- |
13 |
1 file changed, 38 insertions(+), 55 deletions(-) |
14 |
|
15 |
diff --git a/dev-util/netbeans/netbeans-8.2.ebuild b/dev-util/netbeans/netbeans-8.2.ebuild |
16 |
index d68b665..c6b49d4 100644 |
17 |
--- a/dev-util/netbeans/netbeans-8.2.ebuild |
18 |
+++ b/dev-util/netbeans/netbeans-8.2.ebuild |
19 |
@@ -13,26 +13,23 @@ PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.pa |
20 |
L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2" |
21 |
ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}" |
22 |
SRC_URI="l10n_af? ( ${ALL_URLS} ) |
23 |
- l10n_ar-EG? ( ${ALL_URLS} ) |
24 |
- l10n_ar-SA? ( ${ALL_URLS} ) |
25 |
+ l10n_ar? ( ${ALL_URLS} ) |
26 |
l10n_bg? ( ${ALL_URLS} ) |
27 |
l10n_ca? ( ${ALL_URLS} ) |
28 |
l10n_cs? ( ${ALL_URLS} ) |
29 |
l10n_de? ( ${ALL_URLS} ) |
30 |
l10n_el? ( ${ALL_URLS} ) |
31 |
l10n_es? ( ${ALL_URLS} ) |
32 |
- l10n_es-CO? ( ${ALL_URLS} ) |
33 |
- l10n_fil-PH? ( ${ALL_URLS} ) |
34 |
+ l10n_fil? ( ${ALL_URLS} ) |
35 |
l10n_fr? ( ${ALL_URLS} ) |
36 |
- l10n_gl-ES? ( ${ALL_URLS} ) |
37 |
- l10n_hi-IN? ( ${ALL_URLS} ) |
38 |
- l10n_id-ID? ( ${ALL_URLS} ) |
39 |
+ l10n_gl? ( ${ALL_URLS} ) |
40 |
+ l10n_hi? ( ${ALL_URLS} ) |
41 |
+ l10n_id? ( ${ALL_URLS} ) |
42 |
l10n_it? ( ${ALL_URLS} ) |
43 |
l10n_ja? ( ${ALL_URLS} ) |
44 |
l10n_ko? ( ${ALL_URLS} ) |
45 |
l10n_lt? ( ${ALL_URLS} ) |
46 |
- l10n_nl-BE? ( ${ALL_URLS} ) |
47 |
- l10n_nl-NL? ( ${ALL_URLS} ) |
48 |
+ l10n_nl? ( ${ALL_URLS} ) |
49 |
l10n_pl? ( ${ALL_URLS} ) |
50 |
l10n_pt-BR? ( ${ALL_URLS} ) |
51 |
l10n_pt-PT? ( ${ALL_URLS} ) |
52 |
@@ -42,7 +39,7 @@ SRC_URI="l10n_af? ( ${ALL_URLS} ) |
53 |
l10n_sq? ( ${ALL_URLS} ) |
54 |
l10n_sr? ( ${ALL_URLS} ) |
55 |
l10n_sv? ( ${ALL_URLS} ) |
56 |
- l10n_ta-IN? ( ${ALL_URLS} ) |
57 |
+ l10n_ta? ( ${ALL_URLS} ) |
58 |
l10n_tr? ( ${ALL_URLS} ) |
59 |
l10n_vi? ( ${ALL_URLS} ) |
60 |
l10n_zh-CN? ( ${ALL_URLS} ) |
61 |
@@ -68,26 +65,23 @@ IUSE_NETBEANS_MODULES=" |
62 |
+netbeans_modules_websvccommon" |
63 |
IUSE_L10N=" |
64 |
l10n_af |
65 |
- l10n_ar-EG |
66 |
- l10n_ar-SA |
67 |
+ l10n_ar |
68 |
l10n_bg |
69 |
l10n_ca |
70 |
l10n_cs |
71 |
l10n_de |
72 |
l10n_el |
73 |
l10n_es |
74 |
- l10n_es-CO |
75 |
- l10n_fil-PH |
76 |
+ l10n_fil |
77 |
l10n_fr |
78 |
- l10n_gl-ES |
79 |
- l10n_hi-IN |
80 |
- l10n_id-ID |
81 |
+ l10n_gl |
82 |
+ l10n_hi |
83 |
+ l10n_id |
84 |
l10n_it |
85 |
l10n_ja |
86 |
l10n_ko |
87 |
l10n_lt |
88 |
- l10n_nl-BE |
89 |
- l10n_nl-NL |
90 |
+ l10n_nl |
91 |
l10n_pl |
92 |
l10n_pt-BR |
93 |
l10n_pt-PT |
94 |
@@ -97,7 +91,7 @@ IUSE_L10N=" |
95 |
l10n_sq |
96 |
l10n_sr |
97 |
l10n_sv |
98 |
- l10n_ta-IN |
99 |
+ l10n_ta |
100 |
l10n_tr |
101 |
l10n_vi |
102 |
l10n_zh-CN |
103 |
@@ -139,7 +133,14 @@ pkg_setup() { |
104 |
lang=${lang/-/_} |
105 |
|
106 |
case ${lang} in |
107 |
- id-ID) lang="in_ID";; |
108 |
+ ar) lang="ar_EG,ar_SA" ;; |
109 |
+ es) lang="es,es_CO" ;; |
110 |
+ fil) lang="fil_PH" ;; |
111 |
+ gl) lang="gl_ES" ;; |
112 |
+ hi) lang="hi_IN" ;; |
113 |
+ id) lang="in_ID" ;; |
114 |
+ nl) lang="nl_BE,nl_NL" ;; |
115 |
+ ta) lang="ta_IN" ;; |
116 |
esac |
117 |
|
118 |
if [ -z "${NBLOCALES}" ] ; then |
119 |
@@ -172,24 +173,12 @@ src_prepare() { |
120 |
|
121 |
epatch netbeans-8.2-build.xml.patch |
122 |
|
123 |
- # Support for custom patches |
124 |
- if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then |
125 |
- local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f` |
126 |
- |
127 |
- if [ -n "${files}" ] ; then |
128 |
- einfo "Applying custom patches:" |
129 |
- |
130 |
- for file in ${files} ; do |
131 |
- epatch "${file}" |
132 |
- done |
133 |
- fi |
134 |
- fi |
135 |
- |
136 |
einfo "Symlinking external libraries..." |
137 |
java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar |
138 |
fi |
139 |
|
140 |
java-pkg-2_src_prepare |
141 |
+ default |
142 |
} |
143 |
|
144 |
src_compile() { |
145 |
@@ -223,30 +212,24 @@ src_install() { |
146 |
|
147 |
for lingua in ${IUSE_L10N}; do |
148 |
if use ${lingua} ; then |
149 |
- local locale=${lingua/l10n_/} |
150 |
- locale=${locale/-/:} |
151 |
- |
152 |
- case ${locale} in |
153 |
- id:ID) lang="in:ID";; |
154 |
+ local locales=${lingua/l10n_/} |
155 |
+ locales=${locales/-/:} |
156 |
+ |
157 |
+ case ${locales} in |
158 |
+ ar) lang="ar:EG ar:SA" ;; |
159 |
+ es) lang="es es:CO" ;; |
160 |
+ fil) lang="fil:PH" ;; |
161 |
+ gl) lang="gl:ES" ;; |
162 |
+ hi) lang="hi:IN" ;; |
163 |
+ id) lang="in:ID" ;; |
164 |
+ nl) lang="nl:BE nl:NL" ;; |
165 |
+ ta) lang="ta:IN" ;; |
166 |
esac |
167 |
|
168 |
- make_desktop_entry "netbeans-${SLOT} --locale ${locale}" "Netbeans ${PV} ${locale}" netbeans-${SLOT} Development |
169 |
+ for locale in ${locales}; do |
170 |
+ make_desktop_entry "netbeans-${SLOT} --locale ${locale}" "Netbeans ${PV} ${locale}" netbeans-${SLOT} Development |
171 |
+ done |
172 |
fi |
173 |
done |
174 |
fi |
175 |
} |
176 |
- |
177 |
-pkg_postinst() { |
178 |
- if [ -n "${NBLOCALES}" ] ; then |
179 |
- einfo "Netbeans automatically starts with the locale you have set in your user profile, if" |
180 |
- einfo "the locale is built for Netbeans." |
181 |
- einfo "If you want to force specific locale, use --locale argument, for example:" |
182 |
- einfo "${PN}-${SLOT} --locale de" |
183 |
- einfo "${PN}-${SLOT} --locale pt:BR" |
184 |
- fi |
185 |
- |
186 |
- if use l10n_id_ID ; then |
187 |
- einfo |
188 |
- einfo "You selected Indonesian locale which has locale code in:ID in Netbeans." |
189 |
- fi |
190 |
-} |