fix for curl-config --vernum - bug #112759

Package-Manager: portage-2.0.53_rc7

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index fbbb9c5ef67c3c076755882779f8826176f577a2..15c5d091d88f46eff5fe83374b9bf47634f421b8 100644 (file)
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/curl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.56 2005/10/22 13:52:51 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.57 2005/11/20 00:45:15 dragonheart Exp $
+
+  20 Nov 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/curl-7.15.0-versionnumber.patch, curl-7.15.0.ebuild:
+  fix for curl-config --vernum - bug #112759 thanks to Tupone Alfredo
 
   22 Oct 2005; Fabian Groffen <grobian@gentoo.org> curl-7.15.0.ebuild:
   Marked ~ppc-macos (bug #109097)

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index b0112378034ddc13d30cc7deab91c794bda2a32b..43cf00b17a3a4d5301955c3ca1e7df0a795bee1d 100644 (file)
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d977ce329f1a1bc5e7a403ffdb8c0502 ChangeLog 11358
+MD5 9e6527c50d25641df7f79d5b925720a2 ChangeLog 11548
 MD5 79b7fd0dcd4776ca1851d30a45275e78 curl-7.13.1.ebuild 1140
 MD5 c6b9b093ceb98fd1efbc9ca3700888ec curl-7.13.2.ebuild 2392
-MD5 3ee8ef17d44f0e3a44a015a8b7497aee curl-7.15.0.ebuild 2434
+MD5 89d2021f8afb5ff760a8ff36d99a8c39 curl-7.15.0.ebuild 2484
+MD5 3f45a8aa13637f8147adfe79b8cd522b files/curl-7.15.0-versionnumber.patch 550
 MD5 159b437588320b2a3f726d3aa55890e5 files/digest-curl-7.13.1 65
 MD5 71c346cc704727e0bdaef7333521adeb files/digest-curl-7.13.2 130
 MD5 7bcded56c13b85b72508c00b8d3d7e73 files/digest-curl-7.15.0 65
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFDZF6pgIKl8Uu19MoRAjtJAJ4qCbZ1C71jX3FJKvB0DtpAYyXEbwCdEXsN
-GdlBJTc8nzYyhMO5thocVs0=
-=5slp
+iD8DBQFDf8cpmdTrptrqvGERAmW1AJ9irLMjfTOolCyZxDHv0tjJHRRwVACfW7vV
+sEeNfU23z7n6cklK6Mj/okc=
+=VpYF
 -----END PGP SIGNATURE-----

diff --git a/net-misc/curl/curl-7.15.0.ebuild b/net-misc/curl/curl-7.15.0.ebuild
index c0c951a45698c780e418dae64615d54953282f9d..dad247a3290f5e17bef5c6023ffb152ec47e8d3d 100644 (file)
--- a/net-misc/curl/curl-7.15.0.ebuild
+++ b/net-misc/curl/curl-7.15.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.15.0.ebuild,v 1.17 2005/10/30 05:48:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.15.0.ebuild,v 1.18 2005/11/20 00:45:15 dragonheart Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
        unpack ${A}
+       epatch ${FILESDIR}/${P}-versionnumber.patch
        epunt_cxx
 }
 

diff --git a/net-misc/curl/files/curl-7.15.0-versionnumber.patch b/net-misc/curl/files/curl-7.15.0-versionnumber.patch
new file mode 100644 (file)
index 0000000..9d9921f
--- /dev/null
+++ b/net-misc/curl/files/curl-7.15.0-versionnumber.patch
@@ -0,0 +1,12 @@
+--- curl-7.15.0/include/curl/curlver.h 2005-10-13 10:20:05.000000000 +0200
++++ curl-7.15.0/include/curl/curlver.h 2005-11-17 00:52:39.000000000 +0100
+@@ -51,8 +51,6 @@
+    and it is always a greater number in a more recent release. It makes
+    comparisons with greater than and less than work.
+ */
+-#define LIBCURL_VERSION_NUM ((LIBCURL_VERSION_MAJOR << 16) | \
+-                             (LIBCURL_VERSION_MINOR << 8) | \
+-                             LIBCURL_VERSION_PATCH)
++#define LIBCURL_VERSION_NUM 0x070f00
+ 
+ #endif /* __CURL_CURLVER_H */