From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1513973-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id B743615ACFC
for <garchives@archives.gentoo.org>; Mon, 1 May 2023 14:01:58 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D3A5DE084F;
Mon, 1 May 2023 14:01:57 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id ACB46E084F
for <gentoo-commits@lists.gentoo.org>; Mon, 1 May 2023 14:01:57 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 7CA173414B4
for <gentoo-commits@lists.gentoo.org>; Mon, 1 May 2023 14:01:56 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E8A37990
for <gentoo-commits@lists.gentoo.org>; Mon, 1 May 2023 14:01:54 +0000 (UTC)
From: "orbea" <orbea@riseup.net>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "orbea" <orbea@riseup.net>
Message-ID: <1682949522.cf35d3c15813620a15db9cda24c254907fd15f90.orbea@gentoo>
Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-libs/efl/, dev-libs/efl/files/
X-VCS-Repository: repo/proj/libressl
X-VCS-Files: dev-libs/efl/Manifest dev-libs/efl/efl-1.26.3-r1.ebuild dev-libs/efl/files/efl-1.26.2-libressl.patch dev-libs/efl/metadata.xml
X-VCS-Directories: dev-libs/efl/ dev-libs/efl/files/
X-VCS-Committer: orbea
X-VCS-Committer-Name: orbea
X-VCS-Revision: cf35d3c15813620a15db9cda24c254907fd15f90
X-VCS-Branch: master
Date: Mon, 1 May 2023 14:01:54 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f563252f-9a20-417e-93ae-159d4923120b
X-Archives-Hash: 92f72a711d80f9eb82b5662f8520e6c5
commit: cf35d3c15813620a15db9cda24c254907fd15f90
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Mon May 1 13:58:42 2023 +0000
Commit: orbea <orbea <AT> riseup <DOT> net>
CommitDate: Mon May 1 13:58:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=cf35d3c1
dev-libs/efl: treeclean
Bug: https://bugs.gentoo.org/903001
Upstream-PR: https://github.com/gentoo/gentoo/pull/30794
Upstream-Commit: https://github.com/gentoo/gentoo/commit/9088957da743bd19ba56a001852568916b5d393a
Signed-off-by: orbea <orbea <AT> riseup.net>
dev-libs/efl/Manifest | 1 -
dev-libs/efl/efl-1.26.3-r1.ebuild | 316 ---------------------------
dev-libs/efl/files/efl-1.26.2-libressl.patch | 178 ---------------
dev-libs/efl/metadata.xml | 36 ---
4 files changed, 531 deletions(-)
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
deleted file mode 100644
index 35ae7b6..0000000
--- a/dev-libs/efl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST efl-1.26.3.tar.xz 168540684 BLAKE2B aeb0215b9cdce9ca10550c698df4985ff9557c3c400c3a300887148d04a8900f04c7200473e5fce1d3021378be1e664e9364d171ec09c4fc488b4ec758722ea5 SHA512 9801ee8bc963786962d87af56d532d3f019bc18a91924d2ef84934dcd0ae30452d858db93c33964f2bff9af2f3c8feb9927f7281ead4a8993ed622cd0cf2c514
diff --git a/dev-libs/efl/efl-1.26.3-r1.ebuild b/dev-libs/efl/efl-1.26.3-r1.ebuild
deleted file mode 100644
index 55de37b..0000000
--- a/dev-libs/efl/efl-1.26.3-r1.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2023 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_{9..11} )
-
-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-sound/pulseaudio )
- 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
- nls? ( sys-devel/gettext )
- wayland? ( dev-util/wayland-scanner )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.26.2-libressl.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=(
- --buildtype=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.2-libressl.patch b/dev-libs/efl/files/efl-1.26.2-libressl.patch
deleted file mode 100644
index 9f6b1a8..0000000
--- a/dev-libs/efl/files/efl-1.26.2-libressl.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-Upstream-PR: https://git.enlightenment.org/enlightenment/efl/pulls/10
-
-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(-)
-
-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..b20179fc33 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..f2056e56d3 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..acce2a2fa2 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
---
-2.25.1
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
deleted file mode 100644
index 44684ed..0000000
--- a/dev-libs/efl/metadata.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>juippis@gentoo.org</email>
- <name>Joonas Niilola</name>
- </maintainer>
- <use>
- <flag name="avif">Enable AVIF image loader</flag>
- <flag name="bmp">Enable WBMP image loader</flag>
- <flag name="dds">Enable DDS image loader</flag>
- <flag name="drm">Enable DRM engine</flag>
- <flag name="eet">Enable Eet image loader</flag>
- <flag name="efl-one">Combine multiple core libraries into one libefl.so</flag>
- <flag name="fribidi">Enable bidirectional text support</flag>
- <flag name="glib">Enable <pkg>dev-libs/glib</pkg> support</flag>
- <flag name="harfbuzz">Enable complex text shaping and layout support</flag>
- <flag name="hyphen">Enable text hyphenation support</flag>
- <flag name="ibus">Enable Intelligent Input Bus</flag>
- <flag name="ico">Enable Ico image loader</flag>
- <flag name="json">Enable lottie animation support</flag>
- <flag name="mono">Enable mono bindings</flag>
- <flag name="physics">Enable Bullet physics effects and support</flag>
- <flag name="pmaps">Enable PMAPS image loader</flag>
- <flag name="psd">Enable PSD image loader</flag>
- <flag name="scim">Enable Smart Common Input Method</flag>
- <flag name="system-lz4">Use system liblz4 instead of bundled one</flag>
- <flag name="tga">Enable Tga image loader</flag>
- <flag name="tgv">Enable Tgv image loader</flag>
- <flag name="tslib">Enable <pkg>x11-libs/tslib</pkg> for touchscreen events</flag>
- <flag name="unwind">Enable debug support via <pkg>sys-libs/libunwind</pkg></flag>
- <flag name="xcf">Enable XCF image loader</flag>
- <flag name="xim">Enable X Input Method</flag>
- <flag name="xpresent">Enable <pkg>x11-libs/libXpresent</pkg> support</flag>
- </use>
-</pkgmetadata>