gentoo resync : 03.09.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-09-03 20:56:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-09-03 20:56:28 +0100
commit: fbda87924e6faa7a1919f1a2b4182490bde5ec5c (patch)
tree: f3114a4ed212a754756adce027aeef3a4a1a2e2a /net-misc
parent: 3b08f674e3f771b49370edb144dab0958c8cf721 (diff)
59 files changed, 716 insertions, 3742 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d931ea364adb..45719a42587a 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 61933a80884d..b0bbb19863dd 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,8 +1,6 @@
 AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
-DIST curl-7.77.0.tar.xz 2439336 BLAKE2B 433b3179dcf2c3363514b72bf9c54286873d8e5559b33e543ba8f3e7df25a619c5be13a8aacb9361c4464b646af4d1fb214d4de57a17f3de7e8f379777214d13 SHA512 aef92a0e3f8ce8491b258a9a1c4dcea3c07c29b139a1f68f08619caa0295cfde76335d2dfb9cdf434525daea7dd05d8acd22f203f5ccc7735bd317964ec1da76
 DIST curl-7.78.0.tar.xz 2440640 BLAKE2B 0422071ce22d38b89652c702989674a2257dd18b05004245c4f2d7494ccdd24b5b52f330629ce6a411a059d5990e8c879cbbdf23d873b881141f9d2b9ad07f7f SHA512 f72e822a0b5e28320ef547c7a441c07f3b4870579a70ab4c428751baba435a1385cb89a22b9ed4b84a7fafecf620f155911e4131e3463ec1bdad80ecde47bb7a
-EBUILD curl-7.77.0-r2.ebuild 8193 BLAKE2B b95e0408183486856914fa90951fb7aff96a232c8897a4b0acfc1e33b7e307b892d7a0c08cc7288b27eb900ae79f94d029ee939cbb641ed13add64f3f1d8903c SHA512 e190765e6667d59fbd8fe3973623f1dad553e27103addf4448a7cd044005c61d9d779eea54f269deca778c0a99d95d7d4160aa1e5f441770949a78ac6ee9e202
-EBUILD curl-7.78.0-r1.ebuild 7963 BLAKE2B db7995cb94d314315fad8662637bcaa7cd3f36a69193f599a085e3d5463b220f757f00e6b8e58d13180a5275f76c54ab01f87d735e09af00fbbd998ba19bc660 SHA512 a60ad52af689276ab713b7b897fa587034dc2f7202427d06d0e627514d3d66a9c34bcacedcb380e5e391cc8490d0c7ad73f266454c64a32ffd9ff701c2e57018
+EBUILD curl-7.78.0-r1.ebuild 7962 BLAKE2B 22e11af875ee637a45cb4af83d295aa7cacbcf3fac349bd3f7ddefd03f0fa3b1348d2356cd2547fb8891ff1f47ebf1fae6ac3d5e214bb74a7d16d85f55e7b944 SHA512 9fff1fdddf753e8ac210f01cb24e48dd87a9f603f2a3f5c0e4836177f827636940ff796e06bd3d4276fb3debad7168704047c0993bdc8fa67278f4706dc99653
 EBUILD curl-7.78.0-r3.ebuild 7969 BLAKE2B 02cc15b20edb0f2102dfa3fa7cf43d04181a86af9690b24781607a08067b4ad3312c5fdcc3b4bf92373512ee8f5be3c7beeb63128042cd6a555f18ad490a250e SHA512 80aa6a4a1190a9fd0c6af379c8a58e10e5c9c05eaa8307c11a7e10307c7cd91f4732c33ddf7838cc4e8d9a9aabc5bc3b3aeb0af034755e715457d4852f836c33
