Remove monolithic X support.

(Portage version: 2.1.1)

6 files changed, 56 insertions, 56 deletions

diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index 31de69af00a6..7133a4ace506 100644
--- a/dev-lang/swi-prolog/ChangeLog
+++ b/dev-lang/swi-prolog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/swi-prolog
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.31 2006/09/12 09:17:13 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.32 2006/09/17 02:53:22 keri Exp $
+
+  17 Sep 2006; keri <keri@gentoo.org> swi-prolog-5.6.8.ebuild,
+  swi-prolog-5.6.17.ebuild, swi-prolog-5.6.17-r1.ebuild,
+  swi-prolog-5.6.18.ebuild, swi-prolog-5.6.19.ebuild:
+  Remove monolithic X support.
 
 *swi-prolog-5.6.19 (12 Sep 2006)
 
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild
index a89147755607..6cf943d60e2d 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild,v 1.1 2006/08/30 10:07:44 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild,v 1.2 2006/09/17 02:53:22 keri Exp $
 
 inherit autotools eutils
 
@@ -21,16 +21,15 @@ DEPEND="!dev-lang/swi-prolog-lite
 	gmp? ( dev-libs/gmp )
 	ssl? ( dev-libs/openssl )
 	java? ( >=virtual/jdk-1.4 )
-	X? ( media-libs/jpeg
-		|| ( (
-			x11-libs/libX11
-			x11-libs/libXft
-			x11-libs/libXpm
-			x11-libs/libXt
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-proto/xproto )
-		virtual/x11 ) )"
+	X? (
+		media-libs/jpeg
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-proto/xproto )"
 
 S="${WORKDIR}/pl-${PV}"
 
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.17.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.17.ebuild
index 54f024bde9b6..5afd346db558 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.17.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.17.ebuild,v 1.3 2006/08/15 10:09:21 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.17.ebuild,v 1.4 2006/09/17 02:53:22 keri Exp $
 
 inherit autotools eutils flag-o-matic
 
@@ -21,16 +21,15 @@ DEPEND="!dev-lang/swi-prolog-lite
 	gmp? ( dev-libs/gmp )
 	ssl? ( dev-libs/openssl )
 	java? ( virtual/jdk )
-	X? ( media-libs/jpeg
-		|| ( (
-			x11-libs/libX11
-			x11-libs/libXft
-			x11-libs/libXpm
-			x11-libs/libXt
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-proto/xproto )
-		virtual/x11 ) )"
+	X? (
+		media-libs/jpeg
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-proto/xproto )"
 
 S="${WORKDIR}/pl-${PV}"
 
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild
index 71fce2e9e5e1..1b3023f2cbff 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild,v 1.1 2006/09/01 10:20:47 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild,v 1.2 2006/09/17 02:53:22 keri Exp $
 
 inherit eutils
 
@@ -21,16 +21,15 @@ DEPEND="!dev-lang/swi-prolog-lite
 	gmp? ( dev-libs/gmp )
 	ssl? ( dev-libs/openssl )
 	java? ( >=virtual/jdk-1.4 )
-	X? ( media-libs/jpeg
-		|| ( (
-			x11-libs/libX11
-			x11-libs/libXft
-			x11-libs/libXpm
-			x11-libs/libXt
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-proto/xproto )
-		virtual/x11 ) )"
+	X? (
+		media-libs/jpeg
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-proto/xproto )"
 
 S="${WORKDIR}/pl-${PV}"
 
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild
index 7a93763596b9..f795d9a850fc 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild,v 1.1 2006/09/12 09:17:13 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild,v 1.2 2006/09/17 02:53:22 keri Exp $
 
 inherit eutils
 
@@ -21,16 +21,15 @@ DEPEND="!dev-lang/swi-prolog-lite
 	gmp? ( dev-libs/gmp )
 	ssl? ( dev-libs/openssl )
 	java? ( >=virtual/jdk-1.4 )
-	X? ( media-libs/jpeg
-		|| ( (
-			x11-libs/libX11
-			x11-libs/libXft
-			x11-libs/libXpm
-			x11-libs/libXt
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-proto/xproto )
-		virtual/x11 ) )"
+	X? (
+		media-libs/jpeg
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-proto/xproto )"
 
 S="${WORKDIR}/pl-${PV}"
 
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.8.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.8.ebuild
index f8383c5a48d3..be3dc4ed6f5d 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.8.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.8.ebuild,v 1.7 2006/06/04 08:50:57 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.8.ebuild,v 1.8 2006/09/17 02:53:22 keri Exp $
 
 inherit autotools eutils flag-o-matic
 
@@ -21,16 +21,15 @@ DEPEND="!dev-lang/swi-prolog-lite
 	gmp? ( dev-libs/gmp )
 	ssl? ( dev-libs/openssl )
 	java? ( virtual/jdk )
-	X? ( media-libs/jpeg
-		|| ( (
-			x11-libs/libX11
-			x11-libs/libXft
-			x11-libs/libXpm
-			x11-libs/libXt
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-proto/xproto )
-		virtual/x11 ) )"
+	X? (
+		media-libs/jpeg
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-proto/xproto )"
 
 S="${WORKDIR}/pl-${PV}"