Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/libiconv/, dev-libs/libiconv/files/
Date: Fri, 13 Oct 2017 09:11:44
Message-Id: 1507885888.7c7f78d2c2e5be8fc88822c91be7be5403d26eac.grobian@gentoo
1 commit: 7c7f78d2c2e5be8fc88822c91be7be5403d26eac
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 13 09:11:28 2017 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 13 09:11:28 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7c7f78d2
7
8 dev-libs/libiconv: migrated to gx86
9
10 dev-libs/libiconv/Manifest | 2 -
11 dev-libs/libiconv/files/libiconv-1.10-link.patch | 13 ----
12 dev-libs/libiconv/files/libiconv-1.12-winnt.patch | 38 -----------
13 .../libiconv/files/libiconv-1.13-state-mint.patch | 16 -----
14 dev-libs/libiconv/files/libiconv-1.13-winnt.patch | 38 -----------
15 dev-libs/libiconv/files/libiconv-1.13.1-mint.patch | 16 -----
16 .../libiconv/files/libiconv-1.13.1-winnt.patch | 43 -------------
17 .../libiconv/files/libiconv-1.14-no-gets.patch | 22 -------
18 dev-libs/libiconv/files/libiconv-1.14-winnt.patch | 31 ---------
19 dev-libs/libiconv/libiconv-1.13.1.ebuild | 74 ----------------------
20 dev-libs/libiconv/libiconv-1.14-r1.ebuild | 59 -----------------
21 dev-libs/libiconv/libiconv-1.14.ebuild | 49 --------------
22 dev-libs/libiconv/metadata.xml | 13 ----
23 13 files changed, 414 deletions(-)
24
25 diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
26 deleted file mode 100644
27 index f6974165fa..0000000000
28 --- a/dev-libs/libiconv/Manifest
29 +++ /dev/null
30 @@ -1,2 +0,0 @@
31 -DIST libiconv-1.13.1.tar.gz 4716070 SHA256 55a36168306089009d054ccdd9d013041bfc3ab26be7033d107821f1c4949a49 SHA512 8475b020769e66f56e476143b81da032e10b02b76b8b49468ce0d8c5658dca1a36940da5cde2fc7e82add2679fc9efe5cd2ea10ccd349682ff85a64d10101662 WHIRLPOOL 5f8b8f72176a3e80e416e3d0535e9ec77322f9a268567c7175f521d1cd3b15818779f28a0e50bac29048c26c14bb149450b81cc5af2d824ff4fc3c2559e0a97c
32 -DIST libiconv-1.14.tar.gz 4984397 SHA256 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613 SHA512 b96774fefc4fa1d07948fcc667027701373c34ebf9c4101000428e048addd85a5bb5e05e59f80eb783a3054a3a8a3c0da909450053275bbbf3ffde511eb3f387 WHIRLPOOL e96337209a4f86eccb112e94c3cd6b668b2a8fc4b05ed7becaa2f6fbc9279f7b32ec1fa4b086e61520bfffea5d4f7a1cad58bdb266b5f0aa7d02b89aeed9759a
33
34 diff --git a/dev-libs/libiconv/files/libiconv-1.10-link.patch b/dev-libs/libiconv/files/libiconv-1.10-link.patch
35 deleted file mode 100644
36 index c17019c933..0000000000
37 --- a/dev-libs/libiconv/files/libiconv-1.10-link.patch
38 +++ /dev/null
39 @@ -1,13 +0,0 @@
40 -Index: libiconv-1.10/src/Makefile.in
41 -===================================================================
42 ---- libiconv-1.10.orig/src/Makefile.in
43 -+++ libiconv-1.10/src/Makefile.in
44 -@@ -92,7 +92,7 @@ install : all force
45 - if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
46 - case "@host_os@" in \
47 - hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
48 -- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
49 -+ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ -o iconv;; \
50 - esac
51 - $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
52 -
53
54 diff --git a/dev-libs/libiconv/files/libiconv-1.12-winnt.patch b/dev-libs/libiconv/files/libiconv-1.12-winnt.patch
55 deleted file mode 100644
56 index 083fced1dc..0000000000
57 --- a/dev-libs/libiconv/files/libiconv-1.12-winnt.patch
58 +++ /dev/null
59 @@ -1,38 +0,0 @@
60 -diff -ru -x '*.Po' -x '*.Plo' libiconv-1.12.orig/include/iconv.h.build.in libiconv-1.12/include/iconv.h.build.in
61 ---- libiconv-1.12.orig/include/iconv.h.build.in 2008-11-19 14:56:04 +0100
62 -+++ libiconv-1.12/include/iconv.h.build.in 2008-11-19 14:58:46 +0100
63 -@@ -25,6 +25,8 @@
64 -
65 - #if 0 && BUILDING_LIBICONV
66 - #define LIBICONV_DLL_EXPORTED __attribute__((__visibility__("default")))
67 -+#elif !defined(BUILDING_LIBICONV) && defined(_WIN32)
68 -+#define LIBICONV_DLL_EXPORTED __declspec(dllimport)
69 - #else
70 - #define LIBICONV_DLL_EXPORTED
71 - #endif
72 -diff -ru -x '*.Po' -x '*.Plo' libiconv-1.12.orig/srclib/Makefile.in libiconv-1.12/srclib/Makefile.in
73 ---- libiconv-1.12.orig/srclib/Makefile.in 2008-11-19 14:56:09 +0100
74 -+++ libiconv-1.12/srclib/Makefile.in 2008-11-19 14:47:25 +0100
75 -@@ -79,7 +79,7 @@
76 - $(top_srcdir)/srcm4/visibility.m4 $(top_srcdir)/srcm4/wchar.m4 \
77 - $(top_srcdir)/srcm4/wchar_t.m4 $(top_srcdir)/m4/cp.m4 \
78 - $(top_srcdir)/m4/eilseq.m4 $(top_srcdir)/m4/endian.m4 \
79 -- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ln.m4 \
80 -+ $(top_srcdir)/m4/ln.m4 \
81 - $(top_srcdir)/configure.ac
82 - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
83 - $(ACLOCAL_M4)
84 -diff -ru -x '*.Po' -x '*.Plo' libiconv-1.12.orig/srcm4/include_next.m4 libiconv-1.12/srcm4/include_next.m4
85 ---- libiconv-1.12.orig/srcm4/include_next.m4 2008-11-19 14:56:09 +0100
86 -+++ libiconv-1.12/srcm4/include_next.m4 2008-11-19 14:47:25 +0100
87 -@@ -89,8 +89,8 @@
88 - dnl so use subshell.
89 - AS_VAR_SET([gl_next_header],
90 - ['"'`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
91 -- sed -n '\#/]m4_quote(m4_defn([gl_HEADER_NAME]))[#{
92 -- s#.*"\(.*/]m4_quote(m4_defn([gl_HEADER_NAME]))[\)".*#\1#
93 -+ sed -n '\#[/\\]]m4_quote(m4_defn([gl_HEADER_NAME]))[#{
94 -+ s#.*"\(.*[/\\]]m4_quote(m4_defn([gl_HEADER_NAME]))[\)".*#\1#
95 - s#^/[^/]#//&#
96 - p
97 - q
98
99 diff --git a/dev-libs/libiconv/files/libiconv-1.13-state-mint.patch b/dev-libs/libiconv/files/libiconv-1.13-state-mint.patch
100 deleted file mode 100644
101 index 7a61ed2fa2..0000000000
102 --- a/dev-libs/libiconv/files/libiconv-1.13-state-mint.patch
103 +++ /dev/null
104 @@ -1,16 +0,0 @@
105 -http://bugs.gentoo.org/show_bug.cgi?id=277916
106 -
107 ---- lib/iconv_open2.h
108 -+++ lib/iconv_open2.h
109 -@@ -79,9 +79,11 @@
110 - cd->hooks.wc_hook = NULL;
111 - cd->hooks.data = NULL;
112 - #endif
113 -+ #if HAVE_WCRTOMB || HAVE_MBRTOWC
114 - /* Initialize additional fields. */
115 - if (from_wchar != to_wchar) {
116 - struct wchar_conv_struct * wcd = (struct wchar_conv_struct *) cd;
117 - memset(&wcd->state,'\0',sizeof(mbstate_t));
118 - }
119 -+ #endif
120 - /* Done. */
121
122 diff --git a/dev-libs/libiconv/files/libiconv-1.13-winnt.patch b/dev-libs/libiconv/files/libiconv-1.13-winnt.patch
123 deleted file mode 100644
124 index 8c7dcba86e..0000000000
125 --- a/dev-libs/libiconv/files/libiconv-1.13-winnt.patch
126 +++ /dev/null
127 @@ -1,38 +0,0 @@
128 -diff -ru libiconv-1.13.orig/include/iconv.h.build.in libiconv-1.13/include/iconv.h.build.in
129 ---- libiconv-1.13.orig/include/iconv.h.build.in 2009-06-17 13:47:52 +0200
130 -+++ libiconv-1.13/include/iconv.h.build.in 2009-06-17 13:53:00 +0200
131 -@@ -25,6 +25,8 @@
132 -
133 - #if @HAVE_VISIBILITY@ && BUILDING_LIBICONV
134 - #define LIBICONV_DLL_EXPORTED __attribute__((__visibility__("default")))
135 -+#elif !defined(BUILDING_LIBICONV) && defined(_WIN32)
136 -+#define LIBICONV_DLL_EXPORTED __declspec(dllimport)
137 - #else
138 - #define LIBICONV_DLL_EXPORTED
139 - #endif
140 -diff -ru libiconv-1.13.orig/srclib/Makefile.in libiconv-1.13/srclib/Makefile.in
141 ---- libiconv-1.13.orig/srclib/Makefile.in 2009-06-17 13:47:57 +0200
142 -+++ libiconv-1.13/srclib/Makefile.in 2009-06-17 13:49:50 +0200
143 -@@ -83,7 +83,7 @@
144 - $(top_srcdir)/srcm4/visibility.m4 $(top_srcdir)/srcm4/wchar.m4 \
145 - $(top_srcdir)/srcm4/wchar_t.m4 $(top_srcdir)/srcm4/wint_t.m4 \
146 - $(top_srcdir)/m4/cp.m4 $(top_srcdir)/m4/eilseq.m4 \
147 -- $(top_srcdir)/m4/endian.m4 $(top_srcdir)/m4/libtool.m4 \
148 -+ $(top_srcdir)/m4/endian.m4 \
149 - $(top_srcdir)/m4/ln.m4 $(top_srcdir)/m4/ltoptions.m4 \
150 - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
151 - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
152 -diff -ru libiconv-1.13.orig/srcm4/include_next.m4 libiconv-1.13/srcm4/include_next.m4
153 ---- libiconv-1.13.orig/srcm4/include_next.m4 2009-06-17 13:47:58 +0200
154 -+++ libiconv-1.13/srcm4/include_next.m4 2009-06-17 13:52:02 +0200
155 -@@ -153,8 +153,8 @@
156 - dnl so use subshell.
157 - AS_VAR_SET([gl_next_header],
158 - ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
159 -- sed -n '\#/]m4_quote(m4_defn([gl_HEADER_NAME]))[#{
160 -- s#.*"\(.*/]m4_quote(m4_defn([gl_HEADER_NAME]))[\)".*#\1#
161 -+ sed -n '\#[/\\]]m4_quote(m4_defn([gl_HEADER_NAME]))[#{
162 -+ s#.*"\(.*[/\\]]m4_quote(m4_defn([gl_HEADER_NAME]))[\)".*#\1#
163 - s#^/[^/]#//&#
164 - p
165 - q
166
167 diff --git a/dev-libs/libiconv/files/libiconv-1.13.1-mint.patch b/dev-libs/libiconv/files/libiconv-1.13.1-mint.patch
168 deleted file mode 100644
169 index f34c4127a0..0000000000
170 --- a/dev-libs/libiconv/files/libiconv-1.13.1-mint.patch
171 +++ /dev/null
172 @@ -1,16 +0,0 @@
173 -https://savannah.gnu.org/bugs/index.php?29113
174 -
175 --biconv-1.13.1-mint.patch
176 --- preload/configure.old 2010-03-03 19:41:45.000000000 +0000
177 -+++ preload/configure 2010-03-03 19:42:30.000000000 +0000
178 -@@ -4630,6 +4630,10 @@
179 - lt_cv_sys_max_cmd_len=8192;
180 - ;;
181 -
182 -+ mint*)
183 -+ lt_cv_sys_max_cmd_len=8192;
184 -+ ;;
185 -+
186 - amigaos*)
187 - # On AmigaOS with pdksh, this test takes hours, literally.
188 - # So we just punt and use a minimum line length of 8192.
189
190 diff --git a/dev-libs/libiconv/files/libiconv-1.13.1-winnt.patch b/dev-libs/libiconv/files/libiconv-1.13.1-winnt.patch
191 deleted file mode 100644
192 index ff88bdf4d0..0000000000
193 --- a/dev-libs/libiconv/files/libiconv-1.13.1-winnt.patch
194 +++ /dev/null
195 @@ -1,43 +0,0 @@
196 -diff -ru libiconv-1.13.1.orig/include/iconv.h.build.in libiconv-1.13.1/include/iconv.h.build.in
197 ---- libiconv-1.13.1.orig/include/iconv.h.build.in 2009-09-14 08:41:27 +0200
198 -+++ libiconv-1.13.1/include/iconv.h.build.in 2009-09-14 08:37:00 +0200
199 -@@ -25,6 +25,8 @@
200 -
201 - #if @HAVE_VISIBILITY@ && BUILDING_LIBICONV
202 - #define LIBICONV_DLL_EXPORTED __attribute__((__visibility__("default")))
203 -+#elif !defined(BUILDING_LIBICONV) && defined(_WIN32)
204 -+#define LIBICONV_DLL_EXPORTED __declspec(dllimport)
205 - #else
206 - #define LIBICONV_DLL_EXPORTED
207 - #endif
208 -diff -ru libiconv-1.13.1.orig/srclib/Makefile.in libiconv-1.13.1/srclib/Makefile.in
209 ---- libiconv-1.13.1.orig/srclib/Makefile.in 2009-09-14 08:41:27 +0200
210 -+++ libiconv-1.13.1/srclib/Makefile.in 2009-09-14 08:37:00 +0200
211 -@@ -85,7 +85,7 @@
212 - $(top_srcdir)/srcm4/visibility.m4 $(top_srcdir)/srcm4/wchar.m4 \
213 - $(top_srcdir)/srcm4/wchar_t.m4 $(top_srcdir)/srcm4/wint_t.m4 \
214 - $(top_srcdir)/m4/cp.m4 $(top_srcdir)/m4/eilseq.m4 \
215 -- $(top_srcdir)/m4/endian.m4 $(top_srcdir)/m4/libtool.m4 \
216 -+ $(top_srcdir)/m4/endian.m4 \
217 - $(top_srcdir)/m4/ln.m4 $(top_srcdir)/m4/ltoptions.m4 \
218 - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
219 - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
220 -diff -ru libiconv-1.13.1.orig/srcm4/include_next.m4 libiconv-1.13.1/srcm4/include_next.m4
221 ---- libiconv-1.13.1.orig/srcm4/include_next.m4 2009-09-14 08:41:27 +0200
222 -+++ libiconv-1.13.1/srcm4/include_next.m4 2009-09-14 10:04:22 +0200
223 -@@ -159,12 +159,12 @@
224 - dnl so use subshell.
225 - AS_VAR_SET([gl_next_header],
226 - ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
227 -- sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{
228 -- s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1#
229 -+ ( sed -n '\#[/\\]]m4_defn([gl_HEADER_NAME])[#{
230 -+ s#.*"\(.*[/\\]]m4_defn([gl_HEADER_NAME])[\)".*#\1#
231 - s#^/[^/]#//&#
232 - p
233 - q
234 -- }'`'"'])
235 -+ }'; cat > /dev/null);`'"'])
236 - else
237 - AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
238 - fi
239
240 diff --git a/dev-libs/libiconv/files/libiconv-1.14-no-gets.patch b/dev-libs/libiconv/files/libiconv-1.14-no-gets.patch
241 deleted file mode 100644
242 index db767ac1dd..0000000000
243 --- a/dev-libs/libiconv/files/libiconv-1.14-no-gets.patch
244 +++ /dev/null
245 @@ -1,22 +0,0 @@
246 -hack until gzip pulls a newer gnulib version
247 -
248 -From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
249 -From: Eric Blake <eblake@××××××.com>
250 -Date: Thu, 29 Mar 2012 13:30:41 -0600
251 -Subject: [PATCH] stdio: don't assume gets any more
252 -
253 -Gnulib intentionally does not have a gets module, and now that C11
254 -and glibc have dropped it, we should be more proactive about warning
255 -any user on a platform that still has a declaration of this dangerous
256 -interface.
257 -
258 ---- a/srclib/stdio.in.h
259 -+++ b/srclib/stdio.in.h
260 -@@ -695,7 +695,6 @@ _GL_CXXALIASWARN (gets);
261 - /* It is very rare that the developer ever has full control of stdin,
262 - so any use of gets warrants an unconditional warning. Assume it is
263 - always declared, since it is required by C89. */
264 --_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
265 - #endif
266 -
267 -
268
269 diff --git a/dev-libs/libiconv/files/libiconv-1.14-winnt.patch b/dev-libs/libiconv/files/libiconv-1.14-winnt.patch
270 deleted file mode 100644
271 index e49d1ce755..0000000000
272 --- a/dev-libs/libiconv/files/libiconv-1.14-winnt.patch
273 +++ /dev/null
274 @@ -1,31 +0,0 @@
275 ---- libiconv-1.14/configure.orig 2017-09-21 10:12:09.263109700 +0200
276 -+++ libiconv-1.14/configure 2017-09-21 10:12:26.809908100 +0200
277 -@@ -13478,7 +13478,7 @@
278 -
279 -
280 - case "$host_os" in
281 -- mingw* | cygwin*) is_woe32=yes ;;
282 -+ mingw* | cygwin* | winnt*) is_woe32=yes ;;
283 - *) is_woe32=no ;;
284 - esac
285 - WOE32=$is_woe32
286 -@@ -21687,7 +21687,7 @@
287 -
288 - if test "$enable_shared" = yes; then
289 - case "$host_os" in
290 -- mingw* | cygwin*) is_woe32dll=yes ;;
291 -+ mingw* | cygwin* | winnt*) is_woe32dll=yes ;;
292 - *) is_woe32dll=no ;;
293 - esac
294 - else
295 ---- libiconv-1.14/woe32dll/export.h.orig 2017-09-21 10:02:45.106778900 +0200
296 -+++ libiconv-1.14/woe32dll/export.h 2017-09-21 10:10:06.856742200 +0200
297 -@@ -104,3 +104,8 @@
298 - /* Allocate a pseudo-variable IMP(x). */ \
299 - extern int x; \
300 - void * IMP(x) = &x;
301 -+
302 -+#if defined(_MSC_VER)
303 -+# undef VARIABLE
304 -+# define VARIABLE(x) extern __declspec(dllexport) __declspec(dllimport) int x;
305 -+#endif
306
307 diff --git a/dev-libs/libiconv/libiconv-1.13.1.ebuild b/dev-libs/libiconv/libiconv-1.13.1.ebuild
308 deleted file mode 100644
309 index cb36b1fcea..0000000000
310 --- a/dev-libs/libiconv/libiconv-1.13.1.ebuild
311 +++ /dev/null
312 @@ -1,74 +0,0 @@
313 -# Copyright 1999-2017 Gentoo Foundation
314 -# Distributed under the terms of the GNU General Public License v2
315 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.13.1.ebuild,v 1.1 2009/08/10 10:37:21 aballier Exp $
316 -
317 -inherit eutils multilib flag-o-matic toolchain-funcs autotools
318 -
319 -DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
320 -HOMEPAGE="http://www.gnu.org/software/libiconv/"
321 -SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
322 -
323 -LICENSE="GPL-3"
324 -SLOT="0"
325 -KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
326 -IUSE=""
327 -
328 -DEPEND="!sys-libs/glibc
329 - !sys-apps/man-pages"
330 -RDEPEND="${DEPEND}"
331 -
332 -src_unpack() {
333 - unpack ${A}
334 - cd "${S}"
335 -
336 - # This patch is needed as libiconv 1.10 provides (and uses) new functions
337 - # and they are not present in the old libiconv.so, and this breaks the
338 - # ${DESTDIR} != ${prefix} that we use. It's a problem for Solaris, but we
339 - # don't have to deal with it for now.
340 - #epatch "${FILESDIR}"/${PN}-1.10-link.patch
341 -
342 - epatch "${FILESDIR}"/${P}-mint.patch
343 -
344 - if [[ ${CHOST} == *-winnt* ]]; then
345 - epatch "${FILESDIR}"/${P}-winnt.patch
346 -
347 - find "${S}" -name 'libtool.m4' | xargs rm
348 -
349 - AT_M4DIR="${S}/srcm4 ${S}/m4" eautoreconf # required for winnt support
350 - cd "${S}"/libcharset
351 - AT_M4DIR="${S}/srcm4 ${S}/m4" eautoreconf # required for winnt support
352 - cd "${S}"/preload
353 - AT_M4DIR="${S}/srcm4 ${S}/m4" eautoreconf # required for winnt support
354 - else
355 - # Make sure that libtool support is updated to link "the linux way" on
356 - # FreeBSD.
357 - elibtoolize
358 - fi
359 -}
360 -
361 -src_compile() {
362 - # In Prefix we want to have the same header declaration on every
363 - # platform, so make configure find that it should do
364 - # "const char * *inbuf"
365 - export am_cv_func_iconv=no
366 -
367 - # Install in /lib as utils installed in /lib like gnutar
368 - # can depend on this
369 -
370 - # Disable NLS support because that creates a circular dependency
371 - # between libiconv and gettext
372 -
373 - econf \
374 - --disable-nls \
375 - --enable-shared \
376 - --enable-static \
377 - || die "econf failed"
378 - emake || die "emake failed"
379 -}
380 -
381 -src_install() {
382 - emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install || die "make install failed"
383 -
384 - # Move static libs and creates ldscripts into /usr/lib
385 - gen_usr_ldscript -a iconv charset
386 -}
387
388 diff --git a/dev-libs/libiconv/libiconv-1.14-r1.ebuild b/dev-libs/libiconv/libiconv-1.14-r1.ebuild
389 deleted file mode 100644
390 index 04966b3632..0000000000
391 --- a/dev-libs/libiconv/libiconv-1.14-r1.ebuild
392 +++ /dev/null
393 @@ -1,59 +0,0 @@
394 -# Copyright 1999-2017 Gentoo Foundation
395 -# Distributed under the terms of the GNU General Public License v2
396 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.14-r1.ebuild,v 1.7 2014/05/24 09:47:39 hwoarang Exp $
397 -
398 -EAPI="4"
399 -
400 -inherit libtool toolchain-funcs multilib-minimal
401 -
402 -DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
403 -HOMEPAGE="http://www.gnu.org/software/libiconv/"
404 -SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
405 -
406 -LICENSE="GPL-3"
407 -SLOT="0"
408 -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
409 -IUSE="+static-libs"
410 -
411 -DEPEND="!sys-libs/glibc
412 - !userland_GNU? ( !sys-apps/man-pages )"
413 -RDEPEND="${DEPEND}"
414 -
415 -src_prepare() {
416 - epatch "${FILESDIR}"/${P}-no-gets.patch
417 - epatch "${FILESDIR}"/${P}-winnt.patch
418 - elibtoolize
419 -}
420 -
421 -multilib_src_configure() {
422 - # In Prefix we want to have the same header declaration on every
423 - # platform, so make configure find that it should do
424 - # "const char * *inbuf"
425 - export am_cv_func_iconv=no
426 -
427 - # Disable NLS support because that creates a circular dependency
428 - # between libiconv and gettext
429 - ECONF_SOURCE="${S}" \
430 - econf \
431 - --docdir="\$(datarootdir)/doc/${PF}/html" \
432 - --disable-nls \
433 - --enable-shared \
434 - $(use_enable static-libs static)
435 -}
436 -
437 -multilib_src_install_all() {
438 - # Install in /lib as utils installed in /lib like gnutar
439 - # can depend on this
440 - gen_usr_ldscript -a iconv charset
441 -
442 - # If we have a GNU userland, we probably have sys-apps/man-pages
443 - # installed, which means we want to rename our copies #503162.
444 - # The use of USELAND=GNU is kind of a hack though ...
445 - if use userland_GNU ; then
446 - cd "${ED}"/usr/share/man || die
447 - local f
448 - for f in man*/*.[0-9] ; do
449 - mv "${f}" "${f%/*}/${PN}-${f#*/}" || die
450 - done
451 - fi
452 -}
453
454 diff --git a/dev-libs/libiconv/libiconv-1.14.ebuild b/dev-libs/libiconv/libiconv-1.14.ebuild
455 deleted file mode 100644
456 index a4cf760685..0000000000
457 --- a/dev-libs/libiconv/libiconv-1.14.ebuild
458 +++ /dev/null
459 @@ -1,49 +0,0 @@
460 -# Copyright 1999-2017 Gentoo Foundation
461 -# Distributed under the terms of the GNU General Public License v2
462 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.14.ebuild,v 1.6 2012/09/16 16:18:25 blueness Exp $
463 -
464 -EAPI="4"
465 -
466 -inherit libtool toolchain-funcs
467 -
468 -DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
469 -HOMEPAGE="http://www.gnu.org/software/libiconv/"
470 -SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
471 -
472 -LICENSE="GPL-3"
473 -SLOT="0"
474 -KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
475 -IUSE=""
476 -
477 -DEPEND="!sys-libs/glibc
478 - !sys-apps/man-pages"
479 -RDEPEND="${DEPEND}"
480 -
481 -src_prepare() {
482 - # Make sure that libtool support is updated to link "the linux way" on
483 - # FreeBSD.
484 - elibtoolize
485 -}
486 -
487 -src_configure() {
488 - # In Prefix we want to have the same header declaration on every
489 - # platform, so make configure find that it should do
490 - # "const char * *inbuf"
491 - export am_cv_func_iconv=no
492 -
493 - # Disable NLS support because that creates a circular dependency
494 - # between libiconv and gettext
495 - econf \
496 - --docdir="\$(datarootdir)/doc/${PF}/html" \
497 - --disable-nls \
498 - --enable-shared \
499 - --enable-static
500 -}
501 -
502 -src_install() {
503 - default
504 -
505 - # Install in /lib as utils installed in /lib like gnutar
506 - # can depend on this
507 - gen_usr_ldscript -a iconv charset
508 -}
509
510 diff --git a/dev-libs/libiconv/metadata.xml b/dev-libs/libiconv/metadata.xml
511 deleted file mode 100644
512 index 0b46e1d5f0..0000000000
513 --- a/dev-libs/libiconv/metadata.xml
514 +++ /dev/null
515 @@ -1,13 +0,0 @@
516 -<?xml version="1.0" encoding="UTF-8"?>
517 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
518 -<pkgmetadata>
519 -<maintainer type="project">
520 - <email>bsd@g.o</email>
521 - <name>BSD Project</name>
522 -</maintainer>
523 -<longdescription lang="en">
524 -libiconv is a standalone package which implements the iconv() related
525 -functions as glibc already embed. Libraries and applications needs it
526 -when built in a non-glibc system.
527 -</longdescription>
528 -</pkgmetadata>