gentoo auto-resync : 07:02:2024 - 03:59:02

3 files changed, 99 insertions, 3 deletions

diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index dfd74c00eaab..7874172d4fe6 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -5,5 +5,6 @@ DIST pcre2-10.42.tar.bz2.sig 310 BLAKE2B 2125d7e23f7e75847573e3caeb8d55da5d8e0df
 DIST pcre2-10.43-RC1.tar.bz2 1901289 BLAKE2B 94ba878ed7a02d359d094daa22517c645b5d660dfab4ce65e9f56c1750abb56280dc0be05b6f675d12891bf9fa857ba7339d9e703b0360d72ee746afcecc6dba SHA512 2b33a50fbff0f7832d40682e7a43bef301016d8a8d74d838f1ab473f09a19c5ea98dcf73cdfa4cda4a01968e50930bb2fc40948c0e4e9c43d9762ee3dd0b1fc7
 DIST pcre2-10.43-RC1.tar.bz2.sig 310 BLAKE2B 4bfaf5209fbeb89fbc0f134921d18d15b35ef24503b910de7d0a420fbfc84831ddd79f8f61fe8a12776eb154e264ac7ff4f55d548a1e1c0ae8f53c32a4ba90e1 SHA512 09b9166f4edc6fc0d4cab66bcc572d9b081ceda3398c510348fab7746c520c4b607c26e13937e45cf3d27e0a94eefca2dddaf4210d2a754c277f1837b9a7f96d
 EBUILD libpcre2-10.42-r1.ebuild 2554 BLAKE2B 029cb4de0eedb460178d31381099e357a9638b3e0832950209e5952b63d494f05ac9da2efb875c1c0887d8d97d862cce784e1309dd458adbcbddff8c961884dc SHA512 9225c0894edc026422e1769755aeb35bd6eaaad1e47a3a953345409d48d089319f03b6b19ec0de683ab5809f8a9e1034eca3694f067dd44835d29721160f59ad
-EBUILD libpcre2-10.43_rc1.ebuild 2450 BLAKE2B 614d532cbc0135e9ab682518f58c5269e1862da4d2e2e18ca763983baaee9560cae6ed8986d92ca3db2e897ce0e8408f14762a3326a868ce9f9aec391d58d242 SHA512 5cff53024bc1e8e36a2a9f1e21f65868453ad6728d3830216100b8532c6540479aec7e13d8c1c02357c68d471ef73ebd978479bcbeeaa1f3730ac7aa9fd29c8d
+EBUILD libpcre2-10.42-r2.ebuild 2482 BLAKE2B 133aa4deea9999a7d284e3cc8a9d20100fe5c6f9c09e081205956f7c4fdde6d92f7a5c9fac6fd70cd783cc79140327c065c31bfbed769b3efb7510426cf60ab3 SHA512 e0c78e55cb3fc94ce16b47c8489e3ad1028d651ab3debc7598992c2a108560867e1f8c2fc3367c6e293ebd65bbe1a461ba57ef43d90de1f0711d5190a9018ca0
+EBUILD libpcre2-10.43_rc1.ebuild 2370 BLAKE2B 4a2e4ee825b115c1fbd6097bef3d7e1b0bdce0e859426ac96303c8a8c03ace47bf117da502bf1eb551ea2d3265fddc13fc33e01d4b877e1821a2044c7c0867ac SHA512 fa6394bca05a3584b2dfc78db1d7200c0f9aa62e108f6f5b1f8734f263d98ef07c04d9ef7afbd726d97c29a00f26e9c1ba0efdba23ecf3e5251eaa4d8b1554a8
 MISC metadata.xml 1088 BLAKE2B 4adc3d90d0a974c796b33195448d4a1ebaefef89f76137b3501fb2d35a05cbc78d2131742110737720d32ff239cc5c8a5df694330362a261cbbf5da3a0a285ef SHA512 d01ea4e26b1335c2fea7fb39c489411b72e777f6e4173adedb782387f34b6197fab65723071811fa9e69708909ae49091f7467cb0254b669a3d1a8320dccab16
diff --git a/dev-libs/libpcre2/libpcre2-10.42-r2.ebuild b/dev-libs/libpcre2/libpcre2-10.42-r2.ebuild
new file mode 100644
index 000000000000..881a0b37bcba
--- /dev/null
+++ b/dev-libs/libpcre2/libpcre2-10.42-r2.ebuild
@@ -0,0 +1,96 @@
+# 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 ~ia64 ~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_rc1.ebuild b/dev-libs/libpcre2/libpcre2-10.43_rc1.ebuild
index f12355bd6b9e..426be94c00e7 100644
--- a/dev-libs/libpcre2/libpcre2-10.43_rc1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.43_rc1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/philiphazel.asc
-inherit libtool multilib-minimal usr-ldscript verify-sig
+inherit libtool multilib-minimal verify-sig
 
 MY_P="pcre2-${PV/_rc/-RC}"
 
@@ -85,7 +85,6 @@ multilib_src_install() {
 		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() {