Block media-libs/libbluray-xine because both provide plug-in xineplug_inp_bluray.so

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/media-libs/libbluray-xine/Manifest b/media-libs/libbluray-xine/Manifest
index 90a2adb31f75acf68916d62a8d9b05c23e5bff59..f4772bf81171de4a4f64417efc93bf4f168c28fd 100644 (file)
--- a/media-libs/libbluray-xine/Manifest
+++ b/media-libs/libbluray-xine/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 DIST libbluray-0.0.1_pre20110210.tar.bz2 191954 RMD160 e749caebd55a94f920a916f2df4d2caa930524fc SHA1 ceb97424f46b1bdc4382b6dbed2b16fa7deefaa0 SHA256 ee31df7ef817c984548dfd788d8c2f4ba24a7c5903021e61bf1503044118f3f5
 DIST libbluray-0.0.1_pre20110819.tar.xz 191992 RMD160 0e3317616a316fe1f6204d270d3239d644d963a1 SHA1 72f56f9859e3354109920c5697c2833d4466dae4 SHA256 64c87de6411939712ff2546b6cca6e16a0599e4d8da449d49e499d23c273a2d4
 DIST libbluray-0.2.1.tar.bz2 396405 RMD160 afc07c3ca92d77d82e9db9dd12b94446fe84b6bd SHA1 a14a940966a1be8e27106de641fafcd56f26215b SHA256 20eb1d352e9d26e8b5b639f82c218a0c350b78cdbcb741f89d237e2202bd113a
 EBUILD libbluray-xine-0.0.1_pre20110210.ebuild 826 RMD160 5640c87d90a2d3731e2352ec0c063fcebf62fd4e SHA1 7437e400940769189ad1df2e458a2d801889cf1d SHA256 8d33514212ff42bc3f1d4f65377f36e051b13437c27c4ccfcdbde5892d494982
 EBUILD libbluray-xine-0.0.1_pre20110819.ebuild 795 RMD160 514e0a1fa3a5346c6d3bd9d56085ed2227eecbe6 SHA1 ead0816dd317cbec0a5a44b449c8dccfa1d0128a SHA256 4d2ab561d59f0043843167fd6029acff0ec2239d0feaa9d00bed4db8ec87d25b
-EBUILD libbluray-xine-0.2.1.ebuild 826 RMD160 0a60429a540bea83ae6f672fea68432e134e3b54 SHA1 d360fb4fe1fbaa8dc8fd0ecb2bb8979c67d723de SHA256 ccb04e1c8e48cfff5844b5dca861b17168e16a289f97bd2710bc235f8840a367
-EBUILD libbluray-xine-9999.ebuild 834 RMD160 d680a5e6f519efa6227d5ebc988ae2d1c3027b81 SHA1 bee780b115b26f3071a622dc748503cfcf619da2 SHA256 0e2c1a09b035f34ed3431f5a72d8b42f3a191e4ac581d7056838d34da9b2872f
-MISC ChangeLog 1744 RMD160 e41e252826f453a49095d81769868a424499a898 SHA1 18a01cec304e453d40c1ec81354b19d65e35bbed SHA256 eba27d42628b8d5a81fe0a88e34c025a703cccfc07d975ef0b726afaed17f6c2
+EBUILD libbluray-xine-0.2.1.ebuild 858 RMD160 d1efa0cfc289745760431a0f022a26bdafc57273 SHA1 741e4eec62eaaaa9cc3fdbd4b8ac7169f663ee31 SHA256 37463b5b76dcb893d36e6baa2ec1830f24e6b3563b4e9607477ba612162913ff
+EBUILD libbluray-xine-9999.ebuild 864 RMD160 d2e960b78e051baca1a61de194e19791619407b6 SHA1 fd3b78af8ab35b26ab897b83de4bae3e291c7214 SHA256 1747dcfca96991076cc54877d6809cc92776ad471a4cfc4e4bf40e8ba03ec433
+MISC ChangeLog 1963 RMD160 58cb98cfac59794d2aeeef7f9d7b9b41d128199e SHA1 d81410d43745dbe3996097b52f3a71a88086d6d6 SHA256 ed3e7333baad8b3837d91e9e9ed52a9c13cb3934ddd2b21dd2bb90c6cd942ffb
 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO6n+bAAoJEOTDgjZ80txdGJMIAJkAqYADuWyBDCZluF5mdgfk
