gentoo resync : 25.11.2020

14 files changed, 593 insertions, 79 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 86816116d9fc..b808a821b531 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 873f93f35ead..221f605543d2 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,9 +1,13 @@
 AUX freeradius-3.0.18-libressl.patch 2503 BLAKE2B 45b5ca45af2bb145f5876892d02686f0896fb0cdafdf0deb00789e5c927c74b4a6793b9084208a3ae282947241d949ef1a84c621bbd7c9c90907624062d1a1cd SHA512 4dd638736c23af2428481ff6f1dd247f29ee11205bc88b9f59347a9d0baa504f67bc4139c854e52a8ca95a39ab70e72c54bcc58a18f752b07f62bf029626204a
 AUX freeradius-3.0.20-py3-fixes.patch 15422 BLAKE2B 29f10c53b02603c2c854c0100056c01e02c1282a78731e67453101dc6be49d64f57e1f39b8a32459034939a1d47c74bca48270f119095deaa067942b2c2d3b5c SHA512 5a565aa55fab059995870c78f176fa525fca4bd8732c2a2ecc4f625a6635979a51b3fc53999fb7741bc2da37a6260afa43350f61490f0b3548ced5bc81dfdaea
 AUX freeradius-3.0.20-systemd-service.patch 2162 BLAKE2B 3aa32e5a15efa223aab7880b0cb651edca6695a3727b4df7692f656d1f34366a2a16c364c2a5b544a0ad04bca795be269d4d7dc37bc4c3c6d28387bc3e411ad8 SHA512 8a9f5ecaf559132932ed2e46151ff41e5570df3e844f33ee49004ace0aa7b458a6000ec0d1ed01c34b6236c3dde2ca72cb1031b4badcfa4d6826dbf16ca28259
-AUX freeradius.tmpfiles 36 BLAKE2B 612c6ca79a678a3a82114ec142d33aa831b5b19c3e6774b2332334bffbeeb592aeac43d443a5f8fc1380528f3a5de4cfe125eb388d36c0b4f1f7f84f2bfb36bc SHA512 cf364cd860588318d49089946739bb30a6259a5aa7977c768155449fbb495473fe24c1ddccc75dc822e25b1f0d404589d7606590fd2018cc6503dd2767463a7c
 AUX radius.conf-r4 465 BLAKE2B 1c17f57c088be0612b3db23e8a909d7e1f6fc114d3ff31ee1c82f199e3962db57f3042498cf135b3a29c8a730695ed99612e490e0b3253f0644462d28f61215d SHA512 4142869fb61b2938232002c9cb5b843590785560da7db4f2b2a9c9d55c76d0e2d4a6cb946a5347dfa505cd82f5e86c7315cf71f3443a86632090cf4bd025748a
+AUX radius.conf-r5 498 BLAKE2B ef7cb32024e6aada08c78d76d6fdce67cfbd4729e00788616e1f0f1bf8fff4cc6586350644684297b8ef8a08ddc38f51c661c66720c85014de1127dbbe3cdd56 SHA512 f9ba8a46e53f93394c8b49ebb9fee899803d595349d7c3e6cc3920b2ae0629ec6307b2a65eb5d6e37ecfb9ff287e89ea98602b30ec9b07571d7a401737bda11e
 AUX radius.init-r3 734 BLAKE2B ba6918cf5da5ad29ca8062045c3318c2bb30e0a803bc6e6bb9104fe6e8bc2f662bddb4749e6fa57fda55d57ad41b2cb4014d5efcac557a2213f190a5dcc2f7b6 SHA512 826fd3fd576b09e7e590095b1ac63dfaec587a3b46ae1ccdec68134264fb689827aea4a446522bc2a253b9885469b6788a3dddc466ad47483dd62ef67262de49
+AUX radius.init-r4 753 BLAKE2B 18c83f704ac30d14d56ce8a2f5e3176dcd1aab83cc4525b728e3080e81470a9b4124af49459c69070d9c3ed67a95c7593b6d01f0259403fa9ceee43abd541f7c SHA512 8b05604a72a6a0dea3e654f36b13e1ed517d0c277d128475bcca768204d720b3cd9730e5776371818b8deb0f9fd099458bf5a3276ea9b61e3dbacafaaa527892
 DIST freeradius-server-3.0.20.tar.gz 5002727 BLAKE2B f481ad22105694a4af3f0f0c1b4f6e395e8da0fe65274e32ebeed07e3c9b1869029e6ffbc655cfa41d5de2a1dcba54acee33a7a10d28bfbfce791b7ccd0fc57a SHA512 513ed0a5d9e6b9a8d89a9b02c86ff528a9ff14d928f4c1040ca44702465abd711588fe6afa35554cb2c8e8bd7f19dd5be3dbc78445c62c7b00bf5cbc4c621312
