From 401101f9c8077911929d3f2b60a37098460a5d89 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Mar 2022 23:59:54 +0000 Subject: gentoo resync : 25.03.2022 --- dev-libs/libpcre2/Manifest | 11 +-- .../libpcre2/files/libpcre2-10.37-jit_fixes.patch | 80 ------------------ ...of-alternatives-in-first-character-search.patch | 49 ----------- dev-libs/libpcre2/libpcre2-10.37-r2.ebuild | 97 ---------------------- dev-libs/libpcre2/libpcre2-10.38-r1.ebuild | 96 --------------------- dev-libs/libpcre2/libpcre2-10.38.ebuild | 94 --------------------- dev-libs/libpcre2/libpcre2-10.39-r1.ebuild | 93 +++++++++++++++++++++ dev-libs/libpcre2/libpcre2-10.39.ebuild | 94 --------------------- dev-libs/libpcre2/metadata.xml | 4 - 9 files changed, 95 insertions(+), 523 deletions(-) delete mode 100644 dev-libs/libpcre2/files/libpcre2-10.37-jit_fixes.patch delete mode 100644 dev-libs/libpcre2/files/libpcre2-10.38-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch delete mode 100644 dev-libs/libpcre2/libpcre2-10.37-r2.ebuild delete mode 100644 dev-libs/libpcre2/libpcre2-10.38-r1.ebuild delete mode 100644 dev-libs/libpcre2/libpcre2-10.38.ebuild create mode 100644 dev-libs/libpcre2/libpcre2-10.39-r1.ebuild delete mode 100644 dev-libs/libpcre2/libpcre2-10.39.ebuild (limited to 'dev-libs/libpcre2') diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest index 8001cec37c52..1daeb333af5c 100644 --- a/dev-libs/libpcre2/Manifest +++ b/dev-libs/libpcre2/Manifest @@ -1,11 +1,4 @@ -AUX libpcre2-10.37-jit_fixes.patch 3022 BLAKE2B 7e3091cc46d60ec3c72981f1980f7ebcfaeecc1c777188bed0edbaa64205752fcd69164ebf5de670f857f4837a76593c1930cdfe7997b49b38dc1501d7e5cbec SHA512 b691357b43032be0e97234a7fb27b4bdb684028acd4e2bc3da9a997ba823e8ffc9eca1d32fb5c3bc5700b7504ad16f83aa0f6e486c869e529cdbfa597024ad70 -AUX libpcre2-10.38-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch 1501 BLAKE2B cfddc2a8f4ae40e01d18c4f8e19b2810461b49e587dc2483fdc9b712ff4f7dd907b1690663180e480ff794bc9404ce4acbe22585c15a9f5852d116ab629f47e2 SHA512 1b6738f97425b4c397c85a6e254d5c37e17d7327afd8d62e11c565667bfb874a6ddceca8cab01bcc21a397a040b4e7fbaca3ef890569c4a9a207510425207edd DIST libpcre2-10.36-patchset-01.tar.xz 1364 BLAKE2B bfef3c876a092e06972107b44794c23b758a030181f3040c8b722db166789eac794783169b468fc71334fd660bc2f1c31422a8cb8e5bdc18a69b72654b1b59b2 SHA512 04324d1efa6d155fa3ffbc328638e4674bea305fef7f57d4369ab4a6399a0f489b4c0ecfb49643feff310d91872e1673e965c48a5c60f1bf54a319f0d275c306 -DIST pcre2-10.37.tar.bz2 1729384 BLAKE2B b4e56041010d7f44e84a63a17b35e87329d258107d8b27ccead10f51e7deacc93cbee64a22c71b9f0b8f244920b3a22fa4d9b786ec441a428e0ad0bb8535773e SHA512 69f4bf4736b986e0fc855eedb292efe72a0df2e803bc0e61a6cf47775eed433bb1b2f28d7e641591ef4603d47beb543a64ed0eef9538d00f0746bc3435c143ec -DIST pcre2-10.38.tar.bz2 1729078 BLAKE2B 9438ff2422afaa83d5a4b2e64d5897068c35add28d66956431f9937191416d6df4903ecf35af72c788480d7def08e0ce17922e9b036698ce1bbe6cacbb799df2 SHA512 3634cb2db6ccba9720c1b69890bcd9eb7057f6a6cb6981f12b3f2d6b2bb4e75e4e5014f566045f9ba1b79edf01fa5c4d81eb333727b9462e843dfb70f3a58f95 DIST pcre2-10.39.tar.bz2 1730729 BLAKE2B 9ee01ac2704e9cb7a107d402fa0c32828fc66425b62270f6891667bde5fb00c1e779c9730df3522acbd62d11703343bf48265050c09d3754183de314baf7cddd SHA512 b3d898198f4b5ffc3453d2ba56fe2a7298c01c52e5f67d45f1e046fc0dee62e16a4024fcb65839ac9c367beedb531647affd6f8599fbeb102f19423c150d80d4 -EBUILD libpcre2-10.37-r2.ebuild 2593 BLAKE2B 02943bf2282ad9e35e8a70589c16a2f695c1be786b008307e2e4c5c1c597e56b3d830b12b05cac3dc4aa7c1ee39d6d4a60a8c094a6019e20817246b40f00c357 SHA512 365ab860ba70c2bd594ebe668bd86e03feaa97819875393c4e7011c3440c4aa9423e202194d4ecfc2bc07a501163202aad0360b91232824510dbb6bf2754edfa -EBUILD libpcre2-10.38-r1.ebuild 2741 BLAKE2B 7528c16f246064358d84688aa99a143a25d8d73bd8628a95243c550ae6ec286f13c9a152fbc339d6207d3909dcf27e4238b45b794f06ce1f86c20f2a1f9fed9c SHA512 a9a724109d5d394d6d0bfafda9c3639cd0aac027f8f06024d75859ab1f5a4a84f51300a0acc2134ce0090466a7db221abda1f79a2f5b7e446dc4681113771a04 -EBUILD libpcre2-10.38.ebuild 2633 BLAKE2B 93310ef1b7076161de129898f87949e02a2787e573b5ae66d32036af3a545f86dd4e69d13ccf01c9ac034696ba4d413afe9da21f16956be4bab3a4ddaabb8711 SHA512 69e5a4dde785bb82494e07997d81eaab5f034ff599e2f25c6a54b52165999b40449b0a44ef98f162435e577ecede96826828782e74a3e037357dbeb290e7db9e -EBUILD libpcre2-10.39.ebuild 2625 BLAKE2B 146eede56bb7521075d410a002a8259903777bb66d5b43194b422e8e0b091dac30511c3584c07648f9b14a809375847efbc526ce264fdd5a87788b36fefe2012 SHA512 14f10cb68a3cad05cc7850ad0bf9f9758f3fc583af44a869f9dbcea78981f561e0be3a1c745b195f6627da0a35065512ccb4edc3878fbacb65c3908b335ce766 -MISC metadata.xml 1236 BLAKE2B 4a7361d870b4cbbdf16cec3dabd66e5f161b5c9dc17c4db1972e99ed739f2f17dbbdea2b9828991137e7cf8db93c87ceb4b2b8b617174979d0a6d6d827e0537b SHA512 57d2fd0a8b3d98dd2d1d40cf4934bf1202c812b9c2a44802a6ca2960e174dc71471ef9fb5f1baed48432ca956a6572f4313fbec5e83f4557f9634e78f2f2a465 +EBUILD libpcre2-10.39-r1.ebuild 2540 BLAKE2B 9ade286d148d36182f0c31efdd8fe0bba41cca7768d101c1d3007e5c03cb54e05e839462466f4c79377cab34aaff16bca51bc88f3470ddda4061b0a5838278dc SHA512 a78040e5a5a60df14c9e8aa13222f39fcae851d6180c775d34c99f9ce21129b642b3af0627398ca345ba62f9ba9b54ec12dc6707fd3ba244706a4e78b5583ca1 +MISC metadata.xml 1079 BLAKE2B a7d0068409819b13a8216b72b4cbf4241db6ff180e3b0f13cdce8c669cdc4f8be156ad6020b854df349e4ffc4166a8119c582e4d0b90d93a09bade43fa8a1273 SHA512 ad273d7f89ed478186714d388b555b163f6424a9651c6673aa5bc89dc81f602a4add30cf22d8481b70eb079c71cf4d15746a15d6e4ba8ac483e5408aa3415927 diff --git a/dev-libs/libpcre2/files/libpcre2-10.37-jit_fixes.patch b/dev-libs/libpcre2/files/libpcre2-10.37-jit_fixes.patch deleted file mode 100644 index 6ee5494f2bc5..000000000000 --- a/dev-libs/libpcre2/files/libpcre2-10.37-jit_fixes.patch +++ /dev/null @@ -1,80 +0,0 @@ -Index: pcre2/ChangeLog -=================================================================== ---- pcre2/ChangeLog (revision 1314) -+++ pcre2/ChangeLog (revision 1315) -@@ -1,7 +1,14 @@ - Change Log for PCRE2 - -------------------- - -+Version 10.38-RC1 xx-xxx-2021 -+----------------------------- - -+1. Fix invalid single character repetition issues in JIT when the repetition -+is inside a capturing bracket and the bracket is preceeded by character -+literals. -+ -+ - Version 10.37 26-May-2021 - ------------------------- - -Index: pcre2/src/pcre2_jit_compile.c -=================================================================== ---- pcre2/src/pcre2_jit_compile.c (revision 1314) -+++ pcre2/src/pcre2_jit_compile.c (revision 1315) -@@ -1236,15 +1236,16 @@ - - return: current number of iterators enhanced with fast fail - */ --static int detect_early_fail(compiler_common *common, PCRE2_SPTR cc, int *private_data_start, sljit_s32 depth, int start) -+static int detect_early_fail(compiler_common *common, PCRE2_SPTR cc, int *private_data_start, -+ sljit_s32 depth, int start, BOOL fast_forward_allowed) - { - PCRE2_SPTR begin = cc; - PCRE2_SPTR next_alt; - PCRE2_SPTR end; - PCRE2_SPTR accelerated_start; -+BOOL prev_fast_forward_allowed; - int result = 0; - int count; --BOOL fast_forward_allowed = TRUE; - - SLJIT_ASSERT(*cc == OP_ONCE || *cc == OP_BRA || *cc == OP_CBRA); - SLJIT_ASSERT(*cc != OP_CBRA || common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] != 0); -@@ -1476,6 +1477,7 @@ - case OP_CBRA: - end = cc + GET(cc, 1); - -+ prev_fast_forward_allowed = fast_forward_allowed; - fast_forward_allowed = FALSE; - if (depth >= 4) - break; -@@ -1484,7 +1486,7 @@ - if (*end != OP_KET || (*cc == OP_CBRA && common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0)) - break; - -- count = detect_early_fail(common, cc, private_data_start, depth + 1, count); -+ count = detect_early_fail(common, cc, private_data_start, depth + 1, count, prev_fast_forward_allowed); - - if (PRIVATE_DATA(cc) != 0) - common->private_data_ptrs[begin - common->start] = 1; -@@ -13657,7 +13659,7 @@ - private_data_size = common->cbra_ptr + (re->top_bracket + 1) * sizeof(sljit_sw); - - if ((re->overall_options & PCRE2_ANCHORED) == 0 && (re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0 && !common->has_skip_in_assert_back) -- detect_early_fail(common, common->start, &private_data_size, 0, 0); -+ detect_early_fail(common, common->start, &private_data_size, 0, 0, TRUE); - - set_private_data_ptrs(common, &private_data_size, ccend); - -Index: pcre2/src/pcre2_jit_test.c -=================================================================== ---- pcre2/src/pcre2_jit_test.c (revision 1314) -+++ pcre2/src/pcre2_jit_test.c (revision 1315) -@@ -351,6 +351,7 @@ - { MU, A, 0, 0, ".[ab]*a", "xxa" }, - { MU, A, 0, 0, ".[ab]?.", "xx" }, - { MU, A, 0, 0, "_[ab]+_*a", "_aa" }, -+ { MU, A, 0, 0, "#(A+)#\\d+", "#A#A#0" }, - - /* Bracket repeats with limit. */ - { MU, A, 0, 0, "(?:(ab){2}){5}M", "abababababababababababM" }, diff --git a/dev-libs/libpcre2/files/libpcre2-10.38-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch b/dev-libs/libpcre2/files/libpcre2-10.38-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch deleted file mode 100644 index 936bd057a0e9..000000000000 --- a/dev-libs/libpcre2/files/libpcre2-10.38-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch +++ /dev/null @@ -1,49 +0,0 @@ -https://github.com/PhilipHazel/pcre2/pull/22 - ---- a/src/pcre2_jit_compile.c -+++ b/src/pcre2_jit_compile.c -@@ -1251,10 +1251,13 @@ SLJIT_ASSERT(*cc == OP_ONCE || *cc == OP_BRA || *cc == OP_CBRA); - SLJIT_ASSERT(*cc != OP_CBRA || common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] != 0); - SLJIT_ASSERT(start < EARLY_FAIL_ENHANCE_MAX); - -+next_alt = cc + GET(cc, 1); -+if (*next_alt == OP_ALT) -+ fast_forward_allowed = FALSE; -+ - do - { - count = start; -- next_alt = cc + GET(cc, 1); - cc += 1 + LINK_SIZE + ((*cc == OP_CBRA) ? IMM2_SIZE : 0); - - while (TRUE) -@@ -1512,7 +1515,7 @@ do - { - count++; - -- if (fast_forward_allowed && *next_alt == OP_KET) -+ if (fast_forward_allowed) - { - common->fast_forward_bc_ptr = accelerated_start; - common->private_data_ptrs[(accelerated_start + 1) - common->start] = ((*private_data_start) << 3) | type_skip; -@@ -1562,8 +1565,8 @@ do - else if (result < count) - result = count; - -- fast_forward_allowed = FALSE; - cc = next_alt; -+ next_alt = cc + GET(cc, 1); - } - while (*cc == OP_ALT); - ---- a/src/pcre2_jit_test.c -+++ b/src/pcre2_jit_test.c -@@ -352,6 +352,7 @@ static struct regression_test_case regression_test_cases[] = { - { MU, A, 0, 0, ".[ab]?.", "xx" }, - { MU, A, 0, 0, "_[ab]+_*a", "_aa" }, - { MU, A, 0, 0, "#(A+)#\\d+", "#A#A#0" }, -+ { MU, A, 0, 0, "(?P\\d+)m|M", "4M" }, - - /* Bracket repeats with limit. */ - { MU, A, 0, 0, "(?:(ab){2}){5}M", "abababababababababababM" }, - diff --git a/dev-libs/libpcre2/libpcre2-10.37-r2.ebuild b/dev-libs/libpcre2/libpcre2-10.37-r2.ebuild deleted file mode 100644 index abd807adeb95..000000000000 --- a/dev-libs/libpcre2/libpcre2-10.37-r2.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit libtool multilib-minimal usr-ldscript - -PATCH_SET="${PN}-10.36-patchset-01.tar.xz" - -DESCRIPTION="Perl-compatible regular expression library" -HOMEPAGE="https://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 - https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2" -else - SRC_URI="https://ftp.pcre.org/pub/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/3" # libpcre2-posix.so version -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" -IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" -REQUIRED_USE="?? ( libedit readline )" - -BDEPEND=" - virtual/pkgconfig -" -RDEPEND=" - bzip2? ( app-arch/bzip2 ) - libedit? ( dev-libs/libedit ) - readline? ( sys-libs/readline:0= ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${P}-jit_fixes.patch" -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/pcre2-config -) - -src_prepare() { - if [[ -d "${WORKDIR}/patches" ]] ; then - rm "${WORKDIR}"/patches/pcre2-10.36-001-issue2698.patch || die - eapply "${WORKDIR}"/patches - fi - - 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}" -type f -name "*.la" -delete || die -} diff --git a/dev-libs/libpcre2/libpcre2-10.38-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.38-r1.ebuild deleted file mode 100644 index 84077f8a1f3e..000000000000 --- a/dev-libs/libpcre2/libpcre2-10.38-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit libtool multilib-minimal usr-ldscript - -PATCH_SET="${PN}-10.36-patchset-01.tar.xz" - -DESCRIPTION="Perl-compatible regular expression library" -HOMEPAGE="https://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 - https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2 - https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2" -else - SRC_URI="https://ftp.pcre.org/pub/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/3" # libpcre2-posix.so version -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" -IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" -REQUIRED_USE="?? ( libedit readline )" - -BDEPEND=" - virtual/pkgconfig -" -RDEPEND=" - bzip2? ( app-arch/bzip2 ) - libedit? ( dev-libs/libedit ) - readline? ( sys-libs/readline:0= ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}"/${P}-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch ) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/pcre2-config -) - -src_prepare() { - if [[ -d "${WORKDIR}/patches" ]] ; then - rm "${WORKDIR}"/patches/pcre2-10.36-001-issue2698.patch || die - eapply "${WORKDIR}"/patches - fi - - 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}" -type f -name "*.la" -delete || die -} diff --git a/dev-libs/libpcre2/libpcre2-10.38.ebuild b/dev-libs/libpcre2/libpcre2-10.38.ebuild deleted file mode 100644 index 6f868c1cfe8e..000000000000 --- a/dev-libs/libpcre2/libpcre2-10.38.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit libtool multilib-minimal usr-ldscript - -PATCH_SET="${PN}-10.36-patchset-01.tar.xz" - -DESCRIPTION="Perl-compatible regular expression library" -HOMEPAGE="https://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 - https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2 - https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2" -else - SRC_URI="https://ftp.pcre.org/pub/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/3" # libpcre2-posix.so version -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" -IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" -REQUIRED_USE="?? ( libedit readline )" - -BDEPEND=" - virtual/pkgconfig -" -RDEPEND=" - bzip2? ( app-arch/bzip2 ) - libedit? ( dev-libs/libedit ) - readline? ( sys-libs/readline:0= ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/pcre2-config -) - -src_prepare() { - if [[ -d "${WORKDIR}/patches" ]] ; then - rm "${WORKDIR}"/patches/pcre2-10.36-001-issue2698.patch || die - eapply "${WORKDIR}"/patches - fi - - 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}" -type f -name "*.la" -delete || die -} diff --git a/dev-libs/libpcre2/libpcre2-10.39-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.39-r1.ebuild new file mode 100644 index 000000000000..6add5be7acd6 --- /dev/null +++ b/dev-libs/libpcre2/libpcre2-10.39-r1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit libtool multilib-minimal usr-ldscript + +PATCH_SET="${PN}-10.36-patchset-01.tar.xz" + +DESCRIPTION="Perl-compatible regular expression library" +HOMEPAGE="https://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 + https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2 + https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2" +else + SRC_URI="https://ftp.pcre.org/pub/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/3" # libpcre2-posix.so version +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" +IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib" +REQUIRED_USE="?? ( libedit readline )" + +BDEPEND=" + virtual/pkgconfig +" +RDEPEND=" + bzip2? ( app-arch/bzip2 ) + libedit? ( dev-libs/libedit ) + readline? ( sys-libs/readline:0= ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/pcre2-config +) + +src_prepare() { + if [[ -d "${WORKDIR}/patches" ]] ; then + rm "${WORKDIR}"/patches/pcre2-10.36-001-issue2698.patch || die + eapply "${WORKDIR}"/patches + fi + + default + + elibtoolize +} + +multilib_src_configure() { + local myeconfargs=( + --enable-pcre2-8 + --enable-shared + $(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}" -type f -name "*.la" -delete || die +} diff --git a/dev-libs/libpcre2/libpcre2-10.39.ebuild b/dev-libs/libpcre2/libpcre2-10.39.ebuild deleted file mode 100644 index 477a50daf57b..000000000000 --- a/dev-libs/libpcre2/libpcre2-10.39.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit libtool multilib-minimal usr-ldscript - -PATCH_SET="${PN}-10.36-patchset-01.tar.xz" - -DESCRIPTION="Perl-compatible regular expression library" -HOMEPAGE="https://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 - https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2 - https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2" -else - SRC_URI="https://ftp.pcre.org/pub/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/3" # libpcre2-posix.so version -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" -IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" -REQUIRED_USE="?? ( libedit readline )" - -BDEPEND=" - virtual/pkgconfig -" -RDEPEND=" - bzip2? ( app-arch/bzip2 ) - libedit? ( dev-libs/libedit ) - readline? ( sys-libs/readline:0= ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/pcre2-config -) - -src_prepare() { - if [[ -d "${WORKDIR}/patches" ]] ; then - rm "${WORKDIR}"/patches/pcre2-10.36-001-issue2698.patch || die - eapply "${WORKDIR}"/patches - fi - - 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}" -type f -name "*.la" -delete || die -} diff --git a/dev-libs/libpcre2/metadata.xml b/dev-libs/libpcre2/metadata.xml index 0d201299bdec..1f00cd29ae6b 100644 --- a/dev-libs/libpcre2/metadata.xml +++ b/dev-libs/libpcre2/metadata.xml @@ -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). -- cgit v1.2.3