diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-01-23 10:05:46 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-01-23 10:05:46 +0000 |
| commit | ff7b8fe0c7f8b6309235d747a61e98503ee0bf2c (patch) | |
| tree | d5457f3d94d4fa7e1afaf9df71d84951fd6c7157 /x11-themes/fvwm-crystal | |
| parent | Add hashtables for sci-mathematics/agda-2.3.0. (diff) | |
| download | gentoo-2-ff7b8fe0c7f8b6309235d747a61e98503ee0bf2c.tar.gz gentoo-2-ff7b8fe0c7f8b6309235d747a61e98503ee0bf2c.tar.bz2 gentoo-2-ff7b8fe0c7f8b6309235d747a61e98503ee0bf2c.zip | |
Fix *magick dependencies (import command is used) wrt #314413 by Wojciech Porczyk
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'x11-themes/fvwm-crystal')
| -rw-r--r-- | x11-themes/fvwm-crystal/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild | 18 |
2 files changed, 16 insertions, 11 deletions
diff --git a/x11-themes/fvwm-crystal/ChangeLog b/x11-themes/fvwm-crystal/ChangeLog index 0f7eaf4fc1f0..e5ffc6a78891 100644 --- a/x11-themes/fvwm-crystal/ChangeLog +++ b/x11-themes/fvwm-crystal/ChangeLog @@ -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: diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild index e65c849897f6..e1059d692836 100644 --- a/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild +++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild @@ -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 @@ RDEPEND=">=x11-wm/fvwm-2.6.2[png] || ( 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_prepare() { } 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() { |