Add libproxy include patch so it actualy finds the header file.

Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64

4 files changed, 25 insertions, 7 deletions

diff --git a/sci-geosciences/merkaartor/ChangeLog b/sci-geosciences/merkaartor/ChangeLog
index 6da82b505e02..29f655c25757 100644
--- a/sci-geosciences/merkaartor/ChangeLog
+++ b/sci-geosciences/merkaartor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/merkaartor
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.19 2011/06/09 20:30:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.20 2011/06/10 15:31:33 scarabeus Exp $
+
+  10 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/0.17.2-libproxy.patch, merkaartor-0.17.2.ebuild:
+  Add libproxy include patch so it actualy finds the header file.
 
   09 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   merkaartor-0.17.2.ebuild, merkaartor-9999.ebuild:
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 88a1aec96e9a..8956172cba27 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -2,15 +2,16 @@
 Hash: SHA1
 
 AUX 0.17.2-includes.patch 452 RMD160 9a6dbda2ff06503945221f732fd568f269ed37e8 SHA1 2d2cdc05704933df08bebfe3b90dc709aa895dac SHA256 69e257bc8eca02c18313502d4fdf9729e2eaa51e5bd04da8f2115e28d9b675cb
+AUX 0.17.2-libproxy.patch 483 RMD160 38f13275474936ce4eeae2f30b4db51a251e432d SHA1 a15742ecab65eec3483df99d9ded71fb3dae952c SHA256 94c6eca2403ac89d9454837e547651d3158f94ab4abb2e1e9a5f586159990513
 DIST merkaartor-0.17.2.tar.bz2 7138991 RMD160 c5c8944872828ba5ada6003cd5821f33899da3cb SHA1 f789141db427bf25bb3b61801fefc98ab0430012 SHA256 425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a
-EBUILD merkaartor-0.17.2.ebuild 1800 RMD160 6bbf512ed8e68e480e70969adaacfb8dec122b75 SHA1 8f114813e57ae2de7950170e1bfd98f9ed9b59fa SHA256 ef54dce01fcaa8d83d2b129abeac3abfac35a991abc196d4e4b704bb1bb3d61c
+EBUILD merkaartor-0.17.2.ebuild 1836 RMD160 bdb358472d957a0006bc2e7ceafad120a7089539 SHA1 c4b24a389f45c780c40b41c2bf16bf43ebe82b59 SHA256 ce745826138f160216a9a40cbebca447232d19b4b3414db6aaa0c2b1c53baa9d
 EBUILD merkaartor-9999.ebuild 1787 RMD160 1dd5712960c8698fb2c8ab84018745ce5b5f8616 SHA1 9f618213fe03ce873b9b0760d7d3d51b6495bfa3 SHA256 1697c0fc5b82378ce6713e500625092f1f1c80ce7e2eddb43ec308341bd105b7
-MISC ChangeLog 3058 RMD160 637ec2f3eb59b3cc734e872a30b1338a0b84e2fc SHA1 ed43897c5f71a01aff79db4395df612de70b559b SHA256 46d9aa2cd7e32d369136d053d6561d77b5e6f17d7d5f3808299a5b110cb2cf00
+MISC ChangeLog 3238 RMD160 2cd0d851d34bede5d3ff94e4d39fb67e466bad23 SHA1 0ca2c8450ee1751fbc7bfd6a1bd53d859ec4a6d7 SHA256 a8c32c709686d699e26f5b2c37ef01c78f10d718a34667aabed96be4efebc7d1
 MISC metadata.xml 467 RMD160 35303c7ae1f239e15845d3b01417f0f2d04ebf3a SHA1 1361600e4014ce1cc840cbc1d3adec1640903a7b SHA256 b107951b4352a6a1c5ce816735d5dc45306cbf8da2e80adc6d63d8b04bb3d838
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3xLXQACgkQHB6c3gNBRYeJsACdGyWllxA/JOVId/GW/4a7AGHM
-UbQAn1hWU041hq9kNRkBzDB3N0P9DD/W
-=cc7F
+iEYEARECAAYFAk3yONkACgkQHB6c3gNBRYd9kwCeJAvCbalQHeUgPUuwc67TJE0a
+YfgAn3vaKsi65LKK08cNdvFpfQja8PMB
+=+T0I
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/merkaartor/files/0.17.2-libproxy.patch b/sci-geosciences/merkaartor/files/0.17.2-libproxy.patch
new file mode 100644
index 000000000000..d5fdf70f4735
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/0.17.2-libproxy.patch
@@ -0,0 +1,12 @@
+diff -urN merkaartor-0.17.2.old//src/Preferences/MerkaartorPreferences.h merkaartor-0.17.2/src/Preferences/MerkaartorPreferences.h
+--- merkaartor-0.17.2.old//src/Preferences/MerkaartorPreferences.h	2011-06-10 17:26:49.000000000 +0200
++++ merkaartor-0.17.2/src/Preferences/MerkaartorPreferences.h	2011-06-10 17:29:46.000000000 +0200
+@@ -21,7 +21,7 @@
+ #include <QNetworkProxy>
+ 
+ #ifdef USE_LIBPROXY
+-#include <libproxy/proxy.h>
++#include <proxy.h>
+ #endif
+ 
+ #include "Maps/Coord.h"
diff --git a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
index 0d19ba91fdf0..cec83168b06c 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild,v 1.2 2011/06/09 20:30:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild,v 1.3 2011/06/10 15:31:33 scarabeus Exp $
 
 EAPI=4
 
@@ -36,6 +36,7 @@ DOCS="AUTHORS CHANGELOG HACKING"
 
 PATCHES=(
 	"${FILESDIR}/${PV}-includes.patch"
+	"${FILESDIR}/${PV}-libproxy.patch"
 )
 
 merkaartor_use() {