From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 116F1138827 for ; Fri, 2 Oct 2015 17:28:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 778CC21C02F; Fri, 2 Oct 2015 17:28:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0C14121C02F for ; Fri, 2 Oct 2015 17:28:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8C3BD3408F9 for ; Fri, 2 Oct 2015 17:28:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A279E279 for ; Fri, 2 Oct 2015 17:28:27 +0000 (UTC) From: "Julian Ospald" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Julian Ospald" Message-ID: <1443806894.a24b5173cbb13a9758116e38fb393a05740dff7f.hasufell@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/efl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/efl/efl-1.15.1-r1.ebuild dev-libs/efl/efl-9999.ebuild X-VCS-Directories: dev-libs/efl/ X-VCS-Committer: hasufell X-VCS-Committer-Name: Julian Ospald X-VCS-Revision: a24b5173cbb13a9758116e38fb393a05740dff7f X-VCS-Branch: master Date: Fri, 2 Oct 2015 17:28:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 901b8acb-5418-4883-a4ae-513f8030f003 X-Archives-Hash: 6e944fb03f6c5ce855dac7d0c2c147e2 commit: a24b5173cbb13a9758116e38fb393a05740dff7f Author: Julian Ospald gentoo org> AuthorDate: Fri Oct 2 17:23:05 2015 +0000 Commit: Julian Ospald gentoo 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