commit: a24b5173cbb13a9758116e38fb393a05740dff7f
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 2 17:23:05 2015 +0000
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Fri Oct 2 17:28:14 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a24b5173
dev-libs/efl: add libressl support
.../efl/{efl-9999.ebuild => efl-1.15.1-r1.ebuild} | 20 ++++++++++++++++++--
dev-libs/efl/efl-9999.ebuild | 9 +++++++--
2 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/dev-libs/efl/efl-9999.ebuild b/dev-libs/efl/efl-1.15.1-r1.ebuild
similarity index 90%
copy from dev-libs/efl/efl-9999.ebuild
copy to dev-libs/efl/efl-1.15.1-r1.ebuild
index 6bd8d26..d4c401b 100644
--- a/dev-libs/efl/efl-9999.ebuild
+++ b/dev-libs/efl/efl-1.15.1-r1.ebuild
@@ -23,7 +23,7 @@ inherit enlightenment
DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls
gstreamer harfbuzz +ico ibus jpeg2k neon oldlua opengl ssl physics pixman +png
+ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 valgrind
wayland webp X xim xine xpm"
+IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls
gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics
pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2
valgrind wayland webp X xim xine xpm"
REQUIRED_USE="
pulseaudio? ( sound )
@@ -48,7 +48,12 @@ RDEPEND="
gif? ( media-libs/giflib )
glib? ( dev-libs/glib:2 )
gnutls? ( net-libs/gnutls )
- !gnutls? ( ssl? ( dev-libs/openssl:0 ) )
+ !gnutls? (
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -158,6 +163,17 @@ DEPEND="
S=${WORKDIR}/${MY_P}
+src_prepare() {
+ # This is a hack of the upstream fix. Drop with next release. #551882
+ sed -i \
+ -e 's:SDL/:SDL2/:g' \
+ configure \
+ src/modules/evas/engines/gl_common/evas_gl_common.h \
+ src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h || die
+
+ enlightenment_src_prepare
+}
+
src_configure() {
if use ssl && use gnutls ; then
einfo "You enabled both USE=ssl and USE=gnutls, but only one
can be used;"
diff --git a/dev-libs/efl/efl-9999.ebuild b/dev-libs/efl/efl-9999.ebuild
index 6bd8d26..fcf0d81 100644
--- a/dev-libs/efl/efl-9999.ebuild
+++ b/dev-libs/efl/efl-9999.ebuild
@@ -23,7 +23,7 @@ inherit enlightenment
DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls
gstreamer harfbuzz +ico ibus jpeg2k neon oldlua opengl ssl physics pixman +png
+ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 valgrind
wayland webp X xim xine xpm"
+IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls
gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics
pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2
valgrind wayland webp X xim xine xpm"
REQUIRED_USE="
pulseaudio? ( sound )
@@ -48,7 +48,12 @@ RDEPEND="
gif? ( media-libs/giflib )
glib? ( dev-libs/glib:2 )
gnutls? ( net-libs/gnutls )
- !gnutls? ( ssl? ( dev-libs/openssl:0 ) )
+ !gnutls? (
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
