summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-01-23 10:43:31 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-01-23 10:43:31 +0000
commit549826bc06bd7a103975d4f6dda56861a9a65355 (patch)
tree0fddc31ecbc06e78c904040f0967cf4b691ccda1 /x11-themes
parentMissing USE dep for last commit (diff)
downloadhistorical-549826bc06bd7a103975d4f6dda56861a9a65355.tar.gz
historical-549826bc06bd7a103975d4f6dda56861a9a65355.tar.bz2
historical-549826bc06bd7a103975d4f6dda56861a9a65355.zip
Fix *magick dependencies (command convert is used) wrt #314417 by Wojciech Porczyk
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'x11-themes')
-rw-r--r--x11-themes/nuvox/ChangeLog8
-rw-r--r--x11-themes/nuvox/nuvox-07.1.ebuild37
2 files changed, 23 insertions, 22 deletions
diff --git a/x11-themes/nuvox/ChangeLog b/x11-themes/nuvox/ChangeLog
index d7a58eef636f..9cc048cbe9d9 100644
--- a/x11-themes/nuvox/ChangeLog
+++ b/x11-themes/nuvox/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-themes/nuvox
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/nuvox/ChangeLog,v 1.4 2009/02/23 13:59:44 flameeyes Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/nuvox/ChangeLog,v 1.5 2012/01/23 10:43:31 ssuominen Exp $
+
+ 23 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> nuvox-07.1.ebuild:
+ Fix *magick dependencies (command convert is used) wrt #314417 by Wojciech
+ Porczyk
23 Feb 2009; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
Drop me from metadata, I'm not using KDE any longer.
diff --git a/x11-themes/nuvox/nuvox-07.1.ebuild b/x11-themes/nuvox/nuvox-07.1.ebuild
index 9c1597add71d..f3a45291459c 100644
--- a/x11-themes/nuvox/nuvox-07.1.ebuild
+++ b/x11-themes/nuvox/nuvox-07.1.ebuild
@@ -1,36 +1,33 @@
-# Copyright 1999-2008 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/nuvox/nuvox-07.1.ebuild,v 1.3 2008/04/07 21:02:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/nuvox/nuvox-07.1.ebuild,v 1.4 2012/01/23 10:43:31 ssuominen Exp $
-MY_P="nuvoX_${PV}"
+EAPI=4
-DESCRIPTION="NuvoX SVG icon theme."
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+MY_P=nuvoX_${PV}
+
+DESCRIPTION="NuvoX SVG icon theme"
HOMEPAGE="http://www.kde-look.org/content/show.php?content=38467"
-LICENSE="GPL-2"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-IUSE=""
-KEYWORDS="amd64 x86"
+LICENSE="GPL-2"
SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="media-gfx/imagemagick"
RDEPEND=""
+DEPEND="|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] )"
+
+RESTRICT="strip binchecks"
-src_unpack() {
- unpack ${A}
+S=${WORKDIR}/${MY_P}
- sed -i \
- -e '/rm -fr/d' \
- -e '/tar cf/d' \
- "${S}/buildset"
+src_prepare() {
+ sed -i -e '/rm -fr/d' -e '/tar cf/d' buildset || die
}
src_compile() {
- ./buildset || die "unable to build icon sets."
+ ./buildset || die
}
src_install() {