Fixed X dependencies (support for modular X).

Package-Manager: portage-2.1_pre3-r1

5 files changed, 24 insertions, 17 deletions

diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog
index 035c00d3e5fe..e81b52178624 100644
--- a/www-client/elinks/ChangeLog
+++ b/www-client/elinks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/elinks
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.34 2006/01/22 11:38:52 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.35 2006/01/22 11:41:44 spock Exp $
+
+  22 Jan 2006; Michał Januszewski <spock@gentoo.org> elinks-0.10.5.ebuild,
+  elinks-0.10.5-r1.ebuild, elinks-0.10.6.ebuild:
+  Fixed X dependencies (support for modular X).
 
 *elinks-0.11.0 (22 Jan 2006)
 
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 6baf897f5f8d..8439663d9e87 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 aa52d2f60b314eaf4b2a61f783601c40 ChangeLog 12100
-MD5 460bf16e9409074244ba5f1c62f95b2e elinks-0.10.5-r1.ebuild 4025
-MD5 166bcca8eca86c5303b39043887e950b elinks-0.10.5.ebuild 3530
-MD5 6cf1be00849f929b10dc6c30e015030b elinks-0.10.6.ebuild 3911
+MD5 2f99f33e6a8f8c7ac2b617d6b46b9d2e ChangeLog 12274
+MD5 77809539a1fc470b15666ab9b111932b elinks-0.10.5-r1.ebuild 4068
+MD5 a6aae1c470f18573d077f9a17f3dc12d elinks-0.10.5.ebuild 3573
+MD5 fbf2f4dc5d80b8fb9a6c454acb2b08a1 elinks-0.10.6.ebuild 3955
 MD5 b4cb25337664eb8052a716142845486f elinks-0.11.0.ebuild 4234
 MD5 db4038d1a62b31535db38c97c40928d8 files/digest-elinks-0.10.5 132
 MD5 db4038d1a62b31535db38c97c40928d8 files/digest-elinks-0.10.5-r1 132
@@ -17,7 +17,7 @@ MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD027kchej4aZK9/cRAqJSAJ47y6Bmo5nHxqtjY40F+sMm26nRMwCfTvis
-OpkB/G46NDVhzkL4L4fM6HM=
-=up0f
+iD8DBQFD02+Echej4aZK9/cRAg4AAJ9SLosCBe3fGDEzE/6paLVexZYzSwCeIOjm
+b8PQUSh1wa71BMs6tctiEG0=
+=W34s
 -----END PGP SIGNATURE-----
diff --git a/www-client/elinks/elinks-0.10.5-r1.ebuild b/www-client/elinks/elinks-0.10.5-r1.ebuild
index 404e0679a217..96f5dfce4d66 100644
--- a/www-client/elinks/elinks-0.10.5-r1.ebuild
+++ b/www-client/elinks/elinks-0.10.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.10.5-r1.ebuild,v 1.5 2005/12/02 22:29:20 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.10.5-r1.ebuild,v 1.6 2006/01/22 11:41:44 spock Exp $
 
 inherit eutils
 
@@ -21,7 +21,8 @@ DEPEND="virtual/libc
 	>=dev-libs/expat-1.95.4
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
 	ssl? ( >=dev-libs/openssl-0.9.6g )
-	X? ( virtual/x11 )
+	X? ( || ( ( x11-libs/libX11 x11-libs/libXt )
+			virtual/x11 ) )
 	zlib? ( >=sys-libs/zlib-1.1.4 )
 	lua? ( >=dev-lang/lua-4 )
 	gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 )
diff --git a/www-client/elinks/elinks-0.10.5.ebuild b/www-client/elinks/elinks-0.10.5.ebuild
index 61b67989092c..0f2f1422202b 100644
--- a/www-client/elinks/elinks-0.10.5.ebuild
+++ b/www-client/elinks/elinks-0.10.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.10.5.ebuild,v 1.9 2005/09/16 14:21:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.10.5.ebuild,v 1.10 2006/01/22 11:41:44 spock Exp $
 
 inherit eutils
 
@@ -22,7 +22,8 @@ DEPEND="virtual/libc
 	>=dev-libs/expat-1.95.4
 	>=sys-apps/portage-2.0.45-r3
 	ssl? ( >=dev-libs/openssl-0.9.6g )
-	X? ( virtual/x11 )
+	X? ( || ( ( x11-libs/libX11 x11-libs/libXt )
+			virtual/x11 ) )
 	zlib? ( >=sys-libs/zlib-1.1.4 )
 	lua? ( >=dev-lang/lua-4 )
 	gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 )
diff --git a/www-client/elinks/elinks-0.10.6.ebuild b/www-client/elinks/elinks-0.10.6.ebuild
index 885fae78a1cb..0bfcbeffbc76 100644
--- a/www-client/elinks/elinks-0.10.6.ebuild
+++ b/www-client/elinks/elinks-0.10.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.10.6.ebuild,v 1.10 2005/12/24 15:45:13 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.10.6.ebuild,v 1.11 2006/01/22 11:41:44 spock Exp $
 
 inherit eutils
 
@@ -19,7 +19,8 @@ RESTRICT="test"
 DEPEND=">=dev-libs/expat-1.95.4
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
 	ssl? ( >=dev-libs/openssl-0.9.6g )
-	X? ( virtual/x11 )
+	X? ( || ( ( x11-libs/libX11 x11-libs/libXt )
+			virtual/x11 ) )
 	zlib? ( >=sys-libs/zlib-1.1.4 )
 	lua? ( >=dev-lang/lua-4 )
 	gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 )