dev-lang/php: new revision of the 7.x series to fix our webp support.

In the 5.x series, libvpx was used to provide webp support to the gd
library. It was pulled in with USE=vpx. In php-7.x, however, libvpx
has been replaced with libwebp. The old USE=vpx flag no longer worked,
so it has been replaced with USE=webp and eveything updated to use
that for php-7.x.

Package-Manager: portage-2.2.28

diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index d28192d6011debe9cdca5db93332ff2f2429d502..66ecbe7d4a77c7c15b0f9d2725a84446fd922f82 100644 (file)
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -25,7 +25,8 @@
                <flag name="xmlreader">Enable XMLReader support</flag>
                <flag name="xmlwriter">Enable XMLWriter support</flag>
                <flag name="xslt">Enable the XSL extension</flag>
-               <flag name="vpx">Enable webp suppoprt for GD</flag>
+               <flag name="vpx">Enable webp support for GD in php-5.x</flag>
+               <flag name="webp">Enable webp support for GD in php-7.x</flag>
                <flag name="zip">Enable ZIP file support</flag>
        </use>
 </pkgmetadata>

diff --git a/dev-lang/php/php-7.0.7.ebuild b/dev-lang/php/php-7.0.7-r1.ebuild
similarity index 99%
rename from dev-lang/php/php-7.0.7.ebuild
rename to dev-lang/php/php-7.0.7-r1.ebuild
index 92b65071532e8d6e2a3c9abf8a578f5f2b9d601c..a4bf49a827439011c26836e0126590a699541c7f 100644 (file)
--- a/dev-lang/php/php-7.0.7.ebuild
+++ b/dev-lang/php/php-7.0.7-r1.ebuild
@@ -72,7 +72,7 @@ IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
        oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
        readline recode selinux +session sharedmem
        +simplexml snmp soap sockets spell sqlite ssl
-       sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+       sysvipc systemd tidy +tokenizer truetype unicode wddx webp
        +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
 
 DEPEND="
@@ -143,8 +143,8 @@ DEPEND="${DEPEND}
                        virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
        )
        unicode? ( dev-libs/oniguruma )
-       vpx? ( media-libs/libvpx )
        wddx? ( >=dev-libs/libxml2-2.6.8 )
+       webp? ( media-libs/libwebp )
        xml? ( >=dev-libs/libxml2-2.6.8 )
        xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
        xmlreader? ( >=dev-libs/libxml2-2.6.8 )
@@ -166,7 +166,7 @@ php="=${CATEGORY}/${PF}"
 REQUIRED_USE="
        cli? ( ^^ ( readline libedit ) )
        truetype? ( gd )
-       vpx? ( gd )
+       webp? ( gd )
        cjk? ( gd )
        exif? ( gd )
 
@@ -421,8 +421,8 @@ src_configure() {
                $(use_with gd png-dir "${EPREFIX}/usr")
                $(use_with xpm xpm-dir "${EPREFIX}/usr")
        )
-       if use vpx; then
-               our_conf+=( --with-vpx-dir="${EPREFIX}/usr" )
+       if use webp; then
+               our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
        fi
        # enable gd last, so configure can pick up the previous settings
        our_conf+=( $(use_with gd gd) )