gentoo resync : 23.03.2018

7 files changed, 15 insertions, 285 deletions

diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index dbb6c5f14cf7..4e51e817b7e4 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,11 +1,7 @@
-AUX libpcre-8.40-jit-else.patch 2149 BLAKE2B e7a1236669ad5e1247f8036e9c47eb73e717e0c6ff1796af81dbad8983ab0021b1819c31cd5ed3aa30b40fa79aa13fd612c74d95178e5f04798ed1d163d164fe SHA512 d1d8e7c689402bad4ac26785e1a642978a6e76f83f69d4df251fb7b88108106292f73a43c6f476c226a45ccfab008283f269128e3631930b0f5490b2f46e3b48
-AUX libpcre-8.40-pcregrep-multiline-1.patch 2688 BLAKE2B 40d16d331c7ebf1661ed3b5f6e1ea8487687fe5d94429799bb6a1c0926d3e61c13bd0380b58270d6169553a1e709bc85bcfd5e613c56bbe29db76545c21ba00b SHA512 c7095a8034db6896c1457e7950a15c00ffd7c08dc29f07ca83e46db63209d42c87e808f328bd2eaaaed0fe4038575629b8e64fa77b4c249ca938fc83415bbe28
-AUX libpcre-8.40-pcregrep-multiline-2.patch 803 BLAKE2B 51e501773bc599d1c39d84b2cb1e7ea58b3a22cb9ee883f21f1fb88547dbde5afd82d7382aa3ebec8c0a85cfc9b83d51a79d0afd03c60ba1c09fb4a7285c4d03 SHA512 aae538dcf871618d00e9994ab1fd973f491075fc852c45aedd6e99ffd6726aabc9f93fff3e5aebbc1869fd2dd85d6d24f0eded075df857991b0457ca797a25fd
-AUX libpcre-8.41-fix-stack-size-detection.patch 628 BLAKE2B e6851603e6a26deac9ff55ca876ece934993b2f3d42a1731de6f30c02cf31d7008e7a5ea0d1114f6c0d067a4d147b7e5b16a372b1e64fd9c7bdb178569959008 SHA512 181a09a7d8b6c76421d5241536ad6c266c0c16d8815aa9c36d981632b4913d577395b8e4d5702c35a5f4a6385bd4b3c4e713b189ddd343c396467685ff5e0092
+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.40.tar.bz2 1560119 BLAKE2B 121d2c9f8c403a663fe27a68030faf09a06dec5e6a25ae8d62e06887850e219e87c71a14f6ded084fa25b719067acb71c89c66c81f6f09f55dcc51feaf41e737 SHA512 b4c27eafbdf33bd7a1384655b1936f4be3bc6745c072347eb26e988896c52664bd85ac42444da1be78b6e20f45b6c7e5921f5f20f5b0741b5bd3d9844e5bd4e2
 DIST pcre-8.41.tar.bz2 1561874 BLAKE2B 2a97a859237994137190da00c30ba7c15e8631b82b7f200858cf722f1fdd0405d36c24bb716eb099d8107f2f829a85fd7d3497f36cdac51769636989331e7a79 SHA512 cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551
-EBUILD libpcre-8.40-r1.ebuild 2837 BLAKE2B 448c4ac719d4eab9bc73794f6d5c37a803af0371637b7b165155dc5a1d7cb0aba8b32d11b8f3c4c634fa3f2adafc0c42e4bad1a36e8e70173f2d42ec42401f2d SHA512 ad81f5f1e5636d86c853b0534001923712d4a9903e464bfff8216a106c29915c3b1e1d1cbd961a34d078c744aa4b0727a5f085fb75c6e0ee1ecd2e35b618417e
+DIST pcre-8.42.tar.bz2 1570171 BLAKE2B f68bac3cf8ff5a81ccba31fd4d8926e05143a25a756e7daba9793467cec9cd8a4766f394f958ffca088b472463a43a31ea77014f2d4505082c1f366a18f30c7a SHA512 b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d
 EBUILD libpcre-8.41-r1.ebuild 2889 BLAKE2B 1c74969f60b5a5e756d19075337b71ff15c1cb2bb42be17e9998f75c9e08ad049935a9d448465557e3086321c0968ce5943bc00253d4cfe1e7b2fa57f9d2fa43 SHA512 8b3573d8b6921ea62269510f62f90da481836d6685535b8f58c7fc526515ac7644bed82b6a8b2d9a1ddc0277d81a23a3c498d15058b2b6445e12398b530a0c97
