Fix curl header includes

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

4 files changed, 46 insertions, 18 deletions

diff --git a/media-sound/gimmix/ChangeLog b/media-sound/gimmix/ChangeLog
index 9e2aa38b7a76..0406bb16b451 100644
--- a/media-sound/gimmix/ChangeLog
+++ b/media-sound/gimmix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/gimmix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gimmix/ChangeLog,v 1.32 2012/05/05 08:20:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gimmix/ChangeLog,v 1.33 2012/07/25 11:05:20 angelos Exp $
+
+  25 Jul 2012; Christoph Mende <angelos@gentoo.org>
+  +files/gimmix-0.5.7.1-curl-headers.patch, gimmix-0.5.7.1.ebuild:
+  Fix curl header includes
 
   05 May 2012; Michał Górny <mgorny@gentoo.org> gimmix-0.5.7.1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
@@ -133,4 +137,3 @@
   13 Jul 2007; Christoph Mende <angelos@gentoo.org> +metadata.xml,
   +gimmix-0.4.1.ebuild:
   Initial import, thanks to Torsten Rehn
-
diff --git a/media-sound/gimmix/Manifest b/media-sound/gimmix/Manifest
index 924cad4a1e0f..9ff099adf3ce 100644
--- a/media-sound/gimmix/Manifest
+++ b/media-sound/gimmix/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gimmix-0.5.7.1.tar.bz2 330368 RMD160 be664504014a23f3ff7327730508cb18a9e0d356 SHA1 d32f272e4c6b4107081355c19bf813b69096ee7d SHA256 f504e19615fe2032b958d14a88504fbf9c2684ccad3cbe0b177068173e538cba
-EBUILD gimmix-0.5.7.1.ebuild 948 RMD160 78aee7e795407fb2d936492f4b36336e24a19c35 SHA1 f3bff30fb7fac5762216c7dfb7b60ffe3a14e19a SHA256 b937f25d369ccb16737146f473f482634260060f37cc701544f9816899145f50
-MISC ChangeLog 4035 RMD160 5eefe5a8b993f90d2910f8b40cf8d3c4cdecdc4d SHA1 72acac3a4209bb400221c9682768790a9168e113 SHA256 c1c3b2f8c127f9a271a82c20d7334a2bf16da14f211c60a790527409ad9551f1
-MISC metadata.xml 376 RMD160 bfdde685738f0f2f0cce53990abd22385c27c47f SHA1 ffbd4a4753674f7a308b270528ebf31049b917bd SHA256 37c040ef04939ca3fa73560cec4e28a62208d7c42f8cdf40b32261c678e1d9a2
+AUX gimmix-0.5.7.1-curl-headers.patch 655 SHA256 9145f2d69580d1b0e500d84086e11db44ca53b2c4c958cd7c57407a3eec79352 SHA512 9b0665e8de4670b2dc58940215b883549bddd6d7abd26f604f334034d604689063b3347ba81651b804a430b31ff235c9b65c33ee0d3115c4e2fba2d48d3c56bb WHIRLPOOL 5f7e475aeb539ef08535dce4f1387dfa0c868c8bd7f6045820307a9cef2bcfa5e9e6fa5ae27e56238c2bbc760f4789e88f62c7f87448089ca31e5d565819da23
+DIST gimmix-0.5.7.1.tar.bz2 330368 SHA256 f504e19615fe2032b958d14a88504fbf9c2684ccad3cbe0b177068173e538cba SHA512 03187d423afc97e9eec014603518a35795ac3d240e68c888a39c97a790be1cf5a838cd70d71df2ee455e5f437bc74689e5fd2cf3695e0e1d805fde60d9b0e26b WHIRLPOOL ace795cf2b588011e7c7a5b3bdcf4043de2f00e101245866a3990550eaa4ed0877c8b7344df1995b5e8e67515278e064b47da0a46dedfbf8ba47755bcdeaf2cb
+EBUILD gimmix-0.5.7.1.ebuild 953 SHA256 ee8c2e2805791a3999e7c564a992e21f399683712fcc590aff9b0b6ce29a97ec SHA512 6bc75b8e50cce76653215a32e3f258a1bc797320220d72ca5177818a8516fc29cee83183677fe42949b51282d04b8ea666c60e198e7542d787e23c0ec4ba0eed WHIRLPOOL f618c77791f42ab990eac2d98dd7205dac0d1f5ac2d2438546491a5f35f0c66f507ec47f013728b9fa6ab17c4b0ce1dfa4d29246c6ac2f1908da2b6076c264d4
+MISC ChangeLog 4182 SHA256 6e6b718dca09206a9534140e46bca2d6e774c0e42e172cca196c0e1dd1de5313 SHA512 f696a06b7934dd921bf307b5e1864c039dff33519b8f1cdbc3c12cf0d0b9627647f7b2a264c972be537ac4ac33b2570fc15f9e48fc50884eb86ae89608415a33 WHIRLPOOL b4324852a442520257ab577e99adda189f54af509fdbf4fa5096c24a61240d650aa09904789830654c65b65c91dbb08206a66cb1d8690a8208534b97d1a1b965
+MISC metadata.xml 376 SHA256 37c040ef04939ca3fa73560cec4e28a62208d7c42f8cdf40b32261c678e1d9a2 SHA512 cf2ee2e11da6444ad8dc8e475e11c61e827e094e6e1ca14b34f4498a9de3bc2582470dd77d28ea24eecab91336721f308b66ccce5d75f2f668d481171b1d0a3a WHIRLPOOL 953b9f3dc257dff210632afff971a0ed6277381b1bfdad15ea30d82b1e45f2a42f51cf5203fd2eacea53936679f0740363adab1a8e61fa55b6010e058e372e45
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk+k4xMACgkQfXuS5UK5QB1mBQP+MWlJGipr2N/grp+x69E+jj90
-eEDUp1TdXEuJcNDW5cMKcmPxQVYmvRjs3cZKmSZVlgmT5As2+lWEQ+AKk/DXw20e
-wt+5XfcavqqhP/U8YwMlC2sB3MyW1H3PnrCPDZRtGM+ppAWGUFju7PqN9ei7WjF2
-WVi+3hivH+b5bnIwN2M=
-=IGL8
+iF4EAREIAAYFAlAP0vYACgkQmWq1bYTyC0P+awEAp4MRq5R9bvhzCqtQE91Ew+1y
+3N1n04Ul6EQFVNR43t0A/jclDAA/dsQ6ZAsvbEw13hJZJk72p4ZvK44hbEoQdaUx
+=Vgw4
 -----END PGP SIGNATURE-----
