gentoo resync : 13.10.2017

3 files changed, 89 insertions, 0 deletions

diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index 885dfc3dfa0b..ad077c9bd786 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -1,9 +1,12 @@
 AUX libiconv-1.10-link.patch 910 SHA256 99618454073097c4946acd4df69f2af961f7bfd3b52d0e385722a6cc4b81d8d8 SHA512 348700cbc210aad66ea5ff9099b9a871210f211ca2f241be5332b90810b886965b2d5c4a462979f164bd51be033be1ad2f6e92c6efe4171afa0a12db8153bb5d WHIRLPOOL f31c3e61cf49ab99320406a8842be743f61b76be4291fb1b02839b6b0a0950f4d310fc5cc067dfb348eb30550e3634c01f08bcde94af925ef2deb0b0abd4fdee
 AUX libiconv-1.14-no-gets.patch 836 SHA256 36742e571eaf7ec63856ec5dbcf8780fa724a72be4287596d32d23b5c4532af3 SHA512 3bb04769c46964d4357aba57b16a2cbdb5c666d839d46fcc0a11be945da9e855f5e0682c2dccd2fd66baab74e3429040849c503e9bcd05e53962f7680b2c0713 WHIRLPOOL 887ffcaaf0ac7634e238055c13abe14a6d4147d34e420c8c24e7337c4e55cdb82822802693573dc884ce6401a78dbf1fcaa9a92c08757fafae713d31c25aeed7
+AUX libiconv-1.15-no-gets.patch 796 SHA256 2464a9b7cabb80ca3220cfb39ec0eeccab6fc728cd8aacb997e0dbaba923e54c SHA512 39c32470cb802d74ee6f97071e74a4cedc8374cf60b50f470ca318066fe45a71ed89c5c77dc7b3e70f0a3a33ccca7beedf6e96863a431515e957883467325bde WHIRLPOOL 16a3c8c0687d2506b6f0df5688b017e4997a65e4aa2aa9f4f20becb298a1a5403b4240a0fd31360b5a8762f602d0fcb2b80184fba0070185d85f3711a4fc1089
 DIST libiconv-1.14.tar.gz 4984397 SHA256 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613 SHA512 b96774fefc4fa1d07948fcc667027701373c34ebf9c4101000428e048addd85a5bb5e05e59f80eb783a3054a3a8a3c0da909450053275bbbf3ffde511eb3f387 WHIRLPOOL e96337209a4f86eccb112e94c3cd6b668b2a8fc4b05ed7becaa2f6fbc9279f7b32ec1fa4b086e61520bfffea5d4f7a1cad58bdb266b5f0aa7d02b89aeed9759a
+DIST libiconv-1.15.tar.gz 5264188 SHA256 ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178 SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a WHIRLPOOL fabb05b64dc4d51c53b0e82a017c5966de0aba23baa8fd25d09ba14a4327fe8c296365d3f31bedb459bd85cb60c2623ec162b8e0c363f2c56887c4e278323747
 EBUILD libiconv-1.14-r1.ebuild 1385 SHA256 02277445e32d82e69fb04b523a49ffb285eee5a2aafbd9bca4cdb92b9b2c7cfb SHA512 73fe8e4bd0f1bc966d5bf15c0c1409078cf652397c47223cbca210127ed86759337abf7c7bf296268f9f75dda25d41808ca1af3edea50a7029344f0cbc21f744 WHIRLPOOL 9421755b0011fa8d28afb91aa9b22e167112be89104c81b1905fe481c4c66974a8792b304fae511a382468bc1d78e2a29de583d203c95aca54fb7bf28cc947a5
 EBUILD libiconv-1.14-r2.ebuild 1515 SHA256 437a70ac535520b561d85ac6212f315d492bff5fde0cf3e4a577c801a0ee9297 SHA512 b1cd99126fdb3365b228f386792ad94e6e8ddb6567e7a1d2552c89d40766f304893c30e231dfb57b23a35ed5b3101a8f7065410b3147c70d77ae4abc861f6c52 WHIRLPOOL c00acd309578533bcaa2bfeb168ed4b2079058a81ed1d6334ff672a8036fdc4d9fe793028cce81b05c844a018b25c1e9153a5f72752a6e796a6147add0a44d78
 EBUILD libiconv-1.14.ebuild 986 SHA256 e25d66564ec12edd9ce6564a932284abe5d68f5fc1374dd0b8aa1ca316c01121 SHA512 4a3bee9887d6a39f4e96684548f71e5a494d21b3fec6b0b413ba4e34b7894799bf9114f72072a449a4925856b28b4c9c001e2b9ceceb55eb75677c2327ee7bf1 WHIRLPOOL 072ef9b360aa5260b9e4b2b2eb5e46871eea7dce9317b5cdb07672849bc3037de780da6cdd6ce54bdfd6b1bf858ae07f4ffcc8b651293913733857ccf2eab854
