Add missing patch

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

3 files changed, 86 insertions, 7 deletions

diff --git a/dev-libs/poco/ChangeLog b/dev-libs/poco/ChangeLog
index 3c175b9b9152..348ad0aa8059 100644
--- a/dev-libs/poco/ChangeLog
+++ b/dev-libs/poco/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/poco
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/ChangeLog,v 1.22 2013/09/01 11:14:43 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/ChangeLog,v 1.23 2013/09/03 19:26:58 tommy Exp $
+
+  03 Sep 2013; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +files/1.4.6_p1-gentoo.patch:
+  Add missing patch
 
 *poco-1.4.6_p1 (01 Sep 2013)
 
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index 1fc7488bf871..a11fd4482ea3 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -8,6 +8,7 @@ AUX 1.3.3_p1-unbundle_libs.patch 8075 SHA256 63ae188d12bdef000eeb33ce79b045f01d6
 AUX 1.3.6_p2-gentoo.patch 3726 SHA256 1555ce072ac1e6ad37e1d570dfd2b0d9862aae4629425ad7443335952887e3e7 SHA512 67ec0b4c96e588d2e03ad28bd330806174216a174f750d9523a7f684c1e44539d5e028e95d0d2b578c170fb8cdb84507def947a564232ac9c1c6af6e5b446331 WHIRLPOOL 7dea5a576a2a649a392ccfb4e6cfb8dfee918d73b87631ba6bcd72e85e5686dde64cab0a6114fe17b7350e47957410b1766523ff3708c93ff768c8f60d9d02b1
 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 1.4.6_p1-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
@@ -25,14 +26,14 @@ EBUILD poco-1.3.6_p2.ebuild 3437 SHA256 8ee0ae8876e590e3e3db9fc60d3e07aaef5b621d
 EBUILD poco-1.4.3_p1.ebuild 3503 SHA256 babe4ee18e7c9e06edb19f8d75b10b2ad630fecdc578fda3a14470023de5a16e SHA512 decbfb01532f7d786ce74a5212d86532d838eb0fac546aa6832f858d54f5cbe891d7381180a75a6129f86f162d2d831dabdf7ef9961bacecfd0b40eb15d4d936 WHIRLPOOL f23dedd798cfc0151721eae6d2e2f6540f96a5a5b890322cb8a213845c21b18cc3a97f9bce14a9e42a0af1279c86abe280d8d24c3e03cefdefd95d73d5d16f31
 EBUILD poco-1.4.5-r1.ebuild 3500 SHA256 07c514ebb1363ed9f56a1d5d10c5f5f7344238202bba29339352e609761cde7e SHA512 d6bfdd1abd2661195d93a078ed4b881bfeaf3223002ae6c16a8644bf9a2e4d356931e7f0be77e91c1312fbdd364c8194087b75b7962a98a35c4688a84db5992d WHIRLPOOL 7afab86a294df6503bb1c4a20efa9a931dd0677d16264b02e9ba63e8a288d9634bf610e5b96aff48fadf1f7e6c02e0c318093927faf8bf4456fda616c0296e26
 EBUILD poco-1.4.6_p1.ebuild 3500 SHA256 c2b696183687d12eec140c9c3fb6d7ba16b172f858a1bd61a196fb27a8f0ab27 SHA512 0086c98274bf7b6e4fd3449ec2c9eb168a7dc0ec26a7214f044204a7581907427b4f67d19a45dd6782208a42ecfedb7b0879900d7859205d6b6c24c547bb0038 WHIRLPOOL f543dffbdb49158736968593ae2d7208f55bea6fb71cf7c12aaa2b286161c57282ce35f2480010c316362f503f204bfebfc13a92469a38bb72b9cdb3a89b96cd
-MISC ChangeLog 3926 SHA256 d2eeef36d23fd1f005cc2c1364f0d5864152e9ef7552ed9d3c9884200df7dfff SHA512 499395125200ab9773b7c87dada30e5d2875e67866b642edd425b5434f851cdf4775102218be057fcf34303b8c312fc3e54824f0cc8e95c56cc02d5761c75a6a WHIRLPOOL 677f2be534dcc3d70855056d48e0d9be2291b3db3194f3b4bb1b6a6b43cf4855aeb6775443d49dc70a67ae836e64cc09a8ec52bb4f6c4a3338df6b74b82b6771
+MISC ChangeLog 4038 SHA256 ac104e97f93f7296e1778bcde690dfbdc6d0bc1d1e99b26caaa86d75979be434 SHA512 e0ff5095a2f91f8df9c88cde50db5deffeb4c69ab3cea20995a128c20a1ae91ea6e654cf5c514df84bcc6fafa4262aad00ea8d2536b8c9b5f9af9eceedb1a411 WHIRLPOOL 5e90b1bafc6a214ae648492f9e6d48ed4c8d97bce3a20b2c452308c8418c6978f0a7277b3dbfaa59badd8ba596ad3d1ed0321a9b33d555fb7b499bcc76f3b32a
 MISC metadata.xml 1222 SHA256 d28bbe65a45a5d1bb144ffde4b17ea70af62e4d7432cd12fb26f43645e12ff49 SHA512 4ad4f4ff5288eccf854a488042833787906966ab047cb8009d09d15af7cbee8306d0dbe850a556a4e05209852753b2662de08ec8b0f5754361e4f8b5c8d980de WHIRLPOOL b05756d97565723de5344eb38aaf88652084df9e1285f86c45dfbd01ae7cd114bfe2d3c49c960bcbe20d0cfc8d62971b52c44944182bf2c162b1eb0991fb726a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iJwEAQEIAAYFAlIjIasACgkQG7kqcTWJkGfMCwP/T1zBhHBnfRYqwiFfzTBteYPJ