diff --git a/media-sound/gimmix/files/gimmix-0.5.7.1-curl-headers.patch b/media-sound/gimmix/files/gimmix-0.5.7.1-curl-headers.patch
new file mode 100644
index 000000000000..990165725dc2
--- /dev/null
+++ b/media-sound/gimmix/files/gimmix-0.5.7.1-curl-headers.patch
@@ -0,0 +1,24 @@
+diff --git a/src/gimmix-covers.c b/src/gimmix-covers.c
+index f2524c4..2dc37f3 100644
+--- a/src/gimmix-covers.c
++++ b/src/gimmix-covers.c
+@@ -29,7 +29,6 @@
+ #include <glib.h>
+ #include <glib/gstdio.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <nxml.h>
+ #include <libxml/xmlreader.h>
+diff --git a/src/gimmix-lyrics.c b/src/gimmix-lyrics.c
+index ff58954..01990e2 100644
+--- a/src/gimmix-lyrics.c
++++ b/src/gimmix-lyrics.c
+@@ -30,7 +30,6 @@
+ #include <nxml.h>
+ #include <glib/gstdio.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <libxml/xmlreader.h>
+ #include "gimmix-lyrics.h"
diff --git a/media-sound/gimmix/gimmix-0.5.7.1.ebuild b/media-sound/gimmix/gimmix-0.5.7.1.ebuild
index e6d169bf1a7f..ee6353062892 100644
--- a/media-sound/gimmix/gimmix-0.5.7.1.ebuild
+++ b/media-sound/gimmix/gimmix-0.5.7.1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gimmix/gimmix-0.5.7.1.ebuild,v 1.5 2012/05/05 08:20:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gimmix/gimmix-0.5.7.1.ebuild,v 1.6 2012/07/25 11:05:20 angelos Exp $
 
-EAPI=2
+EAPI=4
+inherit eutils
 
 DESCRIPTION="a graphical music player daemon (MPD) client using GTK+2"
 HOMEPAGE="http://gimmix.berlios.de/"
@@ -23,14 +24,15 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-util/intltool"
 
+DOCS=( AUTHORS ChangeLog README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-curl-headers.patch
+}
+
 src_configure() {
 	econf \
 		$(use_enable cover) \
 		$(use_enable lyrics) \
 		$(use_enable taglib tageditor)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README TODO
-}