From e6cbca1e1298f999fe71c0bb859beed0620d556b Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Wed, 31 Mar 2010 10:08:51 +0000 Subject: [PATCH] Fix imagemagick deps to allow both "cxx" and "-nocxx". Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- media-gfx/pstoedit/ChangeLog | 6 +++++- media-gfx/pstoedit/Manifest | 6 +++--- media-gfx/pstoedit/pstoedit-3.45-r1.ebuild | 6 +++--- media-gfx/pstoedit/pstoedit-3.50.ebuild | 17 ++++++++--------- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/media-gfx/pstoedit/ChangeLog b/media-gfx/pstoedit/ChangeLog index c37b694f2a79..11d3d5317b3a 100644 --- a/media-gfx/pstoedit/ChangeLog +++ b/media-gfx/pstoedit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/pstoedit # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/ChangeLog,v 1.64 2010/01/10 17:55:41 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/ChangeLog,v 1.65 2010/03/31 10:08:51 ssuominen Exp $ + + 31 Mar 2010; Samuli Suominen + pstoedit-3.45-r1.ebuild, pstoedit-3.50.ebuild: + Fix imagemagick deps to allow both "cxx" and "-nocxx". 10 Jan 2010; nixnut pstoedit-3.50.ebuild: ppc stable #294109 diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest index d3ac911bf5e5..6432c6492b82 100644 --- a/media-gfx/pstoedit/Manifest +++ b/media-gfx/pstoedit/Manifest @@ -5,7 +5,7 @@ AUX pstoedit-3.50-parallel.patch 1994 RMD160 9d6ac711233cba48c013f4f4ac86ce065aa AUX pstoedit-3.50-plugin-close.patch 259 RMD160 3b38e0d68fb1c7d7e2165969a0afba438bc79e5a SHA1 54bbe019de66eb4cb8525371462595d21fbd074e SHA256 b579b146b2297d69329a7a61707d2cb28fd1506b01da556dfdbb58d12826b1d9 DIST pstoedit-3.45.tar.gz 848922 RMD160 dbe610807dae3ece5d32979100795d3399beb23a SHA1 3eecd5efcd4f3d1752d13303a2d1b64346f74171 SHA256 a489e47e536c194d7fc3a8121a274156a3577d3d893ac4b54d79849bb29f7fd9 DIST pstoedit-3.50.tar.gz 894115 RMD160 ba9be28424ced48464d93dd8bca60107d181a1c3 SHA1 5685bef29fa00aae7cc314d3a1dd21612a98eb2b SHA256 22b16452d7538358f8ecdff1fec29a8b6d4da49dffec9ae436f60bd95d105711 -EBUILD pstoedit-3.45-r1.ebuild 1673 RMD160 70c10997ffbe2bec34cea7312846989cceb18aeb SHA1 84fc0077a17dd06f2f17fdf585925bfc177d2fd7 SHA256 76b50f0d133ad166b15185a842839e64768949ee2dc0bc724f838615b9848af4 -EBUILD pstoedit-3.50.ebuild 1376 RMD160 f5a862d8652689c9512fb26ea4053574b97d6c84 SHA1 949349e2fd989d71ce181f4fdd3de5c1685ccd9c SHA256 8b7941292b1bcd08d97b916d5c1fb89893f2f6d23c4821f1cf8a21bc33fc50e7 -MISC ChangeLog 9058 RMD160 1a3966e84c26b78efdd5512188907c3e0c052ec5 SHA1 60c33bfe6f206f674d0bce3e1a138dc8b7d715f2 SHA256 6d42acaa31ad61203213487c2332fd03a0d10b93646c783d23886a6a241dc2da +EBUILD pstoedit-3.45-r1.ebuild 1713 RMD160 d8c6d5300a3d163d8cb415aa32c7b0c468bf46eb SHA1 d32d38edd8ff9df4946668ad9c2a5a6219a7e19f SHA256 4709a4086160fdf65c068463998ff185ea71f3e836c6828dd6ce3778d9f30efe +EBUILD pstoedit-3.50.ebuild 1400 RMD160 42fa567a87d16f817f4387075bc2dd674ff6bd0f SHA1 69ba95218d9ef24c09614e04b3bc61987c748bf0 SHA256 e4b8b03362e1a0bf9743188fa5148c7a2d66f6db68bc9c453d584011618c9aea +MISC ChangeLog 9222 RMD160 89378933e0fd91d3a8390bb10ccc18b83f22ac2e SHA1 fbd9bfac7405084f6cb917b12d3b3f8fd5b5d3b5 SHA256 4669ea443e9a4566fc195a3f2bf3e31f23a139325fc47211743769a4857382fd MISC metadata.xml 266 RMD160 405ece9efc9a19d31ca7394a9c159a51309a3bec SHA1 7cb5575a9c14679a2f6bbeb1f11333918dda2368 SHA256 5fe90f8eb0d17c47a5e85afd6f31144f68a86e4819c1a43f11b53789f6015c57 diff --git a/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild b/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild index 47ef4c9d9090..816a70c6c7c0 100644 --- a/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild +++ b/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild,v 1.2 2009/12/26 17:39:25 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild,v 1.3 2010/03/31 10:08:51 ssuominen Exp $ EAPI="2" @@ -22,7 +22,7 @@ DEPEND="media-libs/libpng app-text/ghostscript-gpl media-libs/gd emf? ( >=media-libs/libemf-1.0.3 ) - imagemagick? ( media-gfx/imagemagick[-nocxx] ) + imagemagick? ( || ( media-gfx/imagemagick[cxx] media-gfx/imagemagick[-nocxx] ) ) plotutils? ( media-libs/plotutils )" #flash? ( >=media-libs/ming-0.3 ) diff --git a/media-gfx/pstoedit/pstoedit-3.50.ebuild b/media-gfx/pstoedit/pstoedit-3.50.ebuild index 1a829b559adc..9e2906abcfd0 100644 --- a/media-gfx/pstoedit/pstoedit-3.50.ebuild +++ b/media-gfx/pstoedit/pstoedit-3.50.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-gfx/pstoedit/pstoedit-3.50.ebuild,v 1.6 2010/01/10 17:55:41 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.50.ebuild,v 1.7 2010/03/31 10:08:51 ssuominen Exp $ EAPI="2" @@ -17,15 +17,14 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86" IUSE="emf imagemagick plotutils" RDEPEND="media-libs/libpng - media-libs/gd - app-text/ghostscript-gpl - emf? ( >=media-libs/libemf-1.0.3 ) - imagemagick? ( media-gfx/imagemagick[-nocxx] ) - plotutils? ( media-libs/plotutils )" -# swf? ( >=media-libs/ming-0.3 )" bug 238803 - + media-libs/gd + app-text/ghostscript-gpl + emf? ( >=media-libs/libemf-1.0.3 ) + imagemagick? ( || ( media-gfx/imagemagick[cxx] media-gfx/imagemagick[-nocxx] ) ) + plotutils? ( media-libs/plotutils )" +# swf? ( >=media-libs/ming-0.3 )" bug 238803 DEPEND="${RDEPEND} - dev-util/pkgconfig" + dev-util/pkgconfig" src_prepare() { sed -i -e 's:-pedantic ::' -e 's:CXXFLAGS="-g"::' "${S}"/configure.ac -- 2.26.2