Add support for modular X #121067.

(Portage version: 2.1_pre5-r4)

10 files changed, 26 insertions, 29 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index ddc84c9d9365..7106093cfac8 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.27 2006/01/28 19:06:51 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.28 2006/03/07 23:14:21 vapier Exp $
+
+  07 Mar 2006; Mike Frysinger <vapier@gentoo.org> erlang-8b.ebuild,
+  erlang-9c.ebuild, erlang-9c-r1.ebuild, erlang-9c-r2.ebuild,
+  erlang-9c-r3.ebuild, erlang-10.2.0.ebuild, erlang-10.2.5.ebuild,
+  erlang-10.2.6.ebuild, erlang-10.2.7.ebuild:
+  Add support for modular X #121067.
 
   28 Jan 2006; Simon Stelling <blubb@gentoo.org> +files/erlang-9c.patch,
   -files/erlang-9c.patch.gz, erlang-9c-r1.ebuild:
diff --git a/dev-lang/erlang/erlang-10.2.0.ebuild b/dev-lang/erlang/erlang-10.2.0.ebuild
index a5d7e8421182..dd7f66d69a62 100644
--- a/dev-lang/erlang/erlang-10.2.0.ebuild
+++ b/dev-lang/erlang/erlang-10.2.0.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/dev-lang/erlang/erlang-10.2.0.ebuild,v 1.7 2005/08/23 03:03:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.0.ebuild,v 1.8 2006/03/07 23:14:21 vapier Exp $
 
 inherit eutils toolchain-funcs flag-o-matic elisp-common
 
@@ -20,7 +20,6 @@ KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 IUSE="X ssl emacs"
 
 DEPEND=">=dev-lang/perl-5.6.1
-	X? ( virtual/x11 )
 	ssl? ( >=dev-libs/openssl-0.9.7d )
 	emacs? ( virtual/emacs )"
 
diff --git a/dev-lang/erlang/erlang-10.2.5.ebuild b/dev-lang/erlang/erlang-10.2.5.ebuild
index 25347eb92b55..98360973ca5c 100644
--- a/dev-lang/erlang/erlang-10.2.5.ebuild
+++ b/dev-lang/erlang/erlang-10.2.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/dev-lang/erlang/erlang-10.2.5.ebuild,v 1.4 2005/09/05 19:17:37 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.5.ebuild,v 1.5 2006/03/07 23:14:21 vapier Exp $
 
 inherit eutils multilib flag-o-matic elisp-common
 
@@ -21,7 +21,6 @@ KEYWORDS="~amd64 ppc sparc x86"
 IUSE="doc emacs java odbc ssl X"
 
 RDEPEND=">=dev-lang/perl-5.6.1
-	X? ( virtual/x11 )
 	ssl? ( >=dev-libs/openssl-0.9.7d )
 	emacs? ( virtual/emacs )
 	java? ( >=virtual/jdk-1.2 )
diff --git a/dev-lang/erlang/erlang-10.2.6.ebuild b/dev-lang/erlang/erlang-10.2.6.ebuild
index 0df32ed64e00..3aa071b8e743 100644
--- a/dev-lang/erlang/erlang-10.2.6.ebuild
+++ b/dev-lang/erlang/erlang-10.2.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/dev-lang/erlang/erlang-10.2.6.ebuild,v 1.5 2005/09/02 22:31:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.6.ebuild,v 1.6 2006/03/07 23:14:21 vapier Exp $
 
 inherit eutils multilib flag-o-matic elisp-common
 
@@ -21,7 +21,6 @@ KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="doc emacs java odbc ssl X"
 
 RDEPEND=">=dev-lang/perl-5.6.1
-	X? ( virtual/x11 )
 	ssl? ( >=dev-libs/openssl-0.9.7d )
 	emacs? ( virtual/emacs )
 	java? ( >=virtual/jdk-1.2 )
diff --git a/dev-lang/erlang/erlang-10.2.7.ebuild b/dev-lang/erlang/erlang-10.2.7.ebuild
index 57c8500862d7..9315d3deaab4 100644
--- a/dev-lang/erlang/erlang-10.2.7.ebuild
+++ b/dev-lang/erlang/erlang-10.2.7.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/dev-lang/erlang/erlang-10.2.7.ebuild,v 1.2 2005/12/03 11:29:17 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.7.ebuild,v 1.3 2006/03/07 23:14:21 vapier Exp $
 
 inherit eutils multilib flag-o-matic elisp-common
 
