commit:     97280e34403f845e9f03084a2d722db935750a10
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  9 04:38:27 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 04:55:41 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97280e34

dev-libs/libpcre2: drop 10.42-r1, 10.42-r2, 10.43

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libpcre2/Manifest                         |  4 -
 .../files/libpcre2-10.43-fix-loong-sljit.patch     | 30 -------
 dev-libs/libpcre2/libpcre2-10.42-r1.ebuild         | 97 ----------------------
 dev-libs/libpcre2/libpcre2-10.42-r2.ebuild         | 96 ---------------------
 dev-libs/libpcre2/libpcre2-10.43.ebuild            | 96 ---------------------
 5 files changed, 323 deletions(-)

diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 44e0ea377ae5..586d26510d84 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,7 +1,3 @@
 DIST libpcre2-10.44-32bit-tests.patch.xz 7024 BLAKE2B 
d8de8443a9ec165aa3b57384518c8bba06ded1c3d07d03d1451db07f4df13ee2514d055d4a4771162923a9845ac4694dd588ccdc773f0f3d013d7377581fe8b4
 SHA512 
bf8724db31b8cbdc631904cfdbcd1b2e66efa31f958a8919de0f3f03e129410e64e1274d28d0406c70b8a8ef49c3ed47712368bf9fd9ba2d3203afe4d4b104b7
-DIST pcre2-10.42.tar.bz2 1799866 BLAKE2B 
40aa096745548c489a00ead87a191a4d24ecd924a5b8f00401c1273176de15ccb23510882467c8e2b5c1256b97db46fba5fcdfbd9f0d61d86a29d74bb4bca7a0
 SHA512 
72fbde87fecec3aa4b47225dd919ea1d55e97f2cbcf02aba26e5a0d3b1ffb58c25a80a9ef069eb99f9cf4e41ba9604ad06a7ec159870e1e875d86820e12256d3
-DIST pcre2-10.42.tar.bz2.sig 310 BLAKE2B 
2125d7e23f7e75847573e3caeb8d55da5d8e0df3d166bf8b638b998aebacaefb4e88df7e813d6977af2dc7d82c93b7179ad0043c4f46fc4e06d99d214b0b7fcf
 SHA512 
22ce3c7903835b1cf835ac6cfa725badecc982f1504382e62525c88307b2e3bd8951f2221fdd3d73920843e69f714b6df99fe741069e610f1f809087512a31f7
-DIST pcre2-10.43.tar.bz2 1905255 BLAKE2B 
f87f9f36dd6a806cdba1f077f51b53da2583f1898f83e41d594622b28ac8efbc1b2d122b752a9d6cd461fe0e3c7c85ee93358443df518a336da4ee9d72cca808
 SHA512 
8ac1520c32e9e5672404aaf6104e23c9ee5c3c28ad28ff101435599d813cbb20e0491a3fd34e012b4411b3e0366a4c6dfa3f02d093acaa6ff0ab25478bb7ade9
-DIST pcre2-10.43.tar.bz2.sig 310 BLAKE2B 
5625358ec542a2c808be852437ca47a4df005068759e35b95ba20a55e5d1647b0953df6684e24b6a9de1442c6d6784e45fb1665d48c904dda4ffa16154437c7d
 SHA512 
5edb16176ea4335ab1d35f1b77837c8b6b836f346e379e6b5762e1f4463cb3fb55557fee4dc6d0e9b2084766cdba727c9503830031bb92af91f9706e11389d81
 DIST pcre2-10.44.tar.bz2 1928086 BLAKE2B 
fb06228f8bdc5906ef4f19d7d677f1009070855149d9ad3f807cfcd164f5cb6165f96e074fedc3942226d4b29edf4b29fab6cde2f2ba58bf6da282730941412b
 SHA512 
ee91cc10a2962bc7818b03d368df3dd31f42ea9a7260ae51483ea8cd331b7431e36e63256b0adc213cc6d6741e7c90414fd420622308c0ae3fcb5dd878591be2
 DIST pcre2-10.44.tar.bz2.sig 310 BLAKE2B 
a03943d4b04af319ca18992188c9fdd089fc20ef35207b09f2c859ab0090401a9bc140c653ee68a542984d26c0ec59f3ba72b0f9a9d6b3ae322b0823a440a21c
 SHA512 
12dca6fb6ac3dbbe9e3625214b333d20d4ece4c2efa73ada292b178b17ea3640b4f068f2b4da2bea15f5368213e123837dea4e988170d1c6bf5b7afe04b3f8bc

