Fix imagemagick vs. graphicsmagick depend wrt #314405 by Mikael Magnusson.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/x11-misc/xrmap/ChangeLog b/x11-misc/xrmap/ChangeLog
index d92193c4ee291318849193af54ced910930985e0..a9a0fdff5a6ba669e3b812cb45e3958dc0f37c84 100644 (file)
--- a/x11-misc/xrmap/ChangeLog
+++ b/x11-misc/xrmap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xrmap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.18 2010/06/07 13:04:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.19 2010/06/11 18:36:55 ssuominen Exp $
+
+  11 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> xrmap-2.33.ebuild:
+  Fix imagemagick vs. graphicsmagick depend wrt #314405 by Mikael Magnusson.
 
   07 Jun 2010; Diego E. Pettenò <flameeyes@gentoo.org> xrmap-2.33.ebuild:
   Parallel make fails, bug #323065.

diff --git a/x11-misc/xrmap/Manifest b/x11-misc/xrmap/Manifest
index 207f60145f1f1e5e1c86097c904d009cf585fe12..9c0efd27826969a5a21b8bf99b645c884ca9fa0b 100644 (file)
--- a/x11-misc/xrmap/Manifest
+++ b/x11-misc/xrmap/Manifest
@@ -5,6 +5,6 @@ DIST xrmap-2.10.tgz 3944521 RMD160 dd398b2e4b24c23b1fbf9edfa37ddf7d1f4eaf65 SHA1
 DIST xrmap-2.29.tar.bz2 1072241 RMD160 f8cacc343643a66c8236743c76c80d3c33c44c5c SHA1 af2efc47b7ef76840a72a96e67174b0fd5dd8973 SHA256 2c790904c5077940b8e4b23d848b0e6a02757cde18a3256c47f34da7d7ae31d0
 DIST xrmap-2.33.tar.bz2 1224699 RMD160 6c025976f98046315a370405f043aaf2cd05a12d SHA1 bd6392e1732754f5421615ff16ef625e703fbb5b SHA256 120bb1544a7f375e2ed2ec036e7b170081a963b559c3b3b0b5eefe52f56c8440
 EBUILD xrmap-2.29.ebuild 2112 RMD160 1b9f33e54013a4c7ed06c1a0550b9c716f815549 SHA1 fc79529380a944b5585c1655be573511a4cca5df SHA256 bd641e18421edc15bd9f3e439cd97f83c38eef3b1d285ebac970bdff29be6d32
-EBUILD xrmap-2.33.ebuild 2232 RMD160 1d0c9c82db4454ecb97334468ac3e62f781e3641 SHA1 3e3b24cdf31299db96408f02f9a0f54c35692a62 SHA256 bb489208720cee4ff2b505a55dc4d93bd00dafdd8ec9e3ca3c4b796858c48a92
-MISC ChangeLog 2341 RMD160 ee83de3575d9f5c5b1cf6b83b09a2cbe1b214eb9 SHA1 5c0da36cb8d97afaa37fe68064adf2cf0c9ff162 SHA256 d482c1801b693b947ad57715c7b2f6fafde975f47191a2db3a45fe584e68a58e
+EBUILD xrmap-2.33.ebuild 2303 RMD160 983cd6e2d5e50eef251153dafb8087679137e2f7 SHA1 2d190ccf4d3f512b6a926270052779a7c0659ad7 SHA256 acc19b2b5eb8810277424afe3fb6356b65752430248e4838b0e08bbcd2c8c703
+MISC ChangeLog 2492 RMD160 2180262d5c51d52abebf13faef437eea4055b51d SHA1 186cae75e0114cbe695b32c313f1795543a6336a SHA256 f04efb7ab80be37aa4a7e4d507d035e88db5fbb271bf54daa334b1d2ada1853c
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826

diff --git a/x11-misc/xrmap/xrmap-2.33.ebuild b/x11-misc/xrmap/xrmap-2.33.ebuild
index 717f1c19b05e6fcf65863d9966fd8089dac5adc3..1c1a2a7c21fd47980d1fce11c0bb93c041c0b044 100644 (file)
--- a/x11-misc/xrmap/xrmap-2.33.ebuild
+++ b/x11-misc/xrmap/xrmap-2.33.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.33.ebuild,v 1.2 2010/06/07 13:04:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.33.ebuild,v 1.3 2010/06/11 18:36:55 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="a X client for generating images of the Earth and manipulating the CIA World data bank"
@@ -21,7 +22,7 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
        x11-misc/imake
        x11-proto/xproto
-       media-gfx/imagemagick
+       || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
        app-text/gv
        sys-apps/less
        >=sys-apps/sed-4
@@ -32,6 +33,9 @@ src_unpack() {
        rm -rf "${S}"
        mv "${WORKDIR}"/${PN}-${FULL_DIST} "${S}"
        unpack ${A}
+}
+
+src_prepare() {
        epatch "${FILESDIR}"/${P}-Makefile.kit.patch \
                "${FILESDIR}"/${P}-as-needed.patch
        cd "${S}"/editkit && xmkmf || die