Use media-libs/libmp4v2 instead of faad2/mpeg4ip

(Portage version: 2.0.53)

4 files changed, 14 insertions, 18 deletions

diff --git a/app-pda/gtkpod/ChangeLog b/app-pda/gtkpod/ChangeLog
index 04392abbc925..b9c53e4a78df 100644
--- a/app-pda/gtkpod/ChangeLog
+++ b/app-pda/gtkpod/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/gtkpod
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.39 2005/12/14 15:32:29 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.40 2006/01/01 18:37:24 tester Exp $
+
+  20 Dec 2005; Olivier Crête <tester@gentoo.org> gtkpod-0.94.0.ebuild,
+  gtkpod-0.99.2.ebuild:
+  Use media-libs/libmp4v2 for libmp4v2
 
 *gtkpod-0.99.2 (14 Dec 2005)
 
diff --git a/app-pda/gtkpod/Manifest b/app-pda/gtkpod/Manifest
index 567b1bae00f9..fc9628dc5dbd 100644
--- a/app-pda/gtkpod/Manifest
+++ b/app-pda/gtkpod/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 50b72dc36a1b67c4f473a91cbf985f30 metadata.xml 214
-MD5 eea8d0e7d20a036cdc2e4495f4d698cc gtkpod-0.99.2.ebuild 815
 MD5 a78dcb44bef48181f24a046127d03a09 ChangeLog 4722
-MD5 11b2fd04329a06cc388b042fdd7b6cdf gtkpod-0.94.0.ebuild 791
+MD5 4f3fbca543d2131c3606ddc078dda4eb gtkpod-0.99.2.ebuild 791
+MD5 45dc04b592c2533ffa22d48fbd80adf0 gtkpod-0.94.0.ebuild 833
 MD5 5805b9d3cd6839ea6c644a3a5d28b81e files/digest-gtkpod-0.94.0 65
 MD5 ca1b52d9d05ba66e18487d461bdf85fd files/digest-gtkpod-0.99.2 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDoDspmOfEJZHYOKcRAhKvAJsHmbtdjcIn2N28uegnwVA9NghDRQCfQ5BE
-L9KaigRoUAlYAhskbAWwbYc=
-=Rehp
------END PGP SIGNATURE-----
diff --git a/app-pda/gtkpod/gtkpod-0.94.0.ebuild b/app-pda/gtkpod/gtkpod-0.94.0.ebuild
index 3863a64a26eb..2cbe6b5bd03c 100644
--- a/app-pda/gtkpod/gtkpod-0.94.0.ebuild
+++ b/app-pda/gtkpod/gtkpod-0.94.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/app-pda/gtkpod/gtkpod-0.94.0.ebuild,v 1.3 2005/09/02 19:25:16 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-0.94.0.ebuild,v 1.4 2006/01/01 18:37:24 tester Exp $
 
 DESCRIPTION="GUI for iPod using GTK2"
 HOMEPAGE="http://gtkpod.sourceforge.net/"
@@ -14,7 +14,9 @@ IUSE="aac"
 DEPEND=">=x11-libs/gtk+-2.4.0
 	>=media-libs/libid3tag-0.15
 	>=gnome-base/libglade-2
-	aac? ( || ( media-libs/faad2 media-video/mpeg4ip ) )"
+	aac? ( || ( media-libs/libmp4v2
+			<media-libs/faad2-2.0-r8
+			<media-video/mpeg4ip-1.4.1 ) )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-pda/gtkpod/gtkpod-0.99.2.ebuild b/app-pda/gtkpod/gtkpod-0.99.2.ebuild
index 4446fd572e9e..7609186a1da7 100644
--- a/app-pda/gtkpod/gtkpod-0.99.2.ebuild
+++ b/app-pda/gtkpod/gtkpod-0.99.2.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/app-pda/gtkpod/gtkpod-0.99.2.ebuild,v 1.1 2005/12/14 15:32:29 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-0.99.2.ebuild,v 1.2 2006/01/01 18:37:24 tester Exp $
 
 DESCRIPTION="GUI for iPod using GTK2"
 HOMEPAGE="http://gtkpod.sourceforge.net/"
@@ -8,14 +8,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="aac"
 
 DEPEND=">=x11-libs/gtk+-2.4.0
 	>=media-libs/libid3tag-0.15
 	>=gnome-base/libglade-2
 	>=media-libs/libgpod-0.3
-	aac? ( || ( media-libs/faad2 media-video/mpeg4ip ) )"
+	aac? ( media-libs/libmp4v2 )"
 
 src_unpack() {
 	unpack ${A}