fix broken patch

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

diff --git a/dev-libs/poco/ChangeLog b/dev-libs/poco/ChangeLog
index fad6d23b667b29eda53f84898a6c7d09c2a0cf23..f6b0e1a5637b778d6b4622de8b3d69e21aa194ce 100644 (file)
--- a/dev-libs/poco/ChangeLog
+++ b/dev-libs/poco/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/poco
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/ChangeLog,v 1.31 2015/01/02 13:47:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/ChangeLog,v 1.32 2015/01/05 02:16:19 hasufell Exp $
+
+  05 Jan 2015; Julian Ospald <hasufell@gentoo.org> files/1.4.6_p4-gentoo.patch:
+  fix broken patch
 
   02 Jan 2015; Agostino Sarubbo <ago@gentoo.org> poco-1.4.6_p4.ebuild:
   Stable for x86, wrt bug #508720

diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index 1ce121b924a9ce771b47ee3e8c77fc190725e329..e2286c664e4db041bd69656183d56662fefbbfb4 100644 (file)
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -9,7 +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 1.4.6_p1-gentoo.patch 3198 SHA256 3beb9d686f4d09ee65764b3807a94858d64edd5b1a07821adfa31b4384790364 SHA512 f100138e529963b63cdcc77bfeefef8e9402f3622e6145de0e8b092b2ff4ce1167c9d7f16401417a6d3bf7f52a2a78546a62487d646424bf22a1c0d5633a9f9c WHIRLPOOL 063cb6e273d6103c4e44d373774c63825680baaa80d846aab34cc66f2d5cbde5d7ee18d4003be71f0ff7d1081cb37ca6ee96eb08d6829be4acbf7860e21b3f6d
-AUX 1.4.6_p4-gentoo.patch 2898 SHA256 38e62b4d5e87889a883dbb5470330bb2211ccc6be66ab0f3243ca159fa35d30c SHA512 5cfcdc4ad32226104a32887459e38ea39787deeac77dac430f1d40df0dc1e532b749187d33f7c959562d5206ba3782913cf7ed39ba93974f99968ea92f82f8f2 WHIRLPOOL de2f62b5ce436bfff6f329fc3fde22b45f8f33b1c0e13db7dc8fdedd471ee325aa9840249bbfb53225a75c76397ea0c7330356009da2fe64aa01754e8fe33f1e
+AUX 1.4.6_p4-gentoo.patch 2899 SHA256 458e84551044226afd5e5f6c17884cfe88ac66ed8520346337260a881fe37b1e SHA512 d43ffa2422b8fcf465b94d9cf075ce855a90339949cc662e8c8ab81cdc744cdb7aa6563f872a12bffe87526385b9a6decf2b21f244e2b66c1871b6d578de0e79 WHIRLPOOL 0b0e04a723e32ce1665fe64680274e3ae0320b47e530cce21df2b13b1a8ff3cbf29c388d96087ab6fd0fa1f5d9b07cf2e256a7bc195fc307d5d2264e9b8f9334
 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
@@ -29,22 +29,24 @@ EBUILD poco-1.4.3_p1.ebuild 3486 SHA256 bf2e44a74bd4eb24983067b70dafa0369872e5bf
 EBUILD poco-1.4.5-r1.ebuild 3481 SHA256 0329c5d6d49ad7e245ea6b1261de45112f4b5ca0a9f68158e162e366baaf6864 SHA512 7440f9f4f3f6b24f907103579ed669c4a1398fb66b646a873a8b1585a0a2c995c1850d8aa641ad853746dea9f8e2f8005dfe70e8c7f3867c49505569a2ba6476 WHIRLPOOL 59e61b6bed11ee00098feaff4878a283cc967be1f8b74ba196855fb4476b1446e1b2397e68231a4f4e560439c6246979d85e4fc446e8721061862106a5eacecc
 EBUILD poco-1.4.6_p1.ebuild 3484 SHA256 75e2d637e7c1edc1c35858255695bfab9bbb9b0e06a343658a70f133470bdc5d SHA512 80071aa41c059d0a9af010d1b8df63f2a89ef1ce6d5e378b69789a5eb2c1457d7ccabe58a98267483bb13d41273ff5ad746bd227b7ef75aab68b338abf6a7428 WHIRLPOOL cf86c48f2694d38a06bb415c5de1c91587c8455e860b3bef3351df7b2ef5f84904beaf76cc365064f21b40cad23366845fd7c948d60ad14d4e02d0789693ff30
 EBUILD poco-1.4.6_p4.ebuild 3525 SHA256 0efb964f194ab17acfd902ab3751bd59c7b956599d69e72c15428f13dbc9dffb SHA512 d5d02dcb953d1c653b22db1855e47adf1103ae76a72f201c4d566b9166f548b20691bed054938bc8afb8d6d0f3602f7d33decffda06d5a113185f3a6d7213ea1 WHIRLPOOL 6a732e88d71decabb8f59c46f5c4eaab8599a37e5594db2358d767ea31d427d0414b36860e1b7597d6ecdf354107f359a61fc294bada344d7c76cef2213e6838
