Fixed DEPEND for modular X.

Package-Manager: portage-2.1_pre3-r1

9 files changed, 23 insertions, 113 deletions

diff --git a/x11-misc/remind/ChangeLog b/x11-misc/remind/ChangeLog
index 1d60fce52b71..150406ef0cfb 100644
--- a/x11-misc/remind/ChangeLog
+++ b/x11-misc/remind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/remind
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/remind/ChangeLog,v 1.13 2006/01/15 17:53:36 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/remind/ChangeLog,v 1.14 2006/01/21 12:12:14 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> remind-03.00.22.ebuild,
+  remind-03.00.23-r2.ebuild, remind-03.00.24.ebuild:
+  Fixed DEPEND for modular X.
 
 *remind-03.00.24 (15 Jan 2006)
 
diff --git a/x11-misc/remind/remind-03.00.22.ebuild b/x11-misc/remind/remind-03.00.22.ebuild
index 5fe816a17927..831bc2a88a5d 100644
--- a/x11-misc/remind/remind-03.00.22.ebuild
+++ b/x11-misc/remind/remind-03.00.22.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-misc/remind/remind-03.00.22.ebuild,v 1.10 2005/07/29 12:19:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/remind/remind-03.00.22.ebuild,v 1.11 2006/01/21 12:12:14 nelchael Exp $
 
 DESCRIPTION="Ridiculously functional reminder program"
 HOMEPAGE="http://www.roaringpenguin.com/products/remind/"
@@ -10,8 +10,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="X"
 
