Fix build w/newer glibc, and simplify install phase.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 51 insertions, 26 deletions

diff --git a/dev-libs/libiconv/ChangeLog b/dev-libs/libiconv/ChangeLog
index f23c2d18a2a0..7a469ee055b9 100644
--- a/dev-libs/libiconv/ChangeLog
+++ b/dev-libs/libiconv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libiconv
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.45 2013/12/24 12:43:52 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.46 2014/03/27 06:30:41 vapier Exp $
+
+  27 Mar 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/libiconv-1.14-no-gets.patch, libiconv-1.14-r1.ebuild:
+  Fix build w/newer glibc, and simplify install phase.
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> libiconv-1.14-r1.ebuild:
   Stable for x86, wrt bug #492042
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index d4a6488a80d8..1c1ffcbaecd9 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -2,27 +2,28 @@
 Hash: SHA256
 
 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
 DIST libiconv-1.13.1.tar.gz 4716070 SHA256 55a36168306089009d054ccdd9d013041bfc3ab26be7033d107821f1c4949a49 SHA512 8475b020769e66f56e476143b81da032e10b02b76b8b49468ce0d8c5658dca1a36940da5cde2fc7e82add2679fc9efe5cd2ea10ccd349682ff85a64d10101662 WHIRLPOOL 5f8b8f72176a3e80e416e3d0535e9ec77322f9a268567c7175f521d1cd3b15818779f28a0e50bac29048c26c14bb149450b81cc5af2d824ff4fc3c2559e0a97c
 DIST libiconv-1.14.tar.gz 4984397 SHA256 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613 SHA512 b96774fefc4fa1d07948fcc667027701373c34ebf9c4101000428e048addd85a5bb5e05e59f80eb783a3054a3a8a3c0da909450053275bbbf3ffde511eb3f387 WHIRLPOOL e96337209a4f86eccb112e94c3cd6b668b2a8fc4b05ed7becaa2f6fbc9279f7b32ec1fa4b086e61520bfffea5d4f7a1cad58bdb266b5f0aa7d02b89aeed9759a
 EBUILD libiconv-1.13.1.ebuild 1730 SHA256 2a357bff3994fb82092f18205d7a37fe3a62cb4b465f1cd3a7f319eb7b2708c9 SHA512 2d6404316853c9de31ca6e08bc66478b7cf652426b4e1101aa6fbb350cc1428ca9593c4b711a8bcd5d080bf3d2f64ef011e49a7e2971ae487e313df296993192 WHIRLPOOL dd8b6cea8fb5be547494012c7141571a19da539a81ec93abadfc51e5e07f6581a07ef8bc3d68c986d6c23d8650c956d1274b9b89ad9def1d67e0745034609dc6
-EBUILD libiconv-1.14-r1.ebuild 1218 SHA256 801c113e2cdf21e9f960d9156cbab1593fc133220be54c24b1094a6d43408286 SHA512 ced8dba2d03232410c794f58b3bd16bab2a3429807a7128ffefcd57fd5c3c0419fc8777ac5adf8e4a596385658c382b9a74c46d2f3142f09af0a0fe86d5ac782 WHIRLPOOL 04a4236078083dd17895b66dc75e1a63568271979cea982dc9e1f3dc8a5abe2e0ef8511c4678b1982454523aa7bf7727513bf1450f78f0b1f981e9ca32d63335
+EBUILD libiconv-1.14-r1.ebuild 1140 SHA256 c026646f60793557e7d8c01fe0ebdae07a6f1dbcf7643bc83a237240a209ec6f SHA512 87bd5c89c04f25638b2cc778952489c72d1bd5aa78a1d206b4435f45ecfcfb3f37d7172e5ab69f0306bcf4602b00a64db01b998be7f1d876989082be98d9775e WHIRLPOOL f7e4f11ae125cfc362bb4e6a03e7fe01640f23450b69df608ac064e5541d85e02d492a4d6fa12f7886bcc223d8c678beec255618de901cd3d45e10232e24adac
 EBUILD libiconv-1.14.ebuild 1100 SHA256 f80959cc4f4a3465f3f2cef848620cbc2a9e93326b312609dea6c267291a7356 SHA512 987d0e0305c8318273552a94de3e2f0c2fa24c0f8d23a0afcb9876fd7f232238b43f299371c9296d7ae630b0576232c40269d4e476c2f6484869283b06504d90 WHIRLPOOL fae8568a24ad758189dae579dac457a3d2d97458f62cc6c1d7e78108390def0420b0e7d4449bd1a050ec041c04c7292855993b40fe2d665b6d741037b851fb36