-MISC ChangeLog 5166 SHA256 e13afd9a599bd91ef4f9fd223dd02b5e83cc512ccff1f936f1e28cb779a9d071 SHA512 d1aecac923d060aaf95c5e999f69883f0a243eaadb84dcc3b1cb656651b1821d35807daf14c3a4edf9319ebf72868f30d6cf3404d98d828c8edbdf63b653141b WHIRLPOOL 880fe5542e5578144dccf837331590ea6d6840b802faad5d66c6ba20bbd22097c83194e29f0ccc581b3243362849b85674a578c30cf5bdd074ac042588e40312
+MISC ChangeLog 5271 SHA256 3e64fabc8069418a5af8f6be3b92aea0c83607641ef2e898d8944f1cd71c7ea1 SHA512 ec7ea69d7744c4f9a8ecbe216dab9ac69879b8f12cc91f8d7350a8eb3d1da33f0cbbe4d5ebc781fde060ab9adab524917aa19f69a9887a6f2e4d4a3560dd7e92 WHIRLPOOL da2ea2d18fa648029ad63b54dcf1c4a61db8b032bb9995411116034dcfc7eeb65c20730dbc0ac83d64144f7f9032d0a35c4cfa4da58f27525920a50045602a97
 MISC metadata.xml 1222 SHA256 d28bbe65a45a5d1bb144ffde4b17ea70af62e4d7432cd12fb26f43645e12ff49 SHA512 4ad4f4ff5288eccf854a488042833787906966ab047cb8009d09d15af7cbee8306d0dbe850a556a4e05209852753b2662de08ec8b0f5754361e4f8b5c8d980de WHIRLPOOL b05756d97565723de5344eb38aaf88652084df9e1285f86c45dfbd01ae7cd114bfe2d3c49c960bcbe20d0cfc8d62971b52c44944182bf2c162b1eb0991fb726a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUpqFjAAoJELp701BxlEWftxIP/RCnQam47IA1ipR2BUUAf2ob
-GgoluFLIc4jZ1tOmpb7shw4rj3OHl2Bmp/SzFpLQ+jlbcoXCO521DZ95I24J0rSS
-OvzFiXpcEJ8SnH9tsimqeUckViCFecq9EPiKzpy3a+ZIIWe89Pb4rvM89rdlZKo+
-HIaXL7ZYzYCjBSeE1bG4mGKEQXIemullnb3kGBV086PhFZ4Mdwc2g5wNGU2gTv2w
-M2x94cmF6kbtmUUwxRzwTvuC4TN4XbgjYYSm6A72hutDu56Cyz0gO4sr6oue+nGE
-6bFvs0+/NPhbcpaPJqArixPaDHWBDUZsS+60MyRbAqyyE051vRI4h7/ECtIj6aP7
-XDd8/n1s+35LWc3vLf1HnyzT8KPCeYbnc6Xf0eleY1gJlcGhHpDlZhZMyaqYsuhs
-JKvQPu1eCRraw/QBahz0L/rL2E3Iwqktltode4y1gRjM0iM4JWtwy/MJj4viSpfH
-NVoFHrXnpYdaXXUSPKC5eq8Er1yypOzUuyrtRL0MzpKeDQbkkSsXpXV2E/ff+94J
-iZ7sU1BpzLLXk53E7dqSCenMaf+jGy+Xt/SCAON/jP55m2CoBdMvPIR1XmLEZ42Y
-IenCiW2hd4z2BYLMrmfYdKvOzsOBi5J5YyPdAT9w8rFxMUVRliEYknFpNOMtx0sW
-u+5rCOHbZhnBMvotj5Fx
-=4Fyf
+iQJ8BAEBCABmBQJUqfP3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgldIQANFura5Q3n9v65JdqL9QuWL1
+c+XQS4axgbtmHScaaZbrY1EFrVRcF8Si8Y6tuX3E/Fjy7+eJcmPzmym1GznxUXeu
+qcMhdvivXxmge+YN1I+h4siKJ4YWLT9j+uJ7rd+mAt18hzasXFOKVphkequq1WpM
+flTMrelmxzoZNcfiwBsFvs03E4JQKQKuKf/Q3HybOz5Zu00vQlQPKeXaA4EkX3ZJ
+FEdW/7bM4Bjzsf3wD+H2goVGLhfLxHvbiUiZ9Qr6+rPJJyUItfXcNyNpRS1ukmxr
+rUPl8Kyd3A91h4ZrC2LT10c4Bv5cMEvy2SDI/yspAhLBl5BsKx8NbbyTvIq+2lMV
+PaL1prGcc1xf0pZzQP7KsN5DYu/5FkQilBZIwa5F3slDwwHYgtpKo/M+H7/DfQdq
+mdyL1DaLMv8CJCxtT2dEwDor9Fz6Mtt8G3XBEk+tF/3Kl61Nawmcqkbf5jgHq4Wg
+dnMzURMUZvh8nxmSii5CIAGoMTdypEg2bbCOKZMif5pfDiELgnwvp2iecPyGSQcN
+DL58hZXelrG0BNExkWXZnG/wWCZBOTTEkSLjASev4ELjj478IAd5pMehDLfnBqHl
+7xJEyVkJr89/X1WGPeTQODHEn8URJTmSo60YY5ZFthTSkx78Hxlzj5/eNKkVkf2y
+IfWZ36xqMtVH0WSmMvYa
+=cSuu
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/poco/files/1.4.6_p4-gentoo.patch b/dev-libs/poco/files/1.4.6_p4-gentoo.patch
index bc967cc5e57dcb7c1a34ac4c55787d2c54164b9a..8cfc9237db01b2748f6c470a76499e11f2791fdc 100644 (file)
--- a/dev-libs/poco/files/1.4.6_p4-gentoo.patch
+++ b/dev-libs/poco/files/1.4.6_p4-gentoo.patch
@@ -34,7 +34,7 @@
  # -DNOMINMAX      : MIN/MAX macros defined in windows conflict with libstdc++
  CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX
 -else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(LIBLINKEXT); echo $$?))
-+else ifeq (unixodbc, $(GENTOO_ODBC)
++else ifeq (unixodbc, $(GENTOO_ODBC))
  SYSLIBS += -lodbc
  COMMONFLAGS += -DPOCO_UNIXODBC
 -else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(LIBLINKEXT); echo $$?))