Porting to modular X

(Portage version: 2.0.53)

5 files changed, 48 insertions, 18 deletions

diff --git a/sci-libs/root/ChangeLog b/sci-libs/root/ChangeLog
index ad979477ba33..c3d4d633326c 100644
--- a/sci-libs/root/ChangeLog
+++ b/sci-libs/root/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/root
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/root/ChangeLog,v 1.9 2005/07/28 21:02:26 caleb Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/root/ChangeLog,v 1.10 2006/02/03 11:07:46 phosphan Exp $
+
+  03 Feb 2006; Patrick Kursawe <phosphan@gentoo.org> root-3.05.04.ebuild,
+  root-3.10.02-r1.ebuild, root-4.02.00.ebuild:
+  Porting to modular X
 
   28 Jul 2005; Caleb Tennis <caleb@gentoo.org> root-3.10.02-r1.ebuild,
   root-4.02.00.ebuild:
diff --git a/sci-libs/root/Manifest b/sci-libs/root/Manifest
index f21e9d5415a5..23e1dbe720ca 100644
--- a/sci-libs/root/Manifest
+++ b/sci-libs/root/Manifest
@@ -1,10 +1,10 @@
-MD5 f3468210099291f92db93fddddab68d0 root-3.10.02-r1.ebuild 4746
-MD5 15793f41f3908d859a1b391e3187b5c3 root-3.05.04.ebuild 1613
-MD5 9627f6584a9ba6a66ddebe165b587942 root-4.02.00.ebuild 4848
 MD5 22026f7472a22781d66208a05625024d ChangeLog 3819
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 58ce6f63773b28de747663b7e908e2bb files/root-makefile.patch 742
 MD5 053f8a5dbe37435f2b62ee44c79e9523 files/digest-root-3.05.04 73
+MD5 da92522ba08f8d50e5197b6a9fd7549f files/digest-root-3.10.02-r1 74
 MD5 6ed7f7ff48d537bdd4a588d1d992b22a files/digest-root-4.02.00 74
 MD5 1ef2792a1fad865173670aa5942bef6c files/pgsql-no-libpq-int.patch 290
-MD5 da92522ba08f8d50e5197b6a9fd7549f files/digest-root-3.10.02-r1 74
+MD5 58ce6f63773b28de747663b7e908e2bb files/root-makefile.patch 742
+MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 0380166c9744e19246d8331fc37b686c root-3.05.04.ebuild 1718
+MD5 1046f0b135a51c8feb0deb71b5677702 root-3.10.02-r1.ebuild 4850
+MD5 a9300336fe3dd8e0371b38a52b014982 root-4.02.00.ebuild 4953
diff --git a/sci-libs/root/root-3.05.04.ebuild b/sci-libs/root/root-3.05.04.ebuild
index 173746e54b5b..d740eb90e27c 100644
--- a/sci-libs/root/root-3.05.04.ebuild
+++ b/sci-libs/root/root-3.05.04.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/sci-libs/root/root-3.05.04.ebuild,v 1.2 2005/01/16 02:43:45 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/root/root-3.05.04.ebuild,v 1.3 2006/02/03 11:07:46 phosphan Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,12 +14,21 @@ LICENSE="as-is"
 KEYWORDS="x86 sparc ppc"
 IUSE="mysql postgres opengl"
 
-DEPEND="virtual/x11
+RDEPEND="|| (
+				virtual/x11
+				x11-libs/libXpm
+			)
 	>=media-libs/freetype-2.0.9
 	opengl? ( virtual/opengl virtual/glu )
 	mysql? ( >=dev-db/mysql-3.23.49 )
 	postgres? ( >=dev-db/postgresql-7.1.3-r4 )"
 
+DEPEND="${RDEPEND}
+		|| (
+			virtual/x11
+			x11-proto/xproto
+		   )"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/sci-libs/root/root-3.10.02-r1.ebuild b/sci-libs/root/root-3.10.02-r1.ebuild
index b8a122cf973b..63050ca45002 100644
--- a/sci-libs/root/root-3.10.02-r1.ebuild
+++ b/sci-libs/root/root-3.10.02-r1.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/sci-libs/root/root-3.10.02-r1.ebuild,v 1.3 2005/07/28 21:02:26 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/root/root-3.10.02-r1.ebuild,v 1.4 2006/02/03 11:07:46 phosphan Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,7 +14,10 @@ LICENSE="as-is"
 KEYWORDS="~x86 ~amd64"
 IUSE="mysql postgres opengl afs kerberos ldap qt"
 
-DEPEND="virtual/x11
+RDEPEND="|| (
+				virtual/x11
+				x11-libs/libXpm
+			)
 	>=media-libs/freetype-2.0.9
 	sys-apps/shadow
 	opengl? ( virtual/opengl virtual/glu )
@@ -25,8 +28,13 @@ DEPEND="virtual/x11
 	ldap? ( net-nds/openldap )
 	qt? ( =x11-libs/qt-3* )"
 
-src_compile() {
+DEPEND="${RDEPEND}
+		|| (
+			virtual/x11
+			x11-proto/xproto
+		   )"
 
+src_compile() {
 	local myconf
 
 	if [ "x$CERNLIB" = "x" ]
diff --git a/sci-libs/root/root-4.02.00.ebuild b/sci-libs/root/root-4.02.00.ebuild
index b8b370a46266..d1aaf6aad528 100644
--- a/sci-libs/root/root-4.02.00.ebuild
+++ b/sci-libs/root/root-4.02.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/sci-libs/root/root-4.02.00.ebuild,v 1.5 2005/07/28 21:02:26 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/root/root-4.02.00.ebuild,v 1.6 2006/02/03 11:07:46 phosphan Exp $
 
 inherit flag-o-matic eutils
 
@@ -16,7 +16,10 @@ LICENSE="as-is"
 KEYWORDS="x86 -sparc -ppc"
 IUSE="afs kerberos ldap mysql opengl postgres python qt"
 
-DEPEND="virtual/x11
+RDEPEND="|| (
+				virtual/x11
+				x11-libs/libXpm
+			)
 	>=media-libs/freetype-2.0.9
 	sys-apps/shadow
 	opengl? ( virtual/opengl virtual/glu )
@@ -28,6 +31,12 @@ DEPEND="virtual/x11
 	qt? ( =x11-libs/qt-3* )
 	python? ( dev-lang/python )"
 
+DEPEND="${RDEPEND}
+		|| (
+			virtual/x11
+			x11-proto/xproto
+		   )"
+
 src_compile() {
 
 	local myconf