Fix bug #429100

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

5 files changed, 34 insertions, 10 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 53b04cb20b39..0f55df881c73 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.234 2012/07/31 12:29:29 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.235 2012/07/31 21:14:35 blueness Exp $
+
+*curl-7.27.0-r2 (31 Jul 2012)
+
+  31 Jul 2012; Anthony G. Basile <blueness@gentoo.org> -curl-7.27.0-r1.ebuild,
+  +curl-7.27.0-r2.ebuild, +files/curl-7.27.0-curl-config.patch,
+  files/curl-7.27.0-prefix.patch:
+  Fix bug #429100
 
 *curl-7.27.0-r1 (31 Jul 2012)
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 450fcc67d6f6..853a2c107f69 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -5,7 +5,8 @@ AUX config.h.ed 501 SHA256 ab7941abb65756bc18dac7310e413ede974b1556fafdb5f8ba699
 AUX curl-7.18.2-prefix.patch 662 SHA256 ba5530d4ce9175eb54944716768ce33278e5de236cbeeb2a80caefff709ff0f8 SHA512 a7f53f47cb3bd13d01a226f11254c02f197b78d1a889af7840be621476f506324907f8a4aad491361021b98947931f1e5494f902b4bbce315e69a191ce2686c9 WHIRLPOOL ece9a7f1408f7bf49b6cc6f0ff5a988a77424e40f6406697e44ed1fb46b52c275cffe6561c1fe927269eeaf071ef5a97729fc2af0237dc334c7c9552cde7094d
 AUX curl-7.19.7-test241.patch 483 SHA256 e06c33750b5337b2700445a073b96d0ab817584fffbf24ac386668cd5e98d450 SHA512 d76aeaff9fe033db215f791cb647190a4349bc4fcc6cac04e886acba776dbe06710bb07084ce32fcd9858d4b5535a9b96ba12318ab52820ee92e6a8b22fb90a1 WHIRLPOOL 777fb1efe3e54fa987dc168d26489f4a9a208af1c43387618e26b603b8b4a2cab5f3347b285d97a0a4c62117bddf602b768537742e04e29b7aa06304075cb420
 AUX curl-7.20.0-strip-ldflags.patch 419 SHA256 eabd5d5ed0c154b834376a76334581c5ef0ef6a51ea7229c79e4cfc02bd446c6 SHA512 5246f307fc56169c3c34361052ce16aceb6fcb3647fe7c231b6c0d3396f8c55ea2b86eafc24395ae6e629a6ecc989e05c8b28d76263527438e43079dd3d77275 WHIRLPOOL 453a840568f63bcc67091f0e4d8e76b81607f20a6b02696f22c89eab8977925138fe3e96e75d100b9c085554299339016cfefa8a039c8609ef51684dffd4c16b
-AUX curl-7.27.0-prefix.patch 842 SHA256 58e31524d5f3e562fa21b546f7219f51183967dfb0d41820be8da71651b6d68e SHA512 218ad2d4ee95e86f70bb87d163b166761f495e62c9f9c8fd7e7beddd0af4641c2605034bd2637385dd9e3866625aef080fd2cf5bc37f7e925b6d5c501afb3742 WHIRLPOOL 85af11dd355b59cd77a91eba41066cac8a83bd7057d3a5a37a2e7f80b72a54551ade0bb45d790d432b9ffe1721fc881d6fcea3d8f9d4c6395e49069ef1fd7280
+AUX curl-7.27.0-curl-config.patch 579 SHA256 68c06920cf8d2ab4e0e3b539fde2eda9f2f402919a2e03a11f878d76f367b6b8 SHA512 828fb9b7c020a1ab407169907475e19093e35d32f9d5d98dd4b26c52c200758b15290fefde10b96d280570fe07febdbdc91137161b7e53aa53db282be972281a WHIRLPOOL 562b0f567cc627c3633c613186d2bb54bde26bee3ae945087257152199b0cfd8086054df5b4d0682028aee474a93a84e9b0c37fb6c9e40ad571dae2e9c80ff9a
+AUX curl-7.27.0-prefix.patch 842 SHA256 c0ba42416ac1f75bd63c180494c0510dc4ab47d8501fcbd77e75ebe6b136bd19 SHA512 60fef029c8ae9a9458bfee6b19ae7d9dae6317f26e0f1df78e9be83a78e9a81175db77efd1c22f5c09fa5b7b581a76b74457b1e3176f9d42d111f7cd00146244 WHIRLPOOL 5de6922f59e6c16c0abc7d66f361b9c344261172a0388fc6a3090bbb7caa11b8cfdcfe23c83bf6b17d7836dd516c59401302caf504fb3fa4beaa72fb62eed373
 AUX curl-fix-gnutls-nettle.patch 1186 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa WHIRLPOOL 0206a8daf30f4c112c394555e455796cde7e71f632cc2b7f2612ef2cffb900d03001e5845d3683c34c6ae3aef1c1d8c4f5af30eac45d0ab621c9c0adb19397da
 AUX curl-respect-cflags-2.patch 1174 SHA256 a580b492e40bc01dcdf5527f7b69b06ef3a06a329314f48991de0ab9871e5cfe SHA512 f651f46462ff9662784ccb07063853c164171e76ff6e7dc917271c997bd392f51a97694704196af0df9adfde55640e91757eacc102a840ae288875dfe86dcf41 WHIRLPOOL 1c1b3a6755450396f5bb953fd6342f5597ddf6bb535373c561aeae0fa79a1646f31b03f0348443ca8ab21f7616dbf4344485ec0dd20abc4881c31c42616ba4a9
 AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 WHIRLPOOL 5d61ec7f36376bd9712e0fc7984006462ab27a7e2003dd92a8d9e78e97a2e620a5cbf6a62855ebff45b2fbf9f0bca821ffdf6ce8ff81cf2a047af9e168fb61bd