-2YI5pBh2FEa762gwPgTifzj/eETBuHhyHSttpwFrCk97pTg129tn4DmyS9XaNaiM
-L7OjJleMw7VsfrvSqHEthAonVGhpwWy3PUkl8xqwi2ORxxV1c8zXPrF8E+2Oq1Rc
-anNbe32KSmbKBo/22j7vAM4BBuf2a0Vf+aqPbDdwf9KVaIwG/N9hBkAGeb+vkVSF
-0r9A3K24OP8IEPKv5ldbtFCa+2zi9qlsiPjtyH9MhU/mziB83dwt0ipZjOcwOsUg
-lfQy/WzCyogM6gcwnl4obYaRfffwp4i9kvlfwAPr0Gj/gsNNW6ZklEiNIwlveqQ=
-=cknq
+iQEcBAEBAgAGBQJPA4TEAAoJEEdUh39IaPFNpYQH/iakoTWiGmft+QRQvGGP3nek
+28QkC+BTnPsU4S1lK84T9UTlkMWimCRrR8Aapj493/E59FNo+lQFrAAS2eRv1cA1
+R/BelTNjivLuBZRUZf5k2GxmhNfYRPKxlGVbCzV0rxGheY03v9etZBTYmzDgxjV8
+6/0MrJn1qzY71ItSAi4v8KVVKDiq0Fk1TJgtx5+t1oIFniuv4GnG+zIOXagJjeHF
+uU/x9OjyyWPMu+pTcIRKk/Etl1z1CxM59z6ClAb2yQ62h4rBO/smTR2rvaLMkuE5
+oFavCqzXjg2bEGIjxCJDgY5x8PcF33A0Hy4BNWLqLSoj1gkdaZJgaUt+TQdGIXw=
+=XuRW
 -----END PGP SIGNATURE-----

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index ce251f085b4dfb1f0e254d445f7f8e4d097750e0..1d834e4679749e2edcb10e31e2838a5e8bf30bfd 100644 (file)
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.652 2012/01/03 20:04:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.653 2012/01/03 22:44:39 ssuominen Exp $
+
+  03 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> xine-lib-1.2.0.ebuild,
+  xine-lib-1.2.9999.ebuild:
+  Block media-libs/libbluray-xine because both provide plug-in
+  xineplug_inp_bluray.so
 
   03 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> xine-lib-1.2.9999.ebuild:
   Remove USE="nls" from 1.2.9999 because sys-devel/gettext is always required

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 803a22e877763868fb4bdf0fd27091f8778d665a..0b3ca00ff773bff4e1fa02890add30d1c7797d6f 100644 (file)
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -10,18 +10,18 @@ DIST xine-lib-1.1.20.tar.xz 5957256 RMD160 039a7d0ee4e65ce20755d4abbfbf9af6e17a3
 DIST xine-lib-1.2.0.tar.xz 4878972 RMD160 17b73f43e2dc440137727f65d401c673273b1265 SHA1 5d5385f2a0c3bb7beaba1079cd9b62c4c92a301d SHA256 93dff67d07ff2230fac68e64259a72f8a007f4c3fae01b4dd580f74adea78c6f
 EBUILD xine-lib-1.1.19.ebuild 5675 RMD160 b34cf5a8030843ba98e7a90200e4c5e1518153e5 SHA1 d3ef71cc7ef26832f3bbe29d52416f0b22e047b6 SHA256 91daef9cfd2cd146646816e3f15eb5949ea4f8e7a5e05d639e5e621c4795c2da
 EBUILD xine-lib-1.1.20.ebuild 5415 RMD160 0a2a1933c159c8d16f0566ef8ef9f51e0d2d2f3a SHA1 8a31a4753a836043e61bfaab0c240a0abe595110 SHA256 3b688f1ae33b801e9fee6634cd1c009091cff575a707e79c9d99fd52072bb46d
