gentoo resync : 30.09.2020

7 files changed, 2 insertions, 212 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index cfebe9457d4c..7a334298c8ff 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/badvpn/Manifest b/net-vpn/badvpn/Manifest
index 7d57889cec0a..ba6cd8eefbf6 100644
--- a/net-vpn/badvpn/Manifest
+++ b/net-vpn/badvpn/Manifest
@@ -4,14 +4,10 @@ AUX badvpn-ncd.init 1146 BLAKE2B b75f582d7402ee2f586438c58240b290f156153ffdfa4b3
 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
-DIST badvpn-1.999.126.tar.bz2 936233 BLAKE2B 39d6c6a275f751478fcb48a6ec3b148e5e6169475400973c9635ab6682866aac4cf510ee1e19bc4f4586a03c9d07c20d38576a9023a4d4bdec3eaeca54e0961a SHA512 3d0bbe3c8f91a3cb758b78a0fce4fd111f93fa0578ce06f0a8db5cc575d02f52248b37e7fa097447589257e47084a607a9df7078448ef44ae9fb66eb59e8b9e2
 DIST badvpn-1.999.127.tar.bz2 962224 BLAKE2B c0fc22aa56f59d9273797df9a1687509d1502ada2c92a308b8bd7368b50a4151f1ef8a8d91c720fee85c6f92497a421372eec3dd2160d53e3f3345041ce35f9b SHA512 7484a817795392a52b44d3bf68765652739029aae8c16965b433bbfb4ca67ea70048f76376ba445196aac07a8f19f97696917ad24fe2bcb34025adda1f18a9fb
-DIST badvpn-1.999.128.tar.bz2 1000636 BLAKE2B 9279083684b53335cc82b2de7864386a3d14a83bf5e95890e08b3f3fcac21c34201ca1322bc0f26dca464f072dc65f969ed72faef0baba2d03cbcddc9eceac62 SHA512 7d59e8365c10e7164c6c74b95d5f212ae0c480870bea31a6fb4ed25883f28bb6365e09a9271a9ecedccccd886e5f5e50a6f6df406ee3c40fad40031bbd3f049b
 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.126.ebuild 1880 BLAKE2B 8f088a95a2847befee084c14b05f5849e9e499e6166d8f649b9496d4bcbe46be78a0c4e4f26705447c451132e1a5f83cb4cae32c66764af1ed7abcf8bc13b7d3 SHA512 fb2aaacf1d15466a62a3a08414073ebb0e34f1e3ce505ed2fb4d9f9961dc74aea67821739dba149ecbdc9c14ea5adedc8bcbf9255a77d691152dccfd606a5933
 EBUILD badvpn-1.999.127.ebuild 1934 BLAKE2B 4eaa7ab82ec068138606fcc876b15869c8b211aae6b6e9f3fce2827c8f619298670e93164efd847df2b6b3343d16d6445ff940659cba3007746953acf13b5f14 SHA512 5385fa40849092fa11b90ce503bdbe1f2cc175a7e7dc993f35bc683d1c83f057025092fc224c92304631884e0bfca407a00aa4dc5c1d7ee55c5175b511fb2ecd
-EBUILD badvpn-1.999.128.ebuild 1948 BLAKE2B 6c25135de06be69eaa1922c38db8cc9c1a51666aa64df4ac959a4506affe6a27918e4cbc6033ed97117c92f2cdba4e3dbc81b33dd1d1ed919e9a399a9deae8ab SHA512 856fa2dabc437ac4c15dd3faa214468b339178416536b342c35433376b9c1f3f85101c9d42e0abcd97b05c4d79130e31a5537e737087e04f175ae222ba9f0fa8
 EBUILD badvpn-1.999.129.ebuild 2000 BLAKE2B 3285e06320b50827a80e36c6abc97bc7ffc9547fb857b8814871768b64f3e2c5d211bd2201627f532fc12be347ca3fe04770a24b69195a19c39f91a33309b59b SHA512 8c81d8708059bb1717edb69d0d2fae782e672b8e769e392a7fe262d2f4395a7f28ae420979e8493482d68280a6477552e5815a029ffb4c71a928fbd242354e1e
 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.126.ebuild b/net-vpn/badvpn/badvpn-1.999.126.ebuild
