Fix *magick dependencies (import command is used) wrt #314413 by Wojciech Porczyk

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 25 insertions, 20 deletions

diff --git a/x11-themes/fvwm-crystal/ChangeLog b/x11-themes/fvwm-crystal/ChangeLog
index 0f7eaf4fc1f0..e5ffc6a78891 100644
--- a/x11-themes/fvwm-crystal/ChangeLog
+++ b/x11-themes/fvwm-crystal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/fvwm-crystal
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog,v 1.64 2011/11/11 17:08:24 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog,v 1.65 2012/01/23 10:05:46 ssuominen Exp $
+
+  23 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  fvwm-crystal-3.0.6-r1.ebuild:
+  Fix *magick dependencies (import command is used) wrt #314413 by Wojciech
+  Porczyk
 
   11 Nov 2011; Samuli Suominen <ssuominen@gentoo.org>
   -fvwm-crystal-3.0.5-r1.ebuild:
diff --git a/x11-themes/fvwm-crystal/Manifest b/x11-themes/fvwm-crystal/Manifest
index 972f596a9b7f..4cad801303df 100644
--- a/x11-themes/fvwm-crystal/Manifest
+++ b/x11-themes/fvwm-crystal/Manifest
@@ -4,17 +4,17 @@ Hash: SHA1
 AUX fvwm-crystal 25 RMD160 d0c78fa2b6c0f80bd452bc381fbdc91cb5986ec8 SHA1 24deaa87267d7c6f0beb09eee790c0ef90055bbe SHA256 27345a70a0f0a1aadefcb8fe23ca1761fbe44a088f66d0c5e9db154db3c36962
 AUX fvwm-crystal.apps.patch 4448 RMD160 4d1bf1271eae1dfcc1dbe065fee2b1cf1d56c9fd SHA1 be018cef13df0e6166ae2f862800d14bd20607f4 SHA256 425a5c01eda53611fee86b454cbeb7cf482c08496ea78cf4909f3cd817f3c7aa
 DIST fvwm-crystal-3.0.6.tar.gz 7857363 RMD160 38ea8475750f9f8f315d9357bf8ddd6daf9876ed SHA1 965e521f64b8a89994f5afee25c8b1c88239bff0 SHA256 9a325f07929e2b4ab2cc8f3e82eab0219d97dd9111c103309711dab324f17fe9
-EBUILD fvwm-crystal-3.0.6-r1.ebuild 1600 RMD160 1580a2560b7e846d43c9687aab02b052b549c2f9 SHA1 269303c6feb8ad6c64d84a2c48fd87a8cfc1f52c SHA256 b04a2fc0ad799a8fea465da3c618c5789fb7b84c0c5e0279db04a5097dbddc36
-MISC ChangeLog 10449 RMD160 075264447e965c2df8f90b3c5f5781c0743f7575 SHA1 f66ac41a90f305971705c82bbd42f7702e7107dd SHA256 e1e06fefe08f26b7e0a6faf1ec3d03391334696fd70692a31130bc0cb186f802
+EBUILD fvwm-crystal-3.0.6-r1.ebuild 1602 RMD160 26374a19e57a4e9690b4216bc0586acc9fece938 SHA1 17eac22a546a765c77e674b65a0ab7d4092e72d7 SHA256 4b160f2ddf50d967b9fac353066707f6dacf3a14e7a53092c0617478351c3673
+MISC ChangeLog 10622 RMD160 a2dfa7d9c10637d616730c9518aca1bd1b5cbeac SHA1 ed687bec1f3180673a376ec1c826f181d46b9353 SHA256 ff34f9fa9adb802b8da12962cae585c1ec2f1bfe451d7f099fa43194189b30fd
 MISC metadata.xml 874 RMD160 3594678cd37da403f22dbc9ddc11aba9636fdf9a SHA1 899d42749bdc3aa5e90874872c597473d3d10e9a SHA256 89c3b3c4197ca01987650523b0b0e0f64af062ab950a40725d74efc7aafc0d16
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOvVZMAAoJEEdUh39IaPFN0A8H/RGlWFdYu8WJT8Cq09IrxqUy
-cQO9ix7fPNavifGMfGSQ02URnboPLUN19RRIn8Hu0yfSQR1SivL/jWJocG8h2SBG
-uy1tBJgHOzCeURzVwECIdSFznV0dAxLtvO4tXDf9LrHiEYbPsgUnm5jHXjmX5QY4
-wCtJ2sdzDJC+CB7VPKGndE8+Ri9a+SMRAf4lI7VyZvdrkgBCABnzv55ketdcw+x9
-5InxZdiTHdc49mJ+N3hvd211uf+boDPE1G/hrtLE4Jy3OyWSKbLcn1RXor1p01Th
-/nekT7+nPkYSjpC+bqhxg5A6V/XxoScy1ALPX7GdnqtccSrZfS/ZxQ5kzKcvJNY=
-=ambW
+iQEcBAEBAgAGBQJPHTBwAAoJEEdUh39IaPFNElsH/AydF3bYffAdnLsn7T6VHu/X
+HnzMhFoELOPgf1xQqSV47Pvr6jdPqfJc8oQjpxkQfuMA1gBurQa0JAhiIzPF6B+T
+9t2dqLAUD72IHWdQltpMFtNVfrdcpgNuG/trqqpg//YRo5cZ84n4vTmUqK7TmTf/
+TsKs+VbJqcVyCvAkjN7ruZ5UeAutXiTMjhROluagBJcRJLhLLSiGWDh3IOb0GmfV
+RRgIdqCysjWx0lbuPg/VNULMFvo9fdHOEQENJnA6y4LVeuWibJNSraue6Sj7Cmxx
+tWa9t7ACdpqAJ9JJQK7wUg/Zs98Qgy0rr1ZkOxwOmg/uStPh0j4wiROosSn2ZTs=
+=IHL9
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild
index e65c849897f6..e1059d692836 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild,v 1.5 2011/11/11 17:07:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild,v 1.6 2012/01/23 10:05:46 ssuominen Exp $
 
-EAPI=2
+EAPI=4
 inherit eutils
 
 DESCRIPTION="Configurable and full featured theme for FVWM, with lots of transparency"
@@ -20,7 +20,7 @@ RDEPEND=">=x11-wm/fvwm-2.6.2[png]
 	|| ( x11-misc/stalonetray x11-misc/trayer )
 	|| ( x11-misc/habak x11-misc/hsetroot )
 	x11-apps/xwd
-	media-gfx/imagemagick[png]"
+	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )"
 
 src_prepare() {
 	find . -type d -name '.svn' -prune -exec rm -rf {} ';' || die
@@ -28,18 +28,18 @@ src_prepare() {
 }
 
 src_install() {
-	einstall || die
+	einstall
 
-	dodoc AUTHORS README INSTALL NEWS ChangeLog doc/* || die
+	dodoc AUTHORS README INSTALL NEWS ChangeLog doc/*
 
 	docinto examples
-	dodoc addons/* || die
+	dodoc addons/*
 
 	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/fvwm-crystal || die
+	doexe "${FILESDIR}"/fvwm-crystal
 
 	insinto /usr/share/xsessions
-	doins addons/fvwm-crystal.desktop || die
+	doins addons/fvwm-crystal.desktop
 }
 
 pkg_postinst() {