allow media-gfx/graphicsmagick to provide image conversion
authorMichael Sterrett <mr_bones_@gentoo.org>
Sun, 28 Feb 2010 00:43:09 +0000 (00:43 +0000)
committerMichael Sterrett <mr_bones_@gentoo.org>
Sun, 28 Feb 2010 00:43:09 +0000 (00:43 +0000)
Package-Manager: portage-2.1.7.16/cvs/Linux i686

games-strategy/wesnoth/ChangeLog
games-strategy/wesnoth/Manifest
games-strategy/wesnoth/wesnoth-1.7.13.ebuild

index cc1cf2f6eb7991bcda90e5a2436cce3de0b9c3c2..a4f4ccc25ea58a092b37b9108c7eb835b01662fe 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/wesnoth
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.167 2010/02/10 18:48:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.168 2010/02/28 00:43:09 mr_bones_ Exp $
+
+  28 Feb 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  wesnoth-1.7.13.ebuild:
+  allow media-gfx/graphicsmagick to provide image conversion
 
 *wesnoth-1.7.13 (10 Feb 2010)
 
index d59b57f41aeceab9b33e08d0c5b22bb4fc33ff52..b62a179eca9fa042279d7b3afd06414fc4a62866 100644 (file)
@@ -2,6 +2,6 @@ AUX wesnothd.rc 619 RMD160 b3d7a303f27ce3cc1886fd7791ab58f58356ac39 SHA1 8ba6dad
 DIST wesnoth-1.6.5.tar.bz2 230239169 RMD160 7fe957d7eeb61956252d0fc6e9ead74572be43a1 SHA1 232dac3a4327555bf52212cf4420c9ea823220e4 SHA256 7ef047ae364278a5bf9bdc69228f77d825f793f1c4d9adae8b47f0882e7f30d7
 DIST wesnoth-1.7.13.tar.bz2 277677400 RMD160 78fd8fdad93c3ef12ce440b3f05105a78208cbfc SHA1 b0799dbd3a370fb384a51537b2ad108c9b16b104 SHA256 848d3973ff433534d676920c01e35d3d25732b27262c64d285cf6e335fccae37
 EBUILD wesnoth-1.6.5.ebuild 2593 RMD160 a6b5dcbd551d8b3501a2401e11ee02d2385d6e7f SHA1 b488985b8805654a1a28e2ff75c3a0e41eb3c738 SHA256 a5a1cf905012265022e97b91f96f450cb8aa845755877fde026e4b7be4f12101
-EBUILD wesnoth-1.7.13.ebuild 2852 RMD160 c14d1893de58c31719d6424edb0deec8d1253706 SHA1 44998db689febb2e639ca04a5c58384a6da421a8 SHA256 150856d9b8cc3ce275608f4c45a5d600936a7fbf823f9bcd2213c41df665aec2
-MISC ChangeLog 21789 RMD160 b3d559f62062162102e575470c35d1b5c31f7bfd SHA1 d032b08c2bda533e1af4dd804ebd0c37b4e91b90 SHA256 f637652b9aeab40d97bc521653318c24837125f8efa62eeebe748aad6ddb7ae5
+EBUILD wesnoth-1.7.13.ebuild 2922 RMD160 a6a208c710954cce4eb0c6ad920635971a2229ae SHA1 9ec990ffda8f753f1447abca3253e4e8a0ddfa3b SHA256 988a215f6b18475a4bd750e6d8d47f407db2b0bb112a35cb835c8c4df3270c85
+MISC ChangeLog 21931 RMD160 c75b73d72a90f1df16e68065d30fa28df45093f2 SHA1 8428b003cb3c29e20b3bc568577609714b8bda5e SHA256 337ed2a762777135530f422d2da19c61be5532f6d745581f55af806a94a1eb71
 MISC metadata.xml 330 RMD160 27f21d82f0524f02ac36acfd6116ffd979c930fd SHA1 c2ff910e780424aae4bd9d41eea083824bcdb073 SHA256 286df39ac36cc888d57c6c471a1742218ffe4b1448d410e1dba461c061841ca5
index 5fe627d1a0b4cfcf57dca0c34b97b5a92bab35da..54fbd4265aa6e06f64f35c45eb4e1fcbd5786979 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.7.13.ebuild,v 1.1 2010/02/10 18:48:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.7.13.ebuild,v 1.2 2010/02/28 00:43:09 mr_bones_ Exp $
 
 EAPI=2
 inherit cmake-utils eutils toolchain-funcs flag-o-matic games
@@ -31,7 +31,12 @@ RDEPEND=">=media-libs/libsdl-1.2.7[video,X]
 DEPEND="${RDEPEND}
        dev-util/pkgconfig
        !dedicated? (
-               tinygui? ( media-gfx/imagemagick[jpeg,png] )
+               tinygui? (
+                       || (
+                               media-gfx/imagemagick[jpeg,png]
+                               media-gfx/graphicsmagick[imagemagick,jpeg,png]
+                       )
+               )
        )
        sys-devel/gettext"