-EBUILD xine-lib-1.2.0.ebuild 4980 RMD160 a62c4280b0fdfc3d66779178c58c4f80f70db074 SHA1 5d2e8069b9fb146d4a6d540e25b428dcd82f85f2 SHA256 3335dd5cf4adcc568006c8991013035e1f6466bc095ae006040ce755ef9df532
-EBUILD xine-lib-1.2.9999.ebuild 4982 RMD160 65c2531d156c611cc8191ed358351f1994be04c7 SHA1 107b25a8a24ac2c16a862469f5b6eebd86926bb6 SHA256 afae619acfdd7febebd353862834bc0529ef5483adf74bc956be5bfd9ce85604
-MISC ChangeLog 76063 RMD160 707d377f327a8e836fc31aaf30fac0fa9e6912e5 SHA1 9c3b3515b479b3575512ecdbab20ea04260f74e2 SHA256 98367540458d8414b765289757a61cba04eeffa5043c91d043c437a7b36a6a8a
+EBUILD xine-lib-1.2.0.ebuild 5097 RMD160 47e5db0516bf5aa425faa1fb88967f74fbd3b004 SHA1 4309aafdd62d1edc6e85727e635d5e1ea4427d4e SHA256 c9bf8d5ffc162f9b4facfb87fe6cfd4cc76f906d0a5701fe2f6b2cb09b6794ed
+EBUILD xine-lib-1.2.9999.ebuild 5099 RMD160 5f5f85ee6e261519e93b6ad2e3c61f2b575db576 SHA1 2d2664f997853c3a71c3f7a35475eebc31640b75 SHA256 0043658d6f55588c74a1e135dafb7ee7195712b23907970cfa183f0ba4aa679f
+MISC ChangeLog 76257 RMD160 5b6aa6f9a2e54333ce9ed893425982daf22591c8 SHA1 a636f74d0f440e06676ffe9afaabdb5b098b780a SHA256 fe07a37ef3286ddf689f6de16bc2d920e18b375029dcf33913a114b370e380c7
 MISC metadata.xml 3072 RMD160 1e12a6a6a26545534c9a77ee57a04c3df6613772 SHA1 c0f3e790048f732dedb7de2478a1de54f327a2b7 SHA256 40718f6753a8cdbb8492ca71d3c335106fa7fe54cb4f6161ad1023ef8323af1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPA17QAAoJEEdUh39IaPFNpw0H+wW2jhL1/BfkTdC3K57PDVWt
-2DBNZnfpmHrVfA+d+inF63XnIvpYbiwS5+GOM0ZmTJATaUy624jIsaeOEOHARTeV
-Jt2HKOwAWRar59yJnTiIJOaYz6rqF/IbofOYK6pdBR8VQPU9Vm7gdInDKEKr4jhD
-NWLoHD5KvqXArd67EdpoquAB3r+DOJAjy5JPRHpb5DH42Sw6PqWYudJMQzkbB4x3
-yxWPkNgyfQKGuAZpGloiEflmTjPD060XcbLsTiqmciCbH6KX602Dqe67LZ6dvT14
-QR5DzP2yOgfT0vKtXbCKwKXiBf7AQVUCSgK6VidLmRqkSyMRfdlgqEDaL4NimHk=
-=/mTz
+iQEcBAEBAgAGBQJPA4RkAAoJEEdUh39IaPFNyqMH+wZED6A3du+0YLj3H6NVuvj/
+L/M0JzWUFChAARZoFp9BQ+VKDur2dIYAxlg0OsPp7Z3grsd6i1FN+PbRsNBciHnS
+HJo/yF1ksyW8+4H88voivphxdd1X+YcG+yXyV/jc8EByeatIbrieAMQktwd9er1q
+aTrqqHFMK/aMWOymTCsE7XKdBF2Ys1vEDvuACfNNi1Wd6WYNhs09wTNanfvtJgJH
+4IB/GDimuKBDZmIl6HJEoRGZSRDU0LVetLolnl1pembfEBYKUE3GqJu0LrOAyZXC
+6dtjmLa6V4m82Bj2frbv4ho+bdUn7iRiVbnFvS4deOHSwCzvs2gqP7ETU25JW6w=
+=PoWa
 -----END PGP SIGNATURE-----

