Version bump (bug #496778). Add subslot and chromium herd to metadata.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 83 insertions, 8 deletions

diff --git a/media-libs/libwebp/ChangeLog b/media-libs/libwebp/ChangeLog
index 1ef96eee6447..da8c691c2903 100644
--- a/media-libs/libwebp/ChangeLog
+++ b/media-libs/libwebp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libwebp
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libwebp/ChangeLog,v 1.64 2013/10/21 12:26:38 grobian Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwebp/ChangeLog,v 1.65 2014/01/02 21:47:54 radhermit Exp $
+
+*libwebp-0.4.0 (02 Jan 2014)
+
+  02 Jan 2014; Tim Harder <radhermit@gentoo.org> +libwebp-0.4.0.ebuild,
+  metadata.xml:
+  Version bump (bug #496778). Add subslot and chromium herd to metadata.
 
   21 Oct 2013; Fabian Groffen <grobian@gentoo.org> libwebp-0.3.1.ebuild:
   Marked ~x64-macos, bug #486818
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 4af208ceccfe..3501ebcaadc4 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -4,15 +4,21 @@ Hash: SHA256
 DIST libwebp-0.2.1.tar.gz 705230 SHA256 894e08b8b0043cf007cc1ca893f33d73784565a6e64b0e7aefb201a687392314 SHA512 fffaf0f81d6062b68443ffa30412384bc914cd032d11f5ad9e1dcd56c3a04bf40a56649bcc422f7496ef75a200952aacb20e6fb38f8313be6f5d53720f9e85fd WHIRLPOOL 081d57d49dc470bd5c19856ede00e49eab23a8db182c5145b336e79d838ced950c57a7c47aa532fb2fd5d55a79b10bee1290484917e0cd98dd812ce33a93c15b
 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
 EBUILD libwebp-0.2.1.ebuild 879 SHA256 7f6621ba4d35316f2d5a32212f92922c736df9ec1e6bc86af75d6e9ce008ebac SHA512 4c253f18da163e2fd23724eb07426cd876dc2bf18ccc9088ec69fd94f9034da3bf2c111f21319bfa65b0567e84d2dfe89713bd61cc4ca20065e51251dd76bb6c WHIRLPOOL 11880d06fe2df7785e3b203296e49e515999ca4cda55a60ed63a8505870efcd310725d67e58e74fd003138865b9c70fe80fda27b3329656c76f35c2911e7692c
 EBUILD libwebp-0.3.0.ebuild 1300 SHA256 4c0c8050061bb588909076e7dfd153bbaf46e9ede8d2317d07de75854f58e38d SHA512 0f7b028a2d9b9c099d192db8e0fa9d02a9f7d6c72adf93e159a72fcabc6371c20721c9829aff2f7aee56728f2aa6605b0014758773a1263941c540e6c81c6fb1 WHIRLPOOL 2bc5d355c84f7b1a1839c0e1759ff80150aa464905c32dbf32357a1fd4b009df92813addfbb7b0210b46b1ea1b6d76dde063bbd8c33e7dce9873c952a0700108
 EBUILD libwebp-0.3.1.ebuild 1841 SHA256 6988569dae280777789935d6978e265c75b17353798f100ea9bb3419a1182554 SHA512 e61d9bfe5b017069611f133e2af3609382f17416ee7b493f05ee3caa2d192634efeb6c022fcc58b5d06f1b3c74427315b337d74fae4d58679eb358f8bfc0e6bb WHIRLPOOL 442727719cc8f9733a9ac5f67ec38e759a3361b461998fa264481c86dc9e4f0dbaa526897d449ed524a1738771d96201e0b9ab4f9a0e80fa6683f170aa403fbe
-MISC ChangeLog 7523 SHA256 57d245d134fac2b5ff318639bc9dac788de97c2ccf88d5655ed2646971aaed22 SHA512 4edfb2b7fc09dda463bfaa273ddb79fb7fc8f32eea8ade590a5e87d7e2b6d9aa5fa1d3448fae4a5b6d29385bf47d87b433c7323a861ddc76cea038118c08a2b8 WHIRLPOOL efc0ac8d3889df88bc7583ab5cca48f20132b0a9e726f5a2caf01b1dbc7ca56fc7e0486af7ce8eb4650e360ea46e0f8d9a3bac2c350082db2e03ff25dba744dd
-MISC metadata.xml 406 SHA256 79e05fc0114b873db59f6a7fe6722da504bb35fc7bdac18ca59ebbc44ab375fc SHA512 0db9a2d63fc3f483bb04d6eee947d326cc070368b3821ee025786da94f3cd965f10bd42e9434cd133fcab15291ec9fcc331a844ef4a42f89cc1e84ea0680cd36 WHIRLPOOL 40eb1f67cada43a2179b4e71605ac3fc613b3c428303fe030600326086b1a81ceaf824a5fe2267a3a33561b4dbd5d6e3e2d7d7daf804332dc1d868cdffd9c4d6
+EBUILD libwebp-0.4.0.ebuild 1888 SHA256 9b3b47651539427e2dda322afa9b47ac950140dad2c57fa56dacc8e6a50cc92d SHA512 71420a6ca90527d2a06987db1695173895f9520b7096b30cbc1b148c7d58dfe002d711358da04212a57313992ce85a92ac47faa1ee6d979f0b1708712777b1d9 WHIRLPOOL 09ae1fb6e503cef7144247bcf4b492b3d978789a2e3e4ea73dca54a19065cc98a336b15f55f745ff6fd2c317926daf15a6e88fe239c50dced54bbdab95e8ad02
+MISC ChangeLog 7717 SHA256 54a7d664b25a74a0f9879e70d316e9ec412fa7d1e77d8bca71b7d960d3614d7c SHA512 e68ec1d68f97ad85e995ac07b08401e6f0456c161bd1da344af84ca7ca7df7afa7a3e9496b96d553b4218332786d33df2231bdc007f29656cdc002a550ca0c7b WHIRLPOOL 0850c6f1466f38815d7d1c8e69a517c41a0bbc979b031096761b860f6b7e4cab1dcdf2bb9fe7f4c3430529ae61809d230dabde561d55272a674dbffea6e456a0
+MISC metadata.xml 429 SHA256 96573a14116289bfab7c689a1c3919b4047bb2c6eb4fa0c3790f3ed08c4209a4 SHA512 4297a7fcb833b905f91b6325b6cdaa85af9350922348874ef110e67cbccf1c301221849b12abd580fe90fa32c7b2b9a71ded651221544a3430a07503daa47434 WHIRLPOOL f352b7d01ff74a58805af2a7aeb0df4fd41f4d7f320aae3258fad1edf82cd7d68da435533f140227d868049fd71147172b57141e2a0f713f9fe6455ea8376ae5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (SunOS)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJlHX8ACgkQX3X2B8XHTol57QCfYUnX/MQV266e2NJ1fg7eRnLF
-XQ8AoJA9/KbkXykc8wn8rIXshZKAuwZM
-=z0rO
+iQEcBAEBCAAGBQJSxd6NAAoJEEqz6FtPBkyjVSgH/2m81GrjNkyUMCYWKGihGTBJ
+86K6Fjj0waRlAveYYg2lQy2JhkAQko/TtODggtjWIRewgRSWCTgz+rqtKMnJv7Ni
+yMwjOq54ni3AYsVbAKXGdU1vjzSl/GmecLpDEKM/XxkAgFsr9yGYP/ywMIcckzi+
+7ViIM6gsU7xl0hb6RoAi6ZSL5PZkuvl6uhyebbPazWB3PSRLfgrjXdrK8RnLyZ9w
+iulRlNhD1pWnMXArToAwjLDnC4GNC/TUIDTQV7hy6dzervQhKerkWmRbNouk2lms
+777gM+utGSr/5dDm7ZHtY7ncAWLl04H6Lku0lm0rM7bSqpNEQIzv84hUl6yOQHA=
+=Atxq
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libwebp/libwebp-0.4.0.ebuild b/media-libs/libwebp/libwebp-0.4.0.ebuild
new file mode 100644
index 000000000000..d738b5de9a31
--- /dev/null
+++ b/media-libs/libwebp/libwebp-0.4.0.ebuild
@@ -0,0 +1,62 @@
+# 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.0.ebuild,v 1.1 2014/01/02 21:47:54 radhermit Exp $
+
+EAPI=5
+inherit eutils multilib-minimal
+
+DESCRIPTION="A lossy image compression format"
+HOMEPAGE="http://code.google.com/p/webp/"
+SRC_URI="http://webp.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/5" # subslot = libwebp soname version
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+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
+}
+
+multilib_src_configure() {
+	# Only used for gif2webp binary wrt #486646
+	local build_gif2webp=$(usex gif)
+	multilib_build_binaries || 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}
+}
diff --git a/media-libs/libwebp/metadata.xml b/media-libs/libwebp/metadata.xml
index d7dbe98f74e6..1e4704acadf5 100644
--- a/media-libs/libwebp/metadata.xml
+++ b/media-libs/libwebp/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>graphics</herd>
+	<herd>chromium</herd>
 	<use>
 		<flag name='experimental'>Build with -DWEBP_EXPERIMENTAL_FEATURES</flag>
 		<flag name='swap-16bit-csp'>Enable byte swapping for 16 bit colorspace</flag>