Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-themes/tangerine-icon-theme: ChangeLog tangerine-icon-theme-0.26.ebuild
Date: Fri, 02 Apr 2010 14:56:13
Message-Id: E1NxiI6-0004bV-Sx@stork.gentoo.org
1 ssuominen 10/04/02 14:56:10
2
3 Modified: ChangeLog tangerine-icon-theme-0.26.ebuild
4 Log:
5 depend vs. rdepend confusion wrt #312591 by Diego E. 'Flameeyes' Pettenò.
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.17 x11-themes/tangerine-icon-theme/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/tangerine-icon-theme/ChangeLog?rev=1.17&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/tangerine-icon-theme/ChangeLog?rev=1.17&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/tangerine-icon-theme/ChangeLog?r1=1.16&r2=1.17
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/ChangeLog,v
18 retrieving revision 1.16
19 retrieving revision 1.17
20 diff -u -r1.16 -r1.17
21 --- ChangeLog 28 Apr 2009 11:05:51 -0000 1.16
22 +++ ChangeLog 2 Apr 2010 14:56:10 -0000 1.17
23 @@ -1,6 +1,11 @@
24 # ChangeLog for x11-themes/tangerine-icon-theme
25 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/ChangeLog,v 1.16 2009/04/28 11:05:51 ssuominen Exp $
27 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 +# $Header: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/ChangeLog,v 1.17 2010/04/02 14:56:10 ssuominen Exp $
29 +
30 + 02 Apr 2010; Samuli Suominen <ssuominen@g.o>
31 + tangerine-icon-theme-0.26.ebuild:
32 + Fix depend vs. rdepend confusion wrt #312591 by Diego E. 'Flameeyes'
33 + Pettenò.
34
35 28 Apr 2009; Samuli Suominen <ssuominen@g.o>
36 tangerine-icon-theme-0.26.ebuild:
37
38
39
40 1.6 x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild
41
42 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild?rev=1.6&view=markup
43 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild?rev=1.6&content-type=text/plain
44 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild?r1=1.5&r2=1.6
45
46 Index: tangerine-icon-theme-0.26.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild,v
49 retrieving revision 1.5
50 retrieving revision 1.6
51 diff -u -r1.5 -r1.6
52 --- tangerine-icon-theme-0.26.ebuild 28 Apr 2009 11:05:51 -0000 1.5
53 +++ tangerine-icon-theme-0.26.ebuild 2 Apr 2010 14:56:10 -0000 1.6
54 @@ -1,6 +1,6 @@
55 -# Copyright 1999-2009 Gentoo Foundation
56 +# Copyright 1999-2010 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $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 $
59 +# $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 $
60
61 EAPI=2
62 inherit autotools gnome2-utils
63 @@ -15,14 +15,14 @@
64 KEYWORDS="amd64 sparc x86"
65 IUSE="png"
66
67 -RDEPEND=">=x11-misc/icon-naming-utils-0.8.2
68 +RDEPEND=">=x11-themes/gnome-icon-theme-2.24"
69 +DEPEND=">=gnome-base/librsvg-2.12.3
70 media-gfx/imagemagick[png?]
71 - >=gnome-base/librsvg-2.12.3
72 - >=x11-themes/gnome-icon-theme-2.18"
73 -DEPEND="${RDEPEND}
74 + >=x11-misc/icon-naming-utils-0.8.2
75 dev-util/pkgconfig
76 dev-util/intltool
77 sys-devel/gettext"
78 +
79 RESTRICT="binchecks strip"
80
81 src_unpack() { unpack ${PN}_${PV}.tar.gz; }
82 @@ -32,21 +32,22 @@
83
84 for res in 16 22 32; do
85 rsvg -w ${res} -h ${res} scalable/places/start-here.svg \
86 - ${res}x${res}/places/start-here.png || die "rsvg failed"
87 + ${res}x${res}/places/start-here.png || die
88 done
89
90 - intltoolize --force --copy --automake || die "intltoolize failed"
91 + intltoolize --force --copy --automake || die
92 eautoreconf
93 }
94
95 src_configure() {
96 - econf $(use_enable png png-creation) \
97 + econf \
98 + $(use_enable png png-creation) \
99 $(use_enable png icon-framing)
100 }
101
102 src_install() {
103 addwrite /root/.gnome2
104 - emake DESTDIR="${D}" install || die "emake install failed"
105 + emake DESTDIR="${D}" install || die
106 dodoc AUTHORS ChangeLog README
107 }