gentoo resync : 02.09.2020

4 files changed, 37 insertions, 131 deletions

diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index 5a67a2dedac5..2d74d9bcfd24 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -1,7 +1,6 @@
-AUX tntnet-2.0-zlib-minizip.patch 1432 BLAKE2B 137e4deaa5c2e6bd57695e19d643657c932c268adfb22f3c593e2bfb312fa979ecc87e14195bf42690883c1fdcde773e91af33823a3abc5ccd592a1cd705bac8 SHA512 13909d58fa2ea73c074816498faaa94dadc3fb750179b8f290600eb8a1adaf6a45464d0ee412ea9d038ab5e524a13da0e44fb07424388f28f16df538845dda07
+AUX tntnet-2.0-zlib-minizip.patch 1288 BLAKE2B 2f6ea37c36bb58e7ec2b9deec00579a86dbacdbd58a82f3516ca8db4a3f67cbf72c4558d5ca71f9973742632efd0c7bfa6062e83e46d9a8e18612dbecb26cb71 SHA512 e0aa06a15a6e4b9472cf2621236b71eab7d074a99bb82df768dce6875c99d634bee72cf15a456821cbbf7804dae247ede3f0839921a151f3750e5dcfa9028ce3
 AUX tntnet.initd 669 BLAKE2B fbe3bd3fef3cc7519b26b1e15f1eb353c6d7afedcb59cc1a594bc7a53c19814e4107115dd6877f23c7a5de1305f859f5980fb3784df3bda4924a9f6c425ee67c SHA512 f67aa89030da69a7278af9c2b7c2b887373be54e711b31fc362df938baf4c5d09df6bc04568ef70a9eacd73582bb58891a9651782d29392cad3d0a1cd0bb8ccf
 DIST tntnet-2.2.1.tar.gz 1127500 BLAKE2B bdb55c879ed00afdde1bfe1560ad4228effaa05b35996df3860631c90c93e57096f590b5ddfd8e8ff0356837e839e2f6ed8f4f6fe8ed478275926dd1143b2051 SHA512 78a26713498fd6eabb0b4a247bb20c130ce967ed22ce5c54da4b1300534dd40155aa62a2dc770be4eca720cadeceac283978a5dc3ce418728994af72e4d8eac1
-EBUILD tntnet-2.2.1-r1.ebuild 1886 BLAKE2B 7c56c11c50147a919bcdc42fdb0e5421f68be73b1bced4c861f422405449b7a512b4dc25fa54be3906a1e230e3a2727742f9e69cfeb455a32a6748142b8b6601 SHA512 0fb812dca2d2cd37a60e21cd3ec622c7c8c5225daefe3966e3cfcc8ea051a228c0ba91a21a0345623e4012e44dba47fd6a777b6eba0deaa9fef48814f1bd16f0
-EBUILD tntnet-2.2.1-r2.ebuild 1940 BLAKE2B 0a1463aaced01a5b42165ea2acf2144023ef12aba89811feb8718d10f4e950be12055af68aa6bd103dbaa954663d994c5bf51e9d1b19903f57012337f41737d5 SHA512 dc6d2ac1921609e9e19fcfaa453fbc04867838a33fd8849e1ba5a0e9eb7b2c96dbf589434d27afe407505fd3d6ec2fb0a7c64c1da2015f92c9c9954466f05d1e
+EBUILD tntnet-2.2.1-r3.ebuild 1900 BLAKE2B 273821b9179d910302c61511a7cd80dff6aeb16091dfdd387776f2953a8c1fc0338ac534d3958e3adf45fbfd9fd2d7742b22cafcfb42f3255bc0cc958d5b530e SHA512 db7ced55aceb5ed38ba87107a5d2bb63aebf3471b68a87592e5bca48bd23301d35ad6fddd2fb095d3371beb8a89c2a55b73a341f474c0cd33cc1186e952a9e05
 EBUILD tntnet-2.2.1.ebuild 1796 BLAKE2B 64ff6856799c154c0eeeac127883043c30e6236cbfe5ae11b151e67712dab7ca2b2e7b8fccf03e7c79a8839921389f153fad2f54ac82d6f724b4d8e86bb4b52c SHA512 8b3d3805a2498c06fd58b83a22e21b21c697743992b248e0b2b896b3c8381ab6665ad9ce92bbb6b2b3a68bea6fe67ad3748c80ba056f05e2ff0a1d35df7e10df
 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
index 07b4836319d4..5e0465060898 100644
--- a/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
+++ b/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
@@ -8,9 +8,9 @@
  
  AC_LANG(C++)
  ACX_PTHREAD