-RDEPEND="X? ( virtual/x11
-		dev-lang/tk )"
+RDEPEND="X? ( dev-lang/tk )"
 
 src_install() {
 	dodir /usr/bin /usr/share/man/man1
diff --git a/x11-misc/remind/remind-03.00.23-r2.ebuild b/x11-misc/remind/remind-03.00.23-r2.ebuild
index eab392b72395..40d9a342c314 100644
--- a/x11-misc/remind/remind-03.00.23-r2.ebuild
+++ b/x11-misc/remind/remind-03.00.23-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-misc/remind/remind-03.00.23-r2.ebuild,v 1.2 2005/12/28 18:47:53 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/remind/remind-03.00.23-r2.ebuild,v 1.3 2006/01/21 12:12:14 nelchael Exp $
 
 inherit eutils
 
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="X"
 
-RDEPEND="X? ( virtual/x11
-		dev-lang/tk )"
+RDEPEND="X? ( dev-lang/tk )"
 
 src_unpack() {
 	unpack "${A}"
diff --git a/x11-misc/remind/remind-03.00.24.ebuild b/x11-misc/remind/remind-03.00.24.ebuild
index ef8463fade1e..6bfb5fc3f25a 100644
--- a/x11-misc/remind/remind-03.00.24.ebuild
+++ b/x11-misc/remind/remind-03.00.24.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/x11-misc/remind/remind-03.00.24.ebuild,v 1.1 2006/01/15 17:53:36 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/remind/remind-03.00.24.ebuild,v 1.2 2006/01/21 12:12:14 nelchael Exp $
 
 inherit eutils
 
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="X"
 
-RDEPEND="X? ( virtual/x11
-		dev-lang/tk )"
+RDEPEND="X? ( dev-lang/tk )"
 
 src_unpack() {
 	unpack "${A}"
diff --git a/x11-misc/root-portal/ChangeLog b/x11-misc/root-portal/ChangeLog
index f4e22a382033..0088f00db99a 100644
--- a/x11-misc/root-portal/ChangeLog
+++ b/x11-misc/root-portal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/root-portal
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/root-portal/ChangeLog,v 1.20 2005/08/14 10:11:43 hansmi Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/root-portal/ChangeLog,v 1.21 2006/01/21 12:15:43 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/0.4.11-gcc3.patch, -root-portal-0.5.0.ebuild,
+  root-portal-0.5.2.ebuild:
+  Fixed DEPEND for modular X.
 
   14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
   root-portal-0.5.2.ebuild:
diff --git a/x11-misc/root-portal/files/0.4.11-gcc3.patch b/x11-misc/root-portal/files/0.4.11-gcc3.patch
deleted file mode 100644
index 387aaa8cadcd..000000000000
--- a/x11-misc/root-portal/files/0.4.11-gcc3.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ur root-portal-0.4.11.orig/src/config/configuration.h root-portal-0.4.11/src/config/configuration.h
---- root-portal-0.4.11.orig/src/config/configuration.h	2003-10-15 16:00:20.512226040 -0400
-+++ root-portal-0.4.11/src/config/configuration.h	2003-10-15 16:10:12.625211184 -0400
-@@ -14,6 +14,7 @@
- #endif
- 
- #include <vector>
-+#include <assert.h>
- using namespace std;
- 
- class ModuleModifier;
-diff -ur root-portal-0.4.11.orig/src/dataset.h root-portal-0.4.11/src/dataset.h
---- root-portal-0.4.11.orig/src/dataset.h	2003-10-15 16:00:20.466233032 -0400
-+++ root-portal-0.4.11/src/dataset.h	2003-10-15 16:08:13.625301920 -0400
-@@ -11,6 +11,7 @@
- #include <string>
- #include <cstdlib>
- #include <cstdio>
-+#include <assert.h>
- using namespace std;
- 
- class BadDataType {};
-diff -ur root-portal-0.4.11.orig/src/modules/filetail/filetail.h root-portal-0.4.11/src/modules/filetail/filetail.h
---- root-portal-0.4.11.orig/src/modules/filetail/filetail.h	2003-10-15 16:00:20.483230448 -0400
-+++ root-portal-0.4.11/src/modules/filetail/filetail.h	2003-10-15 16:05:47.017589680 -0400
-@@ -2,6 +2,7 @@
- #define FILETAIL_H
- 
- #include <cstdio>
-+#include <assert.h>
- using namespace std;
- 
- #include "../../module.h"
-diff -ur root-portal-0.4.11.orig/src/modules/process/process.h root-portal-0.4.11/src/modules/process/process.h
---- root-portal-0.4.11.orig/src/modules/process/process.h	2003-10-15 16:00:20.484230296 -0400
-+++ root-portal-0.4.11/src/modules/process/process.h	2003-10-15 16:06:51.646764552 -0400
-@@ -6,6 +6,7 @@
- #include <cstdlib>
- #include <cstdio>
- #include <vector>
-+#include <assert.h>
- using namespace std;
- 
- #include "../../module.h"
-diff -ur root-portal-0.4.11.orig/src/modules/roottext/roottext.h root-portal-0.4.11/src/modules/roottext/roottext.h
---- root-portal-0.4.11.orig/src/modules/roottext/roottext.h	2003-10-15 16:00:20.486229992 -0400
-+++ root-portal-0.4.11/src/modules/roottext/roottext.h	2003-10-15 16:07:23.406936272 -0400
-@@ -9,6 +9,7 @@
- #include "../../rootwindow.h"
- #include "../../drawing_area.h"
- #include <vector>
-+#include <assert.h>
- using namespace std;
- 
- typedef unsigned long Pixel;
-diff -ur root-portal-0.4.11.orig/src/path.h root-portal-0.4.11/src/path.h
---- root-portal-0.4.11.orig/src/path.h	2003-10-15 16:00:20.467232880 -0400
-+++ root-portal-0.4.11/src/path.h	2003-10-15 16:11:46.954870896 -0400
-@@ -3,6 +3,7 @@
- 
- #include <vector>
- #include <string>
-+#include <assert.h>
- using namespace std;
- 
- class Path
diff --git a/x11-misc/root-portal/files/digest-root-portal-0.5.0 b/x11-misc/root-portal/files/digest-root-portal-0.5.0
deleted file mode 100644
index 63d60a321a47..000000000000
--- a/x11-misc/root-portal/files/digest-root-portal-0.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9b3eff0eed13bc659b485d5c5661a03f root-portal-0.5.0.tar.gz 426038
diff --git a/x11-misc/root-portal/root-portal-0.5.0.ebuild b/x11-misc/root-portal/root-portal-0.5.0.ebuild
deleted file mode 100644
index b7e922f8fe24..000000000000
--- a/x11-misc/root-portal/root-portal-0.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/root-portal/root-portal-0.5.0.ebuild,v 1.11 2005/05/19 06:12:12 pyrania Exp $
-
-inherit gnome2 debug
-
-DESCRIPTION="A program to draw text and graphs in the root window"
-HOMEPAGE="http://root-portal.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-DOC="PACKAGING README NEWS ChangeLog BUGS AUTHORS README.help TODO"
-
-USE_DESTDIR="1"
-
-RDEPEND="virtual/x11
-	>=x11-libs/gtk+-2
-	>=x11-libs/libzvt-2
-	>=gnome-base/orbit-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-panel-2
-	dev-libs/libxml"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	dev-util/pkgconfig"
diff --git a/x11-misc/root-portal/root-portal-0.5.2.ebuild b/x11-misc/root-portal/root-portal-0.5.2.ebuild
index be017ac35772..f6650c707986 100644
--- a/x11-misc/root-portal/root-portal-0.5.2.ebuild
+++ b/x11-misc/root-portal/root-portal-0.5.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/x11-misc/root-portal/root-portal-0.5.2.ebuild,v 1.4 2005/08/14 10:11:43 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/root-portal/root-portal-0.5.2.ebuild,v 1.5 2006/01/21 12:15:43 nelchael Exp $
 
 inherit gnome2 debug
 
@@ -14,8 +14,7 @@ KEYWORDS="ppc x86"
 IUSE=""
 DOC="PACKAGING README NEWS ChangeLog BUGS AUTHORS README.help TODO"
 
-RDEPEND="virtual/x11
-	>=x11-libs/gtk+-2
+RDEPEND=">=x11-libs/gtk+-2
 	>=x11-libs/libzvt-2
 	>=gnome-base/orbit-2
 	>=gnome-base/libgnomeui-2