gentoo resync : 16.02.1018

author: V3n3RiX <venerix@redcorelinux.org> 2019-02-16 12:59:29 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-02-16 12:59:29 +0000
commit: 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch)
tree: ade7cb031f363fad64c77139dea7aa3d81908537 /net-misc
parent: 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff)
56 files changed, 1257 insertions, 1640 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index b1263cba95f6..d2a8ddbbe6c9 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 80bf50608e4f..35fab1c01204 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,10 +1,6 @@
 AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
 AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
-DIST curl-7.62.0.tar.bz2 3014762 BLAKE2B 0cc9ef5d19004dc5cc69444cac3b2fb4fd82ba470a831b761c147e45826fc26087f4e07da76ee0b6a070f6125a1423927607a257786387326f4c9f4e3953d5f7 SHA512 83ca5c2757745f763316eefdd4c3f0e8a211a7f0db6a708b67ae2133ad41fdf17dd2230f9283a4778c9c866126d407454a090291cd2bf274371d0a214c1c13f5
-DIST curl-7.63.0.tar.bz2 3001355 BLAKE2B 7925825f606d7eb474fb73aeec52353d3a3bf8827b34457493003ef2e3c1aed5350d849fdbd5624f148c6bb776aad318f1f49ec1ca57690f5dfb21b12fcbdc16 SHA512 2873ef57b15cf12e508626f4546f6e06450cb87b239be1d26d9b3a22f7533d76eebabb5fa00e7b8c5d7fc9854356997ce164afb069411d079b2b9f0bdb00db25
 DIST curl-7.64.0.tar.bz2 3012077 BLAKE2B 512edeaa7a4ff3a998903771307070b08f1dc53bf45b4f0c98edd78daa309877e1856e1253a3582b3db35d2ae877af5aeedf2fb2741bfd8faed3bc4525880581 SHA512 058da4c63a05f704de475271f37fb99ca90a67a919b168e07958ed45d10cb3d03898ea6e3452ffb1a1f1e5dd5915f08a2993024b12233919f3c46c036b9c07e3
