gentoo resync : 31.10.2017

3 files changed, 124 insertions, 0 deletions

diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 2f773bd7fb45..8aa3c872a085 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,10 +1,12 @@
 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
+AUX libpcre-8.41-fix-stack-size-detection.patch 628 SHA256 4b542941ba95f78d6bdca48661625ab28c91472d99848bcbb4ec896dde9189da SHA512 181a09a7d8b6c76421d5241536ad6c266c0c16d8815aa9c36d981632b4913d577395b8e4d5702c35a5f4a6385bd4b3c4e713b189ddd343c396467685ff5e0092 WHIRLPOOL 3356e0f4de0351028a10ed4878a4ed2b84cc3200cd4a1f567507bfc0ada7f88307cc6c459cd2bbcbf80c93c8fd1799d64216309c510f62c7d471d1da584ef818
 AUX libpcre-8.41-sljit_mips-label-statement-fix.patch 584 SHA256 d91c7b3f71e1e0982ef9b47094d91dd63bcf1a0c235ed0384baa999be0f91801 SHA512 38f133a539f4e09886084e0ff2d30bf69ceb600095f87f32eae42f8f03ada9c1aae0a1eff6763d473f0edfcef047a0c573859d0ada503419a7d663140a92fbb9 WHIRLPOOL 90049c348516104beeb70934ca2b5ce7bdb25bbba3ceb8f4c30c3e7889d45dc61fe932a01c238fad083486eb709ce2d10041cc0705c988712c468e66eaa0597a
 DIST pcre-8.40.tar.bz2 1560119 SHA256 00e27a29ead4267e3de8111fcaa59b132d0533cdfdbdddf4b0604279acbcf4f4 SHA512 b4c27eafbdf33bd7a1384655b1936f4be3bc6745c072347eb26e988896c52664bd85ac42444da1be78b6e20f45b6c7e5921f5f20f5b0741b5bd3d9844e5bd4e2 WHIRLPOOL 6711688972b3db4b98902d548b84e8b03b61c3a12d24a4e42fc49ddc5e2b4be51f98f91873166e550866e88b6cd55092ea27704a3b7e71d58a2af21148ad3340
 DIST pcre-8.41.tar.bz2 1561874 SHA256 e62c7eac5ae7c0e7286db61ff82912e1c0b7a0c13706616e94a7dd729321b530 SHA512 cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551 WHIRLPOOL 24d891c4f6580af20aa07a166038a2bacb52cdb305987f8b91b2fecae65e7b5277d3ef0b26ddbb3a33fd34794e6340e77df6a321e770b3aca4393d1ed144cf64
 EBUILD libpcre-8.40-r1.ebuild 2849 SHA256 71b6ae4b11f222072bf9776f4e701cd17e7819b82ce58d62c65a6380fa87f364 SHA512 b6969ee98be6c15c5e698a03c78956159f147a08fa9646711e75122ebae03df3e154d8a394a033a70ac2d5658b02b67626396433993639491b8753cc03fdd02f WHIRLPOOL 99012339d40a2857e83602e58b7b23f89d9385537df57a84b9ff38492ea443d48445d1151c9a442debee19e3fcfda14ae66ac11c50c702640ef18afc05dc8252
+EBUILD libpcre-8.41-r1.ebuild 2911 SHA256 9a574aa7ce9c156f768fc1ceb8b2261d1d73b56d06b904fd356566fa30946e6f SHA512 587658d10a127502e846ab66c66a41042189eae145f165c0a1a408579c6917087b93349dbd5a7e7c911a857632d83798e74dd654919db30eb09c213dcb2b5b9c WHIRLPOOL 4360f2bba21b30f1c512bc021d1949d4af41971257afff49f4b641f4c30489c99eec8ed39965a2a1d158a5f067953080fbfabb8c0d40a97ab0f984a99e484bed
 EBUILD libpcre-8.41.ebuild 2845 SHA256 5f2b52ec408b03e9a548ab2b58a9fa31429c5e40dd75ee39238b5a01df7f202d SHA512 7b12d7fa5da2b152a3ba581cebe3d2f5535f3bd810887b17acff16271441d0d5350853fb0e8f3b407019c7d2e0910dab01b7b9dab0f16426a909b73f6f6b49cf WHIRLPOOL b68769e948d00c3d7b78026c03987476089cea3f77cd85b887ff5b1d4e9a7d4483bd1a06d189fa73f1f9b85761136698711646fff590da7765fa96bac779570b
 MISC ChangeLog 9358 SHA256 6d71cdef5ca28f5d0c3af958daa73122d374a64088bf960961f9eec235572595 SHA512 ad1c6ff26e6198bda9f8c5d31d03a5337b0bd7c620f564b31b98117982d12677426ec4d703325028c44ea371dc15c3b2530d0c91ccd9e8b40b5710761a2e7ef0 WHIRLPOOL c8f1726ad29d83ee380eeeaae0a385a7de8db1e99751357bbf59dcf0af751e4f6ddb8f88d836dda0d0d6e132ef4db126fa3e64610491ceadce550b3017b2ee5d
 MISC ChangeLog-2015 35335 SHA256 dfdfc43bcff86898d74db532baf46e6d88c70a3e62e82ceab69c285934f802b5 SHA512 94411b185f75967d240777124272d04b13f3cb3e43de6f751baa9944e07086f9fa2972e4854514fb39f85d69422a07fd1ee1cc7fc587dacf54b777bdf68439ea WHIRLPOOL ec71b8c06e85b5ec0a4040def4447e6aa2589bbaf9bd4b5d7479a2b968357a2b5c4a30e7c2739bd1b4607e074cdc9d15e0f730ed1a69cb936d514056d53578e0
diff --git a/dev-libs/libpcre/files/libpcre-8.41-fix-stack-size-detection.patch b/dev-libs/libpcre/files/libpcre-8.41-fix-stack-size-detection.patch
new file mode 100644
index 000000000000..0fd6b5f3b22f
--- /dev/null
+++ b/dev-libs/libpcre/files/libpcre-8.41-fix-stack-size-detection.patch
@@ -0,0 +1,18 @@
+https://bugs.exim.org/show_bug.cgi?id=2173#c4
+
+diff --git a/pcre/pcre_exec.c b/pcre/pcre_exec.c
+--- a/pcre/pcre_exec.c
++++ b/pcre/pcre_exec.c
+@@ -509,6 +509,12 @@
+                  (e.g. stopped by repeated call or recursion limit)
+ */
+ 
++#ifdef __GNUC__
++static int
++match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
++  PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
++  unsigned int rdepth) __attribute__((noinline,noclone));
++#endif
+ static int
+ match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
+   PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
diff --git a/dev-libs/libpcre/libpcre-8.41-r1.ebuild b/dev-libs/libpcre/libpcre-8.41-r1.ebuild
new file mode 100644
index 000000000000..eed796ef4bf4
--- /dev/null
+++ b/dev-libs/libpcre/libpcre-8.41-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 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
+
+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-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 )"
+
+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=(
+	"${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
+}