Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/files/, sys-devel/gettext/
Date: Thu, 29 Oct 2020 14:03:11
Message-Id: 1603980181.2820aee152f31d8627ab8c1dc42d38240ad108b5.polynomial-c@gentoo
1 commit: 2820aee152f31d8627ab8c1dc42d38240ad108b5
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 29 14:02:53 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 29 14:03:01 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2820aee1
7
8 sys-devel/gettext: Removed old
9
10 Closes: https://bugs.gentoo.org/751631
11 Package-Manager: Portage-3.0.8, Repoman-3.0.2
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 sys-devel/gettext/Manifest | 2 -
15 .../files/gettext-0.20-avoid_eautomake.patch | 22 ---
16 sys-devel/gettext/gettext-0.20.1.ebuild | 152 ---------------------
17 sys-devel/gettext/gettext-0.20.2.ebuild | 152 ---------------------
18 4 files changed, 328 deletions(-)
19
20 diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
21 index aa086cfc85b..61bb66f324f 100644
22 --- a/sys-devel/gettext/Manifest
23 +++ b/sys-devel/gettext/Manifest
24 @@ -1,3 +1 @@
25 -DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
26 -DIST gettext-0.20.2.tar.gz 23717789 BLAKE2B f0db5eacc93501020f31d80e4b11df708d5ce1ae76f9c35587c830c064a4b712284df4645cedf054a41e66ab08d14d080c4fe1d316a108b997207b78148ed579 SHA512 50b0520230dba5da6e04e51b2317e073cacf1536d73ea88e4b5dc6cc5bd97cf2c9a279c3c3ada1067f39c8b3bb0b1ce8e0823cc1dd4c33f4f10860bdf787009d
27 DIST gettext-0.21.tar.gz 24181849 BLAKE2B 2eae99d0916b00b2af6fbc6bf7e309076519a10fea16cd49e7aa29fe8aec1ee7c784c6277281b764dc4abacf400cd3fe461129586303c8cd337db15c76cb4b87 SHA512 bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1
28
29 diff --git a/sys-devel/gettext/files/gettext-0.20-avoid_eautomake.patch b/sys-devel/gettext/files/gettext-0.20-avoid_eautomake.patch
30 deleted file mode 100644
31 index 16592c8018e..00000000000
32 --- a/sys-devel/gettext/files/gettext-0.20-avoid_eautomake.patch
33 +++ /dev/null
34 @@ -1,22 +0,0 @@
35 ---- gettext-0.20/gettext-tools/src/Makefile.in
36 -+++ gettext-0.20/gettext-tools/src/Makefile.in
37 -@@ -3952,9 +3952,16 @@
38 -
39 - # How to get the include files of libtextstyle.
40 - textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
41 -- here=`pwd`; \
42 -- cd ../../libtextstyle/lib && \
43 -- $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
44 -+ cd "$(abs_top_builddir)/../libtextstyle/lib" && $(MAKE) $@
45 -+ if test -f "$(abs_top_builddir)/../libtextstyle/lib/$@"; then \
46 -+ file="$(abs_top_builddir)/../libtextstyle/lib/$@"; \
47 -+ else \
48 -+ file="$(abs_top_srcdir)/../libtextstyle/lib/$@"; \
49 -+ fi; \
50 -+ target_dir="$(abs_builddir)/$@"; \
51 -+ target_dir="$${target_dir%/*}"; \
52 -+ $(MKDIR_P) "$${target_dir}"; \
53 -+ $(INSTALL_HEADER) "$$file" $@
54 -
55 - # No need to install libgettextsrc.a, except on AIX.
56 - install-exec-hook: install-exec-clean
57
58 diff --git a/sys-devel/gettext/gettext-0.20.1.ebuild b/sys-devel/gettext/gettext-0.20.1.ebuild
59 deleted file mode 100644
60 index a36da278b93..00000000000
61 --- a/sys-devel/gettext/gettext-0.20.1.ebuild
62 +++ /dev/null
63 @@ -1,152 +0,0 @@
64 -# Copyright 1999-2020 Gentoo Authors
65 -# Distributed under the terms of the GNU General Public License v2
66 -
67 -# Note: Keep version bumps in sync with dev-libs/libintl.
68 -
69 -EAPI=7
70 -
71 -inherit mono-env libtool java-pkg-opt-2 multilib-minimal
72 -
73 -DESCRIPTION="GNU locale utilities"
74 -HOMEPAGE="https://www.gnu.org/software/gettext/"
75 -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
76 -
77 -# Only libasprintf is under the LGPL (and libintl is in a sep package),
78 -# so put that license behind USE=cxx.
79 -LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
80 -SLOT="0"
81 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
82 -IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
83 -
84 -# only runtime goes multilib
85 -# Note: The version of libxml2 corresponds to the version bundled via gnulib.
86 -# If the build detects too old of a system version, it will end up falling back
87 -# to the bundled copy. #596918
88 -# Note: expat lacks a subslot because it is dynamically loaded at runtime. We
89 -# would depend on older subslots if they were available (based on the ABIs that
90 -# are explicitly handled), but expat doesn't currently use subslots.
91 -DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
92 - >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
93 - >=dev-libs/libxml2-2.9.3:=
94 - dev-libs/expat
95 - acl? ( virtual/acl )
96 - ncurses? ( sys-libs/ncurses:0= )
97 - java? ( >=virtual/jdk-1.4:= )"
98 -RDEPEND="${DEPEND}
99 - !git? ( cvs? ( dev-vcs/cvs ) )
100 - git? ( dev-vcs/git )
101 - java? ( >=virtual/jre-1.4 )"
102 -BDEPEND="
103 - git? ( dev-vcs/git )
104 -"
105 -PDEPEND="emacs? ( app-emacs/po-mode )"
106 -
107 -MULTILIB_WRAPPED_HEADERS=(
108 - # only installed for native ABI
109 - /usr/include/gettext-po.h
110 -
111 - /usr/include/autosprintf.h
112 - /usr/include/textstyle.h
113 - /usr/include/textstyle/stdbool.h
114 - /usr/include/textstyle/version.h
115 - /usr/include/textstyle/woe32dll.h
116 -)
117 -
118 -PATCHES=(
119 - "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
120 - "${FILESDIR}"/${PN}-0.20-parallel_install.patch #685530
121 - "${FILESDIR}"/${PN}-0.20-avoid_eautomake.patch
122 -)
123 -
124 -QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so"
125 -
126 -pkg_setup() {
127 - mono-env_pkg_setup
128 - java-pkg-opt-2_pkg_setup
129 -}
130 -
131 -src_prepare() {
132 - java-pkg-opt-2_src_prepare
133 -
134 - default
135 -
136 - elibtoolize
137 -}
138 -
139 -multilib_src_configure() {
140 - local myconf=(
141 - # switches common to runtime and top-level
142 - --cache-file="${BUILD_DIR}"/config.cache
143 - #--docdir="\$(datarootdir)/doc/${PF}"
144 -
145 - # Emacs support is now in a separate package
146 - --without-emacs
147 - --without-lispdir
148 - # glib depends on us so avoid circular deps
149 - --with-included-glib
150 - # libcroco depends on glib which ... ^^^
151 - --with-included-libcroco
152 - # this will _disable_ libunistring (since it is not bundled),
153 - # see bug #326477
154 - --with-included-libunistring
155 - # Never build libintl since it's in dev-libs/libintl now.
156 - --without-included-gettext
157 - # Never build bundled copy of libxml2.
158 - --without-included-libxml
159 -
160 - $(use_enable acl)
161 - $(use_enable cxx c++)
162 - $(use_enable cxx libasprintf)
163 - $(use_with git)
164 - $(usex git --without-cvs $(use_with cvs))
165 - $(use_enable java)
166 - $(use_enable ncurses curses)
167 - $(use_enable nls)
168 - $(use_enable openmp)
169 - $(use_enable static-libs static)
170 - )
171 -
172 - local ECONF_SOURCE="${S}"
173 - if ! multilib_is_native_abi ; then
174 - # for non-native ABIs, we build runtime only
175 - ECONF_SOURCE+=/gettext-runtime
176 - fi
177 -
178 - econf "${myconf[@]}"
179 -}
180 -
181 -multilib_src_install() {
182 - emake DESTDIR="${D}" install
183 -
184 - if multilib_is_native_abi ; then
185 - dosym msgfmt /usr/bin/gmsgfmt #43435
186 - dobin gettext-tools/misc/gettextize
187 - fi
188 -}
189 -
190 -multilib_src_install_all() {
191 - find "${ED}" -type f -name "*.la" -delete || die
192 -
193 - if use java ; then
194 - java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar
195 - rm "${ED}"/usr/share/${PN}/*.jar || die
196 - rm "${ED}"/usr/share/${PN}/*.class || die
197 - if use doc ; then
198 - java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2
199 - fi
200 - fi
201 -
202 - dodoc AUTHORS ChangeLog NEWS README THANKS
203 -
204 - if use doc ; then
205 - docinto html
206 - dodoc "${ED}"/usr/share/doc/${PF}/*.html
207 - else
208 - rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
209 - fi
210 - rm "${ED}"/usr/share/doc/${PF}/*.html || die
211 -}
212 -
213 -pkg_preinst() {
214 - java-pkg-opt-2_pkg_preinst
215 -}
216
217 diff --git a/sys-devel/gettext/gettext-0.20.2.ebuild b/sys-devel/gettext/gettext-0.20.2.ebuild
218 deleted file mode 100644
219 index f84993f9796..00000000000
220 --- a/sys-devel/gettext/gettext-0.20.2.ebuild
221 +++ /dev/null
222 @@ -1,152 +0,0 @@
223 -# Copyright 1999-2020 Gentoo Authors
224 -# Distributed under the terms of the GNU General Public License v2
225 -
226 -# Note: Keep version bumps in sync with dev-libs/libintl.
227 -
228 -EAPI=7
229 -
230 -inherit mono-env libtool java-pkg-opt-2 multilib-minimal
231 -
232 -DESCRIPTION="GNU locale utilities"
233 -HOMEPAGE="https://www.gnu.org/software/gettext/"
234 -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
235 -
236 -# Only libasprintf is under the LGPL (and libintl is in a sep package),
237 -# so put that license behind USE=cxx.
238 -LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
239 -SLOT="0"
240 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
241 -IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
242 -
243 -# only runtime goes multilib
244 -# Note: The version of libxml2 corresponds to the version bundled via gnulib.
245 -# If the build detects too old of a system version, it will end up falling back
246 -# to the bundled copy. #596918
247 -# Note: expat lacks a subslot because it is dynamically loaded at runtime. We
248 -# would depend on older subslots if they were available (based on the ABIs that
249 -# are explicitly handled), but expat doesn't currently use subslots.
250 -DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
251 - >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
252 - >=dev-libs/libxml2-2.9.3:=
253 - dev-libs/expat
254 - acl? ( virtual/acl )
255 - ncurses? ( sys-libs/ncurses:0= )
256 - java? ( >=virtual/jdk-1.4:= )"
257 -RDEPEND="${DEPEND}
258 - !git? ( cvs? ( dev-vcs/cvs ) )
259 - git? ( dev-vcs/git )
260 - java? ( >=virtual/jre-1.4 )"
261 -BDEPEND="
262 - git? ( dev-vcs/git )
263 -"
264 -PDEPEND="emacs? ( app-emacs/po-mode )"
265 -
266 -MULTILIB_WRAPPED_HEADERS=(
267 - # only installed for native ABI
268 - /usr/include/gettext-po.h
269 -
270 - /usr/include/autosprintf.h
271 - /usr/include/textstyle.h
272 - /usr/include/textstyle/stdbool.h
273 - /usr/include/textstyle/version.h
274 - /usr/include/textstyle/woe32dll.h
275 -)
276 -
277 -PATCHES=(
278 - "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
279 - "${FILESDIR}"/${PN}-0.20-parallel_install.patch #685530
280 - "${FILESDIR}"/${PN}-0.21_rc1-avoid_eautomake.patch
281 -)
282 -
283 -QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so"
284 -
285 -pkg_setup() {
286 - mono-env_pkg_setup
287 - java-pkg-opt-2_pkg_setup
288 -}
289 -
290 -src_prepare() {
291 - java-pkg-opt-2_src_prepare
292 -
293 - default
294 -
295 - elibtoolize
296 -}
297 -
298 -multilib_src_configure() {
299 - local myconf=(
300 - # switches common to runtime and top-level
301 - --cache-file="${BUILD_DIR}"/config.cache
302 - #--docdir="\$(datarootdir)/doc/${PF}"
303 -
304 - # Emacs support is now in a separate package
305 - --without-emacs
306 - --without-lispdir
307 - # glib depends on us so avoid circular deps
308 - --with-included-glib
309 - # libcroco depends on glib which ... ^^^
310 - --with-included-libcroco
311 - # this will _disable_ libunistring (since it is not bundled),
312 - # see bug #326477
313 - --with-included-libunistring
314 - # Never build libintl since it's in dev-libs/libintl now.
315 - --without-included-gettext
316 - # Never build bundled copy of libxml2.
317 - --without-included-libxml
318 -
319 - $(use_enable acl)
320 - $(use_enable cxx c++)
321 - $(use_enable cxx libasprintf)
322 - $(use_with git)
323 - $(usex git --without-cvs $(use_with cvs))
324 - $(use_enable java)
325 - $(use_enable ncurses curses)
326 - $(use_enable nls)
327 - $(use_enable openmp)
328 - $(use_enable static-libs static)
329 - )
330 -
331 - local ECONF_SOURCE="${S}"
332 - if ! multilib_is_native_abi ; then
333 - # for non-native ABIs, we build runtime only
334 - ECONF_SOURCE+=/gettext-runtime
335 - fi
336 -
337 - econf "${myconf[@]}"
338 -}
339 -
340 -multilib_src_install() {
341 - emake DESTDIR="${D}" install
342 -
343 - if multilib_is_native_abi ; then
344 - dosym msgfmt /usr/bin/gmsgfmt #43435
345 - dobin gettext-tools/misc/gettextize
346 - fi
347 -}
348 -
349 -multilib_src_install_all() {
350 - find "${ED}" -type f -name "*.la" -delete || die
351 -
352 - if use java ; then
353 - java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar
354 - rm "${ED}"/usr/share/${PN}/*.jar || die
355 - rm "${ED}"/usr/share/${PN}/*.class || die
356 - if use doc ; then
357 - java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2
358 - fi
359 - fi
360 -
361 - dodoc AUTHORS ChangeLog NEWS README THANKS
362 -
363 - if use doc ; then
364 - docinto html
365 - dodoc "${ED}"/usr/share/doc/${PF}/*.html
366 - else
367 - rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
368 - fi
369 - rm "${ED}"/usr/share/doc/${PF}/*.html || die
370 -}
371 -
372 -pkg_preinst() {
373 - java-pkg-opt-2_pkg_preinst
374 -}