From 3606ceecb950b302a6ba2a9882aeeff2a851e5dc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 9 Dec 2022 21:18:42 +0000 Subject: gentoo auto-resync : 09:12:2022 - 21:18:42 --- dev-libs/Manifest.gz | Bin 95843 -> 95841 bytes dev-libs/libpcre2/Manifest | 3 +- .../files/libpcre2-10.41-pcre2posix-header.patch | 66 +++++++++++++++ dev-libs/libpcre2/libpcre2-10.41-r1.ebuild | 94 +++++++++++++++++++++ dev-libs/libpcre2/libpcre2-10.41.ebuild | 93 -------------------- 5 files changed, 162 insertions(+), 94 deletions(-) create mode 100644 dev-libs/libpcre2/files/libpcre2-10.41-pcre2posix-header.patch create mode 100644 dev-libs/libpcre2/libpcre2-10.41-r1.ebuild delete mode 100644 dev-libs/libpcre2/libpcre2-10.41.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index e2cc740509bf..0baa4ef1e92d 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest index f69c101a190e..3446fff309e0 100644 --- a/dev-libs/libpcre2/Manifest +++ b/dev-libs/libpcre2/Manifest @@ -1,4 +1,5 @@ AUX libpcre2-10.10-000-Fix-multilib.patch 726 BLAKE2B 4f4c0db0f6a8a10851fa80ac6066f0b85031cbb5a55c29003cd9dd98364f32c679e66a5f905dc7713e15c85807da55fef5d1143d725c0aaf8d897a0b86d31e27 SHA512 aa3dc3148808d0e856e7d8c608342bd91b515e9924fefcfe1eec14af98ec4d6d194c0aedd559b2617145985376ca7496362a4e04c0bc35fe40983e8122c961d6 +AUX libpcre2-10.41-pcre2posix-header.patch 2719 BLAKE2B 38b47ebc780ba24ab8a5bbe8a51d4e39872407c29a4577f1b7d6c38ff9c06af6ad93733ff48533e83fe974e4fd0953d2e8bb9fb420198b02617f8cc23c1cb1e1 SHA512 9ae27f24e0282ec88101ef516a5d8e708d821c67d6e9b5ed4986dfc269ea45bce51c8edd5dfd01c1207884228253e1674d6305204d675c3fb1a255f36a1e4a29 DIST libpcre2-10.36-patchset-01.tar.xz 1364 BLAKE2B bfef3c876a092e06972107b44794c23b758a030181f3040c8b722db166789eac794783169b468fc71334fd660bc2f1c31422a8cb8e5bdc18a69b72654b1b59b2 SHA512 04324d1efa6d155fa3ffbc328638e4674bea305fef7f57d4369ab4a6399a0f489b4c0ecfb49643feff310d91872e1673e965c48a5c60f1bf54a319f0d275c306 DIST pcre2-10.40.tar.bz2 1765440 BLAKE2B 627a204585b92238eda81b4befc88757a81d75b0d9fa26ea6d51afcdd93f7e2d102a2245bf3c8e1f5f9ddf69a316c419c948b741a64442bb567480015543e49b SHA512 00e7b48a6554b9127cb6fe24c5cacf72783416a9754ec88f62f73c52f46ed72c86c1869e62c91a31b2ff2cbafbbedabca44b3f1eb7670bc92f49d8401c7374e8 DIST pcre2-10.40.tar.bz2.sig 310 BLAKE2B 9609111a64b66893b12e36d1cbc77b64d6a0cc30b9288e52753785ddcab37cc3e169d0f117d94e4ad7d7ff897a6ba0a574c9a2e529c3c7e171f5a1bc6f64fe23 SHA512 faa4b47fdac1543cd323651f251b8abb94b31b5966b42d445b8cbb38c441df4742e3c3517c2bc6c0a4464e9fb5feab5d5beda1250a03d56bec2d8383be2f63ab @@ -6,5 +7,5 @@ DIST pcre2-10.41.tar.bz2 1799126 BLAKE2B 4335eae8e8a327c32092a1a9f8214fa86a2d016 DIST pcre2-10.41.tar.bz2.sig 310 BLAKE2B 4ee3f9327bf568e38d1c072a4be93cdab4209e7b0cc0d183b978553cd7413ba9f292318ddf815cf44bc24872f685ee4ff9bceddd7d0e915b7be67c43fd8bf8f7 SHA512 4127258f17011be7c82d9412728863a9121c5b780514ec836769ab64ccd4cd5349a84fc85b8fdc4abb2e6fe08f4610b2a3e926116e7f1451d90d9afaa888661c EBUILD libpcre2-10.40-r1.ebuild 3018 BLAKE2B a665bd650956f6fc81932f9cda52796832db7fead4fd1ff1c0be900898af573a1eaa7b8305600e2aa27d019c4c13b34b6c306e47d63136f55d53b9ed206bcf89 SHA512 43c58d18ab5e4762ca0124acf45a70a8d04b2ad9d57259043950915cdef04e21568c5b32c167c63cf6a808d4b1b15ff72263e5d89c80d3e5fef7b704a1915789 EBUILD libpcre2-10.40.ebuild 2978 BLAKE2B 689d60aabd0b0278816571add95ddfe47b914d1bf7d55736ae8d0db8a46d7db788c3c61df5eae827f1eaec54389cb5d6dd0ff6e0bd2941f4a2405cb76b422cc4 SHA512 375fca4b0b11d8aba628e0ce86d87c3f7bb3b99faf63b63364eb9efc6a04910db2f11b216368456aaeb0143f0fbd64ea1e59f8061e12dfd53260172f9f6b169d -EBUILD libpcre2-10.41.ebuild 2519 BLAKE2B ac1d2b94be05e75900ada4cf0699bc337c088b0c957f73a3153d8981d07845d42c980dedd667b690ab98d8337c4d96d4242df113f2aab32040255cef59cf39ca SHA512 ba0a5b627e13952de6eb996e7b56057b48d89403c25488af841cf8aa61760ede3a3f91428fb72a2c6dde89cabfea8cc930564675121376f07c59d36edc6ae553 +EBUILD libpcre2-10.41-r1.ebuild 2563 BLAKE2B b1722855587ab47629c620afd00ebd6b694193326885f8c26000a563080976957bc4e4f201ac3cebb60025bf54333b52128afe4ab4fee4fe7d197c971d51d777 SHA512 5d150ef1a6d8b6ea74c936d89972456e191df80c5d6645548c2a11ff7ff64a0ec3a5e46ce73565249ffa611754bd64d77cd3f2287f8b5811474f59bd491a486e MISC metadata.xml 1087 BLAKE2B 693e7f9a4d9cac7b2aa5f24804826f79135a0475770b8ef5058b09542c3b19d30ddef438029dc0358b997ebc032ab103432b1274723c81882f1b5359455c765a SHA512 74dcb822827b8cc3e86c525ab3e2ee302d39ee00d5b4515f9fd6f4a157ae1522a2edbd08b97c2950d9370878f41eb59e414a145d6beae430dab57ea10df68460 diff --git a/dev-libs/libpcre2/files/libpcre2-10.41-pcre2posix-header.patch b/dev-libs/libpcre2/files/libpcre2-10.41-pcre2posix-header.patch new file mode 100644 index 000000000000..12d8bb609329 --- /dev/null +++ b/dev-libs/libpcre2/files/libpcre2-10.41-pcre2posix-header.patch @@ -0,0 +1,66 @@ +https://github.com/PCRE2Project/pcre2/commit/cd8dc40b901bdedf5bcc0b3acdd9eede16802f39 +https://github.com/PCRE2Project/pcre2/issues/173 +https://bugs.gentoo.org/884705 + +From cd8dc40b901bdedf5bcc0b3acdd9eede16802f39 Mon Sep 17 00:00:00 2001 +From: Philip Hazel +Date: Fri, 9 Dec 2022 09:40:52 +0000 +Subject: [PATCH] Move default of PCRE2_CALL_CONVENTION from pcre2posix.c to + pcre2posix.h + +--- a/src/pcre2posix.c ++++ b/src/pcre2posix.c +@@ -92,20 +92,6 @@ changed. This #define is a copy of the one in pcre2_internal.h. */ + #include "pcre2.h" + #include "pcre2posix.h" + +-/* When compiling with the MSVC compiler, it is sometimes necessary to include +-a "calling convention" before exported function names. (This is secondhand +-information; I know nothing about MSVC myself). For example, something like +- +- void __cdecl function(....) +- +-might be needed. In order to make this easy, all the exported functions have +-PCRE2_CALL_CONVENTION just before their names. It is rarely needed; if not +-set, we ensure here that it has no effect. */ +- +-#ifndef PCRE2_CALL_CONVENTION +-#define PCRE2_CALL_CONVENTION +-#endif +- + /* Table to translate PCRE2 compile time error codes into POSIX error codes. + Only a few PCRE2 errors with a value greater than 23 turn into special POSIX + codes: most go to REG_BADPAT. The second table lists, in pairs, those that +--- a/src/pcre2posix.h ++++ b/src/pcre2posix.h +@@ -9,7 +9,7 @@ POSIX wrapper interface. + + Written by Philip Hazel + Original API code Copyright (c) 1997-2012 University of Cambridge +- New API code Copyright (c) 2016-2019 University of Cambridge ++ New API code Copyright (c) 2016-2022 University of Cambridge + + ----------------------------------------------------------------------------- + Redistribution and use in source and binary forms, with or without +@@ -116,6 +116,20 @@ typedef struct { + regoff_t rm_eo; + } regmatch_t; + ++/* When compiling with the MSVC compiler, it is sometimes necessary to include ++a "calling convention" before exported function names. (This is secondhand ++information; I know nothing about MSVC myself). For example, something like ++ ++ void __cdecl function(....) ++ ++might be needed. In order to make this easy, all the exported functions have ++PCRE2_CALL_CONVENTION just before their names. It is rarely needed; if not ++set, we ensure here that it has no effect. */ ++ ++#ifndef PCRE2_CALL_CONVENTION ++#define PCRE2_CALL_CONVENTION ++#endif ++ + /* When an application links to a PCRE2 DLL in Windows, the symbols that are + imported have to be identified as such. When building PCRE2, the appropriate + export settings are needed, and are set in pcre2posix.c before including this + diff --git a/dev-libs/libpcre2/libpcre2-10.41-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.41-r1.ebuild new file mode 100644 index 000000000000..e4703e3a15ea --- /dev/null +++ b/dev-libs/libpcre2/libpcre2-10.41-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/philiphazel.asc +inherit libtool multilib-minimal usr-ldscript verify-sig + +MY_P="pcre2-${PV/_rc/-RC}" + +DESCRIPTION="Perl-compatible regular expression library" +HOMEPAGE="https://www.pcre.org/" +if [[ ${PV} != *_rc* ]] ; then + # Only the final releases are available here. + SRC_URI="https://github.com/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2 + https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2 + verify-sig? ( https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2.sig )" +else + SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2" +fi + +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD" +SLOT="0/3" # libpcre2-posix.so version +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" +IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib" +REQUIRED_USE="?? ( libedit readline )" + +RDEPEND=" + bzip2? ( app-arch/bzip2 ) + libedit? ( dev-libs/libedit ) + readline? ( sys-libs/readline:= ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-philiphazel ) +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/pcre2-config +) + +PATCHES=( + "${FILESDIR}"/${PN}-10.10-000-Fix-multilib.patch + "${FILESDIR}"/${P}-pcre2posix-header.patch +) + +src_prepare() { + 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_test() { + emake check VERBOSE=yes +} + +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.41.ebuild b/dev-libs/libpcre2/libpcre2-10.41.ebuild deleted file mode 100644 index c8948edf597e..000000000000 --- a/dev-libs/libpcre2/libpcre2-10.41.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/philiphazel.asc -inherit libtool multilib-minimal usr-ldscript verify-sig - -MY_P="pcre2-${PV/_rc/-RC}" - -DESCRIPTION="Perl-compatible regular expression library" -HOMEPAGE="https://www.pcre.org/" -if [[ ${PV} != *_rc* ]] ; then - # Only the final releases are available here. - SRC_URI="https://github.com/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2 - https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2 - verify-sig? ( https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2.sig )" -else - SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2" -fi - -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD" -SLOT="0/3" # libpcre2-posix.so version -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" -IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib" -REQUIRED_USE="?? ( libedit readline )" - -RDEPEND=" - bzip2? ( app-arch/bzip2 ) - libedit? ( dev-libs/libedit ) - readline? ( sys-libs/readline:= ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - verify-sig? ( sec-keys/openpgp-keys-philiphazel ) -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/pcre2-config -) - -PATCHES=( - "${FILESDIR}"/${PN}-10.10-000-Fix-multilib.patch -) - -src_prepare() { - 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_test() { - emake check VERBOSE=yes -} - -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 -} -- cgit v1.2.3