gentoo resync : 17.02.2020

27 files changed, 826 insertions, 24 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 27a762aaf744..ecf5a369f591 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/freeradius-client/Manifest b/net-dialup/freeradius-client/Manifest
index b51fcd1adf0d..bf9b7c777cb5 100644
--- a/net-dialup/freeradius-client/Manifest
+++ b/net-dialup/freeradius-client/Manifest
@@ -1,3 +1,3 @@
 DIST freeradius-client-1.1.7.tar.gz 433141 BLAKE2B 3a1ba65eb8b66d28362fd66a905af0a4e12b67e664da2c64dab87616e3787cded58d0c3bf56705bdb879d41f1a9a984cf5256b06eeb382209caebf748f679e12 SHA512 20e79ec97da79f46b334e1c2880803a692885a4038196a4d016094d349f675e2d0521d921140c5ab06703008619417f7a20d3e90cdfc7b3578faccbd232be0ce
-EBUILD freeradius-client-1.1.7.ebuild 835 BLAKE2B 5b548bffd3c62f80dca765826a5852c4e7df9fccd34dced11a334c8c504da69d9610a50d2f631bde1d48ca01c0f239f12ac129bb43be985c1af97c6ee26aedd8 SHA512 649129a0f7000977355fdaf86a50ad3013d384695e8e0b1a0fee36c4d9ee104414baa2563e248d22593fe8eb7b34eaf3bc1616eb039e1823cd8e1bc006b164a5
+EBUILD freeradius-client-1.1.7.ebuild 835 BLAKE2B 3df4755ee9e769b179922fc4b247c6c58d7bbefe7d20b0f82da9d41aa5faae563114c4263dc41d423c9685b8374c2458d3510e4da8c031955cd4594154146cce SHA512 c495996d0892fae8fba0fba4a6721d16727295d92c61ba45fbf2d98f5173dc5ab6f8ba42e946acdcd4e0a3cca52018dd67f253b7d09808897c4af026b420e4b9
 MISC metadata.xml 711 BLAKE2B 9c8b62b863c724f5420b360f919af5b42e7a8d7951a43ba79c871ff54fb88ac3599df12043f792b27cc33fa6ddf71d16c688f90a128a61a2a723812a994544e1 SHA512 9e0758dd57ba13e42d5517aba8c7a6a6f5ede66f0fc6fa62a2a361ab7ba03058032b6a998f93ee24d3ce3050f3757694d8d088c6e09754cfc0652c2b857ef3cc
diff --git a/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild b/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
index 77a157fda148..c138c7f6d582 100644
--- a/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
+++ b/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 193159582feb..7c915ce24453 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,6 +1,8 @@
 AUX freeradius-3.0.18-libressl.patch 2503 BLAKE2B 45b5ca45af2bb145f5876892d02686f0896fb0cdafdf0deb00789e5c927c74b4a6793b9084208a3ae282947241d949ef1a84c621bbd7c9c90907624062d1a1cd SHA512 4dd638736c23af2428481ff6f1dd247f29ee11205bc88b9f59347a9d0baa504f67bc4139c854e52a8ca95a39ab70e72c54bcc58a18f752b07f62bf029626204a
 AUX freeradius-3.0.18-systemd-service.patch 1131 BLAKE2B 468fb9e26d5890c643f8fef2d6677a9d8fea8c6457c7d540ff6f1c7a3a8e9cd91afe67acaf7349e0e8063d8b15bf776e7fb6d005ae397de25dab71619c2af1d6 SHA512 ef28a98720fceeddaeabc5d99b3448322b59ef00848604a872067d9ebdf5288a0d7bdd857436e0769fe9e26c83cc220df9cf569e90a72588e6f2d6c081bbaf48
 AUX freeradius-3.0.19-systemd-service.patch 1894 BLAKE2B a82f328e15141ad725530031b083b687ead04f55af5a8225feb6342b07e471f9d0dc4158e08e72cd6554b394caf94291f920b54d91eac729b0c1a3499eb6a2d0 SHA512 6e24202101a40937d91a1faed198e7855b9a1b115f1d652783b5e0632bef84667303f220465327c18709a4e51cf9c4d1378822909d9bdd5733bd276492cfca46
+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.service 392 BLAKE2B c45290bf56e49244da8f135fb7f1726db7e73d66b24b970926065100e047bd8abcff55d164f5274b092a6735132eca898e271666ed9c9e9062b01fe4ef145f84 SHA512 c2e153f0e8543758dff81835b17c6221ca031fc66f17828b6380d40501c8b6f6ed7e33096218e44326f731245c24386427bb3c9eda48ac185b67104fc878b692
 AUX freeradius.tmpfiles 36 BLAKE2B 612c6ca79a678a3a82114ec142d33aa831b5b19c3e6774b2332334bffbeeb592aeac43d443a5f8fc1380528f3a5de4cfe125eb388d36c0b4f1f7f84f2bfb36bc SHA512 cf364cd860588318d49089946739bb30a6259a5aa7977c768155449fbb495473fe24c1ddccc75dc822e25b1f0d404589d7606590fd2018cc6503dd2767463a7c
 AUX radius.conf-r4 465 BLAKE2B 1c17f57c088be0612b3db23e8a909d7e1f6fc114d3ff31ee1c82f199e3962db57f3042498cf135b3a29c8a730695ed99612e490e0b3253f0644462d28f61215d SHA512 4142869fb61b2938232002c9cb5b843590785560da7db4f2b2a9c9d55c76d0e2d4a6cb946a5347dfa505cd82f5e86c7315cf71f3443a86632090cf4bd025748a
@@ -9,8 +11,10 @@ DIST freeradius-server-3.0.15.tar.gz 4818244 BLAKE2B 24cded2c4f0c6fc6a6135058c40
 DIST freeradius-server-3.0.17.tar.gz 4843020 BLAKE2B 9e1f54a9f5ad8ede471881ffe4ec987c3ac655a3c39fcd920094760c006102be02f3b7f25b14379a0bac876ac0944e8698c2781bbd804cd22d8b915b6c13a693 SHA512 381222e452288c56a1bf68953be57379a5568f0c92de022abc3004cc6a15078d46535b867b31801de3eb096ba7af92e745e79decfa7cc8151a1ffb371b1aea79
 DIST freeradius-server-3.0.18.tar.gz 4884192 BLAKE2B 21df490f5eba4e0eca42127181fa02a9451abf5fc2b0d7c5e6d0c5c287eda739585500a31f480dccc618c3bbb4096fbe9258c1b2d3a2047951abf85d68784862 SHA512 b81c40cd22170adb1126b9dde6dd84411dfafce33e27da6c4665cb4fc524aab854a7cd4c80757db50899604d7980aec7216e1c53b8184af482c7113692a26458
 DIST freeradius-server-3.0.19.tar.gz 4886632 BLAKE2B 6e9b73eaa29344e4efca6ad19d8e86df8c625921441712b71cb54c2b0db78fc909748da42be837a9170fb6312be22f236956f0d2b169050a37ac8c4de143cc96 SHA512 8a914e2ad1fbeb4cf8c00aaf7eaa154ea17f70e4d58734716bfaf71b3ddef9f8f63a4d3217bdc07dfa776273e5bf090bc98f7bb16f5b565339ddc3b9c13e091f
+DIST freeradius-server-3.0.20.tar.gz 5002727 BLAKE2B f481ad22105694a4af3f0f0c1b4f6e395e8da0fe65274e32ebeed07e3c9b1869029e6ffbc655cfa41d5de2a1dcba54acee33a7a10d28bfbfce791b7ccd0fc57a SHA512 513ed0a5d9e6b9a8d89a9b02c86ff528a9ff14d928f4c1040ca44702465abd711588fe6afa35554cb2c8e8bd7f19dd5be3dbc78445c62c7b00bf5cbc4c621312
 EBUILD freeradius-3.0.15.ebuild 6054 BLAKE2B 9b9f62eb1f4a3aa24d9640e6ff82df0b0185105e9808976ddf04881ccf81ed430c0e8695d9c8c9c020a16adb329b0f378421a5e041ac4e8070ea953a2ef61c86 SHA512 a040769cb5aa338017eddd9b440920b847860565bd8ac29e020a520714dc52e2e7007fabb82226db006bf108502230822a92e1601c59294545b157ea7d900a07
 EBUILD freeradius-3.0.17.ebuild 6727 BLAKE2B 0f42808b329fef66e7eb28e6ae5abc32108b138714f5429348bb00373f620b5ea68662812e16bec992d2664ea37adf9a800b07c883fd2d4b978ebace1b56e650 SHA512 c3ed93033d57754f53ea2d5b0d1cab63119561784ae761423c357e5aeea8f1963729f80b19a9a7beb253fd51a601a5e2751f301c55de39ce22a9ab3a27762638
 EBUILD freeradius-3.0.18-r1.ebuild 6874 BLAKE2B b35457da5edffb5679a6baa9af427d5efc8ebd9eec314beae928a20ae7b0be3523914e30bc6225a0bb9e471f2e8fd8b4630113ed3bcc82da7be26d6505cfda73 SHA512 a44785b4c7629c44af02bb29f60a1f6a973b351dded93b0470e39d29a2a2861a68e187ccd7a6f239c38b46c86b833c7fff7e9956a5045d57b949443d9a628a18
 EBUILD freeradius-3.0.19.ebuild 6855 BLAKE2B ff9866d2d69ccfd9b9fd0e9d9689140b8d84f1103dd7d5f85053954d79ecb3189e98c475272dd0c01957e9ca048aea995401a1ca6aeeadf50b4209cbcb6b1556 SHA512 9cf421d3ecc09ba3c40ba6e60bb2111f4587aa2e84a90040c19e040d6b5a1cc6f46e71ca0c2ff5d7e44f41d6502609ead1030cd3ba9d5ca2b4deedbbe3d590d1
