| 1 |
commit: a24b5173cbb13a9758116e38fb393a05740dff7f |
| 2 |
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 2 17:23:05 2015 +0000 |
| 4 |
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 2 17:28:14 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a24b5173 |
| 7 |
|
| 8 |
dev-libs/efl: add libressl support |
| 9 |
|
| 10 |
.../efl/{efl-9999.ebuild => efl-1.15.1-r1.ebuild} | 20 ++++++++++++++++++-- |
| 11 |
dev-libs/efl/efl-9999.ebuild | 9 +++++++-- |
| 12 |
2 files changed, 25 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/dev-libs/efl/efl-9999.ebuild b/dev-libs/efl/efl-1.15.1-r1.ebuild |
| 15 |
similarity index 90% |
| 16 |
copy from dev-libs/efl/efl-9999.ebuild |
| 17 |
copy to dev-libs/efl/efl-1.15.1-r1.ebuild |
| 18 |
index 6bd8d26..d4c401b 100644 |
| 19 |
--- a/dev-libs/efl/efl-9999.ebuild |
| 20 |
+++ b/dev-libs/efl/efl-1.15.1-r1.ebuild |
| 21 |
@@ -23,7 +23,7 @@ inherit enlightenment |
| 22 |
DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" |
| 23 |
|
| 24 |
LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" |
| 25 |
-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" |
| 26 |
+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" |
| 27 |
|
| 28 |
REQUIRED_USE=" |
| 29 |
pulseaudio? ( sound ) |
| 30 |
@@ -48,7 +48,12 @@ RDEPEND=" |
| 31 |
gif? ( media-libs/giflib ) |
| 32 |
glib? ( dev-libs/glib:2 ) |
| 33 |
gnutls? ( net-libs/gnutls ) |
| 34 |
- !gnutls? ( ssl? ( dev-libs/openssl:0 ) ) |
| 35 |
+ !gnutls? ( |
| 36 |
+ ssl? ( |
| 37 |
+ !libressl? ( dev-libs/openssl:0 ) |
| 38 |
+ libressl? ( dev-libs/libressl ) |
| 39 |
+ ) |
| 40 |
+ ) |
| 41 |
gstreamer? ( |
| 42 |
media-libs/gstreamer:1.0 |
| 43 |
media-libs/gst-plugins-base:1.0 |
| 44 |
@@ -158,6 +163,17 @@ DEPEND=" |
| 45 |
|
| 46 |
S=${WORKDIR}/${MY_P} |
| 47 |
|
| 48 |
+src_prepare() { |
| 49 |
+ # This is a hack of the upstream fix. Drop with next release. #551882 |
| 50 |
+ sed -i \ |
| 51 |
+ -e 's:SDL/:SDL2/:g' \ |
| 52 |
+ configure \ |
| 53 |
+ src/modules/evas/engines/gl_common/evas_gl_common.h \ |
| 54 |
+ src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h || die |
| 55 |
+ |
| 56 |
+ enlightenment_src_prepare |
| 57 |
+} |
| 58 |
+ |
| 59 |
src_configure() { |
| 60 |
if use ssl && use gnutls ; then |
| 61 |
einfo "You enabled both USE=ssl and USE=gnutls, but only one can be used;" |
| 62 |
|
| 63 |
diff --git a/dev-libs/efl/efl-9999.ebuild b/dev-libs/efl/efl-9999.ebuild |
| 64 |
index 6bd8d26..fcf0d81 100644 |
| 65 |
--- a/dev-libs/efl/efl-9999.ebuild |
| 66 |
+++ b/dev-libs/efl/efl-9999.ebuild |
| 67 |
@@ -23,7 +23,7 @@ inherit enlightenment |
| 68 |
DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" |
| 69 |
|
| 70 |
LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" |
| 71 |
-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" |
| 72 |
+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" |
| 73 |
|
| 74 |
REQUIRED_USE=" |
| 75 |
pulseaudio? ( sound ) |
| 76 |
@@ -48,7 +48,12 @@ RDEPEND=" |
| 77 |
gif? ( media-libs/giflib ) |
| 78 |
glib? ( dev-libs/glib:2 ) |
| 79 |
gnutls? ( net-libs/gnutls ) |
| 80 |
- !gnutls? ( ssl? ( dev-libs/openssl:0 ) ) |
| 81 |
+ !gnutls? ( |
| 82 |
+ ssl? ( |
| 83 |
+ !libressl? ( dev-libs/openssl:0 ) |
| 84 |
+ libressl? ( dev-libs/libressl ) |
| 85 |
+ ) |
| 86 |
+ ) |
| 87 |
gstreamer? ( |
| 88 |
media-libs/gstreamer:1.0 |
| 89 |
media-libs/gst-plugins-base:1.0 |
Archives