Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libiconv/, dev-libs/libiconv/files/
Date: Tue, 25 Feb 2020 12:51:54
Message-Id: 1582635095.9583f47337406d3b0d595847afe5662fdbaa6389.zlogene@gentoo
1 commit: 9583f47337406d3b0d595847afe5662fdbaa6389
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 25 12:51:35 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 25 12:51:35 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9583f473
7
8 dev-libs/libiconv: Drop old
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 dev-libs/libiconv/Manifest | 1 -
14 .../libiconv/files/libiconv-1.14-no-gets.patch | 22 ---------
15 dev-libs/libiconv/libiconv-1.14-r1.ebuild | 52 ----------------------
16 3 files changed, 75 deletions(-)
17
18 diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
19 index d44e54b3cb7..a13b5faafe1 100644
20 --- a/dev-libs/libiconv/Manifest
21 +++ b/dev-libs/libiconv/Manifest
22 @@ -1,2 +1 @@
23 -DIST libiconv-1.14.tar.gz 4984397 BLAKE2B 8697bbff9b929e8a30157f271ba3216aef7b2f0020f5edd273f3cec249069fb23f58ae13cbe3d3bb502c27e97e7cccae66aba23017ab4f6bce11b2ec133ef684 SHA512 b96774fefc4fa1d07948fcc667027701373c34ebf9c4101000428e048addd85a5bb5e05e59f80eb783a3054a3a8a3c0da909450053275bbbf3ffde511eb3f387
24 DIST libiconv-1.15.tar.gz 5264188 BLAKE2B 2384dbf8549fa56e841b15b7e2698b83c0ee171cdff13aef48c60eae0bc4f5e7b2e937bc8d5eddf89fba11412d17bebd77bdda7060c177ce9dc9be00172c0c12 SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a
25
26 diff --git a/dev-libs/libiconv/files/libiconv-1.14-no-gets.patch b/dev-libs/libiconv/files/libiconv-1.14-no-gets.patch
27 deleted file mode 100644
28 index db767ac1dd8..00000000000
29 --- a/dev-libs/libiconv/files/libiconv-1.14-no-gets.patch
30 +++ /dev/null
31 @@ -1,22 +0,0 @@
32 -hack until gzip pulls a newer gnulib version
33 -
34 -From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
35 -From: Eric Blake <eblake@××××××.com>
36 -Date: Thu, 29 Mar 2012 13:30:41 -0600
37 -Subject: [PATCH] stdio: don't assume gets any more
38 -
39 -Gnulib intentionally does not have a gets module, and now that C11
40 -and glibc have dropped it, we should be more proactive about warning
41 -any user on a platform that still has a declaration of this dangerous
42 -interface.
43 -
44 ---- a/srclib/stdio.in.h
45 -+++ b/srclib/stdio.in.h
46 -@@ -695,7 +695,6 @@ _GL_CXXALIASWARN (gets);
47 - /* It is very rare that the developer ever has full control of stdin,
48 - so any use of gets warrants an unconditional warning. Assume it is
49 - always declared, since it is required by C89. */
50 --_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
51 - #endif
52 -
53 -
54
55 diff --git a/dev-libs/libiconv/libiconv-1.14-r1.ebuild b/dev-libs/libiconv/libiconv-1.14-r1.ebuild
56 deleted file mode 100644
57 index c3ba6d18d4b..00000000000
58 --- a/dev-libs/libiconv/libiconv-1.14-r1.ebuild
59 +++ /dev/null
60 @@ -1,52 +0,0 @@
61 -# Copyright 1999-2018 Gentoo Foundation
62 -# Distributed under the terms of the GNU General Public License v2
63 -
64 -EAPI="4"
65 -
66 -inherit libtool toolchain-funcs multilib-minimal usr-ldscript
67 -
68 -DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
69 -HOMEPAGE="https://www.gnu.org/software/libiconv/"
70 -SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
71 -
72 -LICENSE="LGPL-2+ GPL-3+"
73 -SLOT="0"
74 -KEYWORDS="amd64 arm ~mips ppc x86"
75 -IUSE="+static-libs"
76 -
77 -DEPEND="!sys-libs/glibc
78 - !userland_GNU? ( !sys-apps/man-pages )"
79 -RDEPEND="${DEPEND}"
80 -
81 -src_prepare() {
82 - epatch "${FILESDIR}"/${P}-no-gets.patch
83 - elibtoolize
84 -}
85 -
86 -multilib_src_configure() {
87 - # Disable NLS support because that creates a circular dependency
88 - # between libiconv and gettext
89 - ECONF_SOURCE="${S}" \
90 - econf \
91 - --docdir="\$(datarootdir)/doc/${PF}/html" \
92 - --disable-nls \
93 - --enable-shared \
94 - $(use_enable static-libs static)
95 -}
96 -
97 -multilib_src_install_all() {
98 - # Install in /lib as utils installed in /lib like gnutar
99 - # can depend on this
100 - gen_usr_ldscript -a iconv charset
101 -
102 - # If we have a GNU userland, we probably have sys-apps/man-pages
103 - # installed, which means we want to rename our copies #503162.
104 - # The use of USELAND=GNU is kind of a hack though ...
105 - if use userland_GNU ; then
106 - cd "${ED}"/usr/share/man || die
107 - local f
108 - for f in man*/*.[0-9] ; do
109 - mv "${f}" "${f%/*}/${PN}-${f#*/}" || die
110 - done
111 - fi
112 -}