gentoo resync : 11.05.2021

6 files changed, 2 insertions, 280 deletions

diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index 5b65104d2824..4bdf966ea130 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -1,10 +1,5 @@
-AUX tntnet-2.0-zlib-minizip.patch 1288 BLAKE2B 2f6ea37c36bb58e7ec2b9deec00579a86dbacdbd58a82f3516ca8db4a3f67cbf72c4558d5ca71f9973742632efd0c7bfa6062e83e46d9a8e18612dbecb26cb71 SHA512 e0aa06a15a6e4b9472cf2621236b71eab7d074a99bb82df768dce6875c99d634bee72cf15a456821cbbf7804dae247ede3f0839921a151f3750e5dcfa9028ce3
 AUX tntnet-3.0-autoconf-2.70.patch 2238 BLAKE2B 65b5cd276f35ce4b046dc1b6ce4be086935eba283266520b7ba07db6e83b066dc6233d40f80e13131c64e28412ef7974326339f5b2d694a8c2e87b5610dea3bc SHA512 7cebddc0e366499935874706a58620e5f277d5f39a1644733895d2899a97818313e70168c9d9ec91313c9afe9e2a513367b99c109e3b6065c5ab2a688ec05a80
 AUX tntnet-3.initd 550 BLAKE2B b31fd930b69c62c3439096c8de229a256d3f77cb18be752902b577950bb757cb06bd0f19005b25405c263f64d0d8db5d18b0b914d552a25875620c8c44ce090d SHA512 1be6437278de9319806a7fd4ef8cfb7674e4c04b156c2342f850d8ee9aa33c4c490cb64243592f1d6605e96cb51192216f859eac2a59e7aaea8d2730a9dedc0a
-AUX tntnet.initd 669 BLAKE2B fbe3bd3fef3cc7519b26b1e15f1eb353c6d7afedcb59cc1a594bc7a53c19814e4107115dd6877f23c7a5de1305f859f5980fb3784df3bda4924a9f6c425ee67c SHA512 f67aa89030da69a7278af9c2b7c2b887373be54e711b31fc362df938baf4c5d09df6bc04568ef70a9eacd73582bb58891a9651782d29392cad3d0a1cd0bb8ccf
-DIST tntnet-2.2.1.tar.gz 1127500 BLAKE2B bdb55c879ed00afdde1bfe1560ad4228effaa05b35996df3860631c90c93e57096f590b5ddfd8e8ff0356837e839e2f6ed8f4f6fe8ed478275926dd1143b2051 SHA512 78a26713498fd6eabb0b4a247bb20c130ce967ed22ce5c54da4b1300534dd40155aa62a2dc770be4eca720cadeceac283978a5dc3ce418728994af72e4d8eac1
 DIST tntnet-3.0.tar.gz 879598 BLAKE2B 34cbabc52eb28be051da8593eb32d66aa701785be4002056d9be34d28871ae886a87eb1d66e71393a9f9d96110a3d826acead6c6db5c6f2829db797ac449b82e SHA512 5fe1f8750e10537919174e953be92b73e12a9227c50a02dcf2f23a266304ad3ad77d29823e8cdd3e2fa92dba936c2624f140943d021790e8137609bbeb0d3d81
