gentoo resync : 28.04.2021

4 files changed, 86 insertions, 5 deletions

diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index 4bfb4fa01fcb..2b92555692e4 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -4,5 +4,7 @@ AUX zerotier.init 437 BLAKE2B a43cc014d5ad311d14b13324e118c73c694623621c252ad695
 AUX zerotier.init-r1 285 BLAKE2B cb30206b6b2fa00e9b77bee83d0ef61bc864146337e06c6900a6e5bcad95dab87dc88f30a1407f87ecea839b99f5aadd7807719ffaefd7be4137986284d1e43e SHA512 911a90d14bbacb2e5a139d50716850d7286f893769bf0f7fb02a0829293d5fb233ad44255b8ffc5c1d4aee4fbe1361be0f1826732b50de07bd1d418f77651faa
 AUX zerotier.service 179 BLAKE2B 8c27616a5092084a2450f08e5046528ce25f7697fca914436d9dddd003538e4d9bcfb50126e522936cf997d5f225f32751f59229d28cd6e85778b6b1bed8edb2 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701
 DIST zerotier-1.6.3.tar.gz 16020606 BLAKE2B d958ac3276b34b0b99dcce7178ca08a7ac398831172103bb26ddb32814f9043103c9cde6e55853a20d090c1b239746c65cd70de3b9e498dc174baaf6ca403a66 SHA512 56052a9cd50f2a754ba8979fec9b7ba6caf54d83582428b1b43d8b54e5caf388adccbb955fcb9c3fd5b3d7ebde7663023ca4a9a3805b877c3063fa72e23cbed0
-EBUILD zerotier-1.6.3.ebuild 1776 BLAKE2B aa98cbb7880d7e034fbd403285202058313586975a9244f7691c77de9c96e60706a90be3e5cf32f9be34922e4e6468a2b7227a866c4298bcd15cf6817f2065d8 SHA512 19be19a84d78d8e3fa979d0cdb2c890e11b078c83b1f6d9e5b667998d9508757796aea75582cb3e29311aaf0dc3f663825dcc0a433782f88954cf1298e10b67f
-MISC metadata.xml 482 BLAKE2B 20cfeda377f02fe4f2f86119bf088ad0b7e4d5384b482988ec440991b91e6cfd4192a7404c38d53740b545f1d084c9c248a9ada603cace307815bb6fd6de5469 SHA512 f3ab7f82955ef27184446a8e657e9b6f52d473ccc7f3dc74f7945d4840c77c75d1b1f12162ae9fc74bbec067baeccc75f79fab98638682bb107911afdfe069d9
+DIST zerotier-1.6.4.tar.gz 16021448 BLAKE2B b45219c2e54f3e789fb970fc8cd9d26ce6175c9737f02838efd11c07223ca49c10480935319292e609cb24bef46aaf7f5eebc8335e84af642d25e87ea5a8e163 SHA512 b1cd96cdc76cfd7929016382bc4a373a88d468010134cd65efbe32fc23e1cb56e0306f84ae10b3ad6d65e7a3fa6aebe79ec6c019840123f770bbc6fe2152723c
+EBUILD zerotier-1.6.3.ebuild 1804 BLAKE2B e5851370c3b941b2dd21c549b2d13722c5a360b7dbfe589f8d7ce2870fdb33cafd7116c0cdf2a547ce4a03854bb901af1bc91012766b8e5175728c41dbf40391 SHA512 a4d3fe66fd5907ad48e950c25cda57ebc01ab0d89f8d1891c0eaa6acfaa6468891f2129538b5fce4090bf8760b589d00f00609536b5e768d0a98faae074f7bd3
+EBUILD zerotier-1.6.4.ebuild 1804 BLAKE2B e5851370c3b941b2dd21c549b2d13722c5a360b7dbfe589f8d7ce2870fdb33cafd7116c0cdf2a547ce4a03854bb901af1bc91012766b8e5175728c41dbf40391 SHA512 a4d3fe66fd5907ad48e950c25cda57ebc01ab0d89f8d1891c0eaa6acfaa6468891f2129538b5fce4090bf8760b589d00f00609536b5e768d0a98faae074f7bd3
+MISC metadata.xml 419 BLAKE2B af49a92adbb888788fc7a22cd56115cbc8f6c5f17c65bd38536b40a838e016fb2a69ab4cb317f5844739d0d91174c35b88606cc50dfdf99218f2646260e64adb SHA512 d453ad4f2c1ed868044277eed6fe229c6bcb2d61d154e63b49466ba452897e936ba2e4ad78ae3ffb37a352f07f9f2b01eb803e107ecc00b45bc65ceef2a19c5e
diff --git a/net-misc/zerotier/metadata.xml b/net-misc/zerotier/metadata.xml
index f7fa88e2deea..a757cc011a38 100644
--- a/net-misc/zerotier/metadata.xml
+++ b/net-misc/zerotier/metadata.xml
@@ -8,6 +8,5 @@
 	</upstream>
 <use>
 	<flag name="clang">Use Clang compiler instead of GCC</flag>
-	<flag name="neon">Enable ARM32 neon-salsa2012-asm code</flag>
 </use>
 </pkgmetadata>
diff --git a/net-misc/zerotier/zerotier-1.6.3.ebuild b/net-misc/zerotier/zerotier-1.6.3.ebuild
index fdfc4d61007e..fc017b010fc9 100644
--- a/net-misc/zerotier/zerotier-1.6.3.ebuild
+++ b/net-misc/zerotier/zerotier-1.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.ta
 LICENSE="BSL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="clang neon"
+IUSE="clang cpu_flags_arm_neon"
 
 S="${WORKDIR}/ZeroTierOne-${PV}"
 
@@ -56,7 +56,7 @@ pkg_setup() {
 	else
 		tc-export CXX CC
 	fi
-	use neon || export ZT_DISABLE_NEON=1
+	use cpu_flags_arm_neon || export ZT_DISABLE_NEON=1
 }
 
 src_compile() {
diff --git a/net-misc/zerotier/zerotier-1.6.4.ebuild b/net-misc/zerotier/zerotier-1.6.4.ebuild
new file mode 100644
index 000000000000..fc017b010fc9
--- /dev/null
+++ b/net-misc/zerotier/zerotier-1.6.4.ebuild
@@ -0,0 +1,80 @@
+# 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 cpu_flags_arm_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 cpu_flags_arm_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}
+}