-EBUILD libpcre-8.41.ebuild 2833 BLAKE2B 1fc1d6613c48e6ee528ff5ba7fee27803b96107992cc560d841328cdad88f59831ad8bb9ea5f8c18a69398dd0b54bca6b902df9bd1072eed9248c2bf6772ae65 SHA512 9bfc4346d2f0b98cedaa8bbde79c8baf3bdf1e5922d697fba39def8178af0deb7622edb1eebffd948eb1da8e8cba9f4b055836dcdc7a3e73b88708747804293e
+EBUILD libpcre-8.42.ebuild 2591 BLAKE2B 59f1cd6f60d2dc16c2c927fdf293ece576124566eaeed7027b66ed3f95ac2136226b1fabef44514468d48edf47f497797c811e4a3f5ceeb7fa9fea969c5f7648 SHA512 e3121271f15390c66401cca2eff0e4ab795d4c99254a96bba1007de519f362f212021d2287ccc0b13c7fed994751a1e31c2681a8e233b2efa3d78dc394ed85a8
 MISC metadata.xml 1112 BLAKE2B 640e6cc2fe53eaa86b6e6cdd72d45398c880a27d027441447b6162c70fa30fafe818cae8c08614333b866cfb1176feae365996386a72200232a738d99b592b83 SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b
diff --git a/dev-libs/libpcre/files/libpcre-8.40-jit-else.patch b/dev-libs/libpcre/files/libpcre-8.40-jit-else.patch
deleted file mode 100644
index d347a7f5e1e0..000000000000
--- a/dev-libs/libpcre/files/libpcre-8.40-jit-else.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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 <hzmester@freemail.hu>
-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/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-1.patch b/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-1.patch
deleted file mode 100644
index f15968dfe98e..000000000000
--- a/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-1.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 5be027b624bc866702808abadfe5f99360414086 Mon Sep 17 00:00:00 2001
-From: Philip Hazel <ph10@cam.ac.uk>
-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/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-2.patch b/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-2.patch
deleted file mode 100644
index 63ad51cd1047..000000000000
--- a/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8b0fdf16e57ce9a653a0a03c39f6cc061e8122e8 Mon Sep 17 00:00:00 2001
-From: Philip Hazel <ph10@cam.ac.uk>
-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/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
index 0fd6b5f3b22f..b5392677943d 100644
--- 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
@@ -1,8 +1,7 @@
 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
+--- a/pcre_exec.c
++++ b/pcre_exec.c
 @@ -509,6 +509,12 @@
                   (e.g. stopped by repeated call or recursion limit)
  */
diff --git a/dev-libs/libpcre/libpcre-8.40-r1.ebuild b/dev-libs/libpcre/libpcre-8.40-r1.ebuild
deleted file mode 100644
index 0f6e7c38bcb2..000000000000
--- a/dev-libs/libpcre/libpcre-8.40-r1.ebuild
+++ /dev/null
@@ -1,96 +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
-
-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 ~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}"/${P}-pcregrep-multiline-{1,2}.patch
-	"${FILESDIR}"/${P}-jit-else.patch #609592
-)
-
-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/dev-libs/libpcre/libpcre-8.41.ebuild b/dev-libs/libpcre/libpcre-8.42.ebuild
index e167ae0e6ea7..613e96bb360f 100644
--- a/dev-libs/libpcre/libpcre-8.41.ebuild
+++ b/dev-libs/libpcre/libpcre-8.42.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal
+inherit multilib libtool flag-o-matic toolchain-funcs multilib-minimal
 
 DESCRIPTION="Perl-compatible regular expression library"
 HOMEPAGE="http://www.pcre.org/"
@@ -18,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 ~x64-cygwin ~amd64-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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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 )"
@@ -33,13 +33,6 @@ 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}"
 
@@ -48,11 +41,11 @@ MULTILIB_CHOST_TOOLS=(
 )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-8.41-sljit_mips-label-statement-fix.patch
+	"${FILESDIR}"/${PN}-8.41-fix-stack-size-detection.patch
 )
 
 src_prepare() {
-	epatch "${PATCHES[@]}"
+	default
 	sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
 	elibtoolize
 }
@@ -62,18 +55,18 @@ multilib_src_configure() {
 		--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 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)
+		$(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[@]}"
 }
@@ -91,7 +84,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${ED}" -name "*.la" -delete || die
 }
 
 pkg_preinst() {