diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2012-03-08 17:14:12 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2012-03-08 17:14:12 +0000 |
| commit | d6ae897ebe2198c309e7d914ac061b43fb336f6d (patch) | |
| tree | 645563dfe952923b4090eb0ee971f6df73e5d43f /app-cdr | |
| parent | Add ~x86-fbsd. (diff) | |
| download | gentoo-2-d6ae897ebe2198c309e7d914ac061b43fb336f6d.tar.gz gentoo-2-d6ae897ebe2198c309e7d914ac061b43fb336f6d.tar.bz2 gentoo-2-d6ae897ebe2198c309e7d914ac061b43fb336f6d.zip | |
app-cdr/k9copy: Resolve conflict with mplayer2
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr')
| -rw-r--r-- | app-cdr/k9copy/ChangeLog | 7 | ||||
| -rw-r--r-- | app-cdr/k9copy/k9copy-2.3.8.ebuild | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/app-cdr/k9copy/ChangeLog b/app-cdr/k9copy/ChangeLog index 263bc356561d..3c1efc8c80bc 100644 --- a/app-cdr/k9copy/ChangeLog +++ b/app-cdr/k9copy/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-cdr/k9copy # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.69 2012/01/12 16:05:44 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.70 2012/03/08 17:14:12 sping Exp $ + + 08 Mar 2012; Sebastian Pipping <sping@gentoo.org> k9copy-2.3.8.ebuild: + Guard optional mplayer runtime dependency behind mplayer use flag so that + people who (1) have mplayer2 installed (which conflicts with mplayer) and (2) + use the internal preview of k9copy can still install k9copy without problems *k9copy-2.3.8 (12 Jan 2012) diff --git a/app-cdr/k9copy/k9copy-2.3.8.ebuild b/app-cdr/k9copy/k9copy-2.3.8.ebuild index acba02f288bc..02e08c791539 100644 --- a/app-cdr/k9copy/k9copy-2.3.8.ebuild +++ b/app-cdr/k9copy/k9copy-2.3.8.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-cdr/k9copy/k9copy-2.3.8.ebuild,v 1.1 2012/01/12 16:05:44 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-2.3.8.ebuild,v 1.2 2012/03/08 17:14:12 sping Exp $ EAPI=4 @@ -21,7 +21,7 @@ HOMEPAGE="http://k9copy.sourceforge.net/" LICENSE="GPL-2" SLOT="4" KEYWORDS="~amd64 ~x86" -IUSE="debug" +IUSE="debug mplayer" DEPEND=" media-libs/libdvdread @@ -31,7 +31,7 @@ DEPEND=" " RDEPEND="${DEPEND} media-video/dvdauthor - media-video/mplayer + mplayer? ( media-video/mplayer ) " DOCS=( README ) |