Fix compilation without gtk, bug #149018

Package-Manager: portage-2.1.1-r1

5 files changed, 82 insertions, 15 deletions

diff --git a/media-libs/libgpod/ChangeLog b/media-libs/libgpod/ChangeLog
index b0e4e430c831..6281d0319460 100644
--- a/media-libs/libgpod/ChangeLog
+++ b/media-libs/libgpod/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libgpod
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/ChangeLog,v 1.18 2006/10/15 21:08:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/ChangeLog,v 1.19 2006/10/16 20:10:37 tester Exp $
+
+  16 Oct 2006; Olivier Crête <tester@gentoo.org>
+  +files/libgpod-0.4.0-test-nogdk.patch, metadata.xml, libgpod-0.4.0.ebuild:
+  Fix compilation without gtk, bug #149018
 
   15 Oct 2006; Aron Griffis <agriffis@gentoo.org> libgpod-0.4.0.ebuild:
   Mark 0.4.0 ~ia64
diff --git a/media-libs/libgpod/Manifest b/media-libs/libgpod/Manifest
index fd74e37940cc..85e0fef3a204 100644
--- a/media-libs/libgpod/Manifest
+++ b/media-libs/libgpod/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libgpod-0.3.0-config-enables.diff 2433 RMD160 0905beaa574b1b8b04e0f225e8984484449c7b99 SHA1 bef70c56dfceef140677389916dbd2c0b10ed2fe SHA256 279ca52c4d6e6ddb43406d0f56fcf8ab828e1d7801f31b93bd4a5225a9836881
 MD5 a87b6f5715acd8e479e1be7152f9f2b9 files/libgpod-0.3.0-config-enables.diff 2433
 RMD160 0905beaa574b1b8b04e0f225e8984484449c7b99 files/libgpod-0.3.0-config-enables.diff 2433
 SHA256 279ca52c4d6e6ddb43406d0f56fcf8ab828e1d7801f31b93bd4a5225a9836881 files/libgpod-0.3.0-config-enables.diff 2433
+AUX libgpod-0.4.0-test-nogdk.patch 863 RMD160 3c83759ad3f93f3271cfdc1cb2840f35f05da5d6 SHA1 3724816778c5fafd124bad84c07364b5f7a44ec8 SHA256 911e9172b50791be090b49aa6ce0286d12ee4ef360c6fe64c399f8b24d1edc9f
+MD5 eab36081e2f4e69b323c4c9ef51788e3 files/libgpod-0.4.0-test-nogdk.patch 863
+RMD160 3c83759ad3f93f3271cfdc1cb2840f35f05da5d6 files/libgpod-0.4.0-test-nogdk.patch 863
+SHA256 911e9172b50791be090b49aa6ce0286d12ee4ef360c6fe64c399f8b24d1edc9f files/libgpod-0.4.0-test-nogdk.patch 863
 DIST libgpod-0.3.0.tar.gz 455539 RMD160 beb4991e691d8aabc04da4208c71e7931b597624 SHA1 0d31ff7991ca524405aca81e029181d54169fec8 SHA256 6e396346c63db8eac7d771a6b7ba684623b832024043e64f15939a8c99b6059a
 DIST libgpod-0.3.2.tar.gz 461207 RMD160 1cae4642653036ad2af3b9d8e9dabd88155f310f SHA1 ca2c575377534c1e5176e5994dfda7343b19cdf4 SHA256 b9bea0402371091b77ce537288dda66406a94bc200e6ea69ad20654b4a7f12f2
 DIST libgpod-0.4.0.tar.gz 596066 RMD160 02e45e59fa41c7b5683c550ee8c386b56ad4bbb5 SHA1 1ebad590212d1c6951ca10bb5117a7af54060105 SHA256 50cb3dcf283f0b6c76da493cf070eb03c05c8a34f64bddb3ca19188a5d861cc4
@@ -17,18 +24,18 @@ EBUILD libgpod-0.3.2.ebuild 1356 RMD160 8296f4284a155d53d0c80b8b59467b6f8292945f
 MD5 598b127a194512ec0f0fc664fd162304 libgpod-0.3.2.ebuild 1356
 RMD160 8296f4284a155d53d0c80b8b59467b6f8292945f libgpod-0.3.2.ebuild 1356
 SHA256 b818bbfbcdfe4a8ce70ad53e7119d0e29b320171dedb81a054842bcac1c33bfc libgpod-0.3.2.ebuild 1356
