diff options
| -rw-r--r-- | net-misc/curl/ChangeLog | 9 | ||||
| -rw-r--r-- | net-misc/curl/curl-7.27.0-r2.ebuild (renamed from net-misc/curl/curl-7.27.0-r1.ebuild) | 3 | ||||
| -rw-r--r-- | net-misc/curl/files/curl-7.27.0-curl-config.patch | 15 | ||||
| -rw-r--r-- | net-misc/curl/files/curl-7.27.0-prefix.patch | 4 |
4 files changed, 27 insertions, 4 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/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 @@ ;; |