@@ -19,16 +19,15 @@ SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz
 LICENSE="EPL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="doc emacs java odbc ssl X"
+IUSE="doc emacs java odbc ssl tcltk"
 
 RDEPEND=">=dev-lang/perl-5.6.1
-	X? ( virtual/x11 )
 	ssl? ( >=dev-libs/openssl-0.9.7d )
 	emacs? ( virtual/emacs )
 	java? ( >=virtual/jdk-1.2 )
 	odbc? ( dev-db/unixODBC )"
 DEPEND="${RDEPEND}
-	X? ( dev-lang/tk )"
+	tcltk? ( dev-lang/tk )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-lang/erlang/erlang-8b.ebuild b/dev-lang/erlang/erlang-8b.ebuild
index 533afb35230b..7858245a5ab4 100644
--- a/dev-lang/erlang/erlang-8b.ebuild
+++ b/dev-lang/erlang/erlang-8b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-8b.ebuild,v 1.10 2004/06/24 22:48:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-8b.ebuild,v 1.11 2006/03/07 23:14:21 vapier Exp $
 
 MY_P=otp_src_R8B-2
 DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries"
@@ -13,7 +13,6 @@ KEYWORDS="x86 ppc sparc"
 IUSE="X ssl"
 
 DEPEND=">=dev-lang/perl-5.6.1
-	X? ( virtual/x11 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-lang/erlang/erlang-9c-r1.ebuild b/dev-lang/erlang/erlang-9c-r1.ebuild
index 957c0a6590ee..40b86b0589c9 100644
--- a/dev-lang/erlang/erlang-9c-r1.ebuild
+++ b/dev-lang/erlang/erlang-9c-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/erlang/erlang-9c-r1.ebuild,v 1.8 2006/01/28 19:06:51 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c-r1.ebuild,v 1.9 2006/03/07 23:14:21 vapier Exp $
 
 inherit eutils
 
@@ -15,7 +15,6 @@ KEYWORDS="x86 ~ppc ~sparc"
 IUSE="X ssl"
 
 DEPEND=">=dev-lang/perl-5.6.1
-	X? ( virtual/x11 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-lang/erlang/erlang-9c-r2.ebuild b/dev-lang/erlang/erlang-9c-r2.ebuild
index e903e1967b95..613b61ae3808 100644
--- a/dev-lang/erlang/erlang-9c-r2.ebuild
+++ b/dev-lang/erlang/erlang-9c-r2.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/dev-lang/erlang/erlang-9c-r2.ebuild,v 1.6 2005/05/30 18:19:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c-r2.ebuild,v 1.7 2006/03/07 23:14:21 vapier Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -15,7 +15,6 @@ KEYWORDS="x86 ppc sparc"
 IUSE="X ssl"
 
 DEPEND=">=dev-lang/perl-5.6.1
-	X? ( virtual/x11 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-lang/erlang/erlang-9c-r3.ebuild b/dev-lang/erlang/erlang-9c-r3.ebuild
index 27f1acb28115..6c04a3942de3 100644
--- a/dev-lang/erlang/erlang-9c-r3.ebuild
+++ b/dev-lang/erlang/erlang-9c-r3.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/dev-lang/erlang/erlang-9c-r3.ebuild,v 1.2 2005/05/30 18:19:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c-r3.ebuild,v 1.3 2006/03/07 23:14:21 vapier Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -16,7 +16,6 @@ KEYWORDS="-*"
 IUSE="X ssl"
 
 DEPEND=">=dev-lang/perl-5.6.1
-	X? ( virtual/x11 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-lang/erlang/erlang-9c.ebuild b/dev-lang/erlang/erlang-9c.ebuild
index 689570faba75..5b1900be9eca 100644
--- a/dev-lang/erlang/erlang-9c.ebuild
+++ b/dev-lang/erlang/erlang-9c.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c.ebuild,v 1.6 2004/06/24 22:48:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c.ebuild,v 1.7 2006/03/07 23:14:21 vapier Exp $
 
 MY_P=otp_src_R9B-1
 DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries"
@@ -13,7 +13,6 @@ KEYWORDS="x86 ~ppc ~sparc"
 IUSE="X ssl"
 
 DEPEND=">=dev-lang/perl-5.6.1
-	X? ( virtual/x11 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )"
 
 S=${WORKDIR}/${MY_P}