deleted file mode 100644
index b13baaaebb5a..000000000000
--- a/net-vpn/badvpn/badvpn-1.999.126.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils cmake-utils user toolchain-funcs
-
-MY_P=${PN}-${PV/_rc/rc}
-DESCRIPTION="Peer-to-peer VPN, NCD scripting language, tun2socks proxifier"
-HOMEPAGE="https://code.google.com/p/badvpn/"
-SRC_URI="https://badvpn.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-TARGETS="+client +ncd +server +tun2socks +udpgw"
-IUSE="${TARGETS} debug"
-# tests are only ncd related
-RESTRICT="!ncd? ( test )"
-
-COMMON_DEPEND="
-	client? (
-		dev-libs/nspr
-		dev-libs/nss
-		dev-libs/openssl
-	)
-	server? (
-		dev-libs/nspr
-		dev-libs/nss
-		dev-libs/openssl
-	)
-	ncd? (
-		dev-libs/openssl
-	)"
-RDEPEND="${COMMON_DEPEND}
-	ncd? (
-		sys-apps/iproute2
-		>=virtual/udev-171
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-# we need at least one target
-REQUIRED_USE="|| ( ${TARGETS//+/} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser ${PN}
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_NOTHING_BY_DEFAULT=1
-		$(cmake-utils_use_build client CLIENT)
-		$(cmake-utils_use_build server SERVER)
-		$(cmake-utils_use_build ncd NCD)
-		$(cmake-utils_use_build tun2socks TUN2SOCKS)
-		$(cmake-utils_use_build udpgw UDPGW)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# OOHMSA: do this on portage level?
-	tc-is-cross-compiler && die "these tests do not work when cross compiling!"
-
-	einfo "Running NCD tests"
-	cd "${S}"/ncd/tests || die
-	bash ./run_tests "${CMAKE_BUILD_DIR}/ncd/badvpn-ncd" \
-		|| die "one or more tests failed"
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog
-
-	if use server; then
-		newinitd "${FILESDIR}"/${PN}-server.init ${PN}-server
-		newconfd "${FILESDIR}"/${PN}-server.conf ${PN}-server
-	fi
-
-	if use ncd; then
-		newinitd "${FILESDIR}"/${PN}-ncd.init ${PN}-ncd
-		newconfd "${FILESDIR}"/${PN}-ncd.conf ${PN}-ncd
-	fi
-}
diff --git a/net-vpn/badvpn/badvpn-1.999.128.ebuild b/net-vpn/badvpn/badvpn-1.999.128.ebuild
deleted file mode 100644
index 7f18a1c6cadf..000000000000
--- a/net-vpn/badvpn/badvpn-1.999.128.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils cmake-utils user toolchain-funcs systemd
-
-MY_P=${PN}-${PV/_rc/rc}
-DESCRIPTION="Peer-to-peer VPN, NCD scripting language, tun2socks proxifier"
-HOMEPAGE="https://code.google.com/p/badvpn/"
-SRC_URI="https://badvpn.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-TARGETS="+client +ncd +server +tun2socks +udpgw"
-IUSE="${TARGETS} debug"
-# tests are only ncd related
-RESTRICT="!ncd? ( test )"
-
-COMMON_DEPEND="
-	client? (
-		dev-libs/nspr
-		dev-libs/nss
-		dev-libs/openssl
-	)
-	server? (
-		dev-libs/nspr
-		dev-libs/nss
-		dev-libs/openssl
-	)
-	ncd? (
-		dev-libs/openssl
-	)"
-RDEPEND="${COMMON_DEPEND}
-	ncd? (
-		sys-apps/iproute2
-		>=virtual/udev-171
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-# we need at least one target
-REQUIRED_USE="|| ( ${TARGETS//+/} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser ${PN}
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_NOTHING_BY_DEFAULT=1
-		$(cmake-utils_use_build client CLIENT)
-		$(cmake-utils_use_build server SERVER)
-		$(cmake-utils_use_build ncd NCD)
-		$(cmake-utils_use_build tun2socks TUN2SOCKS)
-		$(cmake-utils_use_build udpgw UDPGW)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# OOHMSA: do this on portage level?
-	tc-is-cross-compiler && die "these tests do not work when cross compiling!"
-
-	einfo "Running NCD tests"
-	cd "${S}"/ncd/tests || die
-	bash ./run_tests "${CMAKE_BUILD_DIR}/ncd/badvpn-ncd" \
-		|| die "one or more tests failed"
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog
-
-	if use server; then
-		newinitd "${FILESDIR}"/${PN}-server.init ${PN}-server
-		newconfd "${FILESDIR}"/${PN}-server.conf ${PN}-server
-	fi
-
-	if use ncd; then
-		newinitd "${FILESDIR}"/${PN}-1.999.127-ncd.init ${PN}-ncd
-		newconfd "${FILESDIR}"/${PN}-ncd.conf ${PN}-ncd
-		systemd_dounit "${FILESDIR}"/badvpn-ncd.service
-	fi
-}
diff --git a/net-vpn/corkscrew/Manifest b/net-vpn/corkscrew/Manifest
index c82f12dfae83..e7d163d6ee9b 100644
--- a/net-vpn/corkscrew/Manifest
+++ b/net-vpn/corkscrew/Manifest
@@ -1,5 +1,4 @@
 AUX corkscrew-2.0-crlf-with-authfile.patch 666 BLAKE2B 589586fdc113c5e7467c591dd3cc9300dcc536cfa230fdfe272c931e830d889ebcd43aaf0f0eb4dd245c04daad8cb195bbe53ca93dcbaa6183940d27dc349a75 SHA512 030e5a0b176e9f7180bf737b70e230b06565a80e10106c4bcd444a9e7293286068a0192401dda8886479fe68b6c644350aa2d047f655e846b22204a248605b9e
 DIST corkscrew-2.0.tar.gz 56749 BLAKE2B 4685b373af3a6d19cbd50b42c7fb421cd1c9b872d9682280aba52933869ba723940e959619f6f6d31d93f117d8d1803c79bcd50a86edadcd66a9ffd1df84b3f0 SHA512 bfea81064601cdf67ba1730b49e3a5f7aa377423edbfb052ff0f6b2776b49e104852b7f126f4668d37541a706313ef37d9b4535126e94bb202db4ac38f693e6f
