diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-01-03 22:46:14 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-01-03 22:46:14 +0000 |
| commit | 8ce595e58b4a28521bef0a42d501bdf421b6070f (patch) | |
| tree | 0bef491cee418695ac8948d138bbf779e0b71f41 /media-libs/libbluray-xine | |
| parent | Block media-libs/libbluray-xine because both provide plug-in xineplug_inp_blu... (diff) | |
| download | gentoo-2-8ce595e58b4a28521bef0a42d501bdf421b6070f.tar.gz gentoo-2-8ce595e58b4a28521bef0a42d501bdf421b6070f.tar.bz2 gentoo-2-8ce595e58b4a28521bef0a42d501bdf421b6070f.zip | |
Block media-libs/xine-lib with USE bluray because both provide plug-in xineplug_inp_bluray.so
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libbluray-xine')
| -rw-r--r-- | media-libs/libbluray-xine/ChangeLog | 9 | ||||
| -rw-r--r-- | media-libs/libbluray-xine/libbluray-xine-0.2.1.ebuild | 5 | ||||
| -rw-r--r-- | media-libs/libbluray-xine/libbluray-xine-9999.ebuild | 5 |
3 files changed, 13 insertions, 6 deletions
diff --git a/media-libs/libbluray-xine/ChangeLog b/media-libs/libbluray-xine/ChangeLog index 42e8afdd9e1a..2400592d372c 100644 --- a/media-libs/libbluray-xine/ChangeLog +++ b/media-libs/libbluray-xine/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libbluray-xine -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray-xine/ChangeLog,v 1.9 2011/12/15 23:15:15 ago Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray-xine/ChangeLog,v 1.10 2012/01/03 22:46:14 ssuominen Exp $ + + 03 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> + libbluray-xine-0.2.1.ebuild, libbluray-xine-9999.ebuild: + Block media-libs/xine-lib with USE bluray because both provide plug-in + xineplug_inp_bluray.so 15 Dec 2011; Agostino Sarubbo <ago@gentoo.org> libbluray-xine-0.0.1_pre20110819.ebuild: diff --git a/media-libs/libbluray-xine/libbluray-xine-0.2.1.ebuild b/media-libs/libbluray-xine/libbluray-xine-0.2.1.ebuild index f2bc3a69df50..d93ae4ca7c5c 100644 --- a/media-libs/libbluray-xine/libbluray-xine-0.2.1.ebuild +++ b/media-libs/libbluray-xine/libbluray-xine-0.2.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray-xine/libbluray-xine-0.2.1.ebuild,v 1.1 2011/12/02 20:04:33 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray-xine/libbluray-xine-0.2.1.ebuild,v 1.2 2012/01/03 22:46:14 ssuominen Exp $ EAPI=4 @@ -25,6 +25,7 @@ RDEPEND=" " DEPEND=" ${COMMON_DEPEND} + !media-libs/xine-lib[bluray] dev-util/pkgconfig " diff --git a/media-libs/libbluray-xine/libbluray-xine-9999.ebuild b/media-libs/libbluray-xine/libbluray-xine-9999.ebuild index 240ea820c608..a81f05c86d6c 100644 --- a/media-libs/libbluray-xine/libbluray-xine-9999.ebuild +++ b/media-libs/libbluray-xine/libbluray-xine-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray-xine/libbluray-xine-9999.ebuild,v 1.2 2011/08/22 09:11:35 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray-xine/libbluray-xine-9999.ebuild,v 1.3 2012/01/03 22:46:14 ssuominen Exp $ EAPI=4 @@ -26,6 +26,7 @@ RDEPEND=" " DEPEND=" ${COMMON_DEPEND} + !media-libs/xine-lib[bluray] dev-util/pkgconfig " |