gentoo resync : 15.12.2019

3 files changed, 47 insertions, 36 deletions

diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 690166d35474..1c70ca1257fb 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,7 +1,9 @@
 DIST libpcre2-10.33-patchset-1.0.tar.xz 17812 BLAKE2B 7a6e73101ed12676e1acf1beafcb6bc84d99d588a9dc0a957697380d906474f6ac59ab509e6c7ee5a0879b8d6ec9d06a0aceb8b02c7b16f73602d034927dc836 SHA512 4a0e86756cb96e6143df3add6cd6bca4fb9bb8fcb6a4d2df1530847b946b2494132e9842da01d75b385c33555d96e25f1390788b9e41ca320c1d65f31c89b281
+DIST libpcre2-10.34-patchset-01.tar.xz 1208 BLAKE2B 615b7eff085bd52bb3aed30c90ec5b8cec406f96c58bdfb0304dd59311517662067e68f85bc9930ed6f749820ecfe3c483e261616187bc1077ebb053670d4950 SHA512 d881665701bc330f237d19ee48491a81dc8b952b0b8e529eb83c3ffdf14710f68eb934f872ed76ef6b0bee1864261453e7e71e60e14217c004e4e12c6baa499f
 DIST pcre2-10.32.tar.bz2 1641814 BLAKE2B fdd512312547ae90b36b6c9eb86b6fcfea9b03fcfd9766063c901819c6bf7536e1f3da89bd69ae62309069bc07c705e96e81f4a36355bf934c566f343e3104e4 SHA512 3d712e7d6afbaef227952680ded69fadbdec0b1abdfcac17cf071415c3c93edd152d6d268dec80570aedf24f82ba954f74f5f9e62c9b9991be75080a3d6ab5fe
 DIST pcre2-10.33.tar.bz2 1690739 BLAKE2B e59cf47a5068b2ec2d647d6dfe1cb5f8d6cdcc6fc6b47aa65a4c3d5aae256e7f0b090487d372c62aa7ec7f15a1f037650088b53385fc2fe31aa405878855e5d5 SHA512 c6aa52cdbb0c906b02e9a9f255697a1b9b99d9c7dccdaa484ffdb04fe3582d232ba3cb3c421d6df589a387b415dedb0817f58ec5391488b25b4e7bd9da6bab8f
+DIST pcre2-10.34.tar.bz2 1714731 BLAKE2B f731339b3acdb084ddb1462cf4638edefbfc4a95e63e44c8c75ded55fd9b98334336dbda5f31bd8e9410e63ccd83dc7e707cc20f03df4d801f182ff4939b6cc6 SHA512 77ad75f8b0b8bbfc2f57932596151bca25b06bd621e0f047e476f38cd127f43e2052460b95c281a7e874aad2b7fd86c8f3413f4a323abb74b9440a42d0ee9524
 EBUILD libpcre2-10.32.ebuild 2337 BLAKE2B a6659156d613e53ef1bce927e42c1a948a73868278c335bdb49b89bdc1b5dc9090afb994635e0395921748312c84ab1125a3e5acb66d916540795c9733e7fcc3 SHA512 9c8ebe7887d4ae6c6cf4138ec62021bba726a2052cb7b3c1d34ed276310e3b18e4c01d3a3ba0eb048e8234f2a72418e3749141a3bb0121c5193cfcdd72879fc2
 EBUILD libpcre2-10.33-r1.ebuild 2511 BLAKE2B abcd065375574623703679dffbb248dab0262e04a6a664f34443dae45865be1785611107cc5e58d9f76777cd8a87d74be6e785709ea89d0bbcec73a8a3bf8f99 SHA512 01fb195504b20e6fe88cb066fcaecfae1d133958d60ddfd5a9b3c96f16770becdee5e95d8230356e62c8200e2d625c8331068c20cfa3fd57821d82a37d466f10
