From b2c59335bfbeb25c5644f32172e1e9b23c447710 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 22 Dec 2022 01:55:45 +0000 Subject: gentoo auto-resync : 22:12:2022 - 01:55:45 --- dev-libs/libpcre2/Manifest | 2 - .../files/libpcre2-10.41-pcre2posix-header.patch | 66 ------------- dev-libs/libpcre2/libpcre2-10.40.ebuild | 105 --------------------- 3 files changed, 173 deletions(-) delete mode 100644 dev-libs/libpcre2/files/libpcre2-10.41-pcre2posix-header.patch delete mode 100644 dev-libs/libpcre2/libpcre2-10.40.ebuild (limited to 'dev-libs/libpcre2') diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest index b30bd5cdf253..9fd0c894b75c 100644 --- a/dev-libs/libpcre2/Manifest +++ b/dev-libs/libpcre2/Manifest @@ -1,11 +1,9 @@ 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 DIST pcre2-10.42.tar.bz2 1799866 BLAKE2B 40aa096745548c489a00ead87a191a4d24ecd924a5b8f00401c1273176de15ccb23510882467c8e2b5c1256b97db46fba5fcdfbd9f0d61d86a29d74bb4bca7a0 SHA512 72fbde87fecec3aa4b47225dd919ea1d55e97f2cbcf02aba26e5a0d3b1ffb58c25a80a9ef069eb99f9cf4e41ba9604ad06a7ec159870e1e875d86820e12256d3 DIST pcre2-10.42.tar.bz2.sig 310 BLAKE2B 2125d7e23f7e75847573e3caeb8d55da5d8e0df3d166bf8b638b998aebacaefb4e88df7e813d6977af2dc7d82c93b7179ad0043c4f46fc4e06d99d214b0b7fcf SHA512 22ce3c7903835b1cf835ac6cfa725badecc982f1504382e62525c88307b2e3bd8951f2221fdd3d73920843e69f714b6df99fe741069e610f1f809087512a31f7 EBUILD libpcre2-10.40-r1.ebuild 3010 BLAKE2B 7391fc976105cb55cc07d8c093828e7cddd9f74d3f2b02748a76e87f96fbd7c2a7a7b8e768a854d954c5a397b52e8622c11f6e67686236603442fc0089d0faf5 SHA512 89bc748ae8b671f84bd36a092a45d37a1d3dd592b50fb5d6c14e917b3082c33fc2706c6114e822e796da400888dbc9814faf8529a101fd62a8a29cd3eac94497 -EBUILD libpcre2-10.40.ebuild 2978 BLAKE2B 689d60aabd0b0278816571add95ddfe47b914d1bf7d55736ae8d0db8a46d7db788c3c61df5eae827f1eaec54389cb5d6dd0ff6e0bd2941f4a2405cb76b422cc4 SHA512 375fca4b0b11d8aba628e0ce86d87c3f7bb3b99faf63b63364eb9efc6a04910db2f11b216368456aaeb0143f0fbd64ea1e59f8061e12dfd53260172f9f6b169d EBUILD libpcre2-10.42.ebuild 2519 BLAKE2B ac1d2b94be05e75900ada4cf0699bc337c088b0c957f73a3153d8981d07845d42c980dedd667b690ab98d8337c4d96d4242df113f2aab32040255cef59cf39ca SHA512 ba0a5b627e13952de6eb996e7b56057b48d89403c25488af841cf8aa61760ede3a3f91428fb72a2c6dde89cabfea8cc930564675121376f07c59d36edc6ae553 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 deleted file mode 100644 index 12d8bb609329..000000000000 --- a/dev-libs/libpcre2/files/libpcre2-10.41-pcre2posix-header.patch +++ /dev/null @@ -1,66 +0,0 @@ -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.40.ebuild b/dev-libs/libpcre2/libpcre2-10.40.ebuild deleted file mode 100644 index fb332ff04d3b..000000000000 --- a/dev-libs/libpcre2/libpcre2-10.40.ebuild +++ /dev/null @@ -1,105 +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 - -PATCH_SET="${PN}-10.36-patchset-01.tar.xz" -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/PhilipHazel/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 - -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 - -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 -) - -src_unpack() { - if use verify-sig ; then - # Needed for downloaded patch (which is unsigned, which is fine) - verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.bz2{,.sig} - fi - - default -} - -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_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