gentoo resync : 15.02.2018

3 files changed, 20 insertions, 95 deletions

diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 062ea8d4e136..58f437caa5d2 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,7 +1,5 @@
-DIST pcre2-10.22.tar.bz2 1470620 BLAKE2B d968869db31cb9b0d93586227e6b44ecab57dea625108a386bf6bf8cb007c17f83e0b427744eaa6b4d6a1f6a7f344ee0aed29726bb51d077ff51889e68faf072 SHA512 dcf70b5e5b73f29188a56e4d9efb9afdf2b9ebe50e13a7640b80f543851235a289e476e1f517f49fac9628b456268bcdaf2b492237bc879ddff36f84ef4f32ea
-DIST pcre2-10.23.tar.bz2 1515314 BLAKE2B f5900bbd3dae401180299092751700840b628b6e1e766885436dd8bda1e22279a179e280994ef6c6c98bb2af1ec5002c283b2c2ad3ee0420c3acca814ca1742a SHA512 3e5910bd2405cc35934d91e4be760abe4f2e900202a20b6ba74adb7a3acb2b74b3bf9b0e97e8de10f8e8534133e0722e0bf0f5fb40d6c2c4520d1ed61749d456
 DIST pcre2-10.30.tar.bz2 1583543 BLAKE2B bd9369f3c81bf0d154aaf3d111b934835af25068051f9bcafc0d4b00376011ff7a4acfac127ee10efe6094021163a07a073076d9d769eff68823fd8d1041cd1f SHA512 f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e
-EBUILD libpcre2-10.22.ebuild 2320 BLAKE2B 21a1d2dee729733bb618c8febe31df823cc8058c2ee09dcb1bf79c82b332c6a9cd7051dff4586bf2f5f7cf9f94f051a6b988bdda2bd80051fcba6306052b2d98 SHA512 4763d6daea9bdd4bb8dff8f24e3b051366eb728cf9019097a344ecb3a497d6950f7e352c7fcfe240d6f596c8114f001d562f01f2da953b975b2f805f59c30a23
-EBUILD libpcre2-10.23.ebuild 2329 BLAKE2B af4214bdab9d05107951eee2f5ab079b08b7667ce492c534ed6e0b8b75d36418a64ff40f31b3af499994f0ab7ed58bcade42b48d610cb7f5a215df141793663c SHA512 9ac3202801afb4b8889c4ab8b767d283771caa77be01ffd3741918ee618107c37742ee3b4cd9abf4944b70cb8d1b459db6920abac55c18dcd4f3539a01ac8b31
+DIST pcre2-10.31.tar.bz2 1603075 BLAKE2B 3cc101b738320823f5b8ab5d29fcc94d8bc2ecd3fbade148de34eda5371cc4d9c168f9e234f0d581626f3da85988ec8d46f76377b019459d3f6b044998e82426 SHA512 44d7db2513d9415dcdf6541366fea585e016f572f3e4379f6e959a38114b2337851092049ab4a1576ae8f19b9de413edbcfa62f434c77fc8470747ee5413e967
 EBUILD libpcre2-10.30.ebuild 2339 BLAKE2B 5fd326ec1dc0c4a5d54db90621ae6b9f07c91c4fbb9bf956e446705166d52de87c695fdcffde61e7e8233b538593558ee11ed9db79f1cd7263203aec647def76 SHA512 47979b06fed1350f34305eddfe073a791f91da379a0f05dfd21338bd9131911106dcb0bc899d5a572ad15ee1ddff1aac772216dd6ce87e1f2738ffc79bcf9c34
