Add USE=webp to control the libvpx dep #541854 by Anthony Parsons.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog
index 717e372385c9f904b5395a8927c504f78e5a4b3f..5ad1763449afdcbacad2aa16e077bd5699b469f5 100644 (file)
--- a/media-libs/gd/ChangeLog
+++ b/media-libs/gd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/gd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.105 2015/02/28 22:27:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.106 2015/03/07 20:09:49 vapier Exp $
+
+  07 Mar 2015; Mike Frysinger <vapier@gentoo.org> gd-2.1.1.ebuild, metadata.xml:
+  Add USE=webp to control the libvpx dep #541854 by Anthony Parsons.
 
   28 Feb 2015; Mike Frysinger <vapier@gentoo.org> +files/gd-2.1.1-headers.patch,
   gd-2.1.1.ebuild:

diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 0a124f543e23d509e70a5d51d5d756afe5406634..27baa381caed2f86f56f96f9f47a3e65be7bb458 100644 (file)
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -10,23 +10,23 @@ DIST gd-2.0.35.tar.bz2 1212730 SHA256 bf222490749d2a9a9ac3593b01eb55aed98461ff81
 DIST libgd-2.1.1.tar.xz 2039132 SHA256 9ada1ed45594abc998ebc942cef12b032fbad672e73efc22bc9ff54f5df2b285 SHA512 48f444402a4b89e412870f9091b92eb26136c5c0d795722262ad973c7d4103476204a2de36133a2634b8f410d6bccdcf60afb829a74ac2fddfb96aff2cd2567b WHIRLPOOL a38cf1f060db35d247b54038e731484e6230cd8a9da263a8c4823aaf6b3ce455c0747bbbde60f131d85a48340e39a5c8d6273fa51366cbe2436530520211a238
 EBUILD gd-2.0.35-r3.ebuild 2178 SHA256 ed123dac454522595faf717457793cab4b5ded7fb461612c0833863bef2313c9 SHA512 179fcb75f4d62e3b6fa025d5ed660698bf677628cd6f14b28a9626f3f79bb3afb18ac60765e46e8a07cc9c149d7c63583ada89bc14bc7cf0b4ef109262614432 WHIRLPOOL 0d419bf2fdd0e00a38d95079eeda90f4300a59f21cfaa2efa766d56a1545acbf81838937d7aabd520108bbf9e5db57f0e28330d3d903372bafad1a73b52a7e1d
 EBUILD gd-2.0.35-r4.ebuild 3570 SHA256 2d004afb35d3c7b26a5dd7f23a5e8b9a25ff494531000e30b1a903ff59e94f8b SHA512 40b771ea46c64115069c84a04dfc027213230c4b97d2ed19331b1fd96efbaaae94ff2b5b16f2ffcb63c141baa60daf04cf48c3981b02e4c1f95fc944a83bc14a WHIRLPOOL d98f99188adc915b6adb251e751be80fb9d1ef7de4d2c680f83f5ee3add25b2b412a9dd46d4f2575446adc9738d0cd711259b572e183d51995c4d5fc6f284624
