Adding metadata

24 files changed, 638 insertions, 63 deletions

diff --git a/dev-libs/aws-c-cal/aws-c-cal-0.4.5.ebuild b/dev-libs/aws-c-cal/aws-c-cal-0.4.5.ebuild
index 7dd18890b23a..eecb3c83b59e 100644
--- a/dev-libs/aws-c-cal/aws-c-cal-0.4.5.ebuild
+++ b/dev-libs/aws-c-cal/aws-c-cal-0.4.5.ebuild
@@ -12,13 +12,14 @@ SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static-libs test"
+IUSE="libressl static-libs test"
 
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=dev-libs/aws-c-common-0.4.62:=[static-libs=]
-	>=dev-libs/openssl-1.1.1:=[static-libs=]
+	!libressl? ( >=dev-libs/openssl-1.1.1:=[static-libs=] )
+	libressl? ( dev-libs/libressl )
 "
 
 PATCHES=(
diff --git a/dev-libs/aws-c-cal/metadata.xml b/dev-libs/aws-c-cal/metadata.xml
index 920d3f57b18b..fd62d540f57a 100644
--- a/dev-libs/aws-c-cal/metadata.xml
+++ b/dev-libs/aws-c-cal/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
+ <maintainer type="project">
+  <email>dev@liguros.net</email>
+  <name>Development</name>
+ </maintainer>
  <maintainer type="person">
   <email>sven.eden@prydeworx.com</email>
   <name>Sven Eden</name>
@@ -10,5 +14,5 @@
   <name>Proxy Maintainers</name>
  </maintainer>
  
- <origin>gentoo-staging</origin>
+ <origin>ports</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-libs/aws-sdk-cpp/Manifest b/dev-libs/aws-sdk-cpp/Manifest
index 7c55604e6c1c..128a33ff655d 100644
--- a/dev-libs/aws-sdk-cpp/Manifest
+++ b/dev-libs/aws-sdk-cpp/Manifest
@@ -1,2 +1,2 @@
-DIST aws-sdk-cpp-1.8.105.tar.gz 31880249 BLAKE2B 1a2eb972b716c656f45b8d1d12fc3e7280c171e4a19eb5431e320511365d305211e8567aa7fcc3e21f553ad5befda91829df6ccf60c23296d210d0c7347bb2a2 SHA512 a76da095718c8569c62597431d29a0a54c1a7f81c1825894f0f40b1a971a3e0b4f0813da4ac929612b9bb5f92501ee6a034436faa6eef678d936117765baab7e
 DIST aws-sdk-cpp-1.8.160.tar.gz 33282825 BLAKE2B 3c48edb5578d4450feeab94f9c44ec8222e2e7785d8f69d468b97cddc9bb503bb1648facdce85c2c90a73141c60a22aa6d1e29aeb4b8a904f8e926055f48124e SHA512 b71bed89d27361bf735907ad86908a3dcb952ff6ba9d6c2c04dd2ff6afded777b12ad2da79ba97744ef9ade6fa21a5ff4451f5b664bbab8bae4864fa4e0db073
+DIST aws-sdk-cpp-1.8.186.tar.gz 34125531 BLAKE2B 262b05b5a3fbbdf4a082c35190fce6d26c0445b6f3e44e494214374e479f1af82c78512fed955e1f9d27501b6eaaa64bfcb37d47744be8c06ec4305488bd6eb2 SHA512 d14bd12d10ce87929ab1d2daacb2a4d4642c70fb9bc3ee8db5b6c617140d57439f72fb6d1eb568ed9915c53f4ab659cb16608e16da68254bdca5d71e8d470f44
diff --git a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.160.ebuild b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.160.ebuild
index 83bf87a311be..c03582e42c8b 100644
--- a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.160.ebuild
+++ b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.160.ebuild
@@ -26,7 +26,7 @@ MODULES=(
 	translate waf wellarchitected
 )
 
-IUSE="+http pulseaudio +rtti +ssl static-libs test unity-build ${MODULES[*]}"
+IUSE="+http libressl pulseaudio +rtti +ssl static-libs test unity-build ${MODULES[*]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
@@ -34,7 +34,8 @@ DEPEND="
 	http? ( net-misc/curl:= )
 	pulseaudio? ( media-sound/pulseaudio )
 	ssl? (
-		dev-libs/openssl:0=
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
 	)
 	>=dev-libs/aws-c-common-0.5.2:=[static-libs=]
 	>=dev-libs/aws-c-event-stream-0.2.7:=[static-libs=]
diff --git a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.105.ebuild b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.186.ebuild
index 2110bb059009..2c2d793f7afd 100644
--- a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.105.ebuild
+++ b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.186.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
@@ -23,10 +22,10 @@ MODULES=(
 	lookoutvision machinelearning macie managedblockchain marketplace mwaa networkmanager opsworks
 	organizations other outposts personalize polly qldb queues rds rekognition resource-groups route53 s3
 	sagemaker secretsmanager securityhub serverlessrepo shield sns sqs textract timestream transcribe
-	translate waf
+	translate waf wellarchitected
 )
 
-IUSE="+http pulseaudio +rtti +ssl static-libs test unity-build ${MODULES[*]}"
+IUSE="+http libressl pulseaudio +rtti +ssl static-libs test unity-build ${MODULES[*]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
@@ -34,10 +33,11 @@ DEPEND="
 	http? ( net-misc/curl:= )
 	pulseaudio? ( media-sound/pulseaudio )
 	ssl? (
-		dev-libs/openssl:0=
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
 	)
-	>=dev-libs/aws-c-common-0.4.62:=[static-libs=]
-	>=dev-libs/aws-c-event-stream-0.2.5:=[static-libs=]
+	>=dev-libs/aws-c-common-0.5.2:=[static-libs=]
+	>=dev-libs/aws-c-event-stream-0.2.7:=[static-libs=]
 	>=dev-libs/aws-checksums-0.1.10:=[static-libs=]
 	sys-libs/zlib
 "
@@ -62,7 +62,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-upgrade_scripts_generate_sdks_py-3.9.patch
 	"${FILESDIR}"/${PN}-upgrade_scripts_renew_license_py-3.9.patch
 	"${FILESDIR}"/${PN}-upgrade_scripts_run_integration_tests_py-3.9.patch
-	"${FILESDIR}"/${P}-remove_Werror_from_FLAGS.patch
+	"${FILESDIR}"/${PN}-1.8.105-remove_Werror_from_FLAGS.patch
 )
 
 src_configure() {
@@ -122,15 +122,15 @@ src_configure() {
 			elif [ "${module}" = "forecast" ] ; then
 				mybuildtargets+=";${module};forecastquery"
 			elif [ "${module}" = "iot" ] ; then
-				mybuildtargets+=";${module};greengrass;iot1click-devices;iot1click-projects"
-				mybuildtargets+=";iotanalytics;iot-data;iotevents;iotevents-data;iot-jobs-data"
-				mybuildtargets+=";iotsecuretunneling;iotsitewise;iotthingsgraph"
+				mybuildtargets+=";${module};greengrass;greengrassv2;iot1click-devices;iot1click-projects;iotanalytics"
+				mybuildtargets+=";iot-data;iotdeviceadvisor;iotevents;iotfleethub;iotevents-data;iot-jobs-data"
+				mybuildtargets+=";iotsecuretunneling;iotsitewise;iotthingsgraph;iotwireless"
 			elif [ "${module}" = "kinesis" ] ; then
 				mybuildtargets+=";${module};firehose;ivs;kinesisanalytics;kinesisanalyticsv2"
 				mybuildtargets+=";kinesisvideo;kinesis-video-archived-media;kinesis-video-media"
 				mybuildtargets+=";kinesis-video-signaling"
 			elif [ "${module}" = "lex" ] ; then
-				mybuildtargets+=";${module};lex-models"
+				mybuildtargets+=";${module};lex-models;lexv2-models;lexv2-runtime"
 			elif [ "${module}" = "macie" ] ; then
 				mybuildtargets+=";${module};macie2"
 			elif [ "${module}" = "marketplace" ] ; then
@@ -140,7 +140,7 @@ src_configure() {
 			elif [ "${module}" = "opsworks" ] ; then
 				mybuildtargets+=";${module};opsworkscm"
 			elif [ "${module}" = "other" ] ; then
-				mybuildtargets+=";AWSMigrationHub;alexaforbusiness;appflow;braket;clouddirectory"
+				mybuildtargets+=";AWSMigrationHub;alexaforbusiness;appflow;appintegrations;braket;clouddirectory"
 				mybuildtargets+=";comprehend;comprehendmedical;connect;connect-contact-lens"
 				mybuildtargets+=";connectparticipant;customer-profiles;datapipeline;databrew;datasync"
 				mybuildtargets+=";directconnect;discovery;dms;docdb;ds;dynamodb;gamelift;glue"
@@ -191,5 +191,15 @@ src_configure() {
 		-DNO_ENCRYPTION=$(usex !ssl)
 		-DNO_HTTP_CLIENT=$(usex !http)
 	)
+
+	if use test; then
+		# (#759802) Due to network sandboxing of portage, internet connectivity
+		# tests will always fail. If you need a USE flag, because you want/need
+		# to perform these tests manually, please open a bug report for it.
+		mycmakeargs+=(
+			-DENABLE_HTTP_CLIENT_TESTING=OFF
+		)
+	fi
+
 	cmake_src_configure
 }
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.186-disable_http_testing.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.186-disable_http_testing.patch
new file mode 100644
index 000000000000..8bf926148e52
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.186-disable_http_testing.patch
@@ -0,0 +1,17 @@
+--- a/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp	2021-03-14 12:52:01.193340560 +0100
++++ b/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp	2021-03-14 12:52:42.684342951 +0100
+@@ -18,7 +18,7 @@
+ using namespace Aws::Utils;
+ using namespace Aws::Client;
+ 
+-#ifndef NO_HTTP_CLIENT
++#if !defined(NO_HTTP_CLIENT) && ENABLE_HTTP_CLIENT_TESTING
+ static void makeRandomHttpRequest(std::shared_ptr<HttpClient> httpClient)
+ {
+     auto request = CreateHttpRequest(Aws::String("http://some.unknown1234xxx.test.aws"),
+@@ -319,4 +319,4 @@
+ }
+ #endif // ENABLE_CURL_CLIENT
+ #endif // ENABLE_HTTP_CLIENT_TESTING
+-#endif // NO_HTTP_CLIENT
++#endif // !defined(NO_HTTP_CLIENT) && ENABLE_HTTP_CLIENT_TESTING
diff --git a/dev-libs/aws-sdk-cpp/metadata.xml b/dev-libs/aws-sdk-cpp/metadata.xml
index 69b043c185c9..4366485b92b0 100644
--- a/dev-libs/aws-sdk-cpp/metadata.xml
+++ b/dev-libs/aws-sdk-cpp/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
+ <maintainer type="project">
+  <email>dev@liguros.net</email>
+  <name>Development</name>
+ </maintainer>
  <maintainer type="person">
   <email>amit.prakash.ambasta@gmail.com</email>
  </maintainer>
@@ -25,10 +29,7 @@
  <use>
   <flag name="http">Enable http support via net-misc/curl</flag>
   <flag name="rtti">Flag to enable/disable rtti within the library</flag>
-  <flag name="unity-build">
-			Build using a single unified .cpp file for each service library.
-			Reduces the size of static library binaries
-		</flag>
+  <flag name="unity-build">Build using a single unified .cpp file for each service library. Reduces the size of static library binaries</flag>
   <flag name="access-management">
 			AWS Access Management, a meta-flag that enables:
 			AWS Certificate Manager (ACM): Provision, manage, and deploy SSL/TLS certificates on AWS
@@ -48,10 +49,7 @@
 			Also enables acm-pca, identity-management, identitystore, sso-admin, sso-oidc and sts
 			(Security Token Service).
 		</flag>
-  <flag name="apigateway">
-			Create and deploy your own REST and WebSocket APIs at any scale.
-			Also enables apigatewaymanagementapi and apigatewayv2.
-		</flag>
+  <flag name="apigateway">Create and deploy your own REST and WebSocket APIs at any scale. Also enables apigatewaymanagementapi and apigatewayv2.</flag>
   <flag name="appconfig">Quickly deploy application configurations to applications of any size.</flag>
   <flag name="backup">AWS Backup is a fully managed backup service</flag>
   <flag name="batch">Run batch computing workloads on the AWS Cloud</flag>
@@ -476,5 +474,5 @@
 			architecture.
 		</flag>
  </use>
- <origin>gentoo-staging</origin>
+ <origin>ports</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-libs/efl/efl-1.25.1-r11.ebuild b/dev-libs/efl/efl-1.25.1-r11.ebuild
index c353995b1741..3d22f5891ee6 100644
--- a/dev-libs/efl/efl-1.25.1-r11.ebuild
+++ b/dev-libs/efl/efl-1.25.1-r11.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 DOCS_BUILDER="doxygen"
-DOCS_DEPEND="dev-texlive/texlive-fontutils"
 DOCS_DIR="${S}/doc"
 
 LUA_REQ_USE="deprecated(+)"
@@ -20,9 +19,9 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one elogind examples fbcon
-	+fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico
+	+fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
 	jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim
 	sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf
 	xim xpm xpresent zeroconf"
@@ -110,7 +109,8 @@ RDEPEND="${LUA_DEPS}
 	ssl? (
 		gnutls? ( net-libs/gnutls:= )
 		!gnutls? (
-			dev-libs/openssl:0=
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
 		)
 	)
 	svg? ( gnome-base/librsvg )
diff --git a/dev-libs/efl/efl-1.25.1-r12.ebuild b/dev-libs/efl/efl-1.25.1-r12.ebuild
new file mode 100644
index 000000000000..bb1a62c65958
--- /dev/null
+++ b/dev-libs/efl/efl-1.25.1-r12.ebuild
@@ -0,0 +1,324 @@
+# Copyright 2021 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=7
+
+DOCS_BUILDER="doxygen"
+DOCS_DIR="${S}/doc"
+
+LUA_REQ_USE="deprecated(+)"
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit docs lua-single meson python-any-r1 xdg-utils
+
+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="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one elogind examples fbcon
+	+fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
+	jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim
+	sdl +sound +ssl +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 )
+	?? ( gles2-only opengl )
+	?? ( fbcon tslib )
+	ssl
+	drm? ( gles2-only )
+	examples? ( eet svg )
+	gles2-only? ( || ( wayland X ) )
+	ibus? ( glib )
+	pulseaudio? ( sound )
+	wayland? ( gles2-only !opengl )
+	xim? ( X )
+	xpresent? ( X )"
+
+# Requires everything to be enabled unconditionally.
+RESTRICT="test"
+
+RDEPEND="${LUA_DEPS}
+	dev-libs/check
+	net-misc/curl
+	media-libs/giflib:=
+	media-libs/libpng:0=
+	sys-apps/dbus
+	sys-libs/zlib
+	virtual/jpeg:0=
+	X? (
+		media-libs/freetype
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libXScrnSaver
+		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 )
+	gles2-only? (
+		media-libs/mesa[egl,gles2]
+		virtual/opengl
+	)
+	glib? ( dev-libs/glib:2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	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 )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	svg? ( gnome-base/librsvg )
+	system-lz4? ( app-arch/lz4 )
+	systemd? ( sys-apps/systemd:= )
+	tiff? ( media-libs/tiff:0= )
+	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}"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/efl-1.25.1-libavif-fix.patch
+)
+
+pkg_setup() {
+	# Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so.
+	QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.1.25.1
+		/usr/$(get_libdir)/libefreet_mime.so.1.25.1"
+
+	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=release
+
+		-D buffer=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 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 opengl; then
+		emesonargs+=( -D opengl=full )
+	elif use gles2-only; 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 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
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index bd69f3d7a263..e8670cf01106 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
+ <maintainer type="project">
+  <email>dev@liguros.net</email>
+  <name>Development</name>
+ </maintainer>
  <maintainer type="person">
   <email>juippis@gentoo.org</email>
   <name>Joonas Niilola</name>
@@ -34,5 +38,5 @@
   <flag name="xim">Enable X Input Method</flag>
   <flag name="xpresent">Enable <pkg>x11-libs/libXpresent</pkg> support</flag>
  </use>
- <origin>gentoo-staging</origin>
+ <origin>ports</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-libs/libp11/files/libp11-0.4.11-libressl.patch b/dev-libs/libp11/files/libp11-0.4.11-libressl.patch
new file mode 100644
index 000000000000..9f285b10d01d
--- /dev/null
+++ b/dev-libs/libp11/files/libp11-0.4.11-libressl.patch
@@ -0,0 +1,13 @@
+diff -puriN libp11-0.4.11.orig/src/p11_rsa.c libp11-0.4.11/src/p11_rsa.c
+--- libp11-0.4.11.orig/src/p11_rsa.c	2020-10-11 08:41:00.000000000 -0500
++++ libp11-0.4.11/src/p11_rsa.c	2021-01-15 06:00:38.000000000 -0600
+@@ -336,7 +336,7 @@ int pkcs11_get_key_size(PKCS11_KEY *key)
+ 	return RSA_size(rsa);
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100005L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100005L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3000000L )
+ 
+ int (*RSA_meth_get_priv_enc(const RSA_METHOD *meth))
+ 		(int flen, const unsigned char *from,
+
diff --git a/dev-libs/libp11/libp11-0.4.10.ebuild b/dev-libs/libp11/libp11-0.4.10.ebuild
index f2409455c067..7903034316f0 100644
--- a/dev-libs/libp11/libp11-0.4.10.ebuild
+++ b/dev-libs/libp11/libp11-0.4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,10 +10,11 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="bindist doc static-libs"
+IUSE="libressl bindist doc static-libs"
 
 RDEPEND="
-	dev-libs/openssl:0=[bindist=]"
+	!libressl? ( dev-libs/openssl:0=[bindist=] )
+	libressl? ( >=dev-libs/libressl-2.8:0= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
diff --git a/dev-libs/libp11/libp11-0.4.11.ebuild b/dev-libs/libp11/libp11-0.4.11.ebuild
index b5fde86162cb..81c7e2cf71a9 100644
--- a/dev-libs/libp11/libp11-0.4.11.ebuild
+++ b/dev-libs/libp11/libp11-0.4.11.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=7
 
 DESCRIPTION="Abstraction layer to simplify PKCS#11 API"
@@ -10,14 +9,17 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="bindist doc static-libs"
+IUSE="libressl bindist doc static-libs"
 
 RDEPEND="
-	dev-libs/openssl:0=[bindist=]"
+	!libressl? ( dev-libs/openssl:0=[bindist=] )
+	libressl? ( >=dev-libs/libressl-2.8:0= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
+PATCHES="${FILESDIR}/libp11-0.4.11-libressl.patch"
+
 src_configure() {
 	econf \
 		--enable-shared \
diff --git a/dev-libs/libp11/metadata.xml b/dev-libs/libp11/metadata.xml
index 29308ba5b6e3..e2aba34b7942 100644
--- a/dev-libs/libp11/metadata.xml
+++ b/dev-libs/libp11/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
+ <maintainer type="project">
+  <email>dev@liguros.net</email>
+  <name>Development</name>
+ </maintainer>
  <maintainer type="person">
   <email>polynomial-c@gentoo.org</email>
   <name>Lars Wendler</name>
@@ -12,10 +16,9 @@
  <upstream>
   <remote-id type="cpe">cpe:/a:opensc-project:opensc</remote-id>
   <remote-id type="github">opensc/libp11</remote-id>
-  <remote-id type="sourceforge">opensc</remote-id>
  </upstream>
  <use>
   <flag name="doc">Generate and install API documentation for the package.</flag>
  </use>
- <origin>gentoo-staging</origin>
+ <origin>ports</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index 0dc485b0a315..8e2f3d8891f1 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -1,2 +1,3 @@
 DIST poco-1.10.1.tar.gz 10224204 BLAKE2B 644bb2134c571e10b63937ca15b3f5d7255767bcc99dd6b6107a13d64ed7ac83d499d74f04084c666bbf5ef6f033d57d2fb1de0b8b8487844e3aaf8cefe6fba8 SHA512 40aa8049c68651f461280937c1c733e13d1cedbec12bc44a7f3a6c131d31229c5445067052441427071f6102fd1965d238b2222c0689279dd156b4e261ac9e73
 DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3e26237918baf231b4e56ce3d69347cf7a3017715895f4ee56a428672fcb804fb3c732da0000ccc9790b0081d SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9
+DIST poco-1.9.4.tar.gz 10319487 BLAKE2B beb5334f2b8f88db368b56e061a22c824a0338a662234015f5b6b9e2988a7fd1bbccb8eb8b291321d1cba23b10cc2bb54d9aaa1156ecfd302fda579cd0696d06 SHA512 0b9c54a6b71633a39ef7cace50d6887691ab190f8decb33212869502bbd96ceb0509abde45efa5c1230cab259fa808bffda0e4695e1bfd73d02e9fc2c9ae091f
diff --git a/dev-libs/poco/metadata.xml b/dev-libs/poco/metadata.xml
index 4bf98fd364a9..9c211cbbab4a 100644
--- a/dev-libs/poco/metadata.xml
+++ b/dev-libs/poco/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
+ <maintainer type="project">
+  <email>dev@liguros.net</email>
+  <name>Development</name>
+ </maintainer>
  <maintainer type="person">
   <email>davidroman96@gmail.com</email>
   <name>David Roman</name>
@@ -26,7 +30,6 @@ them to spend their time on more worthwhile areas, such as getting things
 done quickly and working on the features that make their application unique.
 	</longdescription>
  <upstream>
-  <remote-id type="sourceforge">poco</remote-id>
   <remote-id type="github">pocoproject/poco</remote-id>
  </upstream>
  <use>
@@ -44,5 +47,5 @@ done quickly and working on the features that make their application unique.
   <flag name="util">Several utility classes (like logger, timer, config file parser)</flag>
   <flag name="zip">Add support for the zip &amp; gz archive formats</flag>
  </use>
- <origin>gentoo-staging</origin>
+ <origin>ports</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-libs/poco/poco-1.9.0-r2.ebuild b/dev-libs/poco/poco-1.9.0-r2.ebuild
index 6e68ea76db7e..c4df5abf24b6 100644
--- a/dev-libs/poco/poco-1.9.0-r2.ebuild
+++ b/dev-libs/poco/poco-1.9.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
 
-IUSE="7z cppparser +crypto +data examples +file2pagecompiler iodbc +json mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip"
+IUSE="7z cppparser +crypto +data examples +file2pagecompiler iodbc +json libressl mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	7z? ( xml )
@@ -39,7 +39,8 @@ RDEPEND="
 		!iodbc? ( dev-db/unixODBC ) )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? (
-		dev-libs/openssl:0=
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
 	)
 	xml? ( dev-libs/expat )
 	zip? ( sys-libs/zlib )
diff --git a/dev-libs/poco/poco-1.10.1.ebuild b/dev-libs/poco/poco-1.9.4.ebuild
index 6597a6da68d2..c4df5abf24b6 100644
--- a/dev-libs/poco/poco-1.10.1.ebuild
+++ b/dev-libs/poco/poco-1.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,12 +8,11 @@ inherit cmake
 DESCRIPTION="C++ libraries for building network-based applications"
 HOMEPAGE="https://pocoproject.org/"
 SRC_URI="https://github.com/pocoproject/${PN}/archive/${P}-release.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}-release"
-
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="7z cppparser +crypto +data examples +file2pagecompiler iodbc +json mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip"
+KEYWORDS="amd64 arm x86"
+
+IUSE="7z cppparser +crypto +data examples +file2pagecompiler iodbc +json libressl mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	7z? ( xml )
@@ -29,7 +28,9 @@ REQUIRED_USE="
 	test? ( data? ( sqlite ) json util xml )
 "
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	virtual/pkgconfig
+"
 RDEPEND="
 	>=dev-libs/libpcre-8.42
 	mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= )
@@ -38,14 +39,17 @@ RDEPEND="
 		!iodbc? ( dev-db/unixODBC ) )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? (
-		dev-libs/openssl:0=
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
 	)
 	xml? ( dev-libs/expat )
 	zip? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-1.10.1-iodbc-incdir.patch" )
+S="${WORKDIR}/${PN}-${P}-release"
+
+PATCHES=( "${FILESDIR}/${PN}-1.7.2-iodbc-incdir.patch" )
 
 src_prepare() {
 	cmake_src_prepare
@@ -123,13 +127,12 @@ src_install() {
 
 	if use examples ; then
 		for sd in */samples ; do
-			docinto examples/${sd%/samples}
-			dodoc -r ${sd}
+			insinto /usr/share/doc/${PF}/examples/${sd%/samples}
+			doins -r ${sd}
 		done
-
 		find "${D}/usr/share/doc/${PF}/examples" \
 			-iname "*.sln" -or -iname "*.vcproj" -or \
 			-iname "*.vmsbuild" -or -iname "*.properties" \
-			| xargs rm -v || die
+			| xargs rm
 	fi
 }
diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index 923dfd8c213f..c0186637b7eb 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -1 +1,2 @@
+DIST tntnet-2.2.1.tar.gz 1127500 BLAKE2B bdb55c879ed00afdde1bfe1560ad4228effaa05b35996df3860631c90c93e57096f590b5ddfd8e8ff0356837e839e2f6ed8f4f6fe8ed478275926dd1143b2051 SHA512 78a26713498fd6eabb0b4a247bb20c130ce967ed22ce5c54da4b1300534dd40155aa62a2dc770be4eca720cadeceac283978a5dc3ce418728994af72e4d8eac1
 DIST tntnet-3.0.tar.gz 879598 BLAKE2B 34cbabc52eb28be051da8593eb32d66aa701785be4002056d9be34d28871ae886a87eb1d66e71393a9f9d96110a3d826acead6c6db5c6f2829db797ac449b82e SHA512 5fe1f8750e10537919174e953be92b73e12a9227c50a02dcf2f23a266304ad3ad77d29823e8cdd3e2fa92dba936c2624f140943d021790e8137609bbeb0d3d81
diff --git a/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch b/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
new file mode 100644
index 000000000000..5e0465060898
--- /dev/null
+++ b/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
@@ -0,0 +1,65 @@
+--- a/configure.in
++++ b/configure.in
+@@ -18,6 +18,7 @@
+ 
+ AC_PROG_CXX
+ AC_PROG_LIBTOOL
++PKG_PROG_PKG_CONFIG
+ 
+ AC_LANG(C++)
+ ACX_PTHREAD
+@@ -40,6 +41,12 @@
+ AC_CHECK_FUNCS([fopen64], ,[AM_CFLAGS=-DUSE_FILE32API])
+ AC_SUBST(AM_CFLAGS)
+ 
++PKG_CHECK_MODULES([MINIZIP], [minizip],
++  [HAVE_MINIZIP=true], [HAVE_MINIZIP=false])
++AC_SUBST([MINIZIP_CFLAGS])
++AC_SUBST([MINIZIP_LIBS])
++AM_CONDITIONAL([HAVE_MINIZIP], [test $HAVE_MINIZIP = true])
++
+ AC_ARG_WITH([epoll],
+   AS_HELP_STRING([--with-epoll=yes|no|probe], [use epoll]),
+   [epoll_option=$withval],
+--- a/framework/common/Makefile.am
++++ b/framework/common/Makefile.am
+@@ -23,7 +23,6 @@
+ 	httpparser.cpp \
+ 	httprequest.cpp \
+ 	httpreply.cpp \
+-	ioapi.c \
+ 	job.cpp \
+ 	langlib.cpp \
+ 	listener.cpp \
+@@ -40,16 +39,13 @@
+ 	stringlessignorecase.cpp \
+ 	tntconfig.cpp \
+ 	tntnet.cpp \
+-	unzip.c \
+ 	unzipfile.cpp \
+ 	urlescostream.cpp \
+ 	urlmapper.cpp \
+ 	util.cpp \
+ 	worker.cpp \
+ 	zdata.cpp \
+-	crypt.h \
+-	ioapi.h \
+-	unzip.h
++	crypt.h
+ 
+ nobase_include_HEADERS = \
+ 	tnt/applicationunlocker.h \
+@@ -144,3 +140,13 @@
+ 	tnt/stressjob.h
+ endif
+ 
++if HAVE_MINIZIP
++libtntnet_la_CXXFLAGS += $(MINIZIP_CFLAGS)
++libtntnet_la_LDFLAGS += $(MINIZIP_LIBS)
++else
++libtntnet_la_SOURCES += \
++	ioapi.c \
++	ioapi.h \
++	unzip.c \
++	unzip.h
++endif
diff --git a/dev-libs/tntnet/files/tntnet.initd b/dev-libs/tntnet/files/tntnet.initd
new file mode 100644
index 000000000000..54982bddd6e6
--- /dev/null
+++ b/dev-libs/tntnet/files/tntnet.initd
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE="/var/run/tntnet.pid"
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting tntnet"
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec /usr/bin/tntnet
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping tntnet"
+	start-stop-daemon --stop --pidfile $PIDFILE --exec /usr/bin/tntnet
+	eend $?
+}
+
+reload() {
+	# FIXME: Remove --stop and --oknodo as soon as baselayout-1 has been removed...
+	# finally...
+	ebegin "Reloading tntnet configuration"
+	start-stop-daemon --stop --oknodo --pidfile $PIDFILE --signal HUP --exec /usr/bin/tntnet
+	eend $?
+}
diff --git a/dev-libs/tntnet/metadata.xml b/dev-libs/tntnet/metadata.xml
index ba07dc7ab1fe..2ba31dae7811 100644
--- a/dev-libs/tntnet/metadata.xml
+++ b/dev-libs/tntnet/metadata.xml
@@ -9,5 +9,5 @@
  <use>
   <flag name="server">Enable tntnet server daemon</flag>
  </use>
- <origin>gentoo-staging</origin>
+ <origin>ports</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild b/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
new file mode 100644
index 000000000000..6012e52da3e1
--- /dev/null
+++ b/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Modular, multithreaded web application server extensible with C++"
+HOMEPAGE="http://www.tntnet.org/"
+SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="gnutls libressl server ssl examples"
+
+RDEPEND="
+	>=dev-libs/cxxtools-2.2.1
+	sys-libs/zlib[minizip]
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=
+			dev-libs/libgcrypt:0
+		)
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/zip
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch )
+
+src_prepare() {
+	# Both fixed in the next release
+	default
+	rm framework/common/{ioapi,unzip}.[ch] || die
+
+	# bug 426262
+	mv configure.{in,ac} || die
+
+	# bug 423697
+	sed -e "s:unzip.h:minizip/unzip.h:" -i framework/defcomp/unzipcomp.cpp || die
+
+	eautoreconf
+
+	sed -i -e 's:@localstatedir@:/var:' etc/tntnet/tntnet.xml.in || die
+}
+
+src_configure() {
+	# default enabled, will not compile without sdk
+	local myconf=( --with-sdk )
+
+	# Prefer gnutls over SSL
+	if use gnutls; then
+		einfo "Using gnutls for ssl support."
+		myconf+=( --with-ssl=gnutls )
+	elif use ssl; then
+		einfo "Using openssl for ssl support."
+		myconf+=( --with-ssl=openssl )
+	else
+		myconf+=( --with-ssl=no )
+	fi
+
+	econf \
+		--disable-static \
+		$(use_with server) \
+		"${myconf[@]}"
+}
+
+src_install() {
+	default
+	dodoc doc/tntnet.pdf
+
+	if use examples; then
+		emake -C sdk/demos maintainer-clean
+		rm -r sdk/demos/{Makefile*,*/Makefile*,*/*.{la,lo},*/.libs} || die
+
+		docinto examples
+		dodoc -r sdk/demos/.
+	fi
+
+	if use server; then
+		rm -f "${ED}"/etc/init.d/tntnet || die
+		newinitd "${FILESDIR}"/tntnet.initd tntnet
+	fi
+
+	# bug 737184
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/tntnet/tntnet-3.0.ebuild b/dev-libs/tntnet/tntnet-3.0.ebuild
index 24ed5d0c4ea1..07f7369d5a46 100644
--- a/dev-libs/tntnet/tntnet-3.0.ebuild
+++ b/dev-libs/tntnet/tntnet-3.0.ebuild
@@ -11,8 +11,8 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-IUSE="doc gnutls server ssl"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="doc gnutls libressl server ssl"
 
 RDEPEND=">=dev-libs/cxxtools-3.0
 	sys-libs/zlib[minizip]
@@ -22,7 +22,8 @@ RDEPEND=">=dev-libs/cxxtools-3.0
 			dev-libs/libgcrypt:0
 		)
 		!gnutls? (
-			dev-libs/openssl:0=
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
 		)
 	)"
 DEPEND="${RDEPEND}"