gentoo resync : 19.03.2019

3 files changed, 9 insertions, 185 deletions

diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest
index 5d6f60efc500..83cc6c8f1546 100644
--- a/net-libs/axtls/Manifest
+++ b/net-libs/axtls/Manifest
@@ -3,13 +3,11 @@ AUX axhttpd.initd 515 BLAKE2B cd09293cd4741269493860cf9e18feb23f1ee496eb23145674
 AUX config 3064 BLAKE2B baedffe4b9e8696a0f933ba761db3f3b8d4d2cf4b910c22077857a43ebcd31ad388423a8c12257a41481a63466d3d4ca85ecd05c75dfa1c9552d17ade2834aaa SHA512 6589e3912ba9231db660b8afe71a6e233807108a8662860667dcae3b6cc4d77fa405503d6eb9d520669cd26fb67f418095b6174b88527c290818fc6400cb65b0
 AUX explicit-libdir-r1.patch 1578 BLAKE2B 1495850dff9ad1dab1e4820158cff5f706ea3420d664ae2fcb7ae9200790e52fbac093ac510812b80d0eaa177a5d210b6b9c43e80d0317ae4621fe3c18b65c01 SHA512 8e10b10eb6959e309e504a0ff2c16795e258f0fab57b97ffb3b64a6c3b84de8e782cc1697983ed7ff0a05a211e43146ecf39588782e8d3c813a4aa053d94557a
 DIST axTLS-1.5.3.tar.gz 1309853 BLAKE2B 8a7db4df4775dc73e35c3a9b2a7bbee783d96f36c122393b72b47a4ed4e66f41e4736dcb7ed8eee4d756760957feafc113a5a4c6df58847b94721b1fb8560196 SHA512 d37fb1341259b079ed234512a96656d67e005c50d9f8e0c856fb140c9da35267624e065134e0cc8310f70e5cf5d196c7dd34f01e2a7a5cc29e77e7ca46c25281
-DIST axTLS-2.1.1.tar.gz 1305982 BLAKE2B 37f6a233139ed290fd96787644eb9c40de57f4ddbf0615bf5fa314907ac497e2be26d66cef0245c5859038e4f2ec4edcca7c6b31d754e2d1989bfeb83cbf9587 SHA512 55619d5e02ce466bab223ebc1036ef39c6491d11126ed70f2712a427de2c7e396086a97d3607c9cb69685ade0763e2e55f2c94f9ba746d8ce7b34b0d1996f51a
-DIST axTLS-2.1.2.tar.gz 1317506 BLAKE2B e331ac1028fa59821e8213c30349839d324e62a24e3cb602050f87dab4ce044964bf04aa5dda1b533fc623ed300bb3a8987c4f5faa7e06c7b5b13e62a46c9d2d SHA512 29e915c0b8549cf93f0664525c84281dd64159dcb3703badec382d203d0209b4f97d7cb875c710610da8e50a7e28d2b94ac161d1fd5fb625d492b15869333ada
 DIST axTLS-2.1.3.tar.gz 1316776 BLAKE2B f60502d34a9d23ac772e1bbe05dc9350ab2385fb3c42480117120923647f122ef7a955289b656b8a70b3ac9817b1bcf947f541739b8d01ebe1eb4340f8d9cf38 SHA512 aa116b671bf0fa059cb77f9e5c0307c48ab476b7ce7017f1d4b2e6362d9d527e534908cb30ec3667eec8c49566f950de3ae4ec0adf5b603fb4efb571eaffc596
 DIST axTLS-2.1.4.tar.gz 1316768 BLAKE2B 3ff302c59313ee80d18a0d5390c591e6259625e62707cc0c7c677add1f7fddffa5b4dc46860ee18dd96fcc227b3cac1179ab290f8af50ac91fe2841fff977cd4 SHA512 ce301719a12f5b836e3c67a169119d2836382b7b97d39f4010b8b8a644a6751b9f948a6c91f8dc6c39d19f5723311af7aca8958f9052e72cb38a9907247af3e6
+DIST axTLS-2.1.5.tar.gz 1318286 BLAKE2B a4f7cb551f3569fbc9a3a7e0e8faa929a5310fdb412283487fedd4a58e36a65529ebd9aec859027ca6df8e69db85b9f908b56f8d37284548b3984da10774ca3d SHA512 d208b174c31a144a779185e77834a34b0fdd15e8cadf4665b8fd76dcb3207955ed687f3d86d1e60f85d108ecccfd900a76e6d045d16a7182001e0b58da09be18
 EBUILD axtls-1.5.3.ebuild 4658 BLAKE2B f58494ccce35e2d488d9a85b9f92c44be6845a474eb2ee6fb6c7bec5b06976510e39ff2da6f2bbbd72c46e7013325f24a1a974e9945a8d241e9e6bce4a957e7a SHA512 49d2cd35f692d828e16b56bb6eb0ed2cdc45329fdbf1641fbab53418e237141ad233121e3d1aa663df146ab13cecfefa6c2318457cbcd6f2cd8db1aa9046b2f9
