gentoo resync : 22.10.2018

5 files changed, 6 insertions, 94 deletions

diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index c57fb0ea6a2d..9bb461f4bca0 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -1,8 +1,5 @@
 AUX zerotier.init 437 BLAKE2B a43cc014d5ad311d14b13324e118c73c694623621c252ad6957af53064ccb53cda7c028cf2348e6999508262e86576fdd5c02feba81af6e1a9a88653bbd7a0e7 SHA512 938dcdf16228ca62a14c18658d746054590104dc50028d5dc4d56dba139dfc894d88d567e918533820df81723d56411cc046050b4b7c0e11e1128bef599fb12a
 AUX zerotier.service 179 BLAKE2B 8c27616a5092084a2450f08e5046528ce25f7697fca914436d9dddd003538e4d9bcfb50126e522936cf997d5f225f32751f59229d28cd6e85778b6b1bed8edb2 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701
-DIST zerotier-1.2.4.tar.gz 7963254 BLAKE2B 0c79533429e7aab8dc0a93d46ace132b168b6d83276e72cd66c72660d4e44a5336a91c011404690301de0b5ef4b45f857b340f38cd195d6479b480d3a62b7abf SHA512 82adb110208d24ae2745e3839810afcac87955de050ebfe0517a7dc2a875881dafd40c1b16a041742d8c4d0f6513abcc71d6ea3e06c2fb89b47be2630a500363
-DIST zerotier-1.2.8.tar.gz 6009764 BLAKE2B 740b58888f6ce2808608867618df517996d423c61d2ab71f387405bb2528ac5edc6a890b9a7249eebe5d62be58e237362692c13725f0c5313b45102f5fc4824a SHA512 a97a8ff0e5050294fd8d56e74b5dd320b77822242ed4d43919c62a361ccbe1837417cba07d4114c91e277816f60bf47d226f37f816278bfd96505b752ef5d5ff
-EBUILD zerotier-1.2.4-r1.ebuild 900 BLAKE2B 78b4d45a2dbe5577f63193199125fa70298cf498300611f429771767fe165df4ac44a783104e3003628ecf1fa97c9b0de132fc021c759caed25be5ab93fb78b1 SHA512 3311a4b3431450384e08910fac3838b1221c1f6e46debb967e6d98b775aa433de588b6fbd03ca5cb0ae4c8ae28780344806891e5b421f5a90426045189b39434
-EBUILD zerotier-1.2.4.ebuild 910 BLAKE2B 1702a5bdbc81996fbc8503b88cc2149793d8391d80e736e57b6ded5556f0fd6f2d3a90c6d4105e453e4395de9b6cdd2fed835e99bb66361549ff89a82e7bd5c4 SHA512 0b0e295145b5c3b149a41a3645f080e644ca336e151a0dd7c7f6be4c8bfb508414616415b1c95e1f8f4dd34a00cec87ecec6cb67ad1a1642d833e6531a472d67
-EBUILD zerotier-1.2.8.ebuild 904 BLAKE2B 8abce716fdaea48a81bba690f91d987d48dae7fd2f39dc3a97f7583ff7dfab7dc9f6b2641db31e546f70089fb886d1cc1971fa399f760e6295ee89a30dc38623 SHA512 486490d097c4bdcd2049b700f294d112c34df920fb2086e57987e5c7141636b3bd1a372fbcb6cafbe5fe0aa6079468371dd78e477051626b40201ca80ff3e48e
-MISC metadata.xml 551 BLAKE2B f23a3b355a8f7a28b94328a4501c505ba1418426fbd0e97b1787ca085a416f664a3a2a065612d1371c8e79902445465bc2a308a8bffd60e8b767a50f4759b260 SHA512 5fae12e1943c36525f6d9206753cf59a9a27cd895872da9f9ebb31b1d07542b5a76dcf9295f20d2360fa0d56a3f3328cccbd2e2030a6494359c6c69e0c015a9f
+DIST zerotier-1.2.12.tar.gz 6058902 BLAKE2B 851d0d871fac7f6cdd9feafb375f97181f9155c265f13e44122424bd7adcaff10e3f2c2a4484d2e2ad1f4f2f174fc723681451c1a728c9aa324bdcb02300af57 SHA512 a35029993d9266f3529a9922daa606b0d56a332514545f8cfab2092a4c9db4fc7217223f3bd7dbe59e536de325ee9b4f0226d673c0f0ec5859cf2937e8a4a2d4
+EBUILD zerotier-1.2.12.ebuild 905 BLAKE2B 15730c3a9c069e8519998e1fcfcc1c44b38b6e9ec94cf3885562a08c4ad7212af5333dbcd021326f7e606f7c5c9312e0821944b523b6afa7c96ba1409f859aae SHA512 6b504bee732d704b692b00fa18fdc8c47054a1b38a082aa83d4335d2773308c0d12886327d4454a7d95ce43f37e931940c84d082f2e88e5c5e1bfea7002ac6ae
+MISC metadata.xml 550 BLAKE2B b2337f927bef36ec75e2329459f9f654e3e786ec8d4dfa2016e42c5c857db77a539df1e2e6398483995e72d2a71f9eee3bf81df3e26501354c8bdd8ac5243222 SHA512 2c76feb941ce99247828da120bf10b4c9152065a361230b06c2717716fe0eb8798fa59eb737dff449d9c2d8f7f99025576e42a1592ac7183163bd4d8e7e9ba8a
diff --git a/net-misc/zerotier/metadata.xml b/net-misc/zerotier/metadata.xml
index 9ba830b73cc2..9a0bb99004b4 100644
--- a/net-misc/zerotier/metadata.xml
+++ b/net-misc/zerotier/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ramage.lucas@openmailbox.org</email>
+		<email>ramage.lucas@protonmail.com</email>
 		<name>Lucas Ramage</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/net-misc/zerotier/zerotier-1.2.8.ebuild b/net-misc/zerotier/zerotier-1.2.12.ebuild
