Version bump, bug #524812 by Michalis Adamidis.

Package-Manager: portage-2.2.8-r2/cvs/Linux i686
Manifest-Sign-Key: 0x4F1A2555EA71991D!

3 files changed, 88 insertions, 18 deletions

diff --git a/media-libs/libwebp/ChangeLog b/media-libs/libwebp/ChangeLog
index 30964f2765a8..d7edbb1ef725 100644
--- a/media-libs/libwebp/ChangeLog
+++ b/media-libs/libwebp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libwebp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libwebp/ChangeLog,v 1.79 2014/04/28 17:45:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwebp/ChangeLog,v 1.80 2014/12/16 19:35:49 phajdan.jr Exp $
+
+*libwebp-0.4.2 (16 Dec 2014)
+
+  16 Dec 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> +libwebp-0.4.2.ebuild:
+  Version bump, bug #524812 by Michalis Adamidis.
 
   28 Apr 2014; Michał Górny <mgorny@gentoo.org> libwebp-0.3.1.ebuild,
   libwebp-0.4.0.ebuild:
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index ede667d65e1a..c3628c6dbfff 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -5,28 +5,28 @@ DIST libwebp-0.2.1.tar.gz 705230 SHA256 894e08b8b0043cf007cc1ca893f33d73784565a6
 DIST libwebp-0.3.0.tar.gz 800793 SHA256 8903fca40ece603b9cb20d32105168da7e2a33bebbd4d89001a3c8741ef03ddb SHA512 8218abb5e994ab5c89c9d3360efb7c8bf448879caed581bdc3ed7febb65f9eaf597059efcd130352f7e38c25af9508f850e09a7490270e903e228355148c2c30 WHIRLPOOL 68764e957aca26211fea5e663a7a0d377b87be9a218377636e88641c3245f3413097713104da913d80827e3c0043bbaa07b5c91e14fb3dd84bbc5738846c57e6
 DIST libwebp-0.3.1.tar.gz 844799 SHA256 b37932c625322a69fe4e9b88884b5c7aed2b3eaf9fd5e5b480aee339a92e6ee7 SHA512 9b962ce8ce696eb1cc78de624abe0371f9143449cbc8978eb6327e40afe95b31c1b4c9aa97e9c3f4ada46c2f2b70d7b1ca59e46046ddbb3546ecb8e3e766922f WHIRLPOOL ce1fc294b951f75b5a9ca3048f73a9eff8f9e7f413370b36f9c6ceda8d11fad8bb4ff621d55ad4e3c8b6c829eceecf79f3892d464971e76aa2c0edc8fa32f2f6
 DIST libwebp-0.4.0.tar.gz 887880 SHA256 31913577e96386556855b41d210736449445fe96cfbe9289014e9b8afa944d69 SHA512 b0229bcbdf04f667cb0957738a199e08a1340d936c88ef69ad6436da7280a337a94579f4f315b478b74a72a49c126be4222c36c5e2184d429750b9ddc76ff2d6 WHIRLPOOL 8e9edfc589b41d8c076b56cf81d5a21976ad4d1b5aad9b39ed8cadd5fd520bab5fc7b6b3d036c7d7e265218b3eb3adcd1fac4bef180e2c096bac663e55489808
+DIST libwebp-0.4.2.tar.gz 977801 SHA256 14d825d7c2ef7d49621bcb6b83466be455585e671ae0a2ebc1f2e07775a1722d SHA512 0213f92cc9a4303b9ae51ffbc72c083880bcd5c1d8b2f92fe514e0a11167925934d01155f89dc9e571dee51293ea26f8b8b486c5b980db20e921d653320a4d13 WHIRLPOOL be219a80a6a427f19c2ad2943a37e51b7e9c6b5509ad910bfe58ced386cb1d12e78e059ac7028987ee2942d5bdfc9d52e0051e13f14de2aea0088f6abb92a6ef
 EBUILD libwebp-0.2.1.ebuild 888 SHA256 2acd210f7b4b2e8e0d33919ef30757b408102ef27a9e5d66163cac39f400c380 SHA512 b6fb2360755080508b20246f6ac1175ab53e3c3574caee4e27ca8ab868e3278d2b0ef642258f653a8d39c6518957a777746f3809c511582e32adb14e550033ad WHIRLPOOL 429e8eeb6c344595f5b2a38cb6430ec5ec6dcb5f0e407cd4ff3636efbce5e40ce1ffd2869fdf88f082dbc7698236541ff6c29967412b3dc0749c6bf09c366655
 EBUILD libwebp-0.3.0.ebuild 1305 SHA256 54e328eb2e81ec19741c0646e9047cd2b833ca3402909b1e55741151440f741b SHA512 a5a118df38776cfe25a1b6b72def2b458ac4fa1f0942c32de6da2f766745897f39de73d2726036dc016c49764c9d1118e08270046b9bb0b56293bb2f2ed510fd WHIRLPOOL 975327de98c839363a97e1d2eb5fa62ea90003ecb427e321eaf7054194ca2ea0beaa2e1a5fb473db6955ed9e073014d259b04d2c3f26449ec51a6b2ed6aae511
 EBUILD libwebp-0.3.1.ebuild 1845 SHA256 83875763e07eebf09e2bab36b650a64e3c6e2fb88831e111dd506275f94ef943 SHA512 fdb3005b052b6bfe3eb6e13b83a65cd161c1d3697ba4d52e1c133d96ea174c2ea2ba63d28c85467dc2dfbbf02335325f16b2d6d7de5b5be04eee63a35684410b WHIRLPOOL 929c5eb26e62c24c6acd73092b75ef66b27a1e7ebde1be2db51e3c67bf1560dd5767dbf189bea998eefa7a4a32ddaabe2f5bdea069af2968035c64b6b08b3496
 EBUILD libwebp-0.4.0.ebuild 1963 SHA256 b2d1cf4ddd63a0eafbd50e5ba9a484a70d745806a1284caa735599998480e2a7 SHA512 2e768c5d6032565782f4a0bb1a7779b5a57f84a5585f8f2ac1fc831e08a4f3cf69c4b8069a4737cf452298cde1a572c697f2c7fe3fec2901ec694e2424d3fa92 WHIRLPOOL 2dd082b599360fde5926125dca972d112f510c76a5d1edf979f7f11ed3d18e32e2470b58f451d9d802e20fd5f4f98405f320a35cea0fa8e47cf183bd1e6f6e3f
