Revision bump, add patch for libpcre-8.32, drop restriction for <=libpcre-8.31, patch by Eleriseth (FMS user)

Package-Manager: portage-2.2.0_alpha149-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x35899067

4 files changed, 65 insertions, 11 deletions

diff --git a/dev-libs/poco/ChangeLog b/dev-libs/poco/ChangeLog
index fa5fb95b44f6..65455a51d261 100644
--- a/dev-libs/poco/ChangeLog
+++ b/dev-libs/poco/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/poco
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/ChangeLog,v 1.20 2012/12/20 16:56:18 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/ChangeLog,v 1.21 2012/12/21 13:15:07 tommy Exp $
+
+*poco-1.4.5-r1 (21 Dec 2012)
+
+  21 Dec 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +files/poco-1.4.4-patch-for-libpcre-8.32.patch, -poco-1.4.5.ebuild,
+  +poco-1.4.5-r1.ebuild:
+  Revision bump, add patch for libpcre-8.32, drop restriction for
+  <=libpcre-8.31, patch by Eleriseth (FMS user)
 
 *poco-1.4.5 (20 Dec 2012)
 
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index 9acbff1ca49a..1fda9c11364b 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -9,6 +9,7 @@ AUX 1.3.6_p2-gentoo.patch 3726 SHA256 1555ce072ac1e6ad37e1d570dfd2b0d9862aae4629
 AUX 1.4.3_p1-gentoo.patch 3778 SHA256 f856ef1329bc1ae5c40ef78bbc8798d1f0b0f6fbc71f2f52326954693e4d9e3e SHA512 4fd531b1be72eb92bdd3986cee2151e6244176a4d6f8fff2367bcc32b70c773b33b3407e0cce578d91796561a18101694baac5c099eb7a725ecb9e6775745d06 WHIRLPOOL adebd430e823069ea9890fa7bb975080f5ffb4751fd20f6314840660b6566fd2ddd46c2025e67ba4b1a52d74e1fd5db5b3fbf880a65ea7f16aabd58b8454c74b
 AUX 1.4.5-gentoo.patch 3198 SHA256 3beb9d686f4d09ee65764b3807a94858d64edd5b1a07821adfa31b4384790364 SHA512 f100138e529963b63cdcc77bfeefef8e9402f3622e6145de0e8b092b2ff4ce1167c9d7f16401417a6d3bf7f52a2a78546a62487d646424bf22a1c0d5633a9f9c WHIRLPOOL 063cb6e273d6103c4e44d373774c63825680baaa80d846aab34cc66f2d5cbde5d7ee18d4003be71f0ff7d1081cb37ca6ee96eb08d6829be4acbf7860e21b3f6d
 AUX libpcre-8.13.patch 339 SHA256 cadb2f6099f7f23c1fd0c2a522de12ef2ad57e71effe209f951bc11ecb8f40e5 SHA512 090e9ee1694ba1b91ea2d28b5e518ebbc098c19ba0f02ad7a830de5f41a31b11aeccd2524d5412d638229a75b0ef19fa05b0d6af0e31930b533db4c11a7fa719 WHIRLPOOL 8024a825ca4754df76087906e48b8fb30d84287b48024b1f6558b19500127a8c05411c1b09b30ebb717bdde9d34c15bce8cdc1a859fde02b2150e9ebe60bd7c2
