Version bump and add pcre32 use flag (bug #471608).

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 101 insertions, 17 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index bc0ea6a05049..539b64f9906a 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.210 2013/04/28 02:22:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.211 2013/05/29 02:24:48 radhermit Exp $
+
+*libpcre-8.33 (29 May 2013)
+
+  29 May 2013; Tim Harder <radhermit@gentoo.org> +libpcre-8.33.ebuild,
+  metadata.xml:
+  Version bump and add pcre32 use flag (bug #471608).
 
 *libpcre-8.32-r1 (28 Apr 2013)
 
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 8e898350f8ce..0729d89e741c 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -15,6 +15,7 @@ DIST pcre-8.21.tar.bz2 1174037 SHA256 a4b8509d11fc2764fb4e1415b764ad2c214459edc0
 DIST pcre-8.30.tar.bz2 1248556 SHA256 c1113fd7db934e97ad8b3917d432e5b642e9eb9afd127eb797804937c965f4ac SHA512 0d6fd24baaf75819e254898763ae0918a6455b822b0d72043c7c52d2b5e5880352ba1981544a5966b387bd2b242085cd4f418067e9faf8e93e809b42951c6ca8 WHIRLPOOL 22c6d5285419dc6464def133d974ecd2352aa08adae56cf16de87639edecd2d902f6604cf39dff64e7ded2da1b6c9936771dc003a872e1008db578fa6b678030
 DIST pcre-8.31.tar.bz2 1257162 SHA256 5778a02535473c7ee7838ea598c19f451e63cf5eec0bf0307a688301c9078c3c SHA512 bdc369b967f1d9db36d228fb291a436611d19c2f7df64a265a5c748f797763b8d66e161fd0ecd60a8a9f28fa3bc7d22d61e619c9a16c5a26c71923e2b1802145 WHIRLPOOL b9de376002bb9bc9e76bd845b78456088a46df2f1cd703f6b1d7174e93643123a13911d7055486ca1e4de7f84f13529b687893ff71abb1bcdd2a75dc8acc8e9d
 DIST pcre-8.32.tar.bz2 1361156 SHA256 a913fb9bd058ef380a2d91847c3c23fcf98e92dc3b47cd08a53c021c5cde0f55 SHA512 cd0d5b3367df242fd62e969ddbad6857aa2b65342ba7d11a7b8cb73a09a062339954ce136d8009547a9eb299b37f1461c38ff50da53cea3edaebd98482c6a33b WHIRLPOOL 882a83570303ea093c862ea2b0f632981d825b0dd4b2b771e7152edb31c527b89d8cb3a761a2a87ebb4c2f421ef84d87311d6ef519e7e46bb634ba1749864271
+DIST pcre-8.33.tar.bz2 1440869 SHA256 c603957a4966811c04af5f6048c71cfb4966ec93312d7b3118116ed9f3bc0478 SHA512 12ff53127c549a37241a32ad22b6d0dd50eb3c44546c56f4ddd5dd3e23b0c71060d5b9d12583f9ad98354ff01804269a4d51b166561787014b820e4c72e2e599 WHIRLPOOL b3658c6f4ff3fd6a582268cfdc1b5f3ad1aa4737f7f0ebd4db719472a1d2bf97318d13f8ac4027fa9dce7d26fc81efca4b7886da3e24513047e986d01bf55b09
 EBUILD libpcre-7.9-r1.ebuild 2225 SHA256 aecec397386853e85124ddc16f9e49a82410c4caf5b91eeb12143a9ff103e186 SHA512 59f6dce1be9415b1e6b088a41cb5757b0396a5bcaf4bf607895fd385aede373030a9cf93eb2f2c9139f802eac7179fec70368a0104f31ab5860f531c9138aabd WHIRLPOOL 76a56bda51367e351009bab2fbd00c05f40ad7ece8513942e18b7d3e140a7b55b848d1812bfe56397087f83309a22b498ce045bf2186a9f29d9e24cffd54cd37
 EBUILD libpcre-8.02.ebuild 2002 SHA256 63dcdf2d19395bf5c3dc000fc0eb6f7008f458027963b2bd40a6b701ad583dc3 SHA512 870f2100cae4f041f833a5d5ebe2c2213f1d12d520affa0cd0d11b4c2b85e3b132e9c2f7f0b638ac21683e555a62d56cc0f44cd13e71c0ac256401c640d289f0 WHIRLPOOL c7a2b49a2b556c36850fec13be911a70f64c7648e6ae597cf6b410ed10a39c629441e3d3a92973a900af0ef95847aa0f72a2dc40e36296bfa4c8a494bc58749d
 EBUILD libpcre-8.12.ebuild 2052 SHA256 f0c6fa4e1a8440bcdbb3cf79d6a61e613cc01004c1a2b48df2155f711122bc21 SHA512 60278ff6b195fdb839650ec538f220bf8d06a6bb57b4635a6b4a9e30a688f2a96c81b7116be5a9c2a1de2360114e86d716e980d1b9634186b02b66d28b4be073 WHIRLPOOL c5072f46590ac626721f8624aaaff1bd2281aa4c0e50a6e859503b2ed3a21d4ac87674f2a80e6dd3e474d381da09aaa48fec34030a9f6313fa680e4b109e920b
@@ -26,22 +27,17 @@ EBUILD libpcre-8.30-r2.ebuild 2345 SHA256 3697c4064533fe7f287c2c7350c1215d2ea2dc
 EBUILD libpcre-8.31.ebuild 2476 SHA256 e1fd01e9d5c13bcfd6c5f9d619c3e64859cda7851fcb4ac900a4c72e05d20a7c SHA512 227838120b616874a7dfb805c0c66822a5eb366008c9c61b6acf89ad61e457289e63b8a7f1db2ee707452d3a04495c35c3c26ba2100b60185298135eb3e64e11 WHIRLPOOL d78a22c79eb4df3ad15f3ed0b448f1ee4cebab858aa1794d4f2e0c4682a4a996f112d83760c9d9c4673380e10f06261061862e8b5ba9458f0e899101044a8373
 EBUILD libpcre-8.32-r1.ebuild 2528 SHA256 de749b66123bc6d95fd777056246e53276de070041a5b80fe449ec5cf4beb68e SHA512 638b38801fc718c260a7a71098f6eeae5f6cd0de8d1b1a6868e4bc4d33b8a7a7d4c23808c5e4cf459a719578a708154a568c7f5a73be8f50c1d1a9292613e6a2 WHIRLPOOL bee6cc716be6d70537b843db7a44d4a90ee727735486f17409f05e3a257233ff1c7f39f27c7acc2c4a4ad61e40a9997171347344971e718c78e20dc4d97d875a
 EBUILD libpcre-8.32.ebuild 2525 SHA256 df939966377ae4b75df4fbbb2aa10417b1aac6d166530fc7b119abb626abda07 SHA512 030c3904eaf1c1275a3f2b3b28d3897a7462fcd4ff252f49f3ad0362d9db413679487aefa1d7a954d6f70aa6da073097939a7cedf31cc69c0da349dff67012ba WHIRLPOOL 8a6eed071401a8054417d0f4a050bea92dedd6873fec8df20482a9addfd4d9549f05ac0aae2c8306b1d53843cfefb40244338aa4700ccc1b122d6f4c1c999b2e
-MISC ChangeLog 28430 SHA256 d16612b4b7ae79fc661b386d9c81fac9ca3d129d794a4d2c5baca65c73d8c44c SHA512 f6043b6a3114d39c9f6c79be7323dc34d3f8b23fc77442ed9d74e93ecc1f9c07c280673fd2a891662e8705e1b9eaea598c5747ec71382b925fced24336746e65 WHIRLPOOL c6c298a4952121c309c16e14686235176d69637f549241af3a57c34d267eba419cd7cf34dfc8bb421890a1990dd03e4397f05a167225720bbf2d17d20617be3b
-MISC metadata.xml 873 SHA256 23f40a4e5c46ece49e04940cb994be87112b0060a864b0e844b5b9faf2871459 SHA512 b4f9ab3b318f1e78e72613c097007108eac2c81c94908a18707363f032ef8185f73d1e5bb209299f42b87459a76c61d87404df43df0bb46c67d22ba6139c7364 WHIRLPOOL 8e15c996a1288697fd4b406fedcbd2f2d1e570b6f977b4dc4bc690a3e299e4a854aa1396685d2855551da128354994f303ddc04de362fbe2f25e2802fa4dc8a4
+EBUILD libpcre-8.33.ebuild 2560 SHA256 324dea274e5d43862858ef985b75f74891ea10445934571247d3962f9dd4c3ee SHA512 880d496ed0bdcd425f092a8db53d91e3996979ad28c35ec3dab6e1ef78090eb3bfc950ea93a8b7313f0ad00168161464e32395fd7095333698a55c647222d421 WHIRLPOOL f8baa81c4ab3adeef66c5a117e33165b2094a52db231493dc93016954f9a1280e34e25ea287f3ec2b2ae66afada6271ebf51a6555fccbce8f98e2da514f692a9
+MISC ChangeLog 28604 SHA256 c2f6b2b4405b367d6f53fed81d442ad3a635f805d01e4fddd7e9c7f7169ed523 SHA512 79b98e909b6db55a1c2e8a2b02f07426fd6abe9822e4bcdcf0a1fd819a7156fbbc8ee2603a2e024de20f398540d3f42d6c4d35c87dfb5ca86ef89e8a00bb6a72 WHIRLPOOL 1cc45be3b2dae8d2e4123ebba0bf6978ce36d3dca1041af4e899d4752d9155523a39f11476b6a123ea8d0afc167450ef53bc44da4d2b89a874ba5159df16f93a
+MISC metadata.xml 944 SHA256 f5677c319d3a5b8ae7978399b2a5dda00d0bab65b5e88a496f6846e443f019eb SHA512 30a4ccfcf3561154ed8db0cba0c1fabadf6c965e4f2e942c83ea9c3fb295d3d23a5ebaad7b58256b57966d9b8be7a254f2146ab2e93ca550f1df8b40cac2ac61 WHIRLPOOL 69eb719edf1d729eb365d293e86e44ca7d147e1207a9f6a46da391b0586dbfc6b93cbabf3a561729d7adf65983195b6d26e7f428d3e464d5a77e647a5ece38cc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRfIf8AAoJELEHsLL7fEFWwxcP/i5sgnL9yjWL66LSWDFbZwG8
-3hXyOm/Ct44gFlGtIn7KjLE4zoC3umZuWFs2RF69xRH37bfro/QuWcNFd0hhRL4I
-WH/sSb76/E0JfTKW9KUmjjguH61HM5vWGa4sb/2MSO+xZdAvLywMhqQ9PeTR3e4v
-HAFPdyGsBrzdsazDO1s9KboROHCjiA5sEG3sV2gpTPvzKanqfNtJT1p/cgDQpYkK
-6Fec93b+bBanmVpLdQx9i1uQ5oKWFsu//vEgdR9Im1t/2i6YuWkWU1DpSDX92ky0
-NqlwJwOQ8mELMN6YCGQsWTN9Kb6Cq49oIAMgfSpA8dnupU+/ZXCF/gYBMVmGlef+
-N0MPBVH0M9BkSfQaXq2ZMeKkr8w23s4qBBSc7aLS3IJnS1cw8MfpFLdvHpqlzE8I
-xBmx+twxRRdy03cd5i3ye+AMjP53Gx/4BdwwT45yFegpHc4KPHgFmt1kK0WwmVSV
-Nw7tiggjjb+prk8/SR736NCNx2PGXfLslUMCBSaZiTLNPfrj9pDYTW9GdISStjH6
-RqiCBFTSo57jFFNckm7H+c2dFmfjX9QEJwoHacse6vqOt7izy1T81+aPzEaplOZ+
-MNW1ZczwLts5lhMuYkKZNkCWGnQ02Jcl4azCz95STSCH+MkKyif8/hduGtWCaFfD
-Cfhjxnpli3gzFkwLak2y
-=zvcw
+iQEcBAEBCAAGBQJRpWb0AAoJEEqz6FtPBkyj358IALgO7v7g6TbSAyOAGkTh3GUH
+bGMgjllpf6Nhoxk82kO2iVVsBa05dyv7fy2pEKUDJp2ukJ4nKouEYIdPEB/lw06q
+1KhZiP2Z06CLdF0uAjNLFx5h15jCctHZVZ9LEV8MNrJDEc2kf3sZkakpqQLN8RCA
+grmOb5MBtrunUXgTHyN1HoZUGsrcGQEJ4X2cRTJd9BL05hyX11c7dxkgzGlSyfHd
+tefpXykgSAvpLlbCHjsEo2RCjJJK1E6hOCdwE78yW9FZtRij/0LPk8j0SUSU7Npj
+mPPMGEV3ZuKbzpvziaGThQrUWmdH5dcM+8Lmue8KL50QzVt9wFBnT/2gCztRw68=
+=VWwO
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libpcre/libpcre-8.33.ebuild b/dev-libs/libpcre/libpcre-8.33.ebuild
new file mode 100644
index 000000000000..b3fccd26b044
--- /dev/null
+++ b/dev-libs/libpcre/libpcre-8.33.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.33.ebuild,v 1.1 2013/05/29 02:24:48 radhermit Exp $
+
+EAPI="4"
+
+inherit eutils multilib libtool flag-o-matic toolchain-funcs
+
+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 ~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 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	local pc
+	for pc in *.pc.in ; do
+		echo "Libs.private: @PTHREAD_CFLAGS@" >> ${pc} #454478
+	done
+	sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
+	elibtoolize
+}
+
+src_configure() {
+	[[ ${CHOST} == *-mint* ]] && append-cppflags -D_GNU_SOURCE
+	econf \
+		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \
+		$(use_enable bzip2 pcregrep-libbz2) \
+		$(use_enable cxx cpp) \
+		$(use_enable jit) $(use_enable jit pcregrep-jit) \
+		$(use_enable pcre16) \
+		$(use_enable pcre32) \
+		$(use_enable libedit pcretest-libedit) \
+		$(use_enable readline pcretest-libreadline) \
+		$(use_enable static-libs static) \
+		$(use_enable unicode utf) $(use_enable unicode unicode-properties) \
+		$(use_enable zlib pcregrep-libz) \
+		--enable-pcre8 \
+		--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
+	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/metadata.xml b/dev-libs/libpcre/metadata.xml
index 56495e42d0c1..fce98fe2ae4d 100644
--- a/dev-libs/libpcre/metadata.xml
+++ b/dev-libs/libpcre/metadata.xml
@@ -12,6 +12,10 @@
       Build 16 bit PCRE library.
     </flag>
 
+    <flag name='pcre32'>
+      Build 32 bit PCRE library.
+    </flag>
+
     <flag name='readline'>
       Add support for command line editing to pcretest, through
       <pkg>sys-libs/readline</pkg>.