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

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

3 files changed, 71 insertions, 2 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/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>