-MISC ChangeLog 6615 SHA256 005074a145631f7441c9ad54c3eac03a31d9dfa963b514b85aa2bd4b247ff4f3 SHA512 c1cafcc10df4332c487e8099164ba7e1d31f115e563409df1fba11416020d35704127ec701281f8a19f37792cf07723bfc39455c5fcc03faa03cafcd1ef15e5f WHIRLPOOL e3f0d495bdb73d5e01347fbe64ad9248980a46002be8e35ce8c4584bcbd8018b5cb01b96ea1073bedcce38ca57f122f93921c0b01629029ed6a29bcf13aac031
+MISC ChangeLog 6787 SHA256 eb8f555baba915d94d4a876531f1bfb737edaa09783c4fef8b514bb1abc34fff SHA512 383bff46e69a6d847c4a71d3cb5b494f4e424c6bd4c5051bc604ac4d1c850ce447780ea1a8319591d70ae0674e9b9b5e5070b02c32f88c90f2070d65d6166a78 WHIRLPOOL 6f5afdd04bacf7d3188942cd835f33a5c0cdce4810bc1bfcf45cdffe06719e19755b35928716745a63ed9b1317d328c5e8e44340828d115cfb4c3f41be053c70
 MISC metadata.xml 378 SHA256 fb61ffaf9539c5b433445c9145ce53945ccbbb19b02e97afa513574f88d64b1f SHA512 5d49cdd285a2f90eb2120439569abb8083eedb074e6ff083bd03d200ea77898c2626cb8975f3676dbd3572888c9589589f44746f916180fc97d4029871286ce2 WHIRLPOOL 6fdffa68eb58014c2b531b09656018551e0ee91b14cdd52265519dc8acb13412a07a6c9c1db70609085c71699086c2926881ddae1d792170bfaf201dea2f2bbd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSuYGLAAoJELp701BxlEWfKFAP/R+WPLpqHQ1+34A8sBMblDq5
