diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-05-10 05:20:00 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-05-10 05:20:00 +0000 |
| commit | 27880c530ff9e1d3fe5ffef69a8145edf37759ed (patch) | |
| tree | 7099c380d5e474c6378a1e556ddb49fa3c3e01bf /app-pda | |
| parent | arm: rework default --with-arch selection to be more tolerant of endian varia... (diff) | |
| download | gentoo-2-27880c530ff9e1d3fe5ffef69a8145edf37759ed.tar.gz gentoo-2-27880c530ff9e1d3fe5ffef69a8145edf37759ed.tar.bz2 gentoo-2-27880c530ff9e1d3fe5ffef69a8145edf37759ed.zip | |
Relax the libmp4v2 dep for people mixing stabilization levels
(Portage version: 2.2.0_alpha102/cvs/Linux x86_64)
Diffstat (limited to 'app-pda')
| -rw-r--r-- | app-pda/gtkpod/ChangeLog | 8 | ||||
| -rw-r--r-- | app-pda/gtkpod/gtkpod-2.0.2.ebuild | 8 | ||||
| -rw-r--r-- | app-pda/gtkpod/gtkpod-2.1.1-r2.ebuild | 4 |
3 files changed, 12 insertions, 8 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/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 ) |