Version bump (I need the new version with JIT to test new ModSecurity code); add an enabled-by-default (following upstream) jit USE flag to enable the new Just-in-Time compiler of regular expressions. Also add a readline USE flag for pcretest that now can use command line editing. Add description of USE flags to metadata.xml. Also fix in 8.13 the wrong _rc conditional to fix the SRC_URI setting.

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

5 files changed, 105 insertions, 11 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index a3b13d551565..c61725b6a780 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.184 2011/09/17 04:47:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.185 2011/10/23 16:06:55 flameeyes Exp $
+
+*libpcre-8.20 (23 Oct 2011)
+
+  23 Oct 2011; Diego E. Pettenò <flameeyes@gentoo.org> libpcre-8.13-r1.ebuild,
+  +libpcre-8.20.ebuild, metadata.xml:
+  Version bump (I need the new version with JIT to test new ModSecurity code);
+  add an enabled-by-default (following upstream) jit USE flag to enable the new
+  Just-in-Time compiler of regular expressions. Also add a readline USE flag
+  for pcretest that now can use command line editing. Add description of USE
+  flags to metadata.xml. Also fix in 8.13 the wrong _rc conditional to fix the
+  SRC_URI setting.
 
 *libpcre-8.13-r1 (17 Sep 2011)
 
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 2b747fbd6b89..7dd985e2feed 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX libpcre-7.9-pkg-config.patch 1487 RMD160 b9e583ed8776a16cc1ec2c6dbd5c0153d6fdbf88 SHA1 57d60963fd635883a7eacdbed411405a28751fec SHA256 d247cbd8bf85a4e898e0f7512e27bebaaf121e020fd2b85dc04eb6a3c041cd70
 AUX libpcre-8.13-posix-regex.patch 1223 RMD160 413efc35a55410be9e2074166c15f08081f11644 SHA1 84e3ce23c948a2d0afe9e90e83b6ec0eaa0a9e6e SHA256 d31e0eac4c6b24d57e89e56bc16332d1d0a349a0af2a6c6031134c2d1966d2f0
@@ -7,17 +7,19 @@ DIST pcre-7.9.tar.bz2 861580 RMD160 e7ccae1fe3d2cf3ff3264c6e6ad3486c64fe1cec SHA
 DIST pcre-8.02.tar.bz2 956462 RMD160 5a29c3d5e61ea877a6e3ab2b9e70f426c7f34771 SHA1 2cf2f7f04988813c7ce45c43eb934f3b8b1c3b34 SHA256 a4759036d9c3e1773e8b680827b17b843f724ef9021744db92b8dd35ebac4ebd
 DIST pcre-8.12.tar.bz2 992502 RMD160 ec7978604cdf92d8dbd98e0d0c360fe35eb62021 SHA1 2219b372bff53ee29a7e44ecf5977ad15df01cea SHA256 c63070d461edc451ec9457f2324e152a531e907d5c5d2d8f8121e725acd1aeec
 DIST pcre-8.13.tar.bz2 1037903 RMD160 0448109dbf489e4c18cd9e2a0cf97a33ff7e5364 SHA1 4dedf8f2e1d7fb29bd00e62bcd26ca3ba71ff9bb SHA256 3384624ea3281af5fc83400e1fd184e0bdd49e1705315faefd7cfe91b739b504
+DIST pcre-8.20.tar.bz2 1164103 RMD160 805cc578019cbf3eba993d3176b78a3193ec16fa SHA1 6264472669d8068338cd32128cd4e9742587c676 SHA256 e06b0943ce4b0f15324a20020d6086760a75b72f5ad7c23b9b2bfe690ed49acd
 EBUILD libpcre-7.9-r1.ebuild 2219 RMD160 d078f40adb1033becf323f99c9df6b3400a1e3fd SHA1 bfb5fd3e9f9363f716a07a3fb6f4c67143b2f0c4 SHA256 fc0cf38ae0747fdfef18fddeece0884f8b581b9dc3bdc547d585ac87a7ebb2cb
 EBUILD libpcre-8.02.ebuild 2002 RMD160 cf478287ed467c9a0d4e336d5af51e33a62bf642 SHA1 e1173cdec48309c387a7461dcac8f8a907fd12be SHA256 1d2ecc5a099793dde0af22358aa1287b7b6a6fc5690c482dfc3e684a2636c68b
 EBUILD libpcre-8.12.ebuild 2055 RMD160 016b220208b92980fc9293af651dc29a27d4d51f SHA1 c7a3f50fc07b60300cc999fbf6bf96648598fc9a SHA256 06d6bd9bea9fa62d1f0c9badc7ce050d91bda100d355b0ff3c477fc0ab0b3eeb
-EBUILD libpcre-8.13-r1.ebuild 2005 RMD160 778f9b7968409227cd07b85fbed968bd06fbf95f SHA1 c1cbb927943cec4e8457c7c53e8723ad1f720fe4 SHA256 13ab25c061ace9463d16c5d6c7f92f3f80af783a0c25761d994efff14fbdca1f
+EBUILD libpcre-8.13-r1.ebuild 2008 RMD160 1752965932619299f93d041a06461b843ef2a20a SHA1 959ff7bd70cca371d55ea7f7663103cb3773036d SHA256 7757d5f0cafe92b22a08ad02c68a11579478d07c754a34efb570167eb4e65af5
 EBUILD libpcre-8.13.ebuild 2041 RMD160 6a6c3b40102171812eb9e94e3164d1cb308d640f SHA1 6bc9fab9da7fc901ebc96064de9d19fe9f3f52cd SHA256 dce6fb93e8f04515f1c8a8991d9c84c70dbe5d4942aa44bc8e4470d0780e0185