-x+7T2l2TCv1SzZiiGCzcFAajgQtv4TRD4RMzA3QdMWQZhekRWVytUvBh4SCJ5+4k
-ux4vwGQrdbcgoj/2SJ3stntlQRxY7rdLRHEJkgiDCUXnhW8wppMBscbTip+9AA96
-WQw+kiHiXJr3Be/omb4nWVC+B+vnp3FNAkQUZsAhxz16bYUAt7Thn5HprbnFFA8a
-UVrNyaysrr/Yn7QYFXIHbeC7vCmlMXOo3wQMgIkVX28AEFDw7bEV14DFi2E9HX1e
-Se6EvLjQOqgs0TwBwP0vrrZPhS0kyJj5pQdMt/0lR4rLtDUtlOIdwuPadXKGCzMi
-NNGgWeIRJDIl7L+EHiD6zAR6khd5keWuBntglu1Q2XlqLWtHBDE+d5KphHVVpDmH
-JR9opUYPPaQX4AQKObawWhJe5Ru1qAulEIoH2RMzwtIUookHa2rfpl7ke08ptp/T
-MS+B4l1dDhoZFmD77Sd1LoNGg20cCZd3ZAvLJthJUEfKVRycC33BuOU0aXi+A0d2
-NQgF6wqRLDRAQgxiK6n0g+8rhPw8FDNpHKDY4KXfNb6x2evyq3ho9XTH4DBPcjoD
-HsPnKGQOQlp41UMgW4q0bOMVYlJkjfihYDv5jLSn3rHF1RaBT3EI9IBBK2lonjA+
-2S3OCwKC8nsTx/kkdSJr
-=Rh5s
+iQIcBAEBCAAGBQJTM8WaAAoJEPGu1DbS6WIArpsP/ibnawcH39tGpA92LASJBByh
+GmetUAAHtnviP4LaF8NZmQAfQBP0UA+vxV1DjAwHyRRePcg6I1fz7HKdeVOJDJOD
+W46qaLmie3zfDCYh8Whb0W7Yl+wBxf/LpXu+BeRCI3NL3OobmtBsLdDhl8P0SJe7
+jOyuRhWQzhCjcz40ReCRyRQmOg+GJ3UkQkRJC+hkjTdGMrN+kgwxFl1r2NEMT8oB
+2ZIM1UJ5cPnHOd1JkUmvMOL028QlTbCyTH/9YzevjadSi3GGpAWxhixA2+950aWT
+IBBXXuLy0cIyDHlC/16OmWusEIu3xhsI84+Q1gRD4ZKfx7ZAFuX2IF1LGAEucGJz
+8Wjoa4PpnJm6OvQ+tbso2AJ/bhdljCgtFFIyXxYaqdhclyDpCzK8nOPx/Otve0Lh
+MG+E6QJOZ7G5Lq+tw52IU/T3XpVt51/Q9Ki9624j4xtxfBYLwL3Vaf/jKfT8HPfQ
+Hzza5wLmEXQx3ONfTNFG4KMEgdJekPod6s2IRF0aAQHZqz6yQGE4HS8szXjR07z0
+lD5sa9E4BTs9JnPqUlyxnrqXeoKNYLfIW/bHFUQrIa2HcdZkl1yUUx7ABNgOZjhL
+yzUrjv8Bv+UZi4UZ2gPU8Q4WqDYr4+pjpKNIZ2RtEDF5NPbXE8L2RXPllJq29Vy0
+4o3aLEtoEk3sof4N5MrC
+=3HU6
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libiconv/files/libiconv-1.14-no-gets.patch b/dev-libs/libiconv/files/libiconv-1.14-no-gets.patch
new file mode 100644
index 000000000000..db767ac1dd81
--- /dev/null
+++ b/dev-libs/libiconv/files/libiconv-1.14-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
+@@ -695,7 +695,6 @@ _GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
+ 
+ 
diff --git a/dev-libs/libiconv/libiconv-1.14-r1.ebuild b/dev-libs/libiconv/libiconv-1.14-r1.ebuild
index ac0c73dcc69d..e807ce5e53e4 100644
--- a/dev-libs/libiconv/libiconv-1.14-r1.ebuild
+++ b/dev-libs/libiconv/libiconv-1.14-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.14-r1.ebuild,v 1.4 2013/12/24 12:43:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.14-r1.ebuild,v 1.5 2014/03/27 06:30:41 vapier Exp $
 
 EAPI="4"
 
@@ -20,25 +20,23 @@ DEPEND="!sys-libs/glibc
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	# Make sure that libtool support is updated to link "the linux way"
-	# on FreeBSD.
+	epatch "${FILESDIR}"/${P}-no-gets.patch
 	elibtoolize
 }
 
 multilib_src_configure() {
 	# Disable NLS support because that creates a circular dependency
 	# between libiconv and gettext
-	ECONF_SOURCE="${S}" econf \
+	ECONF_SOURCE="${S}" \
+	econf \
 		--docdir="\$(datarootdir)/doc/${PF}/html" \
 		--disable-nls \
 		--enable-shared \
 		$(use_enable static-libs static)
 }
 
-multilib_src_install() {
-	default
-
+multilib_src_install_all() {
 	# Install in /lib as utils installed in /lib like gnutar
 	# can depend on this
-	[ "${ABI}" = "${DEFAULT_ABI}" ] && gen_usr_ldscript -a iconv charset
+	gen_usr_ldscript -a iconv charset
 }