Fix USE -png when imagemagick is also USE -png as reported by marc_alec. Thanks.

Package-Manager: portage-2.1.2-r13

diff --git a/x11-themes/tango-icon-theme/ChangeLog b/x11-themes/tango-icon-theme/ChangeLog
index 16acfad5db6a6d44b264393783de5e26b228e8c8..633a2f1ee739f1f79d991a266ac3c00b4a76b5a9 100644 (file)
--- a/x11-themes/tango-icon-theme/ChangeLog
+++ b/x11-themes/tango-icon-theme/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/tango-icon-theme
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme/ChangeLog,v 1.30 2007/03/03 15:14:55 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme/ChangeLog,v 1.31 2007/03/03 16:23:54 drac Exp $
+
+  03 Mar 2007; Samuli Suominen <drac@gentoo.org>
+  tango-icon-theme-0.8.0.ebuild:
+  Fix USE -png when imagemagick is also USE -png as reported by marc_alec.
+  Thanks.
 
   03 Mar 2007; nixnut <nixnut@gentoo.org> tango-icon-theme-0.8.0.ebuild:
   Stable on ppc wrt bug 161592

diff --git a/x11-themes/tango-icon-theme/Manifest b/x11-themes/tango-icon-theme/Manifest
index 82b2ec6a7aea54f457ea2ebfe38f6af3fafc079b..1c588c62c8b83d3c1333c735d34ef4f40efafb4f 100644 (file)
--- a/x11-themes/tango-icon-theme/Manifest
+++ b/x11-themes/tango-icon-theme/Manifest
@@ -4,14 +4,14 @@ EBUILD tango-icon-theme-0.7.2.ebuild 916 RMD160 12a3a12bef7f3abb1ff5fa71df65e73c
 MD5 b499397269301984444382b925f901d5 tango-icon-theme-0.7.2.ebuild 916
 RMD160 12a3a12bef7f3abb1ff5fa71df65e73c7ac73a4d tango-icon-theme-0.7.2.ebuild 916
 SHA256 a6fbd2407de050c566d49e8fa4c2f5fd4bc2a6a2371252d1d1e6200d9350913a tango-icon-theme-0.7.2.ebuild 916
-EBUILD tango-icon-theme-0.8.0.ebuild 1115 RMD160 ffe192c0e67f81a4a42c6b6d29f7c7e4d3a405b1 SHA1 b5e8b8b967afac03465bdd7ff7c9a60ef090da83 SHA256 ee7ea7bf13cd7e42534b965980830dfd889706d66f5ca4fed3d6513e21081fca
-MD5 a24095508fc0557abf27781dbcdc6045 tango-icon-theme-0.8.0.ebuild 1115
-RMD160 ffe192c0e67f81a4a42c6b6d29f7c7e4d3a405b1 tango-icon-theme-0.8.0.ebuild 1115
-SHA256 ee7ea7bf13cd7e42534b965980830dfd889706d66f5ca4fed3d6513e21081fca tango-icon-theme-0.8.0.ebuild 1115
-MISC ChangeLog 4061 RMD160 1e98cec3c4f3f087e76fed6f492b6acb41f754aa SHA1 2df2dacdd4a209c768b04fd1745ecab0199e0f27 SHA256 3dbccf906356e200e5c31b7815e7e9cfe0a58ffa8c2c21b34252e196cda6d2e2
-MD5 77999dc20455d0fce5ed5760c3114309 ChangeLog 4061
-RMD160 1e98cec3c4f3f087e76fed6f492b6acb41f754aa ChangeLog 4061
-SHA256 3dbccf906356e200e5c31b7815e7e9cfe0a58ffa8c2c21b34252e196cda6d2e2 ChangeLog 4061
+EBUILD tango-icon-theme-0.8.0.ebuild 1119 RMD160 28037f55b247401f7a9789bcd887fe8ff5d6ec93 SHA1 a39533b524ed20662bda7cf7523c049472a770c6 SHA256 44b37d8768b4bc719f1a59c92f19116fd8d72b3a9514e6417f6ba96bc3af4a1d
+MD5 09af830002bc1510ace0859a869af1a0 tango-icon-theme-0.8.0.ebuild 1119
+RMD160 28037f55b247401f7a9789bcd887fe8ff5d6ec93 tango-icon-theme-0.8.0.ebuild 1119
+SHA256 44b37d8768b4bc719f1a59c92f19116fd8d72b3a9514e6417f6ba96bc3af4a1d tango-icon-theme-0.8.0.ebuild 1119
+MISC ChangeLog 4227 RMD160 8cec82f16d6cb69effd7380c7476e1949624f400 SHA1 63c13f0b1ff0178426e3473939fc17c0e62ada36 SHA256 507fb2244a39519f12711be3925c9c6d5caed21fb75e29b9b18d0aa994240d17
+MD5 bbe1f41201f34e283356aaeea94d639a ChangeLog 4227
+RMD160 8cec82f16d6cb69effd7380c7476e1949624f400 ChangeLog 4227
+SHA256 507fb2244a39519f12711be3925c9c6d5caed21fb75e29b9b18d0aa994240d17 ChangeLog 4227
 MISC metadata.xml 383 RMD160 46dc66d3cd399cf8eb9806360848358b8a38e7ba SHA1 baa0a3d04f6589ff75ddf86a50a8b423dcb6eccf SHA256 659ac936e7cbab26414df0875db9e935530215a64195bc2bfaf1f2d1ec5ef947
 MD5 a13844250d06e7025f0fbfd22b8d2557 metadata.xml 383
 RMD160 46dc66d3cd399cf8eb9806360848358b8a38e7ba metadata.xml 383

diff --git a/x11-themes/tango-icon-theme/tango-icon-theme-0.8.0.ebuild b/x11-themes/tango-icon-theme/tango-icon-theme-0.8.0.ebuild
index 17c2cb6f065391e20f65d457cab9c4af20bed87a..7d3c41b5448fe7d830774eba58180f8ce000fd7e 100644 (file)
--- a/x11-themes/tango-icon-theme/tango-icon-theme-0.8.0.ebuild
+++ b/x11-themes/tango-icon-theme/tango-icon-theme-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme/tango-icon-theme-0.8.0.ebuild,v 1.7 2007/03/03 15:14:55 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme/tango-icon-theme-0.8.0.ebuild,v 1.8 2007/03/03 16:23:54 drac Exp $
 
 inherit eutils
 
@@ -30,12 +30,8 @@ pkg_setup() {
 }
 
 src_compile() {
-       if use png; then
-               econf --enable-png-creation
-       else
-               econf
-       fi
-
+       econf $(use_enable png png-creation) \
+               $(use_enable png icon-framing)
        emake || die "emake failed."
 }