gentoo resync : 20.03.2021

5 files changed, 2 insertions, 262 deletions

diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index ee7f584878df..4bfb4fa01fcb 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -1,13 +1,8 @@
 AUX zerotier-1.4.6-add-armv7a-support.patch 419 BLAKE2B 8670511fb18c3833d17b601e692e141281d429f47281d12b420e5bf84c61a0312642be00785284739d68c33c353ff76b76b0651b03de4789cf7112c352c39648 SHA512 e2be80e39ee1a6f554b60c481f11e04c60a30bd8b198142aaeb7479365fee3d3e73ed9365f1ad7795c33781bf83693cc51a86ea5e294c63030fb111872dbad3a
-AUX zerotier-1.4.6-fixup-neon-support.patch 2667 BLAKE2B 39feb92294b2221fa61fbfe93c894bad4218528161854f74d5b5e9c301aef86b9f5a84de567d5050463d323a309179b4efb8e95eb09b22424c4ecfcc065a3da6 SHA512 f032b95f485ae264577f4c7f579a9f4e9ab4a82a5c806c6dc9bd37fb4262d60d98088a19b27a545893d1deedbefb7f1ffdeb52ac102d0b3cfbb82c46b3abca9a
 AUX zerotier-1.4.6-respect-ldflags.patch 455 BLAKE2B 2add558b3770e35d9318965eee27219366af4660935d2ee1261bc7735cbd77405ec8c8677f95ad31e02a0f81a9b9f1984b89ba2aeff3b919a84adfdebf7518bf SHA512 8b00309912e64a33086173f0c14649115bf82d5ceaf838642dc604e6ae1ec49d883c90ad5fcd93c9291fb7491cdd06b4d609ffc80c512425ee7c9988bb67149f
 AUX zerotier.init 437 BLAKE2B a43cc014d5ad311d14b13324e118c73c694623621c252ad6957af53064ccb53cda7c028cf2348e6999508262e86576fdd5c02feba81af6e1a9a88653bbd7a0e7 SHA512 938dcdf16228ca62a14c18658d746054590104dc50028d5dc4d56dba139dfc894d88d567e918533820df81723d56411cc046050b4b7c0e11e1128bef599fb12a
 AUX zerotier.init-r1 285 BLAKE2B cb30206b6b2fa00e9b77bee83d0ef61bc864146337e06c6900a6e5bcad95dab87dc88f30a1407f87ecea839b99f5aadd7807719ffaefd7be4137986284d1e43e SHA512 911a90d14bbacb2e5a139d50716850d7286f893769bf0f7fb02a0829293d5fb233ad44255b8ffc5c1d4aee4fbe1361be0f1826732b50de07bd1d418f77651faa
 AUX zerotier.service 179 BLAKE2B 8c27616a5092084a2450f08e5046528ce25f7697fca914436d9dddd003538e4d9bcfb50126e522936cf997d5f225f32751f59229d28cd6e85778b6b1bed8edb2 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701
-DIST zerotier-1.4.6.tar.gz 13055818 BLAKE2B 46003d9c3ad09e30dbefaa441422ed4570bdbdfb99f2f24fb82246f9e970501d38d96c19dc9771a1d0d30bc49bd8be2b79ebd2e5c8bd85e88b738b29f0a1dcc3 SHA512 72f00602f67190d03ac0c8caa6b79e7f346b10745bdf772c68f77a3a940cdd718d05ec642bc862a6235aab9bd3bfefb0c57571f358ae55f38761f45500f0f189
-DIST zerotier-1.6.2.tar.gz 16020599 BLAKE2B 91da6c85f8d3dfd993a9aea9cd2a8b33e560d5475413fde8bef0a69df7d89503a66b1967ac336bd2213f6ffc35e452f665d37ceb8d9ae53cf5e5d4d352775e74 SHA512 8abb31ba8aed4c187a4e88ffe6f536ed7d0fe2421f89ae706eef620cc9508372a089ce9e9579df372e21b6dab271bea91e2d12b424dd85ece8c19885a6caa643
 DIST zerotier-1.6.3.tar.gz 16020606 BLAKE2B d958ac3276b34b0b99dcce7178ca08a7ac398831172103bb26ddb32814f9043103c9cde6e55853a20d090c1b239746c65cd70de3b9e498dc174baaf6ca403a66 SHA512 56052a9cd50f2a754ba8979fec9b7ba6caf54d83582428b1b43d8b54e5caf388adccbb955fcb9c3fd5b3d7ebde7663023ca4a9a3805b877c3063fa72e23cbed0
