gentoo resync : 25.04.2020

3 files changed, 2 insertions, 88 deletions

diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 67315913cde7..657c2d32409a 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,7 +1,4 @@
-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.33.tar.bz2 1690739 BLAKE2B e59cf47a5068b2ec2d647d6dfe1cb5f8d6cdcc6fc6b47aa65a4c3d5aae256e7f0b090487d372c62aa7ec7f15a1f037650088b53385fc2fe31aa405878855e5d5 SHA512 c6aa52cdbb0c906b02e9a9f255697a1b9b99d9c7dccdaa484ffdb04fe3582d232ba3cb3c421d6df589a387b415dedb0817f58ec5391488b25b4e7bd9da6bab8f
 DIST pcre2-10.34.tar.bz2 1714731 BLAKE2B f731339b3acdb084ddb1462cf4638edefbfc4a95e63e44c8c75ded55fd9b98334336dbda5f31bd8e9410e63ccd83dc7e707cc20f03df4d801f182ff4939b6cc6 SHA512 77ad75f8b0b8bbfc2f57932596151bca25b06bd621e0f047e476f38cd127f43e2052460b95c281a7e874aad2b7fd86c8f3413f4a323abb74b9440a42d0ee9524
-EBUILD libpcre2-10.33-r1.ebuild 2458 BLAKE2B af15a14d6dda70a662663e0b966c75cf9b20eaad8da3b2cab819c23b602dd7ceb5f7c609570d94dff785c0e94fe870273b8ce259e2bebf6a9dac6acb9e6def2b SHA512 baf1e82fb09441ffbf8438333bf0201c47d205c4ee9fcbae72076825d50f0621e4c4bba0889325871f70fb9ac01cdb4544fca8be44da74e48f09ca51807a458b
-EBUILD libpcre2-10.34.ebuild 2542 BLAKE2B 6c702954710c73971306a0ed18d5a6734835d564a14cff0a74a07c09372e32d7f55d9c055a8b20e6b08c6e164b70c6e2f030c67397b1f00377c5939662bab811 SHA512 19a98ffe757ce26c8fd97c9014a0e533114636a087bd031e760019ea53c4aeff56ba8b1f4d3e3196832eb4999372fa46be81ce880d6f3fa8ca0d2eefb3d65ef0
+EBUILD libpcre2-10.34.ebuild 2533 BLAKE2B d37125e2860a9477770133820eee44d04d686771c72ace1a0089dec3d06b06ebcc6d2ad71a43f67a4b64c71d6836c7a5134a6ef2a33ab121d8bd4f938f10d9e1 SHA512 f6c09ed783695ad41e6564d1606a3444b6c2fbfd9ba643ab5287a93779fef6b0ce4407ce872ff54bca866897f58114048e938b4ffdd7b31af0fac49ed252105b
 MISC metadata.xml 1140 BLAKE2B 19f0ea04c9613f0c804c76ca74012fa2313ba69b57fe95f31720809a12d5244f78e4ce9c957723b848f0d8c3514ef27fd875f7814d2434c7e50dbcc7325c0a95 SHA512 9b54ed8cdf78e1d3fe737460117cb840280b63c196cca0bfc7b89975ea8102f9729cf5f29628f5cb7b7c1eefd8fd5c67f3c7f5fab64f9d168d6fcdedbd926b51
diff --git a/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
deleted file mode 100644
index 10f6cab208ff..000000000000
--- a/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool multilib-minimal toolchain-funcs usr-ldscript
-
-PATCH_SET="${P}-patchset-1.0.tar.xz"
-
-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
-		https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}"
-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 ~riscv s390 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 )"
-
-BDEPEND="virtual/pkgconfig
-	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	libedit? ( dev-libs/libedit )
-	readline? ( sys-libs/readline:0= )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pcre2-config
-)
-
-src_prepare() {
-	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
-
-	default
-
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-pcre2-8
-		--enable-shared
-		--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() {
-	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() {
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/libpcre2/libpcre2-10.34.ebuild b/dev-libs/libpcre2/libpcre2-10.34.ebuild
index 350a1fbc1612..073c2ee5689c 100644
--- a/dev-libs/libpcre2/libpcre2-10.34.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.34.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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 )"