gentoo resync : 28.04.2019

4 files changed, 8 insertions, 29 deletions

diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 223722150159..f4edb77e109f 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,8 +1,7 @@
-AUX libpcre2-10.31-cygwin.patch 370 BLAKE2B 3dd868d520c6c4f7f64213ce6854a3d603c6dfd26073eb36238dd04fe7ffb46395ec2002a519269ee28a31e1510251e2d532c46307f0fa2b332cbfe7306b09ed SHA512 7e1eaa3f9a9284c6a21e5971c1c37d8d032da15e7cf98b4b7814e502a3c76221e6939c332ccab0fad5b812c7d9dc55b26532a18a57f6ed715fca3eb79ca95200
 DIST pcre2-10.30.tar.bz2 1583543 BLAKE2B bd9369f3c81bf0d154aaf3d111b934835af25068051f9bcafc0d4b00376011ff7a4acfac127ee10efe6094021163a07a073076d9d769eff68823fd8d1041cd1f SHA512 f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e
-DIST pcre2-10.31.tar.bz2 1603075 BLAKE2B 3cc101b738320823f5b8ab5d29fcc94d8bc2ecd3fbade148de34eda5371cc4d9c168f9e234f0d581626f3da85988ec8d46f76377b019459d3f6b044998e82426 SHA512 44d7db2513d9415dcdf6541366fea585e016f572f3e4379f6e959a38114b2337851092049ab4a1576ae8f19b9de413edbcfa62f434c77fc8470747ee5413e967
 DIST pcre2-10.32.tar.bz2 1641814 BLAKE2B fdd512312547ae90b36b6c9eb86b6fcfea9b03fcfd9766063c901819c6bf7536e1f3da89bd69ae62309069bc07c705e96e81f4a36355bf934c566f343e3104e4 SHA512 3d712e7d6afbaef227952680ded69fadbdec0b1abdfcac17cf071415c3c93edd152d6d268dec80570aedf24f82ba954f74f5f9e62c9b9991be75080a3d6ab5fe
+DIST pcre2-10.33.tar.bz2 1690739 BLAKE2B e59cf47a5068b2ec2d647d6dfe1cb5f8d6cdcc6fc6b47aa65a4c3d5aae256e7f0b090487d372c62aa7ec7f15a1f037650088b53385fc2fe31aa405878855e5d5 SHA512 c6aa52cdbb0c906b02e9a9f255697a1b9b99d9c7dccdaa484ffdb04fe3582d232ba3cb3c421d6df589a387b415dedb0817f58ec5391488b25b4e7bd9da6bab8f
 EBUILD libpcre2-10.30.ebuild 2324 BLAKE2B 1f25bfa72b1418ebee600d5a278a9882fd70064834e3b53eab8ae968429ad75a832854ae144773d1093700792b6e870357bbe2859e91dc1a58beff1333060b2b SHA512 3d7523986e2999cf9ab0263f2b9089ec4a92ccbe174a4dddef9fac17c6a91ddd27e6db529c2bc62afce5cfd784c00fa63e21b3e82646290be2c4a05f2d4dd522
-EBUILD libpcre2-10.31.ebuild 2391 BLAKE2B 3ad00fbe8ebb65a59c3166cef3a00c1c2e6800a4aed99d7aa5b3371ca10a8f64cb392e5e1724efaded8dc3f7e4908b8dfef60756b81449148c5efa562f9c0e66 SHA512 b31d04fd3e8c65638c2bce57bab9e1a66dd42d6a05d791c02395599867f0abb45eb5ae4a5884019986f555e64514fe6b0481a3a36a29d170559c23b74793a110
-EBUILD libpcre2-10.32.ebuild 2359 BLAKE2B 6c6d62c1b08530e1e2a364f5e62d7f4c3581e9d113865cdd6c6655bfe044e5960bd748f37fb8b546cefe45c2da3e1ee0a074224297774f7ec5ed1f1c3f1f3602 SHA512 c64db13b39127e2e0bb3b757597591a2af28e8c7614df71843623a5fc945d58029cadedbbf18181f8bd63e9ee2ef4ee6613c193731697d8d18bd1d2a092a33cc
+EBUILD libpcre2-10.32.ebuild 2349 BLAKE2B 788d2d01d79b750425099f283ee1fc0bb8545b7269bf36933c99061dc54fd7dbdf2c16b93ef80ad2072957061c4413aaff268598f809fb55875d74e73aa57555 SHA512 807fa4305c6da7e342cd801440f69b5322fd9549bfdc3498b465bda1c724d6e2fa3c183c7cbdcdfbb4a63cfbded74dc9e06355d019b41e6cc89e28b9858f9e0f
+EBUILD libpcre2-10.33.ebuild 2359 BLAKE2B 6c6d62c1b08530e1e2a364f5e62d7f4c3581e9d113865cdd6c6655bfe044e5960bd748f37fb8b546cefe45c2da3e1ee0a074224297774f7ec5ed1f1c3f1f3602 SHA512 c64db13b39127e2e0bb3b757597591a2af28e8c7614df71843623a5fc945d58029cadedbbf18181f8bd63e9ee2ef4ee6613c193731697d8d18bd1d2a092a33cc
 MISC metadata.xml 1228 BLAKE2B da9f4403aa5618f793335621cecafefc6c3a475f7339884fdebe661002cf724e0b27d49270ce4dd4092bf9fe00371c53798988d28376475f630c965e7fbd1c09 SHA512 33c0cbcd3fd188d2c594cda3e8aa100a1528f40af2aad398c6371cf01c639b54d0cca52adf15a123fc036738031729f2950b8409b91b40240211ec7e9fbb80a8
diff --git a/dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch b/dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch
deleted file mode 100644
index 3f3a33b366ad..000000000000
--- a/dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.exim.org/show_bug.cgi?id=2152#c14
-https://vcs.pcre.org/pcre2?view=revision&revision=939
-
---- pcre2-10.31/src/pcre2grep.c
-+++ pcre2-10.31/src/pcre2grep.c
-@@ -64,8 +64,8 @@
- #endif
- 
- /* Some cmake's define it still */
--#if defined(__CYGWIN__) && !defined(WIN32)
--#define WIN32
-+#if defined(__CYGWIN__) && defined(WIN32)
-+#undef WIN32
- #endif
- 
- #ifdef WIN32
diff --git a/dev-libs/libpcre2/libpcre2-10.32.ebuild b/dev-libs/libpcre2/libpcre2-10.32.ebuild
index 4d229a789ef8..086f9eb1d349 100644
--- a/dev-libs/libpcre2/libpcre2-10.32.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.32.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libpcre2/libpcre2-10.31.ebuild b/dev-libs/libpcre2/libpcre2-10.33.ebuild
index 45e150f0b696..4d229a789ef8 100644
--- a/dev-libs/libpcre2/libpcre2-10.31.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.33.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit flag-o-matic libtool ltprune multilib-minimal toolchain-funcs
+inherit flag-o-matic libtool multilib-minimal toolchain-funcs
 
 DESCRIPTION="Perl-compatible regular expression library"
 HOMEPAGE="http://www.pcre.org/"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
@@ -30,10 +30,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-cygwin.patch #633612
-)
-
 S="${WORKDIR}/${MY_P}"
 
 MULTILIB_CHOST_TOOLS=(
@@ -79,5 +75,5 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${ED}" -name "*.la" -delete || die
 }