-EBUILD zerotier-1.4.6.ebuild 1802 BLAKE2B 3fa9f53c3568d53c528a20610d58400e3d51ec02d6b6c3781350fddcd133dc8c30aae6f74d4b6a43e06708bc3b71281b60a1c0958b2e1390d0caeb62d5c04d23 SHA512 712437b743c70d5941f72206c0ab9025b85809453ddf5c33e8d18ace4a9771f3c5c861b491758cc2f2b8ee455a50738f7d0b16ac3d87784998ba966f8d56fbb1
-EBUILD zerotier-1.6.2.ebuild 1776 BLAKE2B aa98cbb7880d7e034fbd403285202058313586975a9244f7691c77de9c96e60706a90be3e5cf32f9be34922e4e6468a2b7227a866c4298bcd15cf6817f2065d8 SHA512 19be19a84d78d8e3fa979d0cdb2c890e11b078c83b1f6d9e5b667998d9508757796aea75582cb3e29311aaf0dc3f663825dcc0a433782f88954cf1298e10b67f
 EBUILD zerotier-1.6.3.ebuild 1776 BLAKE2B aa98cbb7880d7e034fbd403285202058313586975a9244f7691c77de9c96e60706a90be3e5cf32f9be34922e4e6468a2b7227a866c4298bcd15cf6817f2065d8 SHA512 19be19a84d78d8e3fa979d0cdb2c890e11b078c83b1f6d9e5b667998d9508757796aea75582cb3e29311aaf0dc3f663825dcc0a433782f88954cf1298e10b67f
