gentoo auto-resync : 17:03:2024 - 12:49:11

4 files changed, 0 insertions, 551 deletions

diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index c2feb9c1b483..2645fc637fec 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,7 +1,3 @@
-AUX efl-1.26.3-gettext-0.22-fix.patch 1200 BLAKE2B c86344e777e2da79164bde3bbb95f0e2896cafe1975423ecd9e16d41ec9380d5aeef666f151ba3e2eb14da7e11f8507db2ea577e152dc9f692c5b15d8dbff392 SHA512 2c32e1b0b85fa8d4f1a1a6628caceda15c7260428efddcc17601077879d4e0ca4c7f9e28bb12d3fa6983b0bcd0d64f75892e8abd02558d0569591acf538a669a
-AUX efl-1.26.3-libressl.patch 8420 BLAKE2B 637269f26888dd46f2f8faca3e63d3ccf69376f231c7f1b2423a7a1e2293eeeae569dfcb6d98dae77fe4005a74fea60c991ab622c79260f616b6e86442284cbd SHA512 10257eedd85b520b956f7e064bf596d6c31cbb7d6200c7396498b7a3d087a4b4f366a54bff06cfe5aacf8454163e2e5c803b82ed5cdaad01b3d5912773ee4e6c
-DIST efl-1.26.3.tar.xz 168540684 BLAKE2B aeb0215b9cdce9ca10550c698df4985ff9557c3c400c3a300887148d04a8900f04c7200473e5fce1d3021378be1e664e9364d171ec09c4fc488b4ec758722ea5 SHA512 9801ee8bc963786962d87af56d532d3f019bc18a91924d2ef84934dcd0ae30452d858db93c33964f2bff9af2f3c8feb9927f7281ead4a8993ed622cd0cf2c514
 DIST efl-1.27.0.tar.xz 168543208 BLAKE2B 082f7089f1a017db8e62f36fb2a51e18c7d00b74b8e865a60d066e49921c69720101deb3184a125633a6c646e241b8765cccc038c906c00d4ca16ecb705faf6f SHA512 5dda2f630463a2504d9246be17449579bbc470904e137b02b3b5c44db033dec2688f6c477885de1485944d875ee62619b6e7c5d4d3657225951f6feaf83b4fa4
-EBUILD efl-1.26.3-r2.ebuild 8469 BLAKE2B 443e6b4b06a3315d12763b49779daa6014734be215c6ee11bf048e67d360b17f0f480c66ef37d5d8b9993dff4befe7d0851b638cd147fbed6f5eb97d7c094c77 SHA512 55b27b1780e7b446a796b25cc5b8d0e78dddd34f027a3c2429d9e37e086f62ac1fba56872435923f2130e0474c342b98d94517901d59e7e2aca5fcfdfaec3253
 EBUILD efl-1.27.0.ebuild 8064 BLAKE2B 2f0c51ae8e8b6d49639a622bb85b16d4628f605bd83e842c5a497e5ede4e006845f68fb083a0cddd81fe8e360b60cc3d768852847b7ba63e2e4634b6e27fd6da SHA512 aa3e223fb43863a40144bb9a4a271583c56ebf10c55a70b48315281f8e7e013f7df268fbaa5fc2e71a012cc986e79a03d5be52c085e97926f0be4443264edc01
 MISC metadata.xml 1835 BLAKE2B 9057e58727f82d085606315896cca8f37f81fc9642cb3d40fed53f07ae09bedfd6d1d1a23878bca9e7e2713314d83c26dcfbf305557cfdfbeeeb01bfb73b2867 SHA512 ac1d09983c4f6e992dd92cc6aa4770a6a847be3a4f5b4236867d411f5c730e8b743574864b948301782eedd72e78dfdd6e7a4deeffd4a09f2f52f958e9a1e6c7
