Version bump, thanks to Arseny Solokha and Sebastian Pipping in bug #333355. Take over the package for base-system herd as Peter has been away for quite a long time. Avoid adding -L/lib(64) to the ldflags when using pkg-config; run elibtoolize. Drop old version.

Package-Manager: portage-2.2.0_alpha7/cvs/Linux x86_64

4 files changed, 36 insertions, 15 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index 45526c23a5ab..dcbdb15771b3 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.164 2010/05/03 20:15:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.165 2010/12/12 09:35:27 flameeyes Exp $
+
+*libpcre-8.10 (12 Dec 2010)
+
+  12 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org> -libpcre-8.00.ebuild,
+  +libpcre-8.10.ebuild, metadata.xml:
+  Version bump, thanks to Arseny Solokha and Sebastian Pipping in bug #333355.
+  Take over the package for base-system herd as Peter has been away for quite a
+  long time. Avoid adding -L/lib(64) to the ldflags when using pkg-config; run
+  elibtoolize. Drop old version.
 
 *libpcre-8.02 (03 May 2010)
 
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 83b5bc6e0076..998a618447a4 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libpcre-7.9-pkg-config.patch 1487 RMD160 b9e583ed8776a16cc1ec2c6dbd5c0153d6fdbf88 SHA1 57d60963fd635883a7eacdbed411405a28751fec SHA256 d247cbd8bf85a4e898e0f7512e27bebaaf121e020fd2b85dc04eb6a3c041cd70
 DIST pcre-7.9.tar.bz2 861580 RMD160 e7ccae1fe3d2cf3ff3264c6e6ad3486c64fe1cec SHA1 a4a34f71313ac042455355c01ad851791971a7fa SHA256 40a13a9759f1de5b16bc2f0d47b6aa5f0ec010325646922f54b013c040dcd740
-DIST pcre-8.00.tar.bz2 922320 RMD160 e1c74746bd2cdff0471c1a1818992fa9faecbc1d SHA1 43ff361017905ab8f56e97d8d7fa8fb466f4c0c4 SHA256 88576f10eb18e170b151c8c89cff6b26863df01b7f96de33700d2efe825ca5d4
 DIST pcre-8.02.tar.bz2 956462 RMD160 5a29c3d5e61ea877a6e3ab2b9e70f426c7f34771 SHA1 2cf2f7f04988813c7ce45c43eb934f3b8b1c3b34 SHA256 a4759036d9c3e1773e8b680827b17b843f724ef9021744db92b8dd35ebac4ebd
+DIST pcre-8.10.tar.bz2 964349 RMD160 2d54068777d5c7119871b3afdeaf64cfb37d8df2 SHA1 8b345da0f835b2caabff071b0b5bab40564652be SHA256 7ac4e016f6bad8c7d990e6de9bce58c04ff5dd8838be0c5ada0afad1d6a07480
 EBUILD libpcre-7.9-r1.ebuild 2219 RMD160 d078f40adb1033becf323f99c9df6b3400a1e3fd SHA1 bfb5fd3e9f9363f716a07a3fb6f4c67143b2f0c4 SHA256 fc0cf38ae0747fdfef18fddeece0884f8b581b9dc3bdc547d585ac87a7ebb2cb
-EBUILD libpcre-8.00.ebuild 2014 RMD160 afc256255d089abc5f7eb6ab84d0d915892783d6 SHA1 83d28f06f15c93ee45fcf0b1334ab732db33c0a8 SHA256 c87f8681103d5091b4018946f0f0bfa2dacc571556b342fc16b6747c6e4054df
 EBUILD libpcre-8.02.ebuild 2013 RMD160 2fb1b301ca4c0de33455760a795e0ac21a51cec0 SHA1 0192eb40a3b0093a1e752248b1c4feb682f71a0e SHA256 fbeaa1fd16cec1f834b9d0b346d896d6df02a9a8dc8c5c04bf9669ba00b21e3b