-EBUILD gd-2.1.1.ebuild 1949 SHA256 eb8325fb01d4a683ac41ef2ae3064df670955115be6df571f335a9241190efc4 SHA512 a3ff81f149930cd96f3fa380832190eb3d1741cf05365cdd1b3badfc698510fbbb4d4f291f58d6ca778ded4f88b5d37d601d0c6f50013c046183dc7c0940ab4b WHIRLPOOL 1faff2a7e745a51d7d794540bc4738c8e60f90ee16efc435426977a3b3639712ece8fd8eb609cd2603d7f6e68900a7b1fb3c89c26fe13c69bb1e5d6512be479b
-MISC ChangeLog 19227 SHA256 2a9b20e620bf954da13e59108073ddff3f35d5ba79905b656e157e6a25e79929 SHA512 4fed16264b45e06c3f9cb76fc06ba619c5c9efdca2761b33c925860eef37c9ba7f2880f6717274fda75892d574cd08ae22e16e9280cc8cfc104cad861c6246bd WHIRLPOOL d52efc764292b7beea3aac818dec24cfcdc9eb0745c71f03b8d714ab218c5a6c1f8ecb44f74f435f808c20bfa5918449fd757fe25096d59d7531e1f7e63ceb08
-MISC metadata.xml 1330 SHA256 253cffa200afc7de82c73b567f70983ad127a416ae260314be3b4bb168d19778 SHA512 b2860495af33074135f7180f02be67042b511848159ab8adfa94058ec4872cc895452f92722085ae181aaf81f31f356c4415d2297f5c9159b259f66ac0a474a8 WHIRLPOOL 3925dbb379f80fdcfe64730d0bf98b8ab517f66e94f1025493bb1057fda01a80b48876a9fd7f5af3b47511c399d64438ccea8a0b74ccfe1b372edd25cee2d531
+EBUILD gd-2.1.1.ebuild 2028 SHA256 63b49daf4716965e628d05312c099f76c4530918315fe0b530618ead240e506f SHA512 faff2b428245bdb3188606e400efcf8d9f589e7044b04fd5aced553272c9248cb5ab3f25b5182bfbe65390a0d230f105792fc209c398ecc336d440314eb55d75 WHIRLPOOL 435cc1d62c195c569419e0b55f4c809cecaa9116ba4bb84079aeba1002edf3429bb29877264b5e9888e0acf96808fd45de9e0f867f467f26ef1b7e5e51dc2cca
+MISC ChangeLog 19378 SHA256 2a5053ce6cef088d65ef5fd217dba9ef5f0d62fdcb763ca67807cd2cc5e78e5d SHA512 eadbc4fe3d533c6f501994e9e65c79cb7ee5c666493c661e6c4ae91a411a0738c119b4e5cf4d83cae3a497b4e47404b9679f405e2f8d7ea89192b798076346ad WHIRLPOOL 627d0b5ca2fc6c49f8c691ac9209e2d17b0a0c3df8d884e1cf841b5bb428c341a2a7a11a7d34c3952200efbe62e5288f8bb6b2b1cccaba8936f4d7c77381ce0d
+MISC metadata.xml 1404 SHA256 464820e152ab174b394ec5cb70eff4d25de5aeb9333a754ace4bed387b80a586 SHA512 c7740d681f3ba8d59da914002c61b9110a2050cf3b5c82ef68a765a2674ce2f2e5f11de9861ddba4ed13b888d072029c63fc9df2a59537ce2b4f2f7dfd4c0a9d WHIRLPOOL 5cbf925c5a258d8089c7601ee8050bdbc02bc423b55b36759a32d83d3476b042c1379bd7cf42a46e5273afb3c67e47aac7b28512cb20c9342b9de225cae19fe3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU8kC7AAoJEPGu1DbS6WIA920QAJfAXXNOcqZA6mMFpFj84TTS
-YIiIVvj822wn4krw2Ao4b33i4azutC+inABHRwbKGutVekhv0IeIBEtl72P8ZqcW
-Gc1zJjojhXQUNXwGs5SNqmkHBs4+CFQGwLFZA7TtlPvmalJ2FMTwJEIYo9vW5jwi
-CF2o64PogCf8FboqcOjv9IIvmgwSvZWUBdC4o4i2d3oBlEXXJjQg86Eji3kO+I8q
-tqt+gO2UF/fSMEhDe5pOaRbRF2m2ETDc4nm2/hwZjLRn+LVzfzRAiw69MZIwPxXp
-B+LUXFag0ZW60jDXnSfgTVrL1kd9VOA+5OpTpZph2Ho4jMgQTZYgzeKJ/22dgVYq
-Uv116B10pYVa2Xwj4KGvrC7TMFQP2Lrq/hvXRyV78pIPviJ+JPe64elnGl/YOvKM
-q88U57xML5RHOd+ooxucM8T0i4l6nbU22k1SVypw5H6LtKSsLfEFknIwIVvFeKvL
-VtXDwWLPVNE+0qYHZfSoNjY+4WsPMgdS1LcI/Ru9Jh3xt+0qxNI98BZkcKh8SxKV
-fRk9tq9qVC/20eMrOTarMp1JeZqc5F8MDXZg+ftZgK+nPair9NEjksjeYb9+zN2n
-ery1R4alFN/ZOa2cgCDJHazG/sT64azmFMOfH3JedmbfDaOgPWufMga/bwhbekVx
-H591SJaDRcYpYYHJE6DP
-=/JUb
+iQIcBAEBCAAGBQJU+1sPAAoJEPGu1DbS6WIAtQMQAJuKs0F+k/z1fPm579Twrk8F
+RqOkAs9m+XX6bD8Z4vEQf1NlstvxpYLztOvmotnrtDqRfmkLDwkkwKfJjPUOVcxz
+hShc0Q9jM/XYAaOxvZ2c4GYoOqS7BGdI21TGgnWMun3mDltXLGHmSm9PKRIXaIJ+
+qCoVmefdfXmZ/f4nQv+Q50/vYDXDhjWU5L99bhQNHMUFERH85kpzVCVtf7gECgBe
+CvgH9Yc8eImwqVoxhoG9KfgiIqWPUN+4pMXvGoVGzS/MgvzzGeEnTI0L2W7lboNC
+qlUn+H+/87m9D4yAkJwq76xGS98Wsj8wzke0xEO3o+kLSDaFhTWK95p/4+OgUNUl
+I8sRMcuSQiAeqPuOptszks5pVIw5iWWy7vkHrJiGsFIndzXt6FMGLMKX5+jYQAOK
+GT6rOHTYYZ5kBek5jeVJiMs7FUYCPQpcjz8AX1xdW+AEIcwhSSBpJ8pX81aE4VNh
+FVs/vtPYnDYS7kpiHry24AohZDabn0J+GNyy32IvqanvxB8LbM3Kt+zSCXpP+zOz
+yhSv8JSSHgxhsFzXh0fdwk2eB/18k8PAUmAsIgOm/1RXgRgUMmRds+XybPKxKMR5
+TkAHwagMObTExKbBXNvaDhYO+p8m6XjDc6RNy/e5bvodvvGGZBzmU3WE3A9MiLiz
+6AokhMj3poQDINArT1dS
+=G42c
 -----END PGP SIGNATURE-----

