(#113838) Add modular X deps, based on work of Sean Fleming and Mauricio L. Pilla.

Package-Manager: portage-2.1_pre6-r2

5 files changed, 60 insertions, 20 deletions

diff --git a/x11-terms/root-tail/ChangeLog b/x11-terms/root-tail/ChangeLog
index 27b80b718e81..d23277efdcc3 100644
--- a/x11-terms/root-tail/ChangeLog
+++ b/x11-terms/root-tail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/root-tail
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/root-tail/ChangeLog,v 1.32 2005/04/09 13:43:35 corsair Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/root-tail/ChangeLog,v 1.33 2006/03/15 08:47:28 spyderous Exp $
+
+  15 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>; root-tail-1.1.ebuild,
+  root-tail-1.2-r1.ebuild, root-tail-1.2-r2.ebuild:
+  (#113838) Add modular X deps, based on work of Sean Fleming and Mauricio L.
+  Pilla.
 
   09 Apr 2005; Markus Rothe <corsair@gentoo.org> root-tail-1.2-r2.ebuild:
   Stable on ppc64
diff --git a/x11-terms/root-tail/Manifest b/x11-terms/root-tail/Manifest
index 0c2eea2ae2b6..492a8c21f1a2 100644
--- a/x11-terms/root-tail/Manifest
+++ b/x11-terms/root-tail/Manifest
@@ -1,9 +1,27 @@
-MD5 95d71e36b62a6f39ea09e94ece01b1a1 ChangeLog 4419
-MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
-MD5 ac82ac29a67025a863f3d258d3d6d680 root-tail-1.1.ebuild 673
-MD5 88c7bc31d50da25669463b2c1d97f535 root-tail-1.2-r1.ebuild 789
-MD5 de76661a66b365283307b8555e38167d root-tail-1.2-r2.ebuild 948
+MD5 081621172ee70fdaa61bababda7f3195 ChangeLog 4638
+RMD160 e6b2863c4f2134915ede38b269edf833df024da4 ChangeLog 4638
+SHA256 03b75d6d6a77f7f52a3a3261c39b33e36ffc36b6a28226d715c592897f080d21 ChangeLog 4638
 MD5 bc94057d9203dc8c6a01efb2172f5a15 files/digest-root-tail-1.1 64
+RMD160 5c8cdc4ab4e20ea36f5213205bacf56ce62e5538 files/digest-root-tail-1.1 64
+SHA256 19fca7cd13f9d5afab7e54be7a116e82cf17edcedd80e69b2c0047e7f5b81dca files/digest-root-tail-1.1 64
 MD5 f8b36716748f19ede695042176e3648b files/digest-root-tail-1.2-r1 64
+RMD160 d513dc70db2e1e6ac4f4cdfacd595f4bbd2bc757 files/digest-root-tail-1.2-r1 64
+SHA256 0872f124d4e157a85048e9777c86c6c8f74f0dd51de9911136eddb18f19bea4b files/digest-root-tail-1.2-r1 64
 MD5 f8b36716748f19ede695042176e3648b files/digest-root-tail-1.2-r2 64
+RMD160 d513dc70db2e1e6ac4f4cdfacd595f4bbd2bc757 files/digest-root-tail-1.2-r2 64
+SHA256 0872f124d4e157a85048e9777c86c6c8f74f0dd51de9911136eddb18f19bea4b files/digest-root-tail-1.2-r2 64
 MD5 3ede80f52914b3650247dbea9ff963fb files/root-tail-1.2-kde.patch 3188
+RMD160 6875d464ad9543c93f7fb3214f8b62c91c317055 files/root-tail-1.2-kde.patch 3188
+SHA256 e188b8a8a6af4f592ff4777cf3cee32bc5d087b9ff6ec1c97fab5193acd14296 files/root-tail-1.2-kde.patch 3188
+MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
+RMD160 2a9e181efd140c3c1a2136376000c63f7459246d metadata.xml 254
+SHA256 ddd8e09da8727f957651a073ae2b61e4a381ee69ab83c93a3077a653743b887f metadata.xml 254
+MD5 bdba35ffe9d1162ca9eec37c73a524ca root-tail-1.1.ebuild 811
+RMD160 0d2e05b6b44ac8b0cb220a4369255ac698e5fae3 root-tail-1.1.ebuild 811
+SHA256 21acb31b38b2f0095f78ea91f0bbda602f4a2a4832e210d2cc8ea318a62746b3 root-tail-1.1.ebuild 811
+MD5 0e9b7effa1ca6d5927dd52dc6c172205 root-tail-1.2-r1.ebuild 888
+RMD160 9c5b9ceb8f2c75194f164cb00f1ec24142b782e6 root-tail-1.2-r1.ebuild 888
+SHA256 2453ffd5204a51695c64acd660c5e8d01447d21805ed9cbe119e46e92ce15ff8 root-tail-1.2-r1.ebuild 888
+MD5 6d2622cc7ef1ba8d46943762e2341f35 root-tail-1.2-r2.ebuild 1047
+RMD160 7377eab132fc4848c865ce76fdbb079bf148d6c3 root-tail-1.2-r2.ebuild 1047
+SHA256 539e2fb515b116f549449e90900ff71f88e824e632d9b3b11fd8b93f0c93bdff root-tail-1.2-r2.ebuild 1047
diff --git a/x11-terms/root-tail/root-tail-1.1.ebuild b/x11-terms/root-tail/root-tail-1.1.ebuild
index 6836912d8a26..0dccea82cdf0 100644
--- a/x11-terms/root-tail/root-tail-1.1.ebuild
+++ b/x11-terms/root-tail/root-tail-1.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/x11-terms/root-tail/root-tail-1.1.ebuild,v 1.7 2005/02/03 12:08:48 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/root-tail/root-tail-1.1.ebuild,v 1.8 2006/03/15 08:47:28 spyderous Exp $
 
 DESCRIPTION="Terminal to display (multiple) log files on the root window"
 HOMEPAGE="http://www.goof.com/pcg/marc/root-tail.html"
@@ -11,7 +11,14 @@ SLOT="0"
 KEYWORDS="x86 ~sparc ~amd64 ppc ppc64"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( x11-libs/libXext virtual/x11 )"
+DEPEND=">=sys-apps/sed-4
+	|| ( ( x11-misc/imake
+			app-text/rman
+			x11-misc/gccmakedep
+		) 
+		virtual/x11
+	)"
 
 src_compile() {
 	xmkmf -a
diff --git a/x11-terms/root-tail/root-tail-1.2-r1.ebuild b/x11-terms/root-tail/root-tail-1.2-r1.ebuild
index ce5196560732..d5ba7381c7c3 100644
--- a/x11-terms/root-tail/root-tail-1.2-r1.ebuild
+++ b/x11-terms/root-tail/root-tail-1.2-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/x11-terms/root-tail/root-tail-1.2-r1.ebuild,v 1.3 2005/03/10 10:51:02 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/root-tail/root-tail-1.2-r1.ebuild,v 1.4 2006/03/15 08:47:28 spyderous Exp $
 
 DESCRIPTION="Terminal to display (multiple) log files on the root window"
 HOMEPAGE="http://www.goof.com/pcg/marc/root-tail.html"
@@ -11,9 +11,14 @@ SLOT="0"
 KEYWORDS="x86 ~sparc amd64 ppc ppc64"
 IUSE=""
 
-RDEPEND="virtual/x11"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+RDEPEND="|| ( x11-libs/libXext virtual/x11 )"
+DEPEND=">=sys-apps/sed-4
+	|| ( ( x11-misc/imake
+			app-text/rman
+			x11-misc/gccmakedep
+		) 
+		virtual/x11
+	)"
 
 src_compile() {
 	xmkmf -a
diff --git a/x11-terms/root-tail/root-tail-1.2-r2.ebuild b/x11-terms/root-tail/root-tail-1.2-r2.ebuild
index baedada6c39b..74b3caa46e3c 100644
--- a/x11-terms/root-tail/root-tail-1.2-r2.ebuild
+++ b/x11-terms/root-tail/root-tail-1.2-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/x11-terms/root-tail/root-tail-1.2-r2.ebuild,v 1.6 2005/04/09 13:43:35 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/root-tail/root-tail-1.2-r2.ebuild,v 1.7 2006/03/15 08:47:28 spyderous Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,9 +13,14 @@ SLOT="0"
 KEYWORDS="x86 ~sparc amd64 ppc ppc64"
 IUSE="kde debug"
 
-RDEPEND="virtual/x11"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+RDEPEND="|| ( x11-libs/libXext virtual/x11 )"
+DEPEND=">=sys-apps/sed-4
+	|| ( ( x11-misc/imake
+			app-text/rman
+			x11-misc/gccmakedep
+		) 
+		virtual/x11
+	)"
 
 src_unpack() {
 	unpack ${A}