+AUX poco-1.4.4-patch-for-libpcre-8.32.patch 1970 SHA256 e5e0328898393d28e8caccf983b3ac4486af35844a2af9f68c79f7ade247c467 SHA512 955a1ed90c1a3ebe50e110ef650853e9e8784aa9ca7c8806478ee4689d886b31f6afb6f613d290dd19b174243001083d975135175027615bf182ad41a9c413b7 WHIRLPOOL 060427a5ecfbdbb61a2ccb131a6f360f9879365d729ab672ebf7c990d8f828fdc24e1693f63e191c4c6bbb65b49c8909e4ebc6b224f0a9133305269abadea646
 DIST poco-1.3.3-doc.tar.gz 924194 SHA256 5edcc2216807c05ba236d4d8423c05c1f4645438196816db33380a4a2f543167 SHA512 7a66db3494b8565df65e280f010ab83de8b06a80636e192dea3b1036d509a8a0b068a77bf6b7ba1a45b8a4ce78b105299011b75fcc218e074246f065a3b4a45a WHIRLPOOL 6721b9d79f290f53ef61026ed00adf52e3b39bb6743c56b1dc6bd4d4f6145f59d9358982adfa591e3e753f2147c9b6e620f6faaa87c4738d9d01767a2971a37a
 DIST poco-1.3.3p1-all.tar.bz2 2011910 SHA256 9b011301f9111b21c37684fc3c2f8a85356300f003b1f827ae2de196e2c11909 SHA512 608b28b170c24576accdfbc6fce925f97f842210bfae2af0f28fd26bc3fad30e96a27b1be60c64e234ca7aaa85b5532dc70424fb6f0ba8d68f5e2f34d4047464 WHIRLPOOL 60430e6a2c93ea0f9d2ce8ccf6e00b69867053b15b508c3b8a512d970f863cea51ff4927ce7568b15c0648d36a06d5f58892f06de6c45e5acf99f9596137c6a4
 DIST poco-1.3.6-all-doc.zip 1911077 SHA256 ccd0920cabfc61969f168b0fc63e3bd8a718f87b055f4da92c6b67539124208e SHA512 682b5c124748c894529d9ad1af52d890ea37aaa4638486f2b76131f19f240381a7d94d5d4ad36af512d25973356220ef6e0267ba827d3f31af2276ad86d33744 WHIRLPOOL ce0105adc405b0727cbab3feb4837ef5b2f04d50681be7a05e1061f0b20fb743e87954a2de7a6ddc4447bccc3ae99dcfb4a45f1bc4ef9ecf8b99f9ef095765f5
@@ -20,15 +21,15 @@ DIST poco-1.4.5-all.tar.bz2 3128716 SHA256 e33a4a8a9bc7c696ec1e54faa56c76adf360f
 EBUILD poco-1.3.3_p1.ebuild 3385 SHA256 ded40f4286a44d062686293a81171020ca6e8194a7c3d510aad347d8b4da3a9d SHA512 5a69ec536778a63206926a2f6f79383acd8e789a97179e57b7072bf35e6a86113d5ce5789a067746ed8fc0ab279f47ae54c5ba1d0dff7338db557802bfa5ff97 WHIRLPOOL c1328c7dc35b8c6c8279ebfd0f2e500072ed4d819470117a67d15d0d54dc7a91e6aed23cb0ac7632e490a7f0a53f2cf06d48853e78c278ee25a9318cab5b0eb5
 EBUILD poco-1.3.6_p2.ebuild 3437 SHA256 8ee0ae8876e590e3e3db9fc60d3e07aaef5b621d38201333520638694dc671f8 SHA512 9a5ade7d6131ef41140efed27dcaea237949984deaadd97f1a88063ca2850f0d489009d56cf29c89620426fe2141d9e6095e913c8fd941307ba8a43bfe157896 WHIRLPOOL 4e2c4714be76cf0b0a76cf74f3791bd3c2e4db9fa9b1b14b2f3824eef299ef70ef8f1fbfc55451519229ef4e0a27745ced63a9bb2ff42327f84f47cc318fb440
 EBUILD poco-1.4.3_p1.ebuild 3503 SHA256 babe4ee18e7c9e06edb19f8d75b10b2ad630fecdc578fda3a14470023de5a16e SHA512 decbfb01532f7d786ce74a5212d86532d838eb0fac546aa6832f858d54f5cbe891d7381180a75a6129f86f162d2d831dabdf7ef9961bacecfd0b40eb15d4d936 WHIRLPOOL f23dedd798cfc0151721eae6d2e2f6540f96a5a5b890322cb8a213845c21b18cc3a97f9bce14a9e42a0af1279c86abe280d8d24c3e03cefdefd95d73d5d16f31