diff --git a/media-libs/gd/gd-2.1.1.ebuild b/media-libs/gd/gd-2.1.1.ebuild
index 6752014359aef9fd56a25f62b93d96615e48aeba..5a7ea2696f185a42c41d219e9bbc2645b207c8df 100644 (file)
--- a/media-libs/gd/gd-2.1.1.ebuild
+++ b/media-libs/gd/gd-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.1.1.ebuild,v 1.2 2015/02/28 22:27:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.1.1.ebuild,v 1.3 2015/03/07 20:09:49 vapier Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="https://bitbucket.org/libgd/gd-libgd/downloads/lib${P}.tar.xz"
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="fontconfig jpeg png static-libs truetype xpm zlib"
+IUSE="fontconfig jpeg png static-libs truetype webp xpm zlib"
 
 # fontconfig has prefixed font paths, details see bug #518970
 REQUIRED_USE="prefix? ( fontconfig )"
@@ -22,6 +22,7 @@ RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
        jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
        png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
        truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
+       webp? ( media-libs/libvpx[${MULTILIB_USEDEP}] )
        xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
        zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
@@ -45,6 +46,7 @@ multilib_src_configure() {
                $(use_with png) \
                $(use_with truetype freetype) \
                $(use_with jpeg) \
+               $(use_with webp vpx) \
                $(use_with xpm) \
                $(use_with zlib)
 }

diff --git a/media-libs/gd/metadata.xml b/media-libs/gd/metadata.xml
index addce1236910bf98e937f92503ca85885fd1c03b..96855a007ecb6babdc048e409f856aceadaf190b 100644 (file)
--- a/media-libs/gd/metadata.xml
+++ b/media-libs/gd/metadata.xml
@@ -27,4 +27,7 @@ and so forth.
        <remote-id type="github">libgd/libgd</remote-id>
        <bugs-to>https://github.com/libgd/libgd/issues</bugs-to>
 </upstream>
+<use>
+       <flag name='webp'>Enable support for the webp format</flag>
+</use>
 </pkgmetadata>