Fix dependencies (bug #183780)

Package-Manager: portage-2.1.2.7

3 files changed, 31 insertions, 16 deletions

diff --git a/app-pda/gtkpod/ChangeLog b/app-pda/gtkpod/ChangeLog
index 88e49bcb2ecd..9fac9f76e500 100644
--- a/app-pda/gtkpod/ChangeLog
+++ b/app-pda/gtkpod/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-pda/gtkpod
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.57 2007/06/29 15:21:31 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.58 2007/07/03 00:16:32 tester Exp $
+
+  03 Jul 2007; Olivier Crête <tester@gentoo.org> gtkpod-0.99.10.ebuild:
+  Fix dependencies (bug #183780)
 
   29 Jun 2007; <tester@gentoo.org> gtkpod-0.99.10.ebuild:
   Fix libgpod dep and use absolute path for configure
diff --git a/app-pda/gtkpod/Manifest b/app-pda/gtkpod/Manifest
index 6d5eca554e56..165774ecb885 100644
--- a/app-pda/gtkpod/Manifest
+++ b/app-pda/gtkpod/Manifest
@@ -4,10 +4,10 @@ Hash: SHA1
 DIST gtkpod-0.99.10.tar.gz 1068561 RMD160 99a06a9e5b8cad1e3c1b48a220296f1796cba8f6 SHA1 350a51ce4e8dae4eb9c2f224799044faaa98f3e0 SHA256 cd8ec2258aa3e774ef1f743117ddc86e7d89bc3f40fc03492b7b0893f9669ece
 DIST gtkpod-0.99.8.tar.gz 1074007 RMD160 6ad6305393d66f7a84cc11e475045c8137a20c80 SHA1 023b55bc3cd9efba9fc7aa016ae63538a98cf1cf SHA256 f74afefe31deb11dc235b1d361df6732966fe2ba3eaddfb960c69bf0d161e16d
 DIST gtkpod-0.99.8_libgpod-0.4.2.diff 2580 RMD160 2e8094b8eba3179279d1b91133df588833e9df3e SHA1 a5090b4597922cc81fc33efd9a3f7e1278b57708 SHA256 a171d985b9f26d89b8583a38dc92f3962ecab9b9f6651236779e5cbea89b2807
-EBUILD gtkpod-0.99.10.ebuild 809 RMD160 13ac60026c754cc97f716092f0b643469f0324b1 SHA1 ea5aef8054e37431d6b1c6cbcc9cfb507e6b0ad2 SHA256 44bf3abd65955b486fe8a656eb4a2fbbbb281cad56a9add65d45be9d346464ae
-MD5 72e1587fad5a3d6f6cac02b623c3fceb gtkpod-0.99.10.ebuild 809
-RMD160 13ac60026c754cc97f716092f0b643469f0324b1 gtkpod-0.99.10.ebuild 809
-SHA256 44bf3abd65955b486fe8a656eb4a2fbbbb281cad56a9add65d45be9d346464ae gtkpod-0.99.10.ebuild 809
+EBUILD gtkpod-0.99.10.ebuild 1096 RMD160 cb1377d1ebc59783941bcda4b2a8c2c398f11542 SHA1 bf7eb54d506e129a103091858ccf5ae021b4e62d SHA256 f9cb877192f02fdc32aca91b576c38c80a656147c9363fab4c1b5491b4f347c7
+MD5 7f824beaaf4a694fccd1a451b9a196df gtkpod-0.99.10.ebuild 1096
+RMD160 cb1377d1ebc59783941bcda4b2a8c2c398f11542 gtkpod-0.99.10.ebuild 1096
+SHA256 f9cb877192f02fdc32aca91b576c38c80a656147c9363fab4c1b5491b4f347c7 gtkpod-0.99.10.ebuild 1096
 EBUILD gtkpod-0.99.8-r1.ebuild 907 RMD160 ec6d228d5d7f05c631f9338e7698d68670c848e7 SHA1 595b8e3f668e74304fed32a91b7cca056d8ae22f SHA256 a5a2416956d41fdd78c0af94c6d0f26d9fcdf2ecf32f5f2c0c779b96c5a07e08
 MD5 a731625db042b67afb2f7ba2a15ad747 gtkpod-0.99.8-r1.ebuild 907
 RMD160 ec6d228d5d7f05c631f9338e7698d68670c848e7 gtkpod-0.99.8-r1.ebuild 907
@@ -16,10 +16,10 @@ EBUILD gtkpod-0.99.8.ebuild 792 RMD160 e5b7d349a4aa8edf77b93c4981b73eb993502c64
 MD5 4514e6082891a423053838da678d4160 gtkpod-0.99.8.ebuild 792
 RMD160 e5b7d349a4aa8edf77b93c4981b73eb993502c64 gtkpod-0.99.8.ebuild 792
 SHA256 9af399066b2ea7bd10c4c75e1ae64df604dfcd708b44663b168ac4824a669270 gtkpod-0.99.8.ebuild 792
-MISC ChangeLog 6837 RMD160 bfceaa3d8becd04e346a76c28ad59682e7109102 SHA1 aca0f159245cda8a262580769398ef1da3a1044d SHA256 b9ec718064de2f494daec0a6236878e3bdfba97032b4ae47bbe1a64f636e3980
-MD5 c7375716937fe13956f36182bc6dd610 ChangeLog 6837
-RMD160 bfceaa3d8becd04e346a76c28ad59682e7109102 ChangeLog 6837
-SHA256 b9ec718064de2f494daec0a6236878e3bdfba97032b4ae47bbe1a64f636e3980 ChangeLog 6837
+MISC ChangeLog 6944 RMD160 eb61eb6778bbb6eee93c3dcb12e99824ec40ee59 SHA1 eec89c6ebb04df47b9da9eb3e5747c6e05811d32 SHA256 c4258f2a1bb0434847e426fecc6c5f8bbf2da45763ce438ae608cbbd8385a3b6
+MD5 a190a69e9ceeda5ad8bb18ce4c38782f ChangeLog 6944
+RMD160 eb61eb6778bbb6eee93c3dcb12e99824ec40ee59 ChangeLog 6944
+SHA256 c4258f2a1bb0434847e426fecc6c5f8bbf2da45763ce438ae608cbbd8385a3b6 ChangeLog 6944
 MISC metadata.xml 214 RMD160 2603e0683cb46d84ef65084451adeb1be5f436e5 SHA1 b569ad75e630129aa266984b5963936db724bd14 SHA256 bf19169d8568531809a0b2aebdf2b5736f2bee804449c60ad7be954318262950
 MD5 50b72dc36a1b67c4f473a91cbf985f30 metadata.xml 214
 RMD160 2603e0683cb46d84ef65084451adeb1be5f436e5 metadata.xml 214
@@ -36,7 +36,7 @@ SHA256 d7f1333c77452df99b7990de3a72aac93f91aa2721d52bcc93182daa13cbf5ec files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGhSN5+IXOQtHLm/gRAhQ2AJ9l6A08kLYvAL8jKQWOSwn95QVPewCfTdgs
-n1rAil4ZeZ7cbm+GFsSIQlM=
-=cTdF
+iD8DBQFGiZV1+IXOQtHLm/gRAvVqAJsHGGWjLRoPX1JGrTroUczJYX9FiQCcD+H3
+NJKyfUdlGxDkV+edM+2mJ1Y=
+=9CQa
 -----END PGP SIGNATURE-----
diff --git a/app-pda/gtkpod/gtkpod-0.99.10.ebuild b/app-pda/gtkpod/gtkpod-0.99.10.ebuild
index 856c403ff201..3078e52b354e 100644
--- a/app-pda/gtkpod/gtkpod-0.99.10.ebuild
+++ b/app-pda/gtkpod/gtkpod-0.99.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-0.99.10.ebuild,v 1.2 2007/06/29 15:21:31 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-0.99.10.ebuild,v 1.3 2007/07/03 00:16:32 tester Exp $
 
 inherit eutils
 
@@ -11,12 +11,19 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="aac"
+IUSE="aac hal"
 
-DEPEND=">=x11-libs/gtk+-2.4.0
+DEPEND=">=x11-libs/gtk+-2.6.0
 	>=media-libs/libid3tag-0.15
-	>=gnome-base/libglade-2
+	>=gnome-base/libglade-2.4
+	>=gnome-base/libgnomecanvas-2.14
 	>=media-libs/libgpod-0.5.2
+	>=gnome-base/libgnomecanvas-2.14.0
+	>=gnome-base/gnome-vfs-2.6
+	>=net-misc/curl-7.10
+	media-libs/flac
+	media-libs/libvorbis
+	hal? ( =sys-apps/hal-0.5* )
 	aac? ( media-libs/libmp4v2 )"
 
 src_unpack() {
@@ -26,6 +33,11 @@ src_unpack() {
 	use aac || sed -i -e s/MP4FileInfo/MP4FileInfoDisabled/g ${S}/configure
 }
 
+src_compile() {
+	econf $(use_with hal) || die "econf failed"
+	emake || die "emake failed"
+}
+
 src_install() {
 	make install DESTDIR=${D} || die
 	dodoc README TROUBLESHOOTING