-MISC ChangeLog 9468 SHA256 e8e1cb9610cffe59e03da2594eca1c997290427712f1d00df9e5ab515c1e228f SHA512 dbda4bf97e6b3607b7794854009b2cefc4948d2fa2b9723cebd368abde620fa20d864625945d94bf937209745165399186306198b537f0b057a952689794f4f5 WHIRLPOOL 07f04e2c4cd782d92b584aa63b897bcb8008fb9a106ccfe3e6e07ac5b70ed06dd7b84a02d1fdb16008f306c3f499d3e0c69c1e262aa964c78d42c11b89fa9e4c
+EBUILD libwebp-0.4.2.ebuild 1989 SHA256 79d9b12c8eecbfabaa67c6c6f219c212c2d355a0c6acb7c2791da8be9af589ea SHA512 f5ba0850779038137e681f5a22a85614507d562d19f5ff346bfcb1cde1ad3617345b40e2bab58df918255126303414c0c19bfcfb9697ae6b111171a3261dead1 WHIRLPOOL 1febd3c1d2072d106c1ee4e94f5f537fe2bbc596f7bf0f3ce9c0b0d9bd1826231a9bf99d9a58ccbab9c5edd3c92d566b4a76bea0ea5a1b1cb9b575aeb408c97b
+MISC ChangeLog 9631 SHA256 f26e789184126a35109f319e507133cf474f0e6b994839f251f87124ec5bd1a3 SHA512 f080484dbdcb04d8cac2551e33dd9a4334a6f75f90f6edfd6ba1e1d2fc8f6c1f43978e3b53f9762f33164b37cce2753e104bd1f42e4e5e3a4541d0735f728e01 WHIRLPOOL 2d4ae084c45e7b3a7a2d4065ef434e8c204d6a1d87c0bebebcfb95d9e50daf66ea3f0a0ce997d98ae4d0e8170eb59d6b2ddb982935d504c783163e7a6326837a
 MISC metadata.xml 429 SHA256 96573a14116289bfab7c689a1c3919b4047bb2c6eb4fa0c3790f3ed08c4209a4 SHA512 4297a7fcb833b905f91b6325b6cdaa85af9350922348874ef110e67cbccf1c301221849b12abd580fe90fa32c7b2b9a71ded651221544a3430a07503daa47434 WHIRLPOOL f352b7d01ff74a58805af2a7aeb0df4fd41f4d7f320aae3258fad1edf82cd7d68da435533f140227d868049fd71147172b57141e2a0f713f9fe6455ea8376ae5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTXpPIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOXWsP/3PJBrNbtdq5VAO8PCMYz74v