-EBUILD freeradius-3.0.20.ebuild 7581 BLAKE2B 13c53ff17b60ee6b7a2ba63c9e367aac17ccd7449ef2d919eec318a5f00eb1407a6a6ba6673f69947d0768965b4642646aa6064f2b3aaa6f7714a289ac4a68bc SHA512 78f1b79d448423618b4a0bac6a6f23b7b822b187a9340a14ab740fa90c27a771deddbfcc6c4b76c9b1d268aa15b312d2e36d9a97c76c6e9f2d83fdaef38f1214
+DIST freeradius-server-3.0.21.tar.gz 5028506 BLAKE2B 3ccf9704a1f8b1ec5f6f066a475083fe7cefa793e8f53ecd287866fc505a832bf8031a4d07c2e07f79da6c6fb82e6a3435b0154d1f135167ebddfc9b8d401544 SHA512 85af1c305e99a56400b04be5c966900e7df8beb7b54626d6aa0cb300dc124817e43b424f9b27d86966bb76cca87dce741812ed8d681a568c7d7b63b3b53a9dfa
+EBUILD freeradius-3.0.20-r1.ebuild 7605 BLAKE2B 8d3152e3fd0f126404407b794182d545e86448c10e03ad45694df2034a3f806df77d4a650404ea0c332c9525e71d279d75b8c800fc245a7bf64787a0d59d29f1 SHA512 052aa4bca8f8f342ff0142a0784e5a10034178bd7ed1b4845216586d02efafcf85ccc9b613284c41ea6e4219e2180d11cba62c63ec39b236001e09a70ec4dfbc
+EBUILD freeradius-3.0.21-r1.ebuild 7460 BLAKE2B 8ed2282ee7b32b6b656d8f27d8270ff756aa7b95c2fae02bb4f20f758c406d7fad3a25e8dd1408616f7ec2cf28d6f6c595cdcf86fcdb3f80b1953e4e26b6cdea SHA512 8a52d56f3d0b342f543c065b4659d174cdabe8aed1e7584bc07024a1bf600213bf7adf0304cccda84c04efda60b36095b8eaf901ed511509dd3f9e55e32c61ea
+EBUILD freeradius-3.0.21.ebuild 7461 BLAKE2B 0d3cce504e6e3b5e875a02bbe5fbf1efdcc4758514c04185e2a902b9717c79dc43dab8786694fec1d5eb01880800a03c902c5244398ac32802f02037b95be197 SHA512 f2c3651d807348f578962237e742a73cbd4abd29b84cde31958da9d49c2927e6e7cca3d8dec2c7da3bf0e8c4f2ca35a715350af55266c40037baa9e91ac1ea0a
 MISC metadata.xml 864 BLAKE2B 5df7dfc698cebaaf850dfffedd8bfc9b7f30a947fdc7072b86b6e557bcf0f2548564260fb2ae073ea5adb5d1a37a5363e122691f748588561e26f5e452176934 SHA512 e36f1c6447cc565efb1523b931f670e944a5cd5eac9176bf42be13db907c7afea6d8ab860f77e739beec25f1b74012fe53987da5c48e6a7b928e335614e679cc