+EBUILD libpcre2-10.31.ebuild 2348 BLAKE2B 501e61f76820a596b4975bd0654981ac89be8da15c44cfab69abea1b1489eae80079855577d89200ecd96714b7d6a2307c0662cca4ec12cefc6ac67e6cf89f0b SHA512 3f6d74efd53d8466b67c6743801d73d2bb80e78e6dbf47d916d23be086245750d0a778cc81f146fe4d5e24fad9bbed28a5690da29fb12c4cc28d555052a293eb
 MISC metadata.xml 1106 BLAKE2B 357dea3a03dcd1184cd5ac7c3fd79cb826d37410d27f06ad267e92c024bfc6fab891363894469e87bb8982d8c0a315320a20c22eb4877b3411b196a8b89c42e8 SHA512 8f2e0a7fd277da813c6aa00ff9ed9fe69443a6c738b2e66d09d5c5b4f6381110c1bab0a6b8be315f99f07254ae38c347aea4d50b54693bab3056c83830bec8cf
diff --git a/dev-libs/libpcre2/libpcre2-10.22.ebuild b/dev-libs/libpcre2/libpcre2-10.22.ebuild
deleted file mode 100644
index f4650a2dbfb8..000000000000
--- a/dev-libs/libpcre2/libpcre2-10.22.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils libtool flag-o-matic toolchain-funcs multilib-minimal
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="http://www.pcre.org/"
-MY_P="pcre2-${PV/_rc/-RC}"
-if [[ ${PV} != *_rc* ]] ; then
-	# Only the final releases are available here.
-	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
-		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
-else
-	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
-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 ~arm-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}
-	virtual/pkgconfig
-	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
-
-S=${WORKDIR}/${MY_P}
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pcre2-config
-)
-
-src_prepare() {
-	default
-
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \
-		$(multilib_native_use_enable bzip2 pcre2grep-libbz2) \
-		$(use_enable jit) $(use_enable jit pcre2grep-jit) \
-		$(use_enable pcre16 pcre2-16) \
-		$(use_enable pcre32 pcre2-32) \
-		$(multilib_native_use_enable libedit pcre2test-libedit) \
-		$(multilib_native_use_enable readline pcre2test-libreadline) \
-		$(use_enable static-libs static) \
-		$(use_enable unicode) \
-		$(multilib_native_use_enable zlib pcre2grep-libz) \
-		--enable-pcre2-8 \
-		--enable-shared \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-multilib_src_compile() {
-	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
-		install
-	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-}
diff --git a/dev-libs/libpcre2/libpcre2-10.23.ebuild b/dev-libs/libpcre2/libpcre2-10.31.ebuild
index 226ebc4fece6..b3366003de68 100644
--- a/dev-libs/libpcre2/libpcre2-10.23.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.31.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils libtool flag-o-matic toolchain-funcs multilib-minimal
+inherit flag-o-matic libtool ltprune multilib-minimal toolchain-funcs
 
 DESCRIPTION="Perl-compatible regular expression library"
 HOMEPAGE="http://www.pcre.org/"
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/pcre2-config
@@ -43,20 +43,23 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \
-		$(multilib_native_use_enable bzip2 pcre2grep-libbz2) \
-		$(use_enable jit) $(use_enable jit pcre2grep-jit) \
-		$(use_enable pcre16 pcre2-16) \
-		$(use_enable pcre32 pcre2-32) \
-		$(multilib_native_use_enable libedit pcre2test-libedit) \
-		$(multilib_native_use_enable readline pcre2test-libreadline) \
-		$(use_enable static-libs static) \
-		$(use_enable unicode) \
-		$(multilib_native_use_enable zlib pcre2grep-libz) \
-		--enable-pcre2-8 \
-		--enable-shared \
+	local myeconfargs=(
+		--enable-pcre2-8
+		--enable-shared
 		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
+		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
+		$(multilib_native_use_enable libedit pcre2test-libedit)
+		$(multilib_native_use_enable readline pcre2test-libreadline)
+		$(multilib_native_use_enable zlib pcre2grep-libz)
+		$(use_enable jit)
+		$(use_enable jit pcre2grep-jit)
+		$(use_enable pcre16 pcre2-16)
+		$(use_enable pcre32 pcre2-32)
+		$(use_enable static-libs static)
+		$(use_enable unicode)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_compile() {