-EBUILD poco-1.4.5.ebuild 3464 SHA256 425385b33898ef6f6b662b52d946795da5dee53a7c2890106d1212bf069cebf8 SHA512 399e2fd8cfe8fc89eee2ccbb4375aa26d22aacace82a6a125c8a3b15bf76d8c82ef671365241bf0547c8aa654d37fbb2877aa032981a929e1d285dc6fb3cd579 WHIRLPOOL 9234f8e65bd7aeb9a039ea1bf416b00947dd4f021cb1d2f6050795cb1152ff976d49b9bad20ff8df1047c5bd48c9f4e8892b36c74c599e2494b5aed85471f7bb
-MISC ChangeLog 3497 SHA256 7aa900b55260d52a9fce279d99bee534c805a375e96d8e5a1e73bb2bc5908492 SHA512 85d8b8db7376040f21e651662c1575a7d7f49339c432a14eacc4d3603494b922b3fbccd36d8fc26183be6df6b52ee11698abaf429351e66d94efacd0bc388a9f WHIRLPOOL 589d96a1f10eeb1da5d622e997d50888dc9175a9bff2d7e0e02dbfbb726e44c1aa6137a0c80f46e6de9d1295c3beb453ef5fc241fa28637fa75feb982f26dce5
+EBUILD poco-1.4.5-r1.ebuild 3500 SHA256 07c514ebb1363ed9f56a1d5d10c5f5f7344238202bba29339352e609761cde7e SHA512 d6bfdd1abd2661195d93a078ed4b881bfeaf3223002ae6c16a8644bf9a2e4d356931e7f0be77e91c1312fbdd364c8194087b75b7962a98a35c4688a84db5992d WHIRLPOOL 7afab86a294df6503bb1c4a20efa9a931dd0677d16264b02e9ba63e8a288d9634bf610e5b96aff48fadf1f7e6c02e0c318093927faf8bf4456fda616c0296e26
+MISC ChangeLog 3796 SHA256 0f3e61997e5289519e7f968de8354010fe749a32cfa211afed5b246351c6126a SHA512 1f4107a8f24b1eef248d79d7bd311c704cb9ae9ff0bf5997feb43439116e2528a693472a4f2301ce61c1ef8eca51ebd5b7031a30e73ac4e9eb6b0e6b4d2d006b WHIRLPOOL 7126b8ee8d4b4fddc010e4fc46423b66d8d0c3bc1fb8fb2d0237efc78d7de74b4a4f657b236e51b3291a54f3c889306b03704a516c35c7fd43f198e5641019f0
 MISC metadata.xml 1222 SHA256 d28bbe65a45a5d1bb144ffde4b17ea70af62e4d7432cd12fb26f43645e12ff49 SHA512 4ad4f4ff5288eccf854a488042833787906966ab047cb8009d09d15af7cbee8306d0dbe850a556a4e05209852753b2662de08ec8b0f5754361e4f8b5c8d980de WHIRLPOOL b05756d97565723de5344eb38aaf88652084df9e1285f86c45dfbd01ae7cd114bfe2d3c49c960bcbe20d0cfc8d62971b52c44944182bf2c162b1eb0991fb726a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlDTQzkACgkQG7kqcTWJkGc0fQP9G0mh149ZIB2M98sblsxYS+iy