diff --git a/net-dialup/freeradius/files/freeradius.tmpfiles b/net-dialup/freeradius/files/freeradius.tmpfiles
deleted file mode 100644
index 21620c97706d..000000000000
--- a/net-dialup/freeradius/files/freeradius.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/radiusd 0755 radius radius -
diff --git a/net-dialup/freeradius/files/radius.conf-r5 b/net-dialup/freeradius/files/radius.conf-r5
new file mode 100644
index 000000000000..7114c32ef923
--- /dev/null
+++ b/net-dialup/freeradius/files/radius.conf-r5
@@ -0,0 +1,18 @@
+# Config file for /etc/init.d/radiusd
+
+# see man pages for radiusd run `radiusd -h`
+# for valid cmdline options
+#RADIUSD_OPTS=""
+
+# Change this value if you change it in /etc/raddb/radiusd.conf
+pidfile=/var/run/radiusd/radiusd.pid
+
+# Change these values if you change them in /etc/raddb/radiusd.conf
+RADIUSD_USER=radius
+RADIUSD_GROUP=radius
+
+RADIUSD_LOGPATH=/var/log/radius
+
+# If you set up logging to syslog in /etc/raddb/radiusd.conf, you want
+# to uncomment the following line.
+#rc_use="logger"
diff --git a/net-dialup/freeradius/files/radius.init-r4 b/net-dialup/freeradius/files/radius.init-r4
new file mode 100644
index 000000000000..dee1842e5cbf
--- /dev/null
+++ b/net-dialup/freeradius/files/radius.init-r4
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command=/usr/sbin/radiusd
+command_args="${RADIUSD_OPTS}"
+pidfile="${pidfile:-/run/radiusd/radiusd.pid}"
+extra_started_commands="reload"
+
+depend() {
+	need localmount
+	use dns
+}
+
+start_pre() {
+	if [ ! -f /etc/raddb/radiusd.conf ] ; then
+		eerror "No /etc/raddb/radiusd.conf file exists!"
+		return 1
+	fi
+
+	checkpath -m0750 -o "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" -d \
+		$(dirname ${pidfile}) "${RADIUSD_LOGPATH:-/var/log/radius}"
+	checkpath -m0750 -o "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" -d \
+		$(dirname ${pidfile}) /run/radiusd
+}
+
+reload() {
+	ebegin "Reloading radiusd"
+	kill -HUP $(cat ${pidfile})
+	eend $?
+}
diff --git a/net-dialup/freeradius/freeradius-3.0.20.ebuild b/net-dialup/freeradius/freeradius-3.0.20-r1.ebuild
index b7e8e652bc88..f29428cfc91e 100644
--- a/net-dialup/freeradius/freeradius-3.0.20.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.20-r1.ebuild
@@ -228,6 +228,10 @@ src_install() {
 
 	pamd_mimic_system radiusd auth account password session
 
+	# fix #711756
+	fowners -R radius:radius /etc/raddb
+	fowners -R radius:radius /var/log/radius
+
 	dodoc CREDITS
 
 	rm "${ED}/usr/sbin/rc.radiusd" || die
@@ -242,10 +246,10 @@ src_install() {
 			-e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
 			"${S}"/debian/freeradius.service
 	fi
-	systemd_newtmpfilesd "${FILESDIR}"/freeradius.tmpfiles freeradius.conf
 	systemd_dounit "${S}"/debian/freeradius.service
 
 	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
 }
 
 pkg_config() {
diff --git a/net-dialup/freeradius/freeradius-3.0.21-r1.ebuild b/net-dialup/freeradius/freeradius-3.0.21-r1.ebuild
new file mode 100644
index 000000000000..3c1737e539aa
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-3.0.21-r1.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit autotools pam python-single-r1 systemd
+
+MY_P="${PN}-server-${PV}"
+
+DESCRIPTION="Highly configurable free RADIUS server"
+SRC_URI="
+	ftp://ftp.freeradius.org/pub/radius/${MY_P}.tar.gz
+	ftp://ftp.freeradius.org/pub/radius/old/${MY_P}.tar.gz
+"
+HOMEPAGE="http://www.freeradius.org/"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="
+	debug firebird iodbc kerberos ldap libressl memcached mysql mongodb odbc oracle pam
+	pcap postgres python readline redis rest samba sqlite ssl systemd
+"
+RESTRICT="test firebird? ( bindist )"
+
+# NOTE: Temporary freeradius doesn't support linking with mariadb client
+#       libs also if code is compliant, will be available in the next release.
+#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
+
+# TODO: rlm_mschap works with both samba library or without. I need to avoid
+#       linking of samba library if -samba is used.
+RDEPEND="acct-group/radius
+	acct-user/radius
+	!net-dialup/cistronradius
+	dev-lang/perl:=
+	sys-libs/gdbm:=
+	sys-libs/talloc
+	firebird? ( dev-db/firebird )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	memcached? ( dev-libs/libmemcached )
+	mysql? ( dev-db/mysql-connector-c )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
+	odbc? ( dev-db/unixODBC )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	pam? ( sys-libs/pam )
+	pcap? ( net-libs/libpcap )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	redis? ( dev-libs/hiredis:= )
+	rest? ( dev-libs/json-c:= )
+	samba? ( net-fs/samba )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[-bindist] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
+)
+
+pkg_setup() {
+	if use python ; then
+		python-single-r1_pkg_setup
+		export PYTHONBIN="${EPYTHON}"
+	fi
+}
+
+src_prepare() {
+	# most of the configuration options do not appear as ./configure
+	# switches. Instead it identifies the directories that are available
+	# and run through them. These might check for the presence of
+	# various libraries, in which case they are not built.  To avoid
+	# automagic dependencies, we just remove all the modules that we're
+	# not interested in using.
+
+	eapply_user
+	default
+
+	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
+	use ldap || { rm -r src/modules/rlm_ldap || die ; }
+	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
+	use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
+	use pam || { rm -r src/modules/rlm_pam || die ; }
+	# Drop support of python2
+	rm -r src/modules/rlm_python || die
+	use python || { rm -r src/modules/rlm_python3 || die ; }
+	use rest || { rm -r src/modules/rlm_rest || die ; }
+	use redis || { rm -r src/modules/rlm_redis{,who} || die ; }
+	# Do not install ruby rlm module, bug #483108
+	rm -r src/modules/rlm_ruby || die
+
+	# these are all things we don't have in portage/I don't want to deal
+	# with myself
+	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die # requires TNCS library
+	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die # requires libeap-ikev2
+	rm -r src/modules/rlm_opendirectory || die # requires some membership.h
+	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
+
+	# sql drivers that are not part of experimental are loaded from a
+	# file, so we have to remove them from the file itself when we
+	# remove them.
+	usesqldriver() {
+		local flag=$1
+		local driver=rlm_sql_${2:-${flag}}
+
+		if ! use ${flag}; then
+			rm -r src/modules/rlm_sql/drivers/${driver} || die
+			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
+		fi
+	}
+
+	sed -i \
+		-e 's:^#\tuser = :\tuser = :g' \
+		-e 's:^#\tgroup = :\tgroup = :g' \
+		-e 's:/var/run/radiusd:/run/radiusd:g' \
+		-e '/^run_dir/s:${localstatedir}::g' \
+		raddb/radiusd.conf.in || die
+
+	# verbosity
+	# build shared libraries using jlibtool --shared
+	sed -i \
+		-e '/$(LIBTOOL)/s|--quiet ||g' \
+		-e 's:--mode=\(compile\|link\):& --shared:g' \
+		Make.inc.in || die
+
+	sed -i \
+		-e 's|--silent ||g' \
+		-e 's:--mode=\(compile\|link\):& --shared:g' \
+		scripts/libtool.mk || die
+
+	# crude measure to stop jlibtool from running ranlib and ar
+	sed -i \
+		-e '/LIBRARIAN/s|".*"|"true"|g' \
+		-e '/RANLIB/s|".*"|"true"|g' \
+		scripts/jlibtool.c || die
+
+	usesqldriver mysql
+	usesqldriver postgres postgresql
+	usesqldriver firebird
+	usesqldriver iodbc
+	usesqldriver odbc unixodbc
+	usesqldriver oracle
+	usesqldriver sqlite
+	usesqldriver mongodb mongo
+
+	eautoreconf
+}
+
+src_configure() {
+	# do not try to enable static with static-libs; upstream is a
+	# massacre of libtool best practices so you also have to make sure
+	# to --enable-shared explicitly.
+	local myeconfargs=(
+		--enable-shared
+		--disable-static
+		--disable-ltdl-install
+		--with-system-libtool
+		--with-system-libltdl
+		--with-ascend-binary
+		--with-udpfromto
+		--with-dhcp
+		--with-iodbc-include-dir=/usr/include/iodbc
+		--with-experimental-modules
+		--with-docdir=/usr/share/doc/${PF}
+		--with-logdir=/var/log/radius
+		$(use_enable debug developer)
+		$(use_with ldap edir)
+		$(use_with ssl openssl)
+		$(use_with systemd systemd)
+	)
+	# fix bug #77613
+	if has_version app-crypt/heimdal; then
+		myeconfargs+=( --enable-heimdal-krb5 )
+	fi
+
+	if use python ; then
+		myeconfargs+=(
+			--with-rlm-python3-bin=${EPYTHON}
+			--with-rlm-python3-config-bin=${EPYTHON}-config
+		)
+	fi
+
+	use readline || export ac_cv_lib_readline=no
+	use pcap || export ac_cv_lib_pcap_pcap_open_live=no
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# verbose, do not generate certificates
+	emake \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS=''
+}
+
+src_install() {
+	dodir /etc
+	diropts -m0750 -o root -g radius
+	dodir /etc/raddb
+	diropts -m0750 -o radius -g radius
+	dodir /var/log/radius
+	keepdir /var/log/radius/radacct
+	diropts
+
+	# verbose, do not install certificates
+	# Parallel install fails (#509498)
+	emake -j1 \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS='' \
+		R="${D}" \
+		install
+
+	pamd_mimic_system radiusd auth account password session
+
+	# fix #711756
+	fowners -R radius:radius /etc/raddb
+	fowners -R radius:radius /var/log/radius
+
+	dodoc CREDITS
+
+	rm "${ED}/usr/sbin/rc.radiusd" || die
+
+	newinitd "${FILESDIR}/radius.init-r4" radiusd
+	newconfd "${FILESDIR}/radius.conf-r5" radiusd
+
+	if ! use systemd ; then
+		# If systemd builtin is not enabled we need use Type=Simple
+		# as systemd .service
+		sed -i -e 's:^Type=.*::g' \
+			-e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
+			"${S}"/debian/freeradius.service
+	fi
+	systemd_dounit "${S}"/debian/freeradius.service
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_config() {
+	if use ssl; then
+		cd "${ROOT}"/etc/raddb/certs || die
+		./bootstrap || die "Error while running ./bootstrap script."
+		fowners root:radius "${ROOT}"/etc/raddb/certs
+		fowners root:radius "${ROOT}"/etc/raddb/certs/ca.pem
+		fowners root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem}
+	fi
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} && use ssl; then
+		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
+		elog "to start the radiusd service."
+	fi
+}
diff --git a/net-dialup/freeradius/freeradius-3.0.21.ebuild b/net-dialup/freeradius/freeradius-3.0.21.ebuild
new file mode 100644
index 000000000000..be0bf1d2179f
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-3.0.21.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit autotools pam python-single-r1 systemd
+
+MY_P="${PN}-server-${PV}"
+
+DESCRIPTION="Highly configurable free RADIUS server"
+SRC_URI="
+	ftp://ftp.freeradius.org/pub/radius/${MY_P}.tar.gz
+	ftp://ftp.freeradius.org/pub/radius/old/${MY_P}.tar.gz
+"
+HOMEPAGE="http://www.freeradius.org/"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="
+	debug firebird iodbc kerberos ldap libressl memcached mysql mongodb odbc oracle pam
+	pcap postgres python readline redis rest samba sqlite ssl systemd
+"
+RESTRICT="test firebird? ( bindist )"
+
+# NOTE: Temporary freeradius doesn't support linking with mariadb client
+#       libs also if code is compliant, will be available in the next release.
+#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
+
+# TODO: rlm_mschap works with both samba library or without. I need to avoid
+#       linking of samba library if -samba is used.
+RDEPEND="acct-group/radius
+	acct-user/radius
+	!net-dialup/cistronradius
+	dev-lang/perl:=
+	sys-libs/gdbm:=
+	sys-libs/talloc
+	firebird? ( dev-db/firebird )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	memcached? ( dev-libs/libmemcached )
+	mysql? ( dev-db/mysql-connector-c )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
+	odbc? ( dev-db/unixODBC )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	pam? ( sys-libs/pam )
+	pcap? ( net-libs/libpcap )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	redis? ( dev-libs/hiredis:= )
+	rest? ( dev-libs/json-c:= )
+	samba? ( net-fs/samba )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[-bindist] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
+)
+
+pkg_setup() {
+	if use python ; then
+		python-single-r1_pkg_setup
+		export PYTHONBIN="${EPYTHON}"
+	fi
+}
+
+src_prepare() {
+	# most of the configuration options do not appear as ./configure
+	# switches. Instead it identifies the directories that are available
+	# and run through them. These might check for the presence of
+	# various libraries, in which case they are not built.  To avoid
+	# automagic dependencies, we just remove all the modules that we're
+	# not interested in using.
+
+	eapply_user
+	default
+
+	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
+	use ldap || { rm -r src/modules/rlm_ldap || die ; }
+	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
+	use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
+	use pam || { rm -r src/modules/rlm_pam || die ; }
+	# Drop support of python2
+	rm -r src/modules/rlm_python || die
+	use python || { rm -r src/modules/rlm_python3 || die ; }
+	use rest || { rm -r src/modules/rlm_rest || die ; }
+	use redis || { rm -r src/modules/rlm_redis{,who} || die ; }
+	# Do not install ruby rlm module, bug #483108
+	rm -r src/modules/rlm_ruby || die
+
+	# these are all things we don't have in portage/I don't want to deal
+	# with myself
+	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die # requires TNCS library
+	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die # requires libeap-ikev2
+	rm -r src/modules/rlm_opendirectory || die # requires some membership.h
+	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
+
+	# sql drivers that are not part of experimental are loaded from a
+	# file, so we have to remove them from the file itself when we
+	# remove them.
+	usesqldriver() {
+		local flag=$1
+		local driver=rlm_sql_${2:-${flag}}
+
+		if ! use ${flag}; then
+			rm -r src/modules/rlm_sql/drivers/${driver} || die
+			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
+		fi
+	}
+
+	sed -i \
+		-e 's:^#\tuser = :\tuser = :g' \
+		-e 's:^#\tgroup = :\tgroup = :g' \
+		-e 's:/var/run/radiusd:/run/radiusd:g' \
+		-e '/^run_dir/s:${localstatedir}::g' \
+		raddb/radiusd.conf.in || die
+
+	# verbosity
+	# build shared libraries using jlibtool --shared
+	sed -i \
+		-e '/$(LIBTOOL)/s|--quiet ||g' \
+		-e 's:--mode=\(compile\|link\):& --shared:g' \
+		Make.inc.in || die
+
+	sed -i \
+		-e 's|--silent ||g' \
+		-e 's:--mode=\(compile\|link\):& --shared:g' \
+		scripts/libtool.mk || die
+
+	# crude measure to stop jlibtool from running ranlib and ar
+	sed -i \
+		-e '/LIBRARIAN/s|".*"|"true"|g' \
+		-e '/RANLIB/s|".*"|"true"|g' \
+		scripts/jlibtool.c || die
+
+	usesqldriver mysql
+	usesqldriver postgres postgresql
+	usesqldriver firebird
+	usesqldriver iodbc
+	usesqldriver odbc unixodbc
+	usesqldriver oracle
+	usesqldriver sqlite
+	usesqldriver mongodb mongo
+
+	eautoreconf
+}
+
+src_configure() {
+	# do not try to enable static with static-libs; upstream is a
+	# massacre of libtool best practices so you also have to make sure
+	# to --enable-shared explicitly.
+	local myeconfargs=(
+		--enable-shared
+		--disable-static
+		--disable-ltdl-install
+		--with-system-libtool
+		--with-system-libltdl
+		--with-ascend-binary
+		--with-udpfromto
+		--with-dhcp
+		--with-iodbc-include-dir=/usr/include/iodbc
+		--with-experimental-modules
+		--with-docdir=/usr/share/doc/${PF}
+		--with-logdir=/var/log/radius
+		$(use_enable debug developer)
+		$(use_with ldap edir)
+		$(use_with ssl openssl)
+		$(use_with systemd systemd)
+	)
+	# fix bug #77613
+	if has_version app-crypt/heimdal; then
+		myeconfargs+=( --enable-heimdal-krb5 )
+	fi
+
+	if use python ; then
+		myeconfargs+=(
+			--with-rlm-python3-bin=${EPYTHON}
+			--with-rlm-python3-config-bin=${EPYTHON}-config
+		)
+	fi
+
+	use readline || export ac_cv_lib_readline=no
+	use pcap || export ac_cv_lib_pcap_pcap_open_live=no
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# verbose, do not generate certificates
+	emake \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS=''
+}
+
+src_install() {
+	dodir /etc
+	diropts -m0750 -o root -g radius
+	dodir /etc/raddb
+	diropts -m0750 -o radius -g radius
+	dodir /var/log/radius
+	keepdir /var/log/radius/radacct
+	diropts
+
+	# verbose, do not install certificates
+	# Parallel install fails (#509498)
+	emake -j1 \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS='' \
+		R="${D}" \
+		install
+
+	pamd_mimic_system radiusd auth account password session
+
+	# fix #711756
+	fowners -R radius:radius /etc/raddb
+	fowners -R radius:radius /var/log/radius
+
+	dodoc CREDITS
+
+	rm "${ED}/usr/sbin/rc.radiusd" || die
+
+	newinitd "${FILESDIR}/radius.init-r3" radiusd
+	newconfd "${FILESDIR}/radius.conf-r4" radiusd
+
+	if ! use systemd ; then
+		# If systemd builtin is not enabled we need use Type=Simple
+		# as systemd .service
+		sed -i -e 's:^Type=.*::g' \
+			-e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
+			"${S}"/debian/freeradius.service
+	fi
+	systemd_dounit "${S}"/debian/freeradius.service
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+}
+
+pkg_config() {
+	if use ssl; then
+		cd "${ROOT}"/etc/raddb/certs || die
+		./bootstrap || die "Error while running ./bootstrap script."
+		fowners root:radius "${ROOT}"/etc/raddb/certs
+		fowners root:radius "${ROOT}"/etc/raddb/certs/ca.pem
+		fowners root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem}
+	fi
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} && use ssl; then
+		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
+		elog "to start the radiusd service."
+	fi
+}
diff --git a/net-dialup/tkvoice/Manifest b/net-dialup/tkvoice/Manifest
deleted file mode 100644
index 28046fb72052..000000000000
--- a/net-dialup/tkvoice/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX tkvoice.desktop 118 BLAKE2B c4e169dfbb36575e307efd5a508e06c9917217233543198c265a42f0acc351ef9dbf04a057d85a5ab29ef2278cdebbeeb833ad8c74e3b518afb5b9c50b32bb5a SHA512 4270ab8eb89ded5b9a1aacd3ff1901d7f5050dd86e5f6f331330620dff86fa66d789e9d703252f035922dbbd10b5b120abac9a9df47ec3003c4f7112dc7b8bdc
-DIST tkvoice-1.5.tar.gz 153967 BLAKE2B a9c1a5b61e765bc16c881b21c05e0c76ee372219fb01605ec11c66290e1325b50e973cbf7ef6fe392f88967f82e301e45786913c4f2028192f264f34d6e12b35 SHA512 d9b2ead55131ef37a4d2e9d4d3065bb7945bbef7ffc38a336765c0d81cdfba44d6453b92277832ef0c2af4f5b9aff4eb27cfcedf119a74683d1d2a0d2fc8ca0c
-EBUILD tkvoice-1.5.ebuild 1249 BLAKE2B 205441fbb672f68b40a80a9dbf1821e6266843f27b042ddbf78708c6d7b39e619647be57d0bba7c318ddd3a1c5c904c80c03b7b1a2e09b0eeaf08bd6e923a459 SHA512 e6b1cf9e2a767698c5af6c19861879eab1483a85cdda957e9ef46b8d57b4413882b49d36b829c4551a8026b768675e7d83d8921a6bff774cb6e549c606022b22
-MISC metadata.xml 327 BLAKE2B 4b432097851997e458e8a57cbb543d0697d5b2af2cb5f489ff6efda1f136d601e8d6c1c805b568c5d19e9b91c076d26e0e35520d5906469d4f3b99552ab326c6 SHA512 e689657e024b07e16b36aa0e55a2a9a5e74a8dce9f70f16a3f288d6809f2fbf2076d5fdc3cea6e33ff0277a78013e3c8e6f103b5c07e633eb76415a593cafe6f
diff --git a/net-dialup/tkvoice/files/tkvoice.desktop b/net-dialup/tkvoice/files/tkvoice.desktop
deleted file mode 100644
index 389305340e08..000000000000
--- a/net-dialup/tkvoice/files/tkvoice.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=TkVoice
-Type=Application
-Comment=Phone/Fax Utility
-Exec=tkvoice
-Icon=tkvoice
-Categories=Utility;
diff --git a/net-dialup/tkvoice/metadata.xml b/net-dialup/tkvoice/metadata.xml
deleted file mode 100644
index 821333d9ba87..000000000000
--- a/net-dialup/tkvoice/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>Tk-Voice is a Telephone Answering Machine frontend for vgetty
-and also a Facsimile Answering Machine frontend for mgetty.</longdescription>
-</pkgmetadata>
diff --git a/net-dialup/tkvoice/tkvoice-1.5.ebuild b/net-dialup/tkvoice/tkvoice-1.5.ebuild
deleted file mode 100644
index f59b8f107568..000000000000
--- a/net-dialup/tkvoice/tkvoice-1.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Voice mail and Fax frontend program"
-HOMEPAGE="http://tkvoice.netfirms.com"
-SRC_URI="http://tkvoice.netfirms.com/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/tk
-	media-libs/netpbm
-	media-sound/sox
-	net-dialup/mgetty"
-DEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e "s:/usr/local/etc:/etc:g; s:/usr/local/bin:/usr/bin:g; s:/usr/local/tkvoice:/usr/lib/${P}:g" \
-		"${S}/tkvoice" "${S}/TCL/tkvfaq.tcl" "${S}/TCL/tkvsetupvoice.tcl" || die
-	sed -i -e "s:set STARTDIR .*:set STARTDIR /usr/lib/${P}:" \
-		"${S}/tkvoice" || die
-}
-
-src_install() {
-	exeinto /usr/lib/${P}
-	doexe ${PN}
-	dodir /usr/bin
-	dosym /usr/lib/${P}/${PN} /usr/bin/${PN}
-	insinto /usr/lib/${P}/TCL
-	doins TCL/*
-	insinto /usr/lib/${P}/image
-	doins image/*
-
-	domenu "${FILESDIR}/${PN}.desktop"
-	insinto /usr/share/pixmaps
-	doins ${PN}.xpm
-
-	dodoc BUGS FAQ README TODO
-}
-
-pkg_postinst() {
-	elog "${P} has been installed. Run ${EPREFIX}/usr/bin/${PN}."
-	elog "For more information, see the home page, ${HOMEPAGE}"
-	elog "or consult the documentation for this program as well as"
-	elog "for mgetty/vgetty."
-}
diff --git a/net-dialup/wvdial/Manifest b/net-dialup/wvdial/Manifest
index 8585a6fc8b02..991dc9ef5350 100644
--- a/net-dialup/wvdial/Manifest
+++ b/net-dialup/wvdial/Manifest
@@ -3,4 +3,4 @@ AUX wvdial-1.61-destdir.patch 782 BLAKE2B 0d514d3fa28552d02c588733aca8180af136f0
 AUX wvdial-1.61-parallel-make.patch 617 BLAKE2B 6f13a64152c6c4d2b58472768f597782e617ad87df278f7bc8a36391e06c078a31da8053119b23af53cc264552e296e23f5a7f87a97369dbd4d363af8b27b6d5 SHA512 bc8f425b0ca6511729bbe0d3b57d39bbc0fb08aa544d97ba577bc07b67bce3502fcdf86c4e298641e0d61a1432f05aa9dcc7cf3e728daa42944a50363cf2d6b6
 DIST wvdial-1.61.tar.gz 94854 BLAKE2B af0649d1361d20187c4c5062926646ee5d887a431be82f978f633f007653b29defe7a1b2474bf79e14be15b86e792c1e5588c47f2c31a25e7ab2d839f89dba05 SHA512 e949632583d889ad040c284f42c46790d247fffbc2d5e926c4b5836c970002f07741d26d052489bdc9c8144dcbb62a12851a3c275a5cecd5393d2722f43bb49a
 EBUILD wvdial-1.61.ebuild 985 BLAKE2B 7f3b10631596a98c8dcafeb33eed9faa2b8cf7693b03808b55e554390f9adc22682844765ee4bcbe3bf347d1a70b98227ce030a72c790b2630bea8600ade1309 SHA512 e86a1aec2973352d0ee86a4be43ef9869f01e0cbf6ac1e0c71710fd32efb49e446cf0621e4726b662c6a018722026bd47f899520fffa18571d6f91e0e8cfdddc
-MISC metadata.xml 289 BLAKE2B b5cc1f1bd248b84fc58a4c5cb03a358f1c15334b75344ccf92d4e0bfa897152d70bdb65f4cdac8a558dc8f629f2e1352405893abc884710e30c9b12af495129b SHA512 c9e1eca7327950313ac8d39abbf957e364084997857910dfe3653a105537ed0e074bff0b15732583270bace998faa5a1e0d9c572da10edf3c7d6cee20a7f7ab0
+MISC metadata.xml 245 BLAKE2B 0695a0d9826be5898cc9f30d1f697926fc5a958945309f7771638de2ca10adb7d7c5714a99d20c10d6a845b362202f0014dbc4f5e035ef0f26e6124a562b3fea SHA512 8aedef9aa5734dc09a2253a735f706551ec92ff2bc56c593c6c973fcfe6343820490763e52f6fcf26593c4a0e8dd94daa1c0eba57763464d999f4dfc6454a0b3
diff --git a/net-dialup/wvdial/metadata.xml b/net-dialup/wvdial/metadata.xml
index 0d0a7d6c0c4f..061abe7fe3dd 100644
--- a/net-dialup/wvdial/metadata.xml
+++ b/net-dialup/wvdial/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='person'>
-<email>jer@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">wvstreams</remote-id>
 	</upstream>