-EBUILD tntnet-2.2.1-r3.ebuild 1838 BLAKE2B 83dc28513d4f4dab4de68ba0bfac92260ccc9734f1006fceaf7a8c86d11dec0456e3bb17e209321e5674fd8c720e47dafc7a229f40b8d3664ffe79374af3df46 SHA512 17863a37e636cb220d150a4edd3c04eb6019fc36f61fd7ed3b286c2c65a579e37e39b284247e9096e8b771f5080c38f1b1e6402c688da37b8d831115e2078a0f
-EBUILD tntnet-2.2.1.ebuild 1796 BLAKE2B 5c76c3354d42c2a76df1fc7143fe499dd7570af798a744b705d3c10a081cfacac1902b723df6de7b221fc90fc621ae8986af25b1c74a5240a567ab4a088d0d57 SHA512 865c94fddabb875f9aea48d2caf9ab44bf8056d0714166ebff613191fd2a263033d583f34b237bfe2a3101da8c996db1b8e511d4f3ebb5cbe1853cee187966a9
-EBUILD tntnet-3.0.ebuild 1451 BLAKE2B d1a58ddfabb0682199cef445ec53967c0bb19ab4eba8c9651fb9579d163b0bc65e7af0456589277059e4e26b97092f387c1af554e05e9416cc34574af96755a1 SHA512 bff9d33294b934bc3d5ce1ba1fbe497b34f5538c9d709cffadf649f0453ce5631528b855d36fd813db3ab935a97cfba2fb21ff8e60348639fe524a64201946b5
+EBUILD tntnet-3.0.ebuild 1450 BLAKE2B 699723d62961e3947f071f77dd1187e208b0bf16843c423150dd434de3601fb5e03d990dbac66ef11e5cfd80dd4b4f7af30255e0aec395ccda2316c766bb3d1b SHA512 dff4d70ca22949d77d0a3badabb1a932c29e357b3dfec27f8918d6fe13ef5f0a2a3157278aa125923799e1283f88935583cfe37ccb5ca7fdce3bc9c2ccf616a3
 MISC metadata.xml 324 BLAKE2B 83eb2795b911c894a248b3180a316063c29de220de0857b99a1eecf31312a7dccd2ae90afd3cfb7e419511022cb4ca0887f45c25042b572a117c5f23c5c4affc SHA512 70796a55ef89e8b85db1524a52525c79fd11870da7b0156a0dce2c91ebc932c61b8088474661d4fe0ede77c617599ce3266e930aaea8b2e9a7ce99e9a9f8c686
diff --git a/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch b/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
deleted file mode 100644
index 5e0465060898..000000000000
--- a/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- 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
deleted file mode 100644
index 54982bddd6e6..000000000000
--- a/dev-libs/tntnet/files/tntnet.initd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/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/tntnet-2.2.1-r3.ebuild b/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
deleted file mode 100644
index bb9f702a21ea..000000000000
--- a/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 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 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? (
-			dev-libs/openssl: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-2.2.1.ebuild b/dev-libs/tntnet/tntnet-2.2.1.ebuild
deleted file mode 100644
index ec2ac1e5af66..000000000000
--- a/dev-libs/tntnet/tntnet-2.2.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools epatch
-
-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="doc gnutls server ssl examples"
-
-RDEPEND=">=dev-libs/cxxtools-2.2.1
-	sys-libs/zlib[minizip]
-	ssl? (
-		gnutls? (
-			>=net-libs/gnutls-1.2.0
-			dev-libs/libgcrypt:0
-		)
-		!gnutls? ( dev-libs/openssl:0= )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/zip"
-
-src_prepare() {
-	# Both fixed in the next release
-	epatch "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch
-	rm framework/common/{ioapi,unzip}.[ch] || die
-
-	# bug 423697
-	sed -e "s:unzip.h:minizip/unzip.h:" -i framework/defcomp/unzipcomp.cpp
-
-	eautoreconf
-
-	sed -i -e 's:@localstatedir@:/var:' etc/tntnet/tntnet.xml.in || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# Prefer gnutls above SSL
-	if use gnutls; then
-		einfo "Using gnutls for ssl support."
-		myconf="${myconf} --with-ssl=gnutls"
-	elif use ssl; then
-		einfo "Using openssl for ssl support."
-		myconf="${myconf} --with-ssl=openssl"
-	else
-		myconf="${myconf} --with-ssl=no"
-	fi
-
-	# default enabled, will not compile without sdk
-	myconf="${myconf} --with-sdk"
-
-	econf \
-		$(use_with server) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog README TODO
-	if use doc; then
-		dodoc doc/*.pdf
-	fi
-
-	if use examples; then
-		cd "${S}/sdk/demos"
-		emake clean
-		rm -rf .deps */.deps .libs */.libs
-		cd "${S}"
-
-		insinto /usr/share/doc/${PF}/examples
-		doins -r sdk/demos/*
-	fi
-
-	if use server; then
-		rm -f "${D}/etc/init.d/tntnet"
-		newinitd "${FILESDIR}/tntnet.initd" tntnet
-	fi
-}
diff --git a/dev-libs/tntnet/tntnet-3.0.ebuild b/dev-libs/tntnet/tntnet-3.0.ebuild
index 2dd289308caa..24ed5d0c4ea1 100644
--- a/dev-libs/tntnet/tntnet-3.0.ebuild
+++ b/dev-libs/tntnet/tntnet-3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
 IUSE="doc gnutls server ssl"
 
 RDEPEND=">=dev-libs/cxxtools-3.0