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 | 579c7317d06b658418543a2942fe2293daffcf35 (patch) | |
| tree | b08de6ca84bceaca54f47a791903866242f81736 /app-cdr | |
| parent | Add ~x86-fbsd. (diff) | |
| download | historical-579c7317d06b658418543a2942fe2293daffcf35.tar.gz historical-579c7317d06b658418543a2942fe2293daffcf35.tar.bz2 historical-579c7317d06b658418543a2942fe2293daffcf35.zip | |
app-cdr/k9copy: Resolve conflict with mplayer2
Package-Manager: portage-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/Manifest | 16 | ||||
| -rw-r--r-- | app-cdr/k9copy/k9copy-2.3.8.ebuild | 6 |
3 files changed, 15 insertions, 14 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/Manifest b/app-cdr/k9copy/Manifest index ccaac12a0d1e..e78df7bafd8e 100644 --- a/app-cdr/k9copy/Manifest +++ b/app-cdr/k9copy/Manifest @@ -1,21 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 AUX k9copy-2.3.7-ffmpeg.patch 664 RMD160 fad7bd83cf932edb13ce2a5b332dda90d8943c64 SHA1 d9be05d7a362ad95fcf584ce22611e18d06a136d SHA256 76c0e7f4e29ef41ecc7948f1a81eaabd41f00fcc520401d9943c24e70a301d58 DIST k9copy-2.3.7-Source.tar.gz 1571305 RMD160 c3b57c77bdb32365f9f694101f1eaf59059d22d9 SHA1 8b0aa8f1e63e4a396746f88ca9c763808895b7d0 SHA256 516f4108a189a050f0aadf5b617d151b6b0e52c18823941f2b895073c104e74e DIST k9copy-2.3.8-Source.tar.gz 1589535 RMD160 1855649ca84140718fc26d97a79ee23e8eb90fa2 SHA1 15c9900c689d4d98d8ebae9fbe6e7f7de158cc32 SHA256 cf5e2d9faf7821561e478ed1fc9b63bbcc3448405d7b7866f68b018d16b42fdf EBUILD k9copy-2.3.7.ebuild 1197 RMD160 da157fea1f327f2cc5932615f92f68007f37d1b6 SHA1 0f1b421c66c96b998bc6a5f5cc9d79a70e362fc9 SHA256 3d5de4af5f25483b7d01a3af9e28653d20cdb1773807e484d41848ff76007753 -EBUILD k9copy-2.3.8.ebuild 1171 RMD160 36e9142c3eb344b950cef64d564ce8a69c933de7 SHA1 d71c3d826d3a9cdde854fb6c17e1985e3521a1a2 SHA256 5422f83318de212a77a0b640dc578d3dc48e11bfc25978c99707adad89fc950b -MISC ChangeLog 11021 RMD160 c4572f6cca9919f9bed7eb0dd608680298c374ee SHA1 eea16cc29abdc3691f341e4d72c360af08044dd8 SHA256 e2491601a46f5aae4cc5117e29e9e15a5a3ebc0bc7de878334d8cc5095734059 +EBUILD k9copy-2.3.8.ebuild 1193 RMD160 df8836c2943079760b2c21e8dda0138b49ac1039 SHA1 4beb796a9e068d8448df5481a21cc5152cda81de SHA256 eeae5b025c97aa8c25454d0791008a5261253e8330efeb0a1db036cc1e204519 +MISC ChangeLog 11331 RMD160 88621b565d97879079e74631295f1cee8fba91c3 SHA1 91b09f4ad6480d4f93b7e70676be67771096f1ca SHA256 2ab28b7ae7c21c91adec7d82d6a0cd52490a5199a7343d172555499fd70927ad MISC metadata.xml 301 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 SHA1 ce66e4b54d1cd620faddeacacceac59b5ede47ed SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJPDwSxAAoJEO+t9ga+3I3aoI0IALEHr+PszNCT+2Yp1wXfNN3n -UOchjFTDxdyqlyqyFvP81bd0AFso7qCQ5rcCyk6GR4blHGq76FAsS4FQ+KnPV/xZ -r/Pw9Q1+b0SVZvUtGm3A4BfVNsX9Q86e119pEm6tnupMTIzspi3F8DQduooKBwUp -ik1AEWCBWvIWZ180adhVPom7Q6iyzynuSiVsqgnL7TmIgcyb1x+Dkt71DZ9XqVn2 -97VbaI/QVqqx6N2YoFxwZjrDAR/3O0CRXpb30Ad7RbNG7Xh4iis6gY6Alhkyc2Wu -yupHhSe4gpDstddALIVWNlSk4J+DxuZMLfzP3cbhrvM6hnPdGC0hHDzgDgCrAhE= -=Bnoa +iEYEARECAAYFAk9Y6MsACgkQsAvGakAaFgAWMwCghv5brYNboNLOGem5/QsJ/8WE +qdIAmgMR08XejLs68glRilqO++YZKL2J +=bhTp -----END PGP SIGNATURE----- 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 ) |