-EBUILD axtls-2.1.1.ebuild 4666 BLAKE2B aeb07ee2ba416c4d71a7e6276408415c5434c1b26700385cf749ec7ff514dc3d81bf82aa5e0423d1eac226ea2ec3fd009957b7ea864967656c178ebf4d5c8f6c SHA512 433b2d36a5e0b0e4b32d7b4724c6dbd7dcc243e5888a51c51cc2da435c908f472ba09cfc5a059cf4a8eb2a721128a3e3bc2ec160b905454b1001d3507adb5a7a
-EBUILD axtls-2.1.2.ebuild 4666 BLAKE2B aeb07ee2ba416c4d71a7e6276408415c5434c1b26700385cf749ec7ff514dc3d81bf82aa5e0423d1eac226ea2ec3fd009957b7ea864967656c178ebf4d5c8f6c SHA512 433b2d36a5e0b0e4b32d7b4724c6dbd7dcc243e5888a51c51cc2da435c908f472ba09cfc5a059cf4a8eb2a721128a3e3bc2ec160b905454b1001d3507adb5a7a
 EBUILD axtls-2.1.3.ebuild 4680 BLAKE2B 97053559414aad27e913fdb547a84f2cd4bced639eff5e9a6e50d6b45617cd43fe32257ab161a7fe572cb54f926a0523bfbf6f2734fdc11487d0f3016085abfd SHA512 9762f6e4e8f517c1ee24012f93413e5fdb36016b3dd310f6ad02ddcbd4521a09209a2e2b18e6f5da26e23ce3ea8ced7514b7b59bb0cddf1f00d8ac9a9bfec096
 EBUILD axtls-2.1.4.ebuild 4687 BLAKE2B a530f9d57e16f65587028a293f0f1ddcb9efa96493ad8d6082b1217a43f1b3645629b2b2910075b6b5ffad4a380a0403b1358f171d352b2d0cf9f470e42939f7 SHA512 e266f60307098635db515eca0e6dc4aaed14d6c0ebd9b11184afe8bb34a20a1eee9367e8ee8e44ce843811d13c39ea7ba8b114657cdeeaa9c74656175ed33dda
+EBUILD axtls-2.1.5.ebuild 4684 BLAKE2B b5fb76ad45727676b7c5fdd71041257531770a95e22b2df59e9e6a068f790461c4c9e8c7a27f1c4c26c44b348738d98fe06f3ed3facee1978cf88dd8011d03c5 SHA512 6609be9ae877b62c253862f89a8c3d640e5806e68db6ad83ecace087d8edb5f213e08d50f98204a64678b656d37b0557a3db13edc8227f369344bc987c6e0d27
 MISC metadata.xml 632 BLAKE2B b83cd23e97a4fdd09ea7354c1245dd65e54c50b418538c2ef71ae9054626861b6516268fcd37485ba19d1981024c47d869cdce00b276473200a7352c29072b1a SHA512 bfd387d998bcf2a457ff01752b553307b0de430cb9372115b366ab80a10866ede54b8ee149c726aba6f12c8cc3c5ea089dc5b25083e95594d8912e181a8626b0
