diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/Manifest index 05b5b9ba56..295a352e94 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/Manifest @@ -1,2 +1 @@ -DIST pcre-8.44.tar.bz2 1577611 BLAKE2B ef8d5737ca1f4c72f12c8726956ce5d3bad13aa8303b7c3b5d25499e3027ddc2edcdb937d9ad2bdd437a8885f1af8757ba194aa0b2f236b6e6a3a18d2ec8f138 SHA512 f26d850aab5228799e58ac8c2306fb313889332c39e29b118ef1de57677c5c90f970d68d3f475cabc64f8b982a77f04eca990ff1057f3ccf5e19bd137997c4ac DIST pcre-8.45.tar.bz2 1578809 BLAKE2B 3954e08cf3c67a5e2249bf72f8d4c1a90fe7a098fffa5a0a06d0d665d07899027cfd632eab2757fcf2b1b9b413a43d5c484c8e52d05b7ca113b3bbbc4dd3bb29 SHA512 91bff52eed4a2dfc3f3bfdc9c672b88e7e2ffcf3c4b121540af8a4ae8c1ce05178430aa6b8000658b9bb7b4252239357250890e20ceb84b79cdfcde05154061a diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.44.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.44.ebuild deleted file mode 100644 index 658a081edc..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.44.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit libtool multilib-minimal preserve-libs usr-ldscript - -DESCRIPTION="Perl-compatible regular expression library" -HOMEPAGE="http://www.pcre.org/" -MY_P="pcre-${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="3" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" -REQUIRED_USE="readline? ( !libedit ) - 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 -" - -S="${WORKDIR}/${MY_P}" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/pcre-config -) - -PATCHES=( - "${FILESDIR}"/${PN}-8.41-fix-stack-size-detection.patch -) - -src_prepare() { - default - sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die - elibtoolize -} - -multilib_src_configure() { - local myeconfargs=( - --with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) - $(multilib_native_use_enable bzip2 pcregrep-libbz2) - $(use_enable cxx cpp) - $(use_enable jit) - $(use_enable jit pcregrep-jit) - $(use_enable pcre16) - $(use_enable pcre32) - $(multilib_native_use_enable libedit pcretest-libedit) - $(multilib_native_use_enable readline pcretest-libreadline) - $(use_enable static-libs static) - $(use_enable unicode utf) - $(use_enable unicode unicode-properties) - $(multilib_native_use_enable zlib pcregrep-libz) - --enable-pcre8 - --enable-shared - ) - 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 - gen_usr_ldscript -a pcre -} - -multilib_src_install_all() { - find "${ED}" -type f -name "*.la" -delete || die -} - -pkg_preinst() { - preserve_old_lib /$(get_libdir)/libpcre.so.0 -} - -pkg_postinst() { - preserve_old_lib_notify /$(get_libdir)/libpcre.so.0 -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45-r1.ebuild similarity index 83% rename from sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45-r1.ebuild index 78e4947fa8..18522d5343 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,8 +21,8 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline static-libs unicode zlib" REQUIRED_USE="readline? ( !libedit ) libedit? ( !readline )" @@ -52,7 +52,6 @@ src_prepare() { multilib_src_configure() { local myeconfargs=( - --with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) $(multilib_native_use_enable bzip2 pcregrep-libbz2) $(use_enable cxx cpp) $(use_enable jit) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/metadata.xml index 3572e85b8d..e7bcdb6d6d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/metadata.xml @@ -1,5 +1,5 @@ - + base-system@gentoo.org @@ -16,10 +16,6 @@ Add support for command line editing to pcretest, through sys-libs/readline. - - Limit match recursion to 8192; if disabled, the default limit is - used, which is the same as the match limit. - Add support for pcregrep command to search within gzip-compressed files (via sys-libs/zlib).