diff options
| -rw-r--r-- | media-sound/easytag/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/easytag/easytag-2.1.7-r2.ebuild | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/media-sound/easytag/ChangeLog b/media-sound/easytag/ChangeLog index 6369a1230a43..3b697f2927cc 100644 --- a/media-sound/easytag/ChangeLog +++ b/media-sound/easytag/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/easytag # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.156 2012/05/19 09:06:50 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.157 2012/05/20 16:00:09 ssuominen Exp $ + + 20 May 2012; Samuli Suominen <ssuominen@gentoo.org> easytag-2.1.7-r2.ebuild: + Use has_version to apply -2.1.7-new_libmp4v2.patch only if + media-libs/libmp4v2 >= 1.9.1_p479 wrt #376391 19 May 2012; Samuli Suominen <ssuominen@gentoo.org> easytag-2.1.6-r3.ebuild, easytag-2.1.7-r2.ebuild: diff --git a/media-sound/easytag/easytag-2.1.7-r2.ebuild b/media-sound/easytag/easytag-2.1.7-r2.ebuild index 295d994f7b26..6e9a7dd0efda 100644 --- a/media-sound/easytag/easytag-2.1.7-r2.ebuild +++ b/media-sound/easytag/easytag-2.1.7-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/media-sound/easytag/easytag-2.1.7-r2.ebuild,v 1.3 2012/05/19 09:06:50 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-2.1.7-r2.ebuild,v 1.4 2012/05/20 16:00:09 ssuominen Exp $ EAPI=4 inherit eutils fdo-mime @@ -23,7 +23,7 @@ RDEPEND=">=x11-libs/gtk+-2.12:2 media-libs/flac media-libs/libvorbis ) - mp4? ( >=media-libs/libmp4v2-1.9.1_p479:0 ) + mp4? ( >=media-libs/libmp4v2-1.9.1:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) speex? ( @@ -39,8 +39,10 @@ DOCS=( ChangeLog README THANKS TODO USERS-GUIDE ) src_prepare() { epatch \ "${FILESDIR}"/${PN}-2.1.7-gold.patch \ - "${FILESDIR}"/${PN}-2.1.6-load-from-txt.patch \ - "${FILESDIR}"/${PN}-2.1.7-new_libmp4v2.patch + "${FILESDIR}"/${PN}-2.1.6-load-from-txt.patch + + has_version '>=media-libs/libmp4v2-1.9.1_p479' && \ + epatch "${FILESDIR}"/${PN}-2.1.7-new_libmp4v2.patch } src_configure() { |