Relax the libmp4v2 dep for people mixing stabilization levels

Package-Manager: portage-2.2.0_alpha102/cvs/Linux x86_64

4 files changed, 22 insertions, 18 deletions

diff --git a/app-pda/gtkpod/ChangeLog b/app-pda/gtkpod/ChangeLog
index a14c4d740d61..0560fe3e666e 100644
--- a/app-pda/gtkpod/ChangeLog
+++ b/app-pda/gtkpod/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-pda/gtkpod
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.100 2012/05/09 18:50:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.101 2012/05/10 05:20:00 ssuominen Exp $
 
   09 May 2012; Samuli Suominen <ssuominen@gentoo.org> -gtkpod-2.1.1-r1.ebuild,
   -files/gtkpod-2.1.1-libmp4v2_so_2.patch:
@@ -8,8 +8,10 @@
 
 *gtkpod-2.1.1-r2 (09 May 2012)
 
-  09 May 2012; Samuli Suominen <ssuominen@gentoo.org> +gtkpod-2.1.1-r2.ebuild:
-  Use ABI SLOT="1" of media-libs/libmp4v2 for libmp4v2.so.1 which is dlopened.
+  09 May 2012; Samuli Suominen <ssuominen@gentoo.org> gtkpod-2.0.2.ebuild,
+  +gtkpod-2.1.1-r2.ebuild:
+  Use ABI SLOT="1" of media-libs/libmp4v2 for libmp4v2.so.1 which is used
+  through dlopen(). Upstream has switched to AtomicParsley for >= 2.1.2.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> gtkpod-2.0.2.ebuild,
   gtkpod-2.1.1-r1.ebuild:
diff --git a/app-pda/gtkpod/Manifest b/app-pda/gtkpod/Manifest
index 5917f99e8651..de72622eb50c 100644
--- a/app-pda/gtkpod/Manifest
+++ b/app-pda/gtkpod/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 DIST gtkpod-2.0.2.tar.gz 2982482 RMD160 0810947c013c137f57599a999f63d07d6710b6c7 SHA1 d93e7618653d00a8bc845fd070305c5b38eea1e8 SHA256 2c5dd3d193cd73ba107ccb158e48198768f1dd26724834f8f5ab804281ea4648
 DIST gtkpod-2.1.1.tar.gz 3120542 RMD160 5f30795cf7cda5744181f56875c7648d430d76fc SHA1 aa0bd06395f878bdf9578f8e4350536216fcd2b6 SHA256 a474bb44ed42df554b02c2bd592485ee4fbe91cb9d0fe43576a63bb8b174c37a
-EBUILD gtkpod-2.0.2.ebuild 2142 RMD160 ae5290fbcfd93e897037f7e42b1bd7340692cf64 SHA1 85662dd1408bc1ace910b178fbecc725f7e8ec7b SHA256 e63fd29ac10b5f2abff798d598489f630da06eede7c6b238121fe2322622ee44
-EBUILD gtkpod-2.1.1-r2.ebuild 2160 RMD160 b0c1dd13abf78be53224d8abf28c9f82b7aeb5bd SHA1 0397a3a9674008ea7d4b8ca26c920d884f67fe79 SHA256 2699086a7fb768d8435f458dd79911aac893d7b86112fa8d6f8e7035521e9ed5
-MISC ChangeLog 12627 RMD160 4514adca68c4decfa6fa4f8e88258648120f1880 SHA1 e749a3451bfb6453772ce5f063732abab562882e SHA256 0d019cb26448aeef496b0b71a85d63aa240ed03d9f279906b74f61b7c2a610dc
+EBUILD gtkpod-2.0.2.ebuild 2188 RMD160 c563c20f4111a5640032adcb5744e4cc8a8f01cb SHA1 e233553f8cfff24840c4d8be77dff306616c41e4 SHA256 f68a21f682e84783f044289313b414fca8c9c4251fff95f1f56c713e7aeb56c5
+EBUILD gtkpod-2.1.1-r2.ebuild 2189 RMD160 6d52b3a75cd705a22cc299c447c0cca1307f27c8 SHA1 420a262ad01721ac25430517b7e7384103f52dee SHA256 4fcfa2f0474078a3fcfd882b00bfd4a1bb3cc938b179c45b5ed163f856e2971e
+MISC ChangeLog 12718 RMD160 2427ca5e2e57345e5f8fc2658d2b6bf5f383ed88 SHA1 11c1e5cabbca511229003d2ebaf856ee940254e8 SHA256 32d1d8e996dd8f0d59722a24d2c64f2c7f4beb9e7cbb613b701c0c45bc445c15
 MISC metadata.xml 428 RMD160 c40c3a378f712e2d05f3e9115c1f3c451bbfa361 SHA1 1c1bf125d989ce79c5cb34851bb164251c40ac9c SHA256 b181f09ad8688911dbcccc8a25e2043db62c7c5697d6ac70645f9c3d639f52d5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPqrybAAoJEEdUh39IaPFNRh0H+wddugv6A+MJVSgXFXqGCwKp