-MISC metadata.xml 482 BLAKE2B 8aaebdfd4d9a6454f3a426fb472a12e50f64e7cc356795b10175f9a3e3bfc5a181f503d609bb431b9619e73675ffa6e24059452696cdbe6f2d4aeff5f3a8cd11 SHA512 54bdb668f32bc05faee9dca6f29c3648127abe60c5338a4f1cdb71b3812e33314f1e6b691801caeb3fc3e5dfaa8ccc89b9f73469eb964321fc9f983ec669dadc
+MISC metadata.xml 482 BLAKE2B 20cfeda377f02fe4f2f86119bf088ad0b7e4d5384b482988ec440991b91e6cfd4192a7404c38d53740b545f1d084c9c248a9ada603cace307815bb6fd6de5469 SHA512 f3ab7f82955ef27184446a8e657e9b6f52d473ccc7f3dc74f7945d4840c77c75d1b1f12162ae9fc74bbec067baeccc75f79fab98638682bb107911afdfe069d9
diff --git a/net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch b/net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch
deleted file mode 100644
index a6ca7f7ca382..000000000000
--- a/net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- a/make-linux.mk	2019-09-27 21:35:39.000000000 -0700
-+++ b/make-linux.mk	2019-09-27 21:36:01.000000000 -0700
-@@ -118,6 +118,7 @@
- # Determine system build architecture from compiler target
- CC_MACH=$(shell $(CC) -dumpmachine | cut -d '-' -f 1)
- ZT_ARCHITECTURE=999
-+ZT_DISABLE_NEON?=
- ifeq ($(CC_MACH),x86_64)
- 	ZT_ARCHITECTURE=2
- 	ZT_USE_X64_ASM_SALSA=1
-@@ -158,57 +159,57 @@
- ifeq ($(CC_MACH),arm)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=0
- endif
- ifeq ($(CC_MACH),armel)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=1
- endif
- ifeq ($(CC_MACH),armhf)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=0
- endif
- ifeq ($(CC_MACH),armv6)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=1
- endif
- ifeq ($(CC_MACH),armv6l)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=1
- endif
- ifeq ($(CC_MACH),armv6zk)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=1
- endif
- ifeq ($(CC_MACH),armv6kz)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=1
- endif
- ifeq ($(CC_MACH),armv7)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=0
- endif
- ifeq ($(CC_MACH),armv7a)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=0
- endif
- ifeq ($(CC_MACH),armv7l)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=0
- endif
- ifeq ($(CC_MACH),armv7hl)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
--	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+	ZT_DISABLE_NEON?=0
- endif
- ifeq ($(CC_MACH),arm64)
- 	ZT_ARCHITECTURE=4
-@@ -268,10 +269,13 @@
- 		override CFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
- 		override CXXFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
- 		ZT_USE_ARM32_NEON_ASM_CRYPTO=0
--	else
--		override CFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions
--		override CXXFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions
-+	endif
-+	ifeq ($(ZT_DISABLE_NEON),1)
-+		override CFLAGS+=-mno-unaligned-access -marm -fexceptions
-+		override CXXFLAGS+=-mno-unaligned-access -marm -fexceptions
- 		ZT_USE_ARM32_NEON_ASM_CRYPTO=0
-+	else
-+		ZT_USE_ARM32_NEON_ASM_CRYPTO=1
- 	endif
- endif
- 
diff --git a/net-misc/zerotier/metadata.xml b/net-misc/zerotier/metadata.xml
index e422a4abe39a..f7fa88e2deea 100644
--- a/net-misc/zerotier/metadata.xml
+++ b/net-misc/zerotier/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/net-misc/zerotier/zerotier-1.4.6.ebuild b/net-misc/zerotier/zerotier-1.4.6.ebuild
deleted file mode 100644
index 49c7f7ed5ff9..000000000000
--- a/net-misc/zerotier/zerotier-1.4.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic llvm systemd toolchain-funcs
-
-HOMEPAGE="https://www.zerotier.com/"
-DESCRIPTION="A software-based managed Ethernet switch for planet Earth"
-SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="clang neon"
-
-S="${WORKDIR}/ZeroTierOne-${PV}"
-
-RDEPEND="
-	dev-libs/json-glib
-	net-libs/libnatpmp
-	net-libs/miniupnpc:=
-	clang? ( >=sys-devel/clang-6:* )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-respect-ldflags.patch"
-	"${FILESDIR}/${P}-add-armv7a-support.patch"
-	"${FILESDIR}/${P}-fixup-neon-support.patch" )
-
-DOCS=( README.md AUTHORS.md )
-
-LLVM_MAX_SLOT=9
-
-llvm_check_deps() {
-	if use clang ; then
-		if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-			ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-
-		einfo "Will use LLVM slot ${LLVM_SLOT}!"
-	fi
-}
-
-pkg_setup() {
-	if use clang && ! tc-is-clang ; then
-		export CC=${CHOST}-clang
-		export CXX=${CHOST}-clang++
-	else
-		tc-export CXX CC
-	fi
-	use neon || export ZT_DISABLE_NEON=1
-}
-
-src_compile() {
-	append-ldflags -Wl,-z,noexecstack
-	emake CXX="${CXX}" STRIP=: one
-}
-
-src_test() {
-	emake selftest
-	./zerotier-selftest || die
-}
-
-src_install() {
-	default
-	# remove pre-zipped man pages
-	rm "${ED}"/usr/share/man/{man1,man8}/* || die
-
-	newinitd "${FILESDIR}/${PN}".init "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}".service
-	doman doc/zerotier-{cli.1,idtool.1,one.8}
-}
diff --git a/net-misc/zerotier/zerotier-1.6.2.ebuild b/net-misc/zerotier/zerotier-1.6.2.ebuild
deleted file mode 100644
index fdfc4d61007e..000000000000
--- a/net-misc/zerotier/zerotier-1.6.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic llvm systemd toolchain-funcs
-
-HOMEPAGE="https://www.zerotier.com/"
-DESCRIPTION="A software-based managed Ethernet switch for planet Earth"
-SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="clang neon"
-
-S="${WORKDIR}/ZeroTierOne-${PV}"
-
-RDEPEND="
-	dev-libs/json-glib
-	net-libs/libnatpmp
-	net-libs/miniupnpc:=
-	clang? ( >=sys-devel/clang-6:* )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.6-respect-ldflags.patch"
-	"${FILESDIR}/${PN}-1.4.6-add-armv7a-support.patch"
-)
-
-DOCS=( README.md AUTHORS.md )
-
-LLVM_MAX_SLOT=11
-
-llvm_check_deps() {
-	if use clang ; then
-		if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-			ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-
-		einfo "Will use LLVM slot ${LLVM_SLOT}!"
-	fi
-}
-
-pkg_setup() {
-	if use clang && ! tc-is-clang ; then
-		export CC=${CHOST}-clang
-		export CXX=${CHOST}-clang++
-	else
-		tc-export CXX CC
-	fi
-	use neon || export ZT_DISABLE_NEON=1
-}
-
-src_compile() {
-	append-ldflags -Wl,-z,noexecstack
-	emake CXX="${CXX}" STRIP=: one
-}
-
-src_test() {
-	emake selftest
-	./zerotier-selftest || die
-}
-
-src_install() {
-	default
-	# remove pre-zipped man pages
-	rm "${ED}"/usr/share/man/{man1,man8}/* || die
-
-	newinitd "${FILESDIR}/${PN}".init-r1 "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}".service
-	doman doc/zerotier-{cli.1,idtool.1,one.8}
-}