gentoo resync : 18.05.2019

4 files changed, 19 insertions, 48 deletions

diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index 53c64c611e08..07fa4bd0bc98 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -1,8 +1,7 @@
-AUX libintl-0.19.5-langinfo.patch 1108 BLAKE2B d45afdc7cfa1c5b1f1a0186d381ecc4ebfe824992928fb96b62ac3a6737daafae7e7f5af1decada27a106dacee08a2c58fda1691d9386ee235b5cec34dc7ee3c SHA512 59dc10bacadb63399bbb23185005c7c83ec6a54cd944f49e4c0b7b9965530760201e49ec2a3b49fc750693125e8c53ac155f323f677272f30a1469bd66a49ac7
-DIST gettext-0.19.6.tar.gz 18619659 BLAKE2B fb5e518cef2048c89d2c637d3551d6d7debff2fcdeb35b60f0ae9943733bf5cd8ec46f0a4cccd9f1806a6af4b16eef372a0621af611d3706356af6ae82d0d5bf SHA512 46adfd4a6d0038aba999658bebe51117e3ab3dc149a9054c1087d3e79ec7ba3371a7e78a8ca30a8872d162c2dc44aba6e67e4d64808c4f92e1e2bd674174f1db
 DIST gettext-0.19.7.tar.gz 19235781 BLAKE2B 4c2cfcb0b21a66a9f8d2d57de7420e624a1235f97180ad5ac194a5eb629760a9cacc7f3966cdf893d7af86c1740d8bb2266c639ebe2664ea44f2c47a962a841a SHA512 7ba89074d3eddd0b4a5e2980e1ec74b53c49b7a04a1fa91c70c4bc11ce9c30415e4df9d79698148eaaed325fb4feb25a340a2e8e01fbe86b1a66b1376a4c9e3d
 DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
-EBUILD libintl-0.19.6.ebuild 2084 BLAKE2B 4c44824e49423705d8845f220b6d688c0f78f3cd31d08235c8141906370ad66856a0e0790952f47b65262d84ac075e2acec4c3ecdddf1e087b94bed4cde64bec SHA512 ff31e398c5f9c74a2fa1bde5f5d7c67ef6b3ea62de0868bc8e0ff419b3f337869b504b3b8631cc5525913fe1892c128ea87119ca83cdcb7329d99b0d236e4ab0
+DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
 EBUILD libintl-0.19.7.ebuild 2100 BLAKE2B 9b655e464aeac02ab8310be730489c98cedfa880d7afe8a8df71b28e81cfe068248052137f77eb28dbb2a2435ea4e5698b6786b08e71443a1c51dc500fc94b94 SHA512 9fc279db2f3a42d087572e8bb3bad92794bb7ece576ed1fa97160250264de2a586e7b3f2b0d68893456458cdd45cb4b8decb7b1f8bf020898ff7a5affa71c7be
-EBUILD libintl-0.19.8.1.ebuild 2113 BLAKE2B a7fe97df7720b623e7d9fe6cbe84e8a23b06c3701e20739f9cd20219d902fe990e594af8462efb08636216ca105f015fe2b00271d871ffa27cad5202112960c6 SHA512 1d4255c1c0e4270f2845bb3478008724b047984499a3bb629906da4653509a9cc52fbcbf3562f5ea364126255e9e94968f747deefe4cfe81b48fe9169f62477d
+EBUILD libintl-0.19.8.1.ebuild 2108 BLAKE2B 597a7bcd05f8c2c6e98ea9fbd73870a59d285863f5eb56e4325387be0278e769205e0051439c250d0979cbbb19058d6f953c6cdc73882eb3809f3dd73433abb0 SHA512 439ffc0704490d2a7728ba943ab3e946dd5a41ce64fc85b32bae908ea27c847c7419e35ca68e604a0ea33a558ed2e377d9cb5cdde2cd6fd2d1d99cc88ee1ae1f
+EBUILD libintl-0.20.1.ebuild 2122 BLAKE2B 4ea73f2f4bf1dcdf2d762e378ddc196d7c4723e6b2ac484eb6050a58f589877aa7b888fe7c5403ddf1b5189012733a817ba58616081e22ae966e3e0558de533c SHA512 d0b6f6527dc1ded47374ef404391f8d10ac27d6d835750c73e0e308d673f48be7aae7429e308f33cb60a4a946a1bed33e7bf95f703ab813d867cf9b974da964f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libintl/files/libintl-0.19.5-langinfo.patch b/dev-libs/libintl/files/libintl-0.19.5-langinfo.patch
deleted file mode 100644
index bf96e69f924c..000000000000
--- a/dev-libs/libintl/files/libintl-0.19.5-langinfo.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-this has been sent upstream
-
-From eac944b0757963ac1ba035ea72617734510ede22 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Mon, 12 Oct 2015 17:58:51 -0400
-Subject: [PATCH] intl/localename: control langinfo.h inclusion
-
-This header is only used to work around buggy behavior in old versions
-of glibc, so do not include it all the time.  Otherwise we get build
-failures on systems that do not provide langinfo.h.
-
-* gettext-runtime/intl/localename.c: Wrap langinfo.h include with same
-ifdefs used in the source later on.
----
- gettext-runtime/intl/localename.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c
-index f8cf3f2..c27be86 100644
---- a/gettext-runtime/intl/localename.c
-+++ b/gettext-runtime/intl/localename.c
-@@ -38,7 +38,9 @@
- # if defined __APPLE__ && defined __MACH__
- #  include <xlocale.h>
- # endif
--# include <langinfo.h>
-+# if __GLIBC__ >= 2 && !defined __UCLIBC__
-+#  include <langinfo.h>
-+# endif
- # if !defined IN_LIBINTL
- #  include "glthread/lock.h"
- # endif
--- 
-2.5.2
-
diff --git a/dev-libs/libintl/libintl-0.19.8.1.ebuild b/dev-libs/libintl/libintl-0.19.8.1.ebuild
index 45621c1ce25e..d7c6b994c6a7 100644
--- a/dev-libs/libintl/libintl-0.19.8.1.ebuild
+++ b/dev-libs/libintl/libintl-0.19.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: Keep version bumps in sync with sys-devel/gettext.
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.19.6.ebuild b/dev-libs/libintl/libintl-0.20.1.ebuild
index a63240d5db93..da2640badddb 100644
--- a/dev-libs/libintl/libintl-0.19.6.ebuild
+++ b/dev-libs/libintl/libintl-0.20.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: Keep version bumps in sync with sys-devel/gettext.
 
-EAPI="5"
+EAPI=7
 
 MY_P="gettext-${PV}"
 
-inherit eutils multilib-minimal toolchain-funcs libtool
+inherit multilib-minimal toolchain-funcs libtool
 
 DESCRIPTION="the GNU international library (split out of gettext)"
 HOMEPAGE="https://www.gnu.org/software/gettext/"
@@ -28,7 +28,7 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${MY_P}/gettext-runtime"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.19.5-langinfo.patch
+	default
 
 	# The libtool files are stored higher up, so make sure we run in the
 	# whole tree and not just the subdir we build.
@@ -54,7 +54,12 @@ multilib_src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable threads)
 	)
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	# We only need things in the intl/ subdir.
+	emake -C intl
 }
 
 multilib_src_install() {
@@ -65,9 +70,11 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	use static-libs || prune_libtool_files --all
+	if ! use static-libs ; then
+		find "${ED}" -type f -name "*.la" -delete || die
+	fi
 
-	rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias
+	rm -r "${ED}"/usr/share/locale || die
 
 	dodoc AUTHORS ChangeLog NEWS README
 }