diff --git a/dev-libs/libpcre2/files/libpcre2-10.43-fix-loong-sljit.patch 
b/dev-libs/libpcre2/files/libpcre2-10.43-fix-loong-sljit.patch
deleted file mode 100644
index 30fe49410bd5..000000000000
--- a/dev-libs/libpcre2/files/libpcre2-10.43-fix-loong-sljit.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://github.com/zherczeg/sljit/commit/7a821cd714d132e46e748275a80d402beea24764
-with file path adjusted to libpcre2 layout
-
-From: lrzlin <[email protected]>
-Date: Wed, 10 Jan 2024 07:13:55 +0800
-Subject: [PATCH] Add LoongArch float to integer conversion special cases
- (#226)
-
---- a/src/sljit/sljitConfigInternal.h
-+++ b/src/sljit/sljitConfigInternal.h
-@@ -198,7 +198,7 @@ extern "C" {
- /* Type of public API functions. */
- /*********************************/
- 
--#ifndef SLJIT_API_FUNC_ATTRIBUTE 
-+#ifndef SLJIT_API_FUNC_ATTRIBUTE
- #if (defined SLJIT_CONFIG_STATIC && SLJIT_CONFIG_STATIC)
- /* Static ABI functions. For all-in-one programs. */
- 
-@@ -399,6 +399,10 @@ typedef double sljit_f64;
- #define SLJIT_CONV_MAX_FLOAT SLJIT_CONV_RESULT_MAX_INT
- #define SLJIT_CONV_MIN_FLOAT SLJIT_CONV_RESULT_MIN_INT
- #define SLJIT_CONV_NAN_FLOAT SLJIT_CONV_RESULT_MIN_INT
-+#elif (defined SLJIT_CONFIG_LOONGARCH && SLJIT_CONFIG_LOONGARCH)
-+#define SLJIT_CONV_MAX_FLOAT SLJIT_CONV_RESULT_MAX_INT
-+#define SLJIT_CONV_MIN_FLOAT SLJIT_CONV_RESULT_MIN_INT
-+#define SLJIT_CONV_NAN_FLOAT SLJIT_CONV_RESULT_ZERO
- #else
- #error "Result for float to integer conversion is not defined"
- #endif

diff --git a/dev-libs/libpcre2/libpcre2-10.42-r1.ebuild 
b/dev-libs/libpcre2/libpcre2-10.42-r1.ebuild
deleted file mode 100644
index 7a0d032915a5..000000000000
--- a/dev-libs/libpcre2/libpcre2-10.42-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/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/PCRE2Project/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 ~loong ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos 
~x64-solaris"
-IUSE="bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode 
valgrind zlib"
-REQUIRED_USE="?? ( libedit readline )"
-
-RDEPEND="
-       bzip2? ( app-arch/bzip2 )
-       libedit? ( dev-libs/libedit )
-       readline? ( sys-libs/readline:= )
-       zlib? ( sys-libs/zlib )
-"
-DEPEND="
-       ${RDEPEND}
-       valgrind? ( dev-debug/valgrind )
-"
-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 valgrind)
-               $(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 pcre2-8
-}
-
-multilib_src_install_all() {
-       find "${ED}" -type f -name "*.la" -delete || die
-}

diff --git a/dev-libs/libpcre2/libpcre2-10.42-r2.ebuild 
b/dev-libs/libpcre2/libpcre2-10.42-r2.ebuild
deleted file mode 100644
index 020533611b16..000000000000
--- a/dev-libs/libpcre2/libpcre2-10.42-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/philiphazel.asc
-inherit libtool multilib-minimal 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/PCRE2Project/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 ~loong ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos 
~x64-solaris"
-IUSE="bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode 
valgrind zlib"
-REQUIRED_USE="?? ( libedit readline )"
-
-RDEPEND="
-       bzip2? ( app-arch/bzip2 )
-       libedit? ( dev-libs/libedit )
-       readline? ( sys-libs/readline:= )
-       zlib? ( sys-libs/zlib )
-"
-DEPEND="
-       ${RDEPEND}
-       valgrind? ( dev-debug/valgrind )
-"
-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 valgrind)
-               $(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_src_install_all() {
-       find "${ED}" -type f -name "*.la" -delete || die
-}

diff --git a/dev-libs/libpcre2/libpcre2-10.43.ebuild 
b/dev-libs/libpcre2/libpcre2-10.43.ebuild
deleted file mode 100644
index 65eaa84b3ca7..000000000000
--- a/dev-libs/libpcre2/libpcre2-10.43.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/philiphazel.asc
-inherit libtool multilib-minimal verify-sig
-
-MY_P="pcre2-${PV/_rc/-RC}"
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="https://www.pcre.org/";
-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/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2.sig
 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0/3" # libpcre2-posix.so version
-if [[ ${PV} != *_rc* ]] ; then
-       KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
-fi
-IUSE="bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode 
valgrind zlib"
-REQUIRED_USE="?? ( libedit readline )"
-
-RDEPEND="
-       bzip2? ( app-arch/bzip2 )
-       libedit? ( dev-libs/libedit )
-       readline? ( sys-libs/readline:= )
-       zlib? ( sys-libs/zlib )
-"
-DEPEND="
-       ${RDEPEND}
-       valgrind? ( dev-debug/valgrind )
-"
-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}"/${PN}-10.43-fix-loong-sljit.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 valgrind)
-               $(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_src_install_all() {
-       find "${ED}" -type f -name "*.la" -delete || die
-}

Reply via email to