Add modular X dependencies.

(Portage version: 2.1_pre4)

6 files changed, 28 insertions, 15 deletions

diff --git a/games-util/aabrowse/ChangeLog b/games-util/aabrowse/ChangeLog
index c7d1856de736..3fadf5c308e9 100644
--- a/games-util/aabrowse/ChangeLog
+++ b/games-util/aabrowse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-util/aabrowse
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/aabrowse/ChangeLog,v 1.5 2005/07/25 17:45:40 caleb Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/aabrowse/ChangeLog,v 1.6 2006/01/28 07:24:55 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  aabrowse-0.0.6.ebuild, aabrowse-0.0.8.ebuild:
+  Add modular X dependencies.
 
   25 Jul 2005; Caleb Tennis <caleb@gentoo.org> aabrowse-0.0.6.ebuild,
   aabrowse-0.0.8.ebuild:
diff --git a/games-util/aabrowse/aabrowse-0.0.6.ebuild b/games-util/aabrowse/aabrowse-0.0.6.ebuild
index 4ee0fbed83de..9baa0ef0d584 100644
--- a/games-util/aabrowse/aabrowse-0.0.6.ebuild
+++ b/games-util/aabrowse/aabrowse-0.0.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/games-util/aabrowse/aabrowse-0.0.6.ebuild,v 1.2 2005/07/25 17:45:40 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/aabrowse/aabrowse-0.0.6.ebuild,v 1.3 2006/01/28 07:24:55 joshuabaergen Exp $
 
 inherit qt3
 
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE="geoip"
 
-DEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libXext
+				x11-libs/libSM )
+			virtual/x11 )"
+DEPEND="${RDEPEND}
 	$(qt_min_version 3.2)
 	sys-libs/zlib
 	media-libs/libpng
diff --git a/games-util/aabrowse/aabrowse-0.0.8.ebuild b/games-util/aabrowse/aabrowse-0.0.8.ebuild
index 5e1555ba9c0b..5c5a9ef9eda1 100644
--- a/games-util/aabrowse/aabrowse-0.0.8.ebuild
+++ b/games-util/aabrowse/aabrowse-0.0.8.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/games-util/aabrowse/aabrowse-0.0.8.ebuild,v 1.4 2005/07/25 17:45:40 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/aabrowse/aabrowse-0.0.8.ebuild,v 1.5 2006/01/28 07:24:55 joshuabaergen Exp $
 
 inherit kde
 
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="~ppc x86"
 IUSE="geoip"
 
-DEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libXext
+				x11-libs/libSM )
+			virtual/x11 )"
+DEPEND="${RDEPEND}
 	$(qt_min_version 3.2)
 	sys-libs/zlib
 	media-libs/libpng
diff --git a/games-util/emilia-pinedit/emilia-pinedit-0.3.1.ebuild b/games-util/emilia-pinedit/emilia-pinedit-0.3.1.ebuild
index 93dde029021c..370e25c08e1a 100644
--- a/games-util/emilia-pinedit/emilia-pinedit-0.3.1.ebuild
+++ b/games-util/emilia-pinedit/emilia-pinedit-0.3.1.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/games-util/emilia-pinedit/emilia-pinedit-0.3.1.ebuild,v 1.11 2005/06/15 19:23:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/emilia-pinedit/emilia-pinedit-0.3.1.ebuild,v 1.12 2006/01/28 07:24:55 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -15,12 +15,15 @@ SLOT="0"
 KEYWORDS="ppc x86"
 IUSE=""
 
-DEPEND="virtual/opengl
-	virtual/x11
+# A lot of deps are inherited from emilia-pinball, so we don't repeat
+# them here.
+RDEPEND="virtual/xft
 	media-libs/libsdl
 	media-libs/sdl-image
 	media-libs/sdl-mixer
 	>=games-arcade/emilia-pinball-0.3.1"
+DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-util/showeq/showeq-5.0.0.18.ebuild b/games-util/showeq/showeq-5.0.0.18.ebuild
index f4d11a1bded5..063cb8f6e94f 100644
--- a/games-util/showeq/showeq-5.0.0.18.ebuild
+++ b/games-util/showeq/showeq-5.0.0.18.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/games-util/showeq/showeq-5.0.0.18.ebuild,v 1.4 2005/07/25 15:46:15 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/showeq-5.0.0.18.ebuild,v 1.5 2006/01/28 07:24:55 joshuabaergen Exp $
 
 inherit kde games
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11
+DEPEND="|| ( x11-libs/libXt virtual/x11 )
 	media-libs/libpng
 	virtual/libpcap
 	$(qt_min_version 3.1)
diff --git a/games-util/showeq/showeq-5.2.4.0.ebuild b/games-util/showeq/showeq-5.2.4.0.ebuild
index a891dd6cf557..724897204071 100644
--- a/games-util/showeq/showeq-5.2.4.0.ebuild
+++ b/games-util/showeq/showeq-5.2.4.0.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/games-util/showeq/showeq-5.2.4.0.ebuild,v 1.2 2005/12/10 15:24:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/showeq-5.2.4.0.ebuild,v 1.3 2006/01/28 07:24:55 joshuabaergen Exp $
 
 inherit kde games
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="virtual/x11
+DEPEND="|| ( x11-libs/libXt virtual/x11 )
 	media-libs/libpng
 	virtual/libpcap
 	$(qt_min_version 3.2)