-MISC metadata.xml 783 BLAKE2B c543f46ba6b40f3a290a1610016a65be011feeb5f9876c44f4c0957580dadef153f90a0779717d435f5f74da66c6ae2b00db43a7f1292c7543a3ec426181ec5d SHA512 77860b155c6fd58008b229cc5ad1b36644efdb9ccddcf1767e36afed25ab975a43726bcde80b17399a19644577212631aa1043e8e6a430a560c33969d8ac613b
+EBUILD freeradius-3.0.20.ebuild 7584 BLAKE2B 9058ed180c90492da0e4b79a2847018c6357faefd31973a5eea4b7aa9b43081ece91029d65c1e09c30b0a3c2d8a3260ff574a4dcbde04178507fb39e7cf33b1d SHA512 5fd71f36f7e6e9246a65700653bdd0eebf7c0d22d2194d421722eb91c03928cf23cdbe8b87789f6de7a4e4aa78090054de1bf1e30657d6a047a3cd333fb99a47
+MISC metadata.xml 864 BLAKE2B 5df7dfc698cebaaf850dfffedd8bfc9b7f30a947fdc7072b86b6e557bcf0f2548564260fb2ae073ea5adb5d1a37a5363e122691f748588561e26f5e452176934 SHA512 e36f1c6447cc565efb1523b931f670e944a5cd5eac9176bf42be13db907c7afea6d8ab860f77e739beec25f1b74012fe53987da5c48e6a7b928e335614e679cc
diff --git a/net-dialup/freeradius/files/freeradius-3.0.20-py3-fixes.patch b/net-dialup/freeradius/files/freeradius-3.0.20-py3-fixes.patch
new file mode 100644
index 000000000000..83dc20090ed2
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-3.0.20-py3-fixes.patch
@@ -0,0 +1,472 @@
+diff --git a/raddb/mods-available/python3 b/raddb/mods-available/python3
+index 246dfd74ce..0593c69f1a 100644
+--- a/raddb/mods-available/python3
++++ b/raddb/mods-available/python3
+@@ -13,7 +13,7 @@ python3 {
+ 	#  item is GLOBAL TO THE SERVER.  That is, you cannot have two
+ 	#  instances of the python module, each with a different path.
+ 	#
+-#        python_path="/path/to/python/files:/another_path/to/python_files/"
++#	python_path="${modconfdir}/${.:name}:/another_path/to/python_files"
+ 
+ 	module = example
+ 
+diff --git a/src/modules/rlm_python3/configure.ac b/src/modules/rlm_python3/configure.ac
+index a00320fda4..295a2486d2 100644
+--- a/src/modules/rlm_python3/configure.ac
++++ b/src/modules/rlm_python3/configure.ac
+@@ -8,128 +8,75 @@ if test x$with_[]modname != xno; then
+ 	AC_PROG_CC
+ 	AC_PROG_CPP
+ 
+-	dnl extra argument: --with-rlm-python3-bin
+-	PYTHON3_BIN=
+-	AC_ARG_WITH(rlm-python3-bin,
+-	[  --with-rlm-python3-bin=PATH   Path to python3 binary []],
++	dnl extra argument: --with-rlm-python3-config-bin
++	PYTHON3_CONFIG_BIN=
++	AC_ARG_WITH(rlm-python3-config-bin,
++	[  --with-rlm-python3-config-bin=PATH   Path to python-config3 binary []],
+ 	[ case "$withval" in
+ 	    no)
+-		AC_MSG_ERROR(Need rlm-python3-bin)
++		AC_MSG_ERROR(Need rlm-python3-config-bin)
+ 		;;
+ 	    yes)
+ 		;;
+ 	    *)
+-		PYTHON3_BIN="$withval"
++		PYTHON3_CONFIG_BIN="$withval"
+ 		;;
+ 	  esac ]
+ 	)
+ 
+-	if test "x$PYTHON3_BIN" = x; then
+-		AC_CHECK_PROGS(PYTHON3_BIN, [ python3 ], not-found, [${PATH}:/usr/bin:/usr/local/bin])
++	if test "x$PYTHON3_CONFIG_BIN" = x; then
++		AC_CHECK_PROGS(PYTHON3_CONFIG_BIN, [ python3-config ], not-found, [${PATH}:/usr/bin:/usr/local/bin])
+ 	fi
+ 
+-	if test "x$PYTHON3_BIN" = "xnot-found"; then
+-		fail="python-binary"
+-	fi
+-
+-	dnl extra argument: --with-rlm-python3-lib-dir
+-	PY_LIB_DIR=
+-	AC_ARG_WITH(rlm-python3-lib-dir,
+-	[  --with-rlm-python3-lib-dir=DIR       Directory for Python library files []],
+-	[ case "$withval" in
+-	    no)
+-		AC_MSG_ERROR(Need rlm-python3-lib-dir)
+-		;;
+-	    yes)
+-		;;
+-	    *)
+-		PY_LIB_DIR="$withval"
+-		;;
+-	  esac ]
+-	)
+-
+-	dnl extra argument: --with-rlm-python3-include-dir
+-	PY_INC_DIR=
+-	AC_ARG_WITH(rlm-python3-include-dir,
+-	[  --with-rlm-python3-include-dir=DIR   Directory for Python include files []],
+-	[ case "$withval" in
+-	    no)
+-		AC_MSG_ERROR(Need rlm-python3-include-dir)
+-		;;
+-	    yes)
+-		;;
+-	    *)
+-		PY_INC_DIR="$withval"
+-		;;
+-	  esac ]
+-	)
+-
+-	if test x$fail = x; then
+-		PY_PREFIX=`${PYTHON3_BIN} -c 'import sys ; print(sys.prefix)'`
+-		AC_MSG_NOTICE([Python sys.prefix \"${PY_PREFIX}\"])
+-
+-		PY_EXEC_PREFIX=`${PYTHON3_BIN} -c 'import sys ; print(sys.exec_prefix)'`
+-		AC_MSG_NOTICE([Python sys.exec_prefix \"${PY_EXEC_PREFIX}\"])
+-
+-		PY_SYS_VERSION=`${PYTHON3_BIN} -c 'import sys ; print(sys.version[[0:3]])'`
+-		AC_MSG_NOTICE([Python sys.version \"${PY_SYS_VERSION}\"])
+-
+-		if test "x$PY_LIB_DIR" = "x"; then
+-			PY_LIB_DIR="$PY_EXEC_PREFIX/lib/python${PY_SYS_VERSION}/config"
+-			PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python${PY_SYS_VERSION}/config"
+-		fi
+-
+-		PY_MAKEFILE="$PY_EXEC_PREFIX/lib/python${PY_SYS_VERSION}/config/Makefile"
+-		if test -f ${PY_MAKEFILE}; then
+-			PY_LOCAL_MOD_LIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE | sed -e 's/[[[:blank:]]]/ /g;s/^ *//;s/ *$//'`
+-			AC_MSG_NOTICE([Python local_mod_libs \"${PY_LOCAL_MOD_LIBS}\"])
+-
+-			PY_BASE_MOD_LIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE | sed -e 's/[[[:blank:]]]/ /g;s/^ *//;s/ *$//'`
+-			AC_MSG_NOTICE([Python base_mod_libs \"${PY_BASE_MOD_LIBS}\"])
+-
+-			PY_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PY_MAKEFILE | sed -e 's/[[[:blank:]]]/ /g;s/  / /g;s/^ *//;s/ *$//'`
+-			PY_OTHER_LDFLAGS=`sed -n -e 's/^LINKFORSHARED=\(.*\)/\1/p' $PY_MAKEFILE | sed -e 's/[[[:blank:]]]/ /g;s/  / /g;s/^ *//;s/ *$//'`
+-			AC_MSG_NOTICE([Python other_libs \"${PY_OTHER_LDFLAGS} ${PY_OTHER_LIBS}\"])
+-		fi
+-		PY_EXTRA_LIBS="$PY_LOCALMODLIBS $PY_BASE_MOD_LIBS $PY_OTHER_LIBS"
++	if test "x$PYTHON3_CONFIG_BIN" = xnot-found; then
++		fail="$fail python3-config"
++	else
++		dnl #
++		dnl # It is necessary due to a weird behavior with 'python3-config'
++		dnl #
++		old_CFLAGS="$CFLAGS"
++		unset CFLAGS
++
++		python3_cflags=`${PYTHON3_CONFIG_BIN} --cflags`
++		AC_MSG_NOTICE([${PYTHON3_CONFIG_BIN}'s cflags were \"${python3_cflags}\"])
++
++		dnl # Convert -I to -isystem to get rid of warnings about issues in Python headers
++		dnl # Strip -systemroot
++		dnl # Strip optimisation flags (-O[0-9]?). We decide our optimisation level, not python.
++		dnl # -D_FORTIFY_SOURCE needs -O.
++		dnl # Strip debug symbol flags (-g[0-9]?). We decide on debugging symbols, not python
++		dnl # Strip -W*, we decide what warnings are important
++		dnl # Strip -DNDEBUG
++		mod_cflags=`echo $python3_cflags | sed -e '\
++			s/-I/-isystem/g;\
++			s/-isysroot[[ =]]\{0,1\}[[^-]]*//g;\
++			s/-O[[^[[:blank:]]]]*//g;\
++			s/-Wp,-D_FORTIFY_SOURCE=[[[:digit:]]]//g;\
++			s/-g[[^ ]]*//g;\
++			s/-W[[^ ]]*//g;\
++			s/-DNDEBUG[[[:blank:]]]*//g;
++			'`
++		AC_MSG_NOTICE([Sanitized cflags were \"${mod_cflags}\"])
++
++		python3_ldflags=`${PYTHON3_CONFIG_BIN} --ldflags`
++		AC_MSG_NOTICE([${PYTHON3_CONFIG_BIN}'s ldflags were \"$python3_ldflags}\"])
++
++		dnl # Strip -Wl,-O1... Is -O even a valid linker flag??
++		dnl # Strip -Wl,-Bsymbolic-functions as thats not always supported or required
++		dnl # Strip -Xlinker -export-dynamic as it causes weird linking issues on Linux
++		dnl #   See: https://bugs.python.org/issue36508
++		mod_ldflags=`echo $python3_ldflags | sed -e '\
++			s/-Wl,-O[[[:digit:]]][[[:blank:]]]*//g;\
++			s/-Wl,-Bsymbolic-functions[[[:blank:]]]*//g;\
++			s/-Xlinker -export-dynamic//g;\
++			s/-Wl,-stack_size,[[[:digit:]]]*[[[:blank:]]]//g;
++			'`
++		AC_MSG_NOTICE([Sanitized ldflags were \"${mod_ldflags}\"])
+ 
+-		old_CFLAGS=$CFLAGS
+-		CFLAGS="$CFLAGS $PY_CFLAGS"
+-		smart_try_dir="$PY_PREFIX/include/python$PY_SYS_VERSION"
+-		FR_SMART_CHECK_INCLUDE(Python.h)
+ 		CFLAGS=$old_CFLAGS
+ 
+-		if test "x$ac_cv_header_Python_h" = "xyes"; then
+-			mod_cflags="$SMART_CPPFLAGS"
+-		else
+-			fail="$fail Python.h"
+-			targetname=
+-		fi
+-
+-		old_LIBS=$LIBS
+-		LIBS="$LIBS $PY_LIB_LOC $PY_EXTRA_LIBS -lm"
+-		smart_try_dir=$PY_LIB_DIR
+-		FR_SMART_CHECK_LIB(python${PY_SYS_VERSION}, Py_Initialize)
+-		LIBS=$old_LIBS
+-
+-		eval t=\${ac_cv_lib_${sm_lib_safe}_${sm_func_safe}}
+-		if test "x$t" = "xyes"; then
+-			mod_ldflags="$PY_LIB_LOC $PY_EXTRA_LIBS $SMART_LIBS -lm"
+-			targetname=modname
+-		else
+-			FR_SMART_CHECK_LIB(python${PY_SYS_VERSION}m, Py_Initialize)
+-			eval t=\${ac_cv_lib_${sm_lib_safe}_${sm_func_safe}}
+-			if test "x$t" = "xyes"; then
+-				mod_ldflags="$PY_LIB_LOC $PY_EXTRA_LIBS $SMART_LIBS -lm"
+-				targetname=modname
+-			else
+-				targetname=
+-				fail="$fail libpython$PY_SYS_VERSION"
+-			fi
+-		fi
++		targetname="rlm_python3"
+ 	fi
+-
+-	AC_CHECK_FUNCS([dl_iterate_phdr])
+ else
+ 	targetname=
+ 	echo \*\*\* module modname is disabled.
+diff --git a/src/modules/rlm_python3/rlm_python3.c b/src/modules/rlm_python3/rlm_python3.c
+index 06187e4ffa..8e893a0eaa 100644
+--- a/src/modules/rlm_python3/rlm_python3.c
++++ b/src/modules/rlm_python3/rlm_python3.c
+@@ -67,8 +67,10 @@ static CONF_PARSER module_config[] = {
+ 	A(preacct)
+ 	A(accounting)
+ 	A(checksimul)
++#ifdef WITH_PROXY
+ 	A(pre_proxy)
+ 	A(post_proxy)
++#endif
+ 	A(post_auth)
+ #ifdef WITH_COA
+ 	A(recv_coa)
+@@ -98,7 +100,9 @@ static struct {
+ 	A(L_AUTH)
+ 	A(L_INFO)
+ 	A(L_ERR)
++#ifdef WITH_PROXY
+ 	A(L_PROXY)
++#endif
+ 	A(L_ACCT)
+ 	A(L_DBG_WARN)
+ 	A(L_DBG_ERR)
+@@ -510,6 +514,7 @@ static rlm_rcode_t do_python_single(REQUEST *request, PyObject *pFunc, char cons
+ 			goto finish;
+ 		}
+ 
++#ifdef WITH_PROXY
+ 		/* fill proxy vps */
+ 		if (request->proxy) {
+ 			if (!mod_populate_vps(pArgs, 4, request->proxy->vps)) {
+@@ -517,10 +522,13 @@ static rlm_rcode_t do_python_single(REQUEST *request, PyObject *pFunc, char cons
+ 				ret = RLM_MODULE_FAIL;
+ 				goto finish;
+ 			}
+-		} else {
++		} else
++#endif
++		{
+ 			mod_populate_vps(pArgs, 4, NULL);
+ 		}
+ 
++#ifdef WITH_PROXY
+ 		/* fill proxy_reply vps */
+ 		if (request->proxy_reply) {
+ 			if (!mod_populate_vps(pArgs, 5, request->proxy_reply->vps)) {
+@@ -528,7 +536,9 @@ static rlm_rcode_t do_python_single(REQUEST *request, PyObject *pFunc, char cons
+ 				ret = RLM_MODULE_FAIL;
+ 				goto finish;
+ 			}
+-		} else {
++		} else
++#endif
++		{
+ 			mod_populate_vps(pArgs, 5, NULL);
+ 		}
+ 
+@@ -550,9 +560,14 @@ static rlm_rcode_t do_python_single(REQUEST *request, PyObject *pFunc, char cons
+ 		    PyDict_SetItemString(pDictInput, "request", PyTuple_GET_ITEM(pArgs, 0)) ||
+ 		    PyDict_SetItemString(pDictInput, "reply", PyTuple_GET_ITEM(pArgs, 1)) ||
+ 		    PyDict_SetItemString(pDictInput, "config", PyTuple_GET_ITEM(pArgs, 2)) ||
+-		    PyDict_SetItemString(pDictInput, "session-state", PyTuple_GET_ITEM(pArgs, 3)) ||
++		    PyDict_SetItemString(pDictInput, "session-state", PyTuple_GET_ITEM(pArgs, 3))
++#ifdef WITH_PROXY
++		    ||
+ 		    PyDict_SetItemString(pDictInput, "proxy-request", PyTuple_GET_ITEM(pArgs, 4)) ||
+-		    PyDict_SetItemString(pDictInput, "proxy-reply", PyTuple_GET_ITEM(pArgs, 5))) {
++		    PyDict_SetItemString(pDictInput, "proxy-reply", PyTuple_GET_ITEM(pArgs, 5))
++#endif
++		    ) {
++
+ 			ERROR("%s:%d, %s - PyDict_SetItemString failed", __func__, __LINE__, funcname);
+ 			ret = RLM_MODULE_FAIL;
+ 			goto finish;
+@@ -819,8 +834,10 @@ MOD_FUNC(authorize)
+ MOD_FUNC(preacct)
+ MOD_FUNC(accounting)
+ MOD_FUNC(checksimul)
++#ifdef WITH_PROXY
+ MOD_FUNC(pre_proxy)
+ MOD_FUNC(post_proxy)
++#endif
+ MOD_FUNC(post_auth)
+ #ifdef WITH_COA
+ MOD_FUNC(recv_coa)
+@@ -1102,7 +1119,7 @@ static int python_interpreter_init(rlm_python_t *inst, CONF_SECTION *conf)
+ 		python_dlhandle = dlopen_libpython(RTLD_NOW | RTLD_GLOBAL);
+ 		if (!python_dlhandle) WARN("Failed loading libpython symbols into global symbol table");
+ 
+-#if PY_VERSION_HEX > 0x03050000
++#if PY_VERSION_HEX >= 0x03050000
+ 		{
+ 			wchar_t  *name;
+ 
+@@ -1110,13 +1127,6 @@ static int python_interpreter_init(rlm_python_t *inst, CONF_SECTION *conf)
+ 			Py_SetProgramName(name);		/* The value of argv[0] as a wide char string */
+ 			PyMem_RawFree(name);
+ 		}
+-#elif PY_VERSION_HEX > 0x0300000
+-		{
+-			wchar_t *name;
+-
+-			MEM(name = _Py_char2wchar(main_config.name, NULL));
+-			Py_SetProgramName(inst->wide_name);		/* The value of argv[0] as a wide char string */
+-		}
+ #else
+ 		{
+ 			char *name;
+@@ -1163,37 +1173,34 @@ static int python_interpreter_init(rlm_python_t *inst, CONF_SECTION *conf)
+ 		 *	the lifetime of the module.
+ 		 */
+ 		if (inst->python_path) {
++			char *p, *path;
++			PyObject *sys = PyImport_ImportModule("sys");
++			PyObject *sys_path = PyObject_GetAttrString(sys, "path");
++
++			memcpy(&p, &inst->python_path, sizeof(path));
++
++			for (path = strtok(p, ":"); path != NULL; path = strtok(NULL, ":")) {
+ #if PY_VERSION_HEX > 0x03050000
+-			{
+-				wchar_t *path;
+-				PyObject* sys = PyImport_ImportModule("sys");
+-				PyObject* sys_path = PyObject_GetAttrString(sys,"path");
+-
+-				MEM(path = Py_DecodeLocale(inst->python_path, NULL));
+-				PyList_Append(sys_path, PyUnicode_FromWideChar(path,-1));				
+-				PyObject_SetAttrString(sys,"path",sys_path);
+-				PyMem_RawFree(path);
+-			}
++				wchar_t *py_path;
++
++				MEM(py_path = Py_DecodeLocale(path, NULL));
++				PyList_Append(sys_path, PyUnicode_FromWideChar(py_path, -1));
++				PyMem_RawFree(py_path);
+ #elif PY_VERSION_HEX > 0x03000000
+-			{
+-				wchar_t *path;
+-				PyObject* sys = PyImport_ImportModule("sys");
+-				PyObject* sys_path = PyObject_GetAttrString(sys,"path");
+-
+-				MEM(path = _Py_char2wchar(inst->python_path, NULL));
+-				PyList_Append(sys_path, PyUnicode_FromWideChar(path,-1));				
+-				PyObject_SetAttrString(sys,"path",sys_path);
+-			}
+-#else
+-			{
+-				char *path;
++				wchar_t *py_path;
+ 
+-				memcpy(&path, &inst->python_path, sizeof(path));
+-				Py_SetPath(path);
+-			}
++				MEM(py_path = _Py_char2wchar(path, NULL));
++				PyList_Append(sys_path, PyUnicode_FromWideChar(py_path, -1));
++				PyMem_RawFree(py_path);
++#else
++				PyList_Append(sys_path, PyLong_FromString(path));
+ #endif
+-		}
++			}
+ 
++			PyObject_SetAttrString(sys, "path", sys_path);
++			Py_DecRef(sys);
++			Py_DecRef(sys_path);
++		}
+ 	} else {
+ 		inst->module = main_module;
+ 		Py_IncRef(inst->module);
+@@ -1220,7 +1227,7 @@ static int python_interpreter_init(rlm_python_t *inst, CONF_SECTION *conf)
+ static int mod_instantiate(CONF_SECTION *conf, void *instance)
+ {
+ 	rlm_python_t	*inst = instance;
+-	int		code = 0;
++	int		code = RLM_MODULE_OK;
+ 
+ 	inst->name = cf_section_name2(conf);
+ 	if (!inst->name) inst->name = cf_section_name1(conf);
+@@ -1245,8 +1252,10 @@ static int mod_instantiate(CONF_SECTION *conf, void *instance)
+ 	PYTHON_FUNC_LOAD(preacct);
+ 	PYTHON_FUNC_LOAD(accounting);
+ 	PYTHON_FUNC_LOAD(checksimul);
++#ifdef WITH_PROXY
+ 	PYTHON_FUNC_LOAD(pre_proxy);
+ 	PYTHON_FUNC_LOAD(post_proxy);
++#endif
+ 	PYTHON_FUNC_LOAD(post_auth);
+ #ifdef WITH_COA
+ 	PYTHON_FUNC_LOAD(recv_coa);
+@@ -1257,12 +1266,14 @@ static int mod_instantiate(CONF_SECTION *conf, void *instance)
+ 	/*
+ 	 *	Call the instantiate function.
+ 	 */
+-	code = do_python_single(NULL, inst->instantiate.function, "instantiate", inst->pass_all_vps, inst->pass_all_vps_dict);
+-	if (code < 0) {
+-	error:
+-		python_error_log();	/* Needs valid thread with GIL */
+-		PyEval_SaveThread();
+-		return -1;
++	if (inst->instantiate.function) {
++		code = do_python_single(NULL, inst->instantiate.function, "instantiate", inst->pass_all_vps, inst->pass_all_vps_dict);
++		if (code < 0) {
++		error:
++			python_error_log();	/* Needs valid thread with GIL */
++			PyEval_SaveThread();
++			return -1;
++		}
+ 	}
+ 	PyEval_SaveThread();
+ 
+@@ -1272,22 +1283,31 @@ static int mod_instantiate(CONF_SECTION *conf, void *instance)
+ static int mod_detach(void *instance)
+ {
+ 	rlm_python_t *inst = instance;
+-	int	     ret;
++	int	     ret = RLM_MODULE_OK;
+ 
+ 	/*
+ 	 *	Call module destructor
+ 	 */
+ 	PyEval_RestoreThread(inst->sub_interpreter);
+ 
+-	ret = do_python_single(NULL, inst->detach.function, "detach", inst->pass_all_vps, inst->pass_all_vps_dict);
++	if (inst->detach.function) ret = do_python_single(NULL, inst->detach.function, "detach", inst->pass_all_vps, inst->pass_all_vps_dict);
+ 
+ #define PYTHON_FUNC_DESTROY(_x) python_function_destroy(&inst->_x)
+ 	PYTHON_FUNC_DESTROY(instantiate);
+-	PYTHON_FUNC_DESTROY(authorize);
+ 	PYTHON_FUNC_DESTROY(authenticate);
++	PYTHON_FUNC_DESTROY(authorize);
+ 	PYTHON_FUNC_DESTROY(preacct);
+ 	PYTHON_FUNC_DESTROY(accounting);
+ 	PYTHON_FUNC_DESTROY(checksimul);
++#ifdef WITH_PROXY
++	PYTHON_FUNC_DESTROY(pre_proxy);
++	PYTHON_FUNC_DESTROY(post_proxy);
++#endif
++	PYTHON_FUNC_DESTROY(post_auth);
++#ifdef WITH_COA
++	PYTHON_FUNC_DESTROY(recv_coa);
++	PYTHON_FUNC_DESTROY(send_coa);
++#endif
+ 	PYTHON_FUNC_DESTROY(detach);
+ 
+ 	Py_DecRef(inst->pythonconf_dict);
+@@ -1313,14 +1333,8 @@ static int mod_detach(void *instance)
+ 		PyThreadState_Swap(main_interpreter); /* Swap to the main thread */
+ 		Py_Finalize();
+ 		dlclose(python_dlhandle);
+-
+-#if PY_VERSION_HEX > 0x03050000
+-		//if (inst->wide_name) PyMem_RawFree(inst->wide_name);
+-		//if (inst->wide_path) PyMem_RawFree(inst->wide_path);
+-#endif
+ 	}
+ 
+-
+ 	return ret;
+ }
+ 
+@@ -1348,8 +1362,10 @@ module_t rlm_python3 = {
+ 		[MOD_PREACCT]		= mod_preacct,
+ 		[MOD_ACCOUNTING]	= mod_accounting,
+ 		[MOD_SESSION]		= mod_checksimul,
++#ifdef WITH_PROXY
+ 		[MOD_PRE_PROXY]		= mod_pre_proxy,
+ 		[MOD_POST_PROXY]	= mod_post_proxy,
++#endif
+ 		[MOD_POST_AUTH]		= mod_post_auth,
+ #ifdef WITH_COA
+ 		[MOD_RECV_COA]		= mod_recv_coa,
diff --git a/net-dialup/freeradius/files/freeradius-3.0.20-systemd-service.patch b/net-dialup/freeradius/files/freeradius-3.0.20-systemd-service.patch
new file mode 100644
index 000000000000..04223657d5f5
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-3.0.20-systemd-service.patch
@@ -0,0 +1,57 @@
+diff --git a/debian/freeradius.service b/debian/freeradius.service
+index 378702d184..ee33c2a294 100644
+--- a/debian/freeradius.service
++++ b/debian/freeradius.service
+@@ -7,7 +7,6 @@ Documentation=man:radiusd(8) man:radiusd.conf(5) http://wiki.freeradius.org/ htt
+ Type=notify
+ WatchdogSec=60
+ NotifyAccess=all
+-EnvironmentFile=-/etc/default/freeradius
+ 
+ # FreeRADIUS can do static evaluation of policy language rules based
+ # on environmental variables which is very useful for doing per-host
+@@ -25,16 +24,15 @@ MemoryLimit=2G
+ # Ensure the daemon can still write its pidfile after it drops
+ # privileges. Combination of options that work on a variety of
+ # systems. Test very carefully if you alter these lines.
+-RuntimeDirectory=freeradius
++RuntimeDirectory=radiusd
+ RuntimeDirectoryMode=0775
+ # This does not work on Debian Jessie:
+-User=freerad
+-Group=freerad
+-# This does not work on Ubuntu Bionic:
+-ExecStartPre=/bin/chown freerad:freerad /var/run/freeradius
++User=radius
++Group=radius
+ 
+-ExecStartPre=/usr/sbin/freeradius $FREERADIUS_OPTIONS -Cx -lstdout
+-ExecStart=/usr/sbin/freeradius -f $FREERADIUS_OPTIONS
++ExecStartPre=/usr/sbin/radiusd $RADIUSD_OPTIONS -Cx -lstdout
++ExecStart=/usr/sbin/radiusd -f $RADIUSD_OPTIONS
++ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+ RestartSec=5
+ 
+@@ -42,7 +40,7 @@ RestartSec=5
+ NoNewPrivileges=true
+ 
+ # Allow binding to secure ports, broadcast addresses, and raw interfaces.
+-#CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SETUID CAP_SETGID CAP_CHOWN CAP_DAC_OVERRIDE
++CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SETUID CAP_SETGID CAP_CHOWN CAP_DAC_OVERRIDE
+ 
+ # Private /tmp that isn't shared by other processes
+ PrivateTmp=true
+@@ -60,10 +58,10 @@ ProtectKernelTunables=true
+ SystemCallArchitectures=native
+ 
+ # We shouldn't be writing to the configuration directory
+-ReadOnlyDirectories=/etc/freeradius/
++ReadOnlyDirectories=/etc/raddb/
+ 
+ # We can read and write to the log directory.
+-ReadWriteDirectories=/var/log/freeradius/
++ReadWriteDirectories=/var/log/radius/
+ 
+ [Install]
+ WantedBy=multi-user.target
diff --git a/net-dialup/freeradius/freeradius-3.0.20.ebuild b/net-dialup/freeradius/freeradius-3.0.20.ebuild
new file mode 100644
index 000000000000..5d43f28c636d
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-3.0.20.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.18-libressl.patch
+	"${FILESDIR}"/${P}-systemd-service.patch
+	# Fix rlm_python3 build
+	# Backport from rlm_python changes to rlm_python3
+	"${FILESDIR}"/${P}-py3-fixes.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
+
+	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_newtmpfilesd "${FILESDIR}"/freeradius.tmpfiles freeradius.conf
+	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/metadata.xml b/net-dialup/freeradius/metadata.xml
index 0f82cd9f9ed5..6d8b1cc66234 100644
--- a/net-dialup/freeradius/metadata.xml
+++ b/net-dialup/freeradius/metadata.xml
@@ -22,5 +22,8 @@
     <flag name="redis">
       Include support for Redis database
     </flag>
+    <flag name="mongodb">
+      Include support for MongoDB database
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/net-dialup/linux-atm/Manifest b/net-dialup/linux-atm/Manifest
index a456e2993cf5..fce1bd9a81d2 100644
--- a/net-dialup/linux-atm/Manifest
+++ b/net-dialup/linux-atm/Manifest
@@ -1,5 +1,5 @@
 AUX linux-atm-2.5.2-headers.patch 646 BLAKE2B 1a1280f70c9232ddc39b664e1a533258c6bf7a05017f471544d442b69a9f9b73775d914b1433359adbcc571218207ec7413e2a64e67432489a8b417251b32e3d SHA512 4248a0063de9723ca6a3abdd07c5c3f4bda5a43f21bb5d19f931e898abd3e10f52b20c9d1a21415a17bee70ac6bdba83e13704f2a7c5489fb12d6e93a5a8e113
 AUX linux-atm-2.5.2-linux-5.2-SIOCGSTAMP.patch 1204 BLAKE2B 26fb42c7c49a56cdb238d22ab65096e7db684550f0f27c208262a2b2b73f790aa3bf4cea65bab176317c444deaf58a4a717e8a83cdb5d2f59474aa6cec814a23 SHA512 0ded21ca8f7f49522611c76d2c161d5f5e2dceeeccf29241d97b57154addd53e0e0101a7ecea648251e264ee88096313dff608b0bd46c53b140be02a4f2cedff
 DIST linux-atm-2.5.2.tar.gz 1082256 BLAKE2B 329aad437a1e6a17fd7d7d2b81c976a76c684aaf127006ed3af1e998a0f52df056747cc84fc13c933dc15c07246f1f00e4ff101ac98ef1dd1bea102830a83625 SHA512 0a50e91513e4e1f882dc6f4792dc032e89497ff745c0eaea0c0c848b0f84e40d19e038e4ab5aa70c1f915c28a9f845340c332ac5c3ae838b8f539466e10a0a08
-EBUILD linux-atm-2.5.2.ebuild 948 BLAKE2B 5a999204b62fc0bb6699d6233e7f190ca94ba16251fb9b989623b66decfe7cb5943100720e0fe91cf1e38badde5cb205d60f3569c416f261e34e46c20b4b9711 SHA512 ca32fe9dc2e1b050a1034128ac438fe6de88b4ccbd1a6ca1d02d2305c7a763b20a1c382f214d7e0c7bd03b9441d7de61155f69d9c1b81b1e7f72214fc1632800
+EBUILD linux-atm-2.5.2.ebuild 956 BLAKE2B 6646fb4bfd14c5536452ae29c8305ebe14d3ea128f90a4fb4f77b3ce1d2e5be408a26a7c70e7817eddc091ae62b6496993c6eb7ec0562e27a580e3399f06754b SHA512 afcb9f7341c73caa314c76650f8747f9b76e11be7d81c39455ef10734c927001b9d556c7614bb8b9407ec088b32520ab33bf87ed2d9d50c7b9e728ff126e7a0b
 MISC metadata.xml 303 BLAKE2B 064756eecade63aaa1040f2712c005a677f365f7c6e6bb5743c4cf8deb59bee599f42b3b38160e5e2a04402a9b2167e618b4f891cc80a30a3e48b2f7851813ac SHA512 86ae1e28bb9f9d2db0a9607d58dd8cb48f96e76c4aaf5e7027f9ae792ef41ca6ac8da92adf13a40c4bcc1bd2cbea67cd4535232116616f687011c777789bc79b
diff --git a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild b/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
index 7bc4fa72eed5..ef811883bab2 100644
--- a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
+++ b/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils flag-o-matic libtool linux-info
+inherit eutils flag-o-matic libtool linux-info ltprune
 
 DESCRIPTION="Tools for ATM"
 HOMEPAGE="http://linux-atm.sourceforge.net/"
diff --git a/net-dialup/lrzsz/Manifest b/net-dialup/lrzsz/Manifest
index ea8baa89f577..9b6f65a7165d 100644
--- a/net-dialup/lrzsz/Manifest
+++ b/net-dialup/lrzsz/Manifest
@@ -4,5 +4,5 @@ AUX lrzsz-0.12.20-gettext-0.20.patch 850 BLAKE2B f3d810b7335c33f1e28247cd7a68d50
 AUX lrzsz-autotools.patch 8725 BLAKE2B 8f499974f0184784d1e800a43e8fdd09b389bb2a2c48ae335708ca25eb2b7130b5554fcbb8217aa3833ffdf2d0756fe091df615351b4c23214e7889dbf2399aa SHA512 4ba98fb4a72d8fcc654741d57992598d56eded61e7b89c54d44edd7a609149e15d9948d777d70bf41137daa0b860c67e1212a3f38519434cb5d44546bfb94909
 AUX lrzsz-implicit-decl.patch 428 BLAKE2B c08a244d292be32bb49fff6186cbe847c106dee67b3ea463860d1e6387e159af1b106e5f78ea5bce31c347cb7207c95116243fa515e4daafb23d2cc309776480 SHA512 7dd642aa6701671986e6ab1635935c7a8088ad5ee74131b7c486e2e87d748fc835798d1a8a291e85a80ba3f88328ce4f293a8dafb1ebd9924f1f31fb2bd3a7d7
 DIST lrzsz-0.12.20.tar.gz 280938 BLAKE2B 86511ab112da849f5894f18c045f2c8a9dd4c4e97426c1d98c5b91aade6c39e26f4a7e5674e057c9596a240dfd3ef32053fcdc8ee58b33654cf15eec64779b1e SHA512 9bce64036f1f1c65f5910f19802aecaf3dc5ffeab0feeca10fa8d2fe1b83e212391cce23056d22fd0eda52df89e12ede68eb5d22ffcf22f935910d2af7399f12
-EBUILD lrzsz-0.12.20-r4.ebuild 1557 BLAKE2B bb64ce97928188fbf1986c31720444b121fb6821f0d034e93d528b4e0934d9b20405d9ed1c625919028484e2c7b2dfbdfd4162c99e04793a9bc3a330654fae16 SHA512 2beb9a8e59456970396222a89468b4303cb6941a9313030359a2c146bd25d4fca70693491ce55de8e9b84aac9565d9decf5ebfc325d05f6f363e6afec7480432
+EBUILD lrzsz-0.12.20-r4.ebuild 1557 BLAKE2B daa8503d225aea093b19cf6537c4abcc1e44d918f149e05cc4eed92c44e1bb2960939ff6c63eccca6002548447d116377f82c48c793348b6db0fc9a82ff5262f SHA512 b93cce9cc0c1b5e6433a47992b0efaac2c337f53bc3e6c498430896d93eeb91ebfa4d19b490f1c31f31914c2bcdaecb0bd2acc2a76893d2dbcb1f04e0b150968
 MISC metadata.xml 359 BLAKE2B 842a9354b4b11a8894d58eda8cee0a31b60bb74981333e3e8ee383cb8caa1f0ee0577060880b123c3d73fb7cb5562a542c346f04bba3e60c5e40d9ef83a26c26 SHA512 5e033194af9899fd66ee44372089c3e63a2839a486f845ba139786a862f1b0534902465e776d901155ddffb794e7419f338b4c5ed43d6a8301c98ae8dc24db70
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
index e0f0bb399182..6fb0595483fa 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-dialup/mgetty/Manifest b/net-dialup/mgetty/Manifest
index cc2ea544de59..0b0091114a07 100644
--- a/net-dialup/mgetty/Manifest
+++ b/net-dialup/mgetty/Manifest
@@ -7,5 +7,5 @@ AUX mgetty-1.2.1-Lucent.c.patch 622 BLAKE2B 63ffcfddfb13fe07037c5d845b60ceb91710
 AUX mgetty-1.2.1-gentoo.patch 4020 BLAKE2B fa9f609cc93cbc2287e415888bfcafc3f4069ba0ed6a2be93a952010f6a91bb2383948b62a407c37aa738be70aaaaf4715e578f51a9115837f3944c65f39f9d7 SHA512 24c3d98e43d8f573e395f65a500ea6379e6b27c020db81e00f4c3ea5d203d4ad344a29b6540575fd94c9462fdf51ecadff13a703568d51de3dc4fd815e462143
 DIST mgetty-1.2.1.tar.gz 1077415 BLAKE2B 09d48c6cb7917a3dbbfc97c1d32ce43b9a3e64e8a44c8a3a7bfdd168421c287357a9d43504fb4d1b354ffb0f8e2a9c52b56ac3464f196f56064d96a7651e0d6e SHA512 2a82dfb782044d9daf8d41158fa10e991dbd7bd37ab43ea44422166554dd790e989ac49e4ff471d168d1cbb49edc5bedb8762ab61884e4653650686d1bbc2a9b
 EBUILD mgetty-1.2.1-r1.ebuild 4668 BLAKE2B b2fa76ef755ad5ba47e19dbe4d61632246a854f8aeb43f47397703bd654d15bee0fc28755e520365e25cdc43e5d41c5a2a8b61080606952bd1db8d5ebd855919 SHA512 119f44fcef46e779f7b49ebbde90e96708765b824c36a3a0c9976066e509f577f870bd4f67acce0e429dac5d6013aa837cf7c4a13045b8fa4a0b63f809a584a5
-EBUILD mgetty-1.2.1.ebuild 4627 BLAKE2B 9e03403bd91666fdd44da94981d446fb278e5b8190dab575e94f0a440c4a0050ec049dfcc30f11b3b59567fc46f49a7d5f7206c80c73f19782ae1e6c7f0a0cae SHA512 ad845d510748cd8aa15a6358bab11a594dd085104e0c8647684f1bdb62edee95a2250d4130bc4e31c9683667d1335b5fed4bf303ca14850748b7c07097b5fec2
+EBUILD mgetty-1.2.1.ebuild 4627 BLAKE2B 68280b15937cae278d77c585bdbafe4d8517222208bcccc166432d3627cff016116341dddaffd8617d1be1ce468ebd0e033abd2742642bcc5dea8f28b44eff03 SHA512 aba6a82b9c6eed00693d1366551334a2618d305b61e9c13304bc6ac6a8bd3517e2b3b1a3edbdb8bbe2c9d3b933bf1aabe7f0387f7818b8393b914531fa0d4266
 MISC metadata.xml 491 BLAKE2B 41dd8488152f14cb26c4db838c6a7267d0cc8063263aa7879971b2afc24e6df481cc76452ff58d07d1c86dab5d27e6d551a1d4c9b721214a71e14af4f33020ba SHA512 e975c8e98834b587752c566c0f52fd16fbbcd1b6b930407d5bf027b5717eb898af0c7c7aff94a31a18a8033d561e934e151f17b1ebbfe406c2cff22f88adba36
diff --git a/net-dialup/mgetty/mgetty-1.2.1.ebuild b/net-dialup/mgetty/mgetty-1.2.1.ebuild
index c4b9686dc846..1e2c85eca543 100644
--- a/net-dialup/mgetty/mgetty-1.2.1.ebuild
+++ b/net-dialup/mgetty/mgetty-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-dialup/mingetty/Manifest b/net-dialup/mingetty/Manifest
index 080a7aba6f4b..e72403dde7b1 100644
--- a/net-dialup/mingetty/Manifest
+++ b/net-dialup/mingetty/Manifest
@@ -1,5 +1,5 @@
 AUX mingetty-1.08-check_chroot_chdir_nice.patch 1148 BLAKE2B 80695e0444f51dea56543e4bc1e3afaaea33796e3556c32ab37e0679189076e04ddf031745de698edf3f47235c277921fa0e187540c3aee6d3b9188733c90f61 SHA512 b296b8618218014bbe02b0d449d7e478a098d23e224ded632ea2e2f9ee95252930f31657adecb971e9e5d984491f6763295a0d269f3d6d59926e1f86ed49e0b2
 AUX mingetty-1.08-utf8.patch 4203 BLAKE2B d15273a937405c6c562ac69c7a399b2d9e11f134c1ae4d78ba19d5b3fcb784c809b1756cae652ffd1bce07dfae42a92a28c6f50ceda93e846ac920469529eabe SHA512 157ee0f38ad2175a3a5c1fd40a419e963c7310c2e1e7d8e8879ee17cca1283f2ea7ba39a0a67381347e75d5b691becf56f92c9ae2e5f65ca400687cb565ca31a
 DIST mingetty-1.08.tar.gz 13476 BLAKE2B a6a1e2fd84cc3c1b7a26919989d79268818cf0ee50b544f92d700e31e42bd527ec8caf97df8aa04486190a8e6c3ac379ec0507ce1488c1a1ffb4a53359233727 SHA512 d2c050a412af81d4635cbaa5610dfa2cf2addce0d3116fa53f73eb15cd6b53d476165a0509ae630a151de07a5bdc82cba1b5da0ab78d0313b200adece3c8872b
-EBUILD mingetty-1.08-r1.ebuild 755 BLAKE2B 8c2b2986a75b66f49ebfd18e641f2bb4b3bd63e672f47c514d131291800a02b3e2c5ec9ca1a7a2fa59ee357d6b696ffde54e9ce5a522a0b3c0f2fc28365c525f SHA512 3e00066cda135ce354dd32f690c308dd21def7634ecaeb345795b9b385516a8c5725e7c5c7bc956d7efaf2d5311fa626cb23015076dbae1bd0ef8d8f0a2f5c98
+EBUILD mingetty-1.08-r1.ebuild 752 BLAKE2B b232734ca4c3aa35773febb634638c06b16baeed811eaf3189af2b2c74dc9a059a74792f63ead4b04910b34ff669b25e96f362dc1bdc349e69004f099cb5c93f SHA512 2ab55e25d629f63a9372c028b971c38deadd84a8fca63be9440c9aaeeeaf3f0e909ba4b51e86474180d1473302a33ac0bbabf6e325450da5f49cc50df27b999b
 MISC metadata.xml 674 BLAKE2B 3081183b804d044049024b05caa1c2f1353dc95b4e36b62c36a253e25c3309427782101171287645206aede1fb4fd9276c7b6c746c4da2adfc3e7b328be4a68d SHA512 0d35b42494edd2c4f8e7f2ad51463c2f9730f52d032adf6e3ea3156b05f090b0eaaaec95c4fc4db02e3ebc76cf7848571398bdccf3735adf5511ff1959431201
diff --git a/net-dialup/mingetty/mingetty-1.08-r1.ebuild b/net-dialup/mingetty/mingetty-1.08-r1.ebuild
index 77c665a1033b..c4f90f98cbc4 100644
--- a/net-dialup/mingetty/mingetty-1.08-r1.ebuild
+++ b/net-dialup/mingetty/mingetty-1.08-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-dialup/ppp-scripts/Manifest b/net-dialup/ppp-scripts/Manifest
index a5b2f3d4ee92..215876b1be8a 100644
--- a/net-dialup/ppp-scripts/Manifest
+++ b/net-dialup/ppp-scripts/Manifest
@@ -1,3 +1,3 @@
 DIST ppp-scripts-0.tar.xz 1824 BLAKE2B dc2fe1fa860ec9abe43466a270324f8ac39f08a8ed35f2dbd971a59a2e07a939049624802ae8b8c5a4bf11544c871d27517976f61486c4cdbad75f162a502c59 SHA512 a36e6180b0acc8081b192602a2a5dbe765f1ba26e2cca8dc80d1dbc0e405b86acd6fe0cf655fb520c9f45373528773e64545876fd3370ce3514ffd9858916971
-EBUILD ppp-scripts-0.ebuild 666 BLAKE2B 8ff652b2ea44e09a0c8a8f37609555c70f80776bb59ca37ec1f38ea335b6c9f0949ce79f4d90fb69ca22da0ee18298ade9f80e7587c93912fb8d9c821c76192b SHA512 614e397882db3995ce722120249dfa15de28719f0ff40ef1ec26e188b107824aafbe8949cd8901c20eebb57f8c9b8ea4a7c48fb077417dfcf0f99f3af9861c82
+EBUILD ppp-scripts-0.ebuild 666 BLAKE2B 2c5c1279d5bca0e05470684a1384421912043515a51f67ce0aa9d2ecd9d24ad2009a932c34afb3a87bba017d1517e7af5132c0c40e7423603b54d35d146a6063 SHA512 1792d2fc5a983b346d8a5392d3d27ac160f6c5422ee06685c5b9762220a659e1a45725482ea932237246383867bf660d00eb6a74ad9a4775d1e4da0132c57f64
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dialup/ppp-scripts/ppp-scripts-0.ebuild b/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
index 706162a982c8..3b28abc0689d 100644
--- a/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
+++ b/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index a888408c1085..ff31ffa35bff 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -3,5 +3,5 @@ AUX modules.ppp 299 BLAKE2B d5c0dcf135dd0a33288f27c95133d4dc980b84dc62bf8eca5b35
 DIST ppp-2.4.7-patches-7.tar.xz 40540 BLAKE2B 353814692aab3012f5d5ccdecc514d69357826ea7abe64a7581c562f333d868f9766f11516721cf0b116b4c1c8b01daee306d98ef7be356af6e8d16e22fc9fac SHA512 9d34c044ded09424a6d80047e88bb21130a9c2414c9ea4f52c7299d9db08b1391543b50cd97c0c8763e6943591fc325d01932b31966a1374dbfe5e977bbf4356
 DIST ppp-2.4.7.tar.gz 688117 BLAKE2B e1c94ce31d98674536929d19e956e4013eb2b02c20c34e6184c0b99b50262ad1cd7fb6f4a1ed302872527a0c164af340e15ad1e2eaf191392c3f6ae2de21f5dd SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2
 DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
-EBUILD ppp-2.4.7-r7.ebuild 7076 BLAKE2B cddcf17bd52a06061e865b11b3524ec3e0257afcb97ba04d18458e8054940382476ac733bd089c01df4156320b4ec59c267fcae0d8048a10a998bd09973ba8e3 SHA512 da0367e3a6bfc2620311092bc37f02a7096d5b3c0619ee41718f6e24d26671cec64acd7f5e19d0b14481d28a0c5a898e43c24d6cb5ed114a95535e2d437541e3
+EBUILD ppp-2.4.7-r7.ebuild 7076 BLAKE2B 5c5a518b9b561fa3d3ab7c707a803609868bbe2c98ca110be6108011aa7d12efd31413d5f17acd1fc74d894bc474da776acf3d64f1624452c44ab34af5be96f4 SHA512 8f5b9ca16afa9dd5d04c1e450295afd25069d554becc34b48dd50a28ec5e5c1a8cc92c0b1209a1b90d8e23ed9bef34183a36b4af377f346a6b0458419ddcd2ad
 MISC metadata.xml 1470 BLAKE2B 8e70c742a13d352ff2b16946c6d063cda061e4710e340227d907ca599938b0466f86258d67836eeed6ed189e546ec463703dc0b1e44c1c9a9409c0ef1b74b5ed SHA512 2b00f6c0b4f3079eb885327188e12d151ec3d9682df9a71232b331524d9d3430af5fe342ca4198d926c012059786ec6a7e91fffeec899069a990e032b94b94c4
diff --git a/net-dialup/ppp/ppp-2.4.7-r7.ebuild b/net-dialup/ppp/ppp-2.4.7-r7.ebuild
index f240e0267f04..b3622128a456 100644
--- a/net-dialup/ppp/ppp-2.4.7-r7.ebuild
+++ b/net-dialup/ppp/ppp-2.4.7-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-dialup/pptpclient/Manifest b/net-dialup/pptpclient/Manifest
index 11e58a2badfd..9cdb9813153b 100644
--- a/net-dialup/pptpclient/Manifest
+++ b/net-dialup/pptpclient/Manifest
@@ -2,5 +2,5 @@ AUX pptp_fe.pl 8097 BLAKE2B e479f4f13babd5e467be758b88545653fe3200d5bea4ad0cc008
 AUX xpptp_fe.pl 5620 BLAKE2B 682623fe03b8d9e90f4e86837b850dd57a2a1b960e9f0554d65cac4e0e5351718e8f9b4d56ae4c3be81d666a8be1b1cb9bd2ee07d3f48a1fa776665b5e11c62a SHA512 fa6d31c9b9ae319ea3cbbba389664f04c6fff8d2d17a826870ebca236e04df4ca51cb2cd60961a2cd78ee3c99af2738c4bf87edaf49032dd3ec1dbe5d3632833
 DIST pptp-1.10.0.tar.gz 87007 BLAKE2B aeb8bff0025c5144678db2ee79ecd80ec3c7261640ed94596a3599c163763cbf17b50c37591fd8b39d0687db5dff9b4c14d1aa303d95b9fcaf4eb53602cf321b SHA512 d2b925fb9cb5dbc4da576dce0cfae62f466576ae5b5ed7d6edeaec9be16ab6e0d17c307df43ebdc06138f1269ef61ba8910462a4629b6262c452e8287cabe41c
 DIST pptp-command-20130515.bz2 7269 BLAKE2B dda3f517cf747e025dee1967841d40e58461384415161ef01bcc96c6568c5ccfb1af5254f26276164c43c41b668bf2646e5138985531d54f13ab2fedd410fab2 SHA512 3b0ad28c5f7bf4f674ba8742e8a3be50cb62521f767142a1a1e74263707bc860126b7238a4aea307366a71100a193d18f3ec7599f4c0c52cd259f8b1d6b429bf
-EBUILD pptpclient-1.10.0.ebuild 1137 BLAKE2B cc7b6c193bc51e7329f9fe201870008e0de14af21e4cd01cdca3374ac9bde0d30064f914638b40501ad5d3373cdc92235e86826aa8323a670034aee9fcfcaf7a SHA512 f453ca5afa91d88f864723c905253d90ef962bc99bb5645e365bbf8d7525fe0a1b86a501b59992907d87d47f78e35d6f01feda59367c72760dcefb388fb98bdd
+EBUILD pptpclient-1.10.0.ebuild 1137 BLAKE2B f7058e66f6d5edeef077eecdc239f689f967d1ede674bc4ee55a31ae77db9b081af0c06eaae87256c53eb6734a915c97bb55a06c560591aa43c21d47d85f6a28 SHA512 86db3eb9b317623bb0cec5a21696cf93fb8996131eb014268b5a0ea6ebc50d1c98f002c99af57f4c86d131c4a521e7eccfb784f4941909d0fe1f1f6f7a4923f2
 MISC metadata.xml 378 BLAKE2B 224be6ab2aa2334074dce847a6527f713f1c82f797862e58bb5ed972a4c1f464a53b67a28ea10635fd949a5aa927a9419f85163172f26376001c85e4784cb894 SHA512 7a4b7cfeecee2503bcf7171f7a66edc27962a6f461695dfad358421be6c1bfc794e438d9136448278b11a4fd0761df03132d8ee66b7e43f7b407c0a5bad09ea7
diff --git a/net-dialup/pptpclient/pptpclient-1.10.0.ebuild b/net-dialup/pptpclient/pptpclient-1.10.0.ebuild
index 13f6e7458b78..9c55981bbdb8 100644
--- a/net-dialup/pptpclient/pptpclient-1.10.0.ebuild
+++ b/net-dialup/pptpclient/pptpclient-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index ff04d1353615..29b317b7237c 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -15,6 +15,6 @@ AUX rp-pppoe-3.13-linux-headers.patch 608 BLAKE2B 22ea43655b50eb38e2ae0e9ceca190
 DIST ppp-2.4.7.tar.gz 688117 BLAKE2B e1c94ce31d98674536929d19e956e4013eb2b02c20c34e6184c0b99b50262ad1cd7fb6f4a1ed302872527a0c164af340e15ad1e2eaf191392c3f6ae2de21f5dd SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2
 DIST rp-pppoe-3.12.tar.gz 224125 BLAKE2B 27fe75e794624acaeb81806d67a6f4e5601a6b6a466100898ae3cccc8acb5f72ad9275fecd28735df1b01162ff0e60b74ad0373a24a60c7a5731b0744b86e019 SHA512 1b9e4c806fcbad1bc21f7b74a780ae98682b10a69d91fb08df6dbd1fff86f6271995ebded43f926f8249a17cdddb541edccbbb3ee28e1a2dc89173ad61cd3de1
 DIST rp-pppoe-3.13.tar.gz 224204 BLAKE2B 8ac3cd59c809f7f2e10fea580dfbda20fc99ae443851513cdc6d0ba8e8df848d7bd6f10d2b0ac6592bc4b48ee1945c299d3cbd73eb9dd6ddc23d0c1c39cd1b77 SHA512 e29ddc39252a0e71d509096e275f6f195f86a5871052dd558e8fb174d13086b1c601e6652f45619279a1eb2fbda96ba0ec85dea9edb27459af56ded4a52b5f36
-EBUILD rp-pppoe-3.12-r1.ebuild 2642 BLAKE2B 34975e0dbcab79f36c1673559aa8705e89c97b83450208611de5359f1040ace0ed5c29d369294870c394ece38ae4fe638b7783addef19f9ef9d6a2876987779f SHA512 b65bd800057d1e18312d1977364960148208c9dfab6ee5f1336a7973945129e9bf2f83198c45306442569b047a8a7ad236ffd41b06fdf79ceb3e0aac3fc04b25
-EBUILD rp-pppoe-3.13.ebuild 2906 BLAKE2B 572bc5da4bdd62883c33a3dbd1d84c9ad9c6849ca0691e2a1e10dca665a3da57408826a102ab838c34e783c01fb860450f60cffe4aa55dbccc60b291b25e8545 SHA512 1aaf6b9b5a2fa185e8174cf68d1480c9a663ffce3b207d0846c2e3380d4932d00a8117b11e62ad730a72f700984f2662d2ccb645be493d2640c9f6a22c078501
+EBUILD rp-pppoe-3.12-r1.ebuild 2639 BLAKE2B 45990f3969b5bdb48b2f7ef41a8e88a21d298af4bc5da00397069fc64d87a97bbc05b0c9c59a5bd5f87fb62332483b9bc39be7b6e43b3697f5f3a730d0df5daf SHA512 5129e8c3ed7e7543d53c8aedf50cf918c462f4e0faecc09ca27f3da30cadbe5ae26878e84eaa0b83df4a14fb68d84fb31664e33325696d094623fb7ec3eb5fdc
+EBUILD rp-pppoe-3.13.ebuild 2906 BLAKE2B 7f71b6a400373626225b1b906a43eb02d2e8d3fff3f2e84ec5d8a35ccb7c81e8474aafc2bc29e943e6322435471554a71ff3f5d4b53c864804a3177e6ecfc228 SHA512 9a41987db1d47feb78e2c8bbcc3fbc30257a737a4c916b19e45454023fe57fbbea7a75b2e4e9e7318808a07fc814af51e135559526f7cf32aed68ffc977d8a54
 MISC metadata.xml 370 BLAKE2B 00e0195d903d9fe379c0c8662f4019dd55a53f7027ade12f314f8007f9edbb6b4a5e5bccef2897d97ee3d2164a169efcad607548dbf53d363b72a360b57444b3 SHA512 ebfae7addd585ee6f01b45921b1ba6a1c824c6e34f8f6a3c6d2fd917d7b17aceffca5f6a4ca1c7b135a34c679394417b73a23e067daed8a2c4b71fa63536c849
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild
index c924ec275e96..e0a49a868866 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild
index ab0711a3d0de..760e025984be 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-dialup/wvdial/Manifest b/net-dialup/wvdial/Manifest
index 4a7ccb61fab4..8585a6fc8b02 100644
--- a/net-dialup/wvdial/Manifest
+++ b/net-dialup/wvdial/Manifest
@@ -2,5 +2,5 @@ AUX wvdial-1.61-as-needed.patch 380 BLAKE2B 52a3c7962f3143a942855844158d55b71621
 AUX wvdial-1.61-destdir.patch 782 BLAKE2B 0d514d3fa28552d02c588733aca8180af136f0f0b2846d9535ff1ae0b8e28faf16d36c49635b525222386ebca1921650875cb2b021c4a231785cc2662a64ea21 SHA512 6f1394922aa75ab97e7a589935157ac2f15ed79cf90fa4a2e3bfa0dbe60a6c3a8e072b152c292d1ff02352c2c230a692d35fe23723e3a8c98558db441f49fa22
 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 988 BLAKE2B 73ad784c8786e6f6aec6a2eb08a7689eb1beaa74476f8928fcee8970394d4ca89cce6d5f62fb64da1bf36cc38f51158f6d1317609272d332a9067561b5d48cd6 SHA512 ad58a6124801ff260c36b7536ea3b862d76efa7a0557580bfb4923d3ee59d44c030a715b74eea8f5d60b5d533e8030bc17a24abef445ab88739a939b2787e495
+EBUILD wvdial-1.61.ebuild 985 BLAKE2B 7f3b10631596a98c8dcafeb33eed9faa2b8cf7693b03808b55e554390f9adc22682844765ee4bcbe3bf347d1a70b98227ce030a72c790b2630bea8600ade1309 SHA512 e86a1aec2973352d0ee86a4be43ef9869f01e0cbf6ac1e0c71710fd32efb49e446cf0621e4726b662c6a018722026bd47f899520fffa18571d6f91e0e8cfdddc
 MISC metadata.xml 289 BLAKE2B b5cc1f1bd248b84fc58a4c5cb03a358f1c15334b75344ccf92d4e0bfa897152d70bdb65f4cdac8a558dc8f629f2e1352405893abc884710e30c9b12af495129b SHA512 c9e1eca7327950313ac8d39abbf957e364084997857910dfe3653a105537ed0e074bff0b15732583270bace998faa5a1e0d9c572da10edf3c7d6cee20a7f7ab0
diff --git a/net-dialup/wvdial/wvdial-1.61.ebuild b/net-dialup/wvdial/wvdial-1.61.ebuild
index c64423b90e8b..2580dab104a6 100644
--- a/net-dialup/wvdial/wvdial-1.61.ebuild
+++ b/net-dialup/wvdial/wvdial-1.61.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6