app-pda/gtkpod: Reintroduce the versions for deps and fix patch against usage of libmusicbrainz4, thanks ssuominen

(Portage version: 2.2.0_alpha150/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

2 files changed, 19 insertions, 12 deletions

diff --git a/app-pda/gtkpod/ChangeLog b/app-pda/gtkpod/ChangeLog
index 6213d1eee834..4861bd8bb6a2 100644
--- a/app-pda/gtkpod/ChangeLog
+++ b/app-pda/gtkpod/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-pda/gtkpod
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.119 2013/01/11 16:09:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.120 2013/01/11 17:34:09 jlec Exp $
+
+*gtkpod-2.1.3-r1 (11 Jan 2013)
+
+  11 Jan 2013; Justin Lecher <jlec@gentoo.org> -gtkpod-2.1.3.ebuild,
+  +gtkpod-2.1.3-r1.ebuild:
+  Reintroduce the versions for deps and fix patch against usage of
+  libmusicbrainz4, thanks ssuominen
 
 *gtkpod-2.1.3 (11 Jan 2013)
 
diff --git a/app-pda/gtkpod/gtkpod-2.1.3.ebuild b/app-pda/gtkpod/gtkpod-2.1.3-r1.ebuild
index 340b365b98f3..ca2940f2d5a5 100644
--- a/app-pda/gtkpod/gtkpod-2.1.3.ebuild
+++ b/app-pda/gtkpod/gtkpod-2.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.3.ebuild,v 1.1 2013/01/11 16:09:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.3-r1.ebuild,v 1.1 2013/01/11 17:34:09 jlec Exp $
 
 EAPI=4
 
@@ -17,27 +17,27 @@ IUSE="aac clutter curl cdr flac gstreamer mp3 vorbis webkit"
 
 COMMON_DEPEND="
 	dev-libs/gdl:3
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-util/anjuta
-	media-libs/libgpod
-	media-libs/libid3tag
-	x11-libs/gtk+:3
+	>=dev-libs/glib-2.28.5
+	>=dev-libs/libxml2-2.7.7
+	>=dev-util/anjuta-2.91
+	>=media-libs/libgpod-0.7.0
+	>=media-libs/libid3tag-0.15
+	>=x11-libs/gtk+-3.0.8:3
 	aac? ( media-libs/faad2 )
 	clutter? ( media-libs/clutter-gtk:1.0 )
-	curl? ( net-misc/curl )
+	curl? ( >=net-misc/curl-7.10 )
 	cdr? (
 		>=app-cdr/brasero-3
 		media-libs/musicbrainz:3
 		)
 	flac? ( media-libs/flac )
-	gstreamer? ( media-libs/gst-plugins-base:0.10 )
+	gstreamer? ( >=media-libs/gst-plugins-base-0.10.25:0.10 )
 	mp3? ( media-sound/lame )
 	vorbis? (
 		media-libs/libvorbis
 		media-sound/vorbis-tools
 		)
-	webkit? ( net-libs/webkit-gtk:3 )"
+	webkit? ( >=net-libs/webkit-gtk-1.3:3 )"
 RDEPEND="${COMMON_DEPEND}
 	gstreamer? ( media-plugins/gst-plugins-meta:0.10 )"
 DEPEND="${COMMON_DEPEND}
@@ -49,7 +49,7 @@ DEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	# Make sure SLOT="4" is not used. Everyone should move from "3" to "5" directly.
-	sed -i -e '/PKG_CONFIG/s:libmusicbrainz4:&sLoT4iSdEpReCaTeD:' configure.ac || die
+	sed -i -e '/PKG_CHECK_MODULES/s:libmusicbrainz4:&sLoT4iSdEpReCaTeD:' configure.ac || die
 
 	# /path/to/install: '/path/to/app-pda/gtkpod-2.1.2_beta2/image/usr/share/gtkpod/data/rhythmbox.gep’: File exists
 	sed -i -e '/^dist_profiles_DATA/s:=.*:=:' plugins/sjcd/data/Makefile.am || die