gentoo resync : 15.01.2020

15 files changed, 598 insertions, 124 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 9e89fde65978..86bd435eba7e 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index 3a337f089154..a1917bca9684 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1,9 +1,8 @@
 AUX accel-ppp-1.11.1-socklen.patch 483 BLAKE2B efdcc5b2826ab2d45bcd6914efbc65a3ef0ac6987663f8888d2168d61f941de9bd047a30673ee0114955faa121de701f93c1564b2cb8e2c843cfa7ff2030b309 SHA512 6561b95c8cc0ec642c12895426c5b0b8290da9c7e3c9207beb837e50218fec70ead92a680e131f2967d3281a273cc920ccfebbd66aed4579feec61a759b36dd5
+AUX accel-ppp-1.12.0-kernel-5.2.patch 8304 BLAKE2B f28a0720dd9d99948cd4552986fdd9de3e2552d13576ea35a97acbec7f2a91951b37c1222b8b9d2cd048871e6d71af4e5995b9d27e43a2443bd0f94019f7b712 SHA512 b4c544a36724614bd306e05f626f17b9fa88e92d44e4e94a9cc274d3a9815a342bf4bc403b18bc3a5559109cc1b9d0f2682c6a108f7f0edd016f6f12d9e67dc2
 AUX accel-ppp.confd 437 BLAKE2B 6b418f528877a46b4b8aba3728405459a567c264b5bb73da79a08649f604f99f6b9d5a665599836b902c554b9fa5c62b8e399cb60bf4e0bcf85e21a0d4959b54 SHA512 66dad6b7b4497c5768206e7990e4034f1de03d9608e1470888e061ba0ff6be934f1dd329336fd3978a43a99a8e3971a00be4da327bfc01a64dadfe91da2cea30
 AUX accel-ppp.initd 998 BLAKE2B 974407e0e974fb79b3ea17bd1526d1f6343d7284cb10a93bcb2713f955244a91a664fd7187287a7b090edee340f76181f88645b2d4bf0e5470d825407ddebe83 SHA512 ebee03f6c448f1158831bb563568ce027b2824c185852d380f079456f25dcb69e0fe5c6d6235eed33f028825786f091853c05fcba5eb3c287790353629823764
-DIST accel-ppp-1.11.1_p20180320.tar.bz2 1634359 BLAKE2B 97ca709ef3740c2ac1d75f6fba3acbf9229c3cb48f3a55735eaa14b74c2b0af96d637cbb145bc9e98a5b245704806cdc3d8f9d8692809626e0f73d73702c4a0a SHA512 a8a2420332c02087e45bbaab25831ae5d2d370fd56b29db77c267083badc22b90ca4b0ec7335e13250ac8f150002b2a3c343cfba6c2378932778777dc936d914
 DIST accel-ppp-1.12.0.tar 6758400 BLAKE2B 776c0946decec2d88a0dfeb8e840573ae8d53d53d0fe921604667eaf4a5658e7d0cfa57f0b54eb61fcdf62b7a62a94ee405a01ad2a66ab76042d59cc3f79d42b SHA512 f1d3b31ca36395a429214b7599a43755317d89391c5631dfd02df79ed8dd51c39f75fc56ac625fbc6e7d5b0f9c85699c5da612eb4e8af9eae8ad2d9b13a187ba
-EBUILD accel-ppp-1.11.1_p20180320.ebuild 2436 BLAKE2B 0d024f60748291e5e3bad0640f472950088abecaddb9ad46dcefa100ea8fa9a70837871c577cdabc87e984c2c066a66aa8dc18441b2d403ec2cee393d423891d SHA512 cabce32b55c148a02df91e3612002d17b349a0c1da5ca6e72ba610e99d123ce3be2c42a65b6a7ba66cb34a6cbe83d7dc9f1b964494e661e02f90fcdef55d53cf
-EBUILD accel-ppp-1.12.0.ebuild 2555 BLAKE2B e897fd34c01d95efcfd786953766e7da01d1c8b3ab271377a7b2e64460376ee46035182e8dbe4a70bc1dca8be6a04fb6f78752ee86b03ef3aef24161e62ba3d7 SHA512 021b116c2b45908a165a79a2e7654489c741cc4f4616048e42d7de2359ecd38c47a597ca82b3c9e7c02a03436454693955d3bcd90905d221c8ada95d48127fa7
+EBUILD accel-ppp-1.12.0.ebuild 2592 BLAKE2B 3f7daf0250fb68783db2ed77496e55bfdb6cb1cc1e88b82408b3a88eeb98758aca51736824187b42a89daf599d809266509ae5cca236301fe578e63c12d7c014 SHA512 04076ce730fca7993c207c208328c009a62d86f55c21851961356e342cfe5d31e4465b13d9e9fe1915ca8d673716b322b79a8800dedf24fb65e734163f224b63
 EBUILD accel-ppp-9999.ebuild 2354 BLAKE2B 95c9c459f2845f5fa5c96530b9b9f47e4cd77e0e5a5fb18da6048973c8d701f8c861bbeab458c9a2226307a7492e9c857da8f6b6d4cfc95cb113f60ebb586315 SHA512 0eeafee53bac5a8e2b377e994cef95588e492a14c822603dc78a79d46a126dd577190349c0d31ff693b613d5d059d1fc923d233b82e40cc1f69c038020cd797d
 MISC metadata.xml 507 BLAKE2B 7c0a985830c791f5fe40ed8b624f366eb8e39505fe128b46153740f77ce9c5bd05bf8bf7ffb8939aa42550c9ea08de8f2498d444ef2e930121bbe7f404bf88dd SHA512 6b60c890f172501225ed3da4a229298c2b05601606d047bbe46dbea88246bcce8c15695259063daf73574c9d24048b04d2422c83e2e934015768338120e9154e
diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild
deleted file mode 100644
index 0d27e032077b..000000000000
--- a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic linux-info linux-mod
-
-DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
-SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind"
-
-RDEPEND="lua? ( dev-lang/lua:0 )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( net-analyzer/net-snmp )
-	dev-libs/libpcre
-	dev-libs/openssl:0"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-PDEPEND="net-dialup/ppp-scripts"
-
-DOCS=( README )
-
-CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
-
-REQUIRED_USE="valgrind? ( debug )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.11.1-socklen.patch"
-)
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	if use ipoe; then
-		linux-mod_pkg_setup
-		set_arch_to_kernel
-	else
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i  -e "/mkdir/d" \
-		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
-
-	# Do not install kernel modules like that - breaks sandbox!
-	sed -i -e '/modules_install/d' \
-		drivers/ipoe/CMakeLists.txt \
-		drivers/vlan_mon/CMakeLists.txt || die
-
-	# Bug #549918
-	append-ldflags -Wl,-z,lazy
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local libdir="$(get_libdir)"
-	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
-	local mycmakeargs=(
-		-DLIB_SUFFIX="${libdir#lib}"
-		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
-		-DBUILD_PPTP_DRIVER=no
-		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
-		-DCRYPTO=OPENSSL
-		-DLOG_PGSQL="$(usex postgres)"
-		-DLUA="$(usex lua)"
-		-DMEMDEBUG="$(usex debug)"
-		-DNETSNMP="$(usex snmp)"
-		-DRADIUS="$(usex radius)"
-		-DSHAPER="$(usex shaper)"
-		$(use debug && echo "-DVALGRIND=$(usex valgrind)")
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	if use ipoe; then
-		local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver) vlan_mon(accel-ppp:${BUILD_DIR}/drivers/vlan_mon/driver)"
-		linux-mod_src_install
-	fi
-
-	cmake-utils_src_install
-
-	use doc && dodoc -r rfc
-
-	if use snmp; then
-		insinto /usr/share/snmp/mibs
-		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
-
-	dodir /var/log/accel-ppp
-}
diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
index f2e7d2b54cce..7362e06b530c 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.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
@@ -31,6 +31,7 @@ REQUIRED_USE="valgrind? ( debug )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.11.1-socklen.patch"
+	"${FILESDIR}/${P}-kernel-5.2.patch"
 )
 
 pkg_setup() {
diff --git a/net-dialup/accel-ppp/files/accel-ppp-1.12.0-kernel-5.2.patch b/net-dialup/accel-ppp/files/accel-ppp-1.12.0-kernel-5.2.patch
new file mode 100644
index 000000000000..8300908a2d2a
--- /dev/null
+++ b/net-dialup/accel-ppp/files/accel-ppp-1.12.0-kernel-5.2.patch
@@ -0,0 +1,282 @@
+From 4d837cc3bd92493732f2c598560e9e83c82f9b9e Mon Sep 17 00:00:00 2001
+From: Dmitry Kozlov <xeb@mail.ru>
+Date: Tue, 24 Dec 2019 14:50:04 +0300
+Subject: [PATCH] ipoe,vlan_mon: add support for kernels 5.2+
+
+---
+ drivers/ipoe/ipoe.c         | 58 +++++++++++++++++++++++++++++--------
+ drivers/vlan_mon/vlan_mon.c | 37 +++++++++++++++++------
+ 2 files changed, 74 insertions(+), 21 deletions(-)
+
+diff --git a/drivers/ipoe/ipoe.c b/drivers/ipoe/ipoe.c
+index f3acb3f5..6ac6d77a 100644
+--- a/drivers/ipoe/ipoe.c
++++ b/drivers/ipoe/ipoe.c
+@@ -174,6 +174,10 @@ static struct genl_multicast_group ipoe_nl_mcg;
+ #define NETIF_F_HW_VLAN_FILTER NETIF_F_HW_VLAN_CTAG_FILTER
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
++#define nla_nest_start_noflag(skb, attr) nla_nest_start(skb, attr)
++#endif
++
+ static inline int hash_addr(__be32 addr)
+ {
+ #ifdef __LITTLE_ENDIAN
+@@ -255,8 +259,13 @@ static int check_nat_required(struct sk_buff *skb, struct net_device *link)
+ 	if (IS_ERR(rt))
+ 		return 0;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
+ 	if (rt->rt_gateway || (rt->dst.dev != link && rt->dst.dev != skb->dev))
+ 		r = 1;
++#else
++	if (rt->rt_gw4 || (rt->dst.dev != link && rt->dst.dev != skb->dev))
++		r = 1;
++#endif
+ 
+ 	ip_rt_put(rt);
+ 
+@@ -616,7 +625,7 @@ static void ipoe_process_queue(struct work_struct *w)
+ 			}
+ 
+ 			if (report_skb) {
+-				ns = nla_nest_start(report_skb, id++);
++				ns = nla_nest_start_noflag(report_skb, id++);
+ 				if (!ns)
+ 					goto nl_err;
+ 
+@@ -1729,7 +1738,7 @@ static int ipoe_nl_cmd_del_net(struct sk_buff *skb, struct genl_info *info)
+ 	return 0;
+ }
+ 
+-static struct nla_policy ipoe_nl_policy[IPOE_ATTR_MAX + 1] = {
++static const struct nla_policy ipoe_nl_policy[IPOE_ATTR_MAX + 1] = {
+ 	[IPOE_ATTR_NONE]		    = { .type = NLA_UNSPEC,                     },
+ 	[IPOE_ATTR_ADDR]	      = { .type = NLA_U32,                        },
+ 	[IPOE_ATTR_PEER_ADDR]	  = { .type = NLA_U32,                        },
+@@ -1741,71 +1750,93 @@ static struct nla_policy ipoe_nl_policy[IPOE_ATTR_MAX + 1] = {
+ 	[IPOE_ATTR_LINK_IFINDEX]= { .type = NLA_U32,                        },
+ };
+ 
+-static struct genl_ops ipoe_nl_ops[] = {
++static const struct genl_ops ipoe_nl_ops[] = {
+ 	{
+ 		.cmd = IPOE_CMD_NOOP,
+ 		.doit = ipoe_nl_cmd_noop,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
+ 		.policy = ipoe_nl_policy,
++#endif
+ 		/* can be retrieved by unprivileged users */
+ 	},
+ 	{
+ 		.cmd = IPOE_CMD_CREATE,
+ 		.doit = ipoe_nl_cmd_create,
+-		.policy = ipoe_nl_policy,
+ 		.flags = GENL_ADMIN_PERM,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
++		.policy = ipoe_nl_policy,
++#endif
+ 	},
+ 	{
+ 		.cmd = IPOE_CMD_DELETE,
+ 		.doit = ipoe_nl_cmd_delete,
+-		.policy = ipoe_nl_policy,
+ 		.flags = GENL_ADMIN_PERM,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
++		.policy = ipoe_nl_policy,
++#endif
+ 	},
+ 	{
+ 		.cmd = IPOE_CMD_MODIFY,
+ 		.doit = ipoe_nl_cmd_modify,
+-		.policy = ipoe_nl_policy,
+ 		.flags = GENL_ADMIN_PERM,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
++		.policy = ipoe_nl_policy,
++#endif
+ 	},
+ 	{
+ 		.cmd = IPOE_CMD_GET,
+ 		.dumpit = ipoe_nl_cmd_dump_sessions,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
+ 		.policy = ipoe_nl_policy,
++#endif
+ 	},
+ 	{
+ 		.cmd = IPOE_CMD_ADD_IF,
+ 		.doit = ipoe_nl_cmd_add_interface,
+-		.policy = ipoe_nl_policy,
+ 		.flags = GENL_ADMIN_PERM,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
++		.policy = ipoe_nl_policy,
++#endif
+ 	},
+ 	{
+ 		.cmd = IPOE_CMD_DEL_IF,
+ 		.doit = ipoe_nl_cmd_del_interface,
+-		.policy = ipoe_nl_policy,
+ 		.flags = GENL_ADMIN_PERM,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
++		.policy = ipoe_nl_policy,
++#endif
+ 	},
+ 	{
+ 		.cmd = IPOE_CMD_ADD_EXCLUDE,
+ 		.doit = ipoe_nl_cmd_add_exclude,
+-		.policy = ipoe_nl_policy,
+ 		.flags = GENL_ADMIN_PERM,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
++		.policy = ipoe_nl_policy,
++#endif
+ 	},
+ 	{
+ 		.cmd = IPOE_CMD_DEL_EXCLUDE,
+ 		.doit = ipoe_nl_cmd_del_exclude,
+-		.policy = ipoe_nl_policy,
+ 		.flags = GENL_ADMIN_PERM,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
++		.policy = ipoe_nl_policy,
++#endif
+ 	},
+ 	{
+ 		.cmd = IPOE_CMD_ADD_NET,
+ 		.doit = ipoe_nl_cmd_add_net,
+-		.policy = ipoe_nl_policy,
+ 		.flags = GENL_ADMIN_PERM,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
++		.policy = ipoe_nl_policy,
++#endif
+ 	},
+ 	{
+ 		.cmd = IPOE_CMD_DEL_NET,
+ 		.doit = ipoe_nl_cmd_del_net,
+-		.policy = ipoe_nl_policy,
+ 		.flags = GENL_ADMIN_PERM,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
++		.policy = ipoe_nl_policy,
++#endif
+ 	},
+ };
+ 
+@@ -1834,6 +1865,9 @@ static struct genl_family ipoe_nl_family = {
+ 	.mcgrps = ipoe_nl_mcgs,
+ 	.n_mcgrps = ARRAY_SIZE(ipoe_nl_mcgs),
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
++	.policy = ipoe_nl_policy,
++#endif
+ };
+ 
+ static const struct net_device_ops ipoe_netdev_ops = {
+diff --git a/drivers/vlan_mon/vlan_mon.c b/drivers/vlan_mon/vlan_mon.c
+index b6476d4c..271f2ff1 100644
+--- a/drivers/vlan_mon/vlan_mon.c
++++ b/drivers/vlan_mon/vlan_mon.c
+@@ -43,6 +43,10 @@
+ #define vlan_tx_tag_present(skb) skb_vlan_tag_present(skb)
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
++#define nla_nest_start_noflag(skb, attr) nla_nest_start(skb, attr)
++#endif
++
+ struct vlan_dev {
+ 	unsigned int magic;
+ 	int ifindex;
+@@ -198,13 +202,13 @@ static void vlan_do_notify(struct work_struct *w)
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0) && RHEL_MAJOR < 7
+ 			header = genlmsg_put(report_skb, 0, vlan_mon_nl_mcg.id, &vlan_mon_nl_family, 0, VLAN_MON_NOTIFY);
+ #else
+-			header = genlmsg_put(report_skb, 0, vlan_mon_nl_family.mcgrp_offset, &vlan_mon_nl_family, 0, VLAN_MON_NOTIFY);
++			header = genlmsg_put(report_skb, 0, 0, &vlan_mon_nl_family, 0, VLAN_MON_NOTIFY);
+ #endif
+ 		}
+ 
+ 		//pr_info("notify %i vlan %i\n", id, n->vid);
+ 
+-		ns = nla_nest_start(report_skb, id++);
++		ns = nla_nest_start_noflag(report_skb, id++);
+ 		if (!ns)
+ 			goto nl_err;
+ 
+@@ -616,7 +620,7 @@ static int vlan_mon_nl_cmd_check_busy(struct sk_buff *skb, struct genl_info *inf
+ 	return ret;
+ }
+ 
+-static struct nla_policy vlan_mon_nl_policy[VLAN_MON_ATTR_MAX + 1] = {
++static const struct nla_policy vlan_mon_nl_policy[VLAN_MON_ATTR_MAX + 1] = {
+ 	[VLAN_MON_ATTR_NONE]		    = { .type = NLA_UNSPEC,                     },
+ 	[VLAN_MON_ATTR_VLAN_MASK]	  = { .type = NLA_BINARY, .len = 4096/8       },
+ 	[VLAN_MON_ATTR_PROTO]       = { .type = NLA_U16,                        },
+@@ -624,42 +628,54 @@ static struct nla_policy vlan_mon_nl_policy[VLAN_MON_ATTR_MAX + 1] = {
+ 	[VLAN_MON_ATTR_VID]         = { .type = NLA_U16,                        },
+ };
+ 
+-static struct genl_ops vlan_mon_nl_ops[] = {
++static const struct genl_ops vlan_mon_nl_ops[] = {
+ 	{
+ 		.cmd = VLAN_MON_CMD_NOOP,
+ 		.doit = vlan_mon_nl_cmd_noop,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
+ 		.policy = vlan_mon_nl_policy,
++#endif
+ 		/* can be retrieved by unprivileged users */
+ 	},
+ 	{
+ 		.cmd = VLAN_MON_CMD_ADD,
+ 		.doit = vlan_mon_nl_cmd_add_vlan_mon,
+-		.policy = vlan_mon_nl_policy,
+ 		.flags = GENL_ADMIN_PERM,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
++		.policy = vlan_mon_nl_policy,
++#endif
+ 	},
+ 	{
+ 		.cmd = VLAN_MON_CMD_ADD_VID,
+ 		.doit = vlan_mon_nl_cmd_add_vlan_mon_vid,
+-		.policy = vlan_mon_nl_policy,
+ 		.flags = GENL_ADMIN_PERM,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
++		.policy = vlan_mon_nl_policy,
++#endif
+ 	},
+ 	{
+ 		.cmd = VLAN_MON_CMD_DEL,
+ 		.doit = vlan_mon_nl_cmd_del_vlan_mon,
+-		.policy = vlan_mon_nl_policy,
+ 		.flags = GENL_ADMIN_PERM,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
++		.policy = vlan_mon_nl_policy,
++#endif
+ 	},
+ 	{
+ 		.cmd = VLAN_MON_CMD_CHECK_BUSY,
+ 		.doit = vlan_mon_nl_cmd_check_busy,
+-		.policy = vlan_mon_nl_policy,
+ 		.flags = GENL_ADMIN_PERM,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
++		.policy = vlan_mon_nl_policy,
++#endif
+ 	},
+ 	{
+ 		.cmd = VLAN_MON_CMD_DEL_VID,
+ 		.doit = vlan_mon_nl_cmd_del_vlan_mon_vid,
+-		.policy = vlan_mon_nl_policy,
+ 		.flags = GENL_ADMIN_PERM,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
++		.policy = vlan_mon_nl_policy,
++#endif
+ 	},
+ };
+ 
+@@ -688,6 +704,9 @@ static struct genl_family vlan_mon_nl_family = {
+ 	.mcgrps = vlan_mon_nl_mcgs,
+ 	.n_mcgrps = ARRAY_SIZE(vlan_mon_nl_mcgs),
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
++	.policy = vlan_mon_nl_policy,
++#endif
+ };
+ 
+ static struct packet_type vlan_pt __read_mostly = {
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 2667569ff854..193159582feb 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,5 +1,6 @@
 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.service 392 BLAKE2B c45290bf56e49244da8f135fb7f1726db7e73d66b24b970926065100e047bd8abcff55d164f5274b092a6735132eca898e271666ed9c9e9062b01fe4ef145f84 SHA512 c2e153f0e8543758dff81835b17c6221ca031fc66f17828b6380d40501c8b6f6ed7e33096218e44326f731245c24386427bb3c9eda48ac185b67104fc878b692
 AUX freeradius.tmpfiles 36 BLAKE2B 612c6ca79a678a3a82114ec142d33aa831b5b19c3e6774b2332334bffbeeb592aeac43d443a5f8fc1380528f3a5de4cfe125eb388d36c0b4f1f7f84f2bfb36bc SHA512 cf364cd860588318d49089946739bb30a6259a5aa7977c768155449fbb495473fe24c1ddccc75dc822e25b1f0d404589d7606590fd2018cc6503dd2767463a7c
 AUX radius.conf-r4 465 BLAKE2B 1c17f57c088be0612b3db23e8a909d7e1f6fc114d3ff31ee1c82f199e3962db57f3042498cf135b3a29c8a730695ed99612e490e0b3253f0644462d28f61215d SHA512 4142869fb61b2938232002c9cb5b843590785560da7db4f2b2a9c9d55c76d0e2d4a6cb946a5347dfa505cd82f5e86c7315cf71f3443a86632090cf4bd025748a
@@ -7,7 +8,9 @@ AUX radius.init-r3 734 BLAKE2B ba6918cf5da5ad29ca8062045c3318c2bb30e0a803bc6e6bb
 DIST freeradius-server-3.0.15.tar.gz 4818244 BLAKE2B 24cded2c4f0c6fc6a6135058c40bb2c9d100a55161f2edfc388efba991ff85ecd0f546bc2008cc0c50f2753cf93ece8e67dc3fc0fe13a8b935193ff1f68514b9 SHA512 9b92045b445032bde9d421499fdc0f6a08d602c501730c31a8d3974b21cc5c12c78abb024ed62a176c7aa7fe260fe1d19386aaf558e0fecfcd3a0ba7aa47499c
 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
-EBUILD freeradius-3.0.15.ebuild 6053 BLAKE2B 4672d9bd67377309c59447227be893c1397ef7519e184f27f918d1a92d073720e943927fe73cca6c08b2983b03343d008e12c2b5442bf983f087e6710ee323f4 SHA512 4d7de3a4c70e71cd481e73b0f0888e794cf1eccdb8a541c385584ebea6d51fe59a830c471379b1b28d6e6d4975215f57c3bfa0784fdb5fde977a8b0a668d8d9e
-EBUILD freeradius-3.0.17.ebuild 6730 BLAKE2B 6e6533780d33e1a0b8fb3ae86c5b98ea9e8472f3bd61c312028e3d8fc53cb88172cba9f0678862bfa8c9659405ebd8b6e8ccfb7972c4978bf2fa4ba65fa2f2fc SHA512 40ce26d427a45612f503dcb5db33263ab191544564c88c6f704867cc81b2c6daf4da5db0faa3edda2730ff5bdb57c8060eeaca389b7ee7e6ab3f4d935eefd8f7
-EBUILD freeradius-3.0.18-r1.ebuild 6875 BLAKE2B fc885901cae60109526728c19850bcac5f3e1683d0021676374bd536e4146fab453b21e86a674241ad52458cb949df5e70c4856c4d7b46390df3377ae743fdc2 SHA512 d79e76a4b636502c4032b304716d4d81c5369d501c25dae0e7aa12fd109f822cd756b842c1724d33dc2bc9936dfd88eae3162c034459ba803d85f2ddaf4b9e2f
+DIST freeradius-server-3.0.19.tar.gz 4886632 BLAKE2B 6e9b73eaa29344e4efca6ad19d8e86df8c625921441712b71cb54c2b0db78fc909748da42be837a9170fb6312be22f236956f0d2b169050a37ac8c4de143cc96 SHA512 8a914e2ad1fbeb4cf8c00aaf7eaa154ea17f70e4d58734716bfaf71b3ddef9f8f63a4d3217bdc07dfa776273e5bf090bc98f7bb16f5b565339ddc3b9c13e091f
+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
diff --git a/net-dialup/freeradius/files/freeradius-3.0.19-systemd-service.patch b/net-dialup/freeradius/files/freeradius-3.0.19-systemd-service.patch
new file mode 100644
index 000000000000..37b67dfb21a5
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-3.0.19-systemd-service.patch
@@ -0,0 +1,53 @@
+--- a/debian/freeradius.service	2019-12-01 10:02:31.453150556 +0100
++++ b/debian/freeradius.service	2019-12-01 10:08:16.781370632 +0100
+@@ -4,11 +4,10 @@
+ Documentation=man:radiusd(8) man:radiusd.conf(5) http://wiki.freeradius.org/ http://networkradius.com/doc/
+ 
+ [Service]
+-Type=notify
+-WatchdogSec=60
+-NotifyAccess=all
+-PIDFile=/run/freeradius/freeradius.pid
+-EnvironmentFile=-/etc/default/freeradius
++# In 3.0.19 SystemD integration is broken.
++# Type=notify
++# WatchdogSec=60
++# NotifyAccess=all
+ 
+ # FreeRADIUS can do static evaluation of policy language rules based
+ # on environmental variables which is very useful for doing per-host
+@@ -26,17 +25,27 @@
+ # 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:
+-Group=freerad
+-# This does not work on Ubuntu Bionic:
+-ExecStartPre=/bin/chown freerad:freerad /var/run/freeradius
+-
+-ExecStartPre=/usr/sbin/freeradius $FREERADIUS_OPTIONS -Cx -lstdout
+-ExecStart=/usr/sbin/freeradius $FREERADIUS_OPTIONS
++Group=radius
++User=radius
++ExecStartPre=/usr/sbin/radiusd $RADIUSD_OPTS -Cx -lstdout
++ExecStart=/usr/sbin/radiusd -f $RADIUSD_OPTS
++ExecReload=/usr/sbin/radiusd -C $RADIUSD_OPTS
++ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+ RestartSec=5
++ReadOnlyDirectories=/etc/raddb/
++ReadWriteDirectories=/var/log/radius/
++# Security options (https://github.com/FreeRADIUS/freeradius-server/issues/2637)
++NoNewPrivileges=true
++CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW
++PrivateTmp=true
++ProtectControlGroups=true
++ProtectKernelModules=true
++ProtectKernelTunables=true
++SystemCallArchitectures=native
+ 
+ [Install]
+ WantedBy=multi-user.target
diff --git a/net-dialup/freeradius/freeradius-3.0.15.ebuild b/net-dialup/freeradius/freeradius-3.0.15.ebuild
index 79fb360a846a..84422b0b3162 100644
--- a/net-dialup/freeradius/freeradius-3.0.15.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.15.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 HOMEPAGE="http://www.freeradius.org/"
 
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 
 IUSE="
diff --git a/net-dialup/freeradius/freeradius-3.0.17.ebuild b/net-dialup/freeradius/freeradius-3.0.17.ebuild
index 43ff6595d37f..513bffb3f387 100644
--- a/net-dialup/freeradius/freeradius-3.0.17.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.17.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=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit autotools pam python-single-r1 systemd user
 
 MY_P="${PN}-server-${PV}"
@@ -16,7 +16,7 @@ SRC_URI="
 HOMEPAGE="http://www.freeradius.org/"
 
 KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 
 IUSE="
diff --git a/net-dialup/freeradius/freeradius-3.0.18-r1.ebuild b/net-dialup/freeradius/freeradius-3.0.18-r1.ebuild
index a776acbe3b22..ecc6226870a6 100644
--- a/net-dialup/freeradius/freeradius-3.0.18-r1.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.18-r1.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=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit autotools pam python-single-r1 systemd user
 
 MY_P="${PN}-server-${PV}"
@@ -16,7 +16,7 @@ SRC_URI="
 HOMEPAGE="http://www.freeradius.org/"
 
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 
 IUSE="
diff --git a/net-dialup/freeradius/freeradius-3.0.19.ebuild b/net-dialup/freeradius/freeradius-3.0.19.ebuild
new file mode 100644
index 000000000000..ce636555ba0a
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-3.0.19.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+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 odbc oracle pam
+	pcap postgres python readline rest samba sqlite ssl redis
+"
+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
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	pcap? ( net-libs/libpcap )
+	memcached? ( dev-libs/libmemcached )
+	mysql? ( dev-db/mysql-connector-c )
+	postgres? ( dev-db/postgresql:= )
+	firebird? ( dev-db/firebird )
+	pam? ( sys-libs/pam )
+	rest? ( dev-libs/json-c:= )
+	samba? ( net-fs/samba )
+	redis? ( dev-libs/hiredis:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[-bindist] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	sqlite? ( dev-db/sqlite:3 )
+	odbc? ( dev-db/unixODBC )
+	iodbc? ( dev-db/libiodbc )
+	oracle? ( dev-db/oracle-instantclient-basic )"
+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
+)
+
+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.
+
+	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 ; }
+	use python || { rm -r src/modules/rlm_python || 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
+
+	default
+
+	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)
+	)
+	# fix bug #77613
+	if has_version app-crypt/heimdal; then
+		myeconfargs+=( --enable-heimdal-krb5 )
+	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
+
+	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/moserial/Manifest b/net-dialup/moserial/Manifest
index 0c4fd879a784..554dbff2adfd 100644
--- a/net-dialup/moserial/Manifest
+++ b/net-dialup/moserial/Manifest
@@ -1,3 +1,3 @@
 DIST moserial-3.0.12.tar.xz 1123184 BLAKE2B a8ac7ad422325853f354e1c5c7cd59ca0bf1a2249fb58886fdf104975fe458cc3befe041810cff9b97c941188a757a5929acb0507e8eb4518cb034c2cdc14b87 SHA512 e5ee3776cfa63585290fe7ffb9cab562082b19b505d630c6842d09b4783fadf5438243816c433157ad6360e2a4902cb0e0ada07b61972d3c8119509ca4f520ad
-EBUILD moserial-3.0.12.ebuild 517 BLAKE2B 23f0ea01de32562d6c978d6433d11d42b8ae7b1586ef4ba42aaf4ca0c594888efeec8fa9661ac0b01aa828b50b48d82912cdf99b0c6e502f94079c2ae29c982d SHA512 64c964efffa741caaa0d9868cdf253ba066e5e95c3b665c13f12733a9a6bf95c5a7b4291456683ada4e0d7422d45599d699d9ef02364edd550f5c2de71daf72d
+EBUILD moserial-3.0.12.ebuild 483 BLAKE2B 881d3c1e204cb0789e1390f2a723d1c781bab92254b21f3f68367792f682546aefeead9a61ad077a65af419d4b91d6283d1466e731afeef8f66887bb5161708a SHA512 b59c105395f2dff688c4859f1753578bf5f533647f405c06057814f7d34a1e4d7edb4ee599b9f629d8f81fbcd610aebca4c90a68ac9873ee4082899ee16d1aaa
 MISC metadata.xml 376 BLAKE2B 14e9a86d159786b9124fa98e8abc3573d68d3e98b6b89fff7b6b23a0264a450681d3b224f332cde42385bfa4dd832c6c5f27a50dbff95226bfc99c50ba6062eb SHA512 28b905f1f7f41bc8f6609307e8fe37d7bb8938a1f7eb21eb306a509daa7c094490a0a0efac758e15d807e647b6765e534481fe73581717498450080e0ff480dc
diff --git a/net-dialup/moserial/moserial-3.0.12.ebuild b/net-dialup/moserial/moserial-3.0.12.ebuild
index 81a8b5233fd5..014374c9fe9a 100644
--- a/net-dialup/moserial/moserial-3.0.12.ebuild
+++ b/net-dialup/moserial/moserial-3.0.12.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
@@ -18,7 +18,6 @@ RDEPEND="
 	>=x11-libs/gtk+-3.0.0:3
 "
 DEPEND="${RDEPEND}
-	>=app-text/gnome-doc-utils-0.3.2
 	>=dev-util/intltool-0.35
 	dev-util/itstool
 	virtual/pkgconfig
diff --git a/net-dialup/picocom/Manifest b/net-dialup/picocom/Manifest
index b0b878a984f1..fa643491ad20 100644
--- a/net-dialup/picocom/Manifest
+++ b/net-dialup/picocom/Manifest
@@ -1,5 +1,5 @@
 DIST picocom-2.2.tar.gz 88670 BLAKE2B 47ba36e08e0c45b81a88a4eb66044e69814581c278193c228f83f1e0161c87d450997d26252b70bc66106ee1667d24da07f8a2451c6ae03df62ca86100a26824 SHA512 21495af30b81dfd1b3f4fea1ecf93c3a9252be1ae2ba94c7a2a07ceb75f562bc2ebc6ef6a8ae61f810ff5c121d4ab572a6f8ba75283e2cb28cf9886f834df0fa
 DIST picocom-3.1.tar.gz 121686 BLAKE2B e7f478e7d00e791fb2ea7248ff31e480d05c5c1fe35941f85689a5df19646175e3c698222e430786874c0508c44a0c1f8ecc4b69c889a40e7411c7b54c67249a SHA512 ff1888494ae0e24a151e19ac3abcdbb499e42eb1abcea401a7c6c3b532be3d64ddd81a511641d1ce0119dc5da3d2804ce8eaff262a9d578bfe8e22fdf6e55ad1
 EBUILD picocom-2.2.ebuild 778 BLAKE2B b01e0a860488798070ae6e64bd1a0be2e2c02c6f5ae453a682a341261dfac8516ad72223a1584bde672fb7a31aaf02a8ba7c12bf6e2d2bbe0dbbe6618c81b2ce SHA512 d7c226258a78310e85b945ac36ea9e8b1f5c8d45377ffaecbb47fe243287602f39ff5c0616f8ec9102f37a1cd367bd5030a9090eaa957829eedbf12afff3aa5d
-EBUILD picocom-3.1.ebuild 780 BLAKE2B 9974443b966c4e55336817094fbe2e7a402a6ef9213a9fbddb8b2ccf04033888fa10f16efa6f408d656a5527708ce355070234a1ddfa6587034de787838857bc SHA512 b41715d724dee632e3e8fc85f3169f3173bc6165e8c91c5b30e68c951c70c1798db19891cfb42e25c8c9e6ac8e0ee3c38a5558bf7068afbcdb516b733c52da26
+EBUILD picocom-3.1.ebuild 787 BLAKE2B cd98ff71e4a6a5c8c562ab8b4f171cb36f27cde64cd9a4348270cab1072ac01c039e5175032693b80de139440b45f6b2e407153adbdd6eaf4f7d7c4bc29ff072 SHA512 b688ba193495309f74d07e0f3da49841206685bc14c9ef4e3b5ae8e95cee247c51b368f94ec951258568e9343d9a0ff9fd041d3be0a63ad0d187ef26e75be3cf
 MISC metadata.xml 335 BLAKE2B 0520f99d98b1ecfa11b8f25a5b371ac54eb9bf1e42df147902dbc284ac9062d3d30c8dc22081981dd2e79fde536262f967173cf052b866f980fe361cefe667d9 SHA512 9e039f41b69e370ca12ada0240ac7d9a2977cdc3bc1f2384c85cb14ae169b344272e9cb9705081e455a2a381533d488027f8a3e283e518d9ca23eac087e83bc4
diff --git a/net-dialup/picocom/picocom-3.1.ebuild b/net-dialup/picocom/picocom-3.1.ebuild
index b1cc891871a3..bee5feb0b021 100644
--- a/net-dialup/picocom/picocom-3.1.ebuild
+++ b/net-dialup/picocom/picocom-3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/npat-efault/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 src_compile() {