commit: bbabbfa3d24de9da4c122f776c24de483c72dae5 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Mar 16 19:48:55 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Mar 16 19:56:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbabbfa3
net-misc/zerotier: drop 1.4.6, 1.6.2 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/zerotier/Manifest | 2 - .../files/zerotier-1.4.6-fixup-neon-support.patch | 96 ---------------------- net-misc/zerotier/zerotier-1.4.6.ebuild | 79 ------------------ net-misc/zerotier/zerotier-1.6.2.ebuild | 80 ------------------ 4 files changed, 257 deletions(-) diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest index 45b12a75a32..13913e9401a 100644 --- a/net-misc/zerotier/Manifest +++ b/net-misc/zerotier/Manifest @@ -1,3 +1 @@ -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 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 a6ca7f7ca38..00000000000 --- 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/zerotier-1.4.6.ebuild b/net-misc/zerotier/zerotier-1.4.6.ebuild deleted file mode 100644 index 49c7f7ed5ff..00000000000 --- 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 fdfc4d61007..00000000000 --- 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} -}
