media-libs/mesa: allow USE=libressl too for sha1 funcs #591246

diff --git a/media-libs/mesa/mesa-13.0.0.ebuild b/media-libs/mesa/mesa-13.0.0.ebuild
index f7e39297e11b02f4ac502aacb31bcc616b1142ce..74b4cf7fa9062d285b4c1391d64a48a449a4922a 100644 (file)
--- a/media-libs/mesa/mesa-13.0.0.ebuild
+++ b/media-libs/mesa/mesa-13.0.0.ebuild
@@ -44,11 +44,11 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
        bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gcrypt gles1 gles2
-       +llvm nettle +nptl opencl osmesa pax_kernel openmax +openssl pic selinux
-       vaapi valgrind vdpau wayland xvmc xa kernel_FreeBSD"
+       libressl +llvm nettle +nptl opencl osmesa pax_kernel openmax +openssl pic
+       selinux vaapi valgrind vdpau wayland xvmc xa kernel_FreeBSD"
 
 REQUIRED_USE="
-       || ( gcrypt nettle openssl )
+       || ( gcrypt libressl nettle openssl )
        d3d9?   ( dri3 gallium )
        llvm?   ( gallium )
        opencl? ( gallium llvm )
@@ -104,7 +104,10 @@ RDEPEND="
        nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] )
        !nettle? (
                gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
-               !gcrypt? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+               !gcrypt? (
+                       libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+                       !libressl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+               )
        )
        opencl? (
                                app-eselect/eselect-opencl

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index f7e39297e11b02f4ac502aacb31bcc616b1142ce..74b4cf7fa9062d285b4c1391d64a48a449a4922a 100644 (file)
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -44,11 +44,11 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
        bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gcrypt gles1 gles2
-       +llvm nettle +nptl opencl osmesa pax_kernel openmax +openssl pic selinux
-       vaapi valgrind vdpau wayland xvmc xa kernel_FreeBSD"
+       libressl +llvm nettle +nptl opencl osmesa pax_kernel openmax +openssl pic
+       selinux vaapi valgrind vdpau wayland xvmc xa kernel_FreeBSD"
 
 REQUIRED_USE="
-       || ( gcrypt nettle openssl )
+       || ( gcrypt libressl nettle openssl )
        d3d9?   ( dri3 gallium )
        llvm?   ( gallium )
        opencl? ( gallium llvm )
@@ -104,7 +104,10 @@ RDEPEND="
        nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] )
        !nettle? (
                gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
-               !gcrypt? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+               !gcrypt? (
+                       libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+                       !libressl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+               )
        )
        opencl? (
                                app-eselect/eselect-opencl

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index f53e36d6e90a9de1e940fa5769f29c0b027bcf3d..ab07f8bae6e37e6ea42db68633b3fab7e8a351dc 100644 (file)
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -16,6 +16,7 @@
                <flag name="gbm">Enable the Graphics Buffer Manager for EGL on KMS.</flag>
                <flag name="gles1">Enable GLESv1 support.</flag>
                <flag name="gles2">Enable GLESv2 support.</flag>
+               <flag name="libressl">Use <pkg>dev-libs/libressl</pkg> for low level sha1 utility functions.</flag>
                <flag name="llvm">Enable LLVM backend for Gallium3D.</flag>
                <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for low level sha1 utility functions.</flag>
                <flag name="opencl">Enable the Clover Gallium OpenCL state tracker.</flag>