-EBUILD libgpod-0.4.0.ebuild 950 RMD160 246e2d17bfb725ca5ecad8f4d9947736ed7ccf6c SHA1 70384d38c7a7e8e12d06f079edc09a8ebd46f3de SHA256 dcd5c82fa0a1b699074e97317467b42df85d4a02106d24f7b9b878b4d7f44fe0
-MD5 92d7346bc03cb1a6d76e09b66e3492ba libgpod-0.4.0.ebuild 950
-RMD160 246e2d17bfb725ca5ecad8f4d9947736ed7ccf6c libgpod-0.4.0.ebuild 950
-SHA256 dcd5c82fa0a1b699074e97317467b42df85d4a02106d24f7b9b878b4d7f44fe0 libgpod-0.4.0.ebuild 950
-MISC ChangeLog 2446 RMD160 dfe9f3c111ba13b6ba125474aa2731c5c47c0678 SHA1 98b0312cc958e355b2baeb43acee5f013513ad3c SHA256 faf33742e3451faa3204a9e5e4c5e893f20e1a9814e80921cad638094f0fcdb0
-MD5 bc43bb1c1f2a8af0d936d5ac766e8938 ChangeLog 2446
-RMD160 dfe9f3c111ba13b6ba125474aa2731c5c47c0678 ChangeLog 2446
-SHA256 faf33742e3451faa3204a9e5e4c5e893f20e1a9814e80921cad638094f0fcdb0 ChangeLog 2446
-MISC metadata.xml 423 RMD160 7f8770a1d0c14cf37734f70611508264988c73b9 SHA1 ecf207821ecd817c5fb1a1fadaf063241382e020 SHA256 269219be64de0db9c7010720e00849531018e546281e607fec6a80da107955a8
-MD5 41c5337491a2b640b8d2edfbdd109d29 metadata.xml 423
-RMD160 7f8770a1d0c14cf37734f70611508264988c73b9 metadata.xml 423
-SHA256 269219be64de0db9c7010720e00849531018e546281e607fec6a80da107955a8 metadata.xml 423
+EBUILD libgpod-0.4.0.ebuild 1132 RMD160 8ad9c96f9a5023c604f01a776036215cb2beeb36 SHA1 5d1ff98825671fd4377ae19f200aa2f1f39e91ca SHA256 6510a5ce996ae4cfd56401a355ca7394706a3aa7b043a6178ac288ce6be6a20f
+MD5 f2e8dc4f368f1a01f541a07c9b430b9a libgpod-0.4.0.ebuild 1132
+RMD160 8ad9c96f9a5023c604f01a776036215cb2beeb36 libgpod-0.4.0.ebuild 1132
+SHA256 6510a5ce996ae4cfd56401a355ca7394706a3aa7b043a6178ac288ce6be6a20f libgpod-0.4.0.ebuild 1132
+MISC ChangeLog 2615 RMD160 1e707a55e32ded748055135898be73d30256ea78 SHA1 24af86ae9e64803f6fc2e1178ab57bfb385514d3 SHA256 5c040f1287588adc7afedbb6244d1180c5b590b46ab7e7755a3786582a87fe9c
+MD5 06341768459a824983585df6037b14a7 ChangeLog 2615
+RMD160 1e707a55e32ded748055135898be73d30256ea78 ChangeLog 2615
+SHA256 5c040f1287588adc7afedbb6244d1180c5b590b46ab7e7755a3786582a87fe9c ChangeLog 2615
+MISC metadata.xml 516 RMD160 6039fe4ac9710b9d8e99ebdce2dced155c4824fd SHA1 26da360ddc9b5fe79395d544a5aa793d188375d9 SHA256 4c8e84f4ca114da894d4064b940126a4ee10414ada5a494b0e1efb28e117a1ad
+MD5 bc035a63845fd8313545050e22e15fc0 metadata.xml 516
+RMD160 6039fe4ac9710b9d8e99ebdce2dced155c4824fd metadata.xml 516
+SHA256 4c8e84f4ca114da894d4064b940126a4ee10414ada5a494b0e1efb28e117a1ad metadata.xml 516
 MD5 3fc0d57e4ea9cda1656ebc31407d19f4 files/digest-libgpod-0.3.0 241
 RMD160 39bc48bdd962bbc59b9d02fc26257386e32814f0 files/digest-libgpod-0.3.0 241
 SHA256 247ecae7667060224afeefe510acc7f512bc36e834da683221f7f1ef6a8a0be6 files/digest-libgpod-0.3.0 241
