Fixed DEPEND for modular X.

(Portage version: 2.1_pre3-r1)

5 files changed, 37 insertions, 15 deletions

diff --git a/x11-misc/xrmap/ChangeLog b/x11-misc/xrmap/ChangeLog
index 669129a87848..3988d8e4890a 100644
--- a/x11-misc/xrmap/ChangeLog
+++ b/x11-misc/xrmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xrmap
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.10 2005/11/01 11:42:14 nelchael Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.11 2006/01/22 00:28:19 nelchael Exp $
+
+  22 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xrmap-2.29.ebuild,
+  xrmap-2.30.ebuild, xrmap-2.32.ebuild:
+  Fixed DEPEND for modular X.
 
 *xrmap-2.32 (01 Nov 2005)
 
diff --git a/x11-misc/xrmap/Manifest b/x11-misc/xrmap/Manifest
index ab8004bbc104..b9f8ee0fa2e1 100644
--- a/x11-misc/xrmap/Manifest
+++ b/x11-misc/xrmap/Manifest
@@ -6,4 +6,4 @@ MD5 68f544c43102455686aedc82bd5a2727 files/xrmap-2.32-Makefile.kit.patch 750
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 MD5 4578bf01dee82a5900058673e3431e41 xrmap-2.29.ebuild 2039
 MD5 4aa929bb8e2c0e51fd0ad5bd0d56df9f xrmap-2.30.ebuild 2040
-MD5 1e8973749bab8197851db03d0a14b7ca xrmap-2.32.ebuild 2102
+MD5 1ec49c3f01e084ce4fd74dfdcf0c4cb2 xrmap-2.32.ebuild 2127
diff --git a/x11-misc/xrmap/xrmap-2.29.ebuild b/x11-misc/xrmap/xrmap-2.29.ebuild
index bf380bb6c2d2..1f01520a552d 100644
--- a/x11-misc/xrmap/xrmap-2.29.ebuild
+++ b/x11-misc/xrmap/xrmap-2.29.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/xrmap/xrmap-2.29.ebuild,v 1.6 2005/11/01 11:42:14 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.29.ebuild,v 1.7 2006/01/22 00:28:19 nelchael Exp $
 
 DESCRIPTION="The Xrmap program is a X client for generating images of the Earth and manipulating the CIA World data bank"
 HOMEPAGE="http://frmas.free.fr/li_1.htm#_Xrmap_"
@@ -13,10 +13,16 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~amd64 ~ppc"
 IUSE="zlib"
-DEPEND="media-gfx/imagemagick
+
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )
+	media-gfx/imagemagick
 	app-text/gv
 	sys-apps/less
-	media-libs/xpm
 	>=sys-apps/sed-4
 	zlib? ( sys-libs/zlib )"
 
diff --git a/x11-misc/xrmap/xrmap-2.30.ebuild b/x11-misc/xrmap/xrmap-2.30.ebuild
index b3d938a6934a..a026a4b711b0 100644
--- a/x11-misc/xrmap/xrmap-2.30.ebuild
+++ b/x11-misc/xrmap/xrmap-2.30.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/xrmap/xrmap-2.30.ebuild,v 1.2 2005/11/01 11:42:14 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.30.ebuild,v 1.3 2006/01/22 00:28:19 nelchael Exp $
 
 DESCRIPTION="The Xrmap program is a X client for generating images of the Earth and manipulating the CIA World data bank"
 HOMEPAGE="http://frmas.free.fr/li_1.htm#_Xrmap_"
@@ -13,10 +13,16 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="zlib"
-DEPEND="media-gfx/imagemagick
+
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )
+	media-gfx/imagemagick
 	app-text/gv
 	sys-apps/less
-	media-libs/xpm
 	>=sys-apps/sed-4
 	zlib? ( sys-libs/zlib )"
 
diff --git a/x11-misc/xrmap/xrmap-2.32.ebuild b/x11-misc/xrmap/xrmap-2.32.ebuild
index fe7a864aead4..83384a6f8044 100644
--- a/x11-misc/xrmap/xrmap-2.32.ebuild
+++ b/x11-misc/xrmap/xrmap-2.32.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/xrmap/xrmap-2.32.ebuild,v 1.1 2005/11/01 11:42:14 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.32.ebuild,v 1.2 2006/01/22 00:28:19 nelchael Exp $
 
 inherit eutils
 
@@ -15,10 +15,16 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="zlib"
-DEPEND="media-gfx/imagemagick
+
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )
+	media-gfx/imagemagick
 	app-text/gv
 	sys-apps/less
-	media-libs/xpm
 	>=sys-apps/sed-4
 	zlib? ( sys-libs/zlib )"