diff --git a/media-libs/xine-lib/xine-lib-1.2.0.ebuild b/media-libs/xine-lib/xine-lib-1.2.0.ebuild
index d8300f9694899f594add1f507d552544731eb66a..13b39cae8bf785bb11cf0fe3052ff6497ec9285d 100644 (file)
--- a/media-libs/xine-lib/xine-lib-1.2.0.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.0.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/media-libs/xine-lib/xine-lib-1.2.0.ebuild,v 1.3 2012/01/03 19:51:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.0.ebuild,v 1.4 2012/01/03 22:44:39 ssuominen Exp $
 
 EAPI=4
 
@@ -59,8 +59,14 @@ RDEPEND="dev-libs/libxdg-basedir
                )
        samba? ( net-fs/samba )
        sdl? ( media-libs/libsdl )
-       speex? ( media-libs/speex )
-       theora? ( media-libs/libtheora )
+       speex? (
+               media-libs/libogg
+               media-libs/speex
+               )
+       theora? (
+               media-libs/libogg
+               media-libs/libtheora
+               )
        truetype? (
                media-libs/fontconfig
                media-libs/freetype:2
@@ -89,18 +95,19 @@ DEPEND="${RDEPEND}
        app-arch/xz-utils
        dev-util/pkgconfig
        >=sys-devel/libtool-2.2.6b
+       bluray? ( !media-libs/libbluray-xine )
        nls? ( sys-devel/gettext )
+       oss? ( virtual/os-headers )
        v4l? ( virtual/os-headers )
        X? (
                x11-libs/libXt
-               x11-proto/videoproto
                x11-proto/xf86vidmodeproto
                x11-proto/xproto
                )
+       xv? ( x11-proto/videoproto )
+       xvmc? ( x11-proto/videoproto )
        xinerama? ( x11-proto/xineramaproto )"
-REQUIRED_USE="speex? ( vorbis )
-       theora? ( vorbis )
-       vidix? ( || ( X fbcon ) )
+REQUIRED_USE="vidix? ( || ( X fbcon ) )
        xv? ( X )
        xinerama? ( X )"
 

diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 6527c83a6faa4fdbf339a03f390c69f1e0bf5ab3..477148bf93641195de3ce4e7791016c291ade481 100644 (file)
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.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/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.7 2012/01/03 20:04:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.8 2012/01/03 22:44:39 ssuominen Exp $
 
 EAPI=4
 
@@ -59,8 +59,14 @@ RDEPEND="dev-libs/libxdg-basedir
                )
        samba? ( net-fs/samba )
        sdl? ( media-libs/libsdl )
-       speex? ( media-libs/speex )
-       theora? ( media-libs/libtheora )
+       speex? (
+               media-libs/libogg
+               media-libs/speex
+               )
+       theora? (
+               media-libs/libogg
+               media-libs/libtheora
+               )
        truetype? (
                media-libs/fontconfig
                media-libs/freetype:2
@@ -90,17 +96,18 @@ DEPEND="${RDEPEND}
        dev-util/pkgconfig
        sys-devel/gettext
        >=sys-devel/libtool-2.2.6b
+       bluray? ( !media-libs/libbluray-xine )
+       oss? ( virtual/os-headers )
        v4l? ( virtual/os-headers )
        X? (
                x11-libs/libXt
-               x11-proto/videoproto
                x11-proto/xf86vidmodeproto
                x11-proto/xproto
                )
+       xv? ( x11-proto/videoproto )
+       xvmc? ( x11-proto/videoproto )
        xinerama? ( x11-proto/xineramaproto )"
-REQUIRED_USE="speex? ( vorbis )
-       theora? ( vorbis )
-       vidix? ( || ( X fbcon ) )
+REQUIRED_USE="vidix? ( || ( X fbcon ) )
        xv? ( X )
        xinerama? ( X )"