@@ -20,13 +21,13 @@ EBUILD curl-7.21.4.ebuild 3514 SHA256 90020645c61c93a010fc61c020179e42ebcea70ee1
 EBUILD curl-7.24.0.ebuild 3726 SHA256 ae2afb4021a571cfdbeffa2705b8a202d303b3101176908b6563324ff40969f1 SHA512 d6c2fbc54617a66f6739cfa9a9372358d4bd08002f8e7717444b795f6cbf6b75f4c1f8b64b11d7775e31cc42acc151951acf11cf8605c80feabfa1ea0f1116fa WHIRLPOOL 4cdc34e1ee6826da1de7db2d9e97e1529119ad077a4c6628c9cfed4894a609236c8d726873f361120c34022cdd097f92df23e325926a5120dbf58cd3d634080e
 EBUILD curl-7.25.0-r1.ebuild 5834 SHA256 c14d3185b39d5ef166215b13d4e353f24945d2c8888ce99da8845e5ddfaad48d SHA512 868b5b3dcc038d124aa6a1dca8ff8957d9c76c5ec37ea2ea647c6ed15272066de53d439db99208ee20d146a5c505eb3b1044660e9e75c285ebc9c8353a3a6b11 WHIRLPOOL a35bd0a5d79f149ff9046c6ffb47a526e8569d06b72601fcf627df5805173ca2a27f4223ea9a78e181588383d2789a1ded8e37b9c20cb34561d7927930f4946b
 EBUILD curl-7.26.0.ebuild 6091 SHA256 e7a9b6e2da2b86aa15f68c9d4ab74fa7db274740677afd42e56c797b54ce60c4 SHA512 d1a02aebc621d7f95cdc634caa5eb6bb50d50ec7fe3f6cc3fbf0ae0d0de90be399ba342862cf7cdf9b974b39aee0d530f0de0a15e434dff15567ca0cc349200e WHIRLPOOL 98a7a36cdbaadc631c1ad0a644d34d4c68f26b0ce72ceefda4c965c1ac7bed52b7fedb1cd1aadf99cb6e1182363d8d4bb8e7b0e4845d5078cb76d55d6f081098
-EBUILD curl-7.27.0-r1.ebuild 6392 SHA256 12587e7d7037191d77f5b1affa3e5681759225b502a216899c855d2547763016 SHA512 db1fb5874471827acf481a7ab9dbe86063e6e2aa5c60210ec4dfe8daacccc1ee168b84a9fbe4b57b593c12d5dcdb70785eb412b569ad30cd20bb18ec303dca7e WHIRLPOOL 8a54fd33dd6b4808a1236dde1dd6964d173d392ce58498e1fd9da7f080309bc2db496f98b3041c0df770968c6157a534d23646ee661792a51e46cafe1616dbba
-MISC ChangeLog 38186 SHA256 d01b41198cb00abab069f2151be9faf7703619e7906a216c5a7a65862918a393 SHA512 fa26a80dc064e6597b8a043b21da49082e1ce46a4bf6cd559cfb3717b2bae022b9ff67efd5c214ca19e75b3de4ca1d93629db031212d0e2eff44e544f450aeb2 WHIRLPOOL 0b7c799d7729459c98463545da22509195e08794b13f680e6761d5bf53e3358dfa87d99b9bb805d89c7ad5703f5e0887330e2d35aa7121395a13685709854c7d
+EBUILD curl-7.27.0-r2.ebuild 6441 SHA256 25806bdc0adc95f5389a80e4c35fb08f74e5559d5fe4221f2724a8c0f0f869bb SHA512 8de19a8aaf3a160d46254b6ec7a741c3ba990e270ef840fc1159d2f4f92b5116d4772367e15b67e01f88f8e872fa775d844a93917259093b2a29174ad9e38ca8 WHIRLPOOL 21783c082a3dcbc70eb260ba98a7e09e009c3b62de9fde6e48db78fe6be59f6a1a199d6c4e7cc46ce8fb5f142c994bab3ce8202152f5f2a7f68de73df52210c0
+MISC ChangeLog 38413 SHA256 a93fe75939ca9e7fe750289b7efd979c69a205801e4895dd599162565b3a766f SHA512 152d4d4fd176adf69520afcead2dd1aa198f639ee8b3c8be621a7f2aaa9f59237ee2e96eac08d2c2f94eced441ac6153255fa4078f11dc8cd13bad79a677179c WHIRLPOOL b393f8f1469daf9c11014920879c7f412e39046b39450612da18cab406f97885d01857e538c7f04116f830d4f8bad33f0e4c3924666dd705828bbc119b0c3504
 MISC metadata.xml 847 SHA256 94b3fe2abeff0838aa4374c296d9a896563957a33ba84c1c194fac0455664f8b SHA512 52e3118cb86825cf0d7bb63c6aeec5a37eb9939c5def57f05e6b9d54187687bf60634da01b347e46de04da8ceeac084ce83c9b69ea7a2f2a45981371b3b68987 WHIRLPOOL 49f0c28c28e13b006238e4200acf2613c7ca6011b83ee6145c2ef6bf00ec496125c44d0cd714284e8e1e70b17b20fd675d2f933f7972bc4cf397cc17ff52745d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAXz7QACgkQl5yvQNBFVTUFfgCdEnOZnnqjb4nEWIxPqyakR5m9
