summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-01-23 11:56:17 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-01-23 11:56:17 +0000
commit763988e48a4bf7bea9d371cb87085e8640fbd67e (patch)
tree43f92ba461ea1f102fc0f62bd6b00c782fed1d1a /app-cdr
parentOnly cdparanoia executable is used. Convert the dependency to || () for libcd... (diff)
downloadgentoo-2-763988e48a4bf7bea9d371cb87085e8640fbd67e.tar.gz
gentoo-2-763988e48a4bf7bea9d371cb87085e8640fbd67e.tar.bz2
gentoo-2-763988e48a4bf7bea9d371cb87085e8640fbd67e.zip
Make use of new eselectable cdparanoia and mpg123 for || ( ) style dependency of mpg123 vs. mpg321 and cdparanoia vs. libcdio-paranoia.
(Portage version: 2.2.0_alpha155/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/bashburn/ChangeLog8
-rw-r--r--app-cdr/bashburn/bashburn-3.1.0.ebuild8
2 files changed, 10 insertions, 6 deletions
diff --git a/app-cdr/bashburn/ChangeLog b/app-cdr/bashburn/ChangeLog
index 67302795adc3..393af099019c 100644
--- a/app-cdr/bashburn/ChangeLog
+++ b/app-cdr/bashburn/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-cdr/bashburn
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/bashburn/ChangeLog,v 1.47 2012/04/01 15:44:19 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/bashburn/ChangeLog,v 1.48 2013/01/23 11:56:17 ssuominen Exp $
+
+ 23 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> bashburn-3.1.0.ebuild:
+ Make use of new eselectable cdparanoia and mpg123 for || ( ) style dependency
+ of mpg123 vs. mpg321 and cdparanoia vs. libcdio-paranoia.
01 Apr 2012; Raúl Porcel <armin76@gentoo.org> bashburn-3.1.0.ebuild:
sparc stable wrt #404601
diff --git a/app-cdr/bashburn/bashburn-3.1.0.ebuild b/app-cdr/bashburn/bashburn-3.1.0.ebuild
index 920ad88a51a9..b3e52ca4e0a7 100644
--- a/app-cdr/bashburn/bashburn-3.1.0.ebuild
+++ b/app-cdr/bashburn/bashburn-3.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/bashburn/bashburn-3.1.0.ebuild,v 1.5 2012/04/01 15:44:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/bashburn/bashburn-3.1.0.ebuild,v 1.6 2013/01/23 11:56:17 ssuominen Exp $
EAPI=4
@@ -20,9 +20,9 @@ RDEPEND="${DEPEND}
app-cdr/cdrdao
app-cdr/dvd+rw-tools
media-libs/flac
- media-sound/cdparanoia
+ || ( dev-libs/libcdio-paranoia media-sound/cdparanoia )
media-sound/lame
- media-sound/mpg123
+ || ( media-sound/mpg123 media-sound/mpg321 )
media-sound/normalize
media-sound/vorbis-tools
virtual/cdrtools