-hPEVKXsNdvXTnlKKwM2F/nqrSVn2Bkcgm9N4XAOcdbe15lhoTnG9l+97cyOCjZ9a
-d1FGHx5ofdDnJbWwvN0QzQYEnO9i3LgEMRpdLT0ygK5K4rfcH8vzlatC/MgyeQtj
-QdfYXFXj9XMa2RDBCFi5iHFA5KlPCGKZC/PImcLc25EOW2pWCyjE3UjyMBYwqKxF
-WJu8EekG/CRDJ1JW7qh7l0TTAQwITeLtDfHCwIeRa8SWOWwH3RL6EFd+Y4WDJdnT
-Ef/IzRUJnjiIRf8QBj9QVLCbyPQe7kIah0XJ837t1iiyajSidT1G4dG57io5bTE=
-=1QkX
+iQEcBAEBAgAGBQJPq09TAAoJEEdUh39IaPFN2scH/3IHHK2RMaFaOvSMbZq1SoYM
+KxaHGQxffR+bLFK+DrcCdNVRWAoSxCWUpQsFjjgNR+DXU1frE+4/ly1GsdVf/DLb
+kL3mgs+qA/OG4YPytObKqdsldFVKBe8LPDU9Xh9tICgzU+OVzOBdFFj0kHN058UG
+yeUrg7GeFImQFmtbZuWJ6KL9LtbuoyB52LqQMtmI1sZqqcP+aIhIVps3dk9Rd2FD
+BrN9fMuiZmYJ5+5e1AoNAKHPd6lRRMQ1kx3thykiFPHHz6X3AOmTE3PPMZSEv2b1
+bQ9Tw2pliy9y6a117hP3FmTQqQ9knJ3dgLNVs3spASzf9NDiwzqtJtQIdtZCx8g=
+=/9SF
 -----END PGP SIGNATURE-----
diff --git a/app-pda/gtkpod/gtkpod-2.0.2.ebuild b/app-pda/gtkpod/gtkpod-2.0.2.ebuild
index 1a2c63f21026..43447ddf4595 100644
--- a/app-pda/gtkpod/gtkpod-2.0.2.ebuild
+++ b/app-pda/gtkpod/gtkpod-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-2.0.2.ebuild,v 1.4 2012/05/03 20:20:57 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-2.0.2.ebuild,v 1.5 2012/05/10 05:20:00 ssuominen Exp $
 
 EAPI=2
 inherit gnome2-utils
@@ -21,8 +21,10 @@ COMMON_DEPEND=">=dev-libs/glib-2.15.0:2
 	>=media-libs/libgpod-0.7.0
 	>=media-libs/libid3tag-0.15
 	>=x11-libs/gtk+-2.21.0:2
-	aac? ( media-libs/faad2
-		media-libs/libmp4v2 )
+	aac? (
+		media-libs/faad2
+		|| ( media-libs/libmp4v2:1 <=media-libs/libmp4v2-1.9.1:0 )
+		)
 	curl? ( >=net-misc/curl-7.10 )
 	flac? ( media-libs/flac )
 	gstreamer? ( >=media-libs/gst-plugins-base-0.10.25:0.10 )
diff --git a/app-pda/gtkpod/gtkpod-2.1.1-r2.ebuild b/app-pda/gtkpod/gtkpod-2.1.1-r2.ebuild
index 2a9d5afec9f1..6193b6b2ee49 100644
--- a/app-pda/gtkpod/gtkpod-2.1.1-r2.ebuild
+++ b/app-pda/gtkpod/gtkpod-2.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.1-r2.ebuild,v 1.2 2012/05/09 18:53:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.1-r2.ebuild,v 1.3 2012/05/10 05:20:00 ssuominen Exp $
 
 EAPI=4
 inherit gnome2-utils
@@ -25,7 +25,7 @@ COMMON_DEPEND="dev-libs/gdl:3
 	>=x11-libs/gtk+-3.0.8:3
 	aac? (
 		media-libs/faad2
-		>=media-libs/libmp4v2-1.9.1:1
+		|| ( media-libs/libmp4v2:1 <=media-libs/libmp4v2-1.9.1:0 )
 		)
 	clutter? ( media-libs/clutter-gtk:1.0 )
 	curl? ( >=net-misc/curl-7.10 )