-@@ -25,6 +26,12 @@
- AC_CHECK_HEADER([zlib.h], , AC_MSG_ERROR([zlib not found]))
- AC_CHECK_HEADER([cxxtools/net/tcpsocket.h], , AC_MSG_ERROR([cxxtools headers not found]))
+@@ -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])
@@ -23,7 +23,7 @@
    [epoll_option=$withval],
 --- a/framework/common/Makefile.am
 +++ b/framework/common/Makefile.am
-@@ -23,7 +23,6 @@ libtntnet_la_SOURCES = \
+@@ -23,7 +23,6 @@
  	httpparser.cpp \
  	httprequest.cpp \
  	httpreply.cpp \
@@ -31,7 +31,7 @@
  	job.cpp \
  	langlib.cpp \
  	listener.cpp \
-@@ -41,16 +40,13 @@ libtntnet_la_SOURCES = \
+@@ -40,16 +39,13 @@
  	stringlessignorecase.cpp \
  	tntconfig.cpp \
  	tntnet.cpp \
@@ -49,7 +49,7 @@
  
  nobase_include_HEADERS = \
  	tnt/applicationunlocker.h \
-@@ -145,3 +141,13 @@ noinst_HEADERS += \
+@@ -144,3 +140,13 @@
  	tnt/stressjob.h
  endif
  
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
deleted file mode 100644
index 617f01ca9a91..000000000000
--- a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-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 libressl 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? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl: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
-}
-
-# @stable ~26may2020
\ No newline at end of file
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r2.ebuild b/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
index 2a1e7bb6230c..6012e52da3e1 100644
--- a/dev-libs/tntnet/tntnet-2.2.1-r2.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Modular, multithreaded web application server extensible with C++"
 HOMEPAGE="http://www.tntnet.org/"
@@ -14,11 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="gnutls libressl server ssl examples"
 
-RDEPEND=">=dev-libs/cxxtools-2.2.1
+RDEPEND="
+	>=dev-libs/cxxtools-2.2.1
 	sys-libs/zlib[minizip]
 	ssl? (
 		gnutls? (
-			>=net-libs/gnutls-1.2.0
+			net-libs/gnutls:0=
 			dev-libs/libgcrypt:0
 		)
 		!gnutls? (
@@ -27,18 +28,19 @@ RDEPEND=">=dev-libs/cxxtools-2.2.1
 		)
 	)"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	app-arch/zip"
+BDEPEND="
+	app-arch/zip
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch )
 
 src_prepare() {
 	# Both fixed in the next release
-	eapply "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch
+	default
 	rm framework/common/{ioapi,unzip}.[ch] || die
 
 	# bug 426262
-	if has_version ">sys-devel/autoconf-2.13"; then
-		mv configure.in configure.ac
-	fi
+	mv configure.{in,ac} || die
 
 	# bug 423697
 	sed -e "s:unzip.h:minizip/unzip.h:" -i framework/defcomp/unzipcomp.cpp || die
@@ -46,49 +48,46 @@ src_prepare() {
 	eautoreconf
 
 	sed -i -e 's:@localstatedir@:/var:' etc/tntnet/tntnet.xml.in || die
-
-	default
 }
 
 src_configure() {
-	local myconf=""
+	# default enabled, will not compile without sdk
+	local myconf=( --with-sdk )
 
-	# Prefer gnutls above SSL
+	# Prefer gnutls over SSL
 	if use gnutls; then
 		einfo "Using gnutls for ssl support."
-		myconf="${myconf} --with-ssl=gnutls"
+		myconf+=( --with-ssl=gnutls )
 	elif use ssl; then
 		einfo "Using openssl for ssl support."
-		myconf="${myconf} --with-ssl=openssl"
+		myconf+=( --with-ssl=openssl )
 	else
-		myconf="${myconf} --with-ssl=no"
+		myconf+=( --with-ssl=no )
 	fi
 
-	# default enabled, will not compile without sdk
-	myconf="${myconf} --with-sdk"
-
 	econf \
+		--disable-static \
 		$(use_with server) \
-		${myconf}
+		"${myconf[@]}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog README TODO doc/tntnet.pdf
+	default
+	dodoc doc/tntnet.pdf
 
 	if use examples; then
-		cd "${S}/sdk/demos"
-		emake clean
-		rm -rf .deps */.deps .libs */.libs
-		cd "${S}"
+		emake -C sdk/demos maintainer-clean
+		rm -r sdk/demos/{Makefile*,*/Makefile*,*/*.{la,lo},*/.libs} || die
 
 		docinto examples
-		dodoc -r sdk/demos/*
+		dodoc -r sdk/demos/.
 	fi
 
 	if use server; then
-		rm -f "${D}/etc/init.d/tntnet"
-		newinitd "${FILESDIR}/tntnet.initd" tntnet
+		rm -f "${ED}"/etc/init.d/tntnet || die
+		newinitd "${FILESDIR}"/tntnet.initd tntnet
 	fi
+
+	# bug 737184
+	find "${ED}" -name '*.la' -delete || die
 }