From 53cba99042fa967e2a93da9f8db806fe2d035543 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 17 Feb 2020 01:16:38 +0000 Subject: gentoo resync : 17.02.2020 --- dev-libs/libpcre/Manifest | 9 +- ...bpcre-8.41-sljit_mips-label-statement-fix.patch | 15 ---- dev-libs/libpcre/libpcre-8.41-r1.ebuild | 100 --------------------- dev-libs/libpcre/libpcre-8.42.ebuild | 4 +- dev-libs/libpcre/libpcre-8.43.ebuild | 4 +- dev-libs/libpcre/libpcre-8.44.ebuild | 96 ++++++++++++++++++++ 6 files changed, 104 insertions(+), 124 deletions(-) delete mode 100644 dev-libs/libpcre/files/libpcre-8.41-sljit_mips-label-statement-fix.patch delete mode 100644 dev-libs/libpcre/libpcre-8.41-r1.ebuild create mode 100644 dev-libs/libpcre/libpcre-8.44.ebuild (limited to 'dev-libs/libpcre') diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest index b3ee52fd515f..2cac2ee920ca 100644 --- a/dev-libs/libpcre/Manifest +++ b/dev-libs/libpcre/Manifest @@ -1,9 +1,8 @@ AUX libpcre-8.41-fix-stack-size-detection.patch 569 BLAKE2B 68f685ccd9ebe0a256f829ff2086d93041dfc872e301a19a234c8da3b834fb5c0da3b510b0f63fff7fc07c1d6680ebfb964ba3dbf1a58b302abb14a393da36a4 SHA512 ac9f6155d055b25bcde26bf11450cb07618d7194e0a2c28e0c38dca4190b3319fbfdb85c97f01210dc7540a708fd4f8879853350d66ae382b54c4704e2e7028b -AUX libpcre-8.41-sljit_mips-label-statement-fix.patch 584 BLAKE2B 6523a93f78730f1689ddb79631e31e134d6de844dfc4b3e63a15aea4f0737773ff0a8e4fbf3e9e80ea920d1da751ba2165a7b3b459dfbe0d8673c9a9da95f63c SHA512 38f133a539f4e09886084e0ff2d30bf69ceb600095f87f32eae42f8f03ada9c1aae0a1eff6763d473f0edfcef047a0c573859d0ada503419a7d663140a92fbb9 -DIST pcre-8.41.tar.bz2 1561874 BLAKE2B 2a97a859237994137190da00c30ba7c15e8631b82b7f200858cf722f1fdd0405d36c24bb716eb099d8107f2f829a85fd7d3497f36cdac51769636989331e7a79 SHA512 cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551 DIST pcre-8.42.tar.bz2 1570171 BLAKE2B f68bac3cf8ff5a81ccba31fd4d8926e05143a25a756e7daba9793467cec9cd8a4766f394f958ffca088b472463a43a31ea77014f2d4505082c1f366a18f30c7a SHA512 b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d DIST pcre-8.43.tar.bz2 1576584 BLAKE2B 12c2117fc5d242ada44884df279f7f8b4c680fa1623ddc131c0adca1740ec47614ac6af20fc60b0c516d9d7b66488ba8a4e5efa5fc8a0a70aacb02bb3d38ee53 SHA512 3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7 -EBUILD libpcre-8.41-r1.ebuild 2737 BLAKE2B 1e93f80ba0b9943136c4765b6d07b06bcafc6dc5d6e94d36ea305ea533b6a5175159be96f31a55fa82b3fc79981b093f69de3db8ffd47c4c7c0a77c1f0d97f6e SHA512 59eaa361592778f09385823666bd1114cf576cf493bc33b01d5a2dc78c77ca061501a99e1d863ca6cc7ec9855b6d51e629c266dd6a9820e9dae94d0e98655688 -EBUILD libpcre-8.42.ebuild 2556 BLAKE2B f3c6c001bd86fb8e0d9ca0536747db2cceedd75b3bb7be1dcfbdda0bb5677112befa97ffbadaf5312830e09ffcfff8fe42dd94640c7cafe2f75493421446e17e SHA512 f08b1fc9e1b1653b7e2ff3cadc3e00f14e05b1c0a8909baf1a57f161955dc883e096dad789e2d7c5d87efaae3a3a4d6e74c869ebf979e2d9e37cbf2b0f31390a -EBUILD libpcre-8.43.ebuild 2586 BLAKE2B 65c6ea1a968a802bd7c104c20e18bdd866b50c8c05ad62b3db3bede2181c873b85e961602c5a678c0e53f3edb6ec8e8221abba637eaf4f5ba58b76fdc47d9e9a SHA512 fe4f3bb99cc99726f38e8c51bce11cc2d4ed7aa64a866efe7dd66a30f100c08c31ede92858ccf992017708a5b3ebd0342fe7590cf58e5becd7b7d0c501e0fa82 +DIST pcre-8.44.tar.bz2 1577611 BLAKE2B ef8d5737ca1f4c72f12c8726956ce5d3bad13aa8303b7c3b5d25499e3027ddc2edcdb937d9ad2bdd437a8885f1af8757ba194aa0b2f236b6e6a3a18d2ec8f138 SHA512 f26d850aab5228799e58ac8c2306fb313889332c39e29b118ef1de57677c5c90f970d68d3f475cabc64f8b982a77f04eca990ff1057f3ccf5e19bd137997c4ac +EBUILD libpcre-8.42.ebuild 2570 BLAKE2B 5b2e674baaa8915b2afef96883d5bb0b0ecd483e4f88156653b2ec957a2035c292838607c3acfdf58e0dedd8957150b385f08334b2fcfd26ebf13c8fe1408958 SHA512 aaeff0e450df9ff881c52e3e54c8d978deca513e8ca205ced8fa654a508d7144109e4506c7f5ca16a48de8482f630247bb05fe505ef6636049ed794dce2ba71f +EBUILD libpcre-8.43.ebuild 2600 BLAKE2B bbc281fc115a0501a3806a28eb323ad9028391b6d06f814dce59a496b4fd5c2c841e2c86cb126364aac0a2910f3405682c9b0d880fe1d14802eefc47140a1ca6 SHA512 5770da01e7413f952614a46e89833b302e4d567e5658c898ce781d3f04252847487aa1fe919c9a793e3be4b4bfd71a24ca1aafb1311f11160e4792ae1e7c44c4 +EBUILD libpcre-8.44.ebuild 2617 BLAKE2B c7d61a01c2e37daf7d441461e678587357931cf08e350f510064a845ac8c51dd4608681821fcf2396c30ffedd1ea28a002f5fcd3f389b11177467a13878e0171 SHA512 6f46d4ac883e9d861a2ca7ea7531482e25208daada8bf56c88c463f67af055a313b9f2ad06a62f9b20bc8e14c40774c453104953499f23aa586c690cd7f00cc5 MISC metadata.xml 1112 BLAKE2B 640e6cc2fe53eaa86b6e6cdd72d45398c880a27d027441447b6162c70fa30fafe818cae8c08614333b866cfb1176feae365996386a72200232a738d99b592b83 SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b diff --git a/dev-libs/libpcre/files/libpcre-8.41-sljit_mips-label-statement-fix.patch b/dev-libs/libpcre/files/libpcre-8.41-sljit_mips-label-statement-fix.patch deleted file mode 100644 index 0494ccc25ebc..000000000000 --- a/dev-libs/libpcre/files/libpcre-8.41-sljit_mips-label-statement-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naurp pcre-8.41.orig/sljit/sljitNativeMIPS_common.c pcre-8.41/sljit/sljitNativeMIPS_common.c ---- pcre-8.41.orig/sljit/sljitNativeMIPS_common.c 2017-05-07 11:32:25.000000000 -0400 -+++ pcre-8.41/sljit/sljitNativeMIPS_common.c 2017-07-29 17:50:24.508909742 -0400 -@@ -503,9 +503,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit - #ifdef SLJIT_IS_FPU_AVAILABLE - return SLJIT_IS_FPU_AVAILABLE; - #elif defined(__GNUC__) -+ { - sljit_sw fir; - asm ("cfc1 %0, $0" : "=r"(fir)); - return (fir >> 22) & 0x1; -+ } - #else - #error "FIR check is not implemented for this architecture" - #endif diff --git a/dev-libs/libpcre/libpcre-8.41-r1.ebuild b/dev-libs/libpcre/libpcre-8.41-r1.ebuild deleted file mode 100644 index 54d07b8482cc..000000000000 --- a/dev-libs/libpcre/libpcre-8.41-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal usr-ldscript - -DESCRIPTION="Perl-compatible regular expression library" -HOMEPAGE="http://www.pcre.org/" -MY_P="pcre-${PV/_rc/-RC}" -if [[ ${PV} != *_rc* ]] ; then - # Only the final releases are available here. - SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2 - ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2" -else - SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2" -fi - -LICENSE="BSD" -SLOT="3" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" -REQUIRED_USE="readline? ( !libedit ) - libedit? ( !readline )" - -RDEPEND=" - bzip2? ( app-arch/bzip2 ) - zlib? ( sys-libs/zlib ) - libedit? ( dev-libs/libedit ) - readline? ( sys-libs/readline:0= ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -RDEPEND=" - ${RDEPEND} -" - -S="${WORKDIR}/${MY_P}" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/pcre-config -) - -PATCHES=( - "${FILESDIR}"/${PN}-8.41-sljit_mips-label-statement-fix.patch - "${FILESDIR}"/${PN}-8.41-fix-stack-size-detection.patch -) - -src_prepare() { - epatch "${PATCHES[@]}" - sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die - elibtoolize -} - -multilib_src_configure() { - local myeconfargs=( - --with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) - $(multilib_native_use_enable bzip2 pcregrep-libbz2) - $(use_enable cxx cpp) - $(use_enable jit) $(use_enable jit pcregrep-jit) - $(use_enable pcre16) - $(use_enable pcre32) - $(multilib_native_use_enable libedit pcretest-libedit) - $(multilib_native_use_enable readline pcretest-libreadline) - $(use_enable static-libs static) - $(use_enable unicode utf) $(use_enable unicode unicode-properties) - $(multilib_native_use_enable zlib pcregrep-libz) - --enable-pcre8 - --enable-shared - --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html - --docdir="${EPREFIX}"/usr/share/doc/${PF} - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=") -} - -multilib_src_install() { - emake \ - DESTDIR="${D}" \ - $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ - install - gen_usr_ldscript -a pcre -} - -multilib_src_install_all() { - prune_libtool_files -} - -pkg_preinst() { - preserve_old_lib /$(get_libdir)/libpcre.so.0 -} - -pkg_postinst() { - preserve_old_lib_notify /$(get_libdir)/libpcre.so.0 -} diff --git a/dev-libs/libpcre/libpcre-8.42.ebuild b/dev-libs/libpcre/libpcre-8.42.ebuild index 5572dd9d553c..5e863a9f565d 100644 --- a/dev-libs/libpcre/libpcre-8.42.ebuild +++ b/dev-libs/libpcre/libpcre-8.42.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit multilib libtool flag-o-matic toolchain-funcs multilib-minimal usr-ldscript +inherit multilib libtool flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript DESCRIPTION="Perl-compatible regular expression library" HOMEPAGE="http://www.pcre.org/" diff --git a/dev-libs/libpcre/libpcre-8.43.ebuild b/dev-libs/libpcre/libpcre-8.43.ebuild index b5a63a4a71d1..65e976ed3818 100644 --- a/dev-libs/libpcre/libpcre-8.43.ebuild +++ b/dev-libs/libpcre/libpcre-8.43.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit multilib libtool flag-o-matic toolchain-funcs multilib-minimal usr-ldscript +inherit multilib libtool flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript DESCRIPTION="Perl-compatible regular expression library" HOMEPAGE="http://www.pcre.org/" diff --git a/dev-libs/libpcre/libpcre-8.44.ebuild b/dev-libs/libpcre/libpcre-8.44.ebuild new file mode 100644 index 000000000000..8ee80c2f8d4c --- /dev/null +++ b/dev-libs/libpcre/libpcre-8.44.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib libtool flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript + +DESCRIPTION="Perl-compatible regular expression library" +HOMEPAGE="http://www.pcre.org/" +MY_P="pcre-${PV/_rc/-RC}" +if [[ ${PV} != *_rc* ]] ; then + # Only the final releases are available here. + SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2 + ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2" +else + SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2" +fi + +LICENSE="BSD" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" +REQUIRED_USE="readline? ( !libedit ) + libedit? ( !readline )" + +RDEPEND=" + bzip2? ( app-arch/bzip2 ) + zlib? ( sys-libs/zlib ) + libedit? ( dev-libs/libedit ) + readline? ( sys-libs/readline:0= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" + +S="${WORKDIR}/${MY_P}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/pcre-config +) + +PATCHES=( + "${FILESDIR}"/${PN}-8.41-fix-stack-size-detection.patch +) + +src_prepare() { + default + sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die + elibtoolize +} + +multilib_src_configure() { + local myeconfargs=( + --with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) + $(multilib_native_use_enable bzip2 pcregrep-libbz2) + $(use_enable cxx cpp) + $(use_enable jit) + $(use_enable jit pcregrep-jit) + $(use_enable pcre16) + $(use_enable pcre32) + $(multilib_native_use_enable libedit pcretest-libedit) + $(multilib_native_use_enable readline pcretest-libreadline) + $(use_enable static-libs static) + $(use_enable unicode utf) + $(use_enable unicode unicode-properties) + $(multilib_native_use_enable zlib pcregrep-libz) + --enable-pcre8 + --enable-shared + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=") +} + +multilib_src_install() { + emake \ + DESTDIR="${D}" \ + $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ + install + gen_usr_ldscript -a pcre +} + +multilib_src_install_all() { + find "${ED}" -type f -name "*.la" -delete || die +} + +pkg_preinst() { + preserve_old_lib /$(get_libdir)/libpcre.so.0 +} + +pkg_postinst() { + preserve_old_lib_notify /$(get_libdir)/libpcre.so.0 +} -- cgit v1.2.3