-dfIMYQ178wlpfCTZ0ONZb1yLivKVkKVBCtgbnbehmbR2rPAjNt0T8jHnP0RMgNA6
-DCcr8frEVpmp3ISQv+64bmUPZWd3k+KRW0SC/GFBsqT1Vt2pV5yuYbcEF4Hz6dBQ
-yNznNR1EoiQb7/ks0M0z9N/k6GdJ0ZTptBzDmohia9MFKbF7Yvfmli6G7k86K/1I
-2bSj78gE0nePyOZbhCu0eNWqvLNqWJ6DBLebKDn6kocFBHi0XYZadm3JOycZKozi
-6FJpeRs/EBSzO/wvmVfmTf1xTBHysqyDyZMQkl8FSmybtyKt6dnTp0dRdvMh0KpV
-YYzpcytEY5gZeKSzVun3aivOZRR2odbUc6BhTFgMbqk3briBjDgIPXIPZkSMUtaZ
-8bDPnL0YfiLRGdLqV0mP5+w7LakC+W+D/B/pNcfPLF9D32HRCpjTzvNK2uneTzgI
-vKoDkCYlHrT7czoj3lzVJJ9mUQshLuzbH3MESq38PXalVgpkjFlo2wR77TuW7ETS
-RGPHkNMSLORhWzbrgfvZ5FZAYPMQSA1EOi0xJgk6osBSYso1Ws23vilr6dfg456S
-R+cQGvdJEFvU8zd3ymJl7vzN8OVIxfLaAIB1Hb+2A/tzsvdG8tYq+CA3ZRW63UaL
-uuh5Q33IyRBs/QettkDy
-=5con
+iQIcBAEBCAAGBQJUkImcAAoJEE8aJVXqcZkdEQoQAL+gfuXgBxDMrw71gc3P0IJ1
+aK9ud+rI00ICPFSJEz44umdJuz8SK28tM7XJdfY1NFZAKpAlvnHu++y9BC6JKOMz
+KIxeDkmcmfeV0law7nGZUwWyovVkeX3k1zI74C8vEtVw67NeOA7a3zpUm1nfmzw9
+1+BMDsMNaRITQ4xU2eF3RysVG3/XYrKfNGy2KokcSdKgO4r2Rn3h1FSFYpQRtqSJ
+gimUoQ52EzgwSjYPtcAd7NVNuE9KrJ+gpNyBcjLyojS0pqbmxtYjmFXyLbeg98zS
+5A8vQA4bty7nY2V1efpGAhiEqohU1suHqpuqaYg2IINcOaM9WI4DQE0tV5DWO9WN
+5l9PoNcKgrHo9eGiXQKCMFdRMtg4ePuOkLBo85FWb/QTgDVHJbnIwYSG36/sm9kr
+CnUDloVP8zBKDYNtuVtB7nk7ErTGptHavQxtUt1x3mOrMFXFh9HfdeztBnZQg7vq
+4otP/0xJvs+BvKOVYKEh5WGrrFD3VNkXqnqtKfD7HHOlJS367vV3s7/lM+gcyIiy
+SvUcNxcWDbmoLTb83Fy7/o13ljoBVUqjopxMJi1BmM3yCKDv7FnMY8qVy18r60AT
+ee6KMjGdhyI5wpjueiy6SbELhRxsZeJ1e6NEpelWWLoY++uNrY4USvMmhRxPYcDO
+95PCCPUSvijIcoIJLOvz
+=ttSF
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libwebp/libwebp-0.4.2.ebuild b/media-libs/libwebp/libwebp-0.4.2.ebuild
new file mode 100644
index 000000000000..ac3fd7298199
--- /dev/null
+++ b/media-libs/libwebp/libwebp-0.4.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwebp/libwebp-0.4.2.ebuild,v 1.1 2014/12/16 19:35:49 phajdan.jr Exp $
+
+EAPI=5
+inherit eutils libtool multilib-minimal
+
+DESCRIPTION="A lossy image compression format"
+HOMEPAGE="http://code.google.com/p/webp/"
+SRC_URI="http://downloads.webmproject.org/releases/webp/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/5" # subslot = libwebp soname version
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~m68k-mint"
+IUSE="experimental gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
+
+# TODO: dev-lang/swig bindings in swig/ subdirectory
+RDEPEND="gif? ( media-libs/giflib:= )
+	jpeg? ( virtual/jpeg:0= )
+	opengl? (
+		media-libs/freeglut
+		virtual/opengl
+		)
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0= )"
+DEPEND="${RDEPEND}"
+
+ECONF_SOURCE=${S}
+
+src_prepare() {
+	# This is conflicting with `usex` later on, upstream is using ac_cv_ wrong
+	# If modifying configure.ac, eautoreconf is required because of "Maintainer mode"
+	sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure || die
+
+	# Fix libtool relinking, bug 499270.
+	elibtoolize
+}
+
+multilib_src_configure() {
+	# Only used for gif2webp binary wrt #486646
+	local build_gif2webp=$(usex gif)
+	multilib_is_native_abi || build_gif2webp=no
+
+	ac_cv_header_gif_lib_h=${build_gif2webp} \
+	ac_cv_header_jpeglib_h=$(usex jpeg) \
+	ac_cv_header_png_h=$(usex png) \
+	ac_cv_header_GL_glut_h=$(usex opengl) \
+	ac_cv_header_tiffio_h=$(usex tiff) \
+		econf \
+			$(use_enable static-libs static) \
+			$(use_enable swap-16bit-csp) \
+			$(use_enable experimental) \
+			--enable-libwebpmux \
+			--enable-libwebpdemux \
+			--enable-libwebpdecoder
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+	dodoc AUTHORS ChangeLog doc/*.txt NEWS README{,.mux}
+}