From: Samuli Suominen Date: Sat, 10 Mar 2007 19:20:09 +0000 (+0000) Subject: Fix USE -png when imagemagick is also USE -png. This is a fix moved from tango-icon... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=39e8615d5e2c9dab9a7e2676c7446c64c24893ad;p=gentoo.git Fix USE -png when imagemagick is also USE -png. This is a fix moved from tango-icon-theme to here also, should've done it in the first place.. Package-Manager: portage-2.1.2.2 --- diff --git a/x11-themes/tango-icon-theme-extras/ChangeLog b/x11-themes/tango-icon-theme-extras/ChangeLog index a3e1ae008d75..1c95e20f7b35 100644 --- a/x11-themes/tango-icon-theme-extras/ChangeLog +++ b/x11-themes/tango-icon-theme-extras/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-themes/tango-icon-theme-extras # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme-extras/ChangeLog,v 1.10 2007/02/21 19:43:13 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme-extras/ChangeLog,v 1.11 2007/03/10 19:20:09 drac Exp $ + + 10 Mar 2007; Samuli Suominen + tango-icon-theme-extras-0.1.0-r1.ebuild: + Fix USE -png when imagemagick is also USE -png. *tango-icon-theme-extras-0.1.0-r1 (21 Feb 2007) diff --git a/x11-themes/tango-icon-theme-extras/Manifest b/x11-themes/tango-icon-theme-extras/Manifest index 23feca99c9ce..883d843458f0 100644 --- a/x11-themes/tango-icon-theme-extras/Manifest +++ b/x11-themes/tango-icon-theme-extras/Manifest @@ -1,16 +1,16 @@ DIST tango-icon-theme-extras-0.1.0.tar.gz 228375 RMD160 7c301bbe6748fc770bc52f91624ce676624d00e3 SHA1 1bed3023139187c36e851df19506f4942bf2d1c1 SHA256 b9252179ea2c546e6bb065281d51373f0ae06081e5a98d4255249af4fa8b33db -EBUILD tango-icon-theme-extras-0.1.0-r1.ebuild 1155 RMD160 2b698f3e3dd3325fce61e66bd141a6335ca86893 SHA1 8c9985edc8b3d75814fb19e6a76c600415498f24 SHA256 15495d0f29cb661f53040acf1f77994ba4e72531a825de8d8e3c7a129eeae8be -MD5 1e01827f1db9ca8c6201cc0dd6f95b16 tango-icon-theme-extras-0.1.0-r1.ebuild 1155 -RMD160 2b698f3e3dd3325fce61e66bd141a6335ca86893 tango-icon-theme-extras-0.1.0-r1.ebuild 1155 -SHA256 15495d0f29cb661f53040acf1f77994ba4e72531a825de8d8e3c7a129eeae8be tango-icon-theme-extras-0.1.0-r1.ebuild 1155 +EBUILD tango-icon-theme-extras-0.1.0-r1.ebuild 1161 RMD160 0f0d8ec224ba8150e1c15cf5f1103034275829ff SHA1 7eebb0b168be50de7d9ae08e9136896b081b87e8 SHA256 4ffe09249f8c03462de7713c2a81bb542fec0efc44c751c67cb972e57cf7e1de +MD5 f2a4be276a54e76efbd0fd9fe2f525d8 tango-icon-theme-extras-0.1.0-r1.ebuild 1161 +RMD160 0f0d8ec224ba8150e1c15cf5f1103034275829ff tango-icon-theme-extras-0.1.0-r1.ebuild 1161 +SHA256 4ffe09249f8c03462de7713c2a81bb542fec0efc44c751c67cb972e57cf7e1de tango-icon-theme-extras-0.1.0-r1.ebuild 1161 EBUILD tango-icon-theme-extras-0.1.0.ebuild 931 RMD160 415aaf1ffa2230cb3ceafd162c050d539ffc995e SHA1 1b3e90e53d81daa2be33c55454254d32742b3e2f SHA256 0dffc07fd1f74cfb2a2617f714e121aaff2c49aef74271419f471d2f61dfe3ad MD5 2caeb22a864f4bfc428def65b0e19ae4 tango-icon-theme-extras-0.1.0.ebuild 931 RMD160 415aaf1ffa2230cb3ceafd162c050d539ffc995e tango-icon-theme-extras-0.1.0.ebuild 931 SHA256 0dffc07fd1f74cfb2a2617f714e121aaff2c49aef74271419f471d2f61dfe3ad tango-icon-theme-extras-0.1.0.ebuild 931 -MISC ChangeLog 1533 RMD160 9bc9a833d350778693c9be5c896795c143708021 SHA1 585b8366d313b438f1a5fec8f501851a73986eac SHA256 e018d505891375b0b2fd393d6e9a6acc8f7deb3208d23e69fcf54f35ce88245f -MD5 ce492e7eebb6a4f852471c18ccddcb3d ChangeLog 1533 -RMD160 9bc9a833d350778693c9be5c896795c143708021 ChangeLog 1533 -SHA256 e018d505891375b0b2fd393d6e9a6acc8f7deb3208d23e69fcf54f35ce88245f ChangeLog 1533 +MISC ChangeLog 1676 RMD160 d897bb849d7d6eef5d556975dea1f346fb2732cd SHA1 24e932a3714795d2c0696988f6506886563c5265 SHA256 f8a07d898b8a5789112f82eec77a20a4988153a16f20fa65f3d31b0e9a61d7c9 +MD5 753a8d5d1b3b861cc7e4b0a18046e3d8 ChangeLog 1676 +RMD160 d897bb849d7d6eef5d556975dea1f346fb2732cd ChangeLog 1676 +SHA256 f8a07d898b8a5789112f82eec77a20a4988153a16f20fa65f3d31b0e9a61d7c9 ChangeLog 1676 MISC metadata.xml 292 RMD160 d7b7e392ab66db5f5de20f64ef160ec568ff9116 SHA1 8fb6e709bf9f5a849628c85985961648b93e1db6 SHA256 cc7269e67766389989322d16941a59b398b90e46c0a302b18a547e6549563754 MD5 635e35abfc7eb9b1e9ff08c8e3cb58cc metadata.xml 292 RMD160 d7b7e392ab66db5f5de20f64ef160ec568ff9116 metadata.xml 292 diff --git a/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild b/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild index 625f4fc52bdf..6422c7e8b87d 100644 --- a/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild +++ b/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.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-extras/tango-icon-theme-extras-0.1.0-r1.ebuild,v 1.1 2007/02/21 19:43:13 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild,v 1.2 2007/03/10 19:20:09 drac Exp $ inherit eutils @@ -28,12 +28,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." }