| 1 |
ssuominen 12/01/03 22:46:14 |
| 2 |
|
| 3 |
Modified: ChangeLog libbluray-xine-9999.ebuild |
| 4 |
libbluray-xine-0.2.1.ebuild |
| 5 |
Log: |
| 6 |
Block media-libs/xine-lib with USE bluray because both provide plug-in xineplug_inp_bluray.so |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.10 media-libs/libbluray-xine/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray-xine/ChangeLog?rev=1.10&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray-xine/ChangeLog?rev=1.10&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray-xine/ChangeLog?r1=1.9&r2=1.10 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libbluray-xine/ChangeLog,v |
| 20 |
retrieving revision 1.9 |
| 21 |
retrieving revision 1.10 |
| 22 |
diff -u -r1.9 -r1.10 |
| 23 |
--- ChangeLog 15 Dec 2011 23:15:15 -0000 1.9 |
| 24 |
+++ ChangeLog 3 Jan 2012 22:46:14 -0000 1.10 |
| 25 |
@@ -1,6 +1,11 @@ |
| 26 |
# ChangeLog for media-libs/libbluray-xine |
| 27 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray-xine/ChangeLog,v 1.9 2011/12/15 23:15:15 ago Exp $ |
| 29 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray-xine/ChangeLog,v 1.10 2012/01/03 22:46:14 ssuominen Exp $ |
| 31 |
+ |
| 32 |
+ 03 Jan 2012; Samuli Suominen <ssuominen@g.o> |
| 33 |
+ libbluray-xine-0.2.1.ebuild, libbluray-xine-9999.ebuild: |
| 34 |
+ Block media-libs/xine-lib with USE bluray because both provide plug-in |
| 35 |
+ xineplug_inp_bluray.so |
| 36 |
|
| 37 |
15 Dec 2011; Agostino Sarubbo <ago@g.o> |
| 38 |
libbluray-xine-0.0.1_pre20110819.ebuild: |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.3 media-libs/libbluray-xine/libbluray-xine-9999.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray-xine/libbluray-xine-9999.ebuild?rev=1.3&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray-xine/libbluray-xine-9999.ebuild?rev=1.3&content-type=text/plain |
| 46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray-xine/libbluray-xine-9999.ebuild?r1=1.2&r2=1.3 |
| 47 |
|
| 48 |
Index: libbluray-xine-9999.ebuild |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libbluray-xine/libbluray-xine-9999.ebuild,v |
| 51 |
retrieving revision 1.2 |
| 52 |
retrieving revision 1.3 |
| 53 |
diff -u -r1.2 -r1.3 |
| 54 |
--- libbluray-xine-9999.ebuild 22 Aug 2011 09:11:35 -0000 1.2 |
| 55 |
+++ libbluray-xine-9999.ebuild 3 Jan 2012 22:46:14 -0000 1.3 |
| 56 |
@@ -1,6 +1,6 @@ |
| 57 |
-# Copyright 1999-2011 Gentoo Foundation |
| 58 |
+# Copyright 1999-2012 Gentoo Foundation |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray-xine/libbluray-xine-9999.ebuild,v 1.2 2011/08/22 09:11:35 radhermit Exp $ |
| 61 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray-xine/libbluray-xine-9999.ebuild,v 1.3 2012/01/03 22:46:14 ssuominen Exp $ |
| 62 |
|
| 63 |
EAPI=4 |
| 64 |
|
| 65 |
@@ -26,6 +26,7 @@ |
| 66 |
" |
| 67 |
DEPEND=" |
| 68 |
${COMMON_DEPEND} |
| 69 |
+ !media-libs/xine-lib[bluray] |
| 70 |
dev-util/pkgconfig |
| 71 |
" |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
1.2 media-libs/libbluray-xine/libbluray-xine-0.2.1.ebuild |
| 77 |
|
| 78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray-xine/libbluray-xine-0.2.1.ebuild?rev=1.2&view=markup |
| 79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray-xine/libbluray-xine-0.2.1.ebuild?rev=1.2&content-type=text/plain |
| 80 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray-xine/libbluray-xine-0.2.1.ebuild?r1=1.1&r2=1.2 |
| 81 |
|
| 82 |
Index: libbluray-xine-0.2.1.ebuild |
| 83 |
=================================================================== |
| 84 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libbluray-xine/libbluray-xine-0.2.1.ebuild,v |
| 85 |
retrieving revision 1.1 |
| 86 |
retrieving revision 1.2 |
| 87 |
diff -u -r1.1 -r1.2 |
| 88 |
--- libbluray-xine-0.2.1.ebuild 2 Dec 2011 20:04:33 -0000 1.1 |
| 89 |
+++ libbluray-xine-0.2.1.ebuild 3 Jan 2012 22:46:14 -0000 1.2 |
| 90 |
@@ -1,6 +1,6 @@ |
| 91 |
-# Copyright 1999-2011 Gentoo Foundation |
| 92 |
+# Copyright 1999-2012 Gentoo Foundation |
| 93 |
# Distributed under the terms of the GNU General Public License v2 |
| 94 |
-# $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 $ |
| 95 |
+# $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 $ |
| 96 |
|
| 97 |
EAPI=4 |
| 98 |
|
| 99 |
@@ -25,6 +25,7 @@ |
| 100 |
" |
| 101 |
DEPEND=" |
| 102 |
${COMMON_DEPEND} |
| 103 |
+ !media-libs/xine-lib[bluray] |
| 104 |
dev-util/pkgconfig |
| 105 |
" |
Archives