-PWAwIaqhPHjzkxo54Fv9B8XEXwCPSoO8VUIejL73rQFzVeLI6SWABFmYwHcHDlr5
-MClArR50LhcdbCeRKSVSTQlqdlvFpfyU53L7yANAKjxJVZuiHeSYgbpjiE4wnLSN
-v2OXzmHS8RvmNLWhPfo=
-=a0td
+iJwEAQEIAAYFAlDUYOIACgkQG7kqcTWJkGeLQgQAoTmliX9GIri1xK29u7H9+lDc
+ABcqD7q8DojK/qqSd4jppBYV50CaJGkcO3QQXW+QOFIVjpMratDOdyCJDLTf8YeO
+8Cc0qhWHCqT4i6e5qk93KQo8n8o4EswLBg9pM6VioWHC7JY5ibIAF/nROvJgA9PS
+yGHOfwEAOwukEIGohGQ=
+=Qy2q
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/poco/files/poco-1.4.4-patch-for-libpcre-8.32.patch b/dev-libs/poco/files/poco-1.4.4-patch-for-libpcre-8.32.patch
new file mode 100644
index 000000000000..d2654b59edec
--- /dev/null
+++ b/dev-libs/poco/files/poco-1.4.4-patch-for-libpcre-8.32.patch
@@ -0,0 +1,45 @@
+Index: poco-1.5.0/Foundation/Makefile
+===================================================================
+--- poco-1.5.0.orig/Foundation/Makefile
++++ poco-1.5.0/Foundation/Makefile
+@@ -45,6 +45,7 @@ pcre_utf8_objects = pcre_ucd pcre_tables
+ 
+ ifdef POCO_UNBUNDLED
+ 	SYSLIBS += -lpcre -lz
++	objects += $(pcre_utf8_objects) # unicode.cpp uses internal pcre tables
+ else
+ 	objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)
+ endif
+Index: poco-1.5.0/Foundation/src/pcre_internal.h
+===================================================================
+--- poco-1.5.0.orig/Foundation/src/pcre_internal.h
++++ poco-1.5.0/Foundation/src/pcre_internal.h
+@@ -1109,6 +1109,16 @@ typedef struct {
+ } ucp_type_table;
+ 
+ 
++/* renamed to avoid clashes with system pcre */
++#define _pcre_utf8_table1      _poco__pcre_utf8_table1
++#define _pcre_utf8_table1_size _poco__pcre_utf8_table1_size
++#define _pcre_utf8_table2      _poco__pcre_utf8_table2
++#define _pcre_utf8_table3      _poco__pcre_utf8_table3
++#define _pcre_utf8_table4      _poco__pcre_utf8_table4
++#define _pcre_utt              _poco__pcre_utt
++#define _pcre_utt_size         _poco__pcre_utt_size
++#define _pcre_utt_names        _poco__pcre_utt_names
++#define _pcre_OP_lengths       _poco__pcre_OP_lengths
+ /* Internal shared data tables. These are tables that are used by more than one
+ of the exported public functions. They have to be "external" in the C sense,
+ but are not part of the PCRE public API. The data for these tables is in the
+@@ -1153,6 +1163,11 @@ typedef struct {
+   pcre_int32 other_case;
+ } ucd_record;
+ 
++/* renamed to avoid clashes with system pcre */
++#define _pcre_ucd_records _poco__pcre_ucd_records
++#define _pcre_ucd_stage1 _poco__pcre_ucd_stage1
++#define _pcre_ucd_stage2 _poco__pcre_ucd_stage2
++#define _pcre_ucp_gentype _poco__pcre_ucp_gentype
+ extern const ucd_record  _pcre_ucd_records[];
+ extern const uschar      _pcre_ucd_stage1[];
+ extern const pcre_uint16 _pcre_ucd_stage2[];
diff --git a/dev-libs/poco/poco-1.4.5.ebuild b/dev-libs/poco/poco-1.4.5-r1.ebuild
index 04ef7819b9a3..e09cfd07fa82 100644
--- a/dev-libs/poco/poco-1.4.5.ebuild
+++ b/dev-libs/poco/poco-1.4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/poco-1.4.5.ebuild,v 1.1 2012/12/20 16:56:18 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/poco-1.4.5-r1.ebuild,v 1.1 2012/12/21 13:15:07 tommy Exp $
 
 EAPI="2"
 
@@ -19,7 +19,6 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doc examples iodbc mysql odbc sqlite ssl test"
 
 DEPEND=">=dev-libs/libpcre-8.13
-	<=dev-libs/libpcre-8.31
 	dev-libs/expat
 	sys-libs/zlib
 	mysql? ( virtual/mysql )
@@ -33,7 +32,8 @@ S="${WORKDIR}/${MY_P}-all"
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PV}-gentoo.patch
+		"${FILESDIR}"/${PV}-gentoo.patch \
+		"${FILESDIR}"/poco-1.4.4-patch-for-libpcre-8.32.patch
 }
 
 src_configure() {