+EBUILD libiconv-1.15.ebuild 1891 SHA256 f95658d36cfeb0668205993da51809f970540377d72b58adfb1a35f5166c9c89 SHA512 e19b29a2c8bfdd50419074c25f131cc6eb5b9184586d7d5e1b4e1e358f42cdcaed3d7c6942b20fefc81275681c2bd9c262f4675677608ab61ddd0b57ce86a677 WHIRLPOOL a07267fc7523432b8652d155c9e8ddfcea01badb09600d621f6e97fd6793b300a5f76ee730d8ece64b29fd21edf9e0bf286298bada4ff4509f32d91886fd9987
 MISC ChangeLog 3737 SHA256 67305cdc6702794c17f34b6f05ec4c6535298cfce47e5c254134bfad586706fc SHA512 615e7fa483282d33ba1be5e8ef9658ad79253dfa3a2330a62b6e8531893a9cd2f6f75c3fe144e45d81fd109e2f47445ef015841ab2ece40112b1c0294a3b5c01 WHIRLPOOL 2df98f9925b9e8ac6eda81875d8a800c70405072f6ec2cb22d545070bb042aaee579ec92dd7b2dcf71f4380166ff33d32e0abbc2c9991af99f1227543290ac5b
 MISC ChangeLog-2015 7092 SHA256 89405bfc417dfdbe0ba095a1c4690461cf77f7d5e93dd9774692786e059915cb SHA512 33c2c31a7630adab5f5223e74601389c02e18131d597ee5614f9f970ee25f8574eac5e82109461c297a0744de61b85684891b41341f73af488d33683060fa497 WHIRLPOOL cc76fd0b871d8309398678562c4bb888783438db9f6d2d2963e41d22a625c5fc86a6c72b4fc4b5f0b6060da7d88ab1bc06305e8df5dca94511b569fcb123486d
 MISC metadata.xml 564 SHA256 2cde04a8c5d739116a75feb61677ddfa46b40cc67f4808de166deb9d48abc49c SHA512 7c13a258f15e61b3e5fd3e55411466f8830d83ecc25676d491635037be07b1a35b845ec5a06d56c26ecefb8865149e486e939a72111d1a3e46efc26b87d632a6 WHIRLPOOL a3af71368638bf19dcda250c5e3645f505cc019959880b6b321c16df0ba875b3e5bc65774ae126b1a320764fdd8452e76c1653febb2d2d89e4bc850f8f54c730
diff --git a/dev-libs/libiconv/files/libiconv-1.15-no-gets.patch b/dev-libs/libiconv/files/libiconv-1.15-no-gets.patch
new file mode 100644
index 000000000000..5bc20b377493
--- /dev/null
+++ b/dev-libs/libiconv/files/libiconv-1.15-no-gets.patch
@@ -0,0 +1,22 @@
+hack until gzip pulls a newer gnulib version
+
+From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
+From: Eric Blake <eblake@redhat.com>
+Date: Thu, 29 Mar 2012 13:30:41 -0600
+Subject: [PATCH] stdio: don't assume gets any more
+
+Gnulib intentionally does not have a gets module, and now that C11
+and glibc have dropped it, we should be more proactive about warning
+any user on a platform that still has a declaration of this dangerous
+interface.
+
+--- a/srclib/stdio.in.h
++++ b/srclib/stdio.in.h
+@@ -744,7 +744,6 @@ _GL_WARN_ON_USE (getline, "getline is un
+    removed it.  */
+ #undef gets
+ #if HAVE_RAW_DECL_GETS && !defined __cplusplus
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
+ 
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
diff --git a/dev-libs/libiconv/libiconv-1.15.ebuild b/dev-libs/libiconv/libiconv-1.15.ebuild
new file mode 100644
index 000000000000..5b0db6586609
--- /dev/null
+++ b/dev-libs/libiconv/libiconv-1.15.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit libtool toolchain-funcs multilib-minimal
+
+DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
+HOMEPAGE="https://www.gnu.org/software/libiconv/"
+SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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"
+IUSE="prefix static-libs"
+
+DEPEND="!sys-libs/glibc
+	!userland_GNU? ( !sys-apps/man-pages )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.15-no-gets.patch"
+)
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+multilib_src_configure() {
+	if use prefix ; then
+		# In Prefix we want to have the same header declaration on every
+		# platform, so make configure find that it should do
+		# "const char * *inbuf"
+		export am_cv_func_iconv=no
+	fi
+	# Disable NLS support because that creates a circular dependency
+	# between libiconv and gettext
+	ECONF_SOURCE="${S}" \
+	econf \
+		--docdir="\$(datarootdir)/doc/${PF}/html" \
+		--disable-nls \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}" -name 'lib*.la' -delete
+
+	# Install in /lib as utils installed in /lib like gnutar
+	# can depend on this
+	gen_usr_ldscript -a iconv charset
+
+	# If we have a GNU userland, we probably have sys-apps/man-pages
+	# installed, which means we want to rename our copies #503162.
+	# The use of USELAND=GNU is kind of a hack though ...
+	if use userland_GNU ; then
+		cd "${ED}"/usr/share/man || die
+		local f
+		for f in man*/*.[0-9] ; do
+			mv "${f}" "${f%/*}/${PN}-${f#*/}" || die
+		done
+	fi
+}