-MISC metadata.xml 2104 BLAKE2B cd965737bacd5cde978fdcb652559c3c29eee0083bdee82e00cf78055e681571e77a2deaf4ab6ef5a9aba0c33689356fc2299c346c4c1e6b4afda9c675b9f3b1 SHA512 a2e9ba5358d115b18fa089bd222f026a7553505a154e1d865af0cde1004a0a427f58ed38d802815d96453d5d58628aa91d8cd5d082fe059cb1afd4dc9d312052
+MISC metadata.xml 2049 BLAKE2B 09452ca27a61e32bff3040a3856ae7ce67ad8dd98e87498420524e4b6aaf373fabb527a687d3153fe2785af627aa0fcb6948610d72e916e90cac6ffdb9cb10e3 SHA512 febae41d0725dbffaa1c8aec58f108bc78ea7be675c9f2e0cc12c9eea632bc7c6ae82d20f3b403caa66d3174dfdcab117aad8e4bb89f5c1224ea58e262f7d9ce
diff --git a/net-misc/curl/curl-7.77.0-r2.ebuild b/net-misc/curl/curl-7.77.0-r2.ebuild
deleted file mode 100644
index 6d26aadf08fe..000000000000
--- a/net-misc/curl/curl-7.77.0-r2.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
-
-LICENSE="curl"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd"
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" nghttp3 quiche"
-IUSE+=" elibc_Winnt"
-
-# c-ares must be disabled for threads
-# only one default ssl provider can be enabled
-REQUIRED_USE="
-	winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-# lead to lots of false negatives, bug #285669
-RESTRICT="!test? ( test )"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		openssl? (
-			dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
-		)
-		nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
-	nghttp3? (
-		net-libs/nghttp3[${MULTILIB_USEDEP}]
-		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
-	)
-	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	"${FILESDIR}"/${PN}-respect-cflags-3.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-
-	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	#myconf+=( --without-default-ssl-backend )
-	if use ssl ; then
-		if use gnutls || use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		fi
-		if use mbedtls || use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		fi
-		if use nss || use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		fi
-		if use openssl || use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		fi
-		if use winssl || use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		fi
-
-		if use curl_ssl_gnutls; then
-			einfo "Default SSL provided by gnutls"
-			myconf+=( --with-default-ssl-backend=gnutls )
-		elif use curl_ssl_mbedtls; then
-			einfo "Default SSL provided by mbedtls"
-			myconf+=( --with-default-ssl-backend=mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "Default SSL provided by nss"
-			myconf+=( --with-default-ssl-backend=nss )
-		elif use curl_ssl_openssl; then
-			einfo "Default SSL provided by openssl"
-			myconf+=( --with-default-ssl-backend=openssl )
-		elif use curl_ssl_winssl; then
-			einfo "Default SSL provided by Windows"
-			myconf+=( --with-default-ssl-backend=winssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
-	myconf+=(
-		$(use_enable alt-svc)
-		--enable-crypto-auth
-		--enable-dict
-		--disable-ech
-		--enable-file
-		$(use_enable ftp)
-		$(use_enable gopher)
-		$(use_enable hsts)
-		--enable-http
-		$(use_enable imap)
-		$(use_enable ldap)
-		$(use_enable ldap ldaps)
-		--disable-ntlm-wb
-		$(use_enable pop3)
-		--enable-rt
-		--enable-rtsp
-		$(use_enable samba smb)
-		$(use_with ssh libssh2)
-		$(use_enable smtp)
-		$(use_enable telnet)
-		$(use_enable tftp)
-		--enable-tls-srp
-		$(use_enable adns ares)
-		--enable-cookies
-		--enable-dateparse
-		--enable-dnsshuffle
-		--enable-doh
-		--enable-hidden-symbols
-		--enable-http-auth
-		$(use_enable ipv6)
-		--enable-largefile
-		--enable-manual
-		--enable-mime
-		--enable-netrc
-		$(use_enable progress-meter)
-		--enable-proxy
-		--disable-sspi
-		$(use_enable static-libs static)
-		$(use_enable threads threaded-resolver)
-		$(use_enable threads pthreads)
-		--disable-versioned-symbols
-		--without-amissl
-		--without-bearssl
-		$(use_with brotli)
-		--without-cyassl
-		--without-darwinssl
-		--without-fish-functions-dir
-		$(use_with http2 nghttp2)
-		--without-hyper
-		$(use_with idn libidn2)
-		$(use_with kerberos gssapi "${EPREFIX}"/usr)
-		$(use_with metalink libmetalink)
-		--without-libgsasl
-		--without-libpsl
-		$(use_with nghttp3)
-		$(use_with nghttp3 ngtcp2)
-		$(use_with quiche)
-		$(use_with rtmp librtmp)
-		--without-rustls
-		--without-schannel
-		--without-secure-transport
-		--without-spnego
-		--without-winidn
-		--without-wolfssl
-		--with-zlib
-		$(use_with zstd)
-	)
-
-	ECONF_SOURCE="${S}" \
-	econf "${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use quiche; then
-		libs+=( "-lquiche" )
-		priv+=( "quiche" )
-	fi
-	if use nghttp3; then
-		libs+=( "-lnghttp3" "-lngtcp2" )
-		priv+=( "libnghttp3" "-libtcp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default_src_test
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm -rf "${ED}"/etc/ || die
-}
diff --git a/net-misc/curl/curl-7.78.0-r1.ebuild b/net-misc/curl/curl-7.78.0-r1.ebuild
index c3e282bb3a10..8711f462b1da 100644
--- a/net-misc/curl/curl-7.78.0-r1.ebuild
+++ b/net-misc/curl/curl-7.78.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 
 LICENSE="curl"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd"
 IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" nghttp3 quiche"
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index 63231cb33c31..a1af37a98ee4 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -17,7 +17,6 @@
 		<flag name="mbedtls">Enable mbedtls ssl backend</flag>
 		<flag name="nghttp3">Enable HTTP/3.0 support using <pkg>net-libs/nghttp3</pkg> and <pkg>net-libs/ngtcp2</pkg></flag>
 		<flag name="quiche">Enable HTTP/3.0 support using <pkg>net-libs/quiche</pkg></flag>
-		<flag name="metalink">Enable metalink support</flag>
 		<flag name="nss">Enable nss ssl backend</flag>
 		<flag name="openssl">Enable openssl ssl backend</flag>
 		<flag name="pop3">Enable Post Office Protocol 3 support</flag>
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 0c86f2105a85..22e6afd46a51 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,13 +1,10 @@
 AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
-DIST dropbox-lnx.x86-127.4.4265.tar.gz 99182625 BLAKE2B e16df0643ee583cd1e080a748fb96ad426d84c722994fd21bc2cb01027eaf4db0fa2a0402ebf35c2254c4cf0b4cadda4a78e47731de0656009cbafa99518762f SHA512 7be5d9f3f98e45672ea6972e8beea99356bddbc870ccf86f5a9644ac56897be3027f4321860dda0ad5d9293b3db9e9a012fb65fd8e9062ae80d620f59e0cd45d
-DIST dropbox-lnx.x86-128.4.2870.tar.gz 99155419 BLAKE2B 35048b298ce6b1cbbd7648b9a42973313d2f284da49656b7fd2962a10e7289389d61f5eaabf48f4cf386ac3c573745776493e8031032dfa90ed7a134fa9de542 SHA512 67c8ccfc0303dfc16bb11ee6b00ea5a2bd81b38826365a8a6cbc76ffa38bdd9e31081a0a81524e1dbcf5f2206ec44bed058ebe21e3037d4cce2f22b3eb84834c
 DIST dropbox-lnx.x86-129.4.3571.tar.gz 99238430 BLAKE2B 852397538de2c0fc8a1e5217cfac379dae0fb023dab49db3805edab7d88725a0efa1b05207d964d27eab40e1ac0e0f8388f251d836b46b8bff310700ca85b8cc SHA512 a33262e063fc549df8a3c9e3b0ebb66a264c3ea922adcb0cd61f256fcb46d463f006900d97b3948cfd4f7e97f8f049a7ee1b2d560226bf6eb24ac88b5d17229e
-DIST dropbox-lnx.x86_64-127.4.4265.tar.gz 101007286 BLAKE2B 7ec73bc48e29409392a0daa104412dd2765efe35b5a8564371255a49985c851442ebc3d7d27a1178084c55de12633ccee62c2a36ff52b372719563e8f8ffe3f6 SHA512 f03d4918ebeac218bb1291b925a3ffbbd8805f5f632c35a92cd3f7ad2a11ca3472990246edd63365973d6f2d4c059a2da0705ccee5e35269fdf859c026916ea4
-DIST dropbox-lnx.x86_64-128.4.2870.tar.gz 100967811 BLAKE2B f5f2298d92cb76a544fb4a63e877e9f9ecc403942e71026cf231743879d1613ea4ab7a0a2c5ab9c1763c0dde0ea2b5fcc44d88b84574623dad63c4a158b0269b SHA512 9477dcf879ac87b0e7b241e3210740e9363717995acfaa5ea00f2b134e1cba7dc785960743d236553b5ae8a6734b540d001ae7cb601a11ace598407db7ac8aa2
+DIST dropbox-lnx.x86-130.4.4978.tar.gz 99316040 BLAKE2B 2760b2f94e0c5308660698b3887df062518f950e145499dd8b082a547a75415ad6fe60c5a505c2c4486a579447f6f9656e7f2306e7dfa51f8f300df989a2cc38 SHA512 160f1e7cb9f91ead905e35f79cccdc08c661053143c681a3766c57384bf7b61015fd4c6521aa0a8bdca5c1e6ae88f2dc997a6aec6024f6309c785d5a6baa48dd
 DIST dropbox-lnx.x86_64-129.4.3571.tar.gz 101068889 BLAKE2B 5022c8e9759e6a2b81f0a4342b71f7e9a175d3f3cabacb5b4d72fabb56dabcc71cd54500423c3ac6760da5784d7858cd3204d3ebef364ebb992fcfd980702220 SHA512 a6ca18dca268fc2b761e9a599a273478573655f445f0d0d026ab19f7c560143ef12277e1ce1f68456001f08cce13a56ee5e65bc6e35cfb92fa0c7b9c557e896f
-EBUILD dropbox-127.4.4265.ebuild 2673 BLAKE2B 6e031fb04250842de2b31700ca9f5c68a2ee605ed8d55a0a1b07247fafc85179968da4cca5f55e7231a6024d5cdc7c8d691003cdf00e3352985aa245e3ddea59 SHA512 fda0adb204f8899a4355e9d618989b0772ae987fd2694e7a099aad4b8ec3c6f45cc6af63d74bf68728668724251ee56e83eecf7452b084c89c50a10191189869
-EBUILD dropbox-128.4.2870.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
-EBUILD dropbox-129.4.3571.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
+DIST dropbox-lnx.x86_64-130.4.4978.tar.gz 101155639 BLAKE2B 097802a707049c2c5eea8cd66c950c9f7139b9e53119269714d8b474bcdc6746b7de3fd57c79411208bfb8ee9015ba47ef0ab2b836adae621f78f26c3974d928 SHA512 4a317bb15bcf7e5b02bc3da4a23cb34dd52c353c667f3290eca1206aaddfe7ef8885296b97c2b7619aa74f85d64f51133908510436eb0dfca011c8cde5fa6ddf
+EBUILD dropbox-129.4.3571.ebuild 2673 BLAKE2B 6e031fb04250842de2b31700ca9f5c68a2ee605ed8d55a0a1b07247fafc85179968da4cca5f55e7231a6024d5cdc7c8d691003cdf00e3352985aa245e3ddea59 SHA512 fda0adb204f8899a4355e9d618989b0772ae987fd2694e7a099aad4b8ec3c6f45cc6af63d74bf68728668724251ee56e83eecf7452b084c89c50a10191189869
+EBUILD dropbox-130.4.4978.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-127.4.4265.ebuild b/net-misc/dropbox/dropbox-127.4.4265.ebuild
deleted file mode 100644
index 83389e2d0ede..000000000000
--- a/net-misc/dropbox/dropbox-127.4.4265.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
-	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
-	einfo " your user's home directory.  To prevent this, run the following as"
-	einfo " each user who will run dropbox:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-129.4.3571.ebuild b/net-misc/dropbox/dropbox-129.4.3571.ebuild
index be2fed244fff..83389e2d0ede 100644
--- a/net-misc/dropbox/dropbox-129.4.3571.ebuild
+++ b/net-misc/dropbox/dropbox-129.4.3571.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="selinux X"
 
 RESTRICT="mirror strip"
diff --git a/net-misc/dropbox/dropbox-128.4.2870.ebuild b/net-misc/dropbox/dropbox-130.4.4978.ebuild
index be2fed244fff..be2fed244fff 100644
--- a/net-misc/dropbox/dropbox-128.4.2870.ebuild
+++ b/net-misc/dropbox/dropbox-130.4.4978.ebuild
diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index a71e2822384e..8efb9f7c1524 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -2,10 +2,8 @@ AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285eb
 AUX frr-8.0-c-ares.patch 482 BLAKE2B e7a29e165a40737624e234932ca80b07c1ed7c6db2d6972f5e27e727b81e95c39ac7f54e3b1ba19dd0944cbda495ce12c2f884a2fce169f851126e6c88200944 SHA512 d5f2de9c548664668e5bcc9d9a6e2c4b0d2f0e41d73f61c1a09881cec53854de983dea1585d00b0a29be7282925c1e456cf6c2e0b338241c609fa561022d5a63
 AUX frr-openrc-v1 7068 BLAKE2B c790c783ea9c289110b1e85aa23a1adccba36122524cde36798f26c31f82e5381eefb3e5e16b497e84a5aa2faf5bf1f59d12fe8f9b7b3c5d0f504c26ce13fb86 SHA512 34e371bb9bb34e494536091a811084d543c18b302489ce0a56ec3e69c805c22d84d7a928e24e17eba5d4fe6d4e33ac847060da95ded5a02975ba2a2e5a568243
 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
-DIST frr-7.5.1.tar.gz 6746148 BLAKE2B e6a8d38bac1323852d933ca9eaac681df8824407af008bb0170937a01564b3fb9fb081418630b7540f3ccdb899ac0948121d63accfa65ae0fd3fd6933fdafd6d SHA512 cf20316abd39a2d96bb377bd594464ae74c20ad70c60246409fe9f04f0177fcd8891a8da54d83bee962f589a00e71f7b51e78f9729c8680e6265ddd548e0464e
 DIST frr-8.0.1.tar.gz 8206852 BLAKE2B ed23f62457877fb3173977e1b7092c808adc5d5bd9b1d83747ac42573117adc38865abd1e722073532800f543978e5d67ba7c88416a4335c72bd6b8a3045ff5a SHA512 d9a9ee3b40bf0271779765447c67da817551b5bf2d5d1e9f8073fb4596c622e013fbf7316ca39087db7b7f478b18d07f1fd06f1778abde2734c83112573d5f8f
 DIST frr-8.0.tar.gz 8195258 BLAKE2B 75d8d4410a5377dae3bf6938c3b095b163ad87776420a16c07d461bb3f635d623de642fa0ae483094788369c9dc6a04d5424107bf60c848ac54756c4bdb20c97 SHA512 fdf1e68c16e266a74221fb194851ef47c888e90324de2e42a4ca68b9dbce1ba6f45d73b9830bdb17774ecdde736111fa562201a5763c49092b6ce1f0a4d4865a
-EBUILD frr-7.5.1-r4.ebuild 3557 BLAKE2B ea76e974e78d946b0d993bab03f94e05328172e0d86bff1aac865fbd8cacc799710268122c9474ec9618d7c44e00bb258b5f7cde24181e783096348ca6037289 SHA512 c836edeadd95848bbb34d1e281b286246309c09c4ec1784a06ac848cb131d611b257e92a0a992eaa48fdb2ae98d7b30a8a0238b951a73523219554961be15b98
 EBUILD frr-8.0.1.ebuild 3540 BLAKE2B 1c4726be6328f9591129ec0cae9af25cd81c9e5cc64d460163eff0d8bd3a07d45e1ffd14e6e222142ee528bb28f72f1629b7669a595d2985397289fd5b2ff391 SHA512 9e872c47d9fe753d2dc8880e91ba2381e179a386ad0a27746be77bbb055ad252741097b248e7a17ca5dc1d3caec983661caa011e5c271d53671153dbb72d478f
 EBUILD frr-8.0.ebuild 3574 BLAKE2B d936f13e01512991d4bb22e5d3101a23c08b569edd4a4ccaa4cfb9501b28cb3afd886c750311a364da51c564f3b9c878e5f4574cf954e4d661c8d1c9c325bf15 SHA512 dc3f46abfc7bdff106ea19f9a1d56d05aebefcf7fbbf0c3ef53cd0f65b4768d90e19d0393a08a9da5c31eaa8ff2e7ccfdf8f274ce299901314bcd2710b6ec72a
 MISC metadata.xml 766 BLAKE2B 5180b547d024deffc965d384c3f4b8075832e1146106dd9fd2434d08669199db439053bb8fa5ede82b5fa848a21812c6d808778c656c02b6aeb80238caf13f0f SHA512 9d2a818c93693ef3f079a70ec243655489edaf4eacac3fba8890eec0d59e7711053d773aba2ccc10c772f400959a7bd6e42faa413d1100a1f12445d42215769d
diff --git a/net-misc/frr/frr-7.5.1-r4.ebuild b/net-misc/frr/frr-7.5.1-r4.ebuild
deleted file mode 100644
index 4731885ece1f..000000000000
--- a/net-misc/frr/frr-7.5.1-r4.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit autotools pam python-single-r1 systemd
-
-DESCRIPTION="The FRRouting Protocol Suite"
-HOMEPAGE="https://frrouting.org/"
-SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
-# FRR tarballs have weird format.
-S="${WORKDIR}/frr-${P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	acct-user/frr
-	dev-libs/json-c:0=
-	>=net-libs/libyang-1.0.184
-	<net-libs/libyang-2.0.0
-	sys-libs/libcap
-	sys-libs/readline:0=
-	virtual/libcrypt:=
-	grpc? ( net-libs/grpc:= )
-	nhrp? ( net-dns/c-ares:0= )
-	pam? ( sys-libs/pam )
-	rpki? ( >=net-libs/rtrlib-0.6.3[ssh] )
-	snmp? ( net-analyzer/net-snmp:= )"
-
-BDEPEND="
-	dev-util/clippy
-	sys-devel/flex
-	virtual/yacc
-	doc? ( dev-python/sphinx )"
-
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	$(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
-	!net-misc/quagga"
-
-PATCHES=( "${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch )
-
-src_prepare() {
-	default
-
-	python_fix_shebang tools
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--with-pkg-extra-version="-gentoo"
-		--enable-configfile-mask=0640
-		--enable-logfile-mask=0640
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/lib/frr
-		--sbindir="${EPREFIX}"/usr/lib/frr
-		--libexecdir="${EPREFIX}"/usr/lib/frr
-		--sysconfdir="${EPREFIX}"/etc/frr
-		--localstatedir="${EPREFIX}"/run/frr
-		--with-moduledir="${EPREFIX}"/usr/lib/frr/modules
-		--with-clippy="${BROOT}"/usr/bin/clippy
-		--enable-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples
-		--enable-user=frr
-		--enable-group=frr
-		--enable-vty-group=frr
-		--enable-multipath=64
-		$(use_enable doc)
-		$(use_enable fpm)
-		$(use_enable grpc)
-		$(use_enable ipv6 ospf6d)
-		$(use_enable ipv6 ripngd)
-		$(use_enable ipv6 rtadv)
-		$(use_enable kernel_linux realms)
-		$(use_enable nhrp nhrpd)
-		$(usex ospfapi '--enable-ospfclient' '' '' '')
-		$(use_enable rpki)
-		$(use_enable snmp)
-		$(use_enable systemd)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	# Install user documentation if asked
-	use doc && dodoc -r doc/user/_build/html
-
-	# Create configuration directory with correct permissions
-	keepdir /etc/frr
-	fowners frr:frr /etc/frr
-	fperms 775 /etc/frr
-
-	# Create logs directory with the correct permissions
-	keepdir /var/log/frr
-	fowners frr:frr /var/log/frr
-	fperms 775 /var/log/frr
-
-	# Install the default configuration files
-	insinto /etc/frr
-	doins tools/etc/frr/vtysh.conf
-	doins tools/etc/frr/frr.conf
-	doins tools/etc/frr/daemons
-
-	# Fix permissions/owners.
-	fowners frr:frr /etc/frr/vtysh.conf
-	fowners frr:frr /etc/frr/frr.conf
-	fowners frr:frr /etc/frr/daemons
-	fperms 640 /etc/frr/vtysh.conf
-	fperms 640 /etc/frr/frr.conf
-	fperms 640 /etc/frr/daemons
-
-	# Install logrotate configuration
-	insinto /etc/logrotate.d
-	newins redhat/frr.logrotate frr
-
-	# Install PAM configuration file
-	use pam && newpamd "${FILESDIR}"/frr.pam frr
-
-	# Install init scripts
-	systemd_dounit tools/frr.service
-	newinitd "${FILESDIR}"/frr-openrc-v1 frr
-
-	# Conflict files, installed by net-libs/libsmi, bug #758383
-	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
-}
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index a2aa5f75f02c..085a0401b51c 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,5 +1,5 @@
-DIST gns3-gui-2.2.21.tar.gz 5162935 BLAKE2B ebe60ecd2c2228a783ae8c0aa65213534a81495c7d0afbd5fee7023dcf87e2d25c6575f8b966299f2953e16749ef92d17b07a1cbcac211effb28baca6851aaa8 SHA512 64ec5b49e6dc2ae6af2618b5ad0f06d306c43989802db1f0e30e5fe1ca92bdbb53d011820ed622690f3d97987be94daf3bf9a9b6e6fd4fd04fa6e8bffa846423
 DIST gns3-gui-2.2.22.tar.gz 5043351 BLAKE2B 98bae9bcec74511f33134c0430937788d0ade66648081eda1a394aa032914410d3765a9cbe6c0167911aad9df6392810fdcbaf43d3d27862fbd881d847324d37 SHA512 12a7e014b6f86d643641fc3511387cfe7b9bccf3a8ed9b49e21aaa73f3fd2412a413e83264e306e837b76a5f707caddf08151f95c55a4c2bb197a73cd0429de4
-EBUILD gns3-gui-2.2.21.ebuild 1099 BLAKE2B 4a3c36f87a3fa83d4414161b661c7dfff3c11d7439b408b60644c928826c0d6e9a24c6262d75d287e06d51e6677c3f12bd7a5a79d8ab14fd816165d3c692faa2 SHA512 892e9d0c5292d90b3ff34b300c67134a503e31ca9b5978015df670efa81bd663a080a090029c5532e27d60d6a63902456238d4e92e0709a5af314b2214ad5878
+DIST gns3-gui-2.2.24.tar.gz 5043449 BLAKE2B ef2de570dbad46b90be450e2bc342d96eea3fa7898380e01cf43933a60d0fef6ebef3ed857b9d0fc648355f6f335a406bce3677fd23d87a68e7923bb8bbb2631 SHA512 7b917106836cb77cdb90ecdcce2f0ce183feed52906b27b2dfa0146c12ffaa5e41733de57c0932e0104e55aad501b6508607301648a5d3997d10613daa0c1f19
 EBUILD gns3-gui-2.2.22.ebuild 1024 BLAKE2B c3585ad5af11292a85bef8cb9fee2dc74af2943828c493c9aa6f9f8718d60481c44ed0f38baf3daa1337e418a96bb35b919e728e0d233bdcdaf11ad714c7081e SHA512 3080d89cc01c1bde3500e74f2bb5e47b7f3df22c361c00205dc277d489cd6069bdaa34657d036912dddc22c3ec39d9070ec040f44c60f04710d808f7ec148d80
+EBUILD gns3-gui-2.2.24.ebuild 990 BLAKE2B 5d5fdaa73087a089e25b465de45d52e6e712ce9826eebc0430aa031e93e6ab71a70bb7f5fd4e803120d71ce84d24d3f9f8bccb78fe5ec0799e71c25071eff1e6 SHA512 e562b389923a191040f322f805034627db7cad6d1f75f50043a6d9b372738cc93eb535b739c67f07f17834c52da7bd5659d1c3c5944ea0fa1d67b4bca3afdf63
 MISC metadata.xml 597 BLAKE2B 1a58fc067ee6fc27e5641b4f4bf1c9324cf68a5c224d379bb60ee0ec83feb8aadab7381d33211a2ade2e66d60814346cebe522faedcdc0c3afd4787719a58fe8 SHA512 68d895f6e9eaa8b642250cbe774098e316a3dd162c0b20b9a2e27f87bad9f8a7ee06b6954c71d71258b7c774b2f3e06abb88cfa0f3de5a9a7852a5f96a4e3583
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.21.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.24.ebuild
index f702b56de93a..23ebc84553ad 100644
--- a/net-misc/gns3-gui/gns3-gui-2.2.21.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.2.24.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9} )
 
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1 desktop xdg
+inherit distutils-r1 virtualx xdg
 
 DESCRIPTION="Graphical Network Simulator"
 HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-gui"
@@ -19,14 +17,16 @@ KEYWORDS="~amd64 ~x86"
 
 #net-misc/gns3-server version should always match gns3-gui version
 RDEPEND="
-	>=dev-python/distro-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-1.3.1[${PYTHON_USEDEP}]
 	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
 	dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
 "
 
+distutils_enable_tests pytest
+
 src_prepare() {
 	default
 
@@ -34,9 +34,6 @@ src_prepare() {
 	sed -i -e 's/[<>=].*//' requirements.txt || die
 }
 
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doicon "resources/images/gns3.ico"
-	make_desktop_entry "gns3" "GNS3" "gns3.ico" "Utility"
+src_test() {
+	virtx distutils-r1_src_test
 }
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index c4e19fdb56ed..0608849d76cd 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,5 +1,6 @@
-DIST gns3-server-2.2.21.tar.gz 9054117 BLAKE2B dbbbba4dfe8d084184d38750c67152b99ee286dae88d92c15f153077396cdb008214da89d9161516daef0fbde8de3ba30f6628b9d138799d9ed8c1bc21c17f29 SHA512 adb7b08c88525f8b292688cd31973a00723b8d7989399d861e629bf754408901c2b00c67d425aacd7c234d9bab5d46542024196a4b44066eb1dbf39cf3d521bb
+AUX gns3-server-2.2.24-Fix-tests.patch 2975 BLAKE2B 91d3da6f87e88e172f3e31afc941b0e7f8199e1a601d018847834df57687eafee36f2a8130293b77449bda8f6de94a5d786e950207dc3e21ff4702193367dc1d SHA512 b7f7570977aa6c36b3eeadb15c2327d902e77abae06d2496b8d72914abb442e1ba80b7b54787d98e3df66e38d175f7e2a1085695c13fa07891a808c0964e2480
 DIST gns3-server-2.2.22.tar.gz 9011028 BLAKE2B 910711cac6f649d8dd3f7a4d2a9aa77839c9dda9f4280e7079b86857c542907feaa1205b7060ce7cc8956a2fbd220d5393cda319f64ff17eeb5ce476922afccc SHA512 444f483e69a56ab82c053c042b8791711e2fc6b7c800d30c08f2221405418a5c78d780f0f959c80d56ce864230ae17b04639c74a6559c7f5abce65f9c808a282
-EBUILD gns3-server-2.2.21.ebuild 2113 BLAKE2B 843ae1b77b7bae4847d7b2fcd176d550b34fcc26fa4b530ed0d82aaf4667a39480f24903cf5549f3162e136f6dca0d6b8782a6557320868846410b162d9feaf3 SHA512 e10ab97da6dc98892bb04802dfd0d9b56aabf39c9624bcb929c9634c5456f8942fbd793259fd5efe6f6b938cfc3481680f148af28f9aab5d3f641e4fbc0d6c0d
+DIST gns3-server-2.2.24.tar.gz 9057352 BLAKE2B cc49127afa9b3422f25ec2d10e53b7cedc59a4b872394d7b7c47ac34e6859fd5f22547277f351ba75b6520a0881b2ebbda6ba932af31108f070c2ccd92574020 SHA512 22a4394f645b5909e75b07d63164ad4fa362f78d69c6f30e8e2daf15bc910c238e8cd983a9f1cb3c1045a0722f9a1c260002b4afe8fb5915033b3ddb20814a17
 EBUILD gns3-server-2.2.22.ebuild 2233 BLAKE2B 58febe525be2f40d6294398ae76b7b7f87261b0a97f246512a07db590aa545b7b3dda22f0fb8ffa317c202867dbcb99748bc3e771f660278a67d2f2bf260b2c6 SHA512 ffbde90e9fd1a526f74a5031af44d8550d75e0a051f5aa7f68facf72b01cbbacfef183e898c32472a2187dd9557616a20704a954080e261214fc9c700034936f
+EBUILD gns3-server-2.2.24.ebuild 2208 BLAKE2B 4baaf0cb904aed94173092f4ce584120bb247cc157a66acb63ee84cb44789127c3f6a868943a474eae48838112fe18e2d24090cc8396056a1c3400802d59aec7 SHA512 5675af064e4194b765ba350ced456424688e9f2b3fbd01f099ca854ea1c40be30ec5382795c60cc999ddb1411b0f73b7c70b546b585e453db4d437e55cf9a5d4
 MISC metadata.xml 597 BLAKE2B 1a58fc067ee6fc27e5641b4f4bf1c9324cf68a5c224d379bb60ee0ec83feb8aadab7381d33211a2ade2e66d60814346cebe522faedcdc0c3afd4787719a58fe8 SHA512 68d895f6e9eaa8b642250cbe774098e316a3dd162c0b20b9a2e27f87bad9f8a7ee06b6954c71d71258b7c774b2f3e06abb88cfa0f3de5a9a7852a5f96a4e3583
diff --git a/net-misc/gns3-server/files/gns3-server-2.2.24-Fix-tests.patch b/net-misc/gns3-server/files/gns3-server-2.2.24-Fix-tests.patch
new file mode 100644
index 000000000000..3d0556ab4a1c
--- /dev/null
+++ b/net-misc/gns3-server/files/gns3-server-2.2.24-Fix-tests.patch
@@ -0,0 +1,73 @@
+From 4eb8491cfa61310066395f078009ccc822488eb8 Mon Sep 17 00:00:00 2001
+From: grossmj <grossmj@gns3.net>
+Date: Wed, 1 Sep 2021 19:31:37 +0930
+Subject: [PATCH] Fix tests. Fixes #1950
+
+---
+ tests/compute/qemu/test_qemu_manager.py |  1 -
+ tests/compute/qemu/test_qemu_vm.py      | 12 ++++++------
+ tests/compute/test_manager.py           |  2 +-
+ 3 files changed, 7 insertions(+), 8 deletions(-)
+
+--- a/tests/compute/qemu/test_qemu_manager.py
++++ b/tests/compute/qemu/test_qemu_manager.py
+@@ -71,7 +71,6 @@ async def test_binary_list(monkeypatch, tmpdir):
+         assert {"path": os.path.join(os.environ["PATH"], "qemu-kvm"), "version": version} in qemus
+         assert {"path": os.path.join(os.environ["PATH"], "qemu-system-x42"), "version": version} in qemus
+         assert {"path": os.path.join(os.environ["PATH"], "hello"), "version": version} not in qemus
+-        assert {"path": os.path.join(os.environ["PATH"], "qemu-system-x86_64-spice"), "version": version} not in qemus
+ 
+         qemus = await Qemu.binary_list(["x86"])
+ 
+--- a/tests/compute/qemu/test_qemu_vm.py
++++ b/tests/compute/qemu/test_qemu_vm.py
+@@ -818,21 +818,21 @@ def test_options(linux_platform, vm):
+     assert vm.kvm is False
+ 
+     vm.options = "-no-kvm"
+-    assert vm.options == "-no-kvm"
++    assert vm.options == "-machine accel=tcg"
+ 
+     vm.options = "-enable-kvm"
+-    assert vm.options == "-enable-kvm"
++    assert vm.options == "-machine accel=kvm"
+ 
+     vm.options = "-icount 12"
+-    assert vm.options == "-no-kvm -icount 12"
++    assert vm.options == "-icount 12"
+ 
+     vm.options = "-icount 12 -no-kvm"
+-    assert vm.options == "-icount 12 -no-kvm"
++    assert vm.options == "-icount 12 -machine accel=tcg"
+ 
+ 
+ def test_options_windows(windows_platform, vm):
+     vm.options = "-no-kvm"
+-    assert vm.options == ""
++    assert vm.options == "-machine accel=tcg"
+ 
+     vm.options = "-enable-kvm"
+     assert vm.options == ""
+@@ -878,7 +878,7 @@ async def test_run_with_kvm_linux_options_no_kvm(linux_platform, vm):
+ 
+     with patch("os.path.exists", return_value=True) as os_path:
+         vm.manager.config.set("Qemu", "enable_kvm", True)
+-        assert await vm._run_with_hardware_acceleration("qemu-system-x86_64", "-no-kvm") is False
++        assert await vm._run_with_hardware_acceleration("qemu-system-x86_64", "-machine accel=tcg") is False
+ 
+ 
+ async def test_run_with_kvm_not_x86(linux_platform, vm):
+--- a/tests/compute/test_manager.py
++++ b/tests/compute/test_manager.py
+@@ -190,7 +190,7 @@ def test_get_abs_image_recursive_ova(qemu, tmpdir, config):
+     config.set_section_config("Server", {
+         "images_path": str(tmpdir / "images1"),
+         "local": False})
+-    assert qemu.get_abs_image_path("test.ova/test1.bin") == path1
++    assert qemu.get_abs_image_path("demo/test.ova/test1.bin") == path1
+     assert qemu.get_abs_image_path("test.ova/test2.bin") == path2
+     # Absolute path
+     assert qemu.get_abs_image_path(str(path1)) == path1
+-- 
+2.33.0
+
diff --git a/net-misc/gns3-server/gns3-server-2.2.21.ebuild b/net-misc/gns3-server/gns3-server-2.2.24.ebuild
index 07b724ce6475..78581b451547 100644
--- a/net-misc/gns3-server/gns3-server-2.2.21.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.24.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 systemd optfeature
+inherit distutils-r1 optfeature systemd
 
 DESCRIPTION="GNS3 server to asynchronously manage emulators"
 HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server"
@@ -17,19 +17,29 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	>=app-emulation/dynamips-0.2.18
-	>=dev-python/aiofiles-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3.6.2[${PYTHON_USEDEP}]
+	app-emulation/dynamips
+	>=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.11.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
-	>=dev-python/py-cpuinfo-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
-	>=net-misc/ubridge-0.9.14
+	>=dev-python/py-cpuinfo-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-1.3.1[${PYTHON_USEDEP}]
+	net-misc/ubridge
+	sys-apps/busybox
 "
+BDEPEND="
+	test? (
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${P}-Fix-tests.patch )
+
+distutils_enable_tests pytest
 
 src_prepare() {
 	default
@@ -40,8 +50,8 @@ src_prepare() {
 	# Remove Pre-built busybox binary
 	rm gns3server/compute/docker/resources/bin/busybox || die
 
-	# Package installs 'tests' package which is forbidden
-	rm -r tests || die
+	# add setuptools dependency, bug #809278
+	echo setuptools >> requirements.txt || die
 }
 
 python_install() {
@@ -56,7 +66,6 @@ python_install() {
 pkg_postinst() {
 	elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
 	elog ""
-	elog "The following is a list of packages that can be added:"
 	optfeature "QEMU Support" "app-emulation/qemu"
 	optfeature "Virtualbox Support" "app-emulation/virtualbox"
 	optfeature "Docker Support" "app-emulation/docker"
diff --git a/net-misc/netkit-rsh/Manifest b/net-misc/netkit-rsh/Manifest
index 2dc90c306577..ee139f72162e 100644
--- a/net-misc/netkit-rsh/Manifest
+++ b/net-misc/netkit-rsh/Manifest
@@ -32,5 +32,5 @@ DIST netkit-rsh-0.17-patches-3.tar.lzma 13875 BLAKE2B 80470c4a9fdbfebd351217e48e
 DIST netkit-rsh-0.17.tar.gz 58268 BLAKE2B 7790a91f95c51f4aa538ad614e65ecba5a565e4761c7d8167f4d175bb8bcc27cb48b569f93064285dad983e602f03bcb816da58b02b54290adcd9cabe73cd88e SHA512 0d8da4a779da137f7b3f158ad010b71f2357c86a2160dbd19331cbf45f86a46110cdfdfd3c4ba2d19ddf3634917bf981eb91bfde02c3cdbc946df8695db75218
 DIST rexec-1.5.tar.gz 18469 BLAKE2B cbb694520332a0768b8337e854baf232271a30ac328dcf4b8b16d28dc3710ad58173e135cb9eb9726b07709bcd78ef627cea550c98e00dc86bea7c64e52aa3d1 SHA512 7ed455a921ad71749154bd8e586ac2a624f357b56be17db73b9ed7c1ca1bc19cfb9aee748f79cc649184dfb535ffe5e887643b73a25c3fb6520d4e19fae7333a
 EBUILD netkit-rsh-0.17-r13.ebuild 1778 BLAKE2B ec51ebf68d2bb3fa775677a7901980df01305190c3581e6bfbc8deb5a5f880ff6e05f43c1cedb7145d0348fa18faf327ec5458c1e138b0eaa0c0bcfa6a9c6f63 SHA512 1f0c4bc1b2c3a052b30efe2c118f8120d8f04503ca0c8f6d66b69da93cb252b9f5372bd7f7ba0b823e6fee0bdd48b19d4ca330e7420c9285f835716501339732
-EBUILD netkit-rsh-0.17-r14.ebuild 1750 BLAKE2B d5de6abd82701edba35e9676e15234244505a21d0c445ee08e270823bcbae18bff3285a293e32765358c355b7f7f952ad960c5a868de010e39888a419a7da46a SHA512 069fb3a17c97d430eabf6ad171ce88c2997864f5fe653fdc30eb2f87844d88232facc0f4b354146258c099d7def03931366821fe35ee99e85ad56548e2a59a0c
+EBUILD netkit-rsh-0.17-r14.ebuild 1749 BLAKE2B 33e73b6b20499674369d83946e5e0176fb47a3edf9ea18a0bbb8a8fc311dbbeead1d3ac229d792232a0dfcd3cd9991ca95e52c37a3ce43ad674c16c22fe671d0 SHA512 0c710da28163cd819359f7c65228d3034719376949b46e547422e5aa2b400f530c53e863b1beb319ccb104ab2f0be6753e74e5624474c637450fd25345da6a3b
 MISC metadata.xml 396 BLAKE2B 2faf6277d8d91f7637052da914eda7083abdbca00344f668abb0064162a278b41bd1ac954873188ddcb858721a3cebd49d699346ed4b4bb1b7769e636ef771e9 SHA512 e99d549aed9466e8dba8999404556f63ff51c9b47703020c67d2002f4940c6d0484d6c70420a51c9c389fc1269a10b7e283af15e569a1e9a58fe4af93e07ac32
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild
index 8df61edaefac..adc53dfe1aa0 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="pam"
 
 RDEPEND="
diff --git a/net-misc/netopeer2/Manifest b/net-misc/netopeer2/Manifest
index 33d88442d52c..1411e34a3037 100644
--- a/net-misc/netopeer2/Manifest
+++ b/net-misc/netopeer2/Manifest
@@ -1,7 +1,3 @@
-DIST netopeer2-1.1.70.tar.gz 170883 BLAKE2B 59dbb1f82b355d807769466fc95dcac0ef0b74711f299b29cc6653183b5ffbb832d69b4247e04f38bdb9218adfabe1fff20c6f76e198ca0860808ec3910d20bd SHA512 d60c7ac861a05f8ee325013786e25e7f987f28265d66df5568ffd92ee31016a2d07f6b8256572110b9a6a5d00cb68644d1c3c3cd638f609b0f4f806e9e6cf602
-DIST netopeer2-1.1.76.tar.gz 171127 BLAKE2B 77b97cc60185b8843c216f69d6e7c6366b66dd2de86ab6a08489131738a27e28e730e0d773a5115406ad83df7aa22ee80638b6661faf6394fccb986b3996e038 SHA512 c37e7e4cba1d78fa20cff48fe6cd73fc5c0f0c43989b061915e7f7928c147ed5380f79d74341220df32aeebccf5db7d1560b261570e789807ad53591bedb0232
 DIST netopeer2-2.0.0.tar.gz 255138 BLAKE2B a33fa6a952a060a8fb4bd4ad2f2f4e0ab163faef44cd999eb5d3a28706110908bf6350859da1032e873cf24ff8bd9327d0d694edeb35ecb8e0650634dc5d8966 SHA512 789a6fb36f9a3cf9df4ff996b90a5e8f07a24b14027ec455133e184ae96c72a1e8f9adef6d36800139d47d667c54189a2c14616f4947ce0fe72467cb178dbec5
-EBUILD netopeer2-1.1.70-r1.ebuild 1014 BLAKE2B ed146b0a8bc26b6da5200e2766987cbee3672a4fa07fc7a210a071ac82230a17d57c331bb224929c4107aea2209704fe230573c9e53c1347e104528d59c3798f SHA512 49c34f131200aa54aa72f429f04021433ddda84ddf4448eabe58d1aa8055876b11dea74bc5a1ead59d1eb44bf95393a3b2e0d0671e9c3d51df1dc5ffed5e0626
-EBUILD netopeer2-1.1.76.ebuild 1016 BLAKE2B 29a306b4114bb72c5ad83dff2148269618751f7ad4bc4c3664329443c2102a85e43b4ff79aff8a2ff804a4070bd4cf9f62fe88fd81e607b22b8e77078b134eb0 SHA512 292f43496f1e61b1b70588a6bf684f7cfb580d630adcbafffdc94ed11de9e64a09c9bc2e896d7939eed475d8ca9ac330f48e65149dfc653996c73cde75326751
 EBUILD netopeer2-2.0.0.ebuild 923 BLAKE2B ec65dfc84bbeb329af7a3da12a4520ce41addb79f2a04deadb19ddd54f46262d25b7715223731cb6739f1fa701e39c13c5d75d178f4f91a811d9694cbd9ca50f SHA512 b85af038622f580bb0fc3005cecf0ee3200b525b2e2440b5a9a3f4b11ca5bcc3a43524b1725759ff12e2a2644143fa3286e073ad25b6320f2cb3fb1524feb509
 MISC metadata.xml 328 BLAKE2B 3da6394dffdfe6fdcb5a1aad35f9bd5305f2baf160520d1d6217d6d95f8ba0f6258201b996f51d22115ff52ac30249a7b72414ad5a36d6723af06430ca166575 SHA512 aa61c2b919465d3d5c513f5335ed89eefca29afbf92371c45080add2141dc56875a2d07a531c22ac7f7f1057e3c36a330a275e423d6f1f5abbde03737fbf6c80
diff --git a/net-misc/netopeer2/netopeer2-1.1.70-r1.ebuild b/net-misc/netopeer2/netopeer2-1.1.70-r1.ebuild
deleted file mode 100644
index 395e51ac135f..000000000000
--- a/net-misc/netopeer2/netopeer2-1.1.70-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Server for implementing NETCONF configuration management"
-HOMEPAGE="https://github.com/CESNET/netopeer2"
-SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-libs/openssl:=
-	net-misc/curl:=
-	>=net-misc/sysrepo-1.4.122:=
-	<net-misc/sysrepo-2.0.0:=
-	>=net-libs/libnetconf2-1.1.43:=
-	<net-libs/libnetconf2-2.0.0:=
-	net-libs/libssh:=
-	>=net-libs/libyang-1.0.225:=
-	<net-libs/libyang-2.0.0:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGENERATE_HOSTKEY=OFF
-		-DINSTALL_MODULES=OFF
-		-DMERGE_LISTEN_CONFIG=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /etc/netopeer2
-	doins -r scripts/.
-}
-
-pkg_postinst() {
-	elog "In order to do initial server setup please"
-	elog "run setup scripts located in /etc/netopeer2"
-}
diff --git a/net-misc/netopeer2/netopeer2-1.1.76.ebuild b/net-misc/netopeer2/netopeer2-1.1.76.ebuild
deleted file mode 100644
index a18b90eb1807..000000000000
--- a/net-misc/netopeer2/netopeer2-1.1.76.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Server for implementing NETCONF configuration management"
-HOMEPAGE="https://github.com/CESNET/netopeer2"
-SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/openssl:=
-	net-misc/curl:=
-	>=net-misc/sysrepo-1.4.140:=
-	<net-misc/sysrepo-2.0.0:=
-	>=net-libs/libnetconf2-1.1.46:=
-	<net-libs/libnetconf2-2.0.0:=
-	net-libs/libssh:=
-	>=net-libs/libyang-1.0.240:=
-	<net-libs/libyang-2.0.0:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGENERATE_HOSTKEY=OFF
-		-DINSTALL_MODULES=OFF
-		-DMERGE_LISTEN_CONFIG=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /etc/netopeer2
-	doins -r scripts/.
-}
-
-pkg_postinst() {
-	elog "In order to do initial server setup please"
-	elog "run setup scripts located in /etc/netopeer2"
-}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 3013260a82dd..bad13063dc99 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -15,6 +15,8 @@ AUX openssh-8.6_p1-hpn-15.2-X509-glue.patch 12374 BLAKE2B adb5327ca665f2dc895178
 AUX openssh-8.6_p1-hpn-15.2-glue.patch 4773 BLAKE2B c0db810f7c6e73b307cd9f89b9c4e8a858fde9e5fcc2f39ce02dde213d632b04edf246ec84ff69511b6e74cf4ca67395763b501cb2ddb738c20f9fa48cd4a79b SHA512 8774305853029eee9b024bc1da68134e061aa7ac1087a950e23e39160e11435b0ea9787d3490cc7f1854a9608f11abda9d271fcdce28aceb7089cfa03304e585
 AUX openssh-8.6_p1-hpn-version.patch 556 BLAKE2B 26ef960db46c82ee62e6a6f1be15c2897855caa6cbd05db87d3e606ce42d03fb6e88916f0c6644f67dc008ca802617d0f63e5e8e35d1a6c6076188ba19009186 SHA512 c13d14dc496863bd6bbbf08940322a60e74fa1cc2171f81132dfd874b9371ee0edd77f75ffd606f874fa2de498b174be91da5c641029abff2d2a8503c2f0fc02
 AUX openssh-8.7_p1-GSSAPI-dns.patch 11576 BLAKE2B 84aa0128ddeccf67e14c20f9d2acb61226c5091a3e3106285c79db4a297dbd781eddf7a6d4cb3b1a5a5dcbbcd158d32dbca5986b6fbf15f62cd3928cf125b083 SHA512 794b06c6ee6acd1bcd861753970cfc4d04f42499d48ff4119746dbcab8643f75761fddb9f52f49fe01e356740eb3882671ac3ae209e0e45745d195a219ffe5dd
+AUX openssh-8.7_p1-X509-glue-13.2.patch 2791 BLAKE2B d4d2d2257d2de54acdf6a8b8844b8ec1aa1f342616a59135c0d4ee7343d27b3f9d8ba39b87538e56fbff25db31e4562a5c9155c0d1f6f5ff872836b7929ef77c SHA512 5b74f4a0a77a136c537a12128144c8c4f06a76e9bff656a57ffbb7d5aebf9410f40cd6d0d9f058b58b9a9c147cb9b51a9a4fd17d53b29695e6ce114ef5a54375
+AUX openssh-8.7_p1-hpn-15.2-X509-glue.patch 16283 BLAKE2B 7181c63f43398bda89f663c6de4a688e302d382519b0030ece980777d110ec56077dc6e5ca357f67c8a7a932f2df850ddc4ff7db1ea91c59d136767857c8b24e SHA512 525b68bcd9c891ab6be104d30cf4b9cc9214c257bc41a7e9c306dcfe3fb12109f7422118d9fad58698fe9a6d501b27309e675c857d00c04c46acff27eec60154
 AUX openssh-8.7_p1-hpn-15.2-glue.patch 7354 BLAKE2B 1b5afc662d39db3ab137b2a389b3a5cebf55e0c6741c12ade4977d8d5d8cb4f4cf2d8e8978150808c6570cba7b8080ace971d20913df9a740c1e03adc7134726 SHA512 ea57ea2c6138a275bce8cb7d62ea8771bf51db4d8dca4ea33f46539b33ab5a17c7c1749fa7b10c90e167846fd087f4084dcf5604017ad5c2821c2c74793ca9c2
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27
@@ -29,6 +31,7 @@ DIST openssh-8.5p1.tar.gz 1779733 BLAKE2B f4e4bd39e2dd275d4811e06ca994f2239ad27c
 DIST openssh-8.6p1+x509-13.1.diff.gz 1011666 BLAKE2B 0ac0cf2ff962b8ef677c49de0bb586f375f14d8964e077c10f6a88ec15734807940ab6c0277e44ebdfde0e50c2c80103cff614a6cde4d66e9986152032eeaa90 SHA512 ae4986dd079678c7b0cfd805136ff7ac940d1049fdddeb5a7c4ea2141bfcca70463b951485fb2b113bc930f519b1b41562900ced0269f5673dbdad867f464251
 DIST openssh-8.6p1-sctp-1.2.patch.xz 7696 BLAKE2B 37f9e943a1881af05d9cf2234433711dc45ca30c60af4c0ea38a1d361df02abb491fa114f3698285f582b40b838414c1a048c4f09aa4f7ae9499adb09201d2ac SHA512 ba8c4d38a3d90854e79dc18918fffde246d7609a3f1c3a35e06c0fbe33d3688ed29b0ec33556ae37d1654e1dc2133d892613ad8d1ecbdce9aaa5b9eb10dcbb7a
 DIST openssh-8.6p1.tar.gz 1786328 BLAKE2B 261a0f1a6235275894d487cce37537755c86835e3a34871462fe29bfe72b49cd9a6b6a547aea4bd554f0957e110c84458cc75a5f2560717fb04804d62228562a SHA512 9854eda0b773c64c9f1f74844ce466b2b42ee8845f58ad062b73141d617af944fa4ebafdf72069f400106d2c2bd0a69c92fe805ec1fc26d4f0faadf06c3fbbe6
+DIST openssh-8.7p1+x509-13.2.diff.gz 1068695 BLAKE2B e542e5444f8360e0e28288d6a58d66995ff90e9f6bb1490b04a205162036e371a20d612655ca1bd479b8a04d5ccbfd9b7189b090d50ccbb019848e28571b036b SHA512 342e1ee050258c99f8f206664ef756e1be2c82e5faa5f966b80385aa2c6c601974681459ddba32c1ca5c33eda530af681e753471706c71902c1045a2913cd540
 DIST openssh-8.7p1-sctp-1.2.patch.xz 6740 BLAKE2B 468a455018ffddf4fa64d63acb732ad3e1fb722ae8b24d06cf3a683167a4580626b477bbc286f296c83d39dd36c101ac58597a21daa63de83ad55af00aa3a6be SHA512 aa9067c9025b6e4edfad5e45ec92da43db14edb11aae02cbbc296e66b48377cbbf62cdafcdd5edfd1fd4bf69420ee017223ab52e50a42b1976002d767984777c
 DIST openssh-8.7p1.tar.gz 1814595 BLAKE2B 9fdb8898485053d08c9eca419c15d0d03b7a60152cf6a9d7f1beed3a21c9e6ac3bd9f854580e6e474fb0c871f3d4be9ef4b49bee8c355d9e5769a5505f4e6ea9 SHA512 08c81024d9e1248abfda6cc874886ff5ae916669b93cd6aff640e0614ee8cbcbc3fe87a9ce47136b6443ddbb1168b114367c74e117551905994e1a7e3fa2c0c2
 DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a019996d275655b04997301e247f5c4dd7fad35d12b3b7c25afb1b078d915ef2a4ae02f736f0aec9ba2a8c56a405d7ca303bcadf7 SHA512 4c2dbf99a9b5953fdb955f700272bbaeaa025f108a8860d2190197962b849f8385327af82c4d6a3a130a7fba35a74a8ec9437d642867601acb29817c49632a8f
@@ -36,5 +39,5 @@ DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 370b88a7da7f148
 DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c7777258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1 SHA512 c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914
 EBUILD openssh-8.5_p1-r2.ebuild 17581 BLAKE2B a971d17ec56d3a6217174c14cec3b273ce0a2d1835cf1ea7e7ef32f8769bd69b7fddc77ec59158744fe8d1463464d33813e4c361cfeafc3935afd4260df136f3 SHA512 07bee99c1b3c40d3b82a640960494b2f92ae1f47f7af3acb04507f5a5e3db35aaaea5d530d59723256b9952cedb8836a0157dd9f7101b2f94aafdcc7c1765944
 EBUILD openssh-8.6_p1-r2.ebuild 17655 BLAKE2B 51c2e441eebfab62ebb34eb83ab11ca024ff50a8a3444db82014e554c7d89de10757a45b0f81f4d704977cc7c75a55bae46dbd32bb88132950b72c8cb583073e SHA512 5014bbcde62554e03814906c13521a2db2dcb8df1107d1b2825a9296c85fa76a68c70f07317e57145b46f28b0d5a772aaa03b9e3f6b42db2b3fc0f3be416e527
-EBUILD openssh-8.7_p1.ebuild 17562 BLAKE2B 0d7b68260a18751ef71becd368af8cef248183cd9c7f1dc6efc0d978b091c0c1e0dfe6b5d3700ca5cf594d47ae14e775ed9c946aab257e1443492702471c9a74 SHA512 f69dbf9affd675623082a9740ae1b38e4b37d6c308aac6dcc394b0494fbb6d1709d5c94737347c62d104f01a5c3d1cbc79e2896e86cad86e34de226126a8dce8
+EBUILD openssh-8.7_p1-r1.ebuild 17561 BLAKE2B 815bdc9158304e22ec5225fe07ae7eeab93cda4606b1ca64f41ff61194ac80bc77f31f96a6f9ce7dcd802d70c1909453fedcee9657db128d76d6e987e0458fea SHA512 c7651f4b7a60d18d1d8146325f4a41af03f4b23cec95d632dd42e827df6ad140ef23c0b71cf881290cb0a897e64940db88d0cf3630b300446edb2b1d97b175cf
 MISC metadata.xml 2101 BLAKE2B fabe0e83b78f80666415646d7b85b296c8026f5e7465705555d03237a289208238e182919e75bec29d1113a5b7483a66b53a421e8881533af5d25c79521d9a08 SHA512 b9eb68f11fa10e763f529da88e252a94ccd89b41e857f39bf7c887ddc38c1bfd4aa9e9383a69c506080531f396ad5fdd9e1f811529a04864447a7b3e833c0e9f
diff --git a/net-misc/openssh/files/openssh-8.7_p1-X509-glue-13.2.patch b/net-misc/openssh/files/openssh-8.7_p1-X509-glue-13.2.patch
new file mode 100644
index 000000000000..d6f5e42027d1
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.7_p1-X509-glue-13.2.patch
@@ -0,0 +1,73 @@
+diff -ur '--exclude=.*.un~' a/openssh-8.7p1+x509-13.2.diff b/openssh-8.7p1+x509-13.2.diff
+--- a/openssh-8.7p1+x509-13.2.diff	2021-08-30 17:47:40.415668320 -0700
++++ b/openssh-8.7p1+x509-13.2.diff	2021-08-30 17:49:14.916114987 -0700
+@@ -51082,12 +51082,11 @@
+  
+  install-files:
+  	$(MKDIR_P) $(DESTDIR)$(bindir)
+-@@ -391,6 +368,8 @@
++@@ -391,6 +368,7 @@
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
+  	$(MKDIR_P) $(DESTDIR)$(libexecdir)
+ +	$(MKDIR_P) $(DESTDIR)$(sshcadir)
+-+	$(MKDIR_P) $(DESTDIR)$(piddir)
+  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
+@@ -69793,7 +69792,7 @@
+ -	echo "putty interop tests not enabled"
+ -	exit 0
+ -fi
+-+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1;  exit 1; }
+++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1;  exit 0; }
+  
+  for c in aes 3des aes128-ctr aes192-ctr aes256-ctr chacha20 ; do
+  	verbose "$tid: cipher $c"
+@@ -69808,7 +69807,7 @@
+ -	echo "putty interop tests not enabled"
+ -	exit 0
+ -fi
+-+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1;  exit 1; }
+++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1;  exit 0; }
+  
+  for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ecdh ; do
+  	verbose "$tid: kex $k"
+@@ -69823,7 +69822,7 @@
+ -	echo "putty interop tests not enabled"
+ -	exit 0
+ -fi
+-+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1;  exit 1; }
+++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1;  exit 0; }
+  
+  if [ "`${SSH} -Q compression`" = "none" ]; then
+  	comp="0"
+@@ -70130,9 +70129,9 @@
+  
+ +# cross-project configuration
+ +if test "$sshd_type" = "pkix" ; then
+-+  unset_arg=''
+++  unset_arg=
+ +else
+-+  unset_arg=none
+++  unset_arg=
+ +fi
+ +
+  cat > $OBJ/sshd_config.i << _EOF
+@@ -131673,16 +131672,6 @@
+ +int	 asnmprintf(char **, size_t, int *, const char *, ...)
+  	    __attribute__((format(printf, 4, 5)));
+  void	 msetlocale(void);
+-diff -ruN openssh-8.7p1/version.h openssh-8.7p1+x509-13.2/version.h
+---- openssh-8.7p1/version.h	2021-08-20 07:03:49.000000000 +0300
+-+++ openssh-8.7p1+x509-13.2/version.h	2021-08-30 20:07:00.000000000 +0300
+-@@ -2,5 +2,4 @@
+- 
+- #define SSH_VERSION	"OpenSSH_8.7"
+- 
+--#define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
+ diff -ruN openssh-8.7p1/version.m4 openssh-8.7p1+x509-13.2/version.m4
+ --- openssh-8.7p1/version.m4	1970-01-01 02:00:00.000000000 +0200
+ +++ openssh-8.7p1+x509-13.2/version.m4	2021-08-30 20:07:00.000000000 +0300
diff --git a/net-misc/openssh/files/openssh-8.7_p1-hpn-15.2-X509-glue.patch b/net-misc/openssh/files/openssh-8.7_p1-hpn-15.2-X509-glue.patch
new file mode 100644
index 000000000000..49c05917779a
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.7_p1-hpn-15.2-X509-glue.patch
@@ -0,0 +1,447 @@
+diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff
+--- a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff	2021-08-31 11:12:46.412119817 -0700
++++ b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff	2021-08-31 11:26:11.116026151 -0700
+@@ -3,9 +3,9 @@
+ --- a/Makefile.in
+ +++ b/Makefile.in
+ @@ -46,7 +46,7 @@ CFLAGS=@CFLAGS@
+- CFLAGS_NOPIE=@CFLAGS_NOPIE@
+- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
+- PICFLAG=@PICFLAG@
++ LD=@LD@
++ CFLAGS=@CFLAGS@ $(CFLAGS_EXTRA)
++ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
+ -LIBS=@LIBS@
+ +LIBS=@LIBS@ -lpthread
+  K5LIBS=@K5LIBS@
+@@ -803,8 +803,8 @@
+  ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out)
+  {
+  	struct session_state *state;
+--	const struct sshcipher *none = cipher_by_name("none");
+-+	struct sshcipher *none = cipher_by_name("none");
++-	const struct sshcipher *none = cipher_none();
+++	struct sshcipher *none = cipher_none();
+  	int r;
+  
+  	if (none == NULL) {
+@@ -894,24 +894,24 @@
+  		intptr = &options->compression;
+  		multistate_ptr = multistate_compression;
+ @@ -2272,6 +2278,7 @@ initialize_options(Options * options)
+- 	options->revoked_host_keys = NULL;
+  	options->fingerprint_hash = -1;
+  	options->update_hostkeys = -1;
++	options->known_hosts_command = NULL;
+ +	options->disable_multithreaded = -1;
+- 	options->hostbased_accepted_algos = NULL;
+- 	options->pubkey_accepted_algos = NULL;
+- 	options->known_hosts_command = NULL;
++ }
++ 
++ /*
+ @@ -2467,6 +2474,10 @@ fill_default_options(Options * options)
++ 		options->update_hostkeys = 0;
+  	if (options->sk_provider == NULL)
+  		options->sk_provider = xstrdup("$SSH_SK_PROVIDER");
+- #endif
+ +	if (options->update_hostkeys == -1)
+ +		options->update_hostkeys = 0;
+ +	if (options->disable_multithreaded == -1)
+ +		options->disable_multithreaded = 0;
+  
+- 	/* Expand KEX name lists */
+- 	all_cipher = cipher_alg_list(',', 0);
++ 	/* expand KEX and etc. name lists */
++ {	char *all;
+ diff --git a/readconf.h b/readconf.h
+ index 2fba866e..7f8f0227 100644
+ --- a/readconf.h
+@@ -950,9 +950,9 @@
+  	/* Portable-specific options */
+  	sUsePAM,
+ +	sDisableMTAES,
+- 	/* Standard Options */
+- 	sPort, sHostKeyFile, sLoginGraceTime,
+- 	sPermitRootLogin, sLogFacility, sLogLevel, sLogVerbose,
++ 	/* X.509 Standard Options */
++ 	sHostbasedAlgorithms,
++ 	sPubkeyAlgorithms,
+ @@ -662,6 +666,7 @@ static struct {
+  	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
+  	{ "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL },
+diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff
+--- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff	2021-08-31 11:12:46.412119817 -0700
++++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff	2021-08-31 14:17:59.366248683 -0700
+@@ -157,6 +157,36 @@
+ +	 Allan Jude provided the code for the NoneMac and buffer normalization.
+ +         This work was financed, in part, by Cisco System, Inc., the National
+ +         Library of Medicine, and the National Science Foundation.
++diff --git a/auth2.c b/auth2.c
++--- a/auth2.c	2021-03-15 19:30:45.404060786 -0700
+++++ b/auth2.c	2021-03-15 19:37:22.078476597 -0700
++@@ -229,16 +229,17 @@
++ 	double delay;
++ 
++ 	digest_alg = ssh_digest_maxbytes();
++-	len = ssh_digest_bytes(digest_alg);
++-	hash = xmalloc(len);
+++	if (len = ssh_digest_bytes(digest_alg) > 0) {
+++		hash = xmalloc(len);
++ 
++-	(void)snprintf(b, sizeof b, "%llu%s",
++-	    (unsigned long long)options.timing_secret, user);
++-	if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0)
++-		fatal_f("ssh_digest_memory");
++-	/* 0-4.2 ms of delay */
++-	delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000;
++-	freezero(hash, len);
+++		(void)snprintf(b, sizeof b, "%llu%s",
+++		    (unsigned long long)options.timing_secret, user);
+++		if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0)
+++			fatal_f("ssh_digest_memory");
+++		/* 0-4.2 ms of delay */
+++		delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000;
+++		freezero(hash, len);
+++	}
++ 	debug3_f("user specific delay %0.3lfms", delay/1000);
++ 	return MIN_FAIL_DELAY_SECONDS + delay;
++ }
+ diff --git a/channels.c b/channels.c
+ index b60d56c4..0e363c15 100644
+ --- a/channels.c
+@@ -209,14 +239,14 @@
+  static void
+  channel_pre_open(struct ssh *ssh, Channel *c,
+      fd_set *readset, fd_set *writeset)
+-@@ -2120,22 +2147,32 @@ channel_check_window(struct ssh *ssh, Channel *c)
++@@ -2164,21 +2191,31 @@ channel_check_window(struct ssh *ssh, Channel *c)
+  
+  	if (c->type == SSH_CHANNEL_OPEN &&
+  	    !(c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD)) &&
+ -	    ((c->local_window_max - c->local_window >
+ -	    c->local_maxpacket*3) ||
+-+            ((ssh_packet_is_interactive(ssh) &&
+-+            c->local_window_max - c->local_window > c->local_maxpacket*3) ||
+++	    ((ssh_packet_is_interactive(ssh) &&
+++	    c->local_window_max - c->local_window > c->local_maxpacket*3) ||
+  	    c->local_window < c->local_window_max/2) &&
+  	    c->local_consumed > 0) {
+ +		u_int addition = 0;
+@@ -235,9 +265,8 @@
+  		    (r = sshpkt_put_u32(ssh, c->remote_id)) != 0 ||
+ -		    (r = sshpkt_put_u32(ssh, c->local_consumed)) != 0 ||
+ +		    (r = sshpkt_put_u32(ssh, c->local_consumed + addition)) != 0 ||
+- 		    (r = sshpkt_send(ssh)) != 0) {
+- 			fatal_fr(r, "channel %i", c->self);
+- 		}
++ 		    (r = sshpkt_send(ssh)) != 0)
++ 			fatal_fr(r, "channel %d", c->self);
+ -		debug2("channel %d: window %d sent adjust %d", c->self,
+ -		    c->local_window, c->local_consumed);
+ -		c->local_window += c->local_consumed;
+@@ -337,70 +366,92 @@
+ index 70f492f8..5503af1d 100644
+ --- a/clientloop.c
+ +++ b/clientloop.c
+-@@ -1578,9 +1578,11 @@ client_request_x11(struct ssh *ssh, const char *request_type, int rchan)
++@@ -1578,10 +1578,11 @@ client_request_x11(struct ssh *ssh, const char *request_type, int rchan)
+  	sock = x11_connect_display(ssh);
+  	if (sock < 0)
+  		return NULL;
+ -	c = channel_new(ssh, "x11",
+ -	    SSH_CHANNEL_X11_OPEN, sock, sock, -1,
+--	    CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, "x11", 1);
+-+        c = channel_new(ssh, "x11",
+-+			SSH_CHANNEL_X11_OPEN, sock, sock, -1,
+-+			/* again is this really necessary for X11? */
+-+			options.hpn_disabled ? CHAN_TCP_WINDOW_DEFAULT : options.hpn_buffer_size,
+-+			CHAN_X11_PACKET_DEFAULT, 0, "x11", 1);
++-	    CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, "x11",
++-	    CHANNEL_NONBLOCK_SET);
+++	c = channel_new(ssh, "x11",
+++	    SSH_CHANNEL_X11_OPEN, sock, sock, -1,
+++	    /* again is this really necessary for X11? */
+++	    options.hpn_disabled ? CHAN_TCP_WINDOW_DEFAULT : options.hpn_buffer_size,
+++	    CHAN_X11_PACKET_DEFAULT, 0, "x11", CHANNEL_NONBLOCK_SET);
+  	c->force_drain = 1;
+  	return c;
+  }
+-@@ -1608,9 +1610,10 @@ client_request_agent(struct ssh *ssh, const char *request_type, int rchan)
++@@ -1608,9 +1609,10 @@ client_request_agent(struct ssh *ssh, const char *request_type, int rchan)
+  		return NULL;
+  	}
+  	c = channel_new(ssh, "authentication agent connection",
+ -	    SSH_CHANNEL_OPEN, sock, sock, -1,
+ -	    CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0,
+--	    "authentication agent connection", 1);
+-+			SSH_CHANNEL_OPEN, sock, sock, -1,
+-+			options.hpn_disabled ? CHAN_X11_WINDOW_DEFAULT : options.hpn_buffer_size,
+-+			CHAN_TCP_PACKET_DEFAULT, 0,
+-+			"authentication agent connection", 1);
++-	    "authentication agent connection", CHANNEL_NONBLOCK_SET);
+++	    SSH_CHANNEL_OPEN, sock, sock, -1,
+++	    options.hpn_disabled ? CHAN_X11_WINDOW_DEFAULT : options.hpn_buffer_size,
+++	    CHAN_TCP_PACKET_DEFAULT, 0,
+++	    "authentication agent connection", CHANNEL_NONBLOCK_SET);
+  	c->force_drain = 1;
+  	return c;
+  }
+-@@ -1635,10 +1638,13 @@ client_request_tun_fwd(struct ssh *ssh, int tun_mode,
++@@ -1635,9 +1637,9 @@ client_request_tun_fwd(struct ssh *ssh, int tun_mode,
+  	}
+  	debug("Tunnel forwarding using interface %s", ifname);
+  
+ -	c = channel_new(ssh, "tun", SSH_CHANNEL_OPENING, fd, fd, -1,
+--	    CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1);
+-+        c = channel_new(ssh, "tun", SSH_CHANNEL_OPENING, fd, fd, -1,
++-	    CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "tun",
++-	    CHANNEL_NONBLOCK_SET);
+++	c = channel_new(ssh, "tun", SSH_CHANNEL_OPENING, fd, fd, -1,
+ +	    options.hpn_disabled ? CHAN_TCP_WINDOW_DEFAULT : options.hpn_buffer_size,
+-+	    CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1);
+++	    CHAN_TCP_PACKET_DEFAULT, 0, "tun", CHANNEL_NONBLOCK_SET);
+  	c->datagram = 1;
+  
+-+
+-+
+  #if defined(SSH_TUN_FILTER)
+- 	if (options.tun_open == SSH_TUNMODE_POINTOPOINT)
+- 		channel_register_filter(ssh, c->self, sys_tun_infilter,
+ diff --git a/compat.c b/compat.c
+ index 69befa96..90b5f338 100644
+ --- a/compat.c
+ +++ b/compat.c
+-@@ -149,6 +149,14 @@ compat_banner(struct ssh *ssh, const char *version)
+- 			debug_f("match: %s pat %s compat 0x%08x",
++@@ -43,7 +43,7 @@ compat_datafellows(const char *version)
++ static u_int
++ compat_datafellows(const char *version)
++ {
++-	int i;
+++	int i, bugs = 0;
++ 	static struct {
++ 		char	*pat;
++ 		int	bugs;
++@@ -147,11 +147,26 @@
++ 		if (match_pattern_list(version, check[i].pat, 0) == 1) {
++ 			debug("match: %s pat %s compat 0x%08x",
+  			    version, check[i].pat, check[i].bugs);
+- 			ssh->compat = check[i].bugs;
+ +			/* Check to see if the remote side is OpenSSH and not HPN */
+-+			/* TODO: need to use new method to test for this */
+ +			if (strstr(version, "OpenSSH") != NULL) {
+ +				if (strstr(version, "hpn") == NULL) {
+-+					ssh->compat |= SSH_BUG_LARGEWINDOW;
+++					bugs |= SSH_BUG_LARGEWINDOW;
+ +					debug("Remote is NON-HPN aware");
+ +				}
+ +			}
+- 			return;
++-			return check[i].bugs;
+++			bugs |= check[i].bugs;
+  		}
+  	}
++-	debug("no match: %s", version);
++-	return 0;
+++	/* Check to see if the remote side is OpenSSH and not HPN */
+++	if (strstr(version, "OpenSSH") != NULL) {
+++		if (strstr(version, "hpn") == NULL) {
+++			bugs |= SSH_BUG_LARGEWINDOW;
+++			debug("Remote is NON-HPN aware");
+++		}
+++	}
+++	if (bugs == 0)
+++		debug("no match: %s", version);
+++	return bugs;
++ }
++ 
++ char *
+ diff --git a/compat.h b/compat.h
+ index c197fafc..ea2e17a7 100644
+ --- a/compat.h
+@@ -459,7 +510,7 @@
+ @@ -890,6 +890,10 @@ kex_choose_conf(struct ssh *ssh)
+  	int nenc, nmac, ncomp;
+  	u_int mode, ctos, need, dh_need, authlen;
+- 	int r, first_kex_follows;
++ 	int r, first_kex_follows = 0;
+ +	int auth_flag = 0;
+ +
+ +	auth_flag = packet_authentication_state(ssh);
+@@ -553,7 +604,7 @@
+  #define MAX_PACKETS	(1U<<31)
+  static int
+  ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
+-@@ -1317,7 +1351,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
++@@ -1317,7 +1336,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
+  	struct session_state *state = ssh->state;
+  	int len, r, ms_remain;
+  	fd_set *setp;
+@@ -1035,19 +1086,6 @@
+  
+  /* Minimum amount of data to read at a time */
+  #define MIN_READ_SIZE	512
+-diff --git a/ssh-keygen.c b/ssh-keygen.c
+-index cfb5f115..36a6e519 100644
+---- a/ssh-keygen.c
+-+++ b/ssh-keygen.c
+-@@ -2971,7 +2971,7 @@ do_download_sk(const char *skprovider, const char *device)
+- 			freezero(pin, strlen(pin));
+- 		error_r(r, "Unable to load resident keys");
+- 		return -1;
+--	}
+-+ 	}
+- 	if (nkeys == 0)
+- 		logit("No keys to download");
+- 	if (pin != NULL)
+ diff --git a/ssh.c b/ssh.c
+ index 53330da5..27b9770e 100644
+ --- a/ssh.c
+@@ -1093,7 +1131,7 @@
+ +	else
+ +		options.hpn_buffer_size = 2 * 1024 * 1024;
+ +
+-+	if (ssh->compat & SSH_BUG_LARGEWINDOW) {
+++	if (ssh_compat_fellows(ssh, SSH_BUG_LARGEWINDOW)) {
+ +		debug("HPN to Non-HPN Connection");
+ +	} else {
+ +		int sock, socksize;
+@@ -1157,14 +1195,14 @@
+  	}
+ @@ -2089,6 +2167,11 @@ ssh_session2_open(struct ssh *ssh)
+  	    window, packetmax, CHAN_EXTENDED_WRITE,
+- 	    "client-session", /*nonblock*/0);
++ 	    "client-session", CHANNEL_NONBLOCK_STDIO);
+  
+ +	if ((options.tcp_rcv_buf_poll > 0) && !options.hpn_disabled) {
+ +		c->dynamic_window = 1;
+ +		debug("Enabled Dynamic Window Scaling");
+ +	}
+ +
+- 	debug3_f("channel_new: %d", c->self);
++ 	debug2_f("channel %d", c->self);
+  
+  	channel_send_open(ssh, c->self);
+ @@ -2105,6 +2188,13 @@ ssh_session2(struct ssh *ssh, const struct ssh_conn_info *cinfo)
+@@ -1335,7 +1373,29 @@
+  		/* Bind the socket to the desired port. */
+  		if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) == -1) {
+  			error("Bind to port %s on %s failed: %.200s.",
+-@@ -1727,6 +1734,19 @@ main(int ac, char **av)
++@@ -1625,13 +1632,14 @@
++ 		if (ssh_digest_update(ctx, sshbuf_ptr(server_cfg),
++ 		    sshbuf_len(server_cfg)) != 0)
++ 			fatal_f("ssh_digest_update");
++-		len = ssh_digest_bytes(digest_alg);
++-		hash = xmalloc(len);
++-		if (ssh_digest_final(ctx, hash, len) != 0)
++-			fatal_f("ssh_digest_final");
++-		options.timing_secret = PEEK_U64(hash);
++-		freezero(hash, len);
++-		ssh_digest_free(ctx);
+++		if ((len = ssh_digest_bytes(digest_alg)) > 0) {
+++			hash = xmalloc(len);
+++			if (ssh_digest_final(ctx, hash, len) != 0)
+++				fatal_f("ssh_digest_final");
+++			options.timing_secret = PEEK_U64(hash);
+++			freezero(hash, len);
+++			ssh_digest_free(ctx);
+++		}
++ 		ctx = NULL;
++ 		return;
++ 	}
++@@ -1727,6 +1735,19 @@ main(int ac, char **av)
+  		fatal("AuthorizedPrincipalsCommand set without "
+  		    "AuthorizedPrincipalsCommandUser");
+  
+@@ -1355,7 +1415,7 @@
+  	/*
+  	 * Check whether there is any path through configured auth methods.
+  	 * Unfortunately it is not possible to verify this generally before
+-@@ -2166,6 +2186,9 @@ main(int ac, char **av)
++@@ -2166,6 +2187,9 @@ main(int ac, char **av)
+  	    rdomain == NULL ? "" : "\"");
+  	free(laddr);
+  
+@@ -1365,7 +1425,7 @@
+  	/*
+  	 * We don't want to listen forever unless the other side
+  	 * successfully authenticates itself.  So we set up an alarm which is
+-@@ -2343,6 +2366,12 @@ do_ssh2_kex(struct ssh *ssh)
++@@ -2343,6 +2367,12 @@ do_ssh2_kex(struct ssh *ssh)
+  	struct kex *kex;
+  	int r;
+  
+@@ -1405,14 +1465,3 @@
+  # Example of overriding settings on a per-user basis
+  #Match User anoncvs
+  #	X11Forwarding no
+-diff --git a/version.h b/version.h
+-index 6b4fa372..332fb486 100644
+---- a/version.h
+-+++ b/version.h
+-@@ -3,4 +3,5 @@
+- #define SSH_VERSION	"OpenSSH_8.5"
+- 
+- #define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_HPN         "-hpn15v2"
+-+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
+diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-PeakTput-15.2.diff b/openssh-8_5_P1-hpn-PeakTput-15.2.diff
+--- a/openssh-8_5_P1-hpn-PeakTput-15.2.diff	2021-08-31 11:12:16.778011216 -0700
++++ b/openssh-8_5_P1-hpn-PeakTput-15.2.diff	2021-08-31 11:13:11.573211934 -0700
+@@ -12,9 +12,9 @@
+  static long stalled;		/* how long we have been stalled */
+  static int bytes_per_second;	/* current speed in bytes per second */
+ @@ -127,6 +129,7 @@ refresh_progress_meter(int force_update)
++ 	off_t bytes_left;
+  	int cur_speed;
+- 	int hours, minutes, seconds;
+- 	int file_len;
++ 	int len;
+ +	off_t delta_pos;
+  
+  	if ((!force_update && !alarm_fired && !win_resized) || !can_output())
+@@ -30,15 +30,17 @@
+  	if (bytes_left > 0)
+  		elapsed = now - last_update;
+  	else {
+-@@ -166,7 +173,7 @@ refresh_progress_meter(int force_update)
+- 
++@@ -166,8 +173,8 @@ refresh_progress_meter(int force_update)
++ 	buf[1] = '\0';
++
+  	/* filename */
+- 	buf[0] = '\0';
+--	file_len = win_size - 36;
+-+	file_len = win_size - 45;
+- 	if (file_len > 0) {
+- 		buf[0] = '\r';
+- 		snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s",
++-	if (win_size > 36) {
+++	if (win_size > 45) {
++-		int file_len = win_size - 36;
+++		int file_len = win_size - 45;
++ 		snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s ",
++ 		    file_len, file);
++ 	}
+ @@ -191,6 +198,15 @@ refresh_progress_meter(int force_update)
+  	    (off_t)bytes_per_second);
+  	strlcat(buf, "/s ", win_size);
+@@ -63,15 +65,3 @@
+  }
+  
+  /*ARGSUSED*/
+-diff --git a/ssh-keygen.c b/ssh-keygen.c
+-index cfb5f115..986ff59b 100644
+---- a/ssh-keygen.c
+-+++ b/ssh-keygen.c
+-@@ -2959,7 +2959,6 @@ do_download_sk(const char *skprovider, const char *device)
+- 
+- 	if (skprovider == NULL)
+- 		fatal("Cannot download keys without provider");
+--
+- 	pin = read_passphrase("Enter PIN for authenticator: ", RP_ALLOW_STDIN);
+- 	if (!quiet) {
+- 		printf("You may need to touch your authenticator "
diff --git a/net-misc/openssh/openssh-8.7_p1.ebuild b/net-misc/openssh/openssh-8.7_p1-r1.ebuild
index 2b26a0f2548b..f5ffce0f4495 100644
--- a/net-misc/openssh/openssh-8.7_p1.ebuild
+++ b/net-misc/openssh/openssh-8.7_p1-r1.ebuild
@@ -21,7 +21,7 @@ HPN_PATCHES=(
 )
 
 SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
-#X509_VER="13.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+X509_VER="13.2" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="https://www.openssh.com/"
@@ -186,7 +186,7 @@ src_prepare() {
 		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die
 		pushd "${hpn_patchdir}" &>/dev/null || die
 		eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch
-		use X509 && eapply "${FILESDIR}"/${PN}-8.6_p1-hpn-${HPN_VER}-X509-glue.patch
+		use X509 && eapply "${FILESDIR}"/${PN}-8.7_p1-hpn-${HPN_VER}-X509-glue.patch
 		use sctp && eapply "${FILESDIR}"/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch
 		popd &>/dev/null || die
 
diff --git a/net-misc/stargazer/Manifest b/net-misc/stargazer/Manifest
deleted file mode 100644
index c0b6f3e73784..000000000000
--- a/net-misc/stargazer/Manifest
+++ /dev/null
@@ -1,26 +0,0 @@
-AUX logrotate 130 BLAKE2B 9906a340e5f92f0cd2af084c2b6f8d22d1df0b3e3ee8bdcb1c7f96d74f9620676bd0f1b4a610880f407768e600d927e071dc1aebc9dd74cc042c31159789cde7 SHA512 bc6b186ac83fdfdbd26c75fbef6a350e7e3af0b106082cebc4001512b07be501326df23bc260846453b1bb322e8a08abc2a1b111982c71edf1df5c05cb394790
-AUX mans/rscriptd.8 1057 BLAKE2B 5409b6d33995815502944b516909816a3f3b574864c9d16c45e8f6426492c47007dbbba73cfbe86503189ceb7ced489bdc203e441c7b88891d3cbf8ed5648f51 SHA512 2afbd834aceb273a7574012bae43881d9918247524c96a1f60fa31cdc4331757a0e345432155d83a21a21a7c37f494984c175a282f4b16e4f1fb2882754676bc
-AUX mans/sgauth.8 1146 BLAKE2B c2b611a1bb5d5e705b22097bb19e5c65d4ea1b065ece8e7423356e2b47dc3e616350915dba0570ab6d4aa4ed76e0aa3873cf337582cb98b86037e07f7731e00c SHA512 724ce9ed66abe53b9c22db273e04e372663d958bb8a70938baa88f844410f7eccaaf3b95515f2d24189b6b93711f26d2588758ffd2cdf8116631c092d18d72c2
-AUX mans/sgconf.1 2870 BLAKE2B 91049e1706bb9667ea294fe986c1fcef1669a8b7a8221b7aee944c67eb35182502df0f3ce5eb8b5f8207bf9ce771457b86f6ec585eb3f733b933cdd3daa65990 SHA512 5ae47adf857d52ee339937cf2ef892602ae513037358470fb87ae682397fe4321ef15d03211d384020c06af3488dc868f5be8ccdaec5b3ad2bea446a8c939776
-AUX mans/sgconf_xml.1 1527 BLAKE2B 491b5d4ef125ceb6c7b5e8d3e956f024705fd102ac4952b056c837e69afabfaa45eef4448c677b7a03ea739b00eadbb318c1c3815560bdb4e91b5a3167d287d3 SHA512 db79a12955865955022a1cdeef1c6496f9c4232b1cac972f3c8bfdf7aff503f206d3b177961357bcaa14a60426b06bd49ffe8601fc57bbf2c00dd2bea890da75
-AUX mans/sgconv.1 892 BLAKE2B ebf2f219202967b22b1c105cef69d2eb951d5fef911187a217c9fa35e1600154e4ac8bb8a003b9efe381b9840d7d58afc19fde22d16291063072c5b33a2ed939 SHA512 de6ff8c3569a5aba6690539a2c523833200e732777c1b7e9325b4e518ca1cb72906325fb4ea58c2abd0ce80bb0bf5c55f564cc31cbd122c93d8528d2e3a033e8
-AUX mans/stargazer.8 1394 BLAKE2B 6f7964d23f752b1ab8366d3277f5d7a1cff97d894e4fb34e07ccac8000142e6c9a1327dcf3e5e9f631b18a83ff6c2dd60313c910153198e525c82fd63297dd9b SHA512 6c69970f0dfee31f1a9d68ee784a54f169b2ba272a10bb3f3be139407d374fd8d8d5e9e37c4d1e3091c85c22cd84ed7235894cd5f678614017111b6175e08e89
-AUX patches/stg-2.408-build-upstream.patch 4787 BLAKE2B 791316c9477abc5e5f165e5bbf7fe89a444aecbad06b37447fbb6567df16dd3f9e0bcbca1466f8a4047b4698cf0ec933c7bc806d5e70fe5add09222201e6141c SHA512 d3db525bc2526461fe898d4db9c8547db6c95ced8cfce2ac87001884293eb203f001c3ea39004073bbd1a683ac413d8e0c70c5af76b94f7b23c8439a0cba934e
-AUX patches/stg-2.408-build.patch 4248 BLAKE2B 97d9a9e06fd2d41423cbdd315b9a192b08de2c8fc95335cb55d08f9b742da3492f21087beb1c3a45b37a6ae6ed354190146dd2b5679448dc51bfdda357ee8690 SHA512 b9d24ffc1e1c8efe390c2e499220b93971da22506668f9610a95ce47cb77f103653b0820599db2b79790a2d6304bfd7d9f3e1251785eaeee6fcf005fb479b6a4
-AUX patches/stg-2.408-correct-paths.patch 6521 BLAKE2B e7f5ce0f30fde1eeb7f95e06e51bf0db2b42731b3d7def7f6af93dc2acaa8b381fed255eee24ec2542529c7495dc2b62397955ee2aa4f02e9a71eab21f59f123 SHA512 a94f7793cd355517dc2894697109b64080e9bf5b7a982f5fce3da8f92ed6089fad8144d506c318a9611c630655d262a8408bca41f330fb62b9d01e191d9270a0
-AUX patches/stg-2.408-fix-crash-on-stop.patch 6125 BLAKE2B c8f8070e73586548676345f87038643621d7ece755364d56de00ac6d7a3206ac6db43824d295bfc0681caf32207676ae80b3a911fab725619ff914bdf0387354 SHA512 efa0345eafaffc8fd3efa78dfe511987b4fc8990446339b797f3ffaf0dad2f44b061baba390ee4f22232bbb8a8cd785a7ea5062377afb92c4287dbde9df7523b
-AUX patches/stg-2.408-makefile-build-upstream.patch 11266 BLAKE2B 8a10a1ba9373ab6fad78cf2391ebf9511cc4d25b4f4fc0db5bff5e051f67c7040f2b61ea901e504e6a4e1549197221cbd4b7d1a36c7f376e2aaa6c9715d75336 SHA512 722be9686fdcd1b979d3a303c088c6b1567fe6288609696a47cf2677280244fee2345c6f31b0caecd73d7bc4a423e0dfd2cd73f53a795137adc18bfc6ec97d3e
-AUX patches/stg-2.408-makefile-firebird-upstream.patch 400 BLAKE2B 51bbe2e224b6610f8261b12254ea224bd5c41421a993430af6093312588063a9b8d9d98b21d8bc90d713c2716374d7955491cf52aa701be7c5d6aa0dc5013dfa SHA512 cb8a2331465445acb103efde604d37589b1da232408a58c58bc19db19fd4afc76abb01ba4ae8dd92af79ecdc85dbcc9f1e9441a9eaa9759659d1905a4df76969
-AUX patches/stg-2.408-makefile.patch 8547 BLAKE2B d6efac0a7902030e935d0644713bb2d216b766df2dc594f0a2fb19a4bef6a8345fb10ea75727b414f276339dc9c19bc65c8c2415705fc00aac96a241600982fa SHA512 8f8a27eca62b62d80fc22bfd5c192600757faa3780a1c75eeeb966ff5c71bd13ed494bf8ef888b0676f1842a9511f17057cf856cec21df19764c7b7369557ce0
-AUX patches/stg-2.408-on-upstream.patch 5180 BLAKE2B bd5fd3953dcf07e725492659e18b19b609e32acaa2e16f57357957ef8f6ece7f4f1c7e20f815cc9052048801106cbb15f491356592b98a6dc64d31695c5a2b5b SHA512 9c95821caec5bdb8f18c02d2f19f5b2cac563bbfc5f1cf0b65b2d1ac9593d85598efb6d9e8e57a9a80de843e89056b2344d510f95b79d960b72ebd95f47a0075
-AUX patches/stg-2.408-radius-upstream.patch 865 BLAKE2B 68fd33b73026543a4bbbc6a530b2262d051e0e30762520dc0efb0c673671ffe9e1493f57f92b08e5f1fa4704cad0f9d7b0dda1672f179c39cf504555f6083c6d SHA512 ebc9bc785019c871a806eb7c4e694876b08d70be87eaeeb74f21f6450264a4603d6fa6262bd1f9e8e0e4a6fa901621b927b3c0849bc5f6f403c04cf33f343070
-AUX patches/stg-2.408-rscriptd-upstream.patch 1107 BLAKE2B 99ca090bdc99de24d32aa9c2498237b8077e6b4c639a0e5efcd26c0af23455047025974aa77ade876eddd1a55827b35dbf320c5615c9e4f3c09e5259b7942865 SHA512 f90331a0c0edb14e8bd2789008059b2c54d763c326485334cefc5d97ef9373ce02e0b61b43f6099ca8c29e9c3dc6d8ef1468f0eba1d0d462bbe2ba00f3cc5074
-AUX patches/stg-2.408-rscriptd.conf-upstream.patch 2519 BLAKE2B 145112218ec4a8e51e58778a416a9963ddfa6fd0ef30fed04ef422b783953902b53aefb1fc0890e504cdada1490924e89a58353a57c713e67130384a8618e690 SHA512 e095d89605568b1d034920e15298b3fb5fc4490afe4aa7c0cf67865352b5e54d69c362471004013d82bcb6a2e39e99b48482753fc897b1609e2caf3ce16d38b7
-AUX patches/stg-2.408-sgauth.conf-upstream.patch 2386 BLAKE2B e790468c02d02363a186e2a89f4a14bb396f56069666ce2d37452749156ae41e4c8877597f14970f314f849aa7dbe1f4908dfd2e1dab15b065493575126d4024 SHA512 bed8a3ec9dc0ff8f0d88bf3503f34fd7ec8fb6cfc1e0dace9048ee50b3a9c032c36fde1785ff05ca83256e9d6ae9af6ad2b391bab23e87b3586353d123a02ba3
-AUX patches/stg-2.408-sgconv-upstream.patch 1554 BLAKE2B 1956c6990af336243472c2cdf876d31ab2e88b854ae8a1e43517bc8e0729ff6516275ade458defa4a27a8f093bd21797ac5cb2c213123c3170bfafa05dce6c03 SHA512 91bf0ae2df31ad3f9b9b6610ebbc274ccdc806656101136c78a9a6a13ab835f23b5df61b1a8a50e4b2ffcc2b121da40d5e72fb53cb77534de10dca10c2d1a716
-AUX patches/stg-2.408-static-libs.patch 198 BLAKE2B 2ad854cd7ac7f9bf8a01aa8cfbb896efc31d526ee23f6e3857fd4c0ea1e17a4acff2e59bb2c52ac7130eec477496572d4cf2693657356ecc1deea265fa1ac36a SHA512 4766d1c8c1e48776c1d5e39736ecdaf53bb5030721f4799867a675c47d2a9d4f81e0c517a8a7aef330fff9a8d063835774f186e96e29661a99e1e330b759c8ca
-AUX rscriptd 453 BLAKE2B fb7d771ad0c29223d8a24196da05c05faf852291530fef644b60bf83893e3d038628a1ca7db92d3f3b8144cf44ccc7aa694686c77e6514867048841f1f57d61f SHA512 21cb21a5a14901f3b370f2cedb6ede9414c1080d3d4e073ed048f005f40622179cd91e8cf80f609f0a7b5cacecff5f15913a5cf954dfff56ad036649f4a0a48f
-AUX sgauth 462 BLAKE2B 9aeb1dfe4ce08f7626d6275813e8a3b2f3023ebc11b10841c7a6b01ff9110ed1193e3b2b367c7c1056c473d41f481c93ad25f4252f774fd7df5392af710255bd SHA512 a2d6ba8c2200095072a73342fab4cb5706470d52d9dc6a57f023b16dc895957d4377bc089a4a3cd57126bc9628020c2c1bb60347758e53576eccbc0c854c2364
-DIST stg-2.408.tar.gz 5100291 BLAKE2B c5e50d5607f7c5253dcbb9d48fffdd55bf44829bfc3dba1e45227fa819d2592212366baff6b19dce70ef7a565f8b03e8f580204225441b12653de6271a030554 SHA512 200e08cfd629dbacda31ffd3134c2908a1ad58604421cc288ad0ec1bdcd60fe021d51fed50fdc2517bb7c2b61ef23b0b9c71a606babd09bc7804cb899e0b7f75
-EBUILD stargazer-2.408-r2.ebuild 17309 BLAKE2B 8dc32ea6b3ab497584f76eff7c3899683ecae557c82c34380980954b67a14fbd3b75a1f4d53b40682c37c796ed4f7e00db8f4910357844f91f94132131bbc977 SHA512 f33ee6086c1288cb8d408ed2088f8732048061b5aea20b97cfe4fc27cf97c6f53c163379d4fc936f196d87d95da731da227b7593b330ce891c6c70532b8d3eea
-MISC metadata.xml 4193 BLAKE2B db9820d399533519edf9c90f5c8acd3b6627b83ffbdecff58c3691779d940e481cebeff475edd045a924423c0947b00ee68c4725f26154604340c5004d30b0bc SHA512 51e64b32cc492a699a4acad7bf0044b1404be3df14d31ac8f6f239060ce312a908c392df47b86c899baf4e052345c55ac5a940e04f49dbf8dc0ed626bd00058c
diff --git a/net-misc/stargazer/files/logrotate b/net-misc/stargazer/files/logrotate
deleted file mode 100644
index ffa9c23f3012..000000000000
--- a/net-misc/stargazer/files/logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/stargazer/*.log {
-    daily
-    rotate 31
-    compress
-    missingok
-    notifempty
-    copytruncate
-    sharedscripts
-}
diff --git a/net-misc/stargazer/files/mans/rscriptd.8 b/net-misc/stargazer/files/mans/rscriptd.8
deleted file mode 100644
index 440f7b0267b1..000000000000
--- a/net-misc/stargazer/files/mans/rscriptd.8
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH rscriptd 8 "December 31, 2012" "" "rscriptd"
-
-.SH NAME
-rscriptd \- a remote script execute daemon for Stargazer
-
-.SH SYNOPSIS
-.B rscriptd
-.RI [ config-file ]
-.br
-
-.SH DESCRIPTION
-The
-.B rscriptd
-daemon typically runs on a last-wire router before users and
-manages firewall rules to allow/disallow users get their services.
-.B rscriptd
-communicates with
-.B Stargazer
-main daemon by UDP protocol.
-
-.SH OPTIONS
-.TP
-.I config-file
-Path to rscriptd configuration file. Default is 
-.B
-/etc/rscriptd/rscriptd.conf
-
-.SH FILES
-.B
-/usr/sbin/rsriptd
-.br
-.B
-/etc/stargazer/rscriptd.conf
-.br
-.B
-/var/log/stargazer/rscriptd.log
-
-.SH SEE ALSO
-.BR sgconf (1),
-.BR sgconf_xml (1),
-.BR sgconv (1),
-.BR sgauth (8),
-.BR stargazer (8).
-
-.SH AUTHOR
-rscriptd was originally written by Boris Mikhailenko <stg34@stargazer.dp.ua> and 
-Maxim Mamontov <faust@stargazer.dp.ua>.
-.PP
-This manual page was written by Alexey Osipov <simba@lerlan.ru>,
-for the Debian project (and may be used by others), and was modified by
-Vladimir Pavljuchenkov <spiderx@spiderx.dp.ua> for Gentoo Linux
-\ No newline at end of file
diff --git a/net-misc/stargazer/files/mans/sgauth.8 b/net-misc/stargazer/files/mans/sgauth.8
deleted file mode 100644
index 24c872761f7e..000000000000
--- a/net-misc/stargazer/files/mans/sgauth.8
+++ /dev/null
@@ -1,54 +0,0 @@
-.TH sgauth 1 "December 31, 2012" "" "sgauth"
-
-.SH NAME
-sgauth \- a command-line utility for authorization in Stargazer
-
-.SH SYNOPSIS
-.B sgauth
-.RI [ config-file ]
-.br
-
-.SH DESCRIPTION
-.B sgauth
-allow user to become authorized in 
-.B Stargazer
-billing system.
-.PP
-.B sgauth
-reads the
-.IR config-file ,
-connects to
-.B Stargazer
-server and authentificates on it using data supplied in
-.IR config-file .
-In addition, it runs a simple http-server on port 5580, capable of
-monitoring and controlling the connection (if specified in 
-.IR config-file ")."
-
-.SH OPTIONS
-.TP
-.I config-file
-Path to file containing user login, password and other configuration data. Default is 
-.B
-/etc/sgauth.conf
-
-.SH FILES
-.B
-/usr/sbin/sgauth
-.br
-.B
-/etc/stargazer/sgauth.conf
-
-.SH SEE ALSO
-.BR sgconf (1),
-.BR sgconf_xml (1),
-.BR sgconv (1),
-.BR stargazer (8),
-.BR rscriptd (8).
-
-.SH AUTHOR
-sgauth was initially written by Boris Mikhailenko <stg34@stargazer.dp.ua>.
-.PP
-This manual page was written by Alexey Osipov <simba@lerlan.ru>,
-for the Debian project (and may be used by others), and was modified by
-Vladimir Pavljuchenkov <spiderx@spiderx.dp.ua> for Gentoo Linux
-\ No newline at end of file
diff --git a/net-misc/stargazer/files/mans/sgconf.1 b/net-misc/stargazer/files/mans/sgconf.1
deleted file mode 100644
index 4017d9e59648..000000000000
--- a/net-misc/stargazer/files/mans/sgconf.1
+++ /dev/null
@@ -1,160 +0,0 @@
-.TH sgconf 1 "December 31, 2012" "" "sgconf"
-
-.SH NAME
-sgconf \- a command-line utility for configuring Stargazer
-
-.SH SYNOPSIS
-.B sgconf
-(
-.I get
-|
-.I set
-)
-.BI \-s " server"
-.BI \-p " port"
-.BI \-a " admin"
-.BI \-w " admin-pass"
-.BI \-u " user"
-.I special-options
-.br
-
-.SH DESCRIPTION
-.B sgconf
-allows 
-.B Stargazer
-system administrators to configure users.
-.PP
-.B sgconf
-support two subset of commands - 
-.I get
-and
-.IR set .
-.I get
-commands are for reading actual values from 
-.B Stargazer
-and
-.I set
-commands are for writing new values to
-.BR Stargazer .
-
-.SH OPTIONS
-.TP
-.BI \-s " server"
-IP or hostname where 
-.B Stargazer 
-server run.
-.TP
-.BI \-p " port"
-Port, which 
-.B Stargazer 
-listen for configuration connections (typically 5555).
-.TP
-.BI \-a " admin"
-Administrator login.
-.TP
-.BI \-w " admin-pass"
-Administrator password.
-.TP
-.TP
-.IR special-options " are following:"
-(Use without argument for
-.IR get ")"
-.TP
-.BI \-c " add_cash[:log message]"
-Get user's balance or add money to user's balance with optional log message.
-.TP
-.BI \-v " set_cash[:log message]"
-Set user's balance with optional log message.
-.TP
-.BI \-t " tariff:now|delayed"
-Get/set user's tariff. If 
-.I now 
-specified, the change is immediate. If
-.I delayed
-specified, the change will happen at end of the month.
-.TP
-.BI \-r " credit"
-Get/set user's maximum credit.
-.TP
-.BI \-o " password"
-Get/set user's password.
-.TP
-.BI \-e " prepaid"
-Get/set amount of user's prepaid traffic.
-.TP
-.BI \-I " *|ip_addr[,ip_addr...]"
-Get/set user's allowed IP addresses. Asterisk mark means "any address".
-.TP
-.BI \-A " name"
-Get/set user's name.
-.TP
-.BI \-N " note"
-Get/set user's note.
-.TP
-.BI \-D " address"
-Get/set user's street address.
-.TP
-.BI \-L " email"
-Get/set user's email.
-.TP
-.BI \-P " phone"
-Get/set user's phone.
-.TP
-.BI \-G " group"
-Get/set group, user belongs to.
-.TP
-.BI \-d " 0|1"
-Get/set user's "down" ("disabled") flag.
-.TP
-.BI \-i " 0|1"
-Get/set user's "passive" ("frozen") flag.
-.TP
-.BI \-\-disable\-stat " 0|1"
-Get/set user's "disableDetailStat" flag.
-.TP
-.BI \-\-always\-online " 0|1"
-Get/set user's "alwaysOnline" flag.
-.TP
-.BI \-\-u "X traffic"
-Get/set user's upload traffic for
-.I X
-service (direction).
-.TP
-.BI \-\-d "X traffic"
-Get/set user's download traffic for
-.I X
-service (direction).
-.TP
-.BI \-\-ud "X userdata"
-Get/set user's
-.I X
-custom data.
-.TP
-.BI \-m " message"
-Send
-.I message
-to user.
-.TP
-.B \-n
-Create new user.
-.TP
-.B \-l
-Delete user.
-
-.SH FILES
-.B
-/usr/bin/sgconf
-
-.SH SEE ALSO
-.BR sgauth (8),
-.BR sgconf_xml (1),
-.BR sgconv (1),
-.BR stargazer (8),
-.BR rscriptd (8).
-
-.SH AUTHOR
-sgconf was initially written by Boris Mikhailenko <stg34@stargazer.dp.ua>.
-.PP
-This manual page was written by Alexey Osipov <simba@lerlan.ru>,
-for the Debian project (and may be used by others), and was modified by
-Vladimir Pavljuchenkov <spiderx@spiderx.dp.ua> for Gentoo Linux
-\ No newline at end of file
diff --git a/net-misc/stargazer/files/mans/sgconf_xml.1 b/net-misc/stargazer/files/mans/sgconf_xml.1
deleted file mode 100644
index 428fadfd5b18..000000000000
--- a/net-misc/stargazer/files/mans/sgconf_xml.1
+++ /dev/null
@@ -1,79 +0,0 @@
-.TH sgconf_xml 1 "December 31, 2012" "" "sgconf_xml"
-
-.SH NAME
-sgconf_xml \- a command-line xml-based utility for configuring Stargazer
-
-.SH SYNOPSIS
-.B sgconf_xml
-.BI \-s " server"
-.BI \-p " port"
-.BI \-a " admin"
-.BI \-w " admin-pass"
-(
-.BI \-r " request-string"
-|
-.BI \-f " request-file"
-)
-
-.SH DESCRIPTION
-.B sgconf_xml
-allows system administrators to configure 
-.BR Stargazer .
-.PP
-.B sgconf_xml
-uses XML for requests and responses. You can specify a 
-file containing XML request by using
-.B \-f
-option, or you can specify XML request directly as a
-string by using
-.B \-r
-option.
-
-.SH OPTIONS
-.TP
-.BI \-s " server"
-IP or hostname where 
-.B Stargazer 
-server run.
-.TP
-.BI \-p " port"
-Port, which 
-.B Stargazer 
-listen for configuration connections (typically 5555).
-.TP
-.BI \-a " admin"
-Administrator login.
-.TP
-.BI \-w " admin-pass"
-Administrator password.
-.TP
-.BI \-r " request-string"
-The request in form of XML.
-.TP
-.BI \-f " request-file"
-File containing request in form of XML.
-
-.SH REQUEST SYNTAX
-TODO.
-.br
-As for now you can check an example by running 
-.B sgconf_xml
-without arguments.
-
-.SH FILES
-.B
-/usr/bin/sgconf_xml
-
-.SH SEE ALSO
-.BR sgauth (8),
-.BR sgconf (1),
-.BR sgconv (1),
-.BR stargazer (8),
-.BR rscriptd (8).
-
-.SH AUTHOR
-sgconf_xml was initially written by Boris Mikhailenko <stg34@stargazer.dp.ua>.
-.PP
-This manual page was written by Alexey Osipov <simba@lerlan.ru>,
-for the Debian project (and may be used by others), and was modified by
-Vladimir Pavljuchenkov <spiderx@spiderx.dp.ua> for Gentoo Linux
-\ No newline at end of file
diff --git a/net-misc/stargazer/files/mans/sgconv.1 b/net-misc/stargazer/files/mans/sgconv.1
deleted file mode 100644
index b5fb225ab064..000000000000
--- a/net-misc/stargazer/files/mans/sgconv.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.TH sgconv 1 "December 31, 2012" "" "sgconv"
-
-.SH NAME
-sgconv \- an utility to convert Stargazer data between storage backends
-
-.SH SYNOPSIS
-.B sgconv
-.RI [ config-file ]
-
-.SH DESCRIPTION
-.B sgconv
-allows system administrators to copy and merge
-.B Stargazer
-data from one storage backend to another.
-
-.SH OPTIONS
-.TP
-.I config-file
-A path to config file containing convertion parameters. Default is
-.B sgconv.conf 
-in current directory.
-
-.SH FILES
-.B
-/usr/bin/sgconv
-.br
-.B
-/etc/stargazer/sgconv.conf
-
-.SH SEE ALSO
-.BR sgauth (8),
-.BR sgconf (1),
-.BR sgconf_xml (1),
-.BR stargazer (8),
-.BR rscriptd (8).
-
-.SH AUTHOR
-sgconv was initially written by Maxim Mamontov <faust@stargazer.dp.ua>.
-.PP
-This manual page was written by Alexey Osipov <simba@lerlan.ru>,
-for the Debian project (and may be used by others), and was modified by
-Vladimir Pavljuchenkov <spiderx@spiderx.dp.ua> for Gentoo Linux
-\ No newline at end of file
diff --git a/net-misc/stargazer/files/mans/stargazer.8 b/net-misc/stargazer/files/mans/stargazer.8
deleted file mode 100644
index a1860c5d97b9..000000000000
--- a/net-misc/stargazer/files/mans/stargazer.8
+++ /dev/null
@@ -1,64 +0,0 @@
-.TH stargazer 8 "December 31, 2012" "" "stargazer"
-
-.SH NAME
-stargazer \- a powerfull billing system daemon
-
-.SH SYNOPSIS
-.B stargazer
-.RI [ config-directory ]
-.br
-
-.SH DESCRIPTION
-This manual page explains the
-.B stargazer
-daemon. This daemon address ISP user accounting and billing problems.
-.PP
-.B Stargazer
-is capable of:
-.PP
-- manage user accounts using several kinds of stores (plain files, MySQL, Firebird, 
-PostgreSQL)
-.br
-- gather traffic flow information using several methods (Netflow protocol, rawsocket
-ethernet packets capture, netfilter IPQ capture)
-.br
-- bill user accounts according to rate rules and traffic classification
-.br
-- authentificate and authorize users to get access to the internet
-
-.SH OPTIONS
-.TP
-.I config-directory
-Path to directory containing stargazer configuration files. Default is 
-.B
-/etc/stargazer
-
-.SH FILES
-.B
-/usr/sbin/stargazer
-.br
-.B
-/etc/stargazer/
-.br
-.B
-/var/lib/stargazer/
-.br
-.B
-/var/log/stargazer/stargazer.log
-.br
-.B
-/var/log/stargazer/xmlrpc.log
-
-.SH SEE ALSO
-.BR sgconf (1),
-.BR sgconf_xml (1),
-.BR sgconv (1),
-.BR sgauth (8),
-.BR rscriptd (8).
-
-.SH AUTHOR
-stargazer was initially written by Boris Mikhailenko <stg34@stargazer.dp.ua>.
-.PP
-This manual page was written by Alexey Osipov <simba@lerlan.ru>,
-for the Debian project (and may be used by others), and was modified by
-Vladimir Pavljuchenkov <spiderx@spiderx.dp.ua> for Gentoo Linux
-\ No newline at end of file
diff --git a/net-misc/stargazer/files/patches/stg-2.408-build-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-build-upstream.patch
deleted file mode 100644
index 6f2c43e74988..000000000000
--- a/net-misc/stargazer/files/patches/stg-2.408-build-upstream.patch
+++ /dev/null
@@ -1,214 +0,0 @@
---- a/projects/rlm_stg/build.org	2013-01-15 15:25:59.000000000 +0200
-+++ b/projects/rlm_stg/build	2013-01-15 19:48:13.000000000 +0200
-@@ -16,21 +16,15 @@
- DIR_MODE=0755
- OWNER=root
- 
--if [ -z $1 ]
--then
--    MAKEOPTS="-j1"
--    DEBUG="no"
-+if [ "$1" = "debug" ]
-+then
-+   DEFS="$DEFS -DDEBUG"
-+   MAKEOPTS="$MAKEOPTS -j1"
-+   CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra"
-+   DEBUG="yes"
- else
--    if [ "$1" = "debug" ]
--    then
--        DEFS="-DDEBUG"
--        MAKEOPTS="-j1"
--        CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
--        DEBUG="yes"
--    else
--        MAKEOPTS="-j1"
--        DEBUG="no"
--    fi
-+   DEFS="$DEFS -DNDEBUG"
-+   DEBUG="no"
- fi
- 
- CXXFLAGS="$CXXFLAGS -I/usr/local/include"
---- a/projects/rscriptd/build.org	2013-01-15 18:28:32.000000000 +0200
-+++ b/projects/rscriptd/build	2013-01-15 18:38:13.000000000 +0200
-@@ -16,21 +16,15 @@
- DIR_MODE=0755
- OWNER=root
- 
--if [ -z $1 ]
-+if [ "$1" = "debug" ]
- then
--    MAKEOPTS="-j1"
--    DEBUG="no"
-+   DEFS="$DEFS -DDEBUG"
-+   MAKEOPTS="$MAKEOPTS -j1"
-+   CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra"
-+   DEBUG="yes"
- else
--    if [ "$1" = "debug" ]
--    then
--        DEFS="-DDEBUG"
--        MAKEOPTS="-j1"
--        CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
--        DEBUG="yes"
--    else
--        MAKEOPTS="-j1"
--        DEBUG="no"
--    fi
-+   DEFS="$DEFS -DNDEBUG"
-+   DEBUG="no"
- fi
- 
- CXXFLAGS="$CXXFLAGS -I/usr/local/include"
---- a/projects/sgauth/build.org	2013-01-15 18:29:20.000000000 +0200
-+++ b/projects/sgauth/build	2013-01-15 18:36:33.000000000 +0200
-@@ -16,21 +16,15 @@
- DIR_MODE=0755
- OWNER=root
- 
--if [ -z $1 ]
-+if [ "$1" = "debug" ]
- then
--    MAKEOPTS="-j1"
--    DEBUG="no"
-+   DEFS="$DEFS -DDEBUG"
-+   MAKEOPTS="$MAKEOPTS -j1"
-+   CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra"
-+   DEBUG="yes"
- else
--    if [ "$1" = "debug" ]
--    then
--        DEFS="-DDEBUG"
--        MAKEOPTS="-j1"
--        CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
--        DEBUG="yes"
--    else
--        MAKEOPTS="-j1"
--        DEBUG="no"
--    fi
-+   DEFS="$DEFS -DNDEBUG"
-+   DEBUG="no"
- fi
- 
- CXXFLAGS="$CXXFLAGS -I/usr/local/include"
---- a/projects/sgconf/build.org	2013-01-15 18:29:59.000000000 +0200
-+++ b/projects/sgconf/build	2013-01-15 18:35:41.000000000 +0200
-@@ -16,21 +16,15 @@
- DIR_MODE=0755
- OWNER=root
- 
--if [ -z $1 ]
-+if [ "$1" = "debug" ]
- then
--    MAKEOPTS="-j1"
--    DEBUG="no"
-+   DEFS="$DEFS -DDEBUG"
-+   MAKEOPTS="$MAKEOPTS -j1"
-+   CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra"
-+   DEBUG="yes"
- else
--    if [ "$1" = "debug" ]
--    then
--        DEFS="-DDEBUG"
--        MAKEOPTS="-j1"
--        CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
--        DEBUG="yes"
--    else
--        MAKEOPTS="-j1"
--        DEBUG="no"
--    fi
-+   DEFS="$DEFS -DNDEBUG"
-+   DEBUG="no"
- fi
- 
- CXXFLAGS="$CXXFLAGS -I/usr/local/include"
---- a/projects/sgconf_xml/build.org	2013-01-15 18:30:26.000000000 +0200
-+++ b/projects/sgconf_xml/build	2013-01-15 18:34:53.000000000 +0200
-@@ -16,21 +16,15 @@
- DIR_MODE=0755
- OWNER=root
- 
--if [ -z $1 ]
-+if [ "$1" = "debug" ]
- then
--    MAKEOPTS="-j1"
--    DEBUG="no"
-+   DEFS="$DEFS -DDEBUG"
-+   MAKEOPTS="$MAKEOPTS -j1"
-+   CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra"
-+   DEBUG="yes"
- else
--    if [ "$1" = "debug" ]
--    then
--        DEFS="-DDEBUG"
--        MAKEOPTS="-j1"
--        CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
--        DEBUG="yes"
--    else
--        MAKEOPTS="-j1"
--        DEBUG="no"
--    fi
-+   DEFS="$DEFS -DNDEBUG"
-+   DEBUG="no"
- fi
- 
- CXXFLAGS="$CXXFLAGS -I/usr/local/include"
---- a/projects/sgconv/build.org	2013-01-15 18:31:01.000000000 +0200
-+++ b/projects/sgconv/build	2013-01-15 18:32:46.000000000 +0200
-@@ -16,11 +16,20 @@
- DIR_MODE=0755
- OWNER=root
- VAR_DIR="./inst/var/stargazer"
--DEFS="-DDEBUG"
--MAKEOPTS="-j1"
-+
-+if [ "$1" = "debug" ]
-+then
-+   DEFS="$DEFS -DDEBUG"
-+   MAKEOPTS="$MAKEOPTS -j1"
-+   CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -Wextra"
-+   DEBUG="yes"
-+else
-+   DEFS="$DEFS -DNDEBUG"
-+   DEBUG="no"
-+fi
-+
- CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -I/usr/local/include"
- LDFLAGS="$LDFLAGS -L/usr/local/lib"
--DEBUG="yes"
- 
- if [ "$sys" = "Linux" ]
- then
---- a/projects/stargazer/build.org	2013-01-15 19:48:54.000000000 +0200
-+++ b/projects/stargazer/build	2013-01-15 19:51:13.000000000 +0200
-@@ -35,23 +35,15 @@
- XMLRPC_FEATURES="c++2 abyss-server"
- 
- 
--if [ -z "$1" ]
-+if [ "$1" = "debug" ]
- then
-+    DEFS="$DEFS -DDEBUG"
-+    MAKEOPTS="$MAKEOPTS -j1"
-+    CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
-+    DEBUG="yes"
-+else
-     DEFS="$DEFS -DNDEBUG"
--    MAKEOPTS="-j1"
-     DEBUG="no"
--else
--    if [ "$1" = "debug" ]
--    then
--        DEFS="$DEFS -DDEBUG"
--        MAKEOPTS="-j1"
--        CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
--        DEBUG="yes"
--    else
--        DEFS="$DEFS -DNDEBUG"
--        MAKEOPTS="-j1"
--        DEBUG="no"
--    fi
- fi
- 
- CXXFLAGS="$CXXFLAGS -I/usr/local/include"
diff --git a/net-misc/stargazer/files/patches/stg-2.408-build.patch b/net-misc/stargazer/files/patches/stg-2.408-build.patch
deleted file mode 100644
index 9d42a0487d88..000000000000
--- a/net-misc/stargazer/files/patches/stg-2.408-build.patch
+++ /dev/null
@@ -1,179 +0,0 @@
---- a/projects/rlm_stg/configure.org	2013-01-18 18:06:17.000000000 +0200
-+++ b/projects/rlm_stg/configure	2013-01-18 18:07:18.000000000 +0200
-@@ -34,6 +34,7 @@
- then
-     OS=linux
-     release=""
-+    ETC_DIR="./inst/linux/etc/stargazer"
-     MAKE="make"
- fi
- 
-@@ -48,6 +49,7 @@
-         9) OS=bsd7;;
-         *) OS=unknown;;
-     esac
-+    ETC_DIR="./inst/freebsd/etc/stargazer"
-     MAKE="gmake"
- fi
- 
-@@ -163,5 +165,4 @@
- echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
- echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
- echo "OWNER=$OWNER" >> $CONFFILE
--$MAKE $MAKEOPTS
--
-+echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
-\ No newline at end of file
---- a/projects/rscriptd/configure.org	2013-01-18 18:07:28.000000000 +0200
-+++ b/projects/rscriptd/configure	2013-01-18 18:08:02.000000000 +0200
-@@ -34,6 +34,7 @@
- then
-     OS=linux
-     release=""
-+    ETC_DIR="./inst/linux/etc/stargazer"
-     MAKE="make"
- fi
- 
-@@ -48,6 +49,7 @@
-         9) OS=bsd7;;
-         *) OS=unknown;;
-     esac
-+    ETC_DIR="./inst/freebsd/etc/stargazer"
-     MAKE="gmake"
- fi
- 
-@@ -169,6 +171,4 @@
- echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
- echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
- echo "OWNER=$OWNER" >> $CONFFILE
--
--$MAKE $MAKEOPTS
--
-+echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
-\ No newline at end of file
---- a/projects/sgauth/configure.org	2013-01-18 18:08:10.000000000 +0200
-+++ b/projects/sgauth/configure	2013-01-18 18:08:38.000000000 +0200
-@@ -34,6 +34,7 @@
- then
-     OS=linux
-     release=""
-+    ETC_DIR="./inst/linux/etc/stargazer"
-     MAKE="make"
- fi
- 
-@@ -48,6 +49,7 @@
-         9) OS=bsd7;;
-         *) OS=unknown;;
-     esac
-+    ETC_DIR="./inst/freebsd/etc/stargazer"
-     MAKE="gmake"
- fi
- 
-@@ -167,5 +169,4 @@
- echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
- echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
- echo "OWNER=$OWNER" >> $CONFFILE
--$MAKE $MAKEOPTS
--
-+echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
-\ No newline at end of file
---- a/projects/sgconf/configure.org	2013-01-18 18:08:46.000000000 +0200
-+++ b/projects/sgconf/configure	2013-01-18 18:09:44.000000000 +0200
-@@ -34,6 +34,7 @@
- then
-     OS=linux
-     release=""
-+    ETC_DIR="./inst/linux/etc/stargazer"
-     MAKE="make"
- fi
- 
-@@ -48,6 +49,7 @@
-         9) OS=bsd7;;
-         *) OS=unknown;;
-     esac
-+    ETC_DIR="./inst/freebsd/etc/stargazer"
-     MAKE="gmake"
- fi
- 
-@@ -186,6 +188,4 @@
- echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
- echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
- echo "OWNER=$OWNER" >> $CONFFILE
--
--$MAKE $MAKEOPTS
--
-+echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
-\ No newline at end of file
---- a/projects/sgconf_xml/configure.org	2013-01-18 18:09:54.000000000 +0200
-+++ b/projects/sgconf_xml/configure	2013-01-18 18:10:23.000000000 +0200
-@@ -34,6 +34,7 @@
- then
-     OS=linux
-     release=""
-+    ETC_DIR="./inst/linux/etc/stargazer"
-     MAKE="make"
- fi
- 
-@@ -48,6 +49,7 @@
-         9) OS=bsd7;;
-         *) OS=unknown;;
-     esac
-+    ETC_DIR="./inst/freebsd/etc/stargazer"
-     MAKE="gmake"
- fi
- 
-@@ -186,6 +188,4 @@
- echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
- echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
- echo "OWNER=$OWNER" >> $CONFFILE
--
--$MAKE $MAKEOPTS
--
-+echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
-\ No newline at end of file
---- a/projects/sgconv/configure.org	2013-01-18 18:10:30.000000000 +0200
-+++ b/projects/sgconv/configure	2013-01-18 18:11:09.000000000 +0200
-@@ -35,6 +35,7 @@
- then
-     OS=linux
-     release=""
-+    ETC_DIR="./inst/linux/etc/stargazer"
-     MAKE="make"
- fi
- 
-@@ -49,6 +50,7 @@
-         9) OS=bsd7;;
-         *) OS=unknown;;
-     esac
-+    ETC_DIR="./inst/freebsd/etc/stargazer"
-     MAKE="gmake"
- fi
- 
-@@ -293,8 +295,6 @@
- echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
- echo "OWNER=$OWNER" >> $CONFFILE
- echo "VAR_DIR=$VAR_DIR" >> $CONFFILE
-+echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
- 
--mkdir -p ../stargazer/modules
--
--$MAKE $MAKEOPTS
--
-+mkdir -p ../stargazer/modules
-\ No newline at end of file
---- a/projects/stargazer/configure.org	2013-01-18 18:11:15.000000000 +0200
-+++ b/projects/stargazer/configure	2013-01-18 18:11:40.000000000 +0200
-@@ -404,11 +404,4 @@
- echo "VAR_DIR=$VAR_DIR" >> $CONFFILE
- echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
- 
--mkdir -p modules
--
--if [ "$1" != "debug" ]
--then
--    $MAKE $MAKEOPTS
--else
--    echo -e "\n\n\nDebug build. Type $MAKE explicitly"
--fi
-+mkdir -p modules
-\ No newline at end of file
diff --git a/net-misc/stargazer/files/patches/stg-2.408-correct-paths.patch b/net-misc/stargazer/files/patches/stg-2.408-correct-paths.patch
deleted file mode 100644
index 520d635d69c6..000000000000
--- a/net-misc/stargazer/files/patches/stg-2.408-correct-paths.patch
+++ /dev/null
@@ -1,186 +0,0 @@
---- a/projects/rscriptd/rscriptd.conf.org	2013-01-08 18:19:34.000000000 +0200
-+++ b/projects/rscriptd/rscriptd.conf	2013-01-08 18:20:52.000000000 +0200
-@@ -6,7 +6,7 @@
- # Parameter: optional
- # Value: file path
- # Default: /var/log/rscriptd.log
--LogFileName = /var/log/rscriptd.log
-+LogFileName = /var/log/stargazer/rscriptd.log
- 
- # Amount of rscriptd-exec processes.
- # These processes are responsible for the execution of scripts 
-@@ -22,7 +22,7 @@
- # Parameter: optional
- # Value: directory path
- # Default: /etc/rscriptd
--ConfigDir = /etc/rscriptd
-+ConfigDir = /etc/stargazer
- 
- # Defines password for the encryption exchange between
- # Stargazer server and rscriptd.
-@@ -49,12 +49,12 @@
- # Parameter: optional
- # Value: file path
- # Default: /etc/rscriptd/OnConnect
--ScriptOnConnect = /etc/rscriptd/OnConnect
-+ScriptOnConnect = /etc/stargazer/OnConnect
- 
- # Defines file which runs when user loses access
- # Parameter: optional
- # Value: file path
- # Default: /etc/rscriptd/OnDisconnect
--ScriptOnDisconnect = /etc/rscriptd/OnDisconnect
-+ScriptOnDisconnect = /etc/stargazer/OnDisconnect
- 
- ################################################################################
-\ No newline at end of file
---- a/projects/sgconv/sgconv.conf.org	2012-12-18 21:56:33.578221904 +0200
-+++ b/projects/sgconv/sgconv.conf	2012-12-18 21:58:22.355217059 +0200
-@@ -18,27 +18,27 @@
-     # Working server directory, provides data on tariffs, users, administrators.
-     # Parameter: required
-     # Value: directory path
--    WorkDir = /var/stargazer
-+    WorkDir = /var/lib/stargazer
- 
-     # Owner, group and permissions of the files of user statistics (stat)
-     # Parameter: required
-     # Values: any, supported by OS
--    ConfOwner = root
--    ConfGroup = root
-+    ConfOwner = stg
-+    ConfGroup = stg
-     ConfMode = 600
- 
-     # Owner, group and permissions on user configuration files (conf)
-     # Parameter: required
-     # Values: any, supported by OS
--    StatOwner = root
--    StatGroup = root
-+    StatOwner = stg
-+    StatGroup = stg
-     StatMode = 640
- 
-     # Owner, group and permissions for user log files (log)
-     # Parameter: required
-     # Values: any, supported by OS
--    UserLogOwner = root
--    UserLogGroup = root
-+    UserLogOwner = stg
-+    UserLogGroup = stg
-     UserLogMode = 640
- 
- </SourceStoreModule>
-@@ -54,7 +54,7 @@
-     # Parameter: required
-     # Value: file path
-     # Default: /var/stg/stargazer.fdb
--    # database = /var/stg/stargazer.fdb
-+    # database = /var/lib/stargazer/stargazer.fdb
- 
-     # Database username
-     # Parameter: required
---- a/projects/stargazer/inst/linux/etc/stargazer/stargazer.conf.org	2012-12-30 14:35:22.000000000 +0200
-+++ b/projects/stargazer/inst/linux/etc/stargazer/stargazer.conf	2012-12-30 14:36:37.000000000 +0200
-@@ -6,7 +6,7 @@
- # Parameter: required
- # Value: file path
- # Default: /var/log/stargazer.log
--LogFile = /var/log/stargazer.log
-+LogFile = /var/log/stargazer/stargazer.log
- 
- # PID file name
- # Parameter: optional
-@@ -147,7 +147,7 @@
- # Parameter: optional
- # Value: file path
- # Default: /var/stargazer/monitor
--#MonitorDir=/var/stargazer/monitor
-+#MonitorDir=/var/lib/stargazer/monitor
- 
- # Defines message maximum lifetime
- # Note: 0 - unlimited
---- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf.org	2012-12-25 14:03:49.000000000 +0200
-+++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf	2012-12-25 14:04:00.000000000 +0200
-@@ -16,7 +16,7 @@
-     # Parametr: required
-     # Values: filename
-     # Default: subnets
--    SubnetFile = subnets
-+    SubnetFile = /etc/stargazer/subnets
- 
-     # The password to encrypt packets between the stg-server and remote server
-     # Parameter: required
---- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_files.conf.org	2012-12-25 13:31:01.000000000 +0200
-+++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_files.conf	2012-12-25 13:31:43.000000000 +0200
-@@ -5,27 +5,27 @@
-     # Working server directory, provides data on tariffs, users, administrators.
-     # Parameter: required
-     # Value: directory path
--    WorkDir = /var/stargazer
-+    WorkDir = /var/lib/stargazer
- 
-     # Owner, group and permissions of the files of user statistics (stat)
-     # Parameter: required
-     # Values: any, supported by OS
--    ConfOwner = root
--    ConfGroup = root
-+    ConfOwner = stg
-+    ConfGroup = stg
-     ConfMode = 640
- 
-     # Owner, group and permissions on user configuration files (conf)
-     # Parameter: required
-     # Values: any, supported by OS
--    StatOwner = root
--    StatGroup = root
-+    StatOwner = stg
-+    StatGroup = stg
-     StatMode = 640
- 
-     # Owner, group and permissions for user log files (log)
-     # Parameter: required
-     # Values: any, supported by OS
--    UserLogOwner = root
--    UserLogGroup = root
-+    UserLogOwner = stg
-+    UserLogGroup = stg
-     UserLogMode = 640
- 
- </StoreModule>
---- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_firebird.conf.org	2012-12-25 13:39:00.000000000 +0200
-+++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_firebird.conf	2012-12-25 13:39:28.000000000 +0200
-@@ -9,7 +9,7 @@
-     # Parameter: required
-     # Value: file path
-     # Default: /var/stg/stargazer.fdb
--    Database = /var/stg/stargazer.fdb
-+    Database = /var/lib/stargazer/stargazer.fdb
- 
-     # Database username
-     # Parameter: required
---- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp.org	2012-12-31 11:08:26.000000000 +0200
-+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp	2012-12-31 11:08:41.000000000 +0200
-@@ -169,7 +169,7 @@
- rpcServer = new xmlrpc_c::serverAbyss(
-         xmlrpc_c::serverAbyss::constrOpt()
-         .registryP(&rpcRegistry)
--        .logFileName("/var/log/stargazer_rpc.log")
-+        .logFileName("/var/log/stargazer/xmlrpc.log")
-         .socketFd(fd)
-         );
- 
---- a/projects/stargazer/inst/var/00-base-00.sql.org	2013-01-02 16:22:28.000000000 +0200
-+++ b/projects/stargazer/inst/var/00-base-00.sql	2013-01-02 16:22:52.000000000 +0200
-@@ -50,9 +50,9 @@
- /*
-  * CONNECT 'localhost:/var/stg/stargazer.fdb' USER 'stg' PASSWORD '123456';
-  * DROP DATABASE;
-- *
-- * CREATE DATABASE 'localhost:/var/stg/stargazer.fdb' USER 'stg' PASSWORD '123456' DEFAULT CHARACTER SET UTF8;
-  */
-+  CREATE DATABASE 'localhost:/var/lib/stargazer/stargazer.fdb' USER 'stg' PASSWORD '123456' DEFAULT CHARACTER SET UTF8;
-+ 
- 
-  
- 
diff --git a/net-misc/stargazer/files/patches/stg-2.408-fix-crash-on-stop.patch b/net-misc/stargazer/files/patches/stg-2.408-fix-crash-on-stop.patch
deleted file mode 100644
index 367c91209be7..000000000000
--- a/net-misc/stargazer/files/patches/stg-2.408-fix-crash-on-stop.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-diff -Naur stg-2.408/projects/rscriptd/listener.cpp stg-2.408-patched/projects/rscriptd/listener.cpp
---- stg-2.408/projects/rscriptd/listener.cpp	2012-02-09 12:26:59.000000000 +0200
-+++ stg-2.408-patched/projects/rscriptd/listener.cpp	2013-02-11 09:04:32.000000000 +0200
-@@ -49,6 +49,8 @@
-       receiverStopped(true),
-       processorStopped(true),
-       userTimeout(0),
-+      receiverThread(0),
-+      processorThread(0),
-       listenSocket(0)
- {
- version = "rscriptd listener v.1.2";
-@@ -149,8 +151,10 @@
-         }
-     }
- 
--pthread_join(receiverThread, NULL);
--pthread_join(processorThread, NULL);
-+if (receiverThread != 0)
-+    pthread_join(receiverThread, NULL);
-+if (processorThread != 0)
-+    pthread_join(processorThread, NULL);
- 
- pthread_mutex_destroy(&mutex);
- 
-diff -Naur stg-2.408/projects/stargazer/eventloop.cpp stg-2.408-patched/projects/stargazer/eventloop.cpp
---- stg-2.408/projects/stargazer/eventloop.cpp	2012-02-09 12:27:06.000000000 +0200
-+++ stg-2.408-patched/projects/stargazer/eventloop.cpp	2013-02-11 09:03:11.000000000 +0200
-@@ -10,7 +10,7 @@
-     : ACTIONS_LIST(),
-       _running(false),
-       _stopped(true),
--      _tid(),
-+      _tid(0),
-       _mutex(),
-       _condition()
- {
-@@ -41,7 +41,8 @@
- // Wake up thread
- pthread_cond_signal(&_condition);
- // Wait until thread exit
--pthread_join(_tid, NULL);
-+if (_tid != 0)
-+    pthread_join(_tid, NULL);
- return false;
- }
- 
-diff -Naur stg-2.408/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp stg-2.408-patched/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp
---- stg-2.408/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp	2012-02-09 12:27:14.000000000 +0200
-+++ stg-2.408-patched/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp	2013-02-11 09:01:34.000000000 +0200
-@@ -55,8 +55,8 @@
- NF_CAP::NF_CAP()
-     : traffCnt(NULL),
-       settings(),
--      tidTCP(),
--      tidUDP(),
-+      tidTCP(0),
-+      tidUDP(0),
-       runningTCP(false),
-       runningUDP(false),
-       stoppedTCP(true),
-@@ -153,7 +153,8 @@
-         }
-     if (stoppedUDP)
-         {
--        pthread_join(tidUDP, NULL);
-+        if (tidUDP != 0)
-+            pthread_join(tidUDP, NULL);
-         }
-     else
-         {
-@@ -176,7 +177,8 @@
-         }
-     if (stoppedTCP)
-         {
--        pthread_join(tidTCP, NULL);
-+        if (tidTCP != 0)
-+            pthread_join(tidTCP, NULL);
-         }
-     else
-         {
-diff -Naur stg-2.408/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp stg-2.408-patched/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp
---- stg-2.408/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp	2012-02-09 12:27:15.000000000 +0200
-+++ stg-2.408-patched/projects/stargazer/plugins/capture/ether_linux/ether_cap.cpp	2013-02-11 09:02:05.000000000 +0200
-@@ -74,7 +74,7 @@
- //-----------------------------------------------------------------------------
- ETHER_CAP::ETHER_CAP()
-     : errorStr(),
--      thread(),
-+      thread(0),
-       nonstop(false),
-       isRunning(false),
-       capSock(-1),
-@@ -140,7 +140,8 @@
-         }
-     else
-         {
--        pthread_join(thread, NULL);
-+        if (thread != 0)
-+            pthread_join(thread, NULL);
-         }
-     }
- 
-diff -Naur stg-2.408/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp stg-2.408-patched/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp
---- stg-2.408/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp	2012-02-09 12:27:15.000000000 +0200
-+++ stg-2.408-patched/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp	2013-02-11 09:02:37.000000000 +0200
-@@ -58,7 +58,7 @@
- IPQ_CAP::IPQ_CAP()
-     : ipq_h(NULL),
-       errorStr(),
--      thread(),
-+      thread(0),
-       nonstop(false),
-       isRunning(false),
-       capSock(-1),
-@@ -120,7 +120,8 @@
-         }
-     else
-         {
--        pthread_join(thread, NULL);
-+        if (thread != 0)
-+            pthread_join(thread, NULL);
-         }
-     }
- IPQCapClose();
-diff -Naur stg-2.408/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp stg-2.408-patched/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
---- stg-2.408/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp	2012-02-09 12:27:16.000000000 +0200
-+++ stg-2.408-patched/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp	2013-02-11 09:00:33.000000000 +0200
-@@ -93,7 +93,7 @@
-       rpcServer(NULL),
-       running(false),
-       stopped(true),
--      tid(),
-+      tid(0),
-       cookies(),
-       dayFee(0),
-       dirNames()
-@@ -201,7 +201,8 @@
-     }
- else
-     {
--    pthread_join(tid, NULL);
-+    if (tid != 0)
-+        pthread_join(tid, NULL);
-     }
- 
- close(fd);
-diff -Naur stg-2.408/projects/stargazer/plugins/other/smux/smux.cpp stg-2.408-patched/projects/stargazer/plugins/other/smux/smux.cpp
---- stg-2.408/projects/stargazer/plugins/other/smux/smux.cpp	2012-02-09 12:27:24.000000000 +0200
-+++ stg-2.408-patched/projects/stargazer/plugins/other/smux/smux.cpp	2013-02-11 09:07:54.000000000 +0200
-@@ -99,7 +99,7 @@
-       errorStr(),
-       smuxSettings(),
-       settings(),
--      thread(),
-+      thread(0),
-       mutex(),
-       running(false),
-       stopped(true),
-@@ -227,7 +227,7 @@
-         }
-     }
- 
--if (stopped)
-+if (stopped && thread != 0)
-     pthread_join(thread, NULL);
- 
- ResetNotifiers();
-diff -Naur stg-2.408/projects/stargazer/stg_timer.cpp stg-2.408-patched/projects/stargazer/stg_timer.cpp
---- stg-2.408/projects/stargazer/stg_timer.cpp	2012-02-09 12:27:30.000000000 +0200
-+++ stg-2.408-patched/projects/stargazer/stg_timer.cpp	2013-02-11 08:58:55.000000000 +0200
-@@ -7,7 +7,7 @@
- #include "stg/common.h"
- 
- static int nonstop;
--static pthread_t thrStgTimer;
-+static pthread_t thrStgTimer(0);
- static bool isTimerRunning = false;
- volatile time_t stgTime;
- 
-@@ -101,7 +101,8 @@
- void StopStgTimer()
- {
- nonstop = 0;
--pthread_join(thrStgTimer, NULL); // Cleanup thread resources
-+if (thrStgTimer != 0)
-+    pthread_join(thrStgTimer, NULL); // Cleanup thread resources
- printfd(__FILE__, "STG_TIMER stopped\n");
- }
- //-----------------------------------------------------------------------------
diff --git a/net-misc/stargazer/files/patches/stg-2.408-makefile-build-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-makefile-build-upstream.patch
deleted file mode 100644
index 51d0f1f04ea6..000000000000
--- a/net-misc/stargazer/files/patches/stg-2.408-makefile-build-upstream.patch
+++ /dev/null
@@ -1,386 +0,0 @@
-diff --git a/projects/convertor/Makefile b/projects/convertor/Makefile
-index efacbb6..04c00cc 100644
---- a/projects/sgconv/Makefile
-+++ b/projects/sgconv/Makefile
-@@ -58,6 +58,21 @@ clean:
- distclean: clean
- 	rm -f ../../Makefile.conf
- 
-+install: install-bin
-+
-+install-bin:
-+ifeq ($(DEBUG), yes)
-+	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
-+else
-+	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
-+endif
-+	$(MAKE) -C $(DIR_PLUGINS) install
-+
-+uninstall: uninstall-bin
-+
-+uninstall-bin:
-+	rm -f $(PREFIX)/usr/bin/$(PROG)
-+
- ifneq ($(MAKECMDGOALS),distclean)
- ifneq ($(MAKECMDGOALS),clean)
- ifneq ($(MAKECMDGOALS),uninstall)
-diff --git a/projects/convertor/build b/projects/convertor/build
-index 0144b0f..471ee62 100755
---- a/projects/sgconv/build
-+++ b/projects/sgconv/build
-@@ -20,6 +20,7 @@ DEFS="-DDEBUG"
- MAKEOPTS="-j1"
- CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -I/usr/local/include"
- LDFLAGS="$LDFLAGS -L/usr/local/lib"
-+DEBUG="yes"
- 
- if [ "$sys" = "Linux" ]
- then
-@@ -251,6 +252,7 @@ fi
- 
- echo "OS=$OS" > $CONFFILE
- echo "STG_TIME=yes" >> $CONFFILE
-+echo "DEBUG=$DEBUG" >> $CONFFILE
- echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
- echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
- echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
-diff --git a/projects/rlm_stg/Makefile b/projects/rlm_stg/Makefile
-index 98f5f2d..6190491 100644
---- a/projects/rlm_stg/Makefile
-+++ b/projects/rlm_stg/Makefile
-@@ -57,13 +57,17 @@ distclean: clean
- install: install-bin
- 
- install-bin:
--	install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG)
-+ifeq ($(DEBUG), yes)
-+	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
-+else
-+	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
-+endif
- 	$(MAKE) -C $(DIR_LIBSRC) install
- 
- uninstall: uninstall-bin
- 
- uninstall-bin:
--	rm -f $(PREFIX)/usr/lib/$(PROG)
-+	rm -f $(PREFIX)/usr/lib/freeradius/$(PROG)
- 
- ifneq ($(MAKECMDGOALS),distclean)
- ifneq ($(MAKECMDGOALS),clean)
-diff --git a/projects/rlm_stg/build b/projects/rlm_stg/build
-index 0145d03..3781d1b 100755
---- a/projects/rlm_stg/build
-+++ b/projects/rlm_stg/build
-@@ -19,14 +19,17 @@ OWNER=root
- if [ -z $1 ]
- then
-     MAKEOPTS="-j1"
-+    DEBUG="no"
- else
-     if [ "$1" = "debug" ]
-     then
-         DEFS="-DDEBUG"
-         MAKEOPTS="-j1"
-         CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
-+        DEBUG="yes"
-     else
-         MAKEOPTS="-j1"
-+        DEBUG="no"
-     fi
- fi
- 
-@@ -144,6 +147,7 @@ rm -f fake
- 
- echo "OS=$OS" > $CONFFILE
- echo "STG_TIME=yes" >> $CONFFILE
-+echo "DEBUG=$DEBUG" >> $CONFFILE
- echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
- echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
- echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
-diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile
-index 0912be0..da06b50 100644
---- a/projects/rscriptd/Makefile
-+++ b/projects/rscriptd/Makefile
-@@ -57,7 +57,11 @@ distclean: clean
- install: install-bin install-data
- 
- install-bin:
--	install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
-+ifeq ($(DEBUG), yes)
-+	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
-+else
-+	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
-+endif
- 	$(MAKE) -C $(DIR_LIBSRC) install
- 
- install-data:
-diff --git a/projects/rscriptd/build b/projects/rscriptd/build
-index 885eef7..6a7c77f 100755
---- a/projects/rscriptd/build
-+++ b/projects/rscriptd/build
-@@ -19,14 +19,17 @@ OWNER=root
- if [ -z $1 ]
- then
-     MAKEOPTS="-j1"
-+    DEBUG="no"
- else
-     if [ "$1" = "debug" ]
-     then
-         DEFS="-DDEBUG"
-         MAKEOPTS="-j1"
-         CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
-+        DEBUG="yes"
-     else
-         MAKEOPTS="-j1"
-+        DEBUG="no"
-     fi
- fi
- 
-@@ -150,6 +153,7 @@ rm -f build_check.c
- 
- echo "OS=$OS" > $CONFFILE
- echo "STG_TIME=yes" >> $CONFFILE
-+echo "DEBUG=$DEBUG" >> $CONFFILE
- echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
- echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
- echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
-diff --git a/projects/sgauth/Makefile b/projects/sgauth/Makefile
-index 99cd0e4..a59371c 100644
---- a/projects/sgauth/Makefile
-+++ b/projects/sgauth/Makefile
-@@ -58,7 +58,11 @@ distclean: clean
- install: install-bin install-data
- 
- install-bin:
--	install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
-+ifeq ($(DEBUG), yes)
-+	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
-+else
-+	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
-+endif
- 	$(MAKE) -C $(DIR_LIBSRC) install
- 
- install-data:
-diff --git a/projects/sgauth/build b/projects/sgauth/build
-index ec747e2..e3ad87f 100755
---- a/projects/sgauth/build
-+++ b/projects/sgauth/build
-@@ -19,14 +19,17 @@ OWNER=root
- if [ -z $1 ]
- then
-     MAKEOPTS="-j1"
-+    DEBUG="no"
- else
-     if [ "$1" = "debug" ]
-     then
-         DEFS="-DDEBUG"
-         MAKEOPTS="-j1"
-         CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
-+        DEBUG="yes"
-     else
-         MAKEOPTS="-j1"
-+        DEBUG="no"
-     fi
- fi
- 
-@@ -148,6 +151,7 @@ rm -f build_check.c
- 
- echo "OS=$OS" > $CONFFILE
- echo "STG_TIME=yes" >> $CONFFILE
-+echo "DEBUG=$DEBUG" >> $CONFFILE
- echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
- echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
- echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
-diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile
-index 4d62bb5..297d3e2 100644
---- a/projects/sgconf/Makefile
-+++ b/projects/sgconf/Makefile
-@@ -66,7 +66,11 @@ distclean: clean
- install: install-bin
- 
- install-bin:
--	install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
-+ifeq ($(DEBUG), yes)
-+	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
-+else
-+	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
-+endif
- 	$(MAKE) -C $(DIR_LIBSRC) install
- 
- uninstall: uninstall-bin
-diff --git a/projects/sgconf/build b/projects/sgconf/build
-index 1f6c0a0..da81773 100755
---- a/projects/sgconf/build
-+++ b/projects/sgconf/build
-@@ -19,14 +19,17 @@ OWNER=root
- if [ -z $1 ]
- then
-     MAKEOPTS="-j1"
-+    DEBUG="no"
- else
-     if [ "$1" = "debug" ]
-     then
-         DEFS="-DDEBUG"
-         MAKEOPTS="-j1"
-         CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
-+        DEBUG="yes"
-     else
-         MAKEOPTS="-j1"
-+        DEBUG="no"
-     fi
- fi
- 
-@@ -166,6 +169,7 @@ fi
- 
- echo "OS=$OS" > $CONFFILE
- echo "STG_TIME=yes" >> $CONFFILE
-+echo "DEBUG=$DEBUG" >> $CONFFILE
- echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
- echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
- echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
-diff --git a/projects/sgconf_xml/Makefile b/projects/sgconf_xml/Makefile
-index b7ebca0..32384e6 100644
---- a/projects/sgconf_xml/Makefile
-+++ b/projects/sgconf_xml/Makefile
-@@ -66,7 +66,11 @@ distclean: clean
- install: install-bin install-data
- 
- install-bin:
--	install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
-+ifeq ($(DEBUG), yes)
-+	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
-+else
-+	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
-+endif
- 	$(MAKE) -C $(DIR_LIBSRC) install
- 
- uninstall: uninstall-bin uninstall-data
-diff --git a/projects/sgconf_xml/build b/projects/sgconf_xml/build
-index f78e6f7..9797075 100755
---- a/projects/sgconf_xml/build
-+++ b/projects/sgconf_xml/build
-@@ -19,14 +19,17 @@ OWNER=root
- if [ -z $1 ]
- then
-     MAKEOPTS="-j1"
-+    DEBUG="no"
- else
-     if [ "$1" = "debug" ]
-     then
-         DEFS="-DDEBUG"
-         MAKEOPTS="-j1"
-         CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
-+        DEBUG="yes"
-     else
-         MAKEOPTS="-j1"
-+        DEBUG="no"
-     fi
- fi
- 
-@@ -166,6 +169,7 @@ fi
- 
- echo "OS=$OS" > $CONFFILE
- echo "STG_TIME=yes" >> $CONFFILE
-+echo "DEBUG=$DEBUG" >> $CONFFILE
- echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
- echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
- echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
-diff --git a/projects/stargazer/Makefile b/projects/stargazer/Makefile
-index 44ae35e..9dfc0b5 100644
---- a/projects/stargazer/Makefile
-+++ b/projects/stargazer/Makefile
-@@ -77,7 +77,11 @@ distclean: clean
- install: install-bin install-data
- 
- install-bin: $(PROG)
--	install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
-+ifeq ($(DEBUG), yes)
-+	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
-+else
-+	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
-+endif
- 	$(MAKE) -C $(DIR_INCLUDE) install
- 	$(MAKE) -C $(DIR_LIBSRC) install
- 	$(MAKE) -C $(DIR_PLUGINS) install
-diff --git a/projects/stargazer/build b/projects/stargazer/build
-index c58b969..8a34c4f 100755
---- a/projects/stargazer/build
-+++ b/projects/stargazer/build
-@@ -39,15 +39,18 @@ if [ -z "$1" ]
- then
-     DEFS="$DEFS -DNDEBUG"
-     MAKEOPTS="-j1"
-+    DEBUG="no"
- else
-     if [ "$1" = "debug" ]
-     then
-         DEFS="$DEFS -DDEBUG"
-         MAKEOPTS="-j1"
-         CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
-+        DEBUG="yes"
-     else
-         DEFS="$DEFS -DNDEBUG"
-         MAKEOPTS="-j1"
-+        DEBUG="no"
-     fi
- fi
- 
-@@ -391,6 +394,7 @@ fi
- 
- echo "OS=$OS" > $CONFFILE
- echo "STG_TIME=yes" >> $CONFFILE
-+echo "DEBUG=$DEBUG" >> $CONFFILE
- echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
- echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
- echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
-diff --git a/projects/stargazer/plugins/Makefile.in b/projects/stargazer/plugins/Makefile.in
-index 17e10ac..70954a2 100644
---- a/projects/stargazer/plugins/Makefile.in
-+++ b/projects/stargazer/plugins/Makefile.in
-@@ -15,12 +15,12 @@ LIBS += $(addprefix -lstg,$(STGLIBS))
- 
- CXXFLAGS += -fPIC $(STGLIBS_INCS)
- CFLAGS += -fPIC $(STGLIBS_INCS)
--LDFLAGS += -shared -Wl,-rpath,$(PREFIX)/usr/lib/stg $(STGLIBS_LIBS)
-+LDFLAGS += -shared -Wl,-rpath,$(PREFIX)/usr/lib/stg
- 
- all: $(PROG)
- 
- $(PROG): $(OBJS)
--	$(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
-+	$(CXX) $^ $(STGLIBS_LIBS) $(LIBS) $(LDFLAGS) -o $(PROG)
- 	$(LN) -fs "`pwd`/$(PROG)" $(DIR_MOD)/$(PROG)
- 
- clean:
-@@ -28,7 +28,11 @@ clean:
- 
- install: $(PROG)
- 	mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg
--	install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
-+ifeq ($(DEBUG), yes)
-+	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
-+else
-+	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
-+endif
- 
- uninstall:
- 	rm -f $(PREFIX)/usr/lib/stg/$(PROG)
-diff --git a/stglibs/Makefile.in b/stglibs/Makefile.in
-index a318497..b5d1195 100644
---- a/stglibs/Makefile.in
-+++ b/stglibs/Makefile.in
-@@ -35,8 +35,11 @@ clean:
- 	rm -f deps $(PROG) *.o *.a *.so tags *.*~ 
- 
- install: $(PROG)
--	mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg
--	install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
-+ifeq ($(DEBUG), yes)
-+	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
-+else
-+	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
-+endif
- 	mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/include/stg
- 	install -m $(DATA_MODE) -o $(OWNER) $(addprefix include/stg/,$(INCS)) $(PREFIX)/usr/include/stg/
- 
diff --git a/net-misc/stargazer/files/patches/stg-2.408-makefile-firebird-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-makefile-firebird-upstream.patch
deleted file mode 100644
index 166f12aff2a9..000000000000
--- a/net-misc/stargazer/files/patches/stg-2.408-makefile-firebird-upstream.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/projects/stargazer/plugins/store/firebird/Makefile.org	2013-01-04 22:50:13.000000000 +0200
-+++ b/projects/stargazer/plugins/store/firebird/Makefile	2013-01-04 22:50:56.000000000 +0200
-@@ -22,5 +22,11 @@
- 	  locker \
- 	  crypto
- 
-+FB_CFLAGS = $(shell fb_config --cflags)
-+FB_LDFLAGS = $(shell fb_config --libs)
-+
-+CXXFLAGS +=  $(FB_CFLAGS)
-+LDFLAGS += $(FB_LDFLAGS)
-+
- include ../../Makefile.in
diff --git a/net-misc/stargazer/files/patches/stg-2.408-makefile.patch b/net-misc/stargazer/files/patches/stg-2.408-makefile.patch
deleted file mode 100644
index 6cb2a6c2dc50..000000000000
--- a/net-misc/stargazer/files/patches/stg-2.408-makefile.patch
+++ /dev/null
@@ -1,203 +0,0 @@
---- a/projects/sgauth/Makefile.org	2013-01-05 23:47:38.000000000 +0200
-+++ b/projects/sgauth/Makefile	2013-01-05 23:48:34.000000000 +0200
-@@ -67,8 +67,8 @@
- 
- install-data:
- 	# Install etc
--	mkdir -m $(DIR_MODE) -p $(PREFIX)/etc
--	install -m $(DATA_MODE) -o $(OWNER) ./sgauth.conf $(PREFIX)/etc/sgauth.conf
-+	mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer
-+	install -m $(DATA_MODE) -o $(OWNER) ./sgauth.conf $(PREFIX)/etc/stargazer/sgauth.conf
- 
- uninstall: uninstall-bin uninstall-data
- 
---- a/projects/stargazer/Makefile.org	2013-01-05 22:53:26.000000000 +0200
-+++ b/projects/stargazer/Makefile	2013-01-05 22:54:52.000000000 +0200
-@@ -92,30 +92,8 @@
- 	mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer/conf-available.d
- 	mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer/conf-enabled.d
- 	install -m $(DATA_MODE) -o $(OWNER) $(ETC_DIR)/stargazer.conf $(PREFIX)/etc/stargazer/stargazer.conf
--	install -m $(DATA_MODE) -o $(OWNER) $(ETC_DIR)/conf-available.d/*.conf $(PREFIX)/etc/stargazer/conf-available.d
--	ln -sf ../conf-available.d/mod_ao.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ao.conf
--	ln -sf ../conf-available.d/mod_ia.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ia.conf
--	ln -sf ../conf-available.d/mod_ping.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ping.conf
--	ln -sf ../conf-available.d/mod_sg.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_sg.conf
--	ln -sf ../conf-available.d/store_files.conf $(PREFIX)/etc/stargazer/conf-enabled.d/store_files.conf
--
--ifeq ($(OS),linux)
--	ln -sf ../conf-available.d/mod_cap_ether.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_cap_ether.conf
--else
--	ln -sf ../conf-available.d/mod_cap_bpf.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_cap_bpf.conf
--endif
--
- 	install -m $(DATA_MODE) -o $(OWNER) $(ETC_DIR)/rules $(PREFIX)/etc/stargazer/rules
- 	install -m $(BIN_MODE) -o $(OWNER) $(ETC_DIR)/On* $(PREFIX)/etc/stargazer/
--	
--	# Install file db
--	mkdir -m $(DIR_MODE) -p $(PREFIX)/var/stargazer/admins
--	mkdir -m $(DIR_MODE) -p $(PREFIX)/var/stargazer/tariffs
--	mkdir -m $(DIR_MODE) -p $(PREFIX)/var/stargazer/users/test
--	install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/admins/admin.adm $(PREFIX)/var/stargazer/admins/admin.adm
--	install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/tariffs/tariff.tf $(PREFIX)/var/stargazer/tariffs/tariff.tf
--	install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/users/test/conf $(PREFIX)/var/stargazer/users/test/conf
--	install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/users/test/stat $(PREFIX)/var/stargazer/users/test/stat
- 
- uninstall: uninstall-bin uninstall-data
- 
---- a/projects/rscriptd/Makefile.org	2013-01-19 17:03:42.000000000 +0200
-+++ b/projects/rscriptd/Makefile	2013-01-19 17:04:25.000000000 +0200
-@@ -65,15 +65,13 @@
- 	$(MAKE) -C $(DIR_LIBSRC) install
- 
- install-data:
--	# Install etc
--	mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/rscriptd
--	install -m $(DATA_MODE) -o $(OWNER) ./rscriptd.conf $(PREFIX)/etc/rscriptd/rscriptd.conf
-+	install -D -m $(DATA_MODE) -o $(OWNER) ./rscriptd.conf $(PREFIX)/etc/stargazer/rscriptd.conf
- ifeq ($(OS), linux)
--	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/
--	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/
-+	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnConnect $(PREFIX)/etc/stargazer/
-+	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnDisconnect $(PREFIX)/etc/stargazer/
- else
--	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/
--	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/
-+	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnConnect $(PREFIX)/etc/stargazer/
-+	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnDisconnect $(PREFIX)/etc/stargazer/
- endif
- 
- uninstall: uninstall-bin uninstall-data
---- a/projects/rlm_stg/Makefile.org	2013-02-03 14:02:58.000000000 +0200
-+++ b/projects/rlm_stg/Makefile	2013-02-03 14:05:43.000000000 +0200
-@@ -56,19 +56,11 @@
- install: install-bin
- 
- install-bin:
--ifeq ($(DEBUG), yes)
- ifeq ($(OS), linux)
- 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
- else
- 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/$(PROG)
- endif
--else
--ifeq ($(OS), linux)
--	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
--else
--	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG)
--endif
--endif
- 	$(MAKE) -C $(DIR_LIBSRC) install
- 
- uninstall: uninstall-bin
---- a/projects/rscriptd/Makefile.org	2013-02-03 14:17:01.000000000 +0200
-+++ b/projects/rscriptd/Makefile	2013-02-03 14:17:32.000000000 +0200
-@@ -57,11 +57,7 @@
- install: install-bin install-data
- 
- install-bin:
--ifeq ($(DEBUG), yes)
- 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
--else
--	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
--endif
- 	$(MAKE) -C $(DIR_LIBSRC) install
- 
- install-data:
---- a/projects/sgauth/Makefile.org	2013-02-03 14:18:37.000000000 +0200
-+++ b/projects/sgauth/Makefile	2013-02-03 14:18:48.000000000 +0200
-@@ -58,11 +58,7 @@
- install: install-bin install-data
- 
- install-bin:
--ifeq ($(DEBUG), yes)
- 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
--else
--	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
--endif
- 	$(MAKE) -C $(DIR_LIBSRC) install
- 
- install-data:
---- a/projects/sgconf/Makefile.org	2013-02-03 14:19:18.000000000 +0200
-+++ b/projects/sgconf/Makefile	2013-02-03 14:19:28.000000000 +0200
-@@ -66,11 +66,7 @@
- install: install-bin
- 
- install-bin:
--ifeq ($(DEBUG), yes)
- 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
--else
--	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
--endif
- 	$(MAKE) -C $(DIR_LIBSRC) install
- 
- uninstall: uninstall-bin
---- a/projects/sgconf_xml/Makefile.org	2013-02-03 14:19:53.000000000 +0200
-+++ b/projects/sgconf_xml/Makefile	2013-02-03 14:19:59.000000000 +0200
-@@ -66,11 +66,7 @@
- install: install-bin install-data
- 
- install-bin:
--ifeq ($(DEBUG), yes)
- 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
--else
--	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
--endif
- 	$(MAKE) -C $(DIR_LIBSRC) install
- 
- uninstall: uninstall-bin uninstall-data
---- a/projects/sgconv/Makefile.org	2013-02-03 14:20:24.000000000 +0200
-+++ b/projects/sgconv/Makefile	2013-02-03 14:20:33.000000000 +0200
-@@ -61,11 +61,7 @@
- install: install-bin
- 
- install-bin:
--ifeq ($(DEBUG), yes)
- 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
--else
--	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
--endif
- 	$(MAKE) -C $(DIR_PLUGINS) install
- 
- uninstall: uninstall-bin
---- a/projects/stargazer/Makefile.org	2013-02-03 14:20:56.000000000 +0200
-+++ b/projects/stargazer/Makefile	2013-02-03 14:21:30.000000000 +0200
-@@ -77,11 +77,7 @@
- install: install-bin install-data
- 
- install-bin: $(PROG)
--ifeq ($(DEBUG), yes)
- 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
--else
--	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
--endif
- 	$(MAKE) -C $(DIR_INCLUDE) install
- 	$(MAKE) -C $(DIR_LIBSRC) install
- 	$(MAKE) -C $(DIR_PLUGINS) install
---- a/stglibs/Makefile.in.org	2013-02-03 14:53:02.000000000 +0200
-+++ b/stglibs/Makefile.in	2013-02-03 14:53:11.000000000 +0200
-@@ -35,11 +35,7 @@
- 	rm -f deps $(PROG) *.o *.a *.so tags *.*~ 
- 
- install: $(PROG)
--ifeq ($(DEBUG), yes)
- 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
--else
--	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
--endif
- 	mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/include/stg
- 	install -m $(DATA_MODE) -o $(OWNER) $(addprefix include/stg/,$(INCS)) $(PREFIX)/usr/include/stg/
- 
---- a/projects/stargazer/plugins/Makefile.in.org	2013-02-03 15:38:41.000000000 +0200
-+++ b/projects/stargazer/plugins/Makefile.in	2013-02-03 15:38:51.000000000 +0200
-@@ -28,11 +28,7 @@
- 
- install: $(PROG)
- 	mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg
--ifeq ($(DEBUG), yes)
- 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
--else
--	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
--endif
- 
- uninstall:
- 	rm -f $(PREFIX)/usr/lib/stg/$(PROG)
diff --git a/net-misc/stargazer/files/patches/stg-2.408-on-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-on-upstream.patch
deleted file mode 100644
index 64a5964a8e0a..000000000000
--- a/net-misc/stargazer/files/patches/stg-2.408-on-upstream.patch
+++ /dev/null
@@ -1,151 +0,0 @@
---- a/projects/stargazer/inst/linux/etc/stargazer/OnChange.org	2013-01-09 14:30:32.000000000 +0200
-+++ b/projects/stargazer/inst/linux/etc/stargazer/OnChange	2013-01-09 15:50:01.000000000 +0200
-@@ -1,8 +1,20 @@
- #! /bin/sh
- 
--login=$1
--param=$2
--oldValue=$3
--newValue=$4
-+# About: This script is called when user account is changed.
-+# Common Task: Notify about various events.
-+# Priority: optional
- 
--#echo "User: '$login'. Parameter $param changed from '$oldValue' to '$newValue'" >> /var/stargazer/users.chg.log
-\ No newline at end of file
-+# User login
-+LOGIN=$1
-+
-+# User parameter
-+PARAMETER=$2
-+
-+# User parameter old value
-+OLDVALUE=$3
-+
-+# User parameter new value
-+NEWVALUE=$4
-+
-+# Usage examples:
-+#echo "User: '$LOGIN'. Parameter $PARAMETER changed from '$OLDVALUE' to '$NEWVALUE'" >> /var/stargazer/user.change.log
-\ No newline at end of file
---- a/projects/stargazer/inst/linux/etc/stargazer/OnConnect.org	2013-01-09 14:39:51.000000000 +0200
-+++ b/projects/stargazer/inst/linux/etc/stargazer/OnConnect	2013-01-09 15:11:49.000000000 +0200
-@@ -1,24 +1,23 @@
- #! /bin/sh
- 
--#Этот скрипт вызывается в момент, когда пользователь
--#успешно прошел авторизацию на сервере. Задача скрипта - перестроить 
--#файрвол так, что бы пользователь получил доступ в интернет
-+# About: This script is called when the user successfully authenticated on the server.
-+# Common Task: Rebuild firewall to allow user to access the Internet.
-+# Priority: required
- 
--# Login
-+# User login
- LOGIN=$1
- 
--#user IP
-+# User IP
- IP=$2
- 
--#cash
-+# User cash
- CASH=$3
- 
--#user ID
-+# User ID
- ID=$4
- 
--#Selected dirs to connect
-+# Selected DIRs (from rules file) to connect
- DIRS=$5
- 
--
--#echo "C `date +%Y.%m.%d-%H.%M.%S` $IP $CASH" >> /var/stargazer/users/$LOGIN/connect.log
--
-+# Usage examples:
-+#echo "Connected `date +%Y.%m.%d-%H.%M.%S` $IP $CASH" >> /var/stargazer/users/$LOGIN/connect.log
-\ No newline at end of file
---- a/projects/stargazer/inst/linux/etc/stargazer/OnDisconnect.org	2013-01-09 14:54:36.000000000 +0200
-+++ b/projects/stargazer/inst/linux/etc/stargazer/OnDisconnect	2013-01-09 15:11:33.000000000 +0200
-@@ -1,24 +1,23 @@
- #! /bin/sh
- 
--# Этот скрипт вызывается в момент, когда пользователь
--# желает отключится от интернета или вышел таймаут у пользователя
--# и сервер сам отключает пользователя
--# Задача скрипта подобна задаче скрипта OnConnect - перестроить 
--# файрвол так, что бы пользователю закрыть доступ в интернет
-+# About: This script is called when the user wants to disconnect or authorization timeout has passed.
-+# Common task: Rebuild firewall to disallow user to access to the Internet.
-+# Priority: required
- 
--# Login
-+# User login
- LOGIN=$1
- 
--#user IP
-+# User IP
- IP=$2
- 
--#cash
-+# User cash
- CASH=$3
- 
--#user ID
-+# User ID
- ID=$4
- 
--#Selected dirs to disconnect
-+# Selected DIRs (from rules file) to disconnect
- DIRS=$5
- 
--#echo "D `date +%Y.%m.%d-%H.%M.%S` $IP $CASH" >> /var/stargazer/users/$LOGIN/connect.log
-+# Usage examples:
-+#echo "Disconnected `date +%Y.%m.%d-%H.%M.%S` $IP $CASH" >> /var/stargazer/users/$LOGIN/connect.log
-\ No newline at end of file
---- a/projects/stargazer/inst/linux/etc/stargazer/OnUserAdd.org	2013-01-09 15:01:57.000000000 +0200
-+++ b/projects/stargazer/inst/linux/etc/stargazer/OnUserAdd	2013-01-09 15:10:55.000000000 +0200
-@@ -1,14 +1,12 @@
- #! /bin/sh
- 
--# Использование (неиспользование) этого скрипта дело вкуса.
--# Он не выполняет критических функций. Его задача автматизировать
--# действия характерные при добавлении пользователя сети, например добавлекние 
--# пользователю почты
--
--# Login
--login=$1
--
--#echo "added user $login" >> /var/stargazer/add_del.log
--
-+# About: This script is called when the user is added to the Stargazer.
-+# Common task: Automate typical actions on adding user to the network,
-+#              such as creating email or IM account.
-+# Priority: optional
- 
-+# User login
-+LOGIN=$1
- 
-+# Usage examples:
-+#echo "Added user $login" >> /var/stargazer/add_del.log
-\ No newline at end of file
---- a/projects/stargazer/inst/linux/etc/stargazer/OnUserDel.org	2013-01-09 15:12:32.000000000 +0200
-+++ b/projects/stargazer/inst/linux/etc/stargazer/OnUserDel	2013-01-09 15:14:10.000000000 +0200
-@@ -1,7 +1,13 @@
- #! /bin/sh
- 
--# Login
--login=$1
-+# About: This script is called when the user is removed from the Stargazer.
-+# Common task: Automate typical actions on removing user from the network,
-+#              such as removing email or IM account.
-+# Priority: optional
- 
--#echo "deleted user $login" >> /var/stargazer/add_del.log
-+# User login
-+LOGIN=$1
-+
-+# Usage examples:
-+#echo "Deleted user $LOGIN" >> /var/stargazer/add_del.log
- 
diff --git a/net-misc/stargazer/files/patches/stg-2.408-radius-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-radius-upstream.patch
deleted file mode 100644
index 553b31999277..000000000000
--- a/net-misc/stargazer/files/patches/stg-2.408-radius-upstream.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/projects/rlm_stg/Makefile.org	2013-01-18 16:17:18.000000000 +0200
-+++ b/projects/rlm_stg/Makefile	2013-01-18 16:19:13.000000000 +0200
-@@ -57,16 +57,28 @@
- 
- install-bin:
- ifeq ($(DEBUG), yes)
-+ifeq ($(OS), linux)
- 	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
- else
-+	install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/$(PROG)
-+endif
-+else
-+ifeq ($(OS), linux)
- 	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
-+else
-+	install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG)
-+endif
- endif
- 	$(MAKE) -C $(DIR_LIBSRC) install
- 
- uninstall: uninstall-bin
- 
- uninstall-bin:
-+ifeq ($(OS), linux)
- 	rm -f $(PREFIX)/usr/lib/freeradius/$(PROG)
-+else
-+	rm -f $(PREFIX)/usr/lib/$(PROG)
-+endif
- 
- ifneq ($(MAKECMDGOALS),distclean)
- ifneq ($(MAKECMDGOALS),clean)
diff --git a/net-misc/stargazer/files/patches/stg-2.408-rscriptd-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-rscriptd-upstream.patch
deleted file mode 100644
index 708c1d900627..000000000000
--- a/net-misc/stargazer/files/patches/stg-2.408-rscriptd-upstream.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/projects/rscriptd/Makefile.org	2013-01-18 16:22:46.000000000 +0200
-+++ b/projects/rscriptd/Makefile	2013-01-18 16:25:08.000000000 +0200
-@@ -68,6 +68,13 @@
- 	# Install etc
- 	mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/rscriptd
- 	install -m $(DATA_MODE) -o $(OWNER) ./rscriptd.conf $(PREFIX)/etc/rscriptd/rscriptd.conf
-+ifeq ($(OS), linux)
-+	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/
-+	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/linux/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/
-+else
-+	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnConnect $(PREFIX)/etc/rscriptd/
-+	install -D -m $(BIN_MODE) -o $(OWNER) ../stargazer/inst/freebsd/etc/stargazer/OnDisconnect $(PREFIX)/etc/rscriptd/
-+endif
- 
- uninstall: uninstall-bin uninstall-data
- 
-@@ -77,7 +84,8 @@
- uninstall-data:
- 	# Uninstall etc
- 	rm -f $(PREFIX)/etc/rscriptd/rscriptd.conf
--
-+	rm -f $(PREFIX)/etc/rscriptd/OnConnect
-+	rm -f $(PREFIX)/etc/rscriptd/OnDisconnect
- 
- ifneq ($(MAKECMDGOALS),distclean)
- ifneq ($(MAKECMDGOALS),clean)
diff --git a/net-misc/stargazer/files/patches/stg-2.408-rscriptd.conf-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-rscriptd.conf-upstream.patch
deleted file mode 100644
index 6b606353e224..000000000000
--- a/net-misc/stargazer/files/patches/stg-2.408-rscriptd.conf-upstream.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- a/projects/rscriptd/rscriptd.conf.org	2013-01-12 15:44:46.000000000 +0200
-+++ b/projects/rscriptd/rscriptd.conf	2013-01-12 15:45:44.000000000 +0200
-@@ -1,8 +1,68 @@
--LogFileName=/var/log/rscriptd.log
--ExecutersNum=1
--ConfigDir=/etc/rscriptd
--Password=123456
--Port=9999
--UserTimeout=60
--ScriptOnConnect=/etc/stargazer/OnConnect
--ScriptOnDisconnect=/etc/stargazer/OnDisconnect
-+################################################################################
-+#                         Rscriptd Configuration file                          #
-+################################################################################
-+
-+# LOG file name
-+# Parameter: optional
-+# Value: file path
-+# Default: /var/log/rscriptd.log
-+LogFileName = /var/log/rscriptd.log
-+
-+# Amount of rscriptd-exec processes.
-+# These processes are responsible for the execution of scripts 
-+# OnConnect and OnDisconnect.
-+# Amount of processes means how many scripts can be executed simultaneously.
-+# Recommend to leave 1 to avoid errors when executing scripts
-+# Parameter: optional
-+# Value: 1 ... 1024
-+# Default: 1
-+ExecutersNum = 1
-+
-+# Message queue identifier for the script executer.
-+# It may be changed if there're a needs to run multiple copies of rscriptd.
-+# Warning: If you do not understand it, do not touch this setting!
-+# Parameter: optional
-+# Value: 0 ... 2 ^ 32
-+# Default: 5555
-+# ExecMsgKey = 5555
-+
-+# The path to directory where config files are
-+# Parameter: optional
-+# Value: directory path
-+# Default: /etc/rscriptd
-+ConfigDir = /etc/rscriptd
-+
-+# Defines password for the encryption exchange between
-+# Stargazer server and rscriptd.
-+# Parameter: optional
-+# Value: any
-+# Default: 123456
-+Password = 123456
-+
-+# Defines port number for communication between
-+# Stargazer server and rscriptd.
-+# Parameter: optional
-+# Value: 1 ... 65535
-+# Default: 9999
-+Port = 9999
-+
-+# User timeout. If Stargazer does not respond during this time,
-+# the user will be disconnected.
-+# Parameter: optional
-+# Values: 5 ... 600
-+# Default: 60
-+UserTimeout = 60
-+
-+# Defines file which runs when user gets access
-+# Parameter: optional
-+# Value: file path
-+# Default: /etc/rscriptd/OnConnect
-+ScriptOnConnect = /etc/rscriptd/OnConnect
-+
-+# Defines file which runs when user loses access
-+# Parameter: optional
-+# Value: file path
-+# Default: /etc/rscriptd/OnDisconnect
-+ScriptOnDisconnect = /etc/rscriptd/OnDisconnect
-+
-+################################################################################
-\ No newline at end of file
diff --git a/net-misc/stargazer/files/patches/stg-2.408-sgauth.conf-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-sgauth.conf-upstream.patch
deleted file mode 100644
index d18c041cbdc3..000000000000
--- a/net-misc/stargazer/files/patches/stg-2.408-sgauth.conf-upstream.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- a/projects/sgauth/sgauth.conf.org	2013-01-08 15:43:09.000000000 +0200
-+++ b/projects/sgauth/sgauth.conf	2013-01-09 13:41:53.000000000 +0200
-@@ -1,37 +1,72 @@
--#Stargazer server ip
--ServerName=192.168.1.2
-+################################################################################
-+#                           Sgauth Configuration file                          #
-+################################################################################
-+
-+# Stargazer server
-+# Parameter: required
-+# Values: IP address or DNS name
-+# Default:
-+ServerName = 192.168.1.2
-+
-+# Port on which Stargazer interacts with sgauth
-+# Parameter: optional
-+# Value: 1 ... 65535
-+# Default: 5555
-+ServerPort = 5555
-+
-+# User's login in Stargazer
-+# Parameter: required
-+# Value: any
-+# Default:
-+Login = test
-+
-+# Port on which sgauth interacts with Stargazer
-+# Parameter: optional
-+# Value: 1 ... 65535
-+# Default: 0
-+LocalPort = 12345
-+
-+# User's password in Stargazer
-+# Parameter: required
-+# Value: any
-+# Default:
-+Password = 123456
-+
-+# Defines should sgauth try to reestablish connection to Stargazer
-+# if it was lost
-+# Parameter: optional
-+# Value: yes, no
-+# Default: yes
-+Reconnect = yes
-+
-+# Defines should sgauth run as daemon
-+# Parameter: optional
-+# Value: yes, no
-+# Default: yes
-+Daemon = yes
-+
-+# Web-page refresh period in built-in webserver
-+# Parameter: optional
-+# Value: any numeric (minutes)
-+# Default: 10
-+RefreshPeriod = 10
-+
-+# Defines should sgauth use built-in webserver
-+# Parameter: optional
-+# Value: yes, no
-+# Default: no
-+DisableWeb = no
-+
-+# Defines address on which sgauth's built-in webserver will listen
-+# Parameter: optional
-+# Value: IP address or DNS name
-+# Default: 127.0.0.1
-+ListenWebIP = 127.0.0.1
-+
-+# Defines should sgauth show it process ID in process list
-+# Parameter: optional
-+# Value: yes, no
-+# Default: no
-+ShowPid = no
- 
--#Stargazer server port
--#Default value 5555
--ServerPort=5555
--
--#User's login
--Login=test
--
--#
--#
--LocalPort=12345
--
--#User's password
--Password=1234567
--
--#
--#Default value yes
--#Reconnect=no
--
--#
--#Default value yes
--#Daemon=yes
--
--#Refresh web page period
--#Default value 10
--#RefreshPeriod=10
--
--#
--#Default value 127.0.0.1
--ListenWebIP=127.0.0.1
--
--#Default value no
--DisableWeb=no
--
--#ShowPid=no
-+################################################################################
-\ No newline at end of file
diff --git a/net-misc/stargazer/files/patches/stg-2.408-sgconv-upstream.patch b/net-misc/stargazer/files/patches/stg-2.408-sgconv-upstream.patch
deleted file mode 100644
index f1cdf5c5e83a..000000000000
--- a/net-misc/stargazer/files/patches/stg-2.408-sgconv-upstream.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/projects/sgconv/Makefile.org	2013-01-08 12:07:06.000000000 +0200
-+++ b/projects/sgconv/Makefile	2013-01-08 12:07:11.000000000 +0200
-@@ -4,7 +4,7 @@
- 
- include ../../Makefile.conf
- 
--PROG = convertor
-+PROG = sgconv
- 
- SRCS = ./main.cpp \
-        ./settings_impl.cpp
---- a/projects/sgconv/build.org	2012-02-09 12:26:57.000000000 +0200
-+++ b/projects/sgconv/build	2013-01-08 12:10:02.000000000 +0200
-@@ -45,13 +45,13 @@
- if [ "$OS" = "unknown" ]
- then 
-     echo "#############################################################################"
--    echo "# Sorry, but convertor currently supported by Linux, FreeBSD 4.x, 5.x, 6.x  #"
-+    echo "# Sorry, but sgconv currently supported by Linux, FreeBSD 4.x, 5.x, 6.x     #"
-     echo "#############################################################################"
-     exit 1
- fi
- 
- echo "#############################################################################"
--echo "       Building convertor for $sys $release"
-+echo "       Building sgconv for $sys $release"
- echo "#############################################################################"
- 
- STG_LIBS="logger.lib 
---- a/projects/sgconv/settings_impl.h.org	2013-01-08 12:11:53.000000000 +0200
-+++ b/projects/sgconv/settings_impl.h	2013-01-08 12:11:58.000000000 +0200
-@@ -38,7 +38,7 @@
- 
- class SETTINGS_IMPL {
- public:
--    SETTINGS_IMPL() : confFile("./convertor.conf") {}
-+    SETTINGS_IMPL() : confFile("./sgconv.conf") {}
-     SETTINGS_IMPL(const std::string & cf) : confFile(cf) {}
-     ~SETTINGS_IMPL() {}
-     int ReadSettings();
diff --git a/net-misc/stargazer/files/patches/stg-2.408-static-libs.patch b/net-misc/stargazer/files/patches/stg-2.408-static-libs.patch
deleted file mode 100644
index 68f16d41647d..000000000000
--- a/net-misc/stargazer/files/patches/stg-2.408-static-libs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/stglibs/Makefile.org	2013-01-19 18:21:57.000000000 +0200
-+++ b/stglibs/Makefile	2013-01-19 18:24:25.000000000 +0200
-@@ -15,6 +15,6 @@
- 
- clean: all
- 
--install: all
-+install:
- 
- uninstall: all
diff --git a/net-misc/stargazer/files/rscriptd b/net-misc/stargazer/files/rscriptd
deleted file mode 100644
index d8ddf44f696e..000000000000
--- a/net-misc/stargazer/files/rscriptd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-
-DAEMON=/usr/sbin/rscriptd
-RSCRIPTD_OPTS="/etc/stargazer/rscriptd.conf"
-PIDFILE="/run/rscriptd.pid"
-
-depend() {
-	need net
-	provide rscriptd
-}
-
-start() {
-	ebegin "Starting rscriptd"
-	start-stop-daemon --start --quiet --background --make-pidfile --pidfile ${PIDFILE} --exec ${DAEMON} -- ${RSCRIPTD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping rscriptd"
-	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-	rm -f ${PIDFILE}
-	eend $?
-}
-\ No newline at end of file
diff --git a/net-misc/stargazer/files/sgauth b/net-misc/stargazer/files/sgauth
deleted file mode 100644
index 0dec60bfa1af..000000000000
--- a/net-misc/stargazer/files/sgauth
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-
-DAEMON=/usr/sbin/sgauth
-SGAUTH_OPTS="/etc/stargazer/sgauth.conf"
-PIDFILE="/run/sgauth.pid"
-
-depend() {
-	need net
-	provide sgauth
-}
-
-start() {
-	ebegin "Starting sgauth"
-	start-stop-daemon --start --quiet --pidfile ${PIDFILE} --exec ${DAEMON} -- ${SGAUTH_OPTS}
-	eend $?
-}
-
-start_post() {
-	pgrep -n $RC_SVCNAME > ${PIDFILE}
-}
-
-stop() {
-	ebegin "Stopping sgauth"
-	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-	rm -f ${PIDFILE}
-	eend $?
-}
-\ No newline at end of file
diff --git a/net-misc/stargazer/metadata.xml b/net-misc/stargazer/metadata.xml
deleted file mode 100644
index 1f91c8885843..000000000000
--- a/net-misc/stargazer/metadata.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>spiderx@spiderx.dp.ua</email>
-		<name>Vladimir Pavljuchenkov</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription lang="en">
-	Stargazer is a powerful (inter)net billing system, capable of gathering
-	traffic statistics from many sources (such as NetFlow protocol,
-	ethernet packets capture, or IPQ subsystem), managing and billing user
-	accounts according to specified fees and rules (including time-based rules,
-	traffic source/destination rules and a payoff system).
-	This ebuild allows you to compile it yourself depending of your needs.
-	</longdescription>
-	<use>
-		<flag name="sgconv">Enable build of utility to convert Stargazer data between storage backends.</flag>
-		<flag name="radius">Enable build of FreeRADIUS module for data access via Stargazer.</flag>
-		<flag name="rscriptd">Enable build of remote script execute daemon for Stargazer, which run scripts when receive special signal from Stargazer.</flag>
-		<flag name="sgauth">Enable build of command-line utility for authorization in Stargazer.</flag>
-		<flag name="sgconf">Enable build of command-line utility for configuring Stargazer.</flag>
-		<flag name="sgconf_xml">Enable build of command-line xml-based utility for configuring Stargazer.</flag>
-		<flag name="stargazer">Enable build of Stargazer billing system.</flag>
-		<flag name="debug">Enable extra debug codepaths, like asserts and extra output.</flag>
-		<flag name="module_auth_always_online">Enable build of "Always Online" authentication module for Stargazer.</flag>
-		<flag name="module_auth_internet_access">Enable build of "InetAccess" authentication module for Stargazer. InetAccess is a Stargazer specific authentication protocol.</flag>
-		<flag name="module_auth_freeradius">Enable build of "Radius" authentication module for Stargazer. This module capable of using RADIUS procotol for user authentication.</flag>
-		<flag name="module_capture_ether">Enable build of "Ethernet" traffic capture module for Stargazer. This module uses RAW sockets to capture traffic.</flag>
-		<flag name="module_capture_ipq">Enable build of "IPQ" traffic capture module for Stargazer. This module uses IPQ subsystem to capture traffic.</flag>
-		<flag name="module_capture_netflow">Enable build of "NetFlow" traffic capture module for Stargazer. This module capable of receiving traffic data by NetFlow protocol.</flag>
-		<flag name="module_config_rpcconfig">Enable build of "XMLRPC" configuration module for Stargazer. This module uses XML-RPC protocol for configuring Stargazer.</flag>
-		<flag name="module_config_sgconfig">Enable build of "SGConf" configuration module for Stargazer. This module uses Stargazer specific protocol for configuring Stargazer.</flag>
-		<flag name="module_other_ping">Enable build of "Ping" module for Stargazer. This module pings connected users from time to time to ensure they are alive.</flag>
-		<flag name="module_other_remote_script">Enable build of "Remote Script" module for Stargazer. This module control rscriptd daemon over the net and makes it execute scripts in reaction to different Stargazer events.</flag>
-		<flag name="module_other_smux">Enable build of SMUX module for Stargazer. This module uses SMUX protocol to provide various information about Stargazer.</flag>
-		<flag name="module_store_files">Enable build of storage plugin for Stargazer based on plain files.</flag>
-		<flag name="module_store_firebird">Enable build of storage plugin for Stargazer, which uses Firebird database for storage.</flag>
-		<flag name="module_store_mysql">Enable build of storage plugin for Stargazer, which uses MySQL for storage.</flag>
-		<flag name="module_store_postgres">Enable build of storage plugin for Stargazer, which uses PostgreSQL for storage.</flag>
-	</use>
-	<upstream>
-		<doc>http://stg.net.ua/doc/index.html</doc>
-		<bugs-to>mailto:faust@stg.dp.ua</bugs-to>
-		<remote-id type="github">madf/stg</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/stargazer/stargazer-2.408-r2.ebuild b/net-misc/stargazer/stargazer-2.408-r2.ebuild
deleted file mode 100644
index 7f3667a702eb..000000000000
--- a/net-misc/stargazer/stargazer-2.408-r2.ebuild
+++ /dev/null
@@ -1,542 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PROJECTS="sgconv rlm_stg rscriptd sgauth sgconf sgconf_xml stargazer"
-
-STG_MODULES_AUTH="always_online internet_access freeradius"
-STG_MODULES_CAPTURE="ipq ether netflow"
-STG_MODULES_CONFIG="sgconfig rpcconfig"
-STG_MODULES_OTHER="ping smux remote_script"
-STG_MODULES_STORE="files firebird mysql postgres"
-
-declare -A MODULES
-MODULES=( [module_auth_always_online]="authorization\/ao:mod_ao"
-	[module_auth_internet_access]="authorization\/inetaccess:mod_ia"
-	[module_auth_freeradius]="other\/radius:mod_radius"
-	[module_capture_ipq]="capture\/ipq_linux:mod_cap_ipq"
-	[module_capture_ether]="capture\/ether_linux:mod_cap_ether"
-	[module_capture_netflow]="capture\/cap_nf:mod_cap_nf"
-	[module_config_sgconfig]="configuration\/sgconfig:mod_sg"
-	[module_config_rpcconfig]="configuration\/rpcconfig:mod_rpc"
-	[module_other_ping]="other\/ping:mod_ping"
-	[module_other_smux]="other\/smux:mod_smux"
-	[module_other_remote_script]="other\/rscript:mod_remote_script"
-	[module_store_files]="store\/files:store_files"
-	[module_store_firebird]="store\/firebird:store_firebird"
-	[module_store_mysql]="store\/mysql:store_mysql"
-	[module_store_postgres]="store\/postgresql:store_postgresql"
-)
-
-declare -A INIT
-INIT=(	[module_store_files]="11d"
-	[module_store_firebird]="11d;s/need net/need net firebird/"
-	[module_store_mysql]="11d;s/need net/need net mysql/"
-	[module_store_postgres]="11d;s/need net/need net postgresql/"
-)
-
-MY_P="stg-${PV}"
-
-inherit flag-o-matic linux-info
-
-DESCRIPTION="Billing system for small home and office networks"
-HOMEPAGE="http://stg.dp.ua/"
-SRC_URI="http://stg.dp.ua/download/server/${PV}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
-	acct-group/stg
-	acct-user/stg
-"
-
-RDEPEND="
-	module_config_rpcconfig? (
-		dev-libs/expat
-		dev-libs/xmlrpc-c[abyss,cxx]
-	)
-	module_config_sgconfig? ( dev-libs/expat )
-	module_store_firebird? ( dev-db/firebird )
-	module_store_mysql? ( dev-db/mysql-connector-c:0= )
-	module_store_postgres? ( dev-db/postgresql:= )
-	rscriptd? ( ${CDEPEND} )
-	sgauth? ( ${CDEPEND} )
-	sgconf? (
-		${CDEPEND}
-		dev-libs/expat
-	)
-	sgconf_xml? ( dev-libs/expat )
-	stargazer? ( ${CDEPEND} )
-"
-
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="stargazer? ( ^^ ( module_store_files module_store_firebird module_store_mysql module_store_postgres ) )"
-
-DOCS=( BUGS ../../ChangeLog CHANGES README TODO )
-
-# Patches already in upstream's trunk
-PATCHES=(
-	# Fix dependency on fbclient for module_store_firebird
-	"${FILESDIR}"/patches/stg-2.408-makefile-firebird-upstream.patch
-	# Rewrite config for rscriptd
-	"${FILESDIR}"/patches/stg-2.408-rscriptd.conf-upstream.patch
-	# Rewrite config for sgauth
-	"${FILESDIR}"/patches/stg-2.408-sgauth.conf-upstream.patch
-	# Standardization of 'On-scripts'
-	"${FILESDIR}"/patches/stg-2.408-on-upstream.patch
-	# Install demo scripts for rscriptd
-	"${FILESDIR}"/patches/stg-2.408-rscriptd-upstream.patch
-	# Fix crush on stop
-	"${FILESDIR}"/patches/stg-2.408-fix-crash-on-stop.patch
-	# Rename convertor to sgconv to avoid possible file name collisions
-	"${FILESDIR}"/patches/stg-2.408-sgconv-upstream.patch
-	# Debug support. Install radius lib to /usr/lib/freeradius
-	"${FILESDIR}"/patches/stg-2.408-makefile-build-upstream.patch
-	# Don't compile sgconv always with debug. Remove MAKEOPTS=-j1
-	"${FILESDIR}"/patches/stg-2.408-build-upstream.patch
-	# FreeBSD install directory
-	"${FILESDIR}"/patches/stg-2.408-radius-upstream.patch
-)
-
-IUSE="sgconv radius rscriptd sgauth sgconf sgconf_xml stargazer debug"
-
-for module in ${STG_MODULES_AUTH} ; do IUSE="${IUSE} module_auth_${module}" ; done
-for module in ${STG_MODULES_CAPTURE} ; do IUSE="${IUSE} module_capture_${module}" ; done
-for module in ${STG_MODULES_CONFIG} ; do IUSE="${IUSE} module_config_${module}" ; done
-for module in ${STG_MODULES_OTHER} ; do IUSE="${IUSE} module_other_${module}" ; done
-for module in ${STG_MODULES_STORE} ; do IUSE="${IUSE} module_store_${module}" ; done
-
-IUSE=${IUSE/stargazer/+stargazer}
-IUSE=${IUSE/module_store_files/+module_store_files}
-
-src_prepare() {
-	# Rename convertor to sgconv to avoid possible file name collisions
-	mv projects/convertor/ projects/sgconv/ \
-		|| die "Couldn't move convertor folder"
-	mv projects/sgconv/convertor.conf \
-		projects/sgconv/sgconv.conf || die "Couldn't move convertor config"
-
-	default
-
-	local project
-	for project in ${PROJECTS} ; do
-		# Rename build script to configure for further econf launch in every project
-		mv projects/$project/build projects/$project/configure \
-			|| die "Couldn't move build folder for $project"
-		# Change check for debug build
-		sed -i 's/if \[ "$1" = "debug" \]/if \[ "${10}" = "--enable-debug" \]/' \
-			projects/$project/configure \
-			|| die "sed for debug check failed"
-	done
-
-	# Correct working directory, user and group for sgconv.conf, store_files.conf
-	# Correct paths for rscriptd.conf, store_firebird.conf, mod_remote_scriptd.conf, stargazer.conf, rpcconfig.cpp, 00-base-00.sql
-	eapply "${FILESDIR}"/patches/stg-2.408-correct-paths.patch
-
-	# Correct target install-data for stargazer, rscriptd, sgauth, remove debug symbols stripping
-	eapply "${FILESDIR}"/patches/stg-2.408-makefile.patch
-
-	# Remove make from script (for keeping symbols), always add variable to Makefile.conf for all projects
-	eapply "${FILESDIR}"/patches/stg-2.408-build.patch
-
-	# Remove static-libs
-	eapply "${FILESDIR}"/patches/stg-2.408-static-libs.patch
-
-	# Define which module to compile
-	local module
-	for module in ${!MODULES[@]} ; do
-		if ! use $module ; then
-			sed -i "s/${MODULES[$module]%:*}//" \
-				projects/stargazer/configure \
-				|| die "sed for module configure failed"
-		fi
-	done
-
-	# Correct Gentoo init script
-	sed -i	-e 's/opts/extra_commands/' \
-		-e 's/runscript/openrc-run/' \
-		projects/stargazer/inst/linux/etc/init.d/stargazer.gentoo \
-		|| die "sed for init-script failed"
-	local init
-	for init in ${!INIT[@]} ; do
-		if use $init ; then
-			sed -i "${INIT[$init]}" \
-				projects/stargazer/inst/linux/etc/init.d/stargazer.gentoo \
-				|| die "sed for $init failed"
-		fi
-	done
-
-	# Check for IPQ subsystem availability
-	if use module_capture_ipq && kernel_is ge 3 5 ; then
-		die "The IPQ subsystem requires kernel 3.5 or greater."
-	fi
-}
-
-src_configure() {
-	use debug && filter-flags '-O?'
-
-	# Define local variables, strip '+' symbol for used by default USE flags
-	local USEFLAGS=(${IUSE//+})
-	local PROJECTS=($PROJECTS)
-	local i
-
-	for (( i = 0 ; i < ${#PROJECTS[@]} ; i++ )) ; do
-		if use ${USEFLAGS[$i]} ; then
-			cd "${S}"/projects/${PROJECTS[$i]} \
-				|| die "cd to ${PROJECTS[$i]} failed"
-			econf $(use_enable debug)
-		fi
-	done
-}
-
-src_compile() {
-	# Define local variables, strip '+' symbol for used by default USE flags
-	local USEFLAGS=(${IUSE//+})
-	local PROJECTS=($PROJECTS)
-	local i
-
-	# Set jobs to 1 for debug build
-	use debug && MAKEOPTS="-j1"
-
-	# Build necessary libraries first
-	touch Makefile.conf
-	cd stglibs || die "cd to stglibs failed"
-	emake STG_LIBS="ia.lib srvconf.lib"
-
-	for (( i = 0 ; i < ${#PROJECTS[@]} ; i++ )) ; do
-		if use ${USEFLAGS[$i]} ; then
-			cd "${S}"/projects/${PROJECTS[$i]} \
-				|| die "cd to ${PROJECTS[$i]} failed"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	if use rscriptd || use stargazer ; then
-		# Install config file for logrotate
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/logrotate stargazer
-
-		# Keeping logs directory
-		diropts -m 755 -o stg -g stg
-		keepdir /var/log/stargazer
-		if use stargazer ; then
-			diropts -m 775 -o stg -g stg
-			keepdir /var/lib/stargazer
-		fi
-	fi
-
-	if use sgconv ; then
-		cd projects/sgconv || die "cd to sgconv failed"
-
-		emake DESTDIR="${D}" PREFIX="${D}" install
-
-		# Install files into specified directory
-		insinto /etc/stargazer
-		doins "${S}"/projects/sgconv/sgconv.conf
-
-		# Install manual page
-		doman "${FILESDIR}"/mans/sgconv.1
-	fi
-
-	if use radius ; then
-		cd "${S}"/projects/rlm_stg || die "cd to rlm_stg failed"
-
-		emake DESTDIR="${D}" PREFIX="${D}" install
-	fi
-
-	if use rscriptd ; then
-		cd "${S}"/projects/rscriptd || die "cd to rscriptd failed"
-
-		emake DESTDIR="${D}" PREFIX="${D}" install
-
-		# Install Gentoo init script
-		doinitd "${FILESDIR}"/rscriptd
-
-		# Correct permissions for file
-		fperms 0640 /etc/stargazer/rscriptd.conf
-
-		# Install manual page
-		doman "${FILESDIR}"/mans/rscriptd.8
-	fi
-
-	if use sgauth ; then
-		cd "${S}"/projects/sgauth || die "cd to sgauth failed"
-
-		emake DESTDIR="${D}" PREFIX="${D}" install
-
-		# Correct permissions for file
-		fperms 0640 /etc/stargazer/sgauth.conf
-
-		# Install manual page
-		doman "${FILESDIR}"/mans/sgauth.8
-	fi
-
-	if use sgconf ; then
-		cd "${S}"/projects/sgconf || die "cd to sgconf failed"
-
-		emake DESTDIR="${D}" PREFIX="${D}" install
-
-		# Install manual page
-		doman "${FILESDIR}"/mans/sgconf.1
-	fi
-
-	if use sgconf_xml ; then
-		cd "${S}"/projects/sgconf_xml || die "cd to sgconf_xml failed"
-
-		emake DESTDIR="${D}" PREFIX="${D}" install
-
-		# Install manual page
-		doman "${FILESDIR}"/mans/sgconf_xml.1
-	fi
-
-	if use stargazer ; then
-		cd "${S}"/projects/stargazer || die "cd to stargazer failed"
-
-		emake DESTDIR="${D}" PREFIX="${D}" install
-
-		# Install docs
-		einstalldocs
-
-		# Install and rename Gentoo init script
-		newinitd "${S}"/projects/stargazer/inst/linux/etc/init.d/stargazer.gentoo stargazer
-
-		# Install manual page
-		doman "${FILESDIR}"/mans/stargazer.8
-
-		# Install files needed for module_store_files
-		if use module_store_files ; then
-			# Install files into specified directory
-			insinto /var/lib
-			doins -r "${S}"/projects/stargazer/inst/var/stargazer
-
-			# Correct user and group for files and directories
-			fowners -R stg:stg /var/lib/stargazer
-		fi
-
-		if use module_store_firebird ; then
-			# Install files into specified directory
-			insinto /usr/share/stargazer/db/firebird
-			doins \
-				"${S}"/projects/stargazer/inst/var/00-base-00.sql \
-				"${S}"/projects/stargazer/inst/var/00-alter-01.sql
-		fi
-
-		if use module_store_mysql ; then
-			# Install file into specified directory
-			insinto /usr/share/stargazer/db/mysql
-			doins "${S}"/projects/stargazer/inst/var/00-mysql-01.sql
-		fi
-
-		if use module_store_postgres ; then
-			# Install files into specified directory
-			insinto /usr/share/stargazer/db/postgresql
-			doins \
-				"${S}"/projects/stargazer/inst/var/00-base-00.postgresql.sql \
-				"${S}"/projects/stargazer/inst/var/00-alter-01.postgresql.sql
-		fi
-
-		if use module_other_smux ; then
-			# Install files into specified directory
-			insinto /usr/share/snmp/mibs
-			doins "${S}"/projects/stargazer/plugins/other/smux/STG-MIB.mib
-		fi
-
-		if use module_other_remote_script ; then
-			# Create subnets file based on example from mod_remote_script.conf
-			grep 192 "${S}"/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf \
-				| sed 's/# //' > "${ED}"/etc/stargazer/subnets
-
-			# Correct permissions for file
-			fperms 0640 /etc/stargazer/subnets
-		fi
-
-		# Correct permissions for files
-		fperms 0640 \
-			/etc/stargazer/rules \
-			/etc/stargazer/stargazer.conf
-
-		# Install files into specified directory for selected modules
-		insinto /etc/stargazer/conf-available.d
-		insopts -m 0640
-
-		local module
-		for module in ${!MODULES[@]} ; do
-			use $module && doins "${S}"/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/${MODULES[$module]#*:}.conf
-		done
-
-		# Create symlinks of configs for selected modules
-		for module in ${!MODULES[@]} ; do
-			use $module \
-				&& dosym \
-				/etc/stargazer/conf-available.d/${MODULES[$module]#*:}.conf \
-				/etc/stargazer/conf-enabled.d/${MODULES[$module]#*:}.conf
-		done
-	fi
-
-	# Correct user and gsroup for files and directories
-	if use sgconv || use rscriptd || use sgauth || use stargazer ; then
-		fowners -R stg:stg /etc/stargazer
-	fi
-
-	# Put the files in the right folder to support multilib
-	if [ ! -e "${ED}"/usr/$(get_libdir) ] ; then
-		mv "${ED}"/usr/lib/ "${ED}"/usr/$(get_libdir) \
-			|| die "Failed to move library directory for multilib support"
-	fi
-}
-
-pkg_postinst() {
-	if use sgconv ; then
-		einfo "\nSgconv:"
-		einfo "----------"
-		einfo "For further use edit /etc/stargazer/sgconv.conf."
-	fi
-
-	if use radius ; then
-		einfo "\nRadius:"
-		einfo "-------"
-		einfo "For further use emerge net-dialup/freeradius.\n"
-
-		einfo "Example config:\n"
-
-		einfo "stg {"
-		einfo "      local_port = 6667"
-		einfo "      server = localhost"
-		einfo "      port = 6666"
-		einfo "      password = 123456"
-		einfo "    }\n"
-
-		einfo "You should place 'stg' into section Instantiate, Authorize."
-		einfo "In section Authentificate 'stg' should go in sub-section"
-		einfo "Auth-Type before other authentifications modules:\n"
-
-		einfo "Auth-Type PAP {"
-		einfo "                stg"
-		einfo "                pap"
-		einfo "}\n"
-
-		einfo "It also may be used in section Accounting and Post-Auth."
-
-		use module_auth_freeradius || einfo "\nFor use RADIUS enable USE-flag module_auth_freeradius."
-	fi
-
-	if use rscriptd ; then
-		einfo "\nRemote Script Executer:"
-		einfo "-----------------------"
-		einfo "For further use edit /etc/stargazer/rscriptd.conf."
-		einfo "You have to change 'Password' field at least."
-	fi
-
-	if use sgauth ; then
-		einfo "\nSgauth:"
-		einfo "-------"
-		einfo "For further use edit /etc/stargazer/sgauth.conf."
-		einfo "You have to change 'ServerName', 'Login', 'Password' fields at least."
-	fi
-
-	if use sgconf ; then
-		einfo "\nSgconf:"
-		einfo "-------"
-		use module_config_sgconfig \
-			|| einfo "For further use enable USE-flag module_config_sgconfig."
-	fi
-
-	if use sgconf_xml ; then
-		einfo "\nSgconf_xml:"
-		einfo "-----------"
-		use module_config_rpcconfig \
-			|| einfo "For further use enable USE-flag module_config_rpcconfig."
-	fi
-
-	if use stargazer ; then
-		einfo "\nStargazer:"
-		einfo "----------"
-		einfo "Modules availability:\n"
-		if use module_auth_always_online ; then
-			einfo "* module_auth_always_online available."
-		fi
-		if use module_auth_internet_access ; then
-			einfo "* module_auth_internet_access available."
-		fi
-		if use module_auth_freeradius ; then
-			einfo "* module_auth_freeradius available.\n"
-			einfo "For further use emerge net-dialup/freeradius.\n"
-			use radius || einfo "\n           For use RADIUS enable use USE-flag radius."
-		fi
-		if use module_capture_ipq ; then
-			einfo "* module_capture_ipq available."
-		fi
-		if use module_capture_ether ; then
-			einfo "* module_capture_ether available."
-		fi
-		if use module_capture_netflow ; then
-			einfo "* module_capture_netflow available.\n"
-			einfo "For further use emerge any netflow sensor:\n"
-			einfo "net-firewall/ipt_netflow or net-analyzer/softflowd.\n"
-		fi
-		if use module_config_sgconfig ; then
-			einfo "* module_config_sgconfig available."
-		fi
-		if use module_config_rpcconfig ; then
-			einfo "* module_config_rpcconfig available.\n"
-			einfo "KNOWN BUG: Sometimes you can't configure Stargazer"
-			einfo "through xml-based configurator, because module is not responding."
-			einfo "This bug is introduced by xmlrpc-c library."
-			einfo "This bug proceeds very rare, but it still exists.\n"
-		fi
-		if use module_other_ping ; then
-			einfo "* module_other_ping available."
-		fi
-		if use module_other_smux ; then
-			einfo "* module_other_smux available.\n"
-			einfo "For further use emerge net-analyzer/net-snmp.\n"
-		fi
-		if use module_other_remote_script ; then
-			einfo "* module_other_remote_script available.\n"
-			einfo "For further use edit /etc/stargazer/subnets.\n"
-		fi
-		if use module_store_files ; then
-			einfo "* module_store_files available."
-		fi
-		if use module_store_firebird ; then
-			einfo "* module_store_firebird available.\n"
-			einfo "You should add 'firebird' user to stg group:\n"
-			einfo "# usermod -a -G stg firebird\n"
-			einfo "and restart firebird:\n"
-			einfo "# /etc/init.d/firebird restart\n"
-			einfo "Stargazer DB schema for Firebird is here: /usr/share/stargazer/db/firebird"
-			einfo "For new setup you should execute 00-base-00.sql:\n"
-			einfo "# fbsql -q -i /usr/share/stargazer/db/firebird/00-base-00.sql\n"
-			einfo "For upgrade from version 2.406 you should execute 00-alter-01.sql:\n"
-			einfo "# fbsql -i /usr/share/stargazer/db/firebird/00-alter-01.sql\n"
-		fi
-		if use module_store_mysql ; then
-			einfo "* module_store_mysql available.\n"
-			einfo "For upgrade from version 2.406 you should execute 00-mysql-01.sql:\n"
-			einfo "# mysql < /usr/share/stargazer/db/mysql/00-mysql-01.sql\n"
-		fi
-		if use module_store_postgres ; then
-			einfo "* module_store_postgres available.\n"
-			einfo "DB schema for PostgresSQL is here: /usr/share/stargazer/db/postgresql"
-			einfo "For new setup you should execute 00-base-00.postgresql.sql:\n"
-			einfo "# psql -f /usr/share/stargazer/db/postgresql/00-base-00.postgresql.sql\n"
-			einfo "For upgrade from version 2.406 you should execute 00-alter-01.sql:\n"
-			einfo "# psql -f /usr/share/stargazer/db/postgresql/00-alter-01.sql\n"
-		fi
-		einfo "\n    For all storage backends:\n"
-		einfo "* Default admin login - admin, default admin password - 123456."
-		einfo "* Default subscriber login - test, default subscriber password - 123456.\n"
-		einfo "Don't run newer versions without reading their ChangeLog first,"
-		einfo "it can be found in /usr/share/doc/${PF}"
-	fi
-	if use debug ; then
-		ewarn "\nThis is a debug build, avoid to use it in production."
-	fi
-}
diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest
index 125c538cf4ea..f28bf13cf529 100644
--- a/net-misc/sysrepo/Manifest
+++ b/net-misc/sysrepo/Manifest
@@ -1,8 +1,4 @@
 AUX sysrepo-2.0.1-cmake.patch 749 BLAKE2B 40419e1ac3cd9459587f5af1a54a89cbce3b770e81e2c891a6a5dd8f12da9499cdea470951b65233ac43095282892069a976b2f13753332a3981d9779a635ec2 SHA512 9b2d89bf5f6fea6b088d672c51c6b7691375ca2d824c350b9d21cb72df6f290d31681b51426dfd8d2fa5d027e49177e4d6f7392fb758de5718ecd59a9a674597
-DIST sysrepo-1.4.122.tar.gz 679974 BLAKE2B 3161eb8635c3ea7a0168b1a0eb3250da7e8c134030e5c5443d492cb708f095f9af12f08257a7d0b86a084b121754a8f19fa408de5afc32ce82d92bb4c6c7a535 SHA512 ccd603913b0f31f26f990dba8430ad6c1033546cd764396c43cc6667919b486924fc2d2fade77eee9ef7a3329aae2ceaf4acc578613a0c7c1d2a53d3cbf2944c
-DIST sysrepo-1.4.140.tar.gz 683340 BLAKE2B bc9d51fc18450809e0428b32901a20516a82b29a58f0c8bb962c2cfada1bdac94116e8d436eb294d3c50efb3a829f6262666e5715212a1bd83282667cc5ab744 SHA512 9d10f61825438462442a2757293f73a143222dc7f0adafcfdd21a2439eea63fe8789c05765f58c5b3798b0321bc79c4e649f88b0bf0b5443bfac30d1c168325b
 DIST sysrepo-2.0.1.tar.gz 642522 BLAKE2B dc2ce960f1ce4156b89ed8f0ab2c567ca50f8d7fc3bc1151cf52d2302ba8114c8e01b7e295c249176acab6c501fbf45850a6d89fde427be444bcb12ccd243dcc SHA512 c231174980985d7cc7380f2708cd5395f621735cee62923fcb224d09d500978917b4caa7860e4dca8520e27a4f002e7377b987b6738472d6424d09a0894a3953
-EBUILD sysrepo-1.4.122-r1.ebuild 772 BLAKE2B 7425a6e27b426b7b6b62f47ced029fec376dac49a7bd1ca4192c0af7281b540d89695db22eff2d4c8648bb2a7d71be34c127592dfcbec4c443096c5e10ba7087 SHA512 e481e28e1532e179ee42fce9095bfc4d975642c66c4cd33af9b5508db69470689999aa859577c2eb9a7eb2667d2e091d1f457ef65a560273a0c23d3abc881060
-EBUILD sysrepo-1.4.140.ebuild 774 BLAKE2B 6f7998ed5a0bbc506477c05feced5915dcbdd45e06bc13c334188df54fc9a67cfafff230ae7e34123b45a4e5a005e2774ea04a8f2c4971793031e965467a8c06 SHA512 0a5ade7ed2d9751659a9324d2528a023319490ab8fef9059e055a2eaffeb6f953c20f062cb22a2a9d2a36c3149b11806c68f4b0a06f55442622c63d962fa393f
 EBUILD sysrepo-2.0.1.ebuild 784 BLAKE2B 62ef44c179e4b30451b6c9b3eac3cb8d2ce3b218a5295d1c52d7116dad8c13e71bf6c28db7dad1b34ae6fd0fc593e954a40820c942ef42607ab1ae8cb582178c SHA512 6a53a695e039e954e842e4019e46f84bfabb1a42d55c3cb296361d9ba5c702f23b478601a3c0d952f9549b66df44bfe41ab050ffd1c8f8ccfa2a301afc8586cd
 MISC metadata.xml 327 BLAKE2B 441f959f6f61c6a9aa25337593ed5fd04d5646fa64f605d313ef301327ab8a1ade8feead0b0df9f54412c59e663cd96fc2f9a75e4c57f146a4864af53f46ca36 SHA512 095175a85411c469123fb81a7b26a3dbce8faef4b0be314d11ab5d242f909b01e90b56c808690aea344e0e67e520e169eb4bb7578b351c4f09525f344fa3abe5
diff --git a/net-misc/sysrepo/sysrepo-1.4.122-r1.ebuild b/net-misc/sysrepo/sysrepo-1.4.122-r1.ebuild
deleted file mode 100644
index 184ab5dc58ec..000000000000
--- a/net-misc/sysrepo/sysrepo-1.4.122-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="YANG-based configuration and operational state data store"
-HOMEPAGE="https://www.sysrepo.org"
-SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=net-libs/libyang-1.0.225:=
-	<net-libs/libyang-2.0.0:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	cmake_src_install
-
-	use doc && dodoc -r doc/.
-}
diff --git a/net-misc/sysrepo/sysrepo-1.4.140.ebuild b/net-misc/sysrepo/sysrepo-1.4.140.ebuild
deleted file mode 100644
index 9958375e77dc..000000000000
--- a/net-misc/sysrepo/sysrepo-1.4.140.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="YANG-based configuration and operational state data store"
-HOMEPAGE="https://www.sysrepo.org"
-SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=net-libs/libyang-1.0.240:=
-	<net-libs/libyang-2.0.0:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	cmake_src_install
-
-	use doc && dodoc -r doc/.
-}
diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
index 80f2cd8ccc8e..f6e1319e84fc 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -7,7 +7,7 @@ AUX vde.init-r1 1021 BLAKE2B cf91532a53a59fb653b3c9c221ce68a4351a40503dedb28e89b
 DIST vde-2.3.2_p20191011.tar.gz 381468 BLAKE2B 6d25df2a4cf89a0159875eac1c2c3a27e6b6856f24494ee2e181ab8d8a2fa9c3350b9c7b9b9474cbcbd8afd50fc61fd167a5cc18398b771d05178c5c3a402f73 SHA512 0e9f9f28a8ef0acd765307908dfd9ab9462f67df21b06be5b48ed1795900be546e28e1869528ee8e5a6d7eb6e6fa91ded116b826a501e13ec7f1562f1b84f971
 DIST vde2-2.3.2.tar.bz2 600527 BLAKE2B 6c4900578b992eff914136f29395a822bc52945906d291eee78b3bf7cb806bbf4d8ebeec2080daa10923e98b648d071ce1f846214143e4dce749da9be8b48990 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6
 EBUILD vde-2.3.2-r6.ebuild 1407 BLAKE2B 639dd926dc7bcfde76216470b381cec847f7a7369e18b359d614f8edde3e3570cab2ab6416cc312f316a962d3cfd028a136209a607338b48a6cc318cb367b9c4 SHA512 852218c41c305ab7ae013c674c3b3194fbb03895377e37ef0b203611b8e1f1a68bfa5d6ea5bd5fef16afc82ac0706f431afaa3f98dc421d19dd7f8673585e2ac
-EBUILD vde-2.3.2_p20191011-r1.ebuild 2086 BLAKE2B 3cc69a0f174fa50e0de1a3e7573eb65d297574d84b978b5d37c9dafc63fe76ed24f5200b05eb76b6f20656e95436f878eb0af677a15fdcf62985b261a518a89a SHA512 e005b825ef59394b8a80ae9835616479ab41f1022762bf3a7eb5c804925079f2016fa14dd95897fa2d1a6b3c41f334ad08efea02f135228f20c434f0be1296c2
+EBUILD vde-2.3.2_p20191011-r1.ebuild 2100 BLAKE2B 127b3d1f27c8fd2df1a9376583aa6188857805811bfa509f83c1b4e0f32a109087eb430451fcf8eac4957a6317f8f92d5febb01a59253d3168fdc8362e139665 SHA512 c92b096d679ed5fb0e306ad69f764603b5c6f86bb9d51a6685560abaeab593e071d0f059938cbf3db0acdf70e2cb602759de76335c5324caa513c90331eeb10a
 EBUILD vde-2.3.2_p20191011.ebuild 2010 BLAKE2B 0d27fd650fa45d8d2acaa52e9f85862b65290dfdcdfca9711c3f422c51139fda45b5b9b24e98af3b197e02d4d4ee63688489868796d1ae0c1529553f8d9d5369 SHA512 0a35644c54730e4855f41b821cb69933b19bb80c7b795874db692435a928f79bfaed8bb34a90f87b7b34d21d9b17813b6ea7260a5219cf36ae0fc23a26dc4363
-EBUILD vde-9999.ebuild 2010 BLAKE2B 0d27fd650fa45d8d2acaa52e9f85862b65290dfdcdfca9711c3f422c51139fda45b5b9b24e98af3b197e02d4d4ee63688489868796d1ae0c1529553f8d9d5369 SHA512 0a35644c54730e4855f41b821cb69933b19bb80c7b795874db692435a928f79bfaed8bb34a90f87b7b34d21d9b17813b6ea7260a5219cf36ae0fc23a26dc4363
+EBUILD vde-9999.ebuild 2024 BLAKE2B 1f1489b30da6061df5a2cbec6e1f3c8af692fc979e97a9ce713281bdce5079900e5c2c2e94bb974e06298936f197f741a08f2c9af9b84f6249436e21fd8b0b69 SHA512 83f5c66b59e54e7a907720672f5897bfb52c6216f9be2fff6b742c07ebfe4a3fd8b793431f73bce9ee4b7946d0b4b4679848339dd11c1b54466181d1e0eb8338
 MISC metadata.xml 987 BLAKE2B 7470e3c50e1b3f15d56a2bb0a96da7112dff6799587a74ee6935f48c3d65dc560b55449f2938889085f0285c789891515c517b0eb4b336bfb6050052e70f6b5e SHA512 6d25c342154f85da0cc39ccb6d6a9fdf16977453fe46f62f73b3687d6fe009238c00a29ed27927908dd9c23769716d9abf48e255ecf61ff4782604ef4f3db189
diff --git a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
index 3cdfaa0d67a4..48c1a5d22c19 100644
--- a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
+++ b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
@@ -14,13 +14,13 @@ elif [[ ${PV} = *_p* ]]; then
 	MY_PN="vde-2"
 	COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb"
 	SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 	S="${WORKDIR}/${MY_PN}-${COMMIT}"
 else
 	MY_P="${PN}2-${PV}"
 	SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/vde/vde-9999.ebuild b/net-misc/vde/vde-9999.ebuild
index 0d3dd7100e23..97b492902bf5 100644
--- a/net-misc/vde/vde-9999.ebuild
+++ b/net-misc/vde/vde-9999.ebuild
@@ -13,13 +13,13 @@ elif [[ ${PV} = *_p* ]]; then
 	MY_PN="vde-2"
 	COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb"
 	SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 	S="${WORKDIR}/${MY_PN}-${COMMIT}"
 else
 	MY_P="${PN}2-${PV}"
 	SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index 51bd4f941230..51538d64f292 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -6,10 +6,12 @@ DIST xmrig-6.13.0.tar.gz 1694984 BLAKE2B 6449df3fe7a42c5caa9050d0e7ef8723cb36175
 DIST xmrig-6.13.1.tar.gz 1695005 BLAKE2B 8094a7f247d1b1f714a22fcdddcbede0d859f4883c6fcb1789ce134bdae31875da434679bdb141cd332a575ca0e4fa80b8ca96e603e8c381e9073c58394abe71 SHA512 f1a4e11f6e13bd275f2d867f1a4826cb244bdc9d157e590870ebc4dcd3cafc522bf7f46cfb4eb81e129fc3f9dbef59219288088c42e8f6b876ac16b5b6224323
 DIST xmrig-6.14.0.tar.gz 1698011 BLAKE2B 62391c7dde6d3d4fbb4cb78e53c6f704fb277830257148a03fc059e0eebd6a2fc7ba723a1caafe0e3920b15c3abe7a35a774743fdd0d0a800879fdc666ebed45 SHA512 de1cc3543a690a65cb50e629114324e95d4769dc3610c6dde0fff937206df3949907f8a21a4e4533bee71958e6febbaf4a23c3092c1e67a763f4ffea11770591
 DIST xmrig-6.14.1.tar.gz 1698951 BLAKE2B 99a0b3407aa0f0d835e04b407350c07f6e3adaf10e839217343aa56368d61665a2a83b75d4965c3573cb46018f20918c34cab295edd5c8398d0e7581e414976e SHA512 11d877e6b96f224fe317f74e019cf5df22a267d1b89c3d8ee775a2e3508e4d2f276f7ce9de5cc09430f8a8f56183595166f75d10bd8a3598530daec3bffb7788
+DIST xmrig-6.15.0.tar.gz 1742192 BLAKE2B 6495a48b9cc9e5a2ef851d6ffbeb0f1e3ce2fbd4ae3aaaef8acffcdff157006622a51fc23b2337933b1ced100a38fee334b240188aacaf8263f1806a39492f1f SHA512 e3f9af9fdf19512cddbb1f1a5655f9710fba486bc6f4a4eda6661ad7201d8909ada1308890dccf34af65d18cd687390c238b9b3522af6c1cafb360713ceb2985
 EBUILD xmrig-6.12.2.ebuild 1284 BLAKE2B ad14cf0ce42c072c6a640e32927035704a2144f76462d98fe108aae7b970ae27304abdb0600561a159ddd22874c08a19e4d42b308b1fdd6b1f9049c0f13d1c03 SHA512 87d2e6897670dd2d43383f305718536ed6769482556d8b3e88988521b4434cd635f4c5b5f0e59f59638e0851135cbf226492837e30ef96c650a1b7f71305c201
 EBUILD xmrig-6.13.0.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
 EBUILD xmrig-6.13.1.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
 EBUILD xmrig-6.14.0.ebuild 1348 BLAKE2B 464ba0de9178acb2b7eb380a58a167708425a6c97a28b4618008f830622d01629cf8d7f0a9b9482aae2da369ecd96a67c8b0771565bde8e18136399bf58351c6 SHA512 9d8af7c511fcb6a008a8cd37bc103fb821354b321453879fa9c9923c13ece6a1eb4aa4a31ec8cb5ce21f79baf358990c25f837e3fa728627a4122312a7f464ef
 EBUILD xmrig-6.14.1.ebuild 1287 BLAKE2B b47c344c0444f5c1735bbf32a0eca9b5986df3ff7ed6db66292c12d4b7353e536b007befcb5ab1e9a1d84beba91b053cc77c655f1efe03a8b6f1369039d0cc27 SHA512 fbfab6ffc6402b62775a34a883ca49231a07a586cf0aba6b12be2c38dbda7f963ebc13d06c3ba36d62e2871b6b915c45c83b2cee42f817afdc8fd30bf26ca620
+EBUILD xmrig-6.15.0.ebuild 1287 BLAKE2B b47c344c0444f5c1735bbf32a0eca9b5986df3ff7ed6db66292c12d4b7353e536b007befcb5ab1e9a1d84beba91b053cc77c655f1efe03a8b6f1369039d0cc27 SHA512 fbfab6ffc6402b62775a34a883ca49231a07a586cf0aba6b12be2c38dbda7f963ebc13d06c3ba36d62e2871b6b915c45c83b2cee42f817afdc8fd30bf26ca620
 EBUILD xmrig-9999.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
 MISC metadata.xml 967 BLAKE2B 40681544dee425cb4bf05607ed01d3231d10be52b89da4defffe410507c4b763cf3820ccb36bdd158e8360fa24fd3028f8b93fffa8fd77cbd856e8d8e49b704f SHA512 b66915ea7f93291b609dcedcecbeddc8e0e637227eaaefb7db8d0af4353cb6c1b67dfd48e4400da268b9939f15ebb06e6f4cb322a57184757c8291ebb65a440e
diff --git a/net-misc/xmrig/xmrig-6.15.0.ebuild b/net-misc/xmrig/xmrig-6.15.0.ebuild
new file mode 100644
index 000000000000..8ad79070a47b
--- /dev/null
+++ b/net-misc/xmrig/xmrig-6.15.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
+HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="Apache-2.0 GPL-3+ MIT"
+SLOT="0"
+IUSE="cpu_flags_x86_sse4_1 donate hwloc +ssl"
+
+DEPEND="
+	dev-libs/libuv:=
+	hwloc? ( sys-apps/hwloc:= )
+	ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="
+	${DEPEND}
+	!arm64? ( sys-apps/msr-tools )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
+)
+
+src_prepare() {
+	if ! use donate ; then
+		sed -i 's/1;/0;/g' src/donate.h || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		-DWITH_HWLOC=$(usex hwloc)
+		-DWITH_TLS=$(usex ssl)
+		-DWITH_OPENCL=OFF
+		-DWITH_CUDA=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	default
+	keepdir /etc/xmrig
+	systemd_dounit "${FILESDIR}"/xmrig.service
+	dobin "${BUILD_DIR}/xmrig"
+	dobin "${S}/scripts/enable_1gb_pages.sh"
+	dobin "${S}/scripts/randomx_boost.sh"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-09-03 20:56:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-09-03 20:56:28 +0100
commit	fbda87924e6faa7a1919f1a2b4182490bde5ec5c (patch)
tree	f3114a4ed212a754756adce027aeef3a4a1a2e2a /net-misc
parent	3b08f674e3f771b49370edb144dab0958c8cf721 (diff)