-EBUILD corkscrew-2.0-r1.ebuild 1245 BLAKE2B 43d68a47533f65e2dbce0a54db76e533f09aa7a7e98824326f87b1957d419176717674f8e404564eee78cb2acbf0d97f88a70541b1b4935ab6ae26b2d1a1fbe5 SHA512 1a5db9413b97892978cfaa73cb00a359dd688a3b0d6a6153f9738b38c8b3921ac6c68361a673ae12dd8468086370335189c20ce95baf18f2706e622feb3d440d
-EBUILD corkscrew-2.0.ebuild 985 BLAKE2B 156f288df81e6d554f4c34a548d6bfa074e0042e75c261ad0bb5e5843c555a394e04dacfc840b090245c45c496b19010e76e56fd9c5f94cef6df0cf3589eca36 SHA512 f8bee38825cf415c8af32936cb6537968198c1b5a9e3619e6863b8e3bd41b1b8e6ed58943878be84077ee3220d328fa7c9afc6de812fd870e95aa79e0d12523b
+EBUILD corkscrew-2.0-r1.ebuild 1244 BLAKE2B 73f50cee3d5880d3a2e93cae0f7755de4dd191f7ba1bf58d40ab56ef05b2192c66f63ddb0f48895d8d4fa5909ac535abac118e3928ab056055c58867a5031c70 SHA512 bc44ff95418a90405f2beb1715c8f8b93c2f2b7339c3e51034e188ce344dd6ec2506d044a0c86618222d9826bbe5f5c70e0b171f4a33632bc268137a8970b771
 MISC metadata.xml 393 BLAKE2B 24208f0e307707f49ad8ad3c9f24f5e4b21c3b8750f29607ea2a644c4998fab9d6e27b30a95a9d37d10d5662d70c796b842bd3c8cc13a9435beed09b79f4676e SHA512 3a8fb57c70452056885eae869d55a49d29edb4c23f524cfc5b35b9ab8023a1084cbc11c3f16dea27d9f153845d27bcc1b1539f59b5fd4c2e4aac87e6b322b8d6
diff --git a/net-vpn/corkscrew/corkscrew-2.0-r1.ebuild b/net-vpn/corkscrew/corkscrew-2.0-r1.ebuild
index 3731eacafb6e..0f85fc78b7b1 100644
--- a/net-vpn/corkscrew/corkscrew-2.0-r1.ebuild
+++ b/net-vpn/corkscrew/corkscrew-2.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.agroman.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
 IUSE=""
 
 DOCS="AUTHORS ChangeLog README TODO"
diff --git a/net-vpn/corkscrew/corkscrew-2.0.ebuild b/net-vpn/corkscrew/corkscrew-2.0.ebuild
deleted file mode 100644
index 2982c2a8fddf..000000000000
--- a/net-vpn/corkscrew/corkscrew-2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools
-
-DESCRIPTION="a tool for tunneling SSH through HTTP proxies"
-HOMEPAGE="http://www.agroman.net/corkscrew/"
-SRC_URI="http://www.agroman.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-IUSE=""
-
-DOCS="AUTHORS ChangeLog README TODO"
-
-src_prepare() {
-	# Christoph Mende <angelos@gentoo.org (23 Jun 2010)
-	# Shipped configure doesn't work with some locales (bug #305771)
-	# Shipped missing doesn't work with new configure, so we'll force
-	# regeneration
-	rm -f install-sh missing mkinstalldirs || die
-
-	# Samuli Suominen <ssuominen@gentoo.org> (24 Jun 2012)
-	# AC_HEADER_STDC is called separately and #include <string.h> is
-	# without #ifdef in corkscrew.c. Instead of using AC_C_PROTOTYPES,
-	# remove the call entirely as unused wrt bug #423193
-	sed -i -e 's:AM_C_PROTOTYPES:dnl &:' configure.in || die
-
-	eautoreconf
-}