index e77b9a824dd8..7d2f788b42ec 100644
--- a/net-misc/zerotier/zerotier-1.2.8.ebuild
+++ b/net-misc/zerotier/zerotier-1.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,8 +27,7 @@ DOCS=( README.md AUTHORS.md )
 
 src_compile() {
 	append-ldflags -Wl,-z,noexecstack
-	tc-export AS CC CXX
-	emake STRIP=: one
+	emake CXX="$(tc-getCXX)" STRIP=: one
 }
 
 src_test() {
diff --git a/net-misc/zerotier/zerotier-1.2.4-r1.ebuild b/net-misc/zerotier/zerotier-1.2.4-r1.ebuild
deleted file mode 100644
index bd328bd24296..000000000000
--- a/net-misc/zerotier/zerotier-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs systemd
-
-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="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/ZeroTierOne-${PV}"
-
-RDEPEND="
-	net-libs/miniupnpc
-	net-libs/libnatpmp
-	dev-libs/json-glib
-	net-libs/http-parser"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.9.3"
-
-QA_PRESTRIPPED="/usr/sbin/zerotier-one"
-
-DOCS=( README.md AUTHORS.md )
-
-src_compile() {
-	append-ldflags -Wl,-z,noexecstack
-	emake CXX="$(tc-getCXX)" one
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${PN}.init" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	doman "${S}/doc/zerotier-"{cli.1,idtool.1,one.8}
-}
diff --git a/net-misc/zerotier/zerotier-1.2.4.ebuild b/net-misc/zerotier/zerotier-1.2.4.ebuild
deleted file mode 100644
index 9150c0a91052..000000000000
--- a/net-misc/zerotier/zerotier-1.2.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs systemd
-
-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 -> zerotier-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/ZeroTierOne-${PV}"
-
-RDEPEND="
-	net-libs/miniupnpc
-	net-libs/libnatpmp
-	dev-libs/json-glib
-	net-libs/http-parser"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.9.3"
-
-QA_PRESTRIPPED="/usr/sbin/zerotier-one"
-
-DOCS=( README.md AUTHORS.md )
-
-src_compile() {
-	append-ldflags -Wl,-z,noexecstack
-	emake CXX="$(tc-getCXX)" one
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${PN}.init" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	doman "${S}/doc/zerotier-"{cli.1,idtool.1,one.8}
-}