From 44eb1d8b805b642f3e1dec329374115bbdef14e7 Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 16 Jun 2017 12:03:32 -0700 Subject: [PATCH] bump(dev-libs/libpcre): sync with upstream --- .../portage-stable/dev-libs/libpcre/Manifest | 7 +- .../libpcre/files/libpcre-8.40-jit-else.patch | 68 +++++++++++++ .../libpcre-8.40-pcregrep-multiline-1.patch | 69 ++++++++++++++ .../libpcre-8.40-pcregrep-multiline-2.patch | 25 +++++ ...cre-8.39.ebuild => libpcre-8.40-r1.ebuild} | 11 ++- .../dev-libs/libpcre/libpcre-8.40.ebuild | 95 ------------------- .../metadata/md5-cache/dev-libs/libpcre-8.39 | 14 --- .../{libpcre-8.40 => libpcre-8.40-r1} | 4 +- 8 files changed, 174 insertions(+), 119 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-jit-else.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-1.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-2.patch rename sdk_container/src/third_party/portage-stable/dev-libs/libpcre/{libpcre-8.39.ebuild => libpcre-8.40-r1.ebuild} (88%) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.40.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.39 rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/{libpcre-8.40 => libpcre-8.40-r1} (80%) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/Manifest index ccec7b4721..ab0568f2ac 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/Manifest @@ -1,7 +1,8 @@ -DIST pcre-8.39.tar.bz2 1560758 SHA256 b858099f82483031ee02092711689e7245586ada49e534a06e678b8ea9549e8b SHA512 8b0f14ae5947c4b2d74876a795b04e532fd71c2479a64dbe0ed817e7c7894ea3cae533413de8c17322d305cb7f4e275d72b43e4e828eaca77dc4bcaf04529cf6 WHIRLPOOL 00e8e7fb3dc60cbbd2ee185e269696058b568a0f269749386bad44cb474f723c9ed3dfd2af91ddce0b5047aab459864f07e05940af17d3d51d2f1b068415b1ed +AUX libpcre-8.40-jit-else.patch 2149 SHA256 a6fb7e204a0a33c12c89983f57f8548998b52137f7964a809c5b6031e37d6829 SHA512 d1d8e7c689402bad4ac26785e1a642978a6e76f83f69d4df251fb7b88108106292f73a43c6f476c226a45ccfab008283f269128e3631930b0f5490b2f46e3b48 WHIRLPOOL 35a3593928463bc3fb8c3c51cb110547fbd55be894d968b0569afcac17a5f268d2347be187d267c58f302f60aa7a00df80d72524a99cb8c6b4491b0a7725e9c2 +AUX libpcre-8.40-pcregrep-multiline-1.patch 2688 SHA256 6bc091de8df6715c9cdea6b65d3050112b032915e24e12d5d440434b11d4032a SHA512 c7095a8034db6896c1457e7950a15c00ffd7c08dc29f07ca83e46db63209d42c87e808f328bd2eaaaed0fe4038575629b8e64fa77b4c249ca938fc83415bbe28 WHIRLPOOL 87ae705b53a3227f297cec1036301be32687c02c8b44131b62994663fb2cf2cc0c92c1968627f1238f1985a92a660ccebacc0eda4e05ac315a4672c5b89ab3fa +AUX libpcre-8.40-pcregrep-multiline-2.patch 803 SHA256 01d27d72071e1fc5e90db5da2795b61b19e519097200b891979b02a63222b5ed SHA512 aae538dcf871618d00e9994ab1fd973f491075fc852c45aedd6e99ffd6726aabc9f93fff3e5aebbc1869fd2dd85d6d24f0eded075df857991b0457ca797a25fd WHIRLPOOL 7dc104231878dad7a51a2d0fd95711002780a6c6190af15facda78595ac93befeb0f63c02315a1c528dd2aac7ef17727a5fed0af0fe996f6a0158ea380ffd0e4 DIST pcre-8.40.tar.bz2 1560119 SHA256 00e27a29ead4267e3de8111fcaa59b132d0533cdfdbdddf4b0604279acbcf4f4 SHA512 b4c27eafbdf33bd7a1384655b1936f4be3bc6745c072347eb26e988896c52664bd85ac42444da1be78b6e20f45b6c7e5921f5f20f5b0741b5bd3d9844e5bd4e2 WHIRLPOOL 6711688972b3db4b98902d548b84e8b03b61c3a12d24a4e42fc49ddc5e2b4be51f98f91873166e550866e88b6cd55092ea27704a3b7e71d58a2af21148ad3340 -EBUILD libpcre-8.39.ebuild 2804 SHA256 8397835b0303e77a5962d4a784d0d7ad79b7d17f77efff3c70988d18d3c9c8e4 SHA512 6aa289609ca02802f1d6ab8fa4d3344e352789775fa30d3c50b53a4e1145e1d033230d2daad195873d4d2b1d2bcefce6f569f71fc4baf90adc7f2802e67861f9 WHIRLPOOL 12941ae26442a87c52c01816626b01cfb7a80519a9e9263117ae209e8a47afc05d02cb4575ca91a298a2765c4133b50650cd1b1b97bcdfa082d6d84d1d7a9a7f -EBUILD libpcre-8.40.ebuild 2817 SHA256 6f1946adb6214b71649118fc1f6fb4f3c54f32dfebead324fac63c65da39dbf5 SHA512 8c25d21862600348295300cc421e14087f5fd18758af8d9910112826d0ce07820dff412460b44e5a8c52f51fb911f8bef3bf88f3023b2676a48e10260964bac7 WHIRLPOOL 70f1293c70f7365a42bc54899cdd5cba2d6ced27bab68d211f3945ad35c4fe63ee7921e9256f5c921a7024b60c4df9f6ad0e08a115ef99102d522e23737e3427 +EBUILD libpcre-8.40-r1.ebuild 2849 SHA256 71b6ae4b11f222072bf9776f4e701cd17e7819b82ce58d62c65a6380fa87f364 SHA512 b6969ee98be6c15c5e698a03c78956159f147a08fa9646711e75122ebae03df3e154d8a394a033a70ac2d5658b02b67626396433993639491b8753cc03fdd02f WHIRLPOOL 99012339d40a2857e83602e58b7b23f89d9385537df57a84b9ff38492ea443d48445d1151c9a442debee19e3fcfda14ae66ac11c50c702640ef18afc05dc8252 MISC ChangeLog 9358 SHA256 6d71cdef5ca28f5d0c3af958daa73122d374a64088bf960961f9eec235572595 SHA512 ad1c6ff26e6198bda9f8c5d31d03a5337b0bd7c620f564b31b98117982d12677426ec4d703325028c44ea371dc15c3b2530d0c91ccd9e8b40b5710761a2e7ef0 WHIRLPOOL c8f1726ad29d83ee380eeeaae0a385a7de8db1e99751357bbf59dcf0af751e4f6ddb8f88d836dda0d0d6e132ef4db126fa3e64610491ceadce550b3017b2ee5d MISC ChangeLog-2015 35335 SHA256 dfdfc43bcff86898d74db532baf46e6d88c70a3e62e82ceab69c285934f802b5 SHA512 94411b185f75967d240777124272d04b13f3cb3e43de6f751baa9944e07086f9fa2972e4854514fb39f85d69422a07fd1ee1cc7fc587dacf54b777bdf68439ea WHIRLPOOL ec71b8c06e85b5ec0a4040def4447e6aa2589bbaf9bd4b5d7479a2b968357a2b5c4a30e7c2739bd1b4607e074cdc9d15e0f730ed1a69cb936d514056d53578e0 MISC metadata.xml 1112 SHA256 fa2a7f9e7f1ee1c432907cbc5cc0dd23f9636b5f4c51836dbcdbf24f72975c2a SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b WHIRLPOOL 7b675f34fbd1f58f42d7ad5c4e39e1d80922474624047165b30d85ecdbbffd1246d68b0dad4d7553c0d2fc900249e3425fc04f9b3821f189b30ebb2d2615dbad diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-jit-else.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-jit-else.patch new file mode 100644 index 0000000000..d347a7f5e1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-jit-else.patch @@ -0,0 +1,68 @@ +https://bugs.gentoo.org/609592 +https://bugs.exim.org/show_bug.cgi?id=2035 + +From 7ddfbe9d0b9f43402f8043e940172a318cc407c6 Mon Sep 17 00:00:00 2001 +From: Zoltan Herczeg +Date: Tue, 14 Feb 2017 08:48:18 +0000 +Subject: [PATCH] Fix a missing else in the JIT compiler reported by + 'idaifish'. + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1680 2f5784b3-3f2a-0410-8824-cb99058d5e15 +--- + ChangeLog | 2 ++ + pcre_jit_compile.c | 2 +- + testdata/testinput12 | 2 ++ + testdata/testoutput12 | 2 ++ + 4 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/ChangeLog b/ChangeLog +index 373ee8422ef5..d813935539bd 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -15,6 +15,8 @@ mode with --only-matching matched several lines, it restarted scanning at the + next line instead of moving on to the end of the matched string, which can be + several lines after the start. + ++3. Fix a missing else in the JIT compiler reported by 'idaifish'. ++ + + Version 8.40 11-January-2017 + ---------------------------- +diff --git a/pcre_jit_compile.c b/pcre_jit_compile.c +index c301f05d5e3f..6ef8e48ff5e8 100644 +--- a/pcre_jit_compile.c ++++ b/pcre_jit_compile.c +@@ -8110,7 +8110,7 @@ if (opcode == OP_COND || opcode == OP_SCOND) + + if (*matchingpath == OP_FAIL) + stacksize = 0; +- if (*matchingpath == OP_RREF) ++ else if (*matchingpath == OP_RREF) + { + stacksize = GET2(matchingpath, 1); + if (common->currententry == NULL) +diff --git a/testdata/testinput12 b/testdata/testinput12 +index 944be6943f5e..89ed4564bcd4 100644 +--- a/testdata/testinput12 ++++ b/testdata/testinput12 +@@ -104,4 +104,6 @@ and a couple of things that are different with JIT. --/ + /(.|.)*?bx/ + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabax + ++/((?(?!))x)(?'name')(?1)/S++ ++ + /-- End of testinput12 --/ +diff --git a/testdata/testoutput12 b/testdata/testoutput12 +index 87911086f498..7632c4e58013 100644 +--- a/testdata/testoutput12 ++++ b/testdata/testoutput12 +@@ -201,4 +201,6 @@ No match, mark = m (JIT) + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabax + Error -8 (match limit exceeded) + ++/((?(?!))x)(?'name')(?1)/S++ ++ + /-- End of testinput12 --/ +-- +2.12.0 + diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-1.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-1.patch new file mode 100644 index 0000000000..f15968dfe9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-1.patch @@ -0,0 +1,69 @@ +From 5be027b624bc866702808abadfe5f99360414086 Mon Sep 17 00:00:00 2001 +From: Philip Hazel +Date: Fri, 10 Feb 2017 17:47:34 +0000 +Subject: [PATCH] Correct fix for pcre2grep multiline with --only-matching. + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1678 2f5784b3-3f2a-0410-8824-cb99058d5e15 +--- + ChangeLog | 5 +++++ + configure.ac | 6 +++--- + pcregrep.c | 20 +++++++++++++++----- + 3 files changed, 23 insertions(+), 8 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index ab4e053e601e..373ee8422ef5 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -10,6 +10,11 @@ Version 8.41 + 1. Fixed typo in CMakeLists.txt (wrong number of arguments for + PCRE_STATIC_RUNTIME (affects MSVC only). + ++2. Issue 1 for 8.40 below was not correctly fixed. If pcregrep in multiline ++mode with --only-matching matched several lines, it restarted scanning at the ++next line instead of moving on to the end of the matched string, which can be ++several lines after the start. ++ + + Version 8.40 11-January-2017 + ---------------------------- +diff --git a/pcregrep.c b/pcregrep.c +index fd2a67622baa..2070c057e4a0 100644 +--- a/pcregrep.c ++++ b/pcregrep.c +@@ -1804,11 +1804,6 @@ while (ptr < endptr) + if (line_buffered) fflush(stdout); + rc = 0; /* Had some success */ + +- /* If the current match ended past the end of the line (only possible +- in multiline mode), we are done with this line. */ +- +- if ((unsigned int)offsets[1] > linelength) goto END_ONE_MATCH; +- + startoffset = offsets[1]; /* Restart after the match */ + if (startoffset <= oldstartoffset) + { +@@ -1818,6 +1813,21 @@ while (ptr < endptr) + if (utf8) + while ((matchptr[startoffset] & 0xc0) == 0x80) startoffset++; + } ++ ++ /* If the current match ended past the end of the line (only possible ++ in multiline mode), we must move on to the line in which it did end ++ before searching for more matches. */ ++ ++ while (startoffset > (int)linelength) ++ { ++ matchptr = ptr += linelength + endlinelength; ++ filepos += (int)(linelength + endlinelength); ++ linenumber++; ++ startoffset -= (int)(linelength + endlinelength); ++ t = end_of_line(ptr, endptr, &endlinelength); ++ linelength = t - ptr - endlinelength; ++ } ++ + goto ONLY_MATCHING_RESTART; + } + } +-- +2.12.0 + diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-2.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-2.patch new file mode 100644 index 0000000000..63ad51cd10 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-2.patch @@ -0,0 +1,25 @@ +From 8b0fdf16e57ce9a653a0a03c39f6cc061e8122e8 Mon Sep 17 00:00:00 2001 +From: Philip Hazel +Date: Sun, 12 Feb 2017 13:28:11 +0000 +Subject: [PATCH] Fix bug in most recent fix for multiline pcre2grep. + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1679 2f5784b3-3f2a-0410-8824-cb99058d5e15 +--- + pcregrep.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pcregrep.c b/pcregrep.c +index 2070c057e4a0..3cd70eeb4261 100644 +--- a/pcregrep.c ++++ b/pcregrep.c +@@ -1826,6 +1826,7 @@ while (ptr < endptr) + startoffset -= (int)(linelength + endlinelength); + t = end_of_line(ptr, endptr, &endlinelength); + linelength = t - ptr - endlinelength; ++ length = (size_t)(endptr - ptr); + } + + goto ONLY_MATCHING_RESTART; +-- +2.12.0 + diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.39.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.40-r1.ebuild similarity index 88% rename from sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.39.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.40-r1.ebuild index a3f73bfaf1..3b1c5c161f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.39.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.40-r1.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI="5" @@ -19,7 +18,7 @@ fi LICENSE="BSD" SLOT="3" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 )" @@ -42,11 +41,13 @@ MULTILIB_CHOST_TOOLS=( /usr/bin/pcre-config ) -#PATCHES=( -#) +PATCHES=( + "${FILESDIR}"/${P}-pcregrep-multiline-{1,2}.patch + "${FILESDIR}"/${P}-jit-else.patch #609592 +) src_prepare() { - #epatch "${PATCHES[@]}" + epatch "${PATCHES[@]}" sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die elibtoolize } diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.40.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.40.ebuild deleted file mode 100644 index 8e47cf4487..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.40.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal - -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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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} - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20131008-r2 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" - -S=${WORKDIR}/${MY_P} - -MULTILIB_CHOST_TOOLS=( - /usr/bin/pcre-config -) - -#PATCHES=( -#) - -src_prepare() { - #epatch "${PATCHES[@]}" - sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die - elibtoolize -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - --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} -} - -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/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.39 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.39 deleted file mode 100644 index 27ed0c142a..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.39 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare test -DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) virtual/pkgconfig >=app-portage/elt-patches-20170317 -DESCRIPTION=Perl-compatible regular expression library -EAPI=5 -HOMEPAGE=http://www.pcre.org/ -IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=BSD -RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) -REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline ) -SLOT=3 -SRC_URI=mirror://sourceforge/pcre/pcre-8.39.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.39.tar.bz2 -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 0236be304ee52e7f179ed2f337075515 multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee -_md5_=8cea658ecb3a8ab68b6c60e71332af64 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.40 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.40-r1 similarity index 80% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.40 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.40-r1 index 406ac681e9..67e069518f 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.40 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.40-r1 @@ -4,11 +4,11 @@ DESCRIPTION=Perl-compatible regular expression library EAPI=5 HOMEPAGE=http://www.pcre.org/ IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=BSD RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline ) SLOT=3 SRC_URI=mirror://sourceforge/pcre/pcre-8.40.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.40.tar.bz2 _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool e32ea84bf82cf8987965b574672dba93 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 0236be304ee52e7f179ed2f337075515 multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee -_md5_=e24078c3bf31eeccaf5083daab081345 +_md5_=8fa5a2e376df0b50998868f4899fe96b