@@ -41,3 +48,10 @@ SHA256 d802f2c7566544f921edb019f023539fdbcd24b2b9bf3366bf4b3e433711c7d7 files/di
 MD5 e308c1c9a5a5e4d25e1bc51fe37956da files/digest-libgpod-0.4.0 241
 RMD160 a3fe243a5c70f47bd4884a74e1886c6956e7feba files/digest-libgpod-0.4.0 241
 SHA256 74e96e0039666a6226cc3f8a32ffca0ece38d1fe0c4e5748427fd07867df529e files/digest-libgpod-0.4.0 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFM+dXmOfEJZHYOKcRAi8XAKClRdfxC+k5xcoG24ywvrsHPt5NTQCfeVff
+kP6yzf09Lf6ADqA4LceJZwY=
+=pkzw
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libgpod/files/libgpod-0.4.0-test-nogdk.patch b/media-libs/libgpod/files/libgpod-0.4.0-test-nogdk.patch
new file mode 100644
index 000000000000..75515daf4361
--- /dev/null
+++ b/media-libs/libgpod/files/libgpod-0.4.0-test-nogdk.patch
@@ -0,0 +1,31 @@
+--- tests/test-init-ipod.c.orig	2006-10-16 15:48:29.000000000 -0400
++++ tests/test-init-ipod.c	2006-10-16 15:48:44.000000000 -0400
+@@ -26,7 +26,7 @@
+ #include "itdb.h"
+ 
+ #include <locale.h>
+-#include <gdk-pixbuf/gdk-pixbuf.h>
++#include <glib-object.h>
+ #include <glib/gi18n-lib.h>
+ 
+ 
+--- tests/Makefile.am.orig	2006-10-16 15:56:24.000000000 -0400
++++ tests/Makefile.am	2006-10-16 15:57:45.000000000 -0400
+@@ -23,6 +23,8 @@
+ test_ls_SOURCES = test-ls.c
+ test_ls_LDADD = 
+ 
++test_init_ipod_SOURCES = test-init-ipod.c
++
+ if HAVE_TAGLIB
+ test_rebuild_db_SOURCES = test-rebuild-db.cc
+ test_rebuild_db_LDADD = $(TAGLIB_LIBS)
+@@ -36,8 +38,6 @@
+ test_photos_SOURCES = test-photos.c
+ test_photos_CFLAGS = $(AM_CFLAGS)
+ 
+-test_init_ipod_SOURCES = test-init-ipod.c
+-
+ test_write_thumbnails_SOURCES = test-write-covers.c
+ test_write_thumbnails_CFLAGS = $(AM_CFLAGS)
+ endif
diff --git a/media-libs/libgpod/libgpod-0.4.0.ebuild b/media-libs/libgpod/libgpod-0.4.0.ebuild
index 85c032f2bab3..6eb06af4d169 100644
--- a/media-libs/libgpod/libgpod-0.4.0.ebuild
+++ b/media-libs/libgpod/libgpod-0.4.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/libgpod-0.4.0.ebuild,v 1.3 2006/10/15 21:08:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/libgpod-0.4.0.ebuild,v 1.4 2006/10/16 20:10:37 tester Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Shared library to access the contents of an iPod"
 HOMEPAGE="http://www.gtkpod.org/libgpod.html"
@@ -22,6 +22,20 @@ DEPEND="${RDEPEND}
 		sys-devel/autoconf
 		sys-devel/libtool
 		>=dev-util/intltool-0.2.9"
+
+src_unpack() {
+	unpack ${A}
+
+	cd  ${S}
+	epatch ${FILESDIR}/libgpod-0.4.0-test-nogdk.patch
+
+	# Dont run aclocal, it breaks
+	eautomake
+	eautoconf
+	eautoheader
+	elibtoolize
+}
+
 src_compile() {
 
 	econf $(use_enable gtk gdk-pixbuf) \
diff --git a/media-libs/libgpod/metadata.xml b/media-libs/libgpod/metadata.xml
index ae51d81b64d4..0b12c97b0728 100644
--- a/media-libs/libgpod/metadata.xml
+++ b/media-libs/libgpod/metadata.xml
@@ -3,6 +3,10 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
+		<email>tester@gentoo.org</email>
+		<name>Olivier Crete</name>
+	</maintainer>
+	<maintainer>
 		<email>joem@gentoo.org</email>
 		<name>Joe McCann</name>
 	</maintainer>