Fix imagemagick deps to allow both "cxx" and "nocxx".

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

diff --git a/media-sound/gejengel/ChangeLog b/media-sound/gejengel/ChangeLog
index 78e766586e53b9378f54db130908adb1666b429f..568b7aed61cd0ce54976c1b06b323d62ad7a7467 100644 (file)
--- a/media-sound/gejengel/ChangeLog
+++ b/media-sound/gejengel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/gejengel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/ChangeLog,v 1.7 2010/02/23 08:08:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/ChangeLog,v 1.8 2010/03/31 10:05:35 ssuominen Exp $
+
+  31 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> gejengel-0.1.2.ebuild:
+  Fix imagemagick deps to allow both "cxx" and "nocxx".
 
   23 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> gejengel-0.1.2.ebuild:
   Fix lastfmlib to at least 0.4.0 per configure.ac.

diff --git a/media-sound/gejengel/Manifest b/media-sound/gejengel/Manifest
index 37f1f121d4f95f2e1c413836f24aa8543c0a43b1..e08ea8d8920ea4f3193ae3309606a7bd740f0ff3 100644 (file)
--- a/media-sound/gejengel/Manifest
+++ b/media-sound/gejengel/Manifest
@@ -1,5 +1,5 @@
 AUX gejengel-0.1.2_64bit_fix.patch 1446 RMD160 65cbda557c6c593c202ad2b238c6710d2889777e SHA1 1d21548b4da61f3a2d05499ec33e1245105cfd72 SHA256 5baa9c45a1d810092510c5d9f406b8c014b678c580c8760075094756a16abbb0
 DIST gejengel-0.1.2.tar.gz 475783 RMD160 4011b6aaace6c2b07405da6d2744e7ab7bcb4c96 SHA1 90111f2de1a014b01dedcb57563b2587e9b4b4bb SHA256 efa7e8db2463fb32c8978fdb0b6e1fef8e22aa8d296eb9bcd8c5be3b5425e6ea
-EBUILD gejengel-0.1.2.ebuild 1690 RMD160 e9d4d76241bc76ef47b25c0f9e26b2f8ce122f51 SHA1 f9b19ed983b89344cd4f19cbb1a5492b10fd5611 SHA256 08bac203660d59832781df6cb5eab47c28fcfacf11128ec23540126b73b1358a
-MISC ChangeLog 1243 RMD160 443314e1b7477d59f4a80caecdab470c6baad1a1 SHA1 191140697e21302075d4880c116baf90b4619150 SHA256 f69264948b98892e16401d1ae977a2a5d5e0ac69f6bc8c30eeeb0f487c123524
+EBUILD gejengel-0.1.2.ebuild 1724 RMD160 e6e1fe216ba1230b5f542cf4c21ab606b336343b SHA1 7e5c919f0d766cc0d224fafaea716c5a4ccef386 SHA256 1b462113027d1f8a6bec998c80e4a25335ab1ae161cf780625a89146b455aef7
+MISC ChangeLog 1377 RMD160 c90ed2e0f70218ea542976a6f9b37a2d00eadb1a SHA1 2c66752ff861bfc50151f56f7ebce204f2521f19 SHA256 4fcc64307d169d9dbd664e176790ccf570981861703ac447c606d3f14407b6ba
 MISC metadata.xml 561 RMD160 fa1cd6eae8181d8de7776f3766ab04b2fb4f8327 SHA1 7434df6d71d08be1838f006715454ba105eea6b1 SHA256 c536a2322d23676f2c59c1ccf080671e24d9a1950c9b334b1daf67231ebcc574

diff --git a/media-sound/gejengel/gejengel-0.1.2.ebuild b/media-sound/gejengel/gejengel-0.1.2.ebuild
index c79e5a683480fedd24a1090f4e609b759a23fd41..7123045705ed0359fe8c06df13837f67c358c2c5 100644 (file)
--- a/media-sound/gejengel/gejengel-0.1.2.ebuild
+++ b/media-sound/gejengel/gejengel-0.1.2.ebuild
@@ -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/media-sound/gejengel/gejengel-0.1.2.ebuild,v 1.2 2010/02/23 08:08:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/gejengel-0.1.2.ebuild,v 1.3 2010/03/31 10:05:35 ssuominen Exp $
 
 EAPI=2
 inherit eutils multilib
@@ -19,7 +19,7 @@ RDEPEND=">=dev-cpp/gtkmm-2.16
        dev-cpp/libsexymm
        media-libs/taglib
        dev-db/sqlite
-       media-gfx/imagemagick[-nocxx]
+       || ( media-gfx/imagemagick[cxx] media-gfx/imagemagick[-nocxx] )
        mad? ( media-libs/libmad )
        flac? ( media-libs/flac[cxx] )
        ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070330 )