summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-04-02 14:56:10 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-04-02 14:56:10 +0000
commitee750fcd83bfead3e63e7901537b79851301db16 (patch)
treea51c01b7dda6425455dd00055b0bf6d72361e769 /x11-themes
parentAutomated update of use.local.desc (diff)
downloadgentoo-2-ee750fcd83bfead3e63e7901537b79851301db16.tar.gz
gentoo-2-ee750fcd83bfead3e63e7901537b79851301db16.tar.bz2
gentoo-2-ee750fcd83bfead3e63e7901537b79851301db16.zip
depend vs. rdepend confusion wrt #312591 by Diego E. 'Flameeyes' Pettenò.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-themes')
-rw-r--r--x11-themes/tangerine-icon-theme/ChangeLog9
-rw-r--r--x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild21
2 files changed, 18 insertions, 12 deletions
diff --git a/x11-themes/tangerine-icon-theme/ChangeLog b/x11-themes/tangerine-icon-theme/ChangeLog
index ba0be22f600e..7da03ddff53c 100644
--- a/x11-themes/tangerine-icon-theme/ChangeLog
+++ b/x11-themes/tangerine-icon-theme/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-themes/tangerine-icon-theme
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/ChangeLog,v 1.16 2009/04/28 11:05:51 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/ChangeLog,v 1.17 2010/04/02 14:56:10 ssuominen Exp $
+
+ 02 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
+ tangerine-icon-theme-0.26.ebuild:
+ Fix depend vs. rdepend confusion wrt #312591 by Diego E. 'Flameeyes'
+ Pettenò.
28 Apr 2009; Samuli Suominen <ssuominen@gentoo.org>
tangerine-icon-theme-0.26.ebuild:
diff --git a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild b/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild
index 5de0492b09a1..f4c0380e2b36 100644
--- a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild
+++ b/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.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/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild,v 1.5 2009/04/28 11:05:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild,v 1.6 2010/04/02 14:56:10 ssuominen Exp $
EAPI=2
inherit autotools gnome2-utils
@@ -15,14 +15,14 @@ SLOT="0"
KEYWORDS="amd64 sparc x86"
IUSE="png"
-RDEPEND=">=x11-misc/icon-naming-utils-0.8.2
+RDEPEND=">=x11-themes/gnome-icon-theme-2.24"
+DEPEND=">=gnome-base/librsvg-2.12.3
media-gfx/imagemagick[png?]
- >=gnome-base/librsvg-2.12.3
- >=x11-themes/gnome-icon-theme-2.18"
-DEPEND="${RDEPEND}
+ >=x11-misc/icon-naming-utils-0.8.2
dev-util/pkgconfig
dev-util/intltool
sys-devel/gettext"
+
RESTRICT="binchecks strip"
src_unpack() { unpack ${PN}_${PV}.tar.gz; }
@@ -32,21 +32,22 @@ src_prepare() {
for res in 16 22 32; do
rsvg -w ${res} -h ${res} scalable/places/start-here.svg \
- ${res}x${res}/places/start-here.png || die "rsvg failed"
+ ${res}x${res}/places/start-here.png || die
done
- intltoolize --force --copy --automake || die "intltoolize failed"
+ intltoolize --force --copy --automake || die
eautoreconf
}
src_configure() {
- econf $(use_enable png png-creation) \
+ econf \
+ $(use_enable png png-creation) \
$(use_enable png icon-framing)
}
src_install() {
addwrite /root/.gnome2
- emake DESTDIR="${D}" install || die "emake install failed"
+ emake DESTDIR="${D}" install || die
dodoc AUTHORS ChangeLog README
}