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 x11-themes/fvwm-crystal: ChangeLog fvwm-crystal-3.0.6-r1.ebuild
Date: Mon, 23 Jan 2012 10:05:47 +0000 (UTC)	[thread overview]
Message-ID: <20120123100547.0A35C2004B@flycatcher.gentoo.org> (raw)

ssuominen    12/01/23 10:05:47

  Modified:             ChangeLog fvwm-crystal-3.0.6-r1.ebuild
  Log:
  Fix *magick dependencies (import command is used) wrt #314413 by Wojciech Porczyk
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.65                 x11-themes/fvwm-crystal/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog?r1=1.64&r2=1.65

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ChangeLog	11 Nov 2011 17:08:24 -0000	1.64
+++ ChangeLog	23 Jan 2012 10:05:46 -0000	1.65
@@ -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:



1.6                  x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild?r1=1.5&r2=1.6

Index: fvwm-crystal-3.0.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fvwm-crystal-3.0.6-r1.ebuild	11 Nov 2011 17:07:35 -0000	1.5
+++ fvwm-crystal-3.0.6-r1.ebuild	23 Jan 2012 10:05:46 -0000	1.6
@@ -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 @@
 	|| ( 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_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() {






             reply	other threads:[~2012-01-23 10:05 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-23 10:05 Samuli Suominen (ssuominen) [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-06-21  6:51 [gentoo-commits] gentoo-x86 commit in x11-themes/fvwm-crystal: ChangeLog fvwm-crystal-3.0.6-r1.ebuild Samuli Suominen (ssuominen)
2012-01-23 10:14 Samuli Suominen (ssuominen)
2011-11-11 17:07 Samuli Suominen (ssuominen)
2011-09-27 13:52 Samuli Suominen (ssuominen)
2009-09-28 22:50 Victor Ostorga (vostorga)

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=20120123100547.0A35C2004B@flycatcher.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