media-gfx/imageworsener: Bring back support for webp images (bug #387761)

Package-Manager: portage-2.1.10.27/cvs/Linux x86_64

diff --git a/media-gfx/imageworsener/ChangeLog b/media-gfx/imageworsener/ChangeLog
index 63d2f9de955044f98cd7941eadb428d4ae607db4..6bfbf8cee987fa5c4f9dc99fdeac627c27c3f34f 100644 (file)
--- a/media-gfx/imageworsener/ChangeLog
+++ b/media-gfx/imageworsener/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/imageworsener
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imageworsener/ChangeLog,v 1.9 2011/10/20 00:47:21 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imageworsener/ChangeLog,v 1.10 2011/10/21 22:03:00 sping Exp $
+
+  21 Oct 2011; Sebastian Pipping <sping@gentoo.org> imageworsener-0.9.5.ebuild,
+  metadata.xml:
+  Bring back support for webp images now that libwebp 0.1.3 is in the main tree
+  (bug #387761)
 
 *imageworsener-0.9.5 (20 Oct 2011)
 

diff --git a/media-gfx/imageworsener/Manifest b/media-gfx/imageworsener/Manifest
index 59e84745f73b2ec3ad2311557e296929911cc701..ceda3311aef931d6cc7c4572eb574c003dfadcba 100644 (file)
--- a/media-gfx/imageworsener/Manifest
+++ b/media-gfx/imageworsener/Manifest
@@ -10,13 +10,13 @@ DIST imageworsener-src-0.9.5.tar.gz 241698 RMD160 bb619561da553f8fc670c1b2e36bbb
 EBUILD imageworsener-0.9.2.ebuild 884 RMD160 4edb2f622f3f3a60e99a2de0a41be753364303f8 SHA1 fc3b96259f444403394161a453bdd136addd2c77 SHA256 34c639d47e0b7da12ab6b1474e08686d631d9a4d9db218ba9fbdeb8b9cf2f349
 EBUILD imageworsener-0.9.3.ebuild 915 RMD160 6e47b2daa0023ed4d58eeb0960f0ec0b4d723b87 SHA1 b9e90249ea3b4d85320a72d8ffc44a51ec6ada5e SHA256 7993afe2ddb85c06374fa5cabc87720d9fb76a5bd660be2c2272952715e29962
 EBUILD imageworsener-0.9.4.ebuild 912 RMD160 c718d3a966d3a5f2b3ca933170eef44d6032dcb8 SHA1 78d1a2a6525a16ceaacddf815cdd833981e0b58e SHA256 b1f9d73d5acd422f8eddbe76f36fdb6a742800875adf7c0f84ea19afdf629a18
-EBUILD imageworsener-0.9.5.ebuild 1134 RMD160 fa4ed47247ace8c585a3f8bd13385f490963d9ed SHA1 631d4adb649f2f3fe58cc6cc79450a3ae8c38fff SHA256 4cb2e2af620969e7617afaf1b921b826e3f5ed0ff0e0a84f1eb4baf24081f48a
-MISC ChangeLog 1617 RMD160 8bb5a81167b0e5dfffc40c4fcd802dc575949971 SHA1 a0076251003b537b3081b05ed6922d52f1c4d226 SHA256 e645f6912ac2ca86787347bde965946e1f71ffc023bfe154a05ce07c02045bb4
-MISC metadata.xml 322 RMD160 3f81d1aac2d1c0e2dda5ecb58f1761d2e7543b1e SHA1 debe07c5c6597a20a6ca6932fc17974d7db76f19 SHA256 baae59b5e1a61c90864f40c25538fcafaab451b905218ddc5f9335bb3fe1a44d
+EBUILD imageworsener-0.9.5.ebuild 1111 RMD160 dcdde50a89a9d59e5533b1778a79c6a1bc275e65 SHA1 392d2d19be3e727dac99740bc047ede6de13c690 SHA256 7d9109cb5bb077e4a62f4de583d36a46a1529292dc2a338d3023fb6ddca9b7f9
+MISC ChangeLog 1811 RMD160 977b4dcdf76d0da9c525782095444e9a640ce45d SHA1 42c154dd4bc390e2a8596e0314affdfe06cf745b SHA256 ec96075e6e383ec5c809b4a3686f6eee84f2f18251d748cdb1ea06c8dcc572fe
+MISC metadata.xml 394 RMD160 b77a64b313e588eafe74e7d25e90b320d420069f SHA1 65e4d45b4e83a60b379c15cb2ba445ebc9abd3bb SHA256 3a0b57f0d2a5138607b3d4d428e1c85fd02e33ba4a247f0a0140ddbdcf3465d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6fb5oACgkQsAvGakAaFgA/+ACdEPVSHfcBk65/zO0FvhLuJ/oV
-OxIAoMC0mjTiGRNhNjQ7lzLgfHjKi6uG
-=srq9
+iEYEARECAAYFAk6h7BUACgkQsAvGakAaFgDRVACcCRkE6Pto0R4COrqXc5+AH0VQ
+dgQAnAsHfr9sLvzgoDq2RcLm3Mt+TiJY
+=5tXj
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/imageworsener/imageworsener-0.9.5.ebuild b/media-gfx/imageworsener/imageworsener-0.9.5.ebuild
index a5f731fad8254944a72b2f423c81e3cb063ad32f..f4e3f524ae3fb8e148a4e581d41e77f209e82c84 100644 (file)
--- a/media-gfx/imageworsener/imageworsener-0.9.5.ebuild
+++ b/media-gfx/imageworsener/imageworsener-0.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imageworsener/imageworsener-0.9.5.ebuild,v 1.1 2011/10/20 00:47:21 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imageworsener/imageworsener-0.9.5.ebuild,v 1.2 2011/10/21 22:03:00 sping Exp $
 
 EAPI="2"
 
@@ -18,22 +18,25 @@ SRC_URI="http://entropymine.com/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"  # TODO webp
+IUSE="test webp"
 
+WEBP_DEPEND='>=media-libs/libwebp-0.1.3'
 DEPEND="media-libs/libpng:0
-       virtual/jpeg"
-       # TODO webp? ( >=media-libs/libwebp-0.1.3 )
-       # TODO test? ( >=media-libs/libwebp-0.1.3 )
+       virtual/jpeg
+       webp? ( ${WEBP_DEPEND} )
+       test? ( ${WEBP_DEPEND} )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-       # TODO bring back webp tests
-       epatch "${FILESDIR}"/${P}-webp.patch \
-                       "${FILESDIR}"/${P}-disable-webp-tests.patch
+       epatch "${FILESDIR}"/${P}-webp.patch
 }
 
 src_configure() {
-       mycmakeargs=( -DIW_SUPPORT_WEBP=0 )
+       local webp=0
+       use webp && webp=1
+       use test && webp=1
+       mycmakeargs=( -DIW_SUPPORT_WEBP=${webp} )
+
        cmake-utils_src_configure
 }
 

diff --git a/media-gfx/imageworsener/metadata.xml b/media-gfx/imageworsener/metadata.xml
index bf357130576539d6fd1a65d271728e72ec817126..e46f7556e5828b0677f3b8c161a1503edf076bb5 100644 (file)
--- a/media-gfx/imageworsener/metadata.xml
+++ b/media-gfx/imageworsener/metadata.xml
@@ -9,4 +9,7 @@
        <email>sping@gentoo.org</email>
        <name>Sebastian Pipping</name>
 </maintainer>
+<use>
+       <flag name='webp'>enable webp image format support</flag>
+</use>
 </pkgmetadata>