Fixed X-related dependencies (support for modular X).

(Portage version: 2.1_pre3-r1)

4 files changed, 27 insertions, 13 deletions

diff --git a/x11-misc/xfractint/ChangeLog b/x11-misc/xfractint/ChangeLog
index d5614bec95a4..2fa06a6bc13a 100644
--- a/x11-misc/xfractint/ChangeLog
+++ b/x11-misc/xfractint/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xfractint
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/ChangeLog,v 1.34 2006/01/22 15:46:55 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/ChangeLog,v 1.35 2006/01/22 15:49:52 spock Exp $
+
+  22 Jan 2006; Michał Januszewski <spock@gentoo.org>
+  xfractint-20.3.01.ebuild, xfractint-20.3.02.ebuild,
+  xfractint-20.4.00.ebuild:
+  Fixed X-related dependencies (support for modular X).
 
 *xfractint-20.4.03 (22 Jan 2006)
 
diff --git a/x11-misc/xfractint/xfractint-20.3.01.ebuild b/x11-misc/xfractint/xfractint-20.3.01.ebuild
index 18658bd64fcd..6177bc3237d7 100644
--- a/x11-misc/xfractint/xfractint-20.3.01.ebuild
+++ b/x11-misc/xfractint/xfractint-20.3.01.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/x11-misc/xfractint/xfractint-20.3.01.ebuild,v 1.13 2005/01/11 23:50:45 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/xfractint-20.3.01.ebuild,v 1.14 2006/01/22 15:49:52 spock Exp $
 
 inherit eutils flag-o-matic
 
@@ -16,9 +16,12 @@ SLOT="0"
 LICENSE="freedist"
 IUSE=""
 
-DEPEND="virtual/libc
+RDEPEND="virtual/libc
 	>=sys-libs/ncurses-5.1
-	virtual/x11"
+	|| ( x11-libs/libX11 virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-misc/xfractint/xfractint-20.3.02.ebuild b/x11-misc/xfractint/xfractint-20.3.02.ebuild
index af04104bbca2..7e662b61f75f 100644
--- a/x11-misc/xfractint/xfractint-20.3.02.ebuild
+++ b/x11-misc/xfractint/xfractint-20.3.02.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/x11-misc/xfractint/xfractint-20.3.02.ebuild,v 1.8 2005/01/11 23:50:45 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/xfractint-20.3.02.ebuild,v 1.9 2006/01/22 15:49:52 spock Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,9 +15,12 @@ SLOT="0"
 LICENSE="freedist"
 IUSE=""
 
-DEPEND="virtual/libc
+RDEPEND="virtual/libc
 	>=sys-libs/ncurses-5.1
-	virtual/x11"
+	|| ( x11-libs/libX11 virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-misc/xfractint/xfractint-20.4.00.ebuild b/x11-misc/xfractint/xfractint-20.4.00.ebuild
index 3979a28bf60d..7e2247ec92c7 100644
--- a/x11-misc/xfractint/xfractint-20.4.00.ebuild
+++ b/x11-misc/xfractint/xfractint-20.4.00.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/x11-misc/xfractint/xfractint-20.4.00.ebuild,v 1.5 2005/09/08 13:30:22 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/xfractint-20.4.00.ebuild,v 1.6 2006/01/22 15:49:52 spock Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,9 +15,12 @@ SLOT="0"
 LICENSE="freedist"
 IUSE=""
 
-DEPEND="virtual/libc
+RDEPEND="virtual/libc
 	>=sys-libs/ncurses-5.1
-	virtual/x11"
+	|| ( x11-libs/libX11 virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}