-MISC ChangeLog 24232 RMD160 7b8ed74e500e659d2c938fbb5cf73f49336ab5aa SHA1 bd22f7e2dabf42ce0f9825cc65ad4145258a05e0 SHA256 aee4bb24b820d875e59d3be5a78ec1431228174da5149a89c8c208da54e8e330
-MISC metadata.xml 350 RMD160 5224f17e5a48e04717eabc1c716d640850bb9b38 SHA1 cdbd6adbdc7271ef217001a3fd7616ac5f491feb SHA256 43fd555785f7e73e17e21727705df12cd8b00fae32e13fc4dca22a0135b9c770
+EBUILD libpcre-8.20.ebuild 2098 RMD160 bf81699e87299c6345916d719a30573fb192eb24 SHA1 a7043269918c1799bd356c339653d97ebfee2da9 SHA256 f1f6cfb7b076ff499bceb1fd3f99cbfe045c87317e5706241d7c88224d5ab213
+MISC ChangeLog 24794 RMD160 3e73bfcf85ac1b44e88f670b5cc75fa67688c022 SHA1 91c57425a6a6a6daa1d797d153b55ab29b1fa999 SHA256 308ccbcbe1680f429f75c5e0dbc345c124a0163c52104ba0ade5f10cca6e4d12
+MISC metadata.xml 1067 RMD160 cc89a280b564244a38011086dc33605aa9c03ae1 SHA1 8a40ffa6b0f7a65b8637d4f99769fba480c96778 SHA256 0dded51522c3ba4fb83181b69c7cbdcf8c84cfe9e711d1a0a312693108e6541c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk50Jm0ACgkQaC/OocHi7JbP/wD/ZPzvcX0IW0dJ7K5XHP4Sv3p4
-FT9tRGFaehrGnzotEGkA/2LcVm/DcOFQZ5aFSfcHVrOtDqHPzvRM/EPfal7v4AlU
-=Kiqk
+iEYEARECAAYFAk6kO5YACgkQAiZjviIA2XjXLACg4SaQEVwrLp9gDYyPD/58IBzV
+o2oAoKdIQksX/WF/AVvLZ+8QHrI+0Za/
+=HB/7
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libpcre/libpcre-8.13-r1.ebuild b/dev-libs/libpcre/libpcre-8.13-r1.ebuild
index 4bb6bd0289e2..a8a378644466 100644
--- a/dev-libs/libpcre/libpcre-8.13-r1.ebuild
+++ b/dev-libs/libpcre/libpcre-8.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.13-r1.ebuild,v 1.1 2011/09/17 04:47:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.13-r1.ebuild,v 1.2 2011/10/23 16:06:55 flameeyes Exp $
 
 EAPI="4"
 
@@ -9,7 +9,7 @@ inherit libtool eutils toolchain-funcs flag-o-matic
 DESCRIPTION="Perl-compatible regular expression library"
 HOMEPAGE="http://www.pcre.org/"
 MY_P="pcre-${PV/_rc/-RC}"
-if [[ ${PV} == *_rc* ]] ; then
+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"
diff --git a/dev-libs/libpcre/libpcre-8.20.ebuild b/dev-libs/libpcre/libpcre-8.20.ebuild
new file mode 100644
index 000000000000..dae8c4fe68eb
--- /dev/null
+++ b/dev-libs/libpcre/libpcre-8.20.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.20.ebuild,v 1.1 2011/10/23 16:06:55 flameeyes Exp $
+
+EAPI="4"
+
+inherit libtool eutils toolchain-funcs flag-o-matic
+
+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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-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 +readline +recursion-limit static-libs unicode zlib"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	readline? ( sys-libs/readline )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
+	elibtoolize
+}
+
+src_configure() {
+	[[ ${CHOST} == *-mint* ]] && append-flags -D_GNU_SOURCE
+	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) \
+		$(use_enable bzip2 pcregrep-libbz2) \
+		$(use_enable static-libs static) \
+		$(use_enable jit) $(use_enable jit pcregrep-jit) \
+		$(use_enable readline pcretest-readline) \
+		--enable-shared \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	gen_usr_ldscript -a pcre
+	find "${D}" -type f -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-libs/libpcre/metadata.xml b/dev-libs/libpcre/metadata.xml
index 363611f5805d..2aa21cb4961e 100644
--- a/dev-libs/libpcre/metadata.xml
+++ b/dev-libs/libpcre/metadata.xml
@@ -3,9 +3,31 @@
 <pkgmetadata>
   <herd>base-system</herd>
   <use>
+    <flag name='bzip2'>
+      Add support for pcregrep command to search within
+      bzip2-compressed files, through <pkg>sys-libs/zlib</pkg>.
+    </flag>
+
+    <flag name='jit'>
+      Enable Just-In-Time compilation of regexp bytecode to machine
+      code, through the SLJIT compiler. This feature might conflict
+      wtih security mitigation strategies such as NX/PaX as enabled by
+      Gentoo Hardened.
+    </flag>
+
+    <flag name='readline'>
+      Add support for command line editing to pcretest, through
+      <pkg>sys-libs/readline</pkg>.
+    </flag>
+
     <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>
+
+    <flag name='zlib'>
+      Add support for pcregrep command to search within
+      gzip-compressed files, through <pkg>app-arch/gzip</pkg>.
+    </flag>
   </use>
 </pkgmetadata>