-VwcAn34iG+jA8EZII2WtdYmDBx5SEPBb
-=7X6O
+iEYEAREIAAYFAlAYSsUACgkQl5yvQNBFVTWwowCdEOGfJEw81XTm4VaJSucYETnT
+ZdwAmweAGe0icd+EhPOTUYf/kKpWO1Bs
+=lPkB
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.27.0-r1.ebuild b/net-misc/curl/curl-7.27.0-r2.ebuild
index 307a8cc5d445..5864d83daa4a 100644
--- a/net-misc/curl/curl-7.27.0-r1.ebuild
+++ b/net-misc/curl/curl-7.27.0-r2.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/net-misc/curl/curl-7.27.0-r1.ebuild,v 1.1 2012/07/31 12:29:29 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.27.0-r2.ebuild,v 1.1 2012/07/31 21:14:35 blueness Exp $
 
 EAPI="4"
 
@@ -84,6 +84,7 @@ DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
 
 src_prepare() {
 	epatch \
+		"${FILESDIR}"/${PN}-7.27.0-curl-config.patch \
 		"${FILESDIR}"/${PN}-7.27.0-prefix.patch \
 		"${FILESDIR}"/${PN}-respect-cflags-3.patch \
 		"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
diff --git a/net-misc/curl/files/curl-7.27.0-curl-config.patch b/net-misc/curl/files/curl-7.27.0-curl-config.patch
new file mode 100644
index 000000000000..06f0eb263fdc
--- /dev/null
+++ b/net-misc/curl/files/curl-7.27.0-curl-config.patch
@@ -0,0 +1,15 @@
+diff -Naur curl-7.27.0.orig/curl-config.in curl-7.27.0/curl-config.in
+--- curl-7.27.0.orig/curl-config.in	2012-05-25 23:56:17.000000000 +0200
++++ curl-7.27.0/curl-config.in	2012-07-31 22:07:36.539655495 +0200
+@@ -135,9 +135,9 @@
+           CPPFLAG_CURL_STATICLIB=""
+         fi
+        	if test "X@includedir@" = "X/usr/include"; then
+-          echo "$(CPPFLAG_CURL_STATICLIB)"
++          echo "${CPPFLAG_CURL_STATICLIB}"
+         else
+-          echo "$(CPPFLAG_CURL_STATICLIB)-I@includedir@"
++          echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@"
+         fi
+        	;;
+ 
diff --git a/net-misc/curl/files/curl-7.27.0-prefix.patch b/net-misc/curl/files/curl-7.27.0-prefix.patch
index 9a16ee3e605b..4f37d8b473f6 100644
--- a/net-misc/curl/files/curl-7.27.0-prefix.patch
+++ b/net-misc/curl/files/curl-7.27.0-prefix.patch
@@ -7,9 +7,9 @@ diff -Naur curl-7.27.0.orig//curl-config.in curl-7.27.0/curl-config.in
          fi
 -       	if test "X@includedir@" = "X/usr/include"; then
 +	if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then
-           echo "$(CPPFLAG_CURL_STATICLIB)"
+           echo "${CPPFLAG_CURL_STATICLIB}"
          else
-           echo "$(CPPFLAG_CURL_STATICLIB)-I@includedir@"
+           echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@"
 @@ -142,7 +142,7 @@
         	;;