diff --git a/net-libs/axtls/axtls-2.1.2.ebuild b/net-libs/axtls/axtls-2.1.2.ebuild
deleted file mode 100644
index 26c6da079834..000000000000
--- a/net-libs/axtls/axtls-2.1.2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib multilib-minimal savedconfig toolchain-funcs user
-
-################################################################################
-# axtls CONFIG MINI-HOWTO
-#
-# Note: axtls is highly configurable and uses mconf, like the linux kernel.
-# You can configure it in a couple of ways:
-#
-# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
-# you want, and possibly a lot more.
-#
-# 2) You can create your own configuration file by doing
-#
-#	FEATURES="keepwork" USE="savedconfig -*" emerge axtls
-#	cd /var/tmp/portage/net-libs/axtls*/work/axTLS
-#	make menuconfig
-#
-# Now configure axtls as you want.  Finally save your config file:
-#
-#	cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
-#
-# where ${PV} is the current version.  You can then run emerge again with
-# your configuration by doing
-#
-#	USE="savedconfig" emerge axtls
-#
-################################################################################
-
-MY_PN=${PN/tls/TLS}
-
-DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
-HOMEPAGE="http://axtls.sourceforge.net/"
-SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-code"
-
-LICENSE="BSD GPL-2"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
-
-IUSE="httpd cgi-lua cgi-php static static-libs doc"
-
-# TODO: add ipv6, and c#, java, lua, perl bindings
-# Currently these all have some issue
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="
-	httpd? (
-		cgi-lua? ( dev-lang/lua )
-		cgi-php? ( dev-lang/php[cgi] )
-	)"
-
-#Note1: static, cgi-* makes no sense if httpd is not given
-REQUIRED_USE="
-	static? ( httpd )
-	cgi-lua? ( httpd )
-	cgi-php? ( httpd )"
-
-AXTLS_GROUP="axtls"
-AXTLS_USER="axtls"
-
-pkg_setup() {
-	use httpd && {
-		ebegin "Creating axtls user and group"
-		enewgroup ${AXTLS_GROUP}
-		enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
-	}
-}
-
-src_prepare() {
-	tc-export AR CC
-
-	epatch "${FILESDIR}/explicit-libdir-r1.patch"
-
-	#We want CONFIG_DEBUG to avoid stripping
-	#but not for debugging info
-	sed -i -e 's: -g::' config/Rules.mak || die
-	sed -i -e 's: -g::' config/makefile.conf || die
-
-	multilib_copy_sources
-}
-
-use_flag_config() {
-	cp "${FILESDIR}"/config config/.config || die
-
-	#Respect CFLAGS/LDFLAGS
-	sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
-		config/.config || die
-	sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDLAGS}\":" \
-		config/.config || die
-
-	#The logic is that the default config file enables everything and we disable
-	#here with sed unless a USE flags says to keep it
-	if use httpd; then
-		if ! use static; then
-			sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
-				config/.config || die
-		fi
-		if ! use cgi-php && ! use cgi-lua; then
-			sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
-				config/.config || die
-		fi
-		if ! use cgi-php; then
-			sed -i -e 's:,.php::' config/.config || die
-		fi
-		if ! use cgi-lua; then
-			sed -i -e 's:\.lua,::' \
-				-e 's:lua:php:' \
-				-e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
-				config/.config || die
-		fi
-	else
-		sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
-			config/.config || die
-	fi
-
-	yes "n" | emake -j1 oldconfig > /dev/null || die
-}
-
-multilib_src_configure() {
-	#Per-ABI substitutions.
-	sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
-		Makefile || die
-
-	#Use CC as the host compiler for mconf
-	sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
-		config/Rules.mak || die
-
-	if use savedconfig; then
-		restore_config config/.config
-		if [[ -f config/.config ]]; then
-			ewarn "Using saved config, all other USE flags ignored"
-		else
-			ewarn "No saved config, seeding with the default"
-			cp "${FILESDIR}"/config config/.config || die
-		fi
-		yes "" | emake -j1 oldconfig > /dev/null || die
-	else
-		use_flag_config
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use savedconfig; then
-		save_config config/.config
-	fi
-
-	emake PREFIX="${ED}/usr" install
-
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
-	fi
-
-	# The build system needs to install before it builds docs
-	if multilib_is_native_abi && use doc; then
-		emake docs
-		dodoc -r docsrc/html
-	fi
-}
-
-multilib_src_install_all() {
-	if [[ -f "${ED}"/usr/bin/htpasswd ]]; then
-		mv "${ED}"/usr/bin/{,ax}htpasswd || die
-	fi
-
-	if use httpd; then
-		newinitd "${FILESDIR}"/axhttpd.initd axhttpd
-		newconfd "${FILESDIR}"/axhttpd.confd axhttpd
-	fi
-
-	docompress -x /usr/share/doc/${PF}/README
-	dodoc README
-}
diff --git a/net-libs/axtls/axtls-2.1.1.ebuild b/net-libs/axtls/axtls-2.1.5.ebuild
index 26c6da079834..490ad132093a 100644
--- a/net-libs/axtls/axtls-2.1.1.ebuild
+++ b/net-libs/axtls/axtls-2.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-inherit eutils multilib multilib-minimal savedconfig toolchain-funcs user
+inherit multilib multilib-minimal savedconfig toolchain-funcs user
 
 ################################################################################
 # axtls CONFIG MINI-HOWTO
@@ -40,7 +40,7 @@ S="${WORKDIR}/${PN}-code"
 
 LICENSE="BSD GPL-2"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 IUSE="httpd cgi-lua cgi-php static static-libs doc"
 
@@ -73,13 +73,15 @@ pkg_setup() {
 src_prepare() {
 	tc-export AR CC
 
-	epatch "${FILESDIR}/explicit-libdir-r1.patch"
+	eapply "${FILESDIR}/explicit-libdir-r1.patch"
 
 	#We want CONFIG_DEBUG to avoid stripping
 	#but not for debugging info
 	sed -i -e 's: -g::' config/Rules.mak || die
 	sed -i -e 's: -g::' config/makefile.conf || die
 
+	eapply_user
+
 	multilib_copy_sources
 }