diff --git a/dev-libs/efl/efl-1.26.3-r2.ebuild b/dev-libs/efl/efl-1.26.3-r2.ebuild
deleted file mode 100644
index cce88319b526..000000000000
--- a/dev-libs/efl/efl-1.26.3-r2.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DOCS_BUILDER="doxygen"
-DOCS_DEPEND="dev-texlive/texlive-fontutils"
-DOCS_DIR="${S}/doc"
-
-LUA_REQ_USE="deprecated(+)"
-LUA_COMPAT=( lua5-{1,2} luajit )
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit docs lua-single meson python-any-r1 xdg
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
-IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one elogind examples fbcon
-	+fontconfig fribidi gif gnutls glib +gstreamer harfbuzz heif hyphen ibus ico
-	jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim
-	sdl +sound +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf
-	xim xpm xpresent zeroconf"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	?? ( elogind systemd )
-	?? ( fbcon tslib )
-	drm? ( wayland )
-	examples? ( eet svg )
-	ibus? ( glib )
-	opengl? ( X )
-	pulseaudio? ( sound )
-	xim? ( X )
-	xpresent? ( X )"
-
-# Requires everything to be enabled unconditionally.
-RESTRICT="test"
-
-RDEPEND="${LUA_DEPS}
-	!x11-themes/e-flat-theme
-	dev-libs/libinput:=
-	net-misc/curl
-	media-libs/giflib:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	sys-apps/dbus
-	sys-libs/zlib
-	X? (
-		!opengl? ( media-libs/mesa[egl(+),gles2] )
-		media-libs/freetype
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-		x11-libs/libXcomposite
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libxkbcommon
-		wayland? ( x11-libs/libxkbcommon[X] )
-	)
-	avif? ( media-libs/libavif:= )
-	connman? ( net-misc/connman )
-	drm? (
-		dev-libs/libinput:=
-		dev-libs/wayland
-		media-libs/mesa[gbm(+)]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon
-	)
-	elogind? (
-		sys-auth/elogind
-		virtual/libudev:=
-	)
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	glib? ( dev-libs/glib:2 )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? ( dev-libs/openssl:0= )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	harfbuzz? ( media-libs/harfbuzz:= )
-	heif? ( media-libs/libheif:= )
-	hyphen? ( dev-libs/hyphen )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:= )
-	json? ( >=media-libs/rlottie-0.0.1_pre20200424:= )
-	mono? ( dev-lang/mono )
-	opengl? ( virtual/opengl )
-	pdf? ( app-text/poppler:=[cxx] )
-	physics? ( sci-physics/bullet:= )
-	postscript? ( app-text/libspectre )
-	pulseaudio? ( media-libs/libpulse )
-	raw? ( media-libs/libraw:= )
-	scim? ( app-i18n/scim )
-	sdl? ( media-libs/libsdl2 )
-	sound? ( media-libs/libsndfile )
-	svg? ( gnome-base/librsvg:2 )
-	system-lz4? ( app-arch/lz4:= )
-	systemd? ( sys-apps/systemd:= )
-	tiff? ( media-libs/tiff:= )
-	tslib? ( x11-libs/tslib:= )
-	unwind? ( sys-libs/libunwind:= )
-	v4l? ( media-libs/libv4l )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[gles2,wayland]
-		x11-libs/libxkbcommon
-	)
-	webp? ( media-libs/libwebp:= )
-	xpm? ( x11-libs/libXpm )
-	xpresent? ( x11-libs/libXpresent )
-	zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	wayland? ( dev-libs/wayland-protocols )"
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-	examples? ( sys-devel/gettext )
-	nls? ( sys-devel/gettext )
-	wayland? ( dev-util/wayland-scanner )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.26.3-libressl.patch #903001
-	"${FILESDIR}"/efl-1.26.3-gettext-0.22-fix.patch
-)
-
-pkg_setup() {
-	# Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so.
-	QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.${PV}
-		/usr/$(get_libdir)/libefreet_mime.so.${PV}"
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Remove automagic unwind configure option, #743154
-	if ! use unwind; then
-		sed -i "/config_h.set('HAVE_UNWIND/,/eina_ext_deps += unwind/d" src/lib/eina/meson.build ||
-			die "Failed to remove libunwind dep"
-	fi
-
-	# Fixup Doxyfile
-	pushd "${DOCS_DIR}" || die
-	cp Doxyfile.in Doxyfile || die
-	sed -i \
-		-e "s/@PACKAGE_VERSION@/${PV}/g" \
-		-e "s/@top_builddir@/../g" \
-		-e "s/@top_srcdir@/../g" \
-		-e "s/@srcdir@/./g" \
-		Doxyfile || die
-	popd || die
-
-	# Fix python shebangs for python-exec[-native-symlinks], #764086
-	local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
-	python_fix_shebang -q ${shebangs[*]}
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dbuildtype=plain
-
-		-D buffer=false
-		-D build-tests=false
-		-D cocoa=false
-		-D drm-deprecated=false
-		-D g-mainloop=false
-		-D mono-beta=false
-		-D dotnet=false
-		-D pixman=false
-		-D wl-deprecated=false
-		-D dotnet-stylecop-severity=Warning
-
-		-D edje-sound-and-video=true
-		-D eeze=true
-		-D input=true
-		-D install-eo-files=true
-		-D libmount=true
-		-D native-arch-optimization=true
-		-D xinput2=true
-		-D xinput22=true
-
-		$(meson_use X x11)
-		$(meson_use debug debug-threads)
-		$(meson_use drm)
-		$(meson_use examples build-examples)
-		$(meson_use fbcon fb)
-		$(meson_use fontconfig)
-		$(meson_use fribidi)
-		$(meson_use glib)
-		$(meson_use gstreamer)
-		$(meson_use harfbuzz)
-		$(meson_use hyphen)
-		$(meson_use lua_single_target_luajit elua)
-		$(meson_use nls)
-		$(meson_use physics)
-		$(meson_use pulseaudio)
-		$(meson_use sdl)
-		$(meson_use sound audio)
-		$(meson_use tslib)
-		$(meson_use v4l v4l2)
-		$(meson_use vnc vnc-server)
-		$(meson_use wayland wl)
-		$(meson_use xpresent)
-		$(meson_use zeroconf avahi)
-
-		$(meson_use !system-lz4 embedded-lz4)
-	)
-
-	if use elogind || use systemd; then
-		emesonargs+=( -D systemd=true )
-	else
-		emesonargs+=( -D systemd=false )
-	fi
-
-	if use wayland; then
-		emesonargs+=( -D opengl=es-egl )
-	elif ! use wayland && use opengl; then
-		emesonargs+=( -D opengl=full )
-	elif ! use wayland && use X && ! use opengl; then
-		emesonargs+=( -D opengl=es-egl )
-	else
-		emesonargs+=( -D opengl=none )
-	fi
-
-	if use gnutls; then
-		emesonargs+=( -D crypto=gnutls )
-	else
-		emesonargs+=( -D crypto=openssl )
-	fi
-
-	if use connman; then
-		emesonargs+=( -D network-backend=connman )
-	else
-		emesonargs+=( -D network-backend=none )
-	fi
-
-	local disabledEvasLoaders=""
-	! use avif && disabledEvasLoaders="avif,"
-	! use bmp && disabledEvasLoaders+="bmp,wbmp,"
-	! use dds && disabledEvasLoaders+="dds,"
-	! use eet && disabledEvasLoaders+="eet,"
-	! use gstreamer && disabledEvasLoaders+="gst,"
-	! use heif && disabledEvasLoaders+="heif,"
-	! use ico && disabledEvasLoaders+="ico,"
-	! use jpeg2k && disabledEvasLoaders+="jp2k,"
-	! use json && disabledEvasLoaders+="json,"
-	! use pdf && disabledEvasLoaders+="pdf,"
-	! use pmaps && disabledEvasLoaders+="pmaps,"
-	! use postscript && disabledEvasLoaders+="ps,"
-	! use psd && disabledEvasLoaders+="psd,"
-	! use raw && disabledEvasLoaders+="raw,"
-	! use svg && disabledEvasLoaders+="rsvg,svg,"
-	! use tga && disabledEvasLoaders+="tga,"
-	! use tgv && disabledEvasLoaders+="tgv,"
-	! use tiff && disabledEvasLoaders+="tiff,"
-	! use webp && disabledEvasLoaders+="webp,"
-	! use xcf && disabledEvasLoaders+="xcf,"
-	! use xpm && disabledEvasLoaders+="xpm,"
-	[[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
-	emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
-
-	local disabledImfLoaders=""
-	! use ibus && disabledImfLoaders+="ibus,"
-	! use scim && disabledImfLoaders+="scim,"
-	! use xim && disabledImfLoaders+="xim,"
-	[[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
-	emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
-
-	local bindingsList="cxx,"
-	use lua_single_target_luajit && bindingsList+="lua,"
-	use mono && bindingsList+="mono,"
-	[[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
-	emesonargs+=( -D bindings="${bindingsList}" )
-
-	local luaChoice=""
-	if use lua_single_target_luajit; then
-		luaChoice+="luajit"
-	else
-		luaChoice+="lua"
-	fi
-	emesonargs+=( -D lua-interpreter="${luaChoice}" )
-
-	# Not all arm CPU's have neon instruction set, #722552
-	if use arm && ! use cpu_flags_arm_neon; then
-		emesonargs+=( -D native-arch-optimization=false )
-	fi
-
-	meson_src_configure
-}
-
-src_compile() {
-	docs_compile
-	meson_src_compile
-}
-
-src_install() {
-	meson_src_install
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples/
-		dodoc -r "${BUILD_DIR}"/src/examples/
-	fi
-}
diff --git a/dev-libs/efl/files/efl-1.26.3-gettext-0.22-fix.patch b/dev-libs/efl/files/efl-1.26.3-gettext-0.22-fix.patch
deleted file mode 100644
index 1bce74f76fec..000000000000
--- a/dev-libs/efl/files/efl-1.26.3-gettext-0.22-fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 155842cf9e726009e9eb4ec04d8a176cd990fdcb Mon Sep 17 00:00:00 2001
-From: dimmus <dmitri.chudinov@gmail.com>
-Date: Mon, 14 Aug 2023 21:39:05 +0500
-Subject: [PATCH] examples: edje - add charset header to po files.
-
-Solved compilation error with novel gettext-0.22.
-@fix
----
- src/examples/edje/en_IN/domain_name.po | 5 +++++
- src/examples/edje/hi_IN/domain_name.po | 5 +++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/src/examples/edje/en_IN/domain_name.po b/src/examples/edje/en_IN/domain_name.po
-index f461123404..131579ee36 100644
---- a/src/examples/edje/en_IN/domain_name.po
-+++ b/src/examples/edje/en_IN/domain_name.po
-@@ -1,3 +1,8 @@
-+msgid ""
-+msgstr ""
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: UTF-8\n"
-+
- msgid "LOADING"
- msgstr "Loading..."
- 
-diff --git a/src/examples/edje/hi_IN/domain_name.po b/src/examples/edje/hi_IN/domain_name.po
-index 809cf6f399..fcb0e85d00 100644
---- a/src/examples/edje/hi_IN/domain_name.po
-+++ b/src/examples/edje/hi_IN/domain_name.po
-@@ -1,3 +1,8 @@
-+msgid ""
-+msgstr ""
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: UTF-8\n"
-+
- msgid "LOADING"
- msgstr "लोड हो रहा है..."
- 
diff --git a/dev-libs/efl/files/efl-1.26.3-libressl.patch b/dev-libs/efl/files/efl-1.26.3-libressl.patch
deleted file mode 100644
index 6bb1b6bb83e3..000000000000
--- a/dev-libs/efl/files/efl-1.26.3-libressl.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-https://bugs.gentoo.org/903001
-https://git.enlightenment.org/enlightenment/efl/pulls/10
-https://git.enlightenment.org/enlightenment/efl/commit/bdd5b244e6a6161228f4a98210cefd9ef8a12e85
-https://git.enlightenment.org/enlightenment/efl/commit/0e22417f4579333a967fb5ce65ab339dfc066753
-
-From bdd5b244e6a6161228f4a98210cefd9ef8a12e85 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Mon, 4 Jul 2022 09:05:38 -0700
-Subject: [PATCH] Support LibreSSL 3.5.x
-
-LibreSSL 3.5.x now works with the standard OpenSSL code paths.
----
- src/lib/ecore_con/efl_net_ssl_conn-openssl.c | 12 ++++++------
- src/lib/eet/eet_cipher.c                     |  8 ++++----
- src/lib/emile/emile_cipher_openssl.c         | 14 +++++++-------
- 3 files changed, 17 insertions(+), 17 deletions(-)
-
-From 0e22417f4579333a967fb5ce65ab339dfc066753 Mon Sep 17 00:00:00 2001
-From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
-Date: Mon, 1 Aug 2022 17:35:52 +0100
-Subject: [PATCH] eet emile - cipher - add braces for if defines to be clear on
- order of op
-
----
- src/lib/ecore_con/efl_net_ssl_conn-openssl.c | 12 ++++++------
- src/lib/eet/eet_cipher.c                     |  8 ++++----
- src/lib/emile/emile_cipher_openssl.c         | 10 +++++-----
- 3 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
-index e59c6811c9..56c8a595eb 100644
---- a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
-+++ b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
-@@ -27,7 +27,7 @@
- static int
- efl_net_socket_bio_create(BIO *b)
- {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
-    BIO_set_init(b, 1);
-    BIO_set_data(b, NULL);
-    BIO_set_flags(b, 0);
-@@ -44,7 +44,7 @@ static int
- efl_net_socket_bio_destroy(BIO *b)
- {
-    if (!b) return 0;
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
-    BIO_set_init(b, 0);
-    BIO_set_data(b, NULL);
-    BIO_set_flags(b, 0);
-@@ -63,7 +63,7 @@ efl_net_socket_bio_read(BIO *b, char *buf, int len)
-      .mem = buf,
-      .len = len
-    };
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
-    Eo *sock = BIO_get_data(b);
- #else
-    Eo *sock = b->ptr;
-@@ -99,7 +99,7 @@ efl_net_socket_bio_write(BIO *b, const char *buf, int len)
-      .mem = buf,
-      .len = len
-    };
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
-    Eo *sock = BIO_get_data(b);
- #else
-    Eo *sock = b->ptr;
-@@ -146,7 +146,7 @@ efl_net_socket_bio_puts(BIO *b, const char *str)
- static BIO_METHOD *
- __efl_net_socket_bio_get(void)
- {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
-    static BIO_METHOD *efl_net_socket_bio = NULL;
- 
-    if (efl_net_socket_bio) return efl_net_socket_bio;
-@@ -359,7 +359,7 @@ efl_net_ssl_conn_setup(Efl_Net_Ssl_Conn *conn, Eina_Bool is_dialer, Efl_Net_Sock
-    conn->bio = BIO_new(__efl_net_socket_bio_get());
-    EINA_SAFETY_ON_NULL_GOTO(conn->bio, error_bio);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
-    BIO_set_data(conn->bio, sock);
- #else
-    conn->bio->ptr = sock;
-diff --git a/src/lib/eet/eet_cipher.c b/src/lib/eet/eet_cipher.c
-index 025750cc98..30501b99e1 100644
---- a/src/lib/eet/eet_cipher.c
-+++ b/src/lib/eet/eet_cipher.c
-@@ -472,7 +472,7 @@ eet_identity_sign(FILE    *fp,
-    gnutls_datum_t signum = { NULL, 0 };
-    gnutls_privkey_t privkey;
- # else /* ifdef HAVE_GNUTLS */
--#  if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#  if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
-    EVP_MD_CTX *md_ctx;
- #  else
-    EVP_MD_CTX md_ctx;
-@@ -562,7 +562,7 @@ eet_identity_sign(FILE    *fp,
-      }
- 
-    /* Do the signature. */
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && (!defined(LIBRESSL_VERSION_NUMBER)))
-    md_ctx = EVP_MD_CTX_new();
-    if (!md_ctx)
-      {
-@@ -756,7 +756,7 @@ eet_identity_check(const void   *data_base,
-    const unsigned char *tmp;
-    EVP_PKEY *pkey;
-    X509 *x509;
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
-    EVP_MD_CTX *md_ctx;
- #else
-    EVP_MD_CTX md_ctx;
-@@ -779,7 +779,7 @@ eet_identity_check(const void   *data_base,
-      }
- 
-    /* Verify the signature */
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
-    md_ctx = EVP_MD_CTX_new();
-    if (!md_ctx)
-      {
-diff --git a/src/lib/emile/emile_cipher_openssl.c b/src/lib/emile/emile_cipher_openssl.c
-index e5a1ed4135..7fed417d3f 100644
---- a/src/lib/emile/emile_cipher_openssl.c
-+++ b/src/lib/emile/emile_cipher_openssl.c
-@@ -45,12 +45,12 @@ struct _Emile_SSL
- Eina_Bool
- _emile_cipher_init(void)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
-    ERR_load_crypto_strings();
-    SSL_library_init();
-    SSL_load_error_strings();
-    OpenSSL_add_all_algorithms();
--#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
-+#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x3050000fL */
- 
-    return EINA_TRUE;
- }
-@@ -73,7 +73,7 @@ emile_binbuf_sha1(const Eina_Binbuf * data, unsigned char digest[20])
- {
-    const EVP_MD *md = EVP_sha1();
-    Eina_Slice slice = eina_binbuf_slice_get(data);
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
-    EVP_MD_CTX *ctx = EVP_MD_CTX_new();
-    if (!ctx) return EINA_FALSE;
- 
-@@ -196,7 +196,7 @@ on_error:
-    memset(ik, 0, sizeof (ik));
- 
-    /* Openssl error */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
-    if (ctx)
-      EVP_CIPHER_CTX_cleanup(ctx);
- #else
-@@ -204,7 +204,7 @@ on_error:
-      EVP_CIPHER_CTX_cleanup(ctx);
-      EVP_CIPHER_CTX_free(ctx);
-    }
--#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
-+#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x3050000fL */
- 
- 
-    free(buffer);
-@@ -331,7 +331,7 @@ emile_cipher_server_listen(Emile_Cipher_Type t)
-          SSL_CTX_set_options(r->ssl_ctx,
-                              options | SSL_OP_NO_SSLv2 | SSL_OP_SINGLE_DH_USE);
-          break;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
-       case EMILE_TLSv1:
-          r->ssl_ctx = SSL_CTX_new(TLSv1_server_method());
-          break;
-@@ -780,7 +780,7 @@ emile_cipher_server_connect(Emile_Cipher_Type t)
-                              options | SSL_OP_NO_SSLv2 | SSL_OP_SINGLE_DH_USE);
-          break;
-       case EMILE_TLSv1:
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
-          r->ssl_ctx = SSL_CTX_new(TLSv1_client_method());
-          break;
- #endif