summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-03-11 19:10:07 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-03-11 19:10:07 +0000
commit856b4250559bea39b268d28de34ee388ceff8fed (patch)
tree9d5ebd74a7ae001810b264eaa0ef23bf73310068 /media-sound
parentInitial commit wrt #504232 by Paolo Pedroni (diff)
downloadgentoo-2-856b4250559bea39b268d28de34ee388ceff8fed.tar.gz
gentoo-2-856b4250559bea39b268d28de34ee388ceff8fed.tar.bz2
gentoo-2-856b4250559bea39b268d28de34ee388ceff8fed.zip
Use || ( ) to allow installation of media-video/atomicparsley-wez instead of media-video/atomicparsley wrt #504232
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/audiotag/ChangeLog9
-rw-r--r--media-sound/audiotag/audiotag-0.19.ebuild6
2 files changed, 9 insertions, 6 deletions
diff --git a/media-sound/audiotag/ChangeLog b/media-sound/audiotag/ChangeLog
index 628bd06f70f7..d1b6b45dddc0 100644
--- a/media-sound/audiotag/ChangeLog
+++ b/media-sound/audiotag/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/audiotag
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audiotag/ChangeLog,v 1.28 2011/01/06 16:44:51 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audiotag/ChangeLog,v 1.29 2014/03/11 19:10:07 ssuominen Exp $
+
+ 11 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> audiotag-0.19.ebuild:
+ Use || ( ) to allow installation of media-video/atomicparsley-wez instead of
+ media-video/atomicparsley wrt #504232
06 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> audiotag-0.19.ebuild:
ppc64 stable wrt #346113
@@ -111,4 +115,3 @@
07 Jul 2004; Frank van de Pol <fvdpol@gentoo.org> :
New ebuild thanks submitted by Ryan McGuigan <ryan@cardweb.com>. Closes bug
#45884.
-
diff --git a/media-sound/audiotag/audiotag-0.19.ebuild b/media-sound/audiotag/audiotag-0.19.ebuild
index 91f42ba08fa3..5770b5d44387 100644
--- a/media-sound/audiotag/audiotag-0.19.ebuild
+++ b/media-sound/audiotag/audiotag-0.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audiotag/audiotag-0.19.ebuild,v 1.4 2011/01/06 16:44:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audiotag/audiotag-0.19.ebuild,v 1.5 2014/03/11 19:10:07 ssuominen Exp $
DESCRIPTION="A command-line tool for mass tagging/renaming of audio files."
HOMEPAGE="http://github.com/Daenyth/audiotag"
@@ -15,7 +15,7 @@ RDEPEND="dev-lang/perl
flac? ( media-libs/flac )
vorbis? ( media-sound/vorbis-tools )
mp3? ( media-libs/id3lib )
- aac? ( media-video/atomicparsley )"
+ aac? ( || ( media-video/atomicparsley media-video/atomicparsley-wez ) )"
DEPEND=""
src_install() {