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

Package-Manager: portage-2.2.0_alpha150/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

3 files changed, 24 insertions, 17 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/Manifest b/app-pda/gtkpod/Manifest
index ec900652cccf..d732f483902a 100644
--- a/app-pda/gtkpod/Manifest
+++ b/app-pda/gtkpod/Manifest
@@ -7,13 +7,13 @@ AUX gtkpod-2.1.3-gold.patch 451 SHA256 420272234c4ebff9884c658fe8e1fe4721d8221c8
 DIST gtkpod-2.1.2.tar.gz 3673800 SHA256 c3d054235bae80aa8563a441c902fa32528c2b00ba05a98066671fa3036dc1e6 SHA512 01b5b0c370451c717d7a04b592b2b986a692615d1624a267238268e19dd3baeab2f79604e700573fecce5e3822ee37a1d485965c648e2d7b1cb2ab3602742470 WHIRLPOOL f8b6b4304c07eb3e51b10c15288ba6813b6ea715ffa227fd0909acff5742548a49a2ecc999cabd67c0eca918dc4993339903bce0a8e0767298dd2b5eda48baf7
 DIST gtkpod-2.1.3.tar.gz 3712898 SHA256 2b98352fe670a3d757c2b9cc4f8b910ca7fe8b8d9441764055075cfff16e4691 SHA512 6d59d1a2cce76d89ef7a47244de0edd7965916324c3681cba751316727fd6026c98128948a06db5778d889e582e200d29645e1beeb566ade865631a4c36ba5e5 WHIRLPOOL 02228c644292a2170c3bc11c2bbc6f56d63f5e7e074ddbc2a77c86ce225cbd1bafbedbc38c9e9e8df8569275a1da35b897b4d2e69b04eb55327c66d1a455bfe9
 EBUILD gtkpod-2.1.2-r1.ebuild 2610 SHA256 a493cc04c25bd53e003c1f3742c4a2f1d756cd9fb11ff7dd9ea179c81fc98ec0 SHA512 de5e2714c5cece71b12fbb1db87cf96d415e0f0f235973efdabd98bf51e26cda3555afef3c87c59f459989d3da3326ed55e68818b6f794c0cab4ed229d979dd0 WHIRLPOOL 758f230c6ca0c5ff8dbb7e7ea301ee0d87260100956ed200b2336b6664d5eef543e1f21bd3f7657ac95070a94dbdb02189b0d12f1142d829874054bf0788f2f7
-EBUILD gtkpod-2.1.3.ebuild 2612 SHA256 aa35dc7a09b3b69851df29e8a26308313df31b3e5e0d244d71ed9c7bc1a9880f SHA512 873a2be9c72006657e74f330979fbd84119f171ae823dd6a7ad3768bbd838cc5ba9006c60eff546c6ac421a3d636604a403589bc1fada3af992da000ec45cab4 WHIRLPOOL 2f7e9258b728aab725197a927121d4d89a50527e9fe8981510665a8e68c04e1c5ee4e97674a9a764ab14132484c441fa160f6dd8daca56c10cc5f61fdf81b634
-MISC ChangeLog 15503 SHA256 baf372119e03009e2854b8fed0a5bcb79a2880dc8a8470ec4eeb52c0b9a24f41 SHA512 ab9ac793c9e7a3da51907073f4772fba791a14d00093e694410ccd654c2a26015f414f1b8c764a5282e435251d7e8c55088b7b455f441f8521b4d35f54af2cd2 WHIRLPOOL f4fbe82d4c1845efdfca781bc3ddc0be82950ef50a6eadc03316e201e31b9e357247742d46193ef7a9fce6dc750a3311aa14563fdde3235b5d152d13dce03dca
+EBUILD gtkpod-2.1.3-r1.ebuild 2688 SHA256 d7eecbe6deb9ed83adb1b8a557336159f6e133b3afd53b6274bbb3b4d746e6b0 SHA512 ec01cd7417286b82db6126bb086347b2b22d6d7271dad7a3dd7bfbcc31f40ff8e08a2916ee6e4b187cc6e48e6d655488a8a647c3cc63adf36e5fd9a3dbc04a93 WHIRLPOOL f6741e2bbc1350cb0f228225c613d98d694c63db8485a7c56f24bc21ea30863b52b31076e5124545f1e46d1c2ac65c723c04e61fb98a74ef3cea142ceb6819ba
+MISC ChangeLog 15735 SHA256 5a35f18ab368d867d2720e0124bf0761fbd1f520af2a28cc827c5c6efbec831b SHA512 e7189a83e5f1aff00a3848d07647dfe35d3bdc06d0dd88f915bbecebdd0be99d66127574019511e00e67181f9791724a399ca99d2fd297d41ddd4ff500eb4cb0 WHIRLPOOL 67d38955d40cce736b412878fd837f4f311e438f1171493ed2b914e3aa64cf9b0c92e513acbbf5544105762518eca9a62637f4b0220209511afa5c48f224e03e
 MISC metadata.xml 328 SHA256 95407831a5060771b1e952c41c4b644539008e700ddfc8fb7d8a1908393ae05a SHA512 75a4085abf4c8c3aed8b137909fdd0c595ea89b30a6b1dbc8a30558020d545f1be0c7e180ea4581e7eab3feca5563d0b1f167226b6becba18369ead910f70a04 WHIRLPOOL 7ceefc929392725906e812ca2673cbf1c45a64a9805f7dc1b76312359c0c81c762ff118619b073bc53acf889867f137454cce51f67f71ae3bc06f1347c4c3973
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDwOR8ACgkQgAnW8HDreRYQzACg0oswv/NOsgEpcUdtGTQCEOwZ
-AlUAnAiz/Y7T648LRGfNlxQsJDyAXUNV
-=XUqJ
+iEYEAREIAAYFAlDwTRMACgkQgAnW8HDreRbYPACeNjX8qLp1JVVw07YYWDmsufVU
+pQUAn2xvrDUb7SL7FjxckJZB6LEcWvZd
+=LnDS
 -----END PGP SIGNATURE-----
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