public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Samuli Suominen (ssuominen)" <ssuominen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/pstoedit: ChangeLog pstoedit-3.50.ebuild pstoedit-3.45-r1.ebuild
Date: Wed, 31 Mar 2010 10:08:51 +0000	[thread overview]
Message-ID: <E1Nwuqx-00056p-RZ@stork.gentoo.org> (raw)

ssuominen    10/03/31 10:08:51

  Modified:             ChangeLog pstoedit-3.50.ebuild
                        pstoedit-3.45-r1.ebuild
  Log:
  Fix imagemagick deps to allow both "cxx" and "-nocxx".
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.65                 media-gfx/pstoedit/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/pstoedit/ChangeLog?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/pstoedit/ChangeLog?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/pstoedit/ChangeLog?r1=1.64&r2=1.65

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ChangeLog	10 Jan 2010 17:55:41 -0000	1.64
+++ ChangeLog	31 Mar 2010 10:08:51 -0000	1.65
@@ -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 <ssuominen@gentoo.org>
+  pstoedit-3.45-r1.ebuild, pstoedit-3.50.ebuild:
+  Fix imagemagick deps to allow both "cxx" and "-nocxx".
 
   10 Jan 2010; nixnut <nixnut@gentoo.org> pstoedit-3.50.ebuild:
   ppc stable #294109



1.7                  media-gfx/pstoedit/pstoedit-3.50.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/pstoedit/pstoedit-3.50.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/pstoedit/pstoedit-3.50.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/pstoedit/pstoedit-3.50.ebuild?r1=1.6&r2=1.7

Index: pstoedit-3.50.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.50.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pstoedit-3.50.ebuild	10 Jan 2010 17:55:41 -0000	1.6
+++ pstoedit-3.50.ebuild	31 Mar 2010 10:08:51 -0000	1.7
@@ -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 @@
 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



1.3                  media-gfx/pstoedit/pstoedit-3.45-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild?r1=1.2&r2=1.3

Index: pstoedit-3.45-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pstoedit-3.45-r1.ebuild	26 Dec 2009 17:39:25 -0000	1.2
+++ pstoedit-3.45-r1.ebuild	31 Mar 2010 10:08:51 -0000	1.3
@@ -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 @@
 		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 )
 






             reply	other threads:[~2010-03-31 10:09 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-31 10:08 Samuli Suominen (ssuominen) [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-05-27 10:54 [gentoo-commits] gentoo-x86 commit in media-gfx/pstoedit: ChangeLog pstoedit-3.50.ebuild pstoedit-3.45-r1.ebuild Markus Meier (maekke)
2009-12-26 17:39 Peter Volkov (pva)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1Nwuqx-00056p-RZ@stork.gentoo.org \
    --to=ssuominen@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox