gentoo resync : 03.03.2021

3 files changed, 3 insertions, 52 deletions

diff --git a/net-vpn/badvpn/Manifest b/net-vpn/badvpn/Manifest
index ba6cd8eefbf6..a2555d1874ff 100644
--- a/net-vpn/badvpn/Manifest
+++ b/net-vpn/badvpn/Manifest
@@ -1,6 +1,5 @@
 AUX badvpn-1.999.127-ncd.init 592 BLAKE2B b38f17eafc225f57808493e330441d58cf0028b482f2790e086d30ad8ef92c5c09740a9e1b9b76b420c0ebc0d72cc80e46e41f1f3d95bd17884b1fdcbcab8264 SHA512 d82803b5042c0f450c20023be601860e751ef5d32d0174cb71c903e4d57ebab14e36cdbe7a268e322cd88e49824071659703f71e0e5fa92f0f70ce8c1412ef05
 AUX badvpn-ncd.conf 182 BLAKE2B ad8e285d0b423e09db3495a42e0d98fc043c3f54d3d5158b6df4f5ba834ed674c813075995db80e9949cc3038f20393cd465ccadf04547a76cff3cbb554224d2 SHA512 4b113e3630de4b679d3c74cd4154d0353c6ea8791a77b302c867f5007e889502cf4e6bd1c45d6151e1ea6843bc13ac3e6458790eb4e646daf17d0126b996492f
-AUX badvpn-ncd.init 1146 BLAKE2B b75f582d7402ee2f586438c58240b290f156153ffdfa4b3dd7e91634a591b77ad95a48757f9333792ab4087d552c70f9a48a6af4ee1baa932050aaa8963de8ba SHA512 5bed2372af376241f86037baba383ba7ac28aabe7b05d791345c69fbc23df453a4caca8d9680e3f16c9352c537b369dd04d73234aed4ee711af7d66d1a076ddd
 AUX badvpn-ncd.service 266 BLAKE2B 70faf47cab74ccd6201cfb94bbf275d701f9f856490753b7a6a95e2a7ab0dcb5fe282d6cb0e5cb8bfff86d091cf660f30057bc2c9809f202bc92e7b9982d8711 SHA512 5087d35a4d8c0d17202fe71d2bd2c881292720b550811d99d711623307e32515938464cb885be6c02a784cfc24311aef0b76576fbffeeadcad9b59c3a05e3fc9
 AUX badvpn-server.conf 227 BLAKE2B 5a3e070d3b875563ba20782ac325cfd76760082c6c217f0e3d606c2ba6b37fb731f03c082af9dd3cff852657a8ca4327e3fe3893e3c21a47a47354eb65592542 SHA512 c5628f1380434884d297846a1c49a31f369a17f97ab9914a741cfde9a21df52926b247c0b9544605c2438f47110c9f548b9161c5975be91e70dacfdf993839c8
 AUX badvpn-server.init 1136 BLAKE2B 37d255f56fb1aeb84b63ee22b82c8b7810bb0acbc7c60654060748e6ec1d9d949f40d712c24a5ff30627c053e72abf7b6ed472d3a653b1f81a0c2e4d43829473 SHA512 12326aa9ee4966786bb49dcc8184bceefaa0c02bf4ed00ca6437d58b64178762b75ec137846401493ca8a8d0cee313339915df49e44870bc9745176ca9edffd5
@@ -8,6 +7,6 @@ DIST badvpn-1.999.127.tar.bz2 962224 BLAKE2B c0fc22aa56f59d9273797df9a1687509d15
 DIST badvpn-1.999.129.tar.gz 1327123 BLAKE2B 640b4bc3252d0aadaf9a8ce42da7bbead7c0d371a1f536e994a4d26897d8fbee9a0c9738b31b1ce308b3b08b6a661d9dad0ea012ff08ec6349ee67063e402084 SHA512 7a305198d7b4aaa31e567ff1f1bf23e0a65070d8eae78e7ed6be1a3a3b7bce7fcba32c0eb8ae549ef1851a61675afc1770f52dedf131658036b7b6414fdd4e4e
 DIST badvpn-1.999.130.tar.gz 1340372 BLAKE2B d13d5fdda487418ba8d93ba49736f2b68c1b5054636b5cf9120f32f6de5b9d0240502d68824a194c18074b5de86227ad6412c969d91b0ff1ee0ff016bb4c1fb4 SHA512 958d6f3b7a8074fa7ba2f26812c9b2c39272b75d762a12a821ad2d0db9cdc9b9307338d77ca0dcadcf57b81fa4632362e67524de4246d01829951e8924a89770
 EBUILD badvpn-1.999.127.ebuild 1934 BLAKE2B 4eaa7ab82ec068138606fcc876b15869c8b211aae6b6e9f3fce2827c8f619298670e93164efd847df2b6b3343d16d6445ff940659cba3007746953acf13b5f14 SHA512 5385fa40849092fa11b90ce503bdbe1f2cc175a7e7dc993f35bc683d1c83f057025092fc224c92304631884e0bfca407a00aa4dc5c1d7ee55c5175b511fb2ecd
-EBUILD badvpn-1.999.129.ebuild 2000 BLAKE2B 3285e06320b50827a80e36c6abc97bc7ffc9547fb857b8814871768b64f3e2c5d211bd2201627f532fc12be347ca3fe04770a24b69195a19c39f91a33309b59b SHA512 8c81d8708059bb1717edb69d0d2fae782e672b8e769e392a7fe262d2f4395a7f28ae420979e8493482d68280a6477552e5815a029ffb4c71a928fbd242354e1e
+EBUILD badvpn-1.999.129.ebuild 1996 BLAKE2B 8f3fffa076ef1c6d79412873b3989e06b9dacb786cf71e1bd4b7e3469d23fe6c4c4125395070132703b1087424a68feabb781e400edb445f9ec74269230b62e3 SHA512 8abbfc3d4612fce789387555c808f53c9a95db4ec91746cf0681eee556832a50d87ac9e595968ba52c64d1489ba5212a3778e4364c052e19a3635864357f58d3
 EBUILD badvpn-1.999.130.ebuild 1976 BLAKE2B fca6b518a9a4f8cd61a89da6541ec1211f48fa9b722d31edc2e90ce5340384ad080c78994642303759d217ec68c29383315080ba605d28c44f9d2a160eb0b090 SHA512 ba1c2e0362eaa4aec4b9b4f2cf782d5a5bca50c821cd95c2b6e7077390459bb047f5d59f31b0fcfc752d4a15d5327dd2dc68d23c24f14e7a90c587f3571d6548
 MISC metadata.xml 1728 BLAKE2B 4ba1c50234447e72c340aa8bbd67ec8bd9b5c53f970faecc9473e9e7b790156257590c89df6e78eeed7b7ad42efda154e513baeef48d278291d972a6a74bb929 SHA512 52a2c3b1d9e1f46c71bc151b46d13a6158e0f844228f584a69932fef3370a5407d8e6abaa491a11087802e75e03cb578936abb11c1ece34a0859168ff4e949b7
diff --git a/net-vpn/badvpn/badvpn-1.999.129.ebuild b/net-vpn/badvpn/badvpn-1.999.129.ebuild
index 07ce92beede8..72be95d0304a 100644
--- a/net-vpn/badvpn/badvpn-1.999.129.ebuild
+++ b/net-vpn/badvpn/badvpn-1.999.129.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/ambrop72/badvpn https://code.google.com/p/badvpn/"
 SRC_URI="https://github.com/ambrop72/badvpn/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 SLOT="0"
 TARGETS="+client +ncd +server +tun2socks +udpgw"
 IUSE="${TARGETS} debug"
diff --git a/net-vpn/badvpn/files/badvpn-ncd.init b/net-vpn/badvpn/files/badvpn-ncd.init
deleted file mode 100644
index e408075128a4..000000000000
--- a/net-vpn/badvpn/files/badvpn-ncd.init
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Released under the 3-clause BSD license.
-
-command="${ncd_exec:-"/usr/bin/badvpn-ncd"}"
-command_args="${ncd_args} --config-file ${ncd_config:-/etc/ncd.conf}"
-command_background="YES"
-description="Network Configuration Daemon"
-pidfile="/var/run/${RC_SVCNAME}.pid"
-
-depend() {
-	need localmount
-	after bootmisc
-	before netmount
-	if yesno "${ncd_syslog:-NO}"; then
-		use logger
-	fi
-}
-
-start_pre() {
-	if yesno "${ncd_syslog:-NO}"; then
-		command_args="${command_args}
-			--logger syslog
-		--syslog-ident \"${ncd_syslog_ident:-${RC_SVCNAME}}\""
-	fi
-}
-
-start()
-{
-	[ -n "$command" ] || return 0
-	local _background=
-	ebegin "Starting ${name:-$RC_SVCNAME}"
-	if yesno "${command_background}"; then
-		if [ -z "${pidfile}" ]; then
-			eend 1 "command_background option used but no pidfile specified"
-			return 1
-		fi
-		_background="--background --make-pidfile"
-	fi
-	eval start-stop-daemon --start \
-		--exec $command \
-		${procname:+--name} $procname \
-		${pidfile:+--pidfile} $pidfile \
-		$_background $start_stop_daemon_args \
-		-- $command_args
-	eend $? "Failed to start $RC_SVCNAME"
-	return $?
-}