5 files changed, 0 insertions, 107 deletions
diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index 205f0afefd0e..dc34118cc5c3 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -179,4 +179,3 @@ DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d65
 DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007c3d6100f5135da1a7c223463fc17640f533bc1d4e8c53e9becb186d98351719b3b6276802c68cc755b9ba4e SHA512 09f2d18f62c3c427ebed40d667b672bb778629502ad3c39541f324b2d5ac41f0822c98b7e5320314144130580da46f1e8e51928941850e7d4af28455a564360c
 DIST zerotier-1.10.1.tar.gz 84019609 BLAKE2B 317177c3f64818a78aed3f24e0d5fa8f164bb3778fcf123f222983b784aa8ed4a5bfd842857b3da7bca39e09e74a99b88c541921f2d1ed7633282cc9bae19bd2 SHA512 6a4c9c30b4aad389a60bd72b154f2a0c34303925a5c0efb815b4651db0db5e7b79740b5cfc4f2825bda7c158d374fff277b2f5ba57cd2cf5c740168198e7bbbd
 DIST zerotier-1.10.6.tar.gz 15259391 BLAKE2B 48a47744502f976584c622f0f117ae2b7f73addd69bdb19c0829b1c0b99fa387618b2cd7203eb4f8838cb59c85ec658792066f55c650f2d9d9774029779d267c SHA512 e22982e0898d5db4748ca009480cc6ea07b13e1cf3dcb2c78fbba5036519c0d08afe8bdad20766669f52fef03679ff228414337e2478990fd5ba5d3dbece1972
-DIST zerotier-1.6.4.tar.gz 16021448 BLAKE2B b45219c2e54f3e789fb970fc8cd9d26ce6175c9737f02838efd11c07223ca49c10480935319292e609cb24bef46aaf7f5eebc8335e84af642d25e87ea5a8e163 SHA512 b1cd96cdc76cfd7929016382bc4a373a88d468010134cd65efbe32fc23e1cb56e0306f84ae10b3ad6d65e7a3fa6aebe79ec6c019840123f770bbc6fe2152723c
diff --git a/net-misc/zerotier/files/zerotier-1.4.6-add-armv7a-support.patch b/net-misc/zerotier/files/zerotier-1.4.6-add-armv7a-support.patch
deleted file mode 100644
index 802b1a873f58..000000000000
--- a/net-misc/zerotier/files/zerotier-1.4.6-add-armv7a-support.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/make-linux.mk	2019-09-05 11:02:16.000000000 -0700
-+++ b/make-linux.mk	2019-09-27 21:01:21.000000000 -0700
-@@ -195,6 +195,11 @@
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
- 	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
- endif
-+ifeq ($(CC_MACH),armv7a)
-+	ZT_ARCHITECTURE=3
-+	override DEFS+=-DZT_NO_TYPE_PUNNING
-+	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-+endif
- ifeq ($(CC_MACH),armv7l)
- 	ZT_ARCHITECTURE=3
- 	override DEFS+=-DZT_NO_TYPE_PUNNING
diff --git a/net-misc/zerotier/files/zerotier-1.4.6-respect-ldflags.patch b/net-misc/zerotier/files/zerotier-1.4.6-respect-ldflags.patch
deleted file mode 100644
index 46e24fd7a928..000000000000
--- a/net-misc/zerotier/files/zerotier-1.4.6-respect-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/make-linux.mk	2019-09-05 11:02:16.000000000 -0700
-+++ b/make-linux.mk	2019-09-27 21:01:21.000000000 -0700
-@@ -77,7 +77,7 @@
- 	override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS)
- 	CXXFLAGS?=-O3 -fstack-protector -fPIE
- 	override CXXFLAGS+=-Wall -Wno-deprecated -std=c++11 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
--	LDFLAGS=-pie -Wl,-z,relro,-z,now
-+	LDFLAGS?=-pie -Wl,-z,relro,-z,now
- 	STRIP?=strip
- 	STRIP+=--strip-all
- endif
diff --git a/net-misc/zerotier/metadata.xml b/net-misc/zerotier/metadata.xml
index ead2ca790452..e4e359db5b2a 100644
--- a/net-misc/zerotier/metadata.xml
+++ b/net-misc/zerotier/metadata.xml
@@ -7,7 +7,6 @@
 		<remote-id type="github">zerotier/ZeroTierOne</remote-id>
 	</upstream>
 	<use>
-		<flag name="clang">Use Clang compiler instead of GCC</flag>
 		<flag name="sso">Enable support for Single sign-on through zeroidc</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/zerotier/zerotier-1.6.4.ebuild b/net-misc/zerotier/zerotier-1.6.4.ebuild
deleted file mode 100644
index 256d078e8427..000000000000
--- a/net-misc/zerotier/zerotier-1.6.4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 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="BUSL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~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}
-}