-MISC ChangeLog 21380 RMD160 e88c312f06a5ff7c60bf397ce869137ced8338a3 SHA1 0da70eb27319c043f4846281bb32ac1306e17a7a SHA256 dd3bf61bff2e21e03269e26bb18aa810609ad1725a19f06fbd471dd71f086120
-MISC metadata.xml 258 RMD160 e363fac4024fa1d6e8481465c06e42cbe2eb9e2a SHA1 26ea33fa143b55cfa84ee879aab41f1b5e337127 SHA256 960cfc8d2eda3540d50ea76f60889fb72e3dc8342ecd9dce2070517e4469f599
+EBUILD libpcre-8.10.ebuild 1981 RMD160 1771fa1420267372a78cbf48774c1d8629a8f84a SHA1 92c9ed91da64b17536fe2dac07f4445087531f9c SHA256 a14b20bf9daabe57836432626a4bc2f1225febe1b410f8a78ff7c1f2513c1bdc
+MISC ChangeLog 21799 RMD160 f4c59f068884d5cbfc7627ebcbfa8439feaa6417 SHA1 bdb8846e1245353ffdd65cf3cac0a3759427af7a SHA256 8da58242e304fab8e6977ac00b297bf8a781235154a52ee5634f8ae0ca6159df
+MISC metadata.xml 350 RMD160 5224f17e5a48e04717eabc1c716d640850bb9b38 SHA1 cdbd6adbdc7271ef217001a3fd7616ac5f491feb SHA256 43fd555785f7e73e17e21727705df12cd8b00fae32e13fc4dca22a0135b9c770
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0El3AACgkQAiZjviIA2XiTUwCePXUQKOTj/Y0XqFbddeWTgjWs
+jG8AoK6QXQ6ZiQwG3l8Te0HTiF7s+sIF
+=g6tR
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libpcre/libpcre-8.00.ebuild b/dev-libs/libpcre/libpcre-8.10.ebuild
index 27f94d24e0ae..a69f3ba5d8c2 100644
--- a/dev-libs/libpcre/libpcre-8.00.ebuild
+++ b/dev-libs/libpcre/libpcre-8.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.00.ebuild,v 1.3 2009/10/21 08:56:24 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.10.ebuild,v 1.1 2010/12/12 09:35:27 flameeyes Exp $
 
 EAPI=2
 
@@ -19,7 +19,7 @@ fi
 LICENSE="BSD"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="bzip2 +cxx unicode zlib static-libs"
+IUSE="bzip2 +cxx unicode zlib static-libs +recursion-limit"
 
 RDEPEND="bzip2? ( app-arch/bzip2 )
 	zlib? ( sys-libs/zlib )"
@@ -30,12 +30,12 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	sed -i -e "s:libdir=@libdir@:libdir=/$(get_libdir):" libpcre.pc.in || die "Fixing libpcre pkgconfig files failed"
 	sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die "Fixing libpcrecpp pkgconfig files failed"
+	elibtoolize
 }
 
 src_configure() {
-	econf --with-match-limit-recursion=8192 \
+	econf --with-match-limit-recursion=$(use recursion-limit && echo 8192 || echo MATCH_LIMIT) \
 		$(use_enable unicode utf8) $(use_enable unicode unicode-properties) \
 		$(use_enable cxx cpp) \
 		$(use_enable zlib pcregrep-libz) \
diff --git a/dev-libs/libpcre/metadata.xml b/dev-libs/libpcre/metadata.xml
index 762741c0ab18..363611f5805d 100644
--- a/dev-libs/libpcre/metadata.xml
+++ b/dev-libs/libpcre/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>loki_val@gentoo.org</email>
-		<name>Peter Alfredsen</name>
-	</maintainer>
+  <herd>base-system</herd>
+  <use>
+    <flag name='recursion-limit'>
+      Limit match recursion to 8192; if disabled, the default limit is
+      used, which is the same as the match limit.
+    </flag>
+  </use>
 </pkgmetadata>