Add modular X dependencies.

(Portage version: 2.1_pre4)

6 files changed, 25 insertions, 15 deletions

diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index 46a463b47982..89d56c683de2 100644
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/scim
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.86 2006/01/01 17:43:09 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.87 2006/01/28 08:48:24 flameeyes Exp $
+
+  28 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> scim-1.2.3.ebuild,
+  scim-1.3.3.ebuild, scim-1.4.1.ebuild, scim-1.4.2.ebuild,
+  scim-1.4.3.ebuild:
+  Add modular X dependencies.
 
 *scim-1.4.3 (01 Jan 2006)
 
diff --git a/app-i18n/scim/scim-1.2.3.ebuild b/app-i18n/scim/scim-1.2.3.ebuild
index 71f1585f8645..683800aaf420 100644
--- a/app-i18n/scim/scim-1.2.3.ebuild
+++ b/app-i18n/scim/scim-1.2.3.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/app-i18n/scim/scim-1.2.3.ebuild,v 1.6 2005/08/03 20:01:24 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.2.3.ebuild,v 1.7 2006/01/28 08:48:24 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -17,13 +17,14 @@ GTK_DEPEND=">=x11-libs/gtk+-2
 	>=dev-libs/atk-1
 	>=x11-libs/pango-1
 	>=dev-libs/glib-2"
-RDEPEND="virtual/x11
+RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
 	gtk? ( ${GTK_DEPEND} )
 	immqt? ( ${GTK_DEPEND} )
 	immqt-bc? ( ${GTK_DEPEND} )
 	!app-i18n/scim-cvs
 	!<app-i18n/scim-chinese-0.4.0"
 DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )
 	dev-lang/perl"
 
 has_gtk() {
diff --git a/app-i18n/scim/scim-1.3.3.ebuild b/app-i18n/scim/scim-1.3.3.ebuild
index 5222faa65e12..af65347aa721 100644
--- a/app-i18n/scim/scim-1.3.3.ebuild
+++ b/app-i18n/scim/scim-1.3.3.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/app-i18n/scim/scim-1.3.3.ebuild,v 1.2 2005/07/31 04:59:56 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.3.3.ebuild,v 1.3 2006/01/28 08:48:24 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -17,13 +17,14 @@ GTK_DEPEND=">=x11-libs/gtk+-2
 	>=dev-libs/atk-1
 	>=x11-libs/pango-1
 	>=dev-libs/glib-2"
-RDEPEND="virtual/x11
+RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
 	gtk? ( ${GTK_DEPEND} )
 	immqt? ( ${GTK_DEPEND} )
 	immqt-bc? ( ${GTK_DEPEND} )
 	!app-i18n/scim-cvs
 	!<app-i18n/scim-chinese-0.4.0"
 DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )
 	dev-lang/perl"
 
 has_gtk() {
diff --git a/app-i18n/scim/scim-1.4.1.ebuild b/app-i18n/scim/scim-1.4.1.ebuild
index dce9fc1b8eb0..33f11b6c8f98 100644
--- a/app-i18n/scim/scim-1.4.1.ebuild
+++ b/app-i18n/scim/scim-1.4.1.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/app-i18n/scim/scim-1.4.1.ebuild,v 1.6 2005/09/23 03:01:38 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.1.ebuild,v 1.7 2006/01/28 08:48:24 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -17,13 +17,14 @@ GTK_DEPEND=">=x11-libs/gtk+-2
 	>=dev-libs/atk-1
 	>=x11-libs/pango-1
 	>=dev-libs/glib-2"
-RDEPEND="virtual/x11
+RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
 	gtk? ( ${GTK_DEPEND} )
 	immqt? ( ${GTK_DEPEND} )
 	immqt-bc? ( ${GTK_DEPEND} )
 	!app-i18n/scim-cvs
 	!<app-i18n/scim-chinese-0.4.0"
 DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )
 	dev-lang/perl"
 
 has_gtk() {
diff --git a/app-i18n/scim/scim-1.4.2.ebuild b/app-i18n/scim/scim-1.4.2.ebuild
index 4d3a81d0af03..4724a44628cc 100644
--- a/app-i18n/scim/scim-1.4.2.ebuild
+++ b/app-i18n/scim/scim-1.4.2.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/app-i18n/scim/scim-1.4.2.ebuild,v 1.5 2005/11/24 18:38:28 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.2.ebuild,v 1.6 2006/01/28 08:48:24 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -17,13 +17,14 @@ GTK_DEPEND=">=x11-libs/gtk+-2
 	>=dev-libs/atk-1
 	>=x11-libs/pango-1
 	>=dev-libs/glib-2"
-RDEPEND="virtual/x11
+RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
 	gtk? ( ${GTK_DEPEND} )
 	immqt? ( ${GTK_DEPEND} )
 	immqt-bc? ( ${GTK_DEPEND} )
 	!app-i18n/scim-cvs
 	!<app-i18n/scim-chinese-0.4.0"
 DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )
 	dev-lang/perl"
 
 has_gtk() {
diff --git a/app-i18n/scim/scim-1.4.3.ebuild b/app-i18n/scim/scim-1.4.3.ebuild
index 98ae3812d97e..a3355f9d68b2 100644
--- a/app-i18n/scim/scim-1.4.3.ebuild
+++ b/app-i18n/scim/scim-1.4.3.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/app-i18n/scim/scim-1.4.3.ebuild,v 1.1 2006/01/01 17:43:09 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.3.ebuild,v 1.2 2006/01/28 08:48:24 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -17,13 +17,14 @@ GTK_DEPEND=">=x11-libs/gtk+-2
 	>=dev-libs/atk-1
 	>=x11-libs/pango-1
 	>=dev-libs/glib-2"
-RDEPEND="virtual/x11
+RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
 	gtk? ( ${GTK_DEPEND} )
 	immqt? ( ${GTK_DEPEND} )
 	immqt-bc? ( ${GTK_DEPEND} )
 	!app-i18n/scim-cvs
 	!<app-i18n/scim-chinese-0.4.0"
 DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )
 	dev-lang/perl"
 
 has_gtk() {