-EBUILD libpcre2-10.33.ebuild 2357 BLAKE2B ac53d62cdc00e46b508cf3a554342782df4bba0ed0f772a3e33204f80378fe70349df2b2989e79845f6979ac42df99566820439cf26ce401236b30913651fa40 SHA512 93dcd6ed77ed7f193c7409f8847f209513b69d09adb0332de92103547c9fa0f58148dd29702be9c114c423728292446a5335e7b1f85b280e4f60a5bb6ed999e1
-MISC metadata.xml 1228 BLAKE2B da9f4403aa5618f793335621cecafefc6c3a475f7339884fdebe661002cf724e0b27d49270ce4dd4092bf9fe00371c53798988d28376475f630c965e7fbd1c09 SHA512 33c0cbcd3fd188d2c594cda3e8aa100a1528f40af2aad398c6371cf01c639b54d0cca52adf15a123fc036738031729f2950b8409b91b40240211ec7e9fbb80a8
+EBUILD libpcre2-10.34.ebuild 2643 BLAKE2B 649c567b6bc899ae6e66180a2588c2f807de795c22f1798c3b42588ef08043158c275034fa86df8555b389cc7ca68a49571d7398d6d77b94e05cdfe1327b9d7f SHA512 f4325d823527b5c0ea7f5e6fc9601fd38800834384338aff26ba304f996998d76dc657873481d4afb2fe8d9b380c4a6fcfb874baececefeb961e6196482096c3
+MISC metadata.xml 1140 BLAKE2B 19f0ea04c9613f0c804c76ca74012fa2313ba69b57fe95f31720809a12d5244f78e4ce9c957723b848f0d8c3514ef27fd875f7814d2434c7e50dbcc7325c0a95 SHA512 9b54ed8cdf78e1d3fe737460117cb840280b63c196cca0bfc7b89975ea8102f9729cf5f29628f5cb7b7c1eefd8fd5c67f3c7f5fab64f9d168d6fcdedbd926b51
diff --git a/dev-libs/libpcre2/libpcre2-10.33.ebuild b/dev-libs/libpcre2/libpcre2-10.34.ebuild
index eb473005ccc4..905bcad3168c 100644
--- a/dev-libs/libpcre2/libpcre2-10.33.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.34.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic libtool multilib-minimal toolchain-funcs usr-ldscript
 
+PATCH_SET="${P}-patchset-01.tar.xz"
+
 DESCRIPTION="Perl-compatible regular expression library"
 HOMEPAGE="http://www.pcre.org/"
 MY_P="pcre2-${PV/_rc/-RC}"
@@ -16,19 +18,28 @@ else
 	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
 fi
 
+if [[ -n "${PATCH_SET}" ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}"
+fi
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 )"
 
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	libedit? ( dev-libs/libedit )
-	readline? ( sys-libs/readline:0= )"
-DEPEND="${RDEPEND}
+BDEPEND="
 	virtual/pkgconfig
-	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
+	userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+"
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline:0= )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -37,6 +48,8 @@ MULTILIB_CHOST_TOOLS=(
 )
 
 src_prepare() {
+	[[ -d "${WORKDIR}/patches" ]] && eapply "${WORKDIR}"/patches
+
 	default
 
 	elibtoolize
@@ -75,5 +88,5 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/dev-libs/libpcre2/metadata.xml b/dev-libs/libpcre2/metadata.xml
index e043c3761902..1e5257985a69 100644
--- a/dev-libs/libpcre2/metadata.xml
+++ b/dev-libs/libpcre2/metadata.xml
@@ -1,36 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-	<email>polynomial-c@gentoo.org</email>
-	<name>Lars Wendler</name>
-	</maintainer>
 	<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
 	</maintainer>
 	<use>
-	<flag name="bzip2">
-		Add support for pcregrep command to search within
-		bzip2-compressed files (via <pkg>app-arch/bzip2</pkg>).
-	</flag>
-	<flag name="pcre16">Build PCRE library for 16 bit characters (e.g. UTF-16).</flag>
-	<flag name="pcre32">Build PCRE library for 32 bit characters (e.g. UTF-32).</flag>
-	<flag name="readline">
-		Add support for command line editing to pcretest, through
-		<pkg>sys-libs/readline</pkg>.
-	</flag>
-	<flag name="recursion-limit">
-		Limit match recursion to 8192; if disabled, the default limit is
-		used, which is the same as the match limit.
-	</flag>
-	<flag name="zlib">
-		Add support for pcregrep command to search within
-		gzip-compressed files (via <pkg>sys-libs/zlib</pkg>).
-	</flag>
+		<flag name="bzip2">
+			Add support for pcregrep command to search within
+			bzip2-compressed files (via <pkg>app-arch/bzip2</pkg>).
+		</flag>
+		<flag name="pcre16">Build PCRE library for 16 bit characters (e.g. UTF-16).</flag>
+		<flag name="pcre32">Build PCRE library for 32 bit characters (e.g. UTF-32).</flag>
+		<flag name="readline">
+			Add support for command line editing to pcretest, through
+			<pkg>sys-libs/readline</pkg>.
+		</flag>
+		<flag name="recursion-limit">
+			Limit match recursion to 8192; if disabled, the default limit is
+			used, which is the same as the match limit.
+		</flag>
+		<flag name="zlib">
+			Add support for pcregrep command to search within
+			gzip-compressed files (via <pkg>sys-libs/zlib</pkg>).
+		</flag>
 	</use>
 	<upstream>
-	<remote-id type="cpe">cpe:/a:pcre:pcre</remote-id>
-	<remote-id type="sourceforge">pcre</remote-id>
+		<remote-id type="cpe">cpe:/a:pcre:pcre</remote-id>
+		<remote-id type="sourceforge">pcre</remote-id>
 	</upstream>
 </pkgmetadata>