-EBUILD curl-7.62.0.ebuild 7208 BLAKE2B ef907472ef262984af161c67c766c8d1e31c9601ddd61d678921bebcfe9c98b9f43e65438d28f5276ec6bbce5fdb7843aee06338e3704fd128d8742a36482bf8 SHA512 90cb165e3fe36b5eb9b9755fc0dab27109282a10fdb5092afaf1eb716719040da870a9deca0f8ad1f8f750be4c89f9b46834b18753f9d66d2c70ed39d70e316b
-EBUILD curl-7.63.0-r1.ebuild 6847 BLAKE2B d52226c50765c986e0edfa883009390af00eae62019ad8bef0e7a17f6db400662a6dbdec4f2d550c0e87ede84f692d64edcf16d310cfa8e2d21dca488283ae3c SHA512 417e746879161b9a6034dbb889184809a7684cabb7c1fe2669b8c639e20fa8130d95e8204c954f43e171140b09876ec98b998a5f41dc7efdd3f7495189d4ce96
-EBUILD curl-7.64.0.ebuild 6863 BLAKE2B 6e24b01a5e4f211b22d7f4fc34516ab8914542020503056b58e1ed965fc47533b1c4bec518e927b226ba91cfc884fe9387269fec99c56647c0f7c520ebfb024c SHA512 69642081e38eb479885ada0b0dc4c6ec6f4026497b57cd791e390056bff962a72cde54a31b762fff17a32de6ee1c1e6bc322be4a52458357d34415455a788bb6
+EBUILD curl-7.64.0.ebuild 6857 BLAKE2B 768a2b4559ba419b7211ae44edb63eca018f2bb98a078c05c9eae2f5be74c76501dbe78eee0372e64bcbb5a462a698959533b57d944cf83d40c8140e59b07b02 SHA512 2aa729057a5fca87b89cc412a157c67a02fefc172b374592ffdf832cc8fe88f9648958abb7534bf57e96fab8f14c5f3034688c242d5c660d8d7841112d727cda
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.62.0.ebuild b/net-misc/curl/curl-7.62.0.ebuild
deleted file mode 100644
index fa9090793302..000000000000
--- a/net-misc/curl/curl-7.62.0.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? (
-		curl_ssl_axtls? (
-			net-libs/axtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_libressl? (
-			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_openssl? (
-			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2[${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[static-libs?,${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${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}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
-	curl_ssl_winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_axtls
-			curl_ssl_gnutls
-			curl_ssl_libressl
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
-	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-	eapply_user
-	eprefixify curl-config.in
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin17 ]] ; then
-		# https://bugs.gentoo.org/show_bug.cgi?id=637252
-		sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
-			configure || die
-	fi
-}
-
-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-axtls --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  )
-	if use ssl ; then
-		if use curl_ssl_axtls; then
-			einfo "SSL provided by axtls"
-			myconf+=( --with-axtls )
-		elif use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		elif use curl_ssl_libressl; then
-			einfo "SSL provided by LibreSSL"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		elif use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-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
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-crypto-auth \
-		--enable-dict \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--disable-ntlm-wb \
-		--enable-pop3 \
-		--enable-rt  \
-		--enable-rtsp \
-		$(use_enable samba smb) \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		--enable-tls-srp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--without-libpsl \
-		--enable-manual \
-		--enable-proxy \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		$(use_enable threads pthreads) \
-		--disable-versioned-symbols \
-		--without-cyassl \
-		--without-darwinssl \
-		$(use_with idn libidn2) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		$(use_with metalink libmetalink) \
-		$(use_with http2 nghttp2) \
-		$(use_with rtmp librtmp) \
-		$(use_with brotli) \
-		--without-spnego \
-		--without-winidn \
-		--without-wolfssl \
-		--with-zlib \
-		"${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 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_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	rm -rf "${ED}"/etc/
-}
diff --git a/net-misc/curl/curl-7.63.0-r1.ebuild b/net-misc/curl/curl-7.63.0-r1.ebuild
deleted file mode 100644
index 525bbd549f48..000000000000
--- a/net-misc/curl/curl-7.63.0-r1.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? (
-		curl_ssl_gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_libressl? (
-			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_openssl? (
-			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2[${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}]"
-
-# 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}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
-	curl_ssl_winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_libressl
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
-	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
-
-	eapply_user
-	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  )
-	if use ssl ; then
-		if use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		elif use curl_ssl_libressl; then
-			einfo "SSL provided by LibreSSL"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		elif use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-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
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-crypto-auth \
-		--enable-dict \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--disable-ntlm-wb \
-		--enable-pop3 \
-		--enable-rt  \
-		--enable-rtsp \
-		$(use_enable samba smb) \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		--enable-tls-srp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--without-libpsl \
-		--enable-manual \
-		--enable-proxy \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		$(use_enable threads pthreads) \
-		--disable-versioned-symbols \
-		--without-cyassl \
-		--without-darwinssl \
-		$(use_with idn libidn2) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		$(use_with metalink libmetalink) \
-		$(use_with http2 nghttp2) \
-		$(use_with rtmp librtmp) \
-		$(use_with brotli) \
-		--without-spnego \
-		--without-winidn \
-		--without-wolfssl \
-		--with-zlib \
-		"${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 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_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	rm -rf "${ED}"/etc/
-}
diff --git a/net-misc/curl/curl-7.64.0.ebuild b/net-misc/curl/curl-7.64.0.ebuild
index e50554e31902..c648fbabaec8 100644
--- a/net-misc/curl/curl-7.64.0.ebuild
+++ b/net-misc/curl/curl-7.64.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" elibc_Winnt"
diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest
index 6499e8b5dc78..6fd090201e76 100644
--- a/net-misc/gnome-online-miners/Manifest
+++ b/net-misc/gnome-online-miners/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-online-miners-3.24.0.tar.xz 272572 BLAKE2B 6331e72f65510041cc278670df328ab6ec5336bb76ec1c6681136c6731c70b9d343ef296062da6de302cfea195d1b99c0040e1e016394b2fe3bbbe077915cd76 SHA512 96c6aa99b99553c399ecef754d10a918d8ef3bdf6369a77357241091edc9c2ff7a8350f8a064bb011deddac75b25bdde8006e8d72b6562f9cdcf3b373e693253
+DIST gnome-online-miners-3.26.0.tar.xz 272576 BLAKE2B d87a83489be58f3f78a9245bcb08c28afafab47008fc1d042d8c4964cc8451e7c257055768db88f384c75546d48ea90c477223987e0add757a1a5c614ef5a2b7 SHA512 a116a16c1f8a56bddd3cbb238cfb007d776695446c516dd12811145853553c293a9c8880465238571f6081fc7b05e3e69c14c406cd8e6fa6ee570b4aa4b22435
 EBUILD gnome-online-miners-3.24.0.ebuild 894 BLAKE2B a6de18d767e2edfccaf829f1c5c422a65fc1ead85f15da115a6e978a53061c5719a40b09f341c5042d31dcd296c21516bb6f29725e274a20d061d9aa1cdeaf47 SHA512 a0f03e3ddae3d889835d0733b79022cb62ea1ae03f863edfab53e8d0904e7cef5628979891cf2d8217c112afd43755d297e0ffba9ee8ee1e4de53364e3547cd1
+EBUILD gnome-online-miners-3.26.0.ebuild 892 BLAKE2B ec1b95d5a167917587efde2ae1f498b68aa767c204f06d6d0f02ef47d5e924c120bd96cbca656892fe08f0e0d8b164509d001affc201bc3d6c909225009a2d44 SHA512 2bb1e5d1b86dda67f25bdc157c0b80faff10b3c646fa8076953bac5bd4024cb104091e39a4589497da12f5227db04a8c8083ceec1c347fe705ff3ce57c8aee51
 MISC metadata.xml 312 BLAKE2B 4529eb2ea76ee2c88700e8d551c726424ce4338361eb87c39599d1ee263914d9861cc8f93e1d8e667bdba186c40afbf1376bd9b530edbdab32ec4f961a60f00b SHA512 483189736c04729c1497b3bd6321a1d86241835c22df7c06658fda2af4f06d56f614499bcb8ab7eac76a3619fbaac81cfb430aedf3d4f78592ef3c8fd73746dd
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.26.0.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.26.0.ebuild
new file mode 100644
index 000000000000..e174d047e6a9
--- /dev/null
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.26.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Crawls through your online content"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="flickr"
+KEYWORDS="~amd64 ~x86"
+
+# libgdata[gnome] needed for goa support
+RDEPEND="
+	>=app-misc/tracker-2:=
+	>=dev-libs/glib-2.35.1:2
+	>=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts]
+	media-libs/grilo:0.3
+	>=net-libs/gnome-online-accounts-3.13.3:=
+	>=net-libs/libgfbgraph-0.2.2:0.2
+	>=net-libs/libzapojit-0.0.2
+	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable flickr) \
+		--disable-static \
+		--enable-facebook \
+		--enable-google \
+		--enable-media-server \
+		--enable-owncloud \
+		--enable-windows-live
+}
diff --git a/net-misc/gwhois/Manifest b/net-misc/gwhois/Manifest
index 10c3a93d3612..14b75fc96784 100644
--- a/net-misc/gwhois/Manifest
+++ b/net-misc/gwhois/Manifest
@@ -1,6 +1,6 @@
 AUX gwhois.xinetd 305 BLAKE2B 7ed747398edeb544cccd308ca04a192b62c2bad7206a8a2db85382f01cb72d5794a7c7818caf9a26a9a59841b1282a1a6dd8821b2153d8a3ac6631aa23074419 SHA512 33afac83df9f8d53b54144358cd50b1ea40e266fd5438d1f8a32954c4f05cdb608b5ebc688673f1866ac76e59dfb0b097884bb38077e50061639152899d68460
 DIST gwhois_20120626-1.2.tar.gz 41800 BLAKE2B 695005bd37abaf0dc39593dcc3dfd01102b896dc2bb74a8f3be774d5f7316861588ca3ca621eabdeb19739abfda9be0ab215c757181d3d08ce0416f315410d0d SHA512 c18e20a033e3d2de3b1a5c81d1fdae88cfd9dbc5261b4512b87376d0909ea538db46b3380aaa426ef43904ef292662185dd2f3cb59c56dba306c41a0e827bcb0
 DIST gwhois_20120626.tar.gz 41698 BLAKE2B cce3a6eb385bb782a772a7532cecc2ae164d6ea00a42a6afa29b2ff4d16526507511c16e9cae3dab3d26e7818126b2fcd20a5d88a4affa472162f9ef30c0e464 SHA512 8ffaa611389929435f70d3f020e28249e6e3109c4e822e9318b050f52cf09d6934adbb14ab67a6361574ce8645656d5eaf24808dea453f2187352fc2b2513e0e
-EBUILD gwhois-20120626-r1.ebuild 1363 BLAKE2B 080a0a2528e1724b124a01b2a48012ab0dc377f2604d8096976563c8c297b35575fd2277d8fb0e99f4cfe785f07028279fe367302765cf19e388282ed3e1981b SHA512 93bf217161133b337e9f5735ae81a70d4652374ccca3209d336c148152d043fc44091cf88b8c603e071e8f9cfea31c637a8f2d2f157db3f7ab1c56bde179ce89
+EBUILD gwhois-20120626-r1.ebuild 1360 BLAKE2B 9eb382287ff1eb80c0c2dad4274864abc447051a7aaf79bfa54b4ef843d53d00f629e051c1bc5e57039afae01f55d1f9710aedaff81b30f392f53d008ae36cf7 SHA512 ab3b7f6434d1bb6e0b2c45eb4ad155f14b37ecf883ecba4fe7f090ff237092b4b989217d4f187622acfc1e4914e15ca4834efe650b11828d55d91e9ba21c2047
 EBUILD gwhois-20120626.ebuild 1176 BLAKE2B 8c4f27cd2a32a3227b4a22ebac16b9d694e8ce845ca450f83e3a23cc90a99f1ca0a0cdc044d9eb97cd9e801997d646df6d6dcfccada9df39626892a2da46758b SHA512 730f084c67f0051c130d25dd1f2dfb765b8ace18bf29d81454b8f937d45ec80e01cacfc02adc6652fa369e95fd3553d688edd4030b2b7455ce7201e6e3c4259e
 MISC metadata.xml 530 BLAKE2B 8bde49044c3d194febcd4dd6d43e60854f2282264a5a22d8e35a131c3f6fe5f72f91bb20a8d1179267af873246611fb4defa8ffc5b8e0f0288f6e514475f55c6 SHA512 8e59f39cd78c74a06d0c9d0efc4cf72e80df415b2433970707977cf049140630e976e12062ad2bab2822ac790ae6c160f87cb65c2c746e7ede14d288f6364306
diff --git a/net-misc/gwhois/gwhois-20120626-r1.ebuild b/net-misc/gwhois/gwhois-20120626-r1.ebuild
index 05fb4bf692e7..d83034a44fdf 100644
--- a/net-misc/gwhois/gwhois-20120626-r1.ebuild
+++ b/net-misc/gwhois/gwhois-20120626-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://debian/pool/main/g/${PN}/${MY_P/-/_}-${DEBIAN_VER}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="alpha ~amd64 ~hppa ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index cf765e541abe..c5a48509fdf8 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -4,11 +4,10 @@ AUX conncenter.desktop 194 BLAKE2B 96fdae8892ec9cef05a92e129bba42efb666874a2a218
 AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b0695b368c08600af8a5a7764ee09ae7fe5d7f9c105d1217cae37fc2211542535ce31cea5d2b9f36d996f SHA512 a2857ecadeceb1252039f02e779a3d366cb863758802fc2927b9edd44a6580ba175db8ce332e3cbdd4ab0354fc0144432934abf8fed9f68c3e1a639775613258
 AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
-DIST linuxx64-13.10.0.20.tar.gz 20208082 BLAKE2B f350b303df768f17c49033111f79b85217829ed19ca3884d63266ed1fd436ff8eea44a6514e708d97e72313a6905425a30c0107191e98c68bfc9c7b0fc454008 SHA512 ac12c09fc459726ddff8564a4900e0184d3f04138cf51361076fb476296f96f0f98d55b6d079f2c3829cfbaf07c373e8722fcde56266f2f3c8c5989ad33fa06b
 DIST linuxx64-18.10.0.11.tar.gz 21976273 BLAKE2B 4d673f40a04e31bba94b2e0dda744f8e3bb1ac489bfbbf846da3ae700d8fbd2504d22aa8fe1b703ceee9536699ea7fee288ce21306771f5c8806930cf54e2ffd SHA512 c14cfb2d10738c888dd2f56f840b0446d8952fe2adb76e1fac0c75d135a4c785cbfd8ccefed6d66f917eb4ebe3d27d151da738706b137abe26dcc3963dd78a1d
-DIST linuxx86-13.10.0.20.tar.gz 22123747 BLAKE2B 490024fa780fc8e09afb3dd56194525b6b5aefe89377c59f4bfa12eeb3f60711530dd2659dd8fe975df6121db5af35e3760315a5b656e4f517e2fad9fb411ada SHA512 e4c5220ea680601a95019d30c2fb2a26e7f3cd60da19c42b96168aab74456c1242b4400cc4d7b10910a7e0e1993377d6492fb9e2cebb98b1b662d3d1ebf4cffc
+DIST linuxx64-19.1.0.9.tar.gz 22074792 BLAKE2B aeeb8df5a63d08c94718d069c2f3e259d22309cab8ba3f046e9b1d6ecadbb9ddc7a7049bd6837944e42cfc9f625146218208802a2bf0f3bdc32f1f7d162a8700 SHA512 21539546fd24f7781e6a114e345392ee85e0f27f0f4b8a641e8b94f9a96c4a0e14f3d81838a3735c6098c251b022b3e30ce0c530b686f7587029cd2983516cfc
 DIST linuxx86-18.10.0.11.tar.gz 24095176 BLAKE2B 5e7b9bba57661216b0194ccca292a9e663fdca65439c86ea68c1857352f1ed7c5247e41eeb976bc306148cd78c71b069da3e65042331a0e601637db1fee2d6c6 SHA512 8e073b436454472799df283266ccd68652b519336bf74b558b1d0345147331c5e8f4c8900b8d94a13bd6b08b94298c9dbcc5a3a06edbe53722304de5b117f239
-EBUILD icaclient-13.10.0.20-r1.ebuild 4809 BLAKE2B 08204d5dba7f9632d3047123a78f63539c78dbe9177234486b9afdd8dd2c13e72ce6d9e1eeadebdc9433b4a04ca37c40243c0fdc65b43ed414f2b7d3c19d1f56 SHA512 e16d3870b90449139a368d4e56777fdf97d015fec17878c2c57f92503da75e488cb47844ef84249e565eafff2c013f8f68125b7b8e8ae2c94daa681a14be1434
-EBUILD icaclient-18.10.0.11-r1.ebuild 5001 BLAKE2B 229bc1894b70fdb41fee4f46788e59e218e2c06c21696bd9a67fe6a10a7af3287e2f1ebad2632a083af478ef1de686fe28fb61d31c9899cbb43d0815165c7b7b SHA512 34109258156e8a9be1b1f7aedeb0e4ca8bb63087564cd053edb6ddb509ae98cce20271bb024a6177f494d2f25dd04d059ca4fc49464ab860f3781950935de1ad
-EBUILD icaclient-18.10.0.11.ebuild 4835 BLAKE2B 3cd1c02b2e0b29c36060c084718d8f0798aa7e07847f9d965565783b75030aac07fc45798bc3d7855ee775c13857ae6e8337647e1837806896e867078ad55302 SHA512 e067e03c848086b087d2f34855905c17d637b18d7b23addde72b5e9c1930963e644e5ac73b74280ce8649d2315d7ec8f3c8841ef7d67370f973ddefc8ee99b03
+DIST linuxx86-19.1.0.9.tar.gz 24175639 BLAKE2B d73d3d438ef272f9571587cd66e357bca4698d797ea813dafb47b6c61a86606b2021b5659908d160e3baec7b668265d4dccbf8f009c4c77c99e1258fec28c22f SHA512 110d1f160f6f4538bb589682bcbb8414b816d0669dc1fb4559243ee335a6e6129af8e50d47feadd7688808affef7bcaa300fc6c01fb05b84938fe449f7e9d05d
+EBUILD icaclient-18.10.0.11-r1.ebuild 4999 BLAKE2B 72cea895bcfa9e8713d1cd740422838e5900a7bcf3c8a171acd7ccc2c14e80e4076dc51193b97295b71dd3ceaa96f9914f4227fbe887aa4f22ffbd3f0eb4af7e SHA512 1262b73337b7bd68d187c0d5aae8c84450633a2a5b8844f7358dee753504ed132bd27e290b38471f74e67dfe1b0d45af4335393a14a73ab8b644b396456d7038
+EBUILD icaclient-19.1.0.9.ebuild 5001 BLAKE2B 29a15d96b01be75869fddb51f7905bd19cfc8bc9f92f90fd8e53c507ca5ce5229563c0573304d6256da351531d56a642daf1a1d852fafdc0d30030be5e017af2 SHA512 8caf0fb0bef83be86a90ccdf6d3395895ffffed69c7a22c018886eda55b5da363a80722f20a2d1746dee6a6b235ac20382f30c8ccd9cee4a60d559ba2e423837
 MISC metadata.xml 678 BLAKE2B 7ca853d90b1492bd1c15b9e0109430afbedae032ef56a035cf75de74796f694b2ab955dca5f3ef93a97a1c61686ead93b1bd1579802b35e0bd381d0d0c35d5ff SHA512 a838a68c22e2f1585960a7699399285c0c9b47b79734a22adc5d74599380c7c7792428dd7287f1e62d1194a4f97c79e902910f4c1569fc227f0f7e1c39afc8d0
diff --git a/net-misc/icaclient/icaclient-13.10.0.20-r1.ebuild b/net-misc/icaclient/icaclient-13.10.0.20-r1.ebuild
deleted file mode 100644
index 9ad6a7b62628..000000000000
--- a/net-misc/icaclient/icaclient-13.10.0.20-r1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# eutils inherit required for make_wrapper call
-inherit desktop eutils multilib versionator xdg-utils
-
-DESCRIPTION="ICA Client for Citrix Presentation servers"
-HOMEPAGE="https://www.citrix.com/"
-SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
-	x86? ( linuxx86-${PV}.tar.gz )"
-
-LICENSE="icaclient"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="nsplugin l10n_de l10n_es l10n_fr l10n_ja l10n_zh_CN"
-RESTRICT="mirror strip userpriv fetch"
-
-ICAROOT="/opt/Citrix/ICAClient"
-
-QA_PREBUILT="${ICAROOT#/}/*"
-
-RDEPEND="
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-fonts/font-adobe-100dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	media-fonts/font-xfree86-type1
-	media-fonts/font-misc-ethiopic
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/gst-plugins-base:1.0
-	media-libs/gstreamer:1.0
-	media-libs/libcanberra[gtk]
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/speex
-	net-dns/libidn:1.33
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/e2fsprogs-libs
-	sys-libs/zlib
-	virtual/krb5
-	virtual/jpeg:0
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXinerama
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/pango
-"
-DEPEND=""
-
-pkg_nofetch() {
-	elog "Download the client file ${A} from
-	https://www.citrix.com/downloads/citrix-receiver.html"
-	elog "and place it in ${DISTDIR:-/usr/portage/distfiles}."
-}
-
-pkg_setup() {
-	case ${ARCH} in
-		amd64)
-			ICAARCH=linuxx64
-		;;
-		x86)
-			ICAARCH=linuxx86
-		;;
-		*)
-			eerror "Given architecture is not supported by Citrix."
-		;;
-	esac
-
-	S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor"
-}
-
-src_prepare() {
-	default
-	rm lib/UIDialogLibWebKit.so || die
-}
-
-src_install() {
-	local tmpl dest
-
-	dodir "${ICAROOT}"
-
-	exeinto "${ICAROOT}"
-	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
-
-	exeinto "${ICAROOT}"/lib
-	doexe lib/*.so
-
-	if use nsplugin ; then
-		exeinto "${ICAROOT}"
-		doexe npica.so
-		dosym "${ICAROOT}"/npica.so /usr/$(get_libdir)/nsbrowser/plugins/npica.so
-	fi
-
-	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
-		insinto "${dest}"
-		doins nls/en.UTF-8/eula.txt
-	done
-
-	insinto "${ICAROOT}"
-	doins -r usb
-
-	insinto "${ICAROOT}"/config
-	doins config/* config/.* nls/en/*.ini
-	for tmpl in {appsrv,wfclient}.template ; do
-		newins nls/en/${tmpl} ${tmpl/template/ini}
-	done
-	touch "${ED%/}/${ICAROOT}"/config/.server || die
-
-	insinto "${ICAROOT}"/gtk
-	doins gtk/*
-
-	insinto "${ICAROOT}"/gtk/glade
-	doins gtk/glade/*
-
-	insinto "${ICAROOT}"/site
-	doins -r site/*
-
-	dodir "${ICAROOT}"/help
-
-	insinto "${ICAROOT}"/config/usertemplate
-	doins config/usertemplate/*
-
-	local lang LANGCODES=( en )
-	use l10n_de && LANGCODES+=( de )
-	use l10n_es && LANGCODES+=( es )
-	use l10n_fr && LANGCODES+=( fr )
-	use l10n_ja && LANGCODES+=( ja )
-	use l10n_zh_CN && LANGCODES+=( zh_CN )
-
-	for lang in ${LANGCODES[@]} ; do
-		insinto "${ICAROOT}"/nls/${lang}
-		doins nls/${lang}/*
-
-		insinto "${ICAROOT}"/nls/$lang/UTF-8
-		doins nls/${lang}.UTF-8/*
-
-		insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
-		doins nls/${lang}/LC_MESSAGES/*
-
-		insinto "${ICAROOT}"/nls/${lang}
-		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
-
-		for tmpl in {appsrv,wfclient}.template ; do
-			cp "${ED%/}/${ICAROOT}"/nls/${lang}/${tmpl} \
-				"${ED%/}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
-				|| die
-		done
-	done
-
-	insinto "${ICAROOT}"/nls
-	dosym en /opt/Citrix/ICAClient/nls/C
-
-	insinto "${ICAROOT}"/icons
-	doins icons/*
-
-	insinto "${ICAROOT}"/keyboard
-	doins keyboard/*
-
-	rm -r "${S}"/keystore/cacerts || die
-	dosym /etc/ssl/certs "${ICAROOT}"/keystore/cacerts
-
-	exeinto "${ICAROOT}"/util
-	doexe util/{configmgr,conncenter,gst_play1.0,gst_read1.0,hdxcheck.sh,icalicense.sh,libgstflatstm1.0.so}
-	doexe util/{lurdump,new_store,nslaunch,pnabrowse,storebrowse,sunraymac.sh,what,xcapture}
-
-	# https://bugs.gentoo.org/655922
-	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
-	dosym gst_read1.0 "${ICAROOT}"/util/gst_read
-	dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
-
-	doenvd "${FILESDIR}"/10ICAClient
-
-	make_wrapper wfica "${ICAROOT}"/wfica . "${ICAROOT}"
-
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
-		> "${ED%/}"/etc/revdep-rebuild/70icaclient
-
-	# 651926
-	domenu "${FILESDIR}"/wfica.desktop
-}
-
-pkg_preinst() {
-	local old_plugin="/usr/lib64/nsbrowser/plugins/npwrapper.npica.so"
-	if use amd64 && [[ -f ${old_plugin} ]] ; then
-		local wrapper="/usr/bin/nspluginwrapper"
-		if [[ -x ${wrapper} ]] ; then
-			einfo "Removing npica.so from wrapper."
-			${wrapper} -r ${old_plugin}
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-misc/icaclient/icaclient-18.10.0.11-r1.ebuild b/net-misc/icaclient/icaclient-18.10.0.11-r1.ebuild
index 2694d7156b64..bf40a7fc05de 100644
--- a/net-misc/icaclient/icaclient-18.10.0.11-r1.ebuild
+++ b/net-misc/icaclient/icaclient-18.10.0.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="nsplugin l10n_de l10n_es l10n_fr l10n_ja l10n_zh_CN"
 RESTRICT="mirror strip userpriv fetch"
 
diff --git a/net-misc/icaclient/icaclient-18.10.0.11.ebuild b/net-misc/icaclient/icaclient-19.1.0.9.ebuild
index b8118d5f9b1e..a54c5cd45c39 100644
--- a/net-misc/icaclient/icaclient-18.10.0.11.ebuild
+++ b/net-misc/icaclient/icaclient-19.1.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -89,7 +89,7 @@ src_prepare() {
 }
 
 src_install() {
-	local tmpl dest
+	local bin tmpl dest
 
 	dodir "${ICAROOT}"
 
@@ -184,14 +184,20 @@ src_install() {
 
 	doenvd "${FILESDIR}"/10ICAClient
 
-	make_wrapper wfica "${ICAROOT}"/wfica . "${ICAROOT}"
+	for bin in configmgr conncenter new_store ; do
+		make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util
+	done
+
+	for bin in selfservice wfica ; do
+		make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}"
+	done
 
 	dodir /etc/revdep-rebuild/
 	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
 		> "${ED}"/etc/revdep-rebuild/70icaclient
 
 	# 651926
-	domenu "${FILESDIR}"/wfica.desktop
+	domenu "${FILESDIR}"/*.desktop
 }
 
 pkg_preinst() {
diff --git a/net-misc/jlj/Manifest b/net-misc/jlj/Manifest
index da91bb4ea2c6..a4b62fa444f6 100644
--- a/net-misc/jlj/Manifest
+++ b/net-misc/jlj/Manifest
@@ -1,4 +1,4 @@
 DIST jlj_2.12.tar.gz 32480 BLAKE2B 9d0cc73a1c75c5ca2e856593ed5ae19d694cfc4b4c91d19ceac17604709bb887464ffde712c7fb0f243f240585f5d2321cdf8552494d118bff10e63c240d1877 SHA512 e0d14520c584ca6bca473286cadef46c7deefc47d48fc39e3bd61e01189fe445a9452406a3aec1ed05d9d44925042589cc1396991b56f02018ea01df11ab8594
-EBUILD jlj-2.12-r1.ebuild 620 BLAKE2B fa8a66ede2819967d0925e0702653aa868c314a5de9c448308dc0e935313e0b18393766ec60537b738a4cfbae030318add6ae550a516d332f5f8693aea005f15 SHA512 10b20e57d26cdb266926287fa8133ee9c39a0b37490f33a4be592c9f32075f87fe91d029178cc6b0629d28252218186106d180dbd7bead92052d3dd35f43ced3
+EBUILD jlj-2.12-r1.ebuild 619 BLAKE2B 8c24f6b97638a29fc4dcc09559bcbe7f08597ae61b62959b1b227b2bc3d301503940178f6f217aaa48e394defa696a849c6bb8ec4a1157d591418d57fbfc27a7 SHA512 70157f8584fc7d8eaee361a73a6c5936a013292186a353c6caa165c11cf6240945214acd2a7604652d48f124e8eabf0e156bba1900d8ef435e074c2dceeb0300
 EBUILD jlj-2.12.ebuild 638 BLAKE2B 60a4956223b340af24a7aca3f29cb99a1d88abc8d53bbf48832edcfcc25c8f236b6cd242e0a9b165ef6cf2336c932b2b8206cb5e8077fdabcbf2a724af758326 SHA512 5e5c77c5b0ada7710b47cc15a71598d1c20fe155ceb9b06392e7708d7667607a56e05b3f54d3d18f30539b85d0b788c3af772bcca4d359ebfca79ef6ae1334e5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/jlj/jlj-2.12-r1.ebuild b/net-misc/jlj/jlj-2.12-r1.ebuild
index 5534c8e01b5a..caaba49b41ec 100644
--- a/net-misc/jlj/jlj-2.12-r1.ebuild
+++ b/net-misc/jlj/jlj-2.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ HOMEPAGE="http://umlautllama.com/projects/perl/#jlj"
 SRC_URI="http://umlautllama.com/projects/perl/${PN}_${PV}.tar.gz"
 
 LICENSE="freedist"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
 SLOT="0"
 
 DEPEND="dev-lang/perl"
diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest
index 098db834cff0..a5e257650d7c 100644
--- a/net-misc/minissdpd/Manifest
+++ b/net-misc/minissdpd/Manifest
@@ -1,5 +1,7 @@
 AUX minissdpd.confd 487 BLAKE2B aeb624644debe2e9ba438f9839f526fc9411e6f4d355bf46764c5b7b59a62776c16c93d4112821159835e9d9f174f2af443c0d07a10823b41182910d12899947 SHA512 5ac723cb5b3d3f8bb97989cffb174f22566fcebff304e40f12ca5144cfa94b00614fdf6925e2c5a1dd0f8fa533aac12e991bad0d0909cbdd90a9b7ed73e0c296
 AUX minissdpd.initd-r2 1522 BLAKE2B 35bde96e182529f0dd10ec4081c495ba1f52706dc191e29fa99ebb7d37b302578e492f705d4f724744ec3a9ca455730f01294e2a781529c3750193fd8e84cf50 SHA512 6d14fa0730b4c1f0e6a6765c80250ebd01d69c6fd3341049fae276a3d0ae2ec806cdfeb3b7897be0b62e426c7c9d7fb59514a0d67bb751a2e41f9b9616cc9ade
 DIST minissdpd-1.5.20180223.tar.gz 36179 BLAKE2B 0668862848e8d3f87b151e84e3fbea39a593556b4c9a3800ab7b534228a5af2c7cb20ad183e99f95d9616d306cc5aabdc379521bfb19a5e25a63fe0d81d816d7 SHA512 2564aa91ad54da392ca305a59b3eeab9b4c0a8504c674fc0c34d387560b239ea03c988e667fa3100b2b01e6916dc8e00ddc161fd6f652912a37b4b879b54dfbd
+DIST minissdpd-1.5.20190210.tar.gz 37227 BLAKE2B a273c35bb332e50f5c528cc395b257de7761fbec2cdef910018b0c751026ca4f3fc9fce60485c4209488574d3130a3c8a6d2755ae4114d2f4e2c0316491be021 SHA512 1902c3c396cdcec90af0638305224f77871bd7f70057ac8a1ff59b3ab6da168ee17eb52a5bee87eb85c8d759d02112225876e38c254ad521396eca9c4884686c
 EBUILD minissdpd-1.5.20180223.ebuild 679 BLAKE2B ac75807e2d3a75b631af3ce3d90674e37cbe61a94fffc5e72bf5bf50f9f420d7d95b895c90035d081e83863082416f37f0d129199c9a941dcf644e99ffe9401d SHA512 c4d8bf10a23fdee9575f802b362ec59c8b20b805a37f2bf8a278555e11861632a92b89a688ab92d0ffbd250441b8ae5d5b3be937ff20b326f7a6266b65af5251
+EBUILD minissdpd-1.5.20190210.ebuild 676 BLAKE2B 1d2e443df9406d31e7942c150b430eee7c68e3550f434b8fc4732db1c593335266864408ae93bb669d769dcfc83a9a1524d234a5bafca2446fc06fab63cb410d SHA512 f3429b14b6e2e7d019c582e7354f073159526299c3638e20622a5030cc49a2756d098356facd4974be82f14260e84775fd598e23ad05a0b2ce49c4728a94550e
 MISC metadata.xml 360 BLAKE2B 7e083fa0362b52310ab298a0684308dbe220a6f6acb7b99c99cf6bf22cb9406da9d34e021a367d50eaefa67f133c5b57f01d4b63aa46887ea15bf4c66ad5e5e4 SHA512 fbf209d07841a834e1d216090879be7a1e739f7ddd1e649d40d24aabe8782d2ed55a37fe8525453cb96137f1c76044087a6b435c786877349bbe939485d7b855
diff --git a/net-misc/minissdpd/minissdpd-1.5.20190210.ebuild b/net-misc/minissdpd/minissdpd-1.5.20190210.ebuild
new file mode 100644
index 000000000000..35c0a1f9b2be
--- /dev/null
+++ b/net-misc/minissdpd/minissdpd-1.5.20190210.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit toolchain-funcs
+
+DESCRIPTION="MiniSSDP Daemon"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+HOMEPAGE="http://miniupnp.free.fr/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-libs/libnfnetlink"
+
+RDEPEND="$DEPEND
+	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	emake PREFIX="${ED}" install
+	# note: we overwrite upstream's init.d
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	dodoc Changelog.txt README
+	doman minissdpd.1
+}
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 3ed240cdd923..eb0a669a7fa9 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,5 +1,7 @@
 AUX miniupnpd-conf.d-r1 301 BLAKE2B 90ead95141ec0ef6591113a352a6a1341496f273d33c5d8ba66756349af8e7b9e1d8dc1b1ec585e32c3c783d9d9ecc456383375527f14c1d48bebfb170eabacd SHA512 47ab1626f5102e26ef8788bb5f90138d178a798c106e377139453d80e687b61bea1262a8429b39fa6f2dee5fc5f112628e580975d8e2e5ab40d43473d38a6c5b
 AUX miniupnpd-init.d-r1 659 BLAKE2B fc2cfeabf10b4e163ea47fb5ba814df0a52a181380bc6c8485daf007a40a352d413833586ea537195bd87e5303a262363bbf71ec71119280329a4996d2a08342 SHA512 11b05eb9d33afbce7b1bee1bf0159875ee0dfb52048aa4f379a0d21b117b04cf0775885d06cc24735d46611aae4a78cc66ba19cf3d8f7db3611909a565e75771
 DIST miniupnpd-2.1.20180706.tar.gz 233675 BLAKE2B 641be6dc6a32383a02711139ac56236dc285041f2bda595a909ed5281a5163d1300212892e011f6256c6cf73b877f0e5e2e93efbfb08a77b0ae7d3dde94c28f6 SHA512 90881e08754f9fe3d1ef01da1fe437626d1fef09bea5eab9c1bcf3347e1197038ab87de8c7c454083ba90a86760230a323a6c293307b0fcecefbd5cfb658d227
+DIST miniupnpd-2.1.20190210.tar.gz 235093 BLAKE2B d86b4a73ebfe6b5f3665b92624e7eac36718fffea058c0e7d2cb4af2c0871534c7f7ec56ade6c3cb2e13215a77971173259f912efd61a37e41d0f2f0a4596e5c SHA512 d664d5f61a0e2e71086aa520cb91af9f7f9b8b34268a76d570bbca271d86eab4976655a1fec1d21be80a93e357a0cb185281037604a0cfc00e4944d8e8b6f664
 EBUILD miniupnpd-2.1.20180706.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899
+EBUILD miniupnpd-2.1.20190210.ebuild 1468 BLAKE2B d87f2996fd275ffd8b07fe1d499b5eb20904e62eb8f9314301c0c795fe320849704753ed2d97f7d99e55ccfcdb4ba532a98e58c8973a7eeff9277495f923609d SHA512 3dc192b52abcf760418086ca69c92a1170211a1f50d75e6739661ba20bcde6f590b87f2e36c6de81e3b262f5259b61b232f1b66111f583fd53c7eeea44edc722
 MISC metadata.xml 923 BLAKE2B e7b26fae1c4f3f67ae6a3a7da57607cdca2c2999174c35ddf9db972d4871eacac116a4c0f068e4be467c9670294de7ec797a64b06106a54f986336bb111b0c38 SHA512 8e6c396f3601ccbba09e16cd48b0432616d692700b4b402484d4c592101f71a4434772efe63a4e9a2887d00e39eda9865173d74930aa6f792c61eb24b847af69
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190210.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190210.ebuild
new file mode 100644
index 000000000000..673b340fb090
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.1.20190210.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
+
+RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
+	net-libs/libnfnetlink:=
+	net-libs/libmnl:=
+	dev-libs/gmp:0=
+	sys-apps/util-linux:=
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+	sys-apps/lsb-release"
+
+src_prepare() {
+	default
+	mv Makefile.linux Makefile || die
+
+	# Prevent gzipping manpage.
+	sed -i -e '/gzip/d' Makefile || die
+}
+
+src_configure() {
+	local -a opts
+	opts=(
+		--vendorcfg
+		$(usex igd2 '--igd2' '')
+		$(usex ipv6 '--ipv6' '')
+		$(usex leasefile '--leasefile' '')
+		$(usex portinuse '--portinuse' '')
+		$(usex pcp-peer '--pcp-peer' '')
+		$(usex strict '--strict' '')
+	)
+
+	emake CONFIG_OPTIONS="${opts[*]}" config.h
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/net-misc/ndisc6/Manifest b/net-misc/ndisc6/Manifest
index 7432b8b5acd4..c59abd2e7190 100644
--- a/net-misc/ndisc6/Manifest
+++ b/net-misc/ndisc6/Manifest
@@ -10,5 +10,5 @@ EBUILD ndisc6-0.9.9-r2.ebuild 677 BLAKE2B c1696f8497970344334d894e848547c44ac0fc
 EBUILD ndisc6-0.9.9.ebuild 659 BLAKE2B ca4ea1607a560892ca4b60cf638342b5fb2869cc2d70bd6ca0472b4867c69109e73d014c6d9be98544765ef842fc2eab297f5c4ae57453044bf86a0ad305d816 SHA512 f7894a6e9393d68148617a88bd0887a2f306d7f22c6016b8a45a9c6b54d70dcd11c6871633398c3ef3e934ad894ca8ceb5b1c44f5e7106cc83912eb34b05fbb9
 EBUILD ndisc6-1.0.2-r1.ebuild 737 BLAKE2B 1ca4cb82d5a13a8cee418e9dd2d7fccce1f3eb7592e75eb2381e5b1f3046a89b106aca57dc0591759b6f9cb8ecab70aea5f1ec232e4307920855eb9f752bd25f SHA512 c4e35cb157782390e5a3262ecb4d84e939286ad9b4445e5a5e24a3377b6636cb41c3bf78dcc64531e702cc2527021c3f7bf2e49bedff7c4a5c2258a90a01447e
 EBUILD ndisc6-1.0.2.ebuild 677 BLAKE2B c1696f8497970344334d894e848547c44ac0fcdaffdabbf126bf5fb0f784723fc3edd5d3875d8e0e7e5806eaef50d713b6508d96461748195c164eaa0ecc2713 SHA512 9693cf1e1ed83b3d7565b54466c97f761946b5213857e1b016ff9d72a0c8bee04bff38ae83bcd53210e7e6b8fbeea7903904a63f06717a51d1aefb9e796251f4
-EBUILD ndisc6-1.0.3.ebuild 748 BLAKE2B 913515d07f3b59b71dbbf90e7953c88cbce6bf8f071f15402b239d30ad5d1d15ce0fb6f37b382d6fbf257e2394b1419fc236c92cfc0590144298b89a45ebe2a1 SHA512 82d281e2825a20cfe41154ecddf8e2ea039b747a0fa3b4a73de25ac0809aa438e2e539d9dfd51a0de3327caa227f6f0c4aa5d233ac3fdb6d27f654d3ccb77832
+EBUILD ndisc6-1.0.3.ebuild 744 BLAKE2B 4589ff21a50c5ba6d0fb2f5e4d29cf41764705ddd7daa31fd0c4aa48a7b05bc2cd9c53a0fb295750bc5f8d1c3985e7241236524ba4effd61ad925f0b91666a4f SHA512 19bd5cd374849fdaa6e28b6a2f6f74ef0e66c4c510d13d9aaf4488bf6c7d80aa1e3fe13213f720de013e3cbf80d1a7d638ce5f5456635e752640ea855a7042cb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/ndisc6/ndisc6-1.0.3.ebuild b/net-misc/ndisc6/ndisc6-1.0.3.ebuild
index acde018f8899..511a76c11558 100644
--- a/net-misc/ndisc6/ndisc6-1.0.3.ebuild
+++ b/net-misc/ndisc6/ndisc6-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm x86 ~x64-macos"
 IUSE="debug"
 
 DEPEND="dev-lang/perl
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index 88625864c49e..0fc7a5db730d 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,3 +1,5 @@
+DIST NetworkManager-openvpn-1.8.10.tar.xz 564540 BLAKE2B e117395b91efbd0ee10bdefe0aaff8a39fdd1fe232dc1543224be7dfd9bb18729ad873091301e6348f8955f28579e106f5565c7138309571e06598aa35dc5bba SHA512 f710848fccf21ac4554a2b46e80cf890c011edc6d64d9a49d6d8669f3ff71f7990e11e6f4681bb85d30238ec05f2fc79c4619983f6860c6ab0d714f941a3dfcc
 DIST NetworkManager-openvpn-1.8.8.tar.xz 562748 BLAKE2B 8c75d30a8865d41cd564e719f08522482b0d6901a8e812dec5f5b9fd8c8c2839663d078148e9d505ee7b7fc6e5c96fda8c3c0a0390837211a1fe9689f01fd27d SHA512 8ed7612bcf727b540a74807ccc7ea7460dba3923a052e8716338bf2c852b6c027fd7547793af1b032a3c2348f9ffc579d1071aad2833baa37784bb5a17af1574
+EBUILD networkmanager-openvpn-1.8.10.ebuild 1258 BLAKE2B 334b88266da2b346eebfd686aa7424b4053af457cc8df1fba239b9dcaad9c6cb90e8c3f0f43903623483ab1f57fb2a4cba0639f3ac4a87ad68e883c6877b14bf SHA512 c5197fde17bf0c7b0ae8800b572924a6af6953413e17497337b076a6d9ea00b733c38ede20751231dd0657139962df4ef6e66f38060f9aeea74d5ce7245c004d
 EBUILD networkmanager-openvpn-1.8.8.ebuild 1256 BLAKE2B edd6d769382e025e7d94e15fb8ea95914b8876147579535dca3734f78789072b0ad9003b6129a92940f06ef3656aa62fa986cbf83b5804ac91b667d38bedde06 SHA512 8cb666f9966fdc926aed39483f3ae052dcb6151f2bbdb6861c4ac56804a1733b355ab2f73e9ba175129c0223324d5cd7a2471e70345bc83455513597ae5161aa
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.10.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.10.ebuild
new file mode 100644
index 000000000000..be8cb945aed3
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.10.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2 user
+
+DESCRIPTION="NetworkManager OpenVPN plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk test"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=net-misc/networkmanager-1.7.0:=
+	>=net-vpn/openvpn-2.1
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=gnome-extra/nm-applet-1.7.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	enewgroup nm-openvpn
+	enewuser nm-openvpn -1 -1 -1 nm-openvpn
+}
+
+src_prepare() {
+	# Test will fail if the machine doesn't have a particular locale installed
+	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
+	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
+		-i properties/tests/test-import-export.c || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --localstatedir=/var needed per bug #536248
+	gnome2_src_configure \
+		--localstatedir=/var \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome)
+}
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index 93c045116689..9814492a9dc4 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -3,8 +3,10 @@ DIST ofono-1.16.tar.xz 854296 BLAKE2B 4ee8f895e21903b8181fe14f5a91fea466eb3a2f66
 DIST ofono-1.20.tar.xz 935448 BLAKE2B 751f6c340cf95dd4ab6f3d17f81a967406b3f6cc4d6024435aba1e663a220a47d14f04d62b765205bf04f11a9b5b0075501dbbaaa22f9380ffb0ef3a78fce5ec SHA512 8dc86654ae8a1dc1761c95df5f0de55566db20012e523f11bcd5ab5e1540f4cd9fc7bd6bf1665dcbeb31f2925f9322c21fd05fb00034e408b5d85b265e2fe840
 DIST ofono-1.23.tar.xz 978472 BLAKE2B 0bd0b7921df075f0ea35d61d4ea852dad0bc752802263f8525e697f3b23e555488116918fed8f143c95ae6fc919515cbb06d0644f7119225076d1fe7c5be1f52 SHA512 103dc28f9a6c583804884bdb891424eb53323b5edf764edd6c64e0b6c76ee6ea063c6a1d1d36a35d4ae6740e00479e2fc0abc6fca1dc92b916e166d48a1642fd
 DIST ofono-1.24.tar.xz 980644 BLAKE2B 74974ab104cc31a67ec04c62149e282de5295573e1b236b39da8005721c8277a0636fd290aaa3c6380eb117364d2098af856f22ce9f6d41af599c5bf78bf98b1 SHA512 d3148df4bcac60c0f12bc4665e170e92d35473a7ff9fc516bd6a3c35c3e9b6f9beadc624ac9bbdfb9de2876e4ab417d857bd52b27a634f433f3607a7e11381c3
+DIST ofono-1.28.tar.xz 1016308 BLAKE2B 0aec5bc6c845c0906548f62bda95bfee5ca5ef17bc2defd60fe4b0967b9f58fcbbbfeb9593aa33f6852360266ea4ea025a87a07ac95ef50829b592accfb5bc72 SHA512 963471fac89db746d0e99fee805413342203be0d200bc14f0e56c5ec3053e25ea8112943657c88c57c539ae485ac11eb5f80052aad12443c248888f6e6a4114e
 EBUILD ofono-1.16.ebuild 1610 BLAKE2B 4da501cec1347a1a745732f2ad1a8db28234eab5c828be18a1d493ee83a18dac95dbb0588fd9b56b7d06e54054d8e5134ca3dcdd123d959038955b6327c86ad1 SHA512 b3bd40291d278fe831a1aa4d50ca7c6a79ab32f61f6b54a961e80b4929b620b17344c76c4d1e555a110f51036231c5b4d1af2a7e1c77736e06129b1909c8de24
 EBUILD ofono-1.20.ebuild 1668 BLAKE2B 45171e8d0582a35853b59a39eee4e42471d83ad0416144695442ed3a5a4ed766d87caaf6fcac2b529a2579dd178c9f63baa9dca86db083aeaccd066915c1296e SHA512 7bc146aa1ca4fe35a1899ea724c1e44cc42badc9e9e91c69e3a7ef01fbbf8e47be69a9b1e5e1074c5327d2e807a33f4388ca2d43dd0bf56164be55b402607a75
 EBUILD ofono-1.23.ebuild 1668 BLAKE2B 45171e8d0582a35853b59a39eee4e42471d83ad0416144695442ed3a5a4ed766d87caaf6fcac2b529a2579dd178c9f63baa9dca86db083aeaccd066915c1296e SHA512 7bc146aa1ca4fe35a1899ea724c1e44cc42badc9e9e91c69e3a7ef01fbbf8e47be69a9b1e5e1074c5327d2e807a33f4388ca2d43dd0bf56164be55b402607a75
 EBUILD ofono-1.24.ebuild 1668 BLAKE2B 45171e8d0582a35853b59a39eee4e42471d83ad0416144695442ed3a5a4ed766d87caaf6fcac2b529a2579dd178c9f63baa9dca86db083aeaccd066915c1296e SHA512 7bc146aa1ca4fe35a1899ea724c1e44cc42badc9e9e91c69e3a7ef01fbbf8e47be69a9b1e5e1074c5327d2e807a33f4388ca2d43dd0bf56164be55b402607a75
+EBUILD ofono-1.28.ebuild 1631 BLAKE2B e26874eb6c985a5086848b05f1fe1b5a74e0ea57eeea9ca154a7fd2b2977bb0e0b400399f6809e9817eb45182f9b51560bbdc1bf74759b6ec798280cb56b76c2 SHA512 9b1876aff74fda25f6f61842e7a97e97ca06530c759e2ef00e88632db6f88738d0540993866445bd09910eb6953b055469a2dca635c7a536c4fdea723e1b3953
 MISC metadata.xml 951 BLAKE2B fd63ccff3b96dea1e770b7ec50c1a9e5e583fe81bcb2ca9c1915386a4fbd85a30c806f9ac3e163b1110e93b44f6714c555cee9273ecf90d5a9f9e209f0774897 SHA512 26f8b8b3ac43991d14534b4b1257a5c4dc1dd0eaca83c9f30aab74bbc721d9573e93e8f245a4ac2d0805ea9325aa759ca144951fef1b158b0b68f54df4df3e7e
diff --git a/net-misc/ofono/ofono-1.28.ebuild b/net-misc/ofono/ofono-1.28.ebuild
new file mode 100644
index 000000000000..ca819ad691d5
--- /dev/null
+++ b/net-misc/ofono/ofono-1.28.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib systemd
+
+DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
+HOMEPAGE="https://01.org/ofono"
+SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower"
+
+REQUIRED_USE="dundee? ( bluetooth )"
+
+RDEPEND=">=sys-apps/dbus-1.4
+	>=dev-libs/glib-2.32
+	net-misc/mobile-broadband-provider-info
+	bluetooth? ( >=net-wireless/bluez-4.99 )
+	udev? ( virtual/udev )
+	examples? ( dev-python/dbus-python )
+	tools? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS )
+
+src_configure() {
+	econf \
+		$(use_enable udev) \
+		$(use_enable isimodem) \
+		$(use_enable atmodem) \
+		$(use_enable cdmamodem) \
+		$(use_enable datafiles) \
+		$(use_enable dundee) \
+		$(use_enable bluetooth) \
+		$(use_enable phonesim) \
+		$(use_enable provision) \
+		$(use_enable qmimodem) \
+		$(use_enable tools) \
+		$(use_enable examples test) \
+		$(use_enable upower) \
+		--disable-maintainer-mode \
+		--disable-rilmodem
+		--localstatedir=/var \
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	default
+
+	if use tools ; then
+		dobin tools/auto-enable \
+			tools/huawei-audio \
+			tools/lookup-provider-name \
+			tools/lookup-apn \
+			tools/get-location \
+			tools/tty-redirector
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	use doc && dodoc doc/*.txt
+}
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 57da30e4811f..8d58a64afefb 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -4,11 +4,13 @@ AUX rabbitmq.service 314 BLAKE2B 5489ba8c773f7eccf335d34e3ead22f240fc12e1d089f33
 DIST rabbitmq-server-3.6.14.tar.xz 1508216 BLAKE2B 1ca3f933e91ce204cc90df7df619742e6d42e211b6350c629015a15a0ea6cdad05ad1e0139db5b2f1f353f314d1709ba468112a4059c6894ef9fb454fd616cf2 SHA512 22874b81fcebfd954e5ee8f4701bd8743bbc9559c1a1c09f8de03e16039153aa6e6b0bea71067770913493299e57da6b3928ff0ade4ee9ffb5ea48a30a154d9f
 DIST rabbitmq-server-3.6.9.tar.xz 1422316 BLAKE2B 08f88cf3b592c2fecf3e2a9c7f9a4a2997f7bea6f14a2d72cb42ad8d3254b2bcd32b0605c7687eeae8e1c39a6d3ad1776f89e84292d508903b956ec05f6cd858 SHA512 a003d2343c97e546ac01a5aadc46e94e2dbcc78349072b362950e5c5e11229e2a6fc4020d281f9fbb5cc0f577d2a166ef09671e931ec1470ab2edcdd98443662
 DIST rabbitmq-server-3.7.10.tar.xz 2569968 BLAKE2B 90a0162c9e573f1b99526c7a6cdec38061c3e6f355377b51b920a62b0d61c5f13a21b69d627b49c4c6702e517dfba4c856664e9741d9ad2d21171a3b46770799 SHA512 092df82ac00397fc90ecd69c712985f055ec25fd0ba427fce9330df75f5fe6d788aabc9e25ccbf63c8c3cbe111816a226fb63479a16d8530a53b23ab23b2598e
+DIST rabbitmq-server-3.7.11.tar.xz 2593632 BLAKE2B 4455b47a36ed4b642f0c30a34d018f76ade7153ec8eb872728f0b6baf6d431dbac71b3e27e2661924155950836be80faee23d4fd663d0f852740c143ac24658c SHA512 a54034ebc919be0c6f58832ea5d47f8e3964e30ca9185c59bf882c3dc17d1df5b6e1ab0460f75e8cf0cc325504cc3a674f7cb44a5d7613e16a5ad8b721a286a4
 DIST rabbitmq-server-3.7.3.tar.xz 7382708 BLAKE2B 66d4c2fcb80ba5a851fb5d2bee91d41b04a05e70e74ac2b3adae8aebcaaa01de7ca47772c38deb4e9c25c19f67c2bbd6c4fb3b71480d73986540c60ab6dac02c SHA512 337edddceb66c44b5cc3cec710918385306d9db97ae340752bc39a1be39229a58b3bb1c96763a2ce441a6d46135f2aac8cec09fc33591d0e14e7571c9507d79b
 DIST rabbitmq-server-3.7.9.tar.xz 2551456 BLAKE2B b64037481254f39300fecf53c1f8eda69df3fdc92bbacc6f6edc9d89e167e4cdd0708482b0daf680366986a28f4a3562d4af7dcf427604acc79145d24ca41bd2 SHA512 4a9fd452ad878f20c3a269d2dc0fa63ef7dcf99d2ee1ca46ff693df8d92ae0ef5a05453a6aaaeb00db643b2209770b15216fdff109f27d1e531e363a99bd4a2a
 EBUILD rabbitmq-server-3.6.14.ebuild 2865 BLAKE2B 64a85b0d626e222182a167c5edff69e55802c4a2261a4507a6164dc57cf0d36dddc4db58d3c3aa47152557cbc3bec84fe6701a438ed735ab4b4597ed0f25519c SHA512 bd84518cdee06f69be05ef141ff6d10ffaca2312410621ed35508315878ae7dcbd5ae17f654dd539b6dbd7e0a46850fdbbb3c444564357a352e175107f814ffd
 EBUILD rabbitmq-server-3.6.9.ebuild 2860 BLAKE2B 51d41a29be6986157954f3b675e31b9d813baeff9023c6f6c31ec104039ee2544bd1216ffbed27e0b69437dbe5f396a864fa18b789d33d5f9d8702a32aed4cdd SHA512 17951e227b45b1230bae2992b3f4530e7c2e7dabd62cfd8c9950254cdf0633dace11b45da1ff34934adac1a365032d72e87adf3ad64051e3942d1077b9b59303
 EBUILD rabbitmq-server-3.7.10.ebuild 2999 BLAKE2B 3f7d5a6d6aab697c89b1c36d787f1946bb1a847e5a4301929c945b1c233a8e6b810cae0105563f5c9bdd2a7be3d35936ae7466f80d817e75abccc72471b3372d SHA512 6dc7e5e2e7943f223c0582f837b76a57e9fde6efc9e42e5e40f78d6a29bfeb26d4993793779d10806d67bc1822a5856e5a844e7a4bdca8e1445a3ae54ec7c494
+EBUILD rabbitmq-server-3.7.11.ebuild 2999 BLAKE2B 980260cd0d5f3a86641da078cc3bdad1a7d33a12b201395ddb6742558d849d5d974117c2e0802064d5b64aed93c13ae200e52fa01c7991a3d03b8b8589fa463e SHA512 2e3ffe2ac09747b4c352263d692342d6c4f8dbe1f3a7e88f5808afc4fa7fbaec34bc1723fcd51ffebaa05f48ce5aff54400d142bbf794d33a02e58e652bf9fd5
 EBUILD rabbitmq-server-3.7.3-r1.ebuild 2978 BLAKE2B 1e52884869bea88c8128249c395226fa4b67ffa574b23ee0dd336d6c59f0af050139617a0688e4875cb0633d9032898a7b754f57be37f6977ffccfd8e9d5d3a1 SHA512 5d2d9fe18a2a4a03521b47ede6209791871d361dd00448a2c668a9740dfca834246d4af1b01bf4dd35d1198a3c7359ff911cbdad9c0a4a77e39a2e560d900704
 EBUILD rabbitmq-server-3.7.9.ebuild 2995 BLAKE2B 78f3dab75df9ac4c5f7ca74920678e841cacc5633163e4e2a6478a7a53337417dccae86784132cdeaf922cb6d4bdc4c2de683a966aef4ab7615350aecb67f2aa SHA512 c42215c89935baaf78cb0fcc6c438b8e6552317b9af0f13e4f3daee581f25a3ff346f7027fb5469ae751dac0d10094c0298345c07bf91282463b6fce1b5f96f2
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.11.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.11.ebuild
new file mode 100644
index 000000000000..55f6a5f7e57c
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.11.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 systemd user
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
+HOMEPAGE="http://www.rabbitmq.com/"
+SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
+
+LICENSE="GPL-2 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+
+RDEPEND=">=dev-lang/erlang-20.3[ssl,smp]"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	>=dev-lang/elixir-1.6.6
+	<dev-lang/elixir-1.7.0
+	dev-libs/libxslt
+	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
+"
+
+pkg_setup() {
+	enewgroup rabbitmq
+	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
+	python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake all docs dist
+}
+
+src_install() {
+	# erlang module
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+	einfo "Setting correct RABBITMQ_HOME in scripts"
+	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+		-i deps/rabbit/scripts/rabbitmq-env || die
+
+	einfo "Installing Erlang modules to ${targetdir}"
+	insinto "${targetdir}"
+	doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include deps/rabbit/priv plugins
+
+	einfo "Installing server scripts to /usr/sbin"
+	rm -v deps/rabbit/scripts/*.bat
+	exeinto /usr/libexec/rabbitmq
+	for script in deps/rabbit/scripts/*; do
+		doexe ${script}
+		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
+	done
+
+	# install the init script
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
+	systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+	# install documentation
+	dodoc deps/rabbit/docs/*.example
+	dodoc deps/rabbit/README.md
+	doman deps/rabbit/docs/*.5
+	doman deps/rabbit/docs/*.8
+
+	# create the directory where our log file will go.
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/log/rabbitmq /etc/rabbitmq
+
+	# create the mnesia directory
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/lib/rabbitmq{,/mnesia}
+}
+
+pkg_preinst() {
+	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "RabbitMQ is now running as an unprivileged user instead of root."
+		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
+		elog "Please run the following commands as root:"
+		elog
+		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
+		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
+		elog
+	elif has_version "<net-misc/rabbitmq-server-2.1.1"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "Please read release notes before upgrading:"
+		elog
+		elog "http://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+	fi
+	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
+		elog
+		elog "This release changes the behaviour of the default guest user:"
+		elog
+		elog "http://www.rabbitmq.com/access-control.html"
+	fi
+}
diff --git a/net-misc/ser2net/Manifest b/net-misc/ser2net/Manifest
index ceeabe263cd9..326557a04591 100644
--- a/net-misc/ser2net/Manifest
+++ b/net-misc/ser2net/Manifest
@@ -4,7 +4,7 @@ AUX ser2net.initd 1528 BLAKE2B 509df2c77f6c8495a669aaf017c9809f342ec9bb50033461f
 DIST ser2net-2.10.0.tar.gz 364322 BLAKE2B db041297069ea0a111ed73d6b1fc8a639971f113952fbcd499a81671bbd873ee3e1724146bfb5c6975d1812acd8e545e9df2bde445f4a86af57a0ae5b9b19ec1 SHA512 dd3e37619b10d8bf20d738e90c253bc2d109e0a57ee9f3a8b2a85a69399afa5a8459a4602b2856f0b655427023a36c78330851bf7f8d8da0f28d1fe22c1d5e10
 DIST ser2net-2.7.tar.gz 355064 BLAKE2B 682210619b26d6d34b8ad26559fc20f73febdf8c106afa7cd64c272af5ed9353186db2dcc899f58cd93ae82f5df45b66d025c3f3e88cee0ae1a25252e5be2d8a SHA512 39ee99031fad45ea8eeeb9e8bec343e8d6bd58c818f56ec01a05c50ef6d8ed845c6521a6d4a306671ed26959bd2df5c0b29a6b4399103815923cf958c1891c16
 DIST ser2net-2.9.1.tar.gz 357820 BLAKE2B 2068d9aabad23e647d71baa2951ebf882e2575e457606b15c18ac8a2cf5ea55a251f19b553fe926f37ace51de4b4d33de4a32a0ebd5f33a88c0a231f5e1c6ed0 SHA512 9fd0efc853993b70c0c632a7059df7a04c832f85491194c49dd8b384e1bb1a576ed9cfe28088cc181a2f7084c88dc6ef6dabbc4ead5ad9339a7becebaa6fb8e7
-EBUILD ser2net-2.10.0.ebuild 624 BLAKE2B 915b33a1be0ce0d363b88affa4b1019bbb06e6e8d406c5d6bb65b5663fe4201b8d6249ad46f2303bc7557b8e67ec4cea4af28b0c1322ff005acdc0fefe3489b4 SHA512 42276201d860557ac7594d2b0732a4ba3966629dfd51cf87653d3cbdc303e45bb295d7a6572f56f5ccdf1159c68448c05dc7be7eb3033ca7eb6bdca9a745a0e8
+EBUILD ser2net-2.10.0.ebuild 622 BLAKE2B 22edbf4209bf735f55b5c31adef27d77e82b11ddaa9cd1e19c274d47e498d84d71767d93b8889a9b45ff515343614d797230222e8fb79bdb7c80e830718a2991 SHA512 9d6f473e03ec1d181dceb261e98324db26a1cc78006ba8c66e74bb733115bd1db3cec19fcb8986323aeeba7fecdeb874d727c51624fb42064dd62649d61cdb1b
 EBUILD ser2net-2.7-r1.ebuild 847 BLAKE2B e3fc02c86a660671e5767c89296ea2852a68db014552ef12a6b01b79f6119c1e83f1c901ad78eeb84255e2332f7dd4beed1e25620a2243726c8173ec2b500aae SHA512 f2acf54587c7791b9516db5488eaef6f5fba022a5d43ab6451dae3fda14a190dde790eba2ebce0d1bac488eeb4a90e0496663b243f19d80b5422a3f9583a7345
 EBUILD ser2net-2.9.1.ebuild 626 BLAKE2B 4a8ceeb1f02be88b95ce5e62feb0170d74043a3abfcac79242b373b25aa3a14ac52c8446fbf4509ef0ec5a18b933980a0f5954c48d71ce0e2196c0e4837b2ff2 SHA512 5c401b1795a2b2a46af9af947891702d1074a8edc6f3e252874531b8325d1a0474871e5f35a2c3684a4d311c06cda74fa57ffc66594fcd7c7d010e52e8ae90c3
 MISC metadata.xml 244 BLAKE2B 31c4948eba2d8d59d90f9f49328291d0d678db43eadabae9c482ccc82e2343160809308451a5f014180a4e017eb85afd24e64b6f630219987b3bbb4df45fd170 SHA512 c026f437d46c264d228d51fe7e6d9fa32e7647aad09124fdb77b2c602885609135c63f2b8fae8092b5c68ba62cf4bda87bc3c321f2918bc2f3e77c4fb42a10c0
diff --git a/net-misc/ser2net/ser2net-2.10.0.ebuild b/net-misc/ser2net/ser2net-2.10.0.ebuild
index f0ce78d33a8b..e7f143006002 100644
--- a/net-misc/ser2net/ser2net-2.10.0.ebuild
+++ b/net-misc/ser2net/ser2net-2.10.0.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Serial To Network Proxy"
 SRC_URI="mirror://sourceforge/ser2net/${P}.tar.gz"
 HOMEPAGE="https://sourceforge.net/projects/ser2net"
 
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/net-misc/spread/Manifest b/net-misc/spread/Manifest
index c7361b130af7..28cb9031e900 100644
--- a/net-misc/spread/Manifest
+++ b/net-misc/spread/Manifest
@@ -1,6 +1,10 @@
 AUX spread.init.d 519 BLAKE2B cc0795f77e5b94ebecdd178beb487555a039b8679a8cdd0edbcc54c1b0faa6bd52f481fc11e58ee98f0a6b8c6432d8fe79c1a2791093a6a8430ec49a3706fe58 SHA512 20852b8fe9b14a1b3cde97683042060382f7a66c28e2072ede63bca9752cd0c4307e5aad689b3274018cf83b0918d0418a99b162af67a332ecc0d90d0deb475a
 DIST spread-src-4.1.0.tar.gz 641060 BLAKE2B a1f8f0c943385cd23301faf9f00553a922919fa50113789ce1c8a028d83645bc7fb32fd7e6e21f6073bfc32476c7dd28b885435285f9ac8bab0b3ea6e2949779 SHA512 6db3cf9760d483685bd23d32760f52b9af667fcf98341fad198b0831cc41cc839998dee59dee04426bf4db15700656fe90f4f457e2a3c6e449eb51b07fc18a6d
 DIST spread-src-4.3.0.tar.gz 745113 BLAKE2B 06fc28a0535fcf61e4dae8cb45ad0f5b4ba70cf12835966bebb27a635736764fdd33d24e6e7fe1433240fb9f6c6e9338631108a93cf9e21b2c58691f09c4e156 SHA512 7eb87e896a623accfe3f36c44ba55f8258d078ff9cdc141509456af4a069802f087edaeafcd356791337dbfb4d4f67b808a482ea54ac58aef8fb980cdbc6fea6
+DIST spread-src-4.4.1.tar.gz 760038 BLAKE2B 250e6347695f5f6e8047bf527c92baa3cfb6c44ce88ea08ff6ab066b937fab29531743133e73e155a5cc07109b1942efe46fd1d3b74202264a2e8ef0f518a0ad SHA512 19f3fe897e4a4bd68dffc7d28d7b99826bbcbb5c2f44eb18127ed486063594bfd788c03c8c338b9b329302659325fa84a9cbfee3f202a9970afb1a560bb6f496
+DIST spread-src-5.0.1.tar.gz 803058 BLAKE2B b115675cb8ad89bfda7921d7ede0d168bfa833297a13cf5bba866505813fc255d3585b4a02e51409acda73597803ac691b0b6d329b189405004fce5505af7f1c SHA512 f57dbabb6e4d343434fe1c48bb8868cf601e22c599a520521a23c6dfa215b1d835fb2a7dc3b7cf124352060d12566c5f64114544428cc5a95e7899208379b115
 EBUILD spread-4.1.0-r1.ebuild 733 BLAKE2B e3faae9209052b879a673e42cff6d9831c06ceb8fef38a462268d9e61208883bd7e84b89d14ae9453bc34b27cb8adf5856f43aa558ea2916899962ab5929e897 SHA512 feffbcb7c76c5faf979e00a224c4487cc64dc754a27a4b6ea62335eac68e1a6ddcf8ff0acb7bc3e7996fff1f0dcfe8ddc7bc24f359c0f9109f4f31be0f1f556c
 EBUILD spread-4.3.0-r1.ebuild 712 BLAKE2B 5d0a5152a6778cff67be57e6bb75beb428d4b140551b82c9af99b12def13f5404d2dc571d431586cf8843b4198ce038d8f10d0a2fa09cead496fdc3d271f82f9 SHA512 4469a47c5ab38f67812df29aa559461b8cf79d98fa27519ddc179434c626507b38f580477d7b851829dd7e1850cf00dd645b966320cde66902ced1e3efa87c5b
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD spread-4.4.1.ebuild 703 BLAKE2B a06866661e1bba22c60437c70f2d78939cf868ebf75cb4f7552ac30b062ab449e4ccd4f59d4ab3c803d2ff0fbc2217564807d44d4200924ce10e0a1298cadd28 SHA512 bb618e00444c2d02c096d3c98eb97216307fa626059ed3c5750a775e9aa14bd918f7562d865092234f562b9cdbcb4b4a71bf3a28a64950b94149a7d04964984f
+EBUILD spread-5.0.1.ebuild 703 BLAKE2B a06866661e1bba22c60437c70f2d78939cf868ebf75cb4f7552ac30b062ab449e4ccd4f59d4ab3c803d2ff0fbc2217564807d44d4200924ce10e0a1298cadd28 SHA512 bb618e00444c2d02c096d3c98eb97216307fa626059ed3c5750a775e9aa14bd918f7562d865092234f562b9cdbcb4b4a71bf3a28a64950b94149a7d04964984f
+MISC metadata.xml 245 BLAKE2B 922e349900957e202d9925c3b56ddbc4e93034b041d2d500a4f85b60a78f34089bae6ab910423c336af01717f3a3c6003ebbcb6f51d0d7e1a07574e70e7cfe86 SHA512 4706a02393a13e76abffdbffc63ca8bcc70dd9d7145241e0469ab0511df26bf7d6be8d31fdabff7916d23ab1dc886e3d9886551d8ad80074488a31d02952ad16
diff --git a/net-misc/spread/metadata.xml b/net-misc/spread/metadata.xml
index 6f49eba8f496..269a11fe6430 100644
--- a/net-misc/spread/metadata.xml
+++ b/net-misc/spread/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>kumba@gentoo.org</email>
+		<name>Joshua Kinard</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/spread/spread-4.4.1.ebuild b/net-misc/spread/spread-4.4.1.ebuild
new file mode 100644
index 000000000000..b7526d4dcd16
--- /dev/null
+++ b/net-misc/spread/spread-4.4.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit user
+
+MY_PN="spread-src"
+
+DESCRIPTION="Distributed network messaging system"
+HOMEPAGE="http://www.spread.org"
+SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="Spread-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_setup() {
+	enewuser spread
+	enewgroup spread
+}
+
+src_prepare() {
+	default
+
+	# don't strip binaries
+	sed -i -e 's/0755 -s/0755/g' daemon/Makefile.in examples/Makefile.in
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
+	newinitd "${FILESDIR}"/spread.init.d spread
+}
diff --git a/net-misc/spread/spread-5.0.1.ebuild b/net-misc/spread/spread-5.0.1.ebuild
new file mode 100644
index 000000000000..b7526d4dcd16
--- /dev/null
+++ b/net-misc/spread/spread-5.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit user
+
+MY_PN="spread-src"
+
+DESCRIPTION="Distributed network messaging system"
+HOMEPAGE="http://www.spread.org"
+SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="Spread-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_setup() {
+	enewuser spread
+	enewgroup spread
+}
+
+src_prepare() {
+	default
+
+	# don't strip binaries
+	sed -i -e 's/0755 -s/0755/g' daemon/Makefile.in examples/Makefile.in
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
+	newinitd "${FILESDIR}"/spread.init.d spread
+}
diff --git a/net-misc/stargazer/Manifest b/net-misc/stargazer/Manifest
index 065e57d23158..a57146e32206 100644
--- a/net-misc/stargazer/Manifest
+++ b/net-misc/stargazer/Manifest
@@ -5,22 +5,22 @@ AUX mans/sgconf.1 2870 BLAKE2B 91049e1706bb9667ea294fe986c1fcef1669a8b7a8221b7ae
 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 4759 BLAKE2B e005bc1a6099737664375462c65fc37f975d768d9e6a66b603771bebab93dec230bbed16ca8056a549f48431aef60f55d5c5fa1b366c9ffe828836a90b143178 SHA512 76cd10b98db0c70f989b5f498a13c7baacac3e2a0b6bc0b1449d34789a94317b2576bfb96d48ee567480ce98783c758920a7f3004990f487592fc8a7e8bcd7df
-AUX patches/stg-2.408-build.patch 4220 BLAKE2B c59e87b3936e099f9685ce08943dfab8ced13020d4f30dd5e92ec083c7b6d564790b481301eb1e38022483b85b9a54bf58ebaf79e81bb6becee66c33fd23973b SHA512 98b3824b379aa8c9febf4e0907135ad072844cfea63541e3384e99cd47f6d0a9457e376d1658fb146196ea6ee397dcf7e715abb9bb1a279d209866735974448f
-AUX patches/stg-2.408-correct-paths.patch 6489 BLAKE2B 80efb968f432d4e25aaaf4b9fc1c0c0dbfdb4dc4110e03b75356f924762abe93a6dde411c6344f56ecc267c5f72da6b4044a3c804720ddcebab73557999c37ff SHA512 e400b4d5ba4bb7305557aaba29fae7415d8bde0343a695ac7e979839549b843cf90a0d19e598f050d08282d717ed3b46e4e5572d4be6b295ce88e962ac6966d3
+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 396 BLAKE2B 25e1565b2a85211763d342f347638b665404db8ce0883e05db7b269f2534a3f202347f08d91ae9a1bde683c435ee2969af246be408ef6425c155b1159c0a7a70 SHA512 c7a3cf5a4f9ace4aa7293c56530207827b390aed6aee7cafd38ca50502c47ade22020dbdc096dea3971551f0507910f8d5051dee7ba4d7fc14366cb2f765de76
-AUX patches/stg-2.408-makefile.patch 8499 BLAKE2B 851c8a686df81027cf35424dab4c0e8f0bcd22a93d287c8dcd90a727b3845e5d6ae2fb20373383fbac7293df8061225fcc742ee21b1a999a6c56ac98f052f6b1 SHA512 5d4ad2104710d3c6a7bd8bc48d8c71c20b68f14aff7017606a028d55003344832d47d9e28853b595581863b4128c312e971cdea260515269d9c8cf1e693dacab
-AUX patches/stg-2.408-on-upstream.patch 5160 BLAKE2B 4ba7913f2feb53667783a73e4c608a101910ec858d4e755e24f2898f1bbb4735714ced247b9d5ec531fc1686bed52b235984a435660570c1af8e4ea3960d5245 SHA512 9b83b8e744b246c391abbaad49226b5ccade1395ce2d6eb8573bd13e3e3d1dcdb4b4611a0625ad5a426d9859b09913c6af050161c739a7a63c24bb7ce71f406b
-AUX patches/stg-2.408-radius-upstream.patch 861 BLAKE2B b22f61d03debaa2b9ce1a2a9668f8e6324627a17dcacb84054ac50f43b299e144e1d03a8ed03bbc4b51c50e924e7f996c5ccf54b047814cdb66625937d995d0b SHA512 2c59de06ede39e6987d1235fd423e9d42a2d2a0cdcbe291b28c567d1bcd34243753243faedab8e9cf987e7bbb1dabbc2afc2d7757fd50f0f4170c724f16dd4ef
-AUX patches/stg-2.408-rscriptd-upstream.patch 1103 BLAKE2B fabe5da8b7618b1b22d3f407c70a2f1b04d71b30b47e048a6e77f07315a34d562f3fe6382bf78dd738225ad061637257c1b833f2139751ad4bea8d9777c01d0c SHA512 397240006551501ec3b8829e967a9191e813f1299abd7108d8effc9c11e9ac048a091f77961c348a7878ffe475af3a612cf82aa9d804d3206411b610191bbde9
-AUX patches/stg-2.408-rscriptd.conf-upstream.patch 2515 BLAKE2B 6be62ae8d150f2094eb5c90bf3b5b3d2a1cf3442c14453749cb7c9483772f8d141ed71ac45c120018c76562838deefb2801eb89550bf3b3c5c1bc43396601f21 SHA512 4b2da01d05d07e62bc9c5d002c4a7bc190958e59236c03dde49238ac4e23dfc8e4e67a323ac12c2f89872285506614d3bb127cf3f4873df095c1579f441aa73c
-AUX patches/stg-2.408-sgauth.conf-upstream.patch 2382 BLAKE2B 10820a1254294169305900650a617da14d58f1674606619308925517f829068f4faabfe6b6b1421c087a0bb6662b45427594e27a4649d44c0e1bf9e6c4ca271b SHA512 2875f9b719a2058d435220016bb83b2b30fba9c927b9d1f06b5bfd5149fad213e312106e8de3c1cdedc9c3dd8178d6a1944327f0f9635a57cee329a623946d39
-AUX patches/stg-2.408-sgconv-upstream.patch 1542 BLAKE2B 5fe304dfdc7b91d1513d03d0a7dd14d2672ac6ab45a362018da2c6e7508952c7e50e6e993a060986d3b93826ce18276cccc6029ab498f735b7c7b926fb370d86 SHA512 bc25e9b682ae33ceec30edef35c62e90fc24cdd8c891397193c2aa041557f7e7071abe998ec77291401953899da4a817a269e825be5b5cb552e83c34ac026d70
-AUX patches/stg-2.408-static-libs.patch 194 BLAKE2B fc6d01a0125b2c26712a1741e7d240dd82da50ab48ff9e7098baacc14c2333d308decc77dce5a57f29df0f75d1bda78c5c7b60bd60a421b8cb443df3fe23dca4 SHA512 f6961a429bf4c23ec17935a8568acfccdcecb7e646aa6a607177cbf95fd20b6169d17713e8a0649ff164eb5b34c11bebe94cd252ccdac8577025859aa2c0fca9
+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.ebuild 19983 BLAKE2B f6b68aa085104310f82c6461763ae12b4d891f1355c151a11cd3e6e807e2b9a26c1c4f7842a443f436afd620aef4c8cccd33dad6c851b0b2e45a6dc060269795 SHA512 a385d94e92c6407230dbe57f23830f19561561625d97d5c1c0d3c8db533693aa1241b84c509e4bab25d83bc3965a2dbbaa7e862a6a5eccb45eeb6a9fd705fc70
-MISC metadata.xml 4383 BLAKE2B 0e840802cac1aa54489d9bb240268747c5999907589493a3d19f9530746da10800b20b3229a1e58097e649a8b095bec2e384faa6f17a9850572ca45372838b9f SHA512 7dd2c022fd3b70e063ed9d513e1a148183be4a288ba22ef5b081f3fac35847d8d38f64262ff1ac2a274e24e2ef6331cadb3c8a364366657331911a03f5163de1
+EBUILD stargazer-2.408-r1.ebuild 17363 BLAKE2B 46d7f71b58eb45e764684fd4e4653b4827024090543a91225d4bb88d7739d2f4238c0d4ba13ab76cdbf23c25787c79203672e67a41fac73c5ab55917d2ffc0a9 SHA512 095507ed18283cc13121c11910dd13fc9a344e540d9cb9ca7eaa10a5a8e67c67ff98aabbbe816f2ca7d9fe6881da0f2a151b7d28abeab81e0773069a926918de
+MISC metadata.xml 4163 BLAKE2B 8b56f499cd2f996cef1d15ff7f01dffaa6f76577ac437b7e040a5b8c49272b2eed8f680d6f2ed8c9e2512326971aa5e5a66b06f408341af7add6caa076c74e9f SHA512 60e4a6fc5304feb38c6ccc5fa3dc69df9c600289a65779d6d957b0252262a371c1cca02ae51f4538c7d4d006d0b03040a18a478011a31656562d2e36fce668fa
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
index c8b73d85a63a..6f2c43e74988 100644
--- a/net-misc/stargazer/files/patches/stg-2.408-build-upstream.patch
+++ b/net-misc/stargazer/files/patches/stg-2.408-build-upstream.patch
@@ -1,5 +1,5 @@
---- projects/rlm_stg/build.org	2013-01-15 15:25:59.000000000 +0200
-+++ projects/rlm_stg/build	2013-01-15 19:48:13.000000000 +0200
+--- 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
@@ -30,8 +30,8 @@
  fi
  
  CXXFLAGS="$CXXFLAGS -I/usr/local/include"
---- projects/rscriptd/build.org	2013-01-15 18:28:32.000000000 +0200
-+++ projects/rscriptd/build	2013-01-15 18:38:13.000000000 +0200
+--- 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
@@ -61,8 +61,8 @@
  fi
  
  CXXFLAGS="$CXXFLAGS -I/usr/local/include"
---- projects/sgauth/build.org	2013-01-15 18:29:20.000000000 +0200
-+++ projects/sgauth/build	2013-01-15 18:36:33.000000000 +0200
+--- 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
@@ -92,8 +92,8 @@
  fi
  
  CXXFLAGS="$CXXFLAGS -I/usr/local/include"
---- projects/sgconf/build.org	2013-01-15 18:29:59.000000000 +0200
-+++ projects/sgconf/build	2013-01-15 18:35:41.000000000 +0200
+--- 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
@@ -123,8 +123,8 @@
  fi
  
  CXXFLAGS="$CXXFLAGS -I/usr/local/include"
---- projects/sgconf_xml/build.org	2013-01-15 18:30:26.000000000 +0200
-+++ projects/sgconf_xml/build	2013-01-15 18:34:53.000000000 +0200
+--- 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
@@ -154,8 +154,8 @@
  fi
  
  CXXFLAGS="$CXXFLAGS -I/usr/local/include"
---- projects/sgconv/build.org	2013-01-15 18:31:01.000000000 +0200
-+++ projects/sgconv/build	2013-01-15 18:32:46.000000000 +0200
+--- 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
@@ -180,8 +180,8 @@
  
  if [ "$sys" = "Linux" ]
  then
---- projects/stargazer/build.org	2013-01-15 19:48:54.000000000 +0200
-+++ projects/stargazer/build	2013-01-15 19:51:13.000000000 +0200
+--- 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"
  
diff --git a/net-misc/stargazer/files/patches/stg-2.408-build.patch b/net-misc/stargazer/files/patches/stg-2.408-build.patch
index 380b4cbe91f2..9d42a0487d88 100644
--- a/net-misc/stargazer/files/patches/stg-2.408-build.patch
+++ b/net-misc/stargazer/files/patches/stg-2.408-build.patch
@@ -1,5 +1,5 @@
---- projects/rlm_stg/configure.org	2013-01-18 18:06:17.000000000 +0200
-+++ projects/rlm_stg/configure	2013-01-18 18:07:18.000000000 +0200
+--- 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
@@ -24,8 +24,8 @@
 -
 +echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
 \ No newline at end of file
---- projects/rscriptd/configure.org	2013-01-18 18:07:28.000000000 +0200
-+++ projects/rscriptd/configure	2013-01-18 18:08:02.000000000 +0200
+--- 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
@@ -51,8 +51,8 @@
 -
 +echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
 \ No newline at end of file
---- projects/sgauth/configure.org	2013-01-18 18:08:10.000000000 +0200
-+++ projects/sgauth/configure	2013-01-18 18:08:38.000000000 +0200
+--- 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
@@ -77,8 +77,8 @@
 -
 +echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
 \ No newline at end of file
---- projects/sgconf/configure.org	2013-01-18 18:08:46.000000000 +0200
-+++ projects/sgconf/configure	2013-01-18 18:09:44.000000000 +0200
+--- 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
@@ -104,8 +104,8 @@
 -
 +echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
 \ No newline at end of file
---- projects/sgconf_xml/configure.org	2013-01-18 18:09:54.000000000 +0200
-+++ projects/sgconf_xml/configure	2013-01-18 18:10:23.000000000 +0200
+--- 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
@@ -131,8 +131,8 @@
 -
 +echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
 \ No newline at end of file
---- projects/sgconv/configure.org	2013-01-18 18:10:30.000000000 +0200
-+++ projects/sgconv/configure	2013-01-18 18:11:09.000000000 +0200
+--- 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
@@ -161,8 +161,8 @@
 -
 +mkdir -p ../stargazer/modules
 \ No newline at end of file
---- projects/stargazer/configure.org	2013-01-18 18:11:15.000000000 +0200
-+++ projects/stargazer/configure	2013-01-18 18:11:40.000000000 +0200
+--- 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
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
index 82698af5b6f7..520d635d69c6 100644
--- a/net-misc/stargazer/files/patches/stg-2.408-correct-paths.patch
+++ b/net-misc/stargazer/files/patches/stg-2.408-correct-paths.patch
@@ -1,5 +1,5 @@
---- projects/rscriptd/rscriptd.conf.org	2013-01-08 18:19:34.000000000 +0200
-+++ projects/rscriptd/rscriptd.conf	2013-01-08 18:20:52.000000000 +0200
+--- 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
@@ -34,8 +34,8 @@
  
  ################################################################################
 \ No newline at end of file
---- projects/sgconv/sgconv.conf.org	2012-12-18 21:56:33.578221904 +0200
-+++ projects/sgconv/sgconv.conf	2012-12-18 21:58:22.355217059 +0200
+--- 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
@@ -80,8 +80,8 @@
  
      # Database username
      # Parameter: required
---- projects/stargazer/inst/linux/etc/stargazer/stargazer.conf.org	2012-12-30 14:35:22.000000000 +0200
-+++ projects/stargazer/inst/linux/etc/stargazer/stargazer.conf	2012-12-30 14:36:37.000000000 +0200
+--- 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
@@ -100,8 +100,8 @@
  
  # Defines message maximum lifetime
  # Note: 0 - unlimited
---- projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf.org	2012-12-25 14:03:49.000000000 +0200
-+++ projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf	2012-12-25 14:04:00.000000000 +0200
+--- 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
@@ -111,8 +111,8 @@
  
      # The password to encrypt packets between the stg-server and remote server
      # Parameter: required
---- projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_files.conf.org	2012-12-25 13:31:01.000000000 +0200
-+++ projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_files.conf	2012-12-25 13:31:43.000000000 +0200
+--- 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
@@ -148,8 +148,8 @@
      UserLogMode = 640
  
  </StoreModule>
---- projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_firebird.conf.org	2012-12-25 13:39:00.000000000 +0200
-+++ projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_firebird.conf	2012-12-25 13:39:28.000000000 +0200
+--- 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
@@ -159,8 +159,8 @@
  
      # Database username
      # Parameter: required
---- projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp.org	2012-12-31 11:08:26.000000000 +0200
-+++ projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp	2012-12-31 11:08:41.000000000 +0200
+--- 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()
@@ -170,8 +170,8 @@
          .socketFd(fd)
          );
  
---- projects/stargazer/inst/var/00-base-00.sql.org	2013-01-02 16:22:28.000000000 +0200
-+++ projects/stargazer/inst/var/00-base-00.sql	2013-01-02 16:22:52.000000000 +0200
+--- 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';
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
index 81f46f4a3bfe..166f12aff2a9 100644
--- 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
@@ -1,5 +1,5 @@
---- projects/stargazer/plugins/store/firebird/Makefile.org	2013-01-04 22:50:13.000000000 +0200
-+++ projects/stargazer/plugins/store/firebird/Makefile	2013-01-04 22:50:56.000000000 +0200
+--- 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
diff --git a/net-misc/stargazer/files/patches/stg-2.408-makefile.patch b/net-misc/stargazer/files/patches/stg-2.408-makefile.patch
index 81772d6641fe..6cb2a6c2dc50 100644
--- a/net-misc/stargazer/files/patches/stg-2.408-makefile.patch
+++ b/net-misc/stargazer/files/patches/stg-2.408-makefile.patch
@@ -1,5 +1,5 @@
---- projects/sgauth/Makefile.org	2013-01-05 23:47:38.000000000 +0200
-+++ projects/sgauth/Makefile	2013-01-05 23:48:34.000000000 +0200
+--- 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:
@@ -11,8 +11,8 @@
  
  uninstall: uninstall-bin uninstall-data
  
---- projects/stargazer/Makefile.org	2013-01-05 22:53:26.000000000 +0200
-+++ projects/stargazer/Makefile	2013-01-05 22:54:52.000000000 +0200
+--- 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
@@ -44,8 +44,8 @@
  
  uninstall: uninstall-bin uninstall-data
  
---- projects/rscriptd/Makefile.org	2013-01-19 17:03:42.000000000 +0200
-+++ projects/rscriptd/Makefile	2013-01-19 17:04:25.000000000 +0200
+--- 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
  
@@ -67,8 +67,8 @@
  endif
  
  uninstall: uninstall-bin uninstall-data
---- projects/rlm_stg/Makefile.org	2013-02-03 14:02:58.000000000 +0200
-+++ projects/rlm_stg/Makefile	2013-02-03 14:05:43.000000000 +0200
+--- 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
  
@@ -89,8 +89,8 @@
  	$(MAKE) -C $(DIR_LIBSRC) install
  
  uninstall: uninstall-bin
---- projects/rscriptd/Makefile.org	2013-02-03 14:17:01.000000000 +0200
-+++ projects/rscriptd/Makefile	2013-02-03 14:17:32.000000000 +0200
+--- 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
  
@@ -103,8 +103,8 @@
  	$(MAKE) -C $(DIR_LIBSRC) install
  
  install-data:
---- projects/sgauth/Makefile.org	2013-02-03 14:18:37.000000000 +0200
-+++ projects/sgauth/Makefile	2013-02-03 14:18:48.000000000 +0200
+--- 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
  
@@ -117,8 +117,8 @@
  	$(MAKE) -C $(DIR_LIBSRC) install
  
  install-data:
---- projects/sgconf/Makefile.org	2013-02-03 14:19:18.000000000 +0200
-+++ projects/sgconf/Makefile	2013-02-03 14:19:28.000000000 +0200
+--- 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
  
@@ -131,8 +131,8 @@
  	$(MAKE) -C $(DIR_LIBSRC) install
  
  uninstall: uninstall-bin
---- projects/sgconf_xml/Makefile.org	2013-02-03 14:19:53.000000000 +0200
-+++ projects/sgconf_xml/Makefile	2013-02-03 14:19:59.000000000 +0200
+--- 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
  
@@ -145,8 +145,8 @@
  	$(MAKE) -C $(DIR_LIBSRC) install
  
  uninstall: uninstall-bin uninstall-data
---- projects/sgconv/Makefile.org	2013-02-03 14:20:24.000000000 +0200
-+++ projects/sgconv/Makefile	2013-02-03 14:20:33.000000000 +0200
+--- 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
  
@@ -159,8 +159,8 @@
  	$(MAKE) -C $(DIR_PLUGINS) install
  
  uninstall: uninstall-bin
---- projects/stargazer/Makefile.org	2013-02-03 14:20:56.000000000 +0200
-+++ projects/stargazer/Makefile	2013-02-03 14:21:30.000000000 +0200
+--- 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
  
@@ -173,8 +173,8 @@
  	$(MAKE) -C $(DIR_INCLUDE) install
  	$(MAKE) -C $(DIR_LIBSRC) install
  	$(MAKE) -C $(DIR_PLUGINS) install
---- stglibs/Makefile.in.org	2013-02-03 14:53:02.000000000 +0200
-+++ stglibs/Makefile.in	2013-02-03 14:53:11.000000000 +0200
+--- 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 *.*~ 
  
@@ -187,8 +187,8 @@
  	mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/include/stg
  	install -m $(DATA_MODE) -o $(OWNER) $(addprefix include/stg/,$(INCS)) $(PREFIX)/usr/include/stg/
  
---- projects/stargazer/plugins/Makefile.in.org	2013-02-03 15:38:41.000000000 +0200
-+++ projects/stargazer/plugins/Makefile.in	2013-02-03 15:38:51.000000000 +0200
+--- 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)
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
index 4afbb0340253..64a5964a8e0a 100644
--- a/net-misc/stargazer/files/patches/stg-2.408-on-upstream.patch
+++ b/net-misc/stargazer/files/patches/stg-2.408-on-upstream.patch
@@ -1,5 +1,5 @@
---- projects/stargazer/inst/linux/etc/stargazer/OnChange.org	2013-01-09 14:30:32.000000000 +0200
-+++ projects/stargazer/inst/linux/etc/stargazer/OnChange	2013-01-09 15:50:01.000000000 +0200
+--- 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
  
@@ -28,8 +28,8 @@
 +# Usage examples:
 +#echo "User: '$LOGIN'. Parameter $PARAMETER changed from '$OLDVALUE' to '$NEWVALUE'" >> /var/stargazer/user.change.log
 \ No newline at end of file
---- projects/stargazer/inst/linux/etc/stargazer/OnConnect.org	2013-01-09 14:39:51.000000000 +0200
-+++ projects/stargazer/inst/linux/etc/stargazer/OnConnect	2013-01-09 15:11:49.000000000 +0200
+--- 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
  
@@ -66,8 +66,8 @@
 +# 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
---- projects/stargazer/inst/linux/etc/stargazer/OnDisconnect.org	2013-01-09 14:54:36.000000000 +0200
-+++ projects/stargazer/inst/linux/etc/stargazer/OnDisconnect	2013-01-09 15:11:33.000000000 +0200
+--- 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
  
@@ -104,8 +104,8 @@
 +# 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
---- projects/stargazer/inst/linux/etc/stargazer/OnUserAdd.org	2013-01-09 15:01:57.000000000 +0200
-+++ projects/stargazer/inst/linux/etc/stargazer/OnUserAdd	2013-01-09 15:10:55.000000000 +0200
+--- 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
  
@@ -130,8 +130,8 @@
 +# Usage examples:
 +#echo "Added user $login" >> /var/stargazer/add_del.log
 \ No newline at end of file
---- projects/stargazer/inst/linux/etc/stargazer/OnUserDel.org	2013-01-09 15:12:32.000000000 +0200
-+++ projects/stargazer/inst/linux/etc/stargazer/OnUserDel	2013-01-09 15:14:10.000000000 +0200
+--- 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
  
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
index 790cc3a91e1e..553b31999277 100644
--- a/net-misc/stargazer/files/patches/stg-2.408-radius-upstream.patch
+++ b/net-misc/stargazer/files/patches/stg-2.408-radius-upstream.patch
@@ -1,5 +1,5 @@
---- projects/rlm_stg/Makefile.org	2013-01-18 16:17:18.000000000 +0200
-+++ projects/rlm_stg/Makefile	2013-01-18 16:19:13.000000000 +0200
+--- 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:
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
index 4e97da2f80e3..708c1d900627 100644
--- a/net-misc/stargazer/files/patches/stg-2.408-rscriptd-upstream.patch
+++ b/net-misc/stargazer/files/patches/stg-2.408-rscriptd-upstream.patch
@@ -1,5 +1,5 @@
---- projects/rscriptd/Makefile.org	2013-01-18 16:22:46.000000000 +0200
-+++ projects/rscriptd/Makefile	2013-01-18 16:25:08.000000000 +0200
+--- 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
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
index 21746e59e8d1..6b606353e224 100644
--- 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
@@ -1,5 +1,5 @@
---- projects/rscriptd/rscriptd.conf.org	2013-01-12 15:44:46.000000000 +0200
-+++ projects/rscriptd/rscriptd.conf	2013-01-12 15:45:44.000000000 +0200
+--- 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
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
index 213d35fd2db7..d18c041cbdc3 100644
--- 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
@@ -1,5 +1,5 @@
---- projects/sgauth/sgauth.conf.org	2013-01-08 15:43:09.000000000 +0200
-+++ projects/sgauth/sgauth.conf	2013-01-09 13:41:53.000000000 +0200
+--- 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
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
index cfce675b1287..f1cdf5c5e83a 100644
--- a/net-misc/stargazer/files/patches/stg-2.408-sgconv-upstream.patch
+++ b/net-misc/stargazer/files/patches/stg-2.408-sgconv-upstream.patch
@@ -1,5 +1,5 @@
---- projects/sgconv/Makefile.org	2013-01-08 12:07:06.000000000 +0200
-+++ projects/sgconv/Makefile	2013-01-08 12:07:11.000000000 +0200
+--- 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
@@ -9,8 +9,8 @@
  
  SRCS = ./main.cpp \
         ./settings_impl.cpp
---- projects/sgconv/build.org	2012-02-09 12:26:57.000000000 +0200
-+++ projects/sgconv/build	2013-01-08 12:10:02.000000000 +0200
+--- 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 
@@ -27,8 +27,8 @@
  echo "#############################################################################"
  
  STG_LIBS="logger.lib 
---- projects/sgconv/settings_impl.h.org	2013-01-08 12:11:53.000000000 +0200
-+++ projects/sgconv/settings_impl.h	2013-01-08 12:11:58.000000000 +0200
+--- 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 {
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
index 723d177ac79a..68f16d41647d 100644
--- a/net-misc/stargazer/files/patches/stg-2.408-static-libs.patch
+++ b/net-misc/stargazer/files/patches/stg-2.408-static-libs.patch
@@ -1,5 +1,5 @@
---- stglibs/Makefile.org	2013-01-19 18:21:57.000000000 +0200
-+++ stglibs/Makefile	2013-01-19 18:24:25.000000000 +0200
+--- 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
diff --git a/net-misc/stargazer/metadata.xml b/net-misc/stargazer/metadata.xml
index bfed7e617ab5..5d46368a3e84 100644
--- a/net-misc/stargazer/metadata.xml
+++ b/net-misc/stargazer/metadata.xml
@@ -1,52 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>spiderx@spiderx.dp.ua</email>
-    <name>Vladimir Pavljuchenkov</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <longdescription>
-    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="doc">Adds extra documentation (API, doc, etc).</flag>
-    <flag name="examples">Install examples, usually source code.</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>
-    <changelog>http://stg.dp.ua/server_dl.php</changelog>
-    <doc>http://stg.dp.ua/doc.php</doc>
-    <bugs-to>mailto:faust@stg.dp.ua</bugs-to>
-  </upstream>
+	<maintainer type="person">
+		<email>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+	</maintainer>
+	<maintainer type="project">
+		<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-r1.ebuild b/net-misc/stargazer/stargazer-2.408-r1.ebuild
new file mode 100644
index 000000000000..18d197b3ccb1
--- /dev/null
+++ b/net-misc/stargazer/stargazer-2.408-r1.ebuild
@@ -0,0 +1,538 @@
+# Copyright 1999-2019 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 user
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+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:= )
+	sgconf? ( dev-libs/expat )
+	sgconf_xml? ( dev-libs/expat )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+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 group 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_setup() {
+	# Add user and group to system only when necessary
+	if use sgconv || use rscriptd || use sgauth || use stargazer ; then
+		enewgroup stg
+		enewuser stg -1 -1 -1 stg
+	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/stargazer/stargazer-2.408.ebuild b/net-misc/stargazer/stargazer-2.408.ebuild
deleted file mode 100644
index 112fde0575b7..000000000000
--- a/net-misc/stargazer/stargazer-2.408.ebuild
+++ /dev/null
@@ -1,558 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils linux-info multilib user
-
-DESCRIPTION="Billing system for small home and office networks"
-HOMEPAGE="http://stg.dp.ua/"
-LICENSE="GPL-2"
-
-MY_P="stg-${PV}"
-SRC_URI="http://stg.dp.ua/download/server/${PV}/${MY_P}.tar.gz"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="stargazer? ( ^^ ( module_store_files module_store_firebird module_store_mysql module_store_postgres ) )"
-
-RDEPEND="module_config_rpcconfig? ( dev-libs/xmlrpc-c[abyss] sys-libs/zlib )
-	module_config_sgconfig? ( dev-libs/expat )
-	module_store_firebird? ( >=dev-db/firebird-2.0.3.12981.0-r6 )
-	module_store_mysql? ( virtual/mysql )
-	module_store_postgres? ( dev-db/postgresql dev-libs/openssl sys-libs/zlib )
-	sgconf? ( dev-libs/expat )
-	sgconf_xml? ( dev-libs/expat )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-libs/libxslt )"
-
-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"
-)
-
-IUSE="sgconv radius rscriptd sgauth sgconf sgconf_xml stargazer debug doc examples static-libs"
-
-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() {
-	# Patches already in upstream's trunk
-	# Rename convertor to sgconv to avoid possible file name collisions
-	mv "${S}"/projects/convertor/ "${S}"/projects/sgconv/ || die "Couldn't move convertor folder"
-	mv "${S}"/projects/sgconv/convertor.conf "${S}"/projects/sgconv/sgconv.conf || die "Couldn't move convertor config"
-	epatch "${FILESDIR}"/patches/stg-2.408-sgconv-upstream.patch
-
-	# Fix dependency on fbclient for module_store_firebird
-	epatch "${FILESDIR}"/patches/stg-2.408-makefile-firebird-upstream.patch
-
-	# Debug support. Install radius lib to /usr/lib/freeradius
-	epatch "${FILESDIR}"/patches/stg-2.408-makefile-build-upstream.patch
-
-	# Don't compile sgconv always with debug. Remove MAKEOPTS=-j1
-	epatch "${FILESDIR}"/patches/stg-2.408-build-upstream.patch
-
-	# Rewrite config for rscriptd
-	epatch "${FILESDIR}"/patches/stg-2.408-rscriptd.conf-upstream.patch
-
-	# Rewrite config for sgauth
-	epatch "${FILESDIR}"/patches/stg-2.408-sgauth.conf-upstream.patch
-
-	# Standardization of 'On-scripts'
-	epatch "${FILESDIR}"/patches/stg-2.408-on-upstream.patch
-
-	# FreeBSD install directory
-	epatch "${FILESDIR}"/patches/stg-2.408-radius-upstream.patch
-
-	# Install demo scripts for rscriptd
-	epatch "${FILESDIR}"/patches/stg-2.408-rscriptd-upstream.patch
-
-	# Fix crush on stop
-	epatch "${FILESDIR}"/patches/stg-2.408-fix-crash-on-stop.patch
-
-	for project in ${PROJECTS} ; do
-		# Rename build script to configure for further econf launch in every projects
-		mv "${S}"/projects/${project}/build "${S}"/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" \]/' "${S}"/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
-	epatch "${FILESDIR}"/patches/stg-2.408-correct-paths.patch
-
-	# Correct target install-data for stargazer, rscriptd, sgauth, remove debug symbols stripping
-	epatch "${FILESDIR}"/patches/stg-2.408-makefile.patch
-
-	# Remove make from script (for keeping symbols), always add variable to Makefile.conf for all projects
-	epatch "${FILESDIR}"/patches/stg-2.408-build.patch
-
-	# Remove static-libs if not needed
-	use static-libs || epatch "${FILESDIR}"/patches/stg-2.408-static-libs.patch
-
-	# Define which module to compile
-	for module in ${!MODULES[@]} ; do
-		if ! use $module ; then
-			sed -i "s/${MODULES[$module]%:*}//" "${S}"/projects/stargazer/configure || die "sed for module configure failed"
-		fi
-	done
-
-	# Correct Gentoo init script provided by upstream (TODO: Remove in further releases, already fixed in upstream's trunk)
-	if use stargazer ; then
-		sed -i 's/opts/extra_commands/' "${S}"/projects/stargazer/inst/linux/etc/init.d/stargazer.gentoo || die "sed for stargazer failed"
-	fi
-
-	# Correct Gentoo init script dependencies
-	if use module_store_files ; then
-		sed -i '11d' "${S}"/projects/stargazer/inst/linux/etc/init.d/stargazer.gentoo || die "sed for module_store_files failed"
-	fi
-
-	if use module_store_firebird ; then
-		sed -i '11d;s/need net/need net firebird/' "${S}"/projects/stargazer/inst/linux/etc/init.d/stargazer.gentoo || die "sed for module_store_firebird failed"
-	fi
-
-	if use module_store_mysql ; then
-		sed -i '11d;s/need net/need net mysql/' "${S}"/projects/stargazer/inst/linux/etc/init.d/stargazer.gentoo || die "sed for module_store_mysql failed"
-	fi
-
-	if use module_store_postgres ; then
-		sed -i '11d;s/need net/need net postgresql/' "${S}"/projects/stargazer/inst/linux/etc/init.d/stargazer.gentoo || die "sed for module_store_postgres failed"
-	fi
-
-	# Check for IPQ subsystem availability
-	( use module_capture_ipq && kernel_is ge 3 5 ) && die "IPQ subsystem is gone since Linux kernel 3.5. You can't compile module_capture_ipq with your current kernel."
-
-	epatch_user
-}
-
-src_configure() {
-	# Define local variables, strip '+' symbol for used by default USE flags
-	local USEFLAGS=(${IUSE//+})
-	local PROJECTS=($PROJECTS)
-
-	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)
-
-	# Set jobs to 1 for debug build
-	use debug && MAKEOPTS="-j1"
-
-	# Build necessary libraries first
-	touch "${S}"/Makefile.conf
-	cd "${S}"/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
-
-	if use doc ; then
-		cd "${S}"/doc/xmlrpc || die "cd to doc/xmlrpc failed"
-		emake
-	fi
-}
-
-src_install() {
-	dodoc ChangeLog
-
-	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 doc ; then
-		# Install files into docs directory
-		dodoc "${S}"/projects/stargazer/inst/var/base.dia
-		dodoc "${S}"/doc/proto_client.gif
-		dodoc "${S}"/doc/proto_server.gif
-
-		# Install html documentation
-		docinto html/xmlrpc
-		dohtml -r "${S}"/doc/xmlrpc/book/
-	fi
-
-	if use examples ; then
-		# Install files into specified directory
-		insinto /usr/share/stargazer
-		doins -r "${S}"/projects/stargazer/scripts
-		doins "${S}"/doc/xmlrpc.php
-	fi
-
-	if use sgconv ; then
-		cd "${S}"/projects/sgconv || die "cd to sgconv project 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 project failed"
-
-		emake DESTDIR="${D}" PREFIX="${D}" install
-	fi
-
-	if use rscriptd ; then
-		cd "${S}"/projects/rscriptd || die "cd to rscriptd project 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 project 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 project 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 project 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 project failed"
-
-		emake DESTDIR="${D}" PREFIX="${D}" install
-
-		# Install docs
-		dodoc BUGS CHANGES README TODO
-
-		# 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/# //' > "${D}"/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
-
-		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 group for files and directories
-	( use sgconv || use rscriptd || use sgauth || use stargazer ) && fowners -R stg:stg /etc/stargazer
-
-	# 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_setup() {
-	# Add user and group to system only when necessary
-	if use sgconv || use rscriptd || use sgauth || use stargazer ; then
-		enewgroup stg
-
-		# Add stg user to system (no home directory specified, because otherwise it will be result in stg:root ownership on it)
-		enewuser stg -1 -1 -1 stg
-	fi
-}
-
-pkg_postinst() {
-	if use sgconv ; then
-		einfo "\nSgconv:"
-		einfo "----------"
-		einfo "    For further use of sgconv please edit /etc/stargazer/sgconv.conf depending on your needs."
-	fi
-
-	if use radius ; then
-		einfo "\nRadius:"
-		einfo "-------"
-		einfo "    For further use of radius, 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 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 "\n    For use RADIUS data processing you should also enable USE-flag module_auth_freeradius."
-	fi
-
-	if use rscriptd ; then
-		einfo "\nRemote Script Executer:"
-		einfo "-----------------------"
-		einfo "    For further use of rscriptd please edit /etc/stargazer/rscriptd.conf depending on your needs."
-		einfo "    You have to change 'Password' field at least."
-	fi
-
-	if use sgauth ; then
-		einfo "\nSgauth:"
-		einfo "-------"
-		einfo "    For further use of sgauth please edit /etc/stargazer/sgauth.conf depending on your needs."
-		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 of sgconf utility you should also enable USE-flag module_config_sgconfig."
-	fi
-
-	if use sgconf_xml ; then
-		einfo "\nSgconf_xml:"
-		einfo "-----------"
-		use module_config_rpcconfig || einfo "    For further use of sgconf_xml utility you should also 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 of module, emerge net-dialup/freeradius.\n"
-			use radius || einfo "\n           For use RADIUS data processing you should also 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 of module, emerge 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 through xml-based configurator,"
-			einfo "                      because module is not responding."
-			einfo "                      This bug is introduced by xmlrpc-c library. 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 of module emerge net-analyzer/net-snmp.\n"
-		fi
-
-		if use module_other_remote_script ; then
-			einfo "      * module_other_remote_script available.\n"
-			einfo "           Don't forget to edit /etc/stargazer/subnets file depending on your needs."
-		fi
-
-		if use module_store_files ; then
-			einfo "      * module_store_files available.\n"
-			einfo "           Necessary and sufficient rights to the directory /var/lib/stargazer for this backend is 0755."
-			einfo "           You may fix it if needed.\n"
-		fi
-
-		if use module_store_firebird ; then
-			einfo "      * module_store_firebird available.\n"
-			einfo "           Necessary and sufficient rights to the directory /var/lib/stargazer for this backend is 0775."
-			einfo "           Check that it was so, and fix it if needed."
-			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 -q -u <username> -p <password> -d <database> -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 -h <hostname> -P <port> -u <username> -p <password> <database> < /usr/share/stargazer/db/mysql/00-mysql-01.sql\n"
-		fi
-
-		if use module_store_postgres ; then
-			einfo "      * module_store_postgres available.\n"
-			einfo "           Stargazer 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 -h <hostname> -p <port> -U <username> -d <database> -W -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 -h <hostname> -p <port> -U <username> -d <database> -W -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. You should avoid to use it in production.\n"
-	fi
-}
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 1c50cb59d755..da7bb25925f6 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,4 +1,6 @@
 DIST streamlink-0.14.2.tar.gz 643695 BLAKE2B ea28daac32903738206226bce85a4615338b6039be1e4cce18325e977112c3301d6e6ed90d1210f4f362c898397fd980c136a98d8a0d5ff7ee2b6c5cf077f2c6 SHA512 0d9f1db32915392f9d29bcfb40743058352a924435a8ee77f1218c108e937204e88041c908d2f93546beaa70e18db62c961ea31fbdd85c5e7e4315a18118e276
+DIST streamlink-1.0.0.tar.gz 674393 BLAKE2B 091272bae71f1e89cf14872578091a01f9d05ee372d4b9379e672280735c6800a33ae198bf019fbb3e970aa060ef059e5106e1be3a20602874be6206b6303bf6 SHA512 22ba96ac0ec27fe923b99898c45548df88ed3dda3bcbcb10b55fea145e20731eb8aa3a90212a5863b4ef5a7387d4bcf3d09d447ea2789762a8cf5eaa87f263d7
 EBUILD streamlink-0.14.2-r1.ebuild 1873 BLAKE2B d65929f452d2263b895ed0fd7f0299ee045d649efff7f95e95e88460f262f5a6ca9db1ac20316704a67726e8b7c6c513a69259638f57d64e66ed01872d7068cf SHA512 98a52a9ead5700b82281343bca40bc010303e63be8961cdaa8eb29b68a328e8d233272a2b93cb6d6405a25da7b0092532011eb900c8272f591b42603ef5599f2
+EBUILD streamlink-1.0.0.ebuild 2020 BLAKE2B b54353585e6d6a9cd2b22895ba5dddaf0a516b4c7bb1e7a1c125ad2db477b1701c083f97cca83dd5db4802c5dde4d0e2561bc61134d7526112090c2e5c81ccd2 SHA512 b981253ca0f621eabe90e7e92c19f7e2f089ec215514209aaf8176daa5daa4bbdb9ae9ab2cdbc06765e6f9524c2c387864e155610898204915ebf01079ddaece
 EBUILD streamlink-9999.ebuild 1546 BLAKE2B 034d354005c4e72d769bc33de4068aa537d239050a64b83c3c260662ee1609d80a478fcb58bf42a94a50224e43a16ca2972d6ac7a2e9f31d54ddc1a643f5a235 SHA512 3c5f51958877bd15cd3c5f82c42c076bd8ff1ff52102702508d48a746b03b955520bccc14dbd13b80688f1824e68f79fb5a6fba565847a07e553bf42eb94b554
 MISC metadata.xml 330 BLAKE2B ad3caca1dc3dd2ea5915a6d14f9741ba7352d8a961939dacf89efdcae0cf1203343ca11ea230efc30cf69d359e09e7cd06218404943f8e4e3853a5c6676f7ff6 SHA512 73730cc94810711b86088a41beba0d0da4f20c4ca377c24122ebeac1ea68e712d03d0e79518df847aa15cb9d8a3f04658715f0b75dfaa1a6dfbedc0a15c33672
diff --git a/net-misc/streamlink/streamlink-1.0.0.ebuild b/net-misc/streamlink/streamlink-1.0.0.ebuild
new file mode 100644
index 000000000000..07f15c0c5a65
--- /dev/null
+++ b/net-misc/streamlink/streamlink-1.0.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE='xml(+),threads(+)'
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
+HOMEPAGE="https://streamlink.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD-2 Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+
+# >=urllib3-1.23 only needed for python2, but requests pulls some version anyways, so we might as well guarantee at least that ver for py3 too
+RDEPEND="
+	virtual/python-futures[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	>dev-python/requests-2.21.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.23[${PYTHON_USEDEP}]
+	dev-python/isodate[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-shutil_which[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2*')
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${RDEPEND}
+	media-video/rtmpdump
+	virtual/ffmpeg
+"
+
+python_configure_all() {
+	# Avoid iso-639, iso3166 dependencies since we use pycountry.
+	export STREAMLINK_USE_PYCOUNTRY=1
+}
+
+python_compile_all() {
+	use doc && emake -C docs html man
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use doc; then
+		local HTML_DOCS=( docs/_build/html/. )
+		doman docs/_build/man/*
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 6f296c3aa368..8324bd0f70f7 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -4,15 +4,12 @@ DIST teamviewer_13.1.8286_amd64.tar.xz 11574812 BLAKE2B 9941a3c1894e4b1a285ac61b
 DIST teamviewer_13.1.8286_i386.tar.xz 11422756 BLAKE2B 0bc408cbbf44bdeb84ce8c1d1274e8253ec261571670bce46130a325729eb801f101afae768a38cc43719abe625ebc89b12f3eacba507c9193e1049366b1c2c0 SHA512 1fdbdacfdd2f7884af246326e63f6bcfaf8efc95ec326f566216a173509a21891e4c66d85ef1290648a890135ae3fe23f185da36346d68c016da923b7c9c644a
 DIST teamviewer_13.2.13582_amd64.tar.xz 11472084 BLAKE2B adcec9bfb9ccedbc958eceef611f0f04b9b192313d3c060202166b77a4c2623008cbac147e9136925156446ef10a143283735f13c52cebd30e924329d1ff2453 SHA512 82a7cce2046a0dd268181044093e0d0bccfef0cbc2e842a94bc9a9fda87062b7236ff23606dd482e68baf8194b189ae6994603ac0584fad624d7f47366f34af3
 DIST teamviewer_13.2.13582_i386.tar.xz 11406728 BLAKE2B 91bd8fe9c30f8be9de2ce089a0f678e90cb371233c2e8a05e695aa203634846510f1381b449007648a4b0e6b2b201a654b71dae1c63ade0eb08e732ae343766b SHA512 9453b289ba99f63c75e1acb03d3e5a343db4814cffc4464b46116b269a6556e9fda4b1d963fa35e2e912ae959b09fd5dcfbc26ca31ccd76e6d3235be2d9cf55e
-DIST teamviewer_14.0.14470_amd64.tar.xz 19458912 BLAKE2B ae106af9126719d92d69501091db46ed7aa9200dd9de24498cc586f3dc75fbbad863eb20b3176e32353beb994e1a4048bac381f172c33e022cd6973d76fa0e91 SHA512 d13310eee551e1ce606fa4ba73084ab9680ba3b6eb2fb2db4f9668decd920f6f16906971cc1900f44bd7d76506788430e1a5cff74f9729b957a3ef8d7aaef051
-DIST teamviewer_14.0.14470_i386.tar.xz 19473776 BLAKE2B a96ed757c6af5e07d4b958d2034c94bdd04625e0ae68c6dba94eebd1f1416f33e339a8766161bfa412ce90119a70cefbded995d66656ac11c0b08869639ba15b SHA512 6c867e32f26df3675bee80e3dfb2aa5868f3bf4717ce07deabc7495d2797018051dde42080eea6e3c0a919e20f5517d621e075c7d7f75cabec4b6feeae5fa74d
 DIST teamviewer_14.1.3399_amd64.tar.xz 11311600 BLAKE2B 082b23322b4a24add2f7a1235810a3fb3cfd6572ccfe2a54942bd93902d3adc170a175d32653375c406de7a54949fd0904dfae8b8cf98da58ef492ac63d0e576 SHA512 9417fca34d2b4b3e53d173ed31f85ca6d3f2488dceb7bf2321082631b425d7c3404549ff4bfe615e6f8f82354df5c43ab61e8cd4ec99ae9c42b28807ea0db365
 DIST teamviewer_14.1.3399_i386.tar.xz 11305576 BLAKE2B 1a40cd6dd5e1554b44d210fb0ca78a3570185e046b12eba52d0e089cd317ab6c8828f774d6b786ab7232ad663785bd9fb2e9137eb0ea7364347ea5513ab5e6ef SHA512 0fef5c5794ea06d9a729cd5be0b2e7c28add1fca9bbf9e77ca69fe569a08fc1efb6dc007040d8a8d3608061469dc2e2d364584130316d58e2d8195b2389deb0f
 DIST teamviewer_14.1.9025_amd64.tar.xz 11357456 BLAKE2B d3401b4465341533e0e3e7d57515566b1833689cb55d3d2b2b4ca95ed706ebd5609698b128033737dc1532e10fd15837241f11e327d3345ef266b90d2837075c SHA512 2a6fcfd3bb74a9e0f97bd94cf92ba5c8500c17436887e186c6b65d1c02b984799a41003e0cb58af503ece6c9c4f8205c907ba179b491efd3b765ef34b1ec9f76
 DIST teamviewer_14.1.9025_i386.tar.xz 11357824 BLAKE2B 6eb496549e39a1f66a5e14af3d69f8f11dda1549e4af51d354fa8cdfd027dec58240dc6ddacbaf0b1c0ccecf918873d9307f6d75a09abf180a1be5aff65f2613 SHA512 b5ff7e417ffa59725656611348dd717141fa010460f2d872ef555471f22af24d7dde02b0356eece69eb2a7e8fb0d94024646b74e9c8d5c00577eeda1e8c9a713
 EBUILD teamviewer-13.1.8286.ebuild 3704 BLAKE2B f3811ce525af9e8fc62cf4563e575b2176930a6de394250b160959c14dc06d3df03c743d26292dd8385b069b3c99245f7f5024ccb125dde8f959ed48ab266ccd SHA512 0530eab9b9a03d04c7485245378816368611a897b2e87d6aecce42496ef9200a4103ddb1f07510c36d546ae60d2848237048d82c06e420abe14c1919dd0b8259
 EBUILD teamviewer-13.2.13582.ebuild 3704 BLAKE2B f3811ce525af9e8fc62cf4563e575b2176930a6de394250b160959c14dc06d3df03c743d26292dd8385b069b3c99245f7f5024ccb125dde8f959ed48ab266ccd SHA512 0530eab9b9a03d04c7485245378816368611a897b2e87d6aecce42496ef9200a4103ddb1f07510c36d546ae60d2848237048d82c06e420abe14c1919dd0b8259
-EBUILD teamviewer-14.0.14470.ebuild 3701 BLAKE2B 4f022ce30f521cdac93245040fc1963960fbd83eb5349c8febb1e17019ab990036d6de02a250384b0f2fa332913feca4fa7bb18c0c46812d5e9f64834f17cf29 SHA512 b97758ece045326b9096538393fba63215690996ca5c0ac56b95d4e235b6c9ba182c5909846ba48bad2819dbc3d880f34ca67dfbd083c8770db4962a9150e8db
 EBUILD teamviewer-14.1.3399.ebuild 3701 BLAKE2B 4f022ce30f521cdac93245040fc1963960fbd83eb5349c8febb1e17019ab990036d6de02a250384b0f2fa332913feca4fa7bb18c0c46812d5e9f64834f17cf29 SHA512 b97758ece045326b9096538393fba63215690996ca5c0ac56b95d4e235b6c9ba182c5909846ba48bad2819dbc3d880f34ca67dfbd083c8770db4962a9150e8db
 EBUILD teamviewer-14.1.9025.ebuild 3701 BLAKE2B 2413ca30f73a54cf75f69600d9928d8803b0d6c66a4ef0e40c37703573845984ab15f00dfdba33b9359676a1412828df84dafeb5649d68e71d4f8ce3e8331dd8 SHA512 871ded4d964787d875a4731fa6e44590df92746c855ec1e5d471ed8cea8b7d464c591b308df4ebfd9dcf29cfa5e6cedcc53a98d40547ee3725a54536f83fe65a
 MISC metadata.xml 250 BLAKE2B 94de840f3a83c87af4ee3224855111d06a5c77ebbe20d6691dd5a95b4677075a0e9e2fe405a327ac485056269bf3146d5ee6726843447f6436a97d1f7ef44288 SHA512 1ec261c858ac8824789dab07b4b01fde96e8d2a13add9b05617a4b824085d77c181057a7c602db5f4fd3b864b864e6314a64512159d174304fc4fba393b49734
diff --git a/net-misc/teamviewer/teamviewer-14.0.14470.ebuild b/net-misc/teamviewer/teamviewer-14.0.14470.ebuild
deleted file mode 100644
index 66f0313ab868..000000000000
--- a/net-misc/teamviewer/teamviewer-14.0.14470.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=${PN}${PV/\.*}
-inherit desktop gnome2-utils systemd
-
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="${PV/\.*}"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/dbus
-"
-
-RESTRICT="bindist mirror"
-
-# Silence QA messages
-QA_PREBUILT="opt/${MY_PN}/*"
-
-S="${WORKDIR}"/teamviewer
-
-src_prepare() {
-	default
-
-	# Switch operation mode from 'portable' to 'installed'
-	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
-
-	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
-		-i tv_bin/script/teamviewerd.service || die
-}
-
-src_install() {
-	local dst="/opt/${MY_PN}" # install destination
-
-	# Quirk:
-	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
-	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
-	# when changing the ABI of one of its dependencies. According to the
-	# TeamViewer devs, this binary is an unused remnant of previous Wine-
-	# based builds and will be removed in future releases anyway
-	rm tv_bin/script/libdepend
-
-	insinto ${dst}
-	doins -r tv_bin
-
-	# Set permissions for executables and libraries
-	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
-		fperms 755 ${dst}/${exe}
-	done
-
-	# No slotting here, binary expects this service path
-	newinitd "${FILESDIR}"/teamviewerd14.init teamviewerd
-	systemd_dounit tv_bin/script/teamviewerd.service
-
-	insinto /usr/share/dbus-1/services
-	doins tv_bin/script/com.teamviewer.TeamViewer.service
-	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
-
-	insinto /usr/share/polkit-1/actions
-	doins tv_bin/script/com.teamviewer.TeamViewer.policy
-
-	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
-	done
-
-	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
-	# have the undesired result of installing subdirectory 'doc' in /usr/
-	# share/doc/teamviewer-<version>)
-	for doc in $(find doc -type f); do
-		dodoc ${doc}
-	done
-
-	keepdir /etc/${MY_PN}
-	dosym ../../etc/${MY_PN} ${dst}/config
-
-	# Create directory and symlink for log files (NOTE: according to Team-
-	# Viewer devs, all paths are hard-coded in the binaries; therefore
-	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
-	# <major-version>')
-	keepdir /var/log/${MY_PN}
-	dosym ../../var/log/${MY_PN} ${dst}/logfiles
-
-	dodir /opt/bin
-	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
-	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
-
-	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "Please note that parallel installation of multiple versions of"
-	elog "TeamViewer is currently not supported at runtime. Bug #621818"
-	elog ""
-	elog "Before using TeamViewer, you need to start its daemon:"
-	elog "OpenRC:"
-	elog "# /etc/init.d/teamviewerd start"
-	elog "# rc-update add teamviewerd default"
-	elog
-	elog "Systemd:"
-	elog "# systemctl start teamviewerd.service"
-	elog "# systemctl enable teamviewerd.service"
-	elog
-	elog "To display additional command line options simply run:"
-	elog "$ teamviewer help"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index f111c2cf351e..de00727912c1 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,4 @@
-DIST youtube-dl-2019.01.30.1.tar.gz 3105464 BLAKE2B f09cf3e86710f6d3ec6555e18299097800775a44ed336fa54fd5abb8ea753806dc6431894659e51fef43b90f974250dbcce9bb51eed50e1e43b75fe40dd21fbd SHA512 4d1fd2b9cf84dbbbf3a7a84ce9e7b2fe39d34fb29c337c71c4dba598bc3eac9d205399055dbcd7ec964398dafac90d488188c4fbc5083ee0abfd09269dce26b3
 DIST youtube-dl-2019.02.08.tar.gz 3104780 BLAKE2B e89a9950de84c3d2c5530ca229f2dfb39bb372454a6a1d67c0d1c966f68f2372008556ffda32c042eca6d3c0aee3ace0c1cabdf1d65cb16efc80326b821a3624 SHA512 4fc027ec6d9d7059c34a3c16f1265989ec000c131e6a937f667928531dd2a6d9f56592d367f08ec5e3b1900b3e191aa36bcc997db04b77b95850a43ed1272640
-EBUILD youtube-dl-2019.01.30.1.ebuild 2021 BLAKE2B a7fe20e586f2d3243069237315e89ad05ff23c1684854a4029111c30622f23a8ba0c73325bb3a98f6fdc76203afd3ae4246ae62e0cfdc02c281188d3b1e25e40 SHA512 c589d6d581b2a91443ba9def42b278ed427bebc45a02b25a053dbb556c23dc299b5a8873540679394863a1ca2a3da929d27b779e467c0269707600fea55a7e7a
-EBUILD youtube-dl-2019.02.08.ebuild 2027 BLAKE2B 028f1bd62a12ad5b2b20eeaaf83e63c3dc765c0fd220ec2a187844993159f449b631a7e5c5d0b80977545e7ed47c9c452b3492c5001ce78c0452a69207120b8b SHA512 ce09e4ee4e17b44a51581d252ae5bda890d22168c612785033abd9297ea8be0409845b25a175775ddc64d9dbee0dd9324a2494df6316b4a41837fd4e8f483b23
+EBUILD youtube-dl-2019.02.08.ebuild 2021 BLAKE2B a7fe20e586f2d3243069237315e89ad05ff23c1684854a4029111c30622f23a8ba0c73325bb3a98f6fdc76203afd3ae4246ae62e0cfdc02c281188d3b1e25e40 SHA512 c589d6d581b2a91443ba9def42b278ed427bebc45a02b25a053dbb556c23dc299b5a8873540679394863a1ca2a3da929d27b779e467c0269707600fea55a7e7a
 EBUILD youtube-dl-99999999.ebuild 1916 BLAKE2B 035ac8f58fec97b741be4d080401d6dea03531c95ef61782dcad898f51b2fe845d97ede3ddb4ac3ae52c327fb08d5729b41a1c057e8fb6c81e81afc3d87c4651 SHA512 ae1467fcc2b1bde3b33354a61e29b311a6d8876cbd0502186f55f0826c0182ea21afb229b34b39b37c9e625bb142d86348baa31dc0defc01e19beb427de40321
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.01.30.1.ebuild b/net-misc/youtube-dl/youtube-dl-2019.01.30.1.ebuild
deleted file mode 100644
index d63726ec5fe0..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2019.01.30.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-LICENSE="public-domain"
-
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-RESTRICT="test"
-SLOT="0"
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-"
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
-	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
-	elog "videos can be retrieved in a higher quality format without sound."
-	elog "${PN} will detect whether avconv/ffmpeg is present and"
-	elog "automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2019.02.08.ebuild b/net-misc/youtube-dl/youtube-dl-2019.02.08.ebuild
index 2cb0551f3e35..d63726ec5fe0 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.02.08.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.02.08.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://rg3.github.com/youtube-dl/"
 SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 LICENSE="public-domain"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 RESTRICT="test"
 SLOT="0"
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2019-02-16 12:59:29 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-02-16 12:59:29 +0000
commit	79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch)
tree	ade7cb031f363fad64c77139dea7aa3d81908537 /net-misc
parent	6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff)