commit:     313df39d4a22d9a5c2be6fd6360753192f287a2c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  6 17:21:36 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec  6 17:21:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=313df39d

dev-libs/libpcre2: add 10.41

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

 dev-libs/libpcre2/Manifest                         |  2 +
 .../files/libpcre2-10.10-000-Fix-multilib.patch    | 37 +++++++++
 dev-libs/libpcre2/libpcre2-10.41.ebuild            | 93 ++++++++++++++++++++++
 3 files changed, 132 insertions(+)

diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index a2a57687a418..228972439009 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,3 +1,5 @@
 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.41.tar.bz2 1799126 BLAKE2B 
4335eae8e8a327c32092a1a9f8214fa86a2d016deb7450938c4ddc38214b72dfa8c6f9c85a03bb36b3686390d378d74fdd991563f92611c42a54915310604559
 SHA512 
328f331a56f152424f6021b37f8dcf660842c55d43ff39f1b49115f0d05ed651d0bbb66b43c0ed61d65022030615768b92ce5e6218a54e4e17152ec473cca68d
+DIST pcre2-10.41.tar.bz2.sig 310 BLAKE2B 
4ee3f9327bf568e38d1c072a4be93cdab4209e7b0cc0d183b978553cd7413ba9f292318ddf815cf44bc24872f685ee4ff9bceddd7d0e915b7be67c43fd8bf8f7
 SHA512 
4127258f17011be7c82d9412728863a9121c5b780514ec836769ab64ccd4cd5349a84fc85b8fdc4abb2e6fe08f4610b2a3e926116e7f1451d90d9afaa888661c

diff --git a/dev-libs/libpcre2/files/libpcre2-10.10-000-Fix-multilib.patch 
b/dev-libs/libpcre2/files/libpcre2-10.10-000-Fix-multilib.patch
new file mode 100644
index 000000000000..c216aa62d279
--- /dev/null
+++ b/dev-libs/libpcre2/files/libpcre2-10.10-000-Fix-multilib.patch
@@ -0,0 +1,37 @@
+From 8b6b10229201e5b148979a24e06c640dbbcfbad9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
+Date: Fri, 20 Feb 2015 14:34:26 +0100
+Subject: [PATCH] Fix multilib
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Do not set RPATH nor add explicit -L path to compiler.
+
+Signed-off-by: Petr Písař <ppi...@redhat.com>
+
+--- a/pcre2-config.in
++++ b/pcre2-config.in
+@@ -28,19 +28,7 @@ if test $# -eq 0; then
+ fi
+ 
+ libR=
+-case `uname -s` in
+-  *SunOS*)
+-  libR=" -R@libdir@"
+-  ;;
+-  *BSD*)
+-  libR=" -Wl,-R@libdir@"
+-  ;;
+-esac
+-
+ libS=
+-if test @libdir@ != /usr/lib ; then
+-  libS=-L@libdir@
+-fi
+ 
+ while test $# -gt 0; do
+   case "$1" in
+-- 
+2.1.0
+

diff --git a/dev-libs/libpcre2/libpcre2-10.41.ebuild 
b/dev-libs/libpcre2/libpcre2-10.41.ebuild
new file mode 100644
index 000000000000..c8948edf597e
--- /dev/null
+++ b/dev-libs/libpcre2/libpcre2-10.41.ebuild
@@ -0,0 +1,93 @@
+# 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
+}

Reply via email to