-//7sxvJswPopDZqv4Bp9ZB3O1IGwUUHadFrJcMs5qrx0MJCSCZd40AhH0+E+6McB
-FXIHtAAADVO8A9qEVOyZfs+WWz9jQsXc+QllT1nGYxyajdA5qMYD/h7UsTKh9B++
-msrZHVPmkYbkJi3ZLQo=
-=BdKq
+iJwEAQEIAAYFAlImOAgACgkQG7kqcTWJkGejawP/dOa43Px3jknkcqNF4zQPx6cd
+Iuz7iUpxi95wzzEoZ1pCNKVhlJ0l1Wymrnk6foAtvVZjSZdWLLWhkLQIuEMveSOu
+2WNRK8TOc4ll/H9scWdDlXhDZ4eibuSrxKDxFa+pCRj5nRIU7h58yDjZrRj9VgAA
+kluHTjZRIT8yBw6O7+o=
+=EY5I
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/poco/files/1.4.6_p1-gentoo.patch b/dev-libs/poco/files/1.4.6_p1-gentoo.patch
new file mode 100644
index 000000000000..243ee924b16b
--- /dev/null
+++ b/dev-libs/poco/files/1.4.6_p1-gentoo.patch
@@ -0,0 +1,74 @@
+diff -Nur poco-1.4.5-all_old/components poco-1.4.5-all/components
+--- poco-1.4.5-all_old/components	2012-11-18 16:56:59.000000000 +0100
++++ poco-1.4.5-all/components	2012-12-06 12:29:07.779546771 +0100
+@@ -1,14 +1,8 @@
+-CppUnit
+ Foundation
+ XML
+ Util
+ Net
+-Crypto
+-NetSSL_OpenSSL
+ Data
+-Data/SQLite
+-Data/ODBC
+-Data/MySQL
+ Zip
+ PageCompiler
+ PageCompiler/File2Page
+diff -Nur poco-1.4.5-all_old/Data/ODBC/ODBC.make poco-1.4.5-all/Data/ODBC/ODBC.make
+--- poco-1.4.5-all_old/Data/ODBC/ODBC.make	2012-11-18 16:56:57.000000000 +0100
++++ poco-1.4.5-all/Data/ODBC/ODBC.make	2012-12-06 12:29:07.779546771 +0100
+@@ -14,9 +14,9 @@
+ ifeq (0, $(shell test -d /usr/lib/$(OSARCH)-linux-gnu; echo $$?))
+ ODBCLIBDIR = /usr/lib/$(OSARCH)-linux-gnu
+ else ifeq (0, $(shell test -d /usr/lib64; echo $$?))
+-ODBCLIBDIR = /usr/lib64
++ODBCLIBDIR = /usr/$(LIBDIR)
+ else 
+-ODBCLIBDIR = /usr/lib
++ODBCLIBDIR = /usr/$(LIBDIR)
+ endif
+ endif
+ 
+@@ -39,10 +39,10 @@
+ CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX
+ # CYGWIN platform has its own ODBC library in /lib/w32api 
+ SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32
+-else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(LIBLINKEXT); echo $$?))
++else ifeq (unixodbc, $(GENTOO_ODBC))
+ SYSLIBS += -lodbc -lodbcinst
+ COMMONFLAGS += -DPOCO_UNIXODBC
+-else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(LIBLINKEXT); echo $$?))
++else ifeq (unixodbc, $(GENTOO_ODBC))
+ SYSLIBS += -liodbc -liodbcinst
+ COMMONFLAGS += -DPOCO_IODBC -I/usr/include/iodbc
+ else
+diff -Nur poco-1.4.5-all_old/Makefile poco-1.4.5-all/Makefile
+--- poco-1.4.5-all_old/Makefile	2012-11-18 16:57:00.000000000 +0100
++++ poco-1.4.5-all/Makefile	2012-12-06 12:29:07.779546771 +0100
+@@ -33,7 +33,7 @@
+ 
+ install: libexecs
+ 	mkdir -p $(INSTALLDIR)/include/Poco
+-	mkdir -p $(INSTALLDIR)/lib
++	mkdir -p $(INSTALLDIR)/$(LIBDIR)
+ 	mkdir -p $(INSTALLDIR)/bin
+ 	for comp in $(COMPONENTS) ; do \
+ 		if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \
+@@ -43,11 +43,11 @@
+ 			find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \
+ 		fi ; \
+ 	done
+-	find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \;
+-	find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
++	find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \;
++	find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \;
+ 
+-libexecs =  Foundation-libexec XML-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec
+-tests    =  Foundation-tests XML-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Zip-tests
++libexecs =  Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec PageCompiler-libexec
++tests    =  Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests
+ samples  =  Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples
+ 
+ .PHONY: $(libexecs)