Fix dependencies for modular Xorg.

Package-Manager: portage-2.0.52-r1

3 files changed, 38 insertions, 11 deletions

diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog
index 33523ad6f033..23f19ef11524 100644
--- a/media-video/xine-ui/ChangeLog
+++ b/media-video/xine-ui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/xine-ui
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.96 2005/09/14 00:05:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.97 2005/09/14 09:30:34 flameeyes Exp $
+
+  14 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  xine-ui-0.99.4-r2.ebuild:
+  Fix dependencies for modular Xorg.
 
   14 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
   xine-ui-0.99.4-r2.ebuild:
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 21ec4f71342c..b4bf33ff5196 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 63356bb287ca930424eb2687ff4aed8d ChangeLog 16090
+MD5 70a6d0c1a0014bfb66a0b6128ad16a22 ChangeLog 16209
 MD5 cda8e47e69ddb56ebbd788ff274cf721 xine-ui-0.99.3-r1.ebuild 1831
 MD5 4a022e80e2ebd256efd8ee1ca45cb472 xine-ui-0.99.4-r1.ebuild 1831
 MD5 20edf818b8dafe82c8aad59ecb3156cf xine-ui-0.99.3.ebuild 1596
-MD5 54b624f552ffddbe41c41f4f4ca32fd1 xine-ui-0.99.4-r2.ebuild 1642
+MD5 68a4c23387bd8d5421ab492a87690078 xine-ui-0.99.4-r2.ebuild 2068
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 9bb09aa5a58f1fe1a30f28bc9876d31e files/digest-xine-ui-0.99.4-r2 136
 MD5 609a90c35f25d57077d7e7eaf94aa509 files/digest-xine-ui-0.99.3 135
@@ -14,7 +14,7 @@ MD5 21319eb55b4549ab5e5cc6aeb2f51649 files/digest-xine-ui-0.99.3-r1 135
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDJ2lNj5H05b2HAEkRArb9AJ9reX7wWR3iGpbiUv361BZIfBNDxgCfeDvY
-n6HK31+IqRv/9TF8m73/+ks=
-=uLB7
+iD8DBQFDJ+3Qj5H05b2HAEkRAitiAJ9RqhvbfkY6+C1kYxy9D4Aiilb/1QCeMgfb
+0li/ZuxnkU7HMa5o0HdaJw0=
+=zQ9P
 -----END PGP SIGNATURE-----
diff --git a/media-video/xine-ui/xine-ui-0.99.4-r2.ebuild b/media-video/xine-ui/xine-ui-0.99.4-r2.ebuild
index eca6ea3db9d3..e78b221551fa 100644
--- a/media-video/xine-ui/xine-ui-0.99.4-r2.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.4-r2.ebuild,v 1.4 2005/09/14 00:05:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.4-r2.ebuild,v 1.5 2005/09/14 09:30:34 flameeyes Exp $
 
 inherit eutils autotools
 
@@ -15,15 +15,38 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="X nls lirc aalib libcaca readline curl ncurses"
 
-DEPEND="media-libs/libpng
+RDEPEND="media-libs/libpng
 	>=media-libs/xine-lib-1.0
 	lirc? ( app-misc/lirc )
-	X? ( virtual/x11 )
 	aalib? ( media-libs/aalib )
 	libcaca? ( media-libs/libcaca )
 	curl? ( >=net-misc/curl-7.10.2 )
-	ncurses? ( sys-libs/ncurses )"
-RDEPEND="nls? ( sys-devel/gettext )"
+	ncurses? ( sys-libs/ncurses )
+	X? ( || ( (
+			x11-libs/libX11
+			x11-libs/libXrender
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libXext
+			x11-libs/libXxf86vm
+			x11-libs/libXv
+			x11-libs/libXinerama
+			x11-libs/libXtst
+			x11-libs/libXft )
+		virtual/x11 )
+		)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	X? ( || ( (
+			x11-base/xorg-server
+			x11-libs/libX11
+			x11-libs/libXt
+			x11-proto/xextproto
+			x11-proto/xproto
+			x11-proto/xf86vidmodeproto
+			x11-proto/xineramaproto )
+		virtual/x11 )
+		)"
 
 src_unpack() {
 	unpack ${A}