depend vs. rdepend confusion wrt #312591 by Diego E. 'Flameeyes' Pettenò.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/x11-themes/tangerine-icon-theme/ChangeLog b/x11-themes/tangerine-icon-theme/ChangeLog
index ba0be22f600e3425ff8f532f54f6b05bfe115d7e..7da03ddff53c0834fd620cf73466f7817bb63a59 100644 (file)
--- 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/Manifest b/x11-themes/tangerine-icon-theme/Manifest
index 43610bbb00ea2e432a08a53b9bfde34b53ba8aad..3248c575bcc887e124f0ae68f1b46809ce213b5b 100644 (file)
--- a/x11-themes/tangerine-icon-theme/Manifest
+++ b/x11-themes/tangerine-icon-theme/Manifest
@@ -1,5 +1,5 @@
 DIST gentoo-logo.svg 13764 RMD160 62b740f670377486eb1350c4f180d9f0ab63948c SHA1 a81d7fb4be541547be78d648bbeb0d3c51f1a41e SHA256 ad81a212991cd24faaddbc260c806c805fd7a67f65b24655908a8971fa10794e
 DIST tangerine-icon-theme_0.26.tar.gz 1167388 RMD160 0b35f6c60fce6f0228568f0945158579e577da47 SHA1 38602a729a5d760eebbd79a79905a834ba449553 SHA256 ff35de84580b15a472994f6338a50b96e4df3da2ab5c4cb086c7e0a1af82ea5a
-EBUILD tangerine-icon-theme-0.26.ebuild 1645 RMD160 4f29292d6682bc150482fcd251d3f3b8ffcf9391 SHA1 4430a953ae7f4a72aa176c5e546d5f47e2aa2929 SHA256 f6d9e3e263f7379070167b43b087c44f85b2e39a31073a4d61adbdfd39d1c204
-MISC ChangeLog 2266 RMD160 5edd4d11478ebe71efd6b7635e65423a1ac50b8c SHA1 bff4f2fce7f63accd01a2715256960fd6b439984 SHA256 c11dd43214439f1f9d2a8f758c63cd60ea9d5de0c00633ff874324d5c595b8bc
+EBUILD tangerine-icon-theme-0.26.ebuild 1580 RMD160 a95d08ef83620610f182a359db311c803888611b SHA1 3f8a7c6a8f5704f963f860df4943bf709c4b1459 SHA256 d22ec761297d4f3bc2b25467c0df238281b334deea15fa1fcbb99a232a1951d7
+MISC ChangeLog 2440 RMD160 6439985d6960298cc130f72fec56a3e8daff2bfe SHA1 e08a5eb31f68ec408cb455dae13d4a69327a0fd1 SHA256 6c0bfe1adad9e95a6c3cfb6892dc8692ae10fa0654ce3faa2baaab69491fd685
 MISC metadata.xml 167 RMD160 6f174fdd5033945a3da1b7bbea9796fe17ba2bf8 SHA1 26b8b030985c93a71d6d34f25249320a30b22f36 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241

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 5de0492b09a1084338c1e66472a236859b7846da..f4c0380e2b366bd493ea853ac6e82a8e07330f2b 100644 (file)
--- 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
 }