gentoo resync : 13.10.2019

27 files changed, 43 insertions, 298 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index dafc6a4694f1..2d4c4b3b7cd8 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 bf97aa4e1856..3a337f089154 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1,11 +1,9 @@
-AUX accel-ppp-1.11.1-linux-4.10.patch 2373 BLAKE2B eab95d65e4214413b4c67561c0dfef562a0e2ee62386da13d23f06cca2390adfcf2620616dcab2f77418bc23d26a3650777283948704bc9f42bd4c1c1057dd7a SHA512 5915500f67aad2c956c7a65bc9716e2f32fca6bf51010d8905f025a0386578bcf63613f3b195b47c1a06c01ce68c88a69af2bfed94b3ca76fdb324279f8acfdb
 AUX accel-ppp-1.11.1-socklen.patch 483 BLAKE2B efdcc5b2826ab2d45bcd6914efbc65a3ef0ac6987663f8888d2168d61f941de9bd047a30673ee0114955faa121de701f93c1564b2cb8e2c843cfa7ff2030b309 SHA512 6561b95c8cc0ec642c12895426c5b0b8290da9c7e3c9207beb837e50218fec70ead92a680e131f2967d3281a273cc920ccfebbd66aed4579feec61a759b36dd5
 AUX accel-ppp.confd 437 BLAKE2B 6b418f528877a46b4b8aba3728405459a567c264b5bb73da79a08649f604f99f6b9d5a665599836b902c554b9fa5c62b8e399cb60bf4e0bcf85e21a0d4959b54 SHA512 66dad6b7b4497c5768206e7990e4034f1de03d9608e1470888e061ba0ff6be934f1dd329336fd3978a43a99a8e3971a00be4da327bfc01a64dadfe91da2cea30
 AUX accel-ppp.initd 998 BLAKE2B 974407e0e974fb79b3ea17bd1526d1f6343d7284cb10a93bcb2713f955244a91a664fd7187287a7b090edee340f76181f88645b2d4bf0e5470d825407ddebe83 SHA512 ebee03f6c448f1158831bb563568ce027b2824c185852d380f079456f25dcb69e0fe5c6d6235eed33f028825786f091853c05fcba5eb3c287790353629823764
-DIST accel-ppp-1.11.1_p20170508.tar.bz2 1609904 BLAKE2B 5993e25e09e84fa62fde28e6c79b11514eb5e0c365a8cc1a36c4e3e56ac868725b14049e28184188330ac78cb6c128429f2cc89241d871c02e4154c6882a89e2 SHA512 79f928c9d07891957d12443eaf32e96e826d5bebf241dcfcb31a7777fbce2332078bf0c1dd1e1a55cf96154be1fec610f1afd088fc018f54ebd5d265c037c07a
 DIST accel-ppp-1.11.1_p20180320.tar.bz2 1634359 BLAKE2B 97ca709ef3740c2ac1d75f6fba3acbf9229c3cb48f3a55735eaa14b74c2b0af96d637cbb145bc9e98a5b245704806cdc3d8f9d8692809626e0f73d73702c4a0a SHA512 a8a2420332c02087e45bbaab25831ae5d2d370fd56b29db77c267083badc22b90ca4b0ec7335e13250ac8f150002b2a3c343cfba6c2378932778777dc936d914
-EBUILD accel-ppp-1.11.1_p20170508.ebuild 2485 BLAKE2B 1f7db5a427b4a7d0f8fb8c12f5d8d574445ae9156a78064b99d141047e6928933e35e7dd9a9ecfe77c675a51ea048a084fa69e2b145801ff6380acc0a3ed25e8 SHA512 6c067863978066abd3dfe02e2c4cb5ab3004c158e8339537a75eb79ac93d9f8ffd9c5c3af17cd55c35db1271997a6d95e90a9f268fa49b3478250921562755bd
-EBUILD accel-ppp-1.11.1_p20180320.ebuild 2439 BLAKE2B 5c9760bd87ce0f2846d3feb7b7f3f04d694a53a686eaeb823b2dcb880f5fd21ec8bb8a4a89d841793b465971c37712fb3f0a9a137bc3bdc2d7698d6ff882c78a SHA512 a701ee9c875f760ba0326eab8746038f6f59907fbd383e232215c181f647c4ff11fd633aa821fe62e8f29bf893d84cf55cd684797a9b263a17ce064c2352f589
-EBUILD accel-ppp-1.11.9999.ebuild 2373 BLAKE2B 5b809927209b7a624c0223555b8aa2b559a598e1abc98ef66da1f729527f17405606a971540b40dfded98cbdb657bde2e7703b224c0872d7299d0cf70ec7669d SHA512 d8325db8ca569ffa3b3f54ec90b544baac77bdcb3086e054ea3eaf02acf947b4a81d59080d989025767f0ac794af11f6c16abb47ad91eabd5503ccedb3a42896
-EBUILD accel-ppp-9999.ebuild 2354 BLAKE2B 314b9713caa79adb5a8e57c6f1edc673a7ed4cc8f54cc455b10094afd032b392c4a3cef3959cba8ee74963e2a7ee506880e8aaaa739048ed23eacc501124de01 SHA512 04b4ab35ed359eb028fb601bc65e90fb5b5a588b3d304e8bba5c980a5ee5ae014df1cc54d77979a3a3f5d1e9ee7d784eb3bf2798716d497ce024f7482237f0dd
+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-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
index d583a303be53..0d27e032077b 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
deleted file mode 100644
index 817a5e3058f7..000000000000
--- a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="git://git.code.sf.net/p/accel-ppp/code"
-EGIT_BRANCH="1.11"
-inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod
-
-DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-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 )"
-
-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.11.1_p20170508.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
index 07366eb315c8..f2e7d2b54cce 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 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"
+SRC_URI="https://download.sourceforge.net/accel-ppp/${P}.tar.bz2 -> ${P}.tar"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,7 +18,7 @@ RDEPEND="lua? ( dev-lang/lua:0 )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( net-analyzer/net-snmp )
 	dev-libs/libpcre
-	dev-libs/openssl:0"
+	dev-libs/openssl:0="
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )"
 PDEPEND="net-dialup/ppp-scripts"
@@ -30,12 +30,9 @@ CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
 REQUIRED_USE="valgrind? ( debug )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.11.1-linux-4.10.patch"
 	"${FILESDIR}/${PN}-1.11.1-socklen.patch"
 )
 
-S="${WORKDIR}"
-
 pkg_setup() {
 	if use ipoe; then
 		linux-mod_pkg_setup
@@ -47,7 +44,6 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i  -e "/mkdir/d" \
-		-e "/echo/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!
@@ -55,6 +51,10 @@ src_prepare() {
 		drivers/ipoe/CMakeLists.txt \
 		drivers/vlan_mon/CMakeLists.txt || die
 
+	# Fix version
+	sed -i -e "s/1.11/${PV}/" drivers/ipoe/ipoe.c || die
+	sed -i -e "s/1.11/${PV}/" drivers/vlan_mon/vlan_mon.c || die
+
 	# Bug #549918
 	append-ldflags -Wl,-z,lazy
 
@@ -65,7 +65,7 @@ src_configure() {
 	local libdir="$(get_libdir)"
 	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
 	local mycmakeargs=(
-		-DLIB_PATH_SUFFIX="${libdir#lib}"
+		-DLIB_SUFFIX="${libdir#lib}"
 		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
 		-DBUILD_PPTP_DRIVER=no
 		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
@@ -76,7 +76,7 @@ src_configure() {
 		-DNETSNMP="$(usex snmp)"
 		-DRADIUS="$(usex radius)"
 		-DSHAPER="$(usex shaper)"
-		-DVALGRIND="$(usex valgrind)"
+		$(use debug && echo "-DVALGRIND=$(usex valgrind)")
 	)
 	cmake-utils_src_configure
 }
diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index ff874dac8811..a05fd2d9a09d 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="git://git.code.sf.net/p/accel-ppp/code"
+EGIT_REPO_URI="https://git.code.sf.net/p/accel-ppp/code"
 inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
@@ -19,7 +19,7 @@ RDEPEND="lua? ( dev-lang/lua:0 )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( net-analyzer/net-snmp )
 	dev-libs/libpcre
-	dev-libs/openssl:0"
+	dev-libs/openssl:0="
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )"
 PDEPEND="net-dialup/ppp-scripts"
diff --git a/net-dialup/accel-ppp/files/accel-ppp-1.11.1-linux-4.10.patch b/net-dialup/accel-ppp/files/accel-ppp-1.11.1-linux-4.10.patch
deleted file mode 100644
index 568a405fd69c..000000000000
--- a/net-dialup/accel-ppp/files/accel-ppp-1.11.1-linux-4.10.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- ./drivers/ipoe/ipoe.c.orig	2016-11-28 14:28:33.000000000 +0300
-+++ ./drivers/ipoe/ipoe.c	2017-05-17 11:27:42.030000000 +0300
-@@ -52,6 +52,27 @@
- #define DEFINE_SEMAPHORE(name) struct semaphore name = __SEMAPHORE_INITIALIZER(name, 1)
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
-+static inline int
-+_genl_register_family_with_ops_grps(struct genl_family *family,
-+				    const struct genl_ops *ops, size_t n_ops,
-+				    const struct genl_multicast_group *mcgrps,
-+				    size_t n_mcgrps)
-+{
-+	family->module = THIS_MODULE;
-+	family->ops = ops;
-+	family->n_ops = n_ops;
-+	family->mcgrps = mcgrps;
-+	family->n_mcgrps = n_mcgrps;
-+	return genl_register_family(family);
-+}
-+
-+#define genl_register_family_with_ops_groups(family, ops, grps)	\
-+	_genl_register_family_with_ops_grps((family),			\
-+					    (ops), ARRAY_SIZE(ops),	\
-+					    (grps), ARRAY_SIZE(grps))
-+#endif
-+
- struct ipoe_stats {
- 	struct u64_stats_sync sync;
- 	u64 packets;
-@@ -1668,7 +1689,9 @@
- };
- 
- static struct genl_family ipoe_nl_family = {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0)
- 	.id		= GENL_ID_GENERATE,
-+#endif
- 	.name		= IPOE_GENL_NAME,
- 	.version	= IPOE_GENL_VERSION,
- 	.hdrsize	= 0,
---- ./drivers/vlan_mon/vlan_mon.c.orig	2017-05-17 11:28:23.320000000 +0300
-+++ ./drivers/vlan_mon/vlan_mon.c	2017-05-17 11:29:41.660000000 +0300
-@@ -39,6 +39,27 @@
- #define vlan_tx_tag_present(skb) skb_vlan_tag_present(skb)
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
-+static inline int
-+_genl_register_family_with_ops_grps(struct genl_family *family,
-+				    const struct genl_ops *ops, size_t n_ops,
-+				    const struct genl_multicast_group *mcgrps,
-+				    size_t n_mcgrps)
-+{
-+	family->module = THIS_MODULE;
-+	family->ops = ops;
-+	family->n_ops = n_ops;
-+	family->mcgrps = mcgrps;
-+	family->n_mcgrps = n_mcgrps;
-+	return genl_register_family(family);
-+}
-+
-+#define genl_register_family_with_ops_groups(family, ops, grps)	\
-+	_genl_register_family_with_ops_grps((family),			\
-+					    (ops), ARRAY_SIZE(ops),	\
-+					    (grps), ARRAY_SIZE(grps))
-+#endif
-+
- struct vlan_dev {
- 	unsigned int magic;
- 	int ifindex;
-@@ -660,7 +681,9 @@
- };
- 
- static struct genl_family vlan_mon_nl_family = {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0)
- 	.id		= GENL_ID_GENERATE,
-+#endif
- 	.name		= VLAN_MON_GENL_NAME,
- 	.version	= VLAN_MON_GENL_VERSION,
- 	.hdrsize	= 0,
diff --git a/net-dialup/dgcmodem/Manifest b/net-dialup/dgcmodem/Manifest
deleted file mode 100644
index d1a0ac1663e3..000000000000
--- a/net-dialup/dgcmodem/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dgcmodem-1.10.tar.gz 73685 BLAKE2B b875dcd324200c354f43a08289b2ffc0760f3f8a8849e8f44e9e2f964a31df308c52d8cdae05cc4d6a1f0edb8d9ead57b9eb08798b2f020d0995a17dc3231d06 SHA512 ad02fa129f87c81a853b958c1a2a267fcc2f56e083b6fbad980831a0b6f5ad7effe2977c7667eaca4553f3466950c5543d0ddc6f720dc1662aa62b2f2dd57d18
-EBUILD dgcmodem-1.10.ebuild 1636 BLAKE2B 15177db48ff650db75128913c97b6bbe9ab0546317a4d637171e5966368574893231bd30ec4b78d5087d5f33925c1a447e046308211c10595afa44f29423c618 SHA512 e77de99bd121b1822cf04c52c7600d62ffd09e6d7dc9ff09b9e90f37ed0c9f77fa7f3fbfe042975551ce87413754f2032fbb01d82461bed8d643d5fa84b7e77d
-MISC metadata.xml 246 BLAKE2B 1c5c874dba813702c9e2e0147a6d99d357e2570756e7e15379e972c638d820c953aa010c7a00e26efce9a5d9936c88111176a47c540a90c38c49b889239deea9 SHA512 4f7ed62ba7f03a650ba8db92de0fd24d5a5fecb9866aa28011f7bb10d13f7fcff92bae46d1b68c5d5c03fe39b45a36dc264db290c8518cb2ed77ffbca93af563
diff --git a/net-dialup/dgcmodem/dgcmodem-1.10.ebuild b/net-dialup/dgcmodem/dgcmodem-1.10.ebuild
deleted file mode 100644
index b2fb4e83f051..000000000000
--- a/net-dialup/dgcmodem/dgcmodem-1.10.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit linux-info
-
-DESCRIPTION="Driver for Connexant DGC modems"
-HOMEPAGE="http://www.linuxant.com/drivers/dgc/"
-SRC_URI="http://www.linuxant.com/drivers/dgc/archive/${P}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-CONFIG_CHECK="~USB_ACM"
-ERROR_USB_ACM="${PN} requires USB modem (CDC ACM) support in your kernel (module name: USB_ACM)".
-
-src_compile() {
-	cd "${S}"/scripts
-	emake dgcconfig dgcdcpd dgcmodconflicts dgcstop || die "Failed to make scripts"
-}
-
-src_install() {
-	rm -f modules/GPL/COPYING
-	rm -rf modules/binaries
-	insinto /usr/lib/dgcmodem
-	doins -r modules config.mak || die "Failed to install module files"
-	fperms u+x /usr/lib/dgcmodem/modules/kernelcompiler.sh
-
-	cd "${S}"/scripts
-	dosbin dgcconfig dgcdcpd dgcmodconflicts dgcstop || die "Failed to install scripts"
-
-	echo 'KERNEL=="ttyACM0", SYMLINK="modem"' > "${D}"/etc/udev/rules.d/90-dgcmodem.rules
-
-	keepdir /etc/dgcmodem
-}
-
-pkg_postinst() {
-	ewarn "Users need to be in the uucp group to use this driver."
-	ewarn
-	ewarn "Do not set the baud rate to a value higher than 115200, or it will not work."
-	elog
-	elog "Please run:"
-	elog "    emerge --config ${PN}"
-	elog "now and every time you update your kernel."
-	elog
-	elog "Note that using dgcconfig with default options may install an undesirable"
-	elog "rc script, so it is advised you always use the above command instead."
-}
-
-pkg_config(){
-	dgcconfig --kernel --serial --info
-}
-
-pkg_prerm() {
-	dgcconfig --remove
-	rm -f /etc/dgcmodem/.serial_configured
-}
diff --git a/net-dialup/dgcmodem/metadata.xml b/net-dialup/dgcmodem/metadata.xml
deleted file mode 100644
index ca3cdb362951..000000000000
--- a/net-dialup/dgcmodem/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>calchan@gentoo.org</email>
-  <name>Denis Dupeyron</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-dialup/diald/Manifest b/net-dialup/diald/Manifest
index af77e2b6ace6..69546d98eed5 100644
--- a/net-dialup/diald/Manifest
+++ b/net-dialup/diald/Manifest
@@ -5,5 +5,5 @@ AUX diald-init 609 BLAKE2B b67ce8f1169c68b930eaa6f6690298f1fd639cdb9528cf5375c27
 AUX diald.conf 884 BLAKE2B 3a3d60bb38ed71aea98ff683fd7010d9de172e45b36dc9a87127df6d61b93c9115bc046208158d2a925c6a573132a8d19e1cb0709d106deac4858c0b36c5b744 SHA512 5ec12d52eee408f544167b87f8bf19908af4887b0c26e07775b420303869f66ef67391beda202f75bcf8d0b1dae9effcf875b2c09fbfd1d47bfd980f391badd2
 AUX diald.filter 4532 BLAKE2B 081dbeca3fc55d90fefc11acb9ba8726fa8a14f55c672bd248075892b6eec1b9dc2088599c3e872029eda9bbb6cd09d6d9f21cc325fee4609cfeb6f2d9a73206 SHA512 0eb435d4cccb685b930d5601c05f21dd13b3ec3c58a9d48d04ecc8895a9ed5b3568a6187e2baa303bda587b4182f8db1322f90d50692f41fbfe7e21f9f54df68
 DIST diald-1.0.tar.gz 199698 BLAKE2B 061364ce8ee7b4797d92f46a9cb7cc81b8fbbf4af4c3f874457eb04217404c93d42c303031031643f0c3f29cbe0eeb082efbbd460a77d2c27efd1095f7fb0f2c SHA512 e9429e63b70f06801fafcb325630bf86775835df386799b003d85df691fdd2fe8cda261735c4d9baf2663ece6e369bd51a0f6c5031e62d4870b3253a1c49ce25
-EBUILD diald-1.0-r3.ebuild 1380 BLAKE2B cfe7419b99643219f21e94a312b40108e8825a1300d8bc7044f289630b12aad25c78dbeb254ec9edda0d7bbf58061dfce6550f6eb23c1d6b2fcf2283681b7a05 SHA512 01a503fc569839ce92fa0d204048597fb11a19e81af46e3cd531e6f1e250c07dbdd80ab684342f166002c4e9a9a399cf569f2b5ddfb88c6040ba187db86a7c57
+EBUILD diald-1.0-r3.ebuild 1378 BLAKE2B 464bb849ad62103361dd199e311e559efc034404e7117206d5c865b8234f777f3f60c57fe44ba3e81c5da3c89fabcd0d45ae2ec6587b5ccb696ba20edfab73cb SHA512 73aba6f9bee2eff8f955b4fd6907e4df9394c4a76b386e379a4f23ca897f59fa5ae90684ef5cc9dbd9a321cfcbd70bdaab0ade9382a226d7ea23640b142a1c31
 MISC metadata.xml 403 BLAKE2B e99d7c958e678827e45f44461ed43ae9e0d83ad004d9429bcb753054118a11e0635539bdfb7c0b87adcdd6d86ccce0da073303208614accfc02a4ad03e186fba SHA512 40d961035107b6bd8ab81e48597e83ea91e6f2edf9ee2773c0312105a731e51f2e026c2d852234d9a1fde3574e39830a459c2c6cd0eb1bc155e8f658d9b70434
diff --git a/net-dialup/diald/diald-1.0-r3.ebuild b/net-dialup/diald/diald-1.0-r3.ebuild
index 46729a5be186..eef22960360a 100644
--- a/net-dialup/diald/diald-1.0-r3.ebuild
+++ b/net-dialup/diald/diald-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE="pam"
 
-DEPEND="pam? ( virtual/pam )
+DEPEND="pam? ( sys-libs/pam )
 	sys-apps/tcp-wrappers"
 RDEPEND="${DEPEND}
 	net-dialup/ppp"
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 1d32410a3d8d..2667569ff854 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -7,7 +7,7 @@ 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 6062 BLAKE2B a1f47e8b6f571769d697910b6a402b537cad200991436ade1c65b9da7e3f842c58a2f3dc32c7c31d56878683fe6474dab40823b931d41452011ef7a1e92cbeee SHA512 8e871943ae4a31e098568e44d72fc2717efb463f7382a5b63340857e3cdec4819ecf916cd6829a8f02c1d31ad180944a81f27622a53af44afb767ff2dfb3d48f
-EBUILD freeradius-3.0.17.ebuild 6739 BLAKE2B f8fc308368fce5bfd3d5a87cc07612ab919aef79760b6b272cb3df0c269ba701ffac537d65ac9196d94ca5928e19d4f4f2110152ce26b03d3b1484b149474138 SHA512 7170084ab9faed0a110d534558c3f72e3cb2c86450105eda9f3140e66e6c8a02d140eee5591f55bc7a50e787d92f4ed3c6713c7b418e3b05a61a9d751fed3e24
-EBUILD freeradius-3.0.18-r1.ebuild 6884 BLAKE2B b4902a65a693dcf7d72690516396424836ad81c2093126d1e9eee44c10e2714dac7f7c849a17cff94a9cafb12d0bc0fddc4834a1f0e705bb6b235c6222f01d20 SHA512 209e8f233122c5696621aa1fb5f273ee51df47d4f2984f46ed02f25e0d764b9693874f9c43fc56ff562ece4c21008a2f2b1423eea26bc4e0f9e73a08fa409782
+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
 MISC metadata.xml 783 BLAKE2B c543f46ba6b40f3a290a1610016a65be011feeb5f9876c44f4c0957580dadef153f90a0779717d435f5f74da66c6ae2b00db43a7f1292c7543a3ec426181ec5d SHA512 77860b155c6fd58008b229cc5ad1b36644efdb9ccddcf1767e36afed25ab975a43726bcde80b17399a19644577212631aa1043e8e6a430a560c33969d8ac613b
diff --git a/net-dialup/freeradius/freeradius-3.0.15.ebuild b/net-dialup/freeradius/freeradius-3.0.15.ebuild
index ede4f9100e10..79fb360a846a 100644
--- a/net-dialup/freeradius/freeradius-3.0.15.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.15.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 "
 HOMEPAGE="http://www.freeradius.org/"
 
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -37,7 +37,7 @@ RDEPEND="!net-dialup/cistronradius
 	mysql? ( dev-db/mysql-connector-c:= )
 	postgres? ( dev-db/postgresql:= )
 	firebird? ( dev-db/firebird )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
diff --git a/net-dialup/freeradius/freeradius-3.0.17.ebuild b/net-dialup/freeradius/freeradius-3.0.17.ebuild
index 9b76437cb8b3..43ff6595d37f 100644
--- a/net-dialup/freeradius/freeradius-3.0.17.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.17.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 "
 HOMEPAGE="http://www.freeradius.org/"
 
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -40,7 +40,7 @@ RDEPEND="!net-dialup/cistronradius
 	mysql? ( dev-db/mysql-connector-c )
 	postgres? ( dev-db/postgresql:= )
 	firebird? ( dev-db/firebird )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	rest? ( dev-libs/json-c:= )
 	samba? ( net-fs/samba )
 	redis? ( dev-libs/hiredis:= )
diff --git a/net-dialup/freeradius/freeradius-3.0.18-r1.ebuild b/net-dialup/freeradius/freeradius-3.0.18-r1.ebuild
index 44d5b7baa7ed..a776acbe3b22 100644
--- a/net-dialup/freeradius/freeradius-3.0.18-r1.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.18-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 "
 HOMEPAGE="http://www.freeradius.org/"
 
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -40,7 +40,7 @@ RDEPEND="!net-dialup/cistronradius
 	mysql? ( dev-db/mysql-connector-c )
 	postgres? ( dev-db/postgresql:= )
 	firebird? ( dev-db/firebird )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	rest? ( dev-libs/json-c:= )
 	samba? ( net-fs/samba )
 	redis? ( dev-libs/hiredis:= )
diff --git a/net-dialup/lrzsz/Manifest b/net-dialup/lrzsz/Manifest
index 88467f4a3115..c1ef59429720 100644
--- a/net-dialup/lrzsz/Manifest
+++ b/net-dialup/lrzsz/Manifest
@@ -3,5 +3,5 @@ AUX lrzsz-0.12.20-automake-1.13.patch 454 BLAKE2B 19627ec86b92c5e1dfcd4404408b9a
 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 1526 BLAKE2B 3e78ffb152f06a7f77f312d9918cc2ad83d4f9655867e9f7def2797cb1c978da3c68f88e3488a346bf18ad5a95fa39c5338fd003dc733a0a415cf37eab2bb797 SHA512 3b6f34b961047010d5b22b00bf78b729c2ae4f463c58364b7e8afcc691ce4fafed3fe5c3ace0e6a44cb80dabbaf62b6ce35bf3ea13ab3c3c7250cb127a3423b9
+EBUILD lrzsz-0.12.20-r4.ebuild 1516 BLAKE2B 80a588962b845302a8bac38ff53de43b78cfb8ccd24099675e10b0cbe504c4b4d9cb4d3159ec0c169f2db87c421f1545003f5a4acf5da9d887df66c4bab8a637 SHA512 2d21311c010baadb015c91392a25f89ad93673ba3862e718b790503df526a7dff70abfc06a6967dd11eb5e1c529f7373c6f847f6e3e472a683e131a938bd13df
 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 cb2d74b42e8e..c89d4506098b 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ohse.de/uwe/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/net-dialup/minicom/Manifest b/net-dialup/minicom/Manifest
index 040262693841..6f07284ce1e4 100644
--- a/net-dialup/minicom/Manifest
+++ b/net-dialup/minicom/Manifest
@@ -2,5 +2,5 @@ AUX minicom-2.3-gentoo-runscript.patch 2382 BLAKE2B 358b5472a57d9e95b41fbde79eba
 AUX minicom-2.7-lockdir.patch 535 BLAKE2B dfdd70268877e4eaa959fc3262342be3c0b89aa3e62ab75c58e9987e03f758249712ac639bbffda7dc377eb69ec544dbd5b48fdfd01278fad3f91ffd77cf8f2d SHA512 7e555046cd58a796f01473e064cbf289bfd467b0ceefbdc49734d5a9ee3c8f41480378cd456e0b30e94bb892b3329959c4c38ecc942e35d3890bc6da515e1f59
 AUX minirc.dfl 66 BLAKE2B fa087c52ace0bcc5915e58074b96f8d6b0304690dccdb5d2710a2d3c334825f05d89e75d9a613ac1c40a44bd1605cae8765d24a259212767e62fe3a6f8779b57 SHA512 dc6f65392ec4ee9e0f499596b6220cb23e443530a3802edc8805412a7999ffb48cb2f9f5c9f7a7ebfbbe166fdbf128847f00141c4f67c0176bb245081814955c
 DIST minicom-2.7.1.tar.gz 863544 BLAKE2B 473dbf9695e16fdf23581b831d1b76f32a5b9f47cf82c6430386646a4ad04a58d61bea08ba032d0c4f779fd19d90d12270df317b719bad6cba63d921c197c87c SHA512 eb9679ac3a3d3585ea06c54407567898e50b981378656e7f8a241071c91054ff0928cc9023d2c79d1936588cdffa9426f4962b556e8daa1783add0c5ac59b5af
-EBUILD minicom-2.7.1.ebuild 1293 BLAKE2B a87e5da4ce3f9039a5ac94aba035d9a60d9c461c1231a7f55f5663861f06966740c31e0d93949bd505fe7e4ca90412153f0eb1a33de69a61acb5ba5756cb9679 SHA512 3ac2a434c5db82be96d557f5349262038117c994fac5acb2aa19d69c1b4139f2784c701af0df3aaa2f88f10cfe0492d7ebe6716b97188222c7972ae52bcd4e8d
+EBUILD minicom-2.7.1.ebuild 1283 BLAKE2B f1a4ef81075813d08f8a032a8fed9c0044e56938aedefa35cd6270546c731d2b8a860cfd8d27269f4a9c756efaa47708ea74dedafca21ed848c6ecb6a9288bb9 SHA512 590c038c1ff9376aafd1de5f3a12a900416dd27d22e020730e69f114c8315c2ac50d2381900819f075fe59cefd83630a85aef1585cb689e4671d4fc8fa02bb11
 MISC metadata.xml 552 BLAKE2B 08dc7635a7842cd0e8a601a303a05fafbc141ddfd3c8ab505a7dd2f83773fdd933b23d11eb2bc02762da4ab9d0f38636dcaacb42c7fdc2bc4085ffd4fa1ba352 SHA512 da0850a93f06da092c90434b64be1776b7357c099c8ca4f87d37aa7f07dc985fa4539793c446c1fb6774c55ba0b56d2e445cf5446d6d02abe6386b488040a9e8
diff --git a/net-dialup/minicom/minicom-2.7.1.ebuild b/net-dialup/minicom/minicom-2.7.1.ebuild
index 24686f98a416..0f9ed47b1baa 100644
--- a/net-dialup/minicom/minicom-2.7.1.ebuild
+++ b/net-dialup/minicom/minicom-2.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 COMMON_DEPEND="sys-libs/ncurses:="
diff --git a/net-dialup/picocom/Manifest b/net-dialup/picocom/Manifest
index 574f510bd792..b0b878a984f1 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 788 BLAKE2B f0f15d7a0231c40df08fc73b7a5ee6617145f22213af099d75873f852eb0c7589c2de4807154d46854d3172e911ec00ebe5b20b3660f3b3b8e6c7b5390124026 SHA512 422a9e110619df5f6f8141831afcd642f01e112935e11b7b1e0e7b0b7d822d2f048517081a16cdcb6496077a8e2d0ed1efbdca52bb70357e28a917fc2d65d8ec
-EBUILD picocom-3.1.ebuild 790 BLAKE2B 1facb42f2ae4b5a022b6e3d1daee0e643be331655992e9d43209217a02035b619ed884ce17e300f432b32d87c5c415da4b9ebea0530899ef6823775a91d6a9ed SHA512 b30aef2421e837e3751e21c0210d5190abf0491c6b89a6ada443b850227a572840d9becdee51bf4b1ad10fd7d3a6536c04f9c70a7818cef8e03b089c3fb15162
+EBUILD picocom-2.2.ebuild 778 BLAKE2B b01e0a860488798070ae6e64bd1a0be2e2c02c6f5ae453a682a341261dfac8516ad72223a1584bde672fb7a31aaf02a8ba7c12bf6e2d2bbe0dbbe6618c81b2ce SHA512 d7c226258a78310e85b945ac36ea9e8b1f5c8d45377ffaecbb47fe243287602f39ff5c0616f8ec9102f37a1cd367bd5030a9090eaa957829eedbf12afff3aa5d
+EBUILD picocom-3.1.ebuild 780 BLAKE2B 9974443b966c4e55336817094fbe2e7a402a6ef9213a9fbddb8b2ccf04033888fa10f16efa6f408d656a5527708ce355070234a1ddfa6587034de787838857bc SHA512 b41715d724dee632e3e8fc85f3169f3173bc6165e8c91c5b30e68c951c70c1798db19891cfb42e25c8c9e6ac8e0ee3c38a5558bf7068afbcdb516b733c52da26
 MISC metadata.xml 335 BLAKE2B 0520f99d98b1ecfa11b8f25a5b371ac54eb9bf1e42df147902dbc284ac9062d3d30c8dc22081981dd2e79fde536262f967173cf052b866f980fe361cefe667d9 SHA512 9e039f41b69e370ca12ada0240ac7d9a2977cdc3bc1f2384c85cb14ae169b344272e9cb9705081e455a2a381533d488027f8a3e283e518d9ca23eac087e83bc4
diff --git a/net-dialup/picocom/picocom-2.2.ebuild b/net-dialup/picocom/picocom-2.2.ebuild
index 635ec1958d2b..6df84e7d4d6a 100644
--- a/net-dialup/picocom/picocom-2.2.ebuild
+++ b/net-dialup/picocom/picocom-2.2.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 ~ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 src_compile() {
diff --git a/net-dialup/picocom/picocom-3.1.ebuild b/net-dialup/picocom/picocom-3.1.ebuild
index d1c92b4a713f..b1cc891871a3 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 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
 IUSE=""
 
 src_compile() {
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index a45ff29cda35..9c8aeb3ddf9b 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 7074 BLAKE2B 39abd188047166eca6b2ddf0c3c87ccb98ac84db1d0bc84cf7e3c968023d9476937934f94ff947e212cb2487683a53c6a82659d4343dd69829f7bb31b786fffa SHA512 91c1a2a121b877e2a6f0c9e70a4d5c7dbe743f39b7990e0765030f9e162605fe1a19d1eddf28d12c93b20c267d8587cf1d85c28ba1c2dcf78d5d6a3e0cce414b
+EBUILD ppp-2.4.7-r7.ebuild 7075 BLAKE2B 1bc291293910c09dfdeb297078c523d9c64eaa5285f172da82cc8b6d0a7b17b502d37f090715e9e16d7cc5e133cafe86e4b57cd084eb043074f73fcad0af3106 SHA512 f4a2a2cf994f8029809fec8bf6eb5aed22cbc8534627fe98cc6538ebdce95c8cd828824412e4151fe92a46ca1d284284098f5d55f035c7436bfb2c0ec4962d07
 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 0139d679188f..07da646685d9 100644
--- a/net-dialup/ppp/ppp-2.4.7-r7.ebuild
+++ b/net-dialup/ppp/ppp-2.4.7-r7.ebuild
@@ -20,7 +20,7 @@ IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
 DEPEND="
 	activefilter? ( net-libs/libpcap )
 	atm? ( net-dialup/linux-atm )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	gtk? ( x11-libs/gtk+:2 )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index 19531d632bc3..37981ffe3d45 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -9,5 +9,5 @@ DIST xl2tpd-1.3.13.tar.gz 513958 BLAKE2B 66c2bcbb54191445f1a519d507b2ec67b48d9e9
 EBUILD xl2tpd-1.3.10.ebuild 1421 BLAKE2B 7a913a770cc5feed9b201f6bc7d54402fd246fec6c280c5a8a8c64da7aef9fe1cc66b5d2933820c8d57265e1989d5aaeef3f72c73200769918572ff9fe3dff5d SHA512 c2c4bd328767e082aa8e20c9274a3070f5c121bf0723bcb740c04aacc41825f6785f393904e751f1f820a60d3b541518fba30eb63f228b18d7cf4d919be69601
 EBUILD xl2tpd-1.3.11.ebuild 1428 BLAKE2B 58651df441e16d91d8581a802392328a15350101f2d866b2c31205054779648fd1372520200140392e9078b2e32d0b1b2f061d5c71b1046369e772220ed6734f SHA512 9cee0c5c5b4d36ef43f65347ddcf1b8f6dc7d317f1f300fea2b6634f23ae656ba535674ba3b186bb725adf73f64bdf251e53a03b7c02b8235e99d87392fdb8ae
 EBUILD xl2tpd-1.3.12.ebuild 1004 BLAKE2B a796ad76184d12a65580ae78f74d7d9b1441218575e9ba0251f12c3a455d3a08a842788d3ab5a1ea8b3bbd0f31f844ef3d5bd9b1d3caf58752102b5dbfb9dc3d SHA512 f71ebce1cbb0c62164433a1a17685d1c38c5b359b49bec046e10c9fbb9d4eff0b2878f2aae0fa1630b9126ddb7bf5888beb5ddf78bfc764b7116f75743239ea4
-EBUILD xl2tpd-1.3.13.ebuild 1085 BLAKE2B 59ac457947ab22c55f14f184e48aca4bf1b3f6c17dbfb40819b6c36e4bcb3084247297fa0f1b6266f0fcedcf884596b5dc6e28253129477e4508ff472108115e SHA512 3929d200e1d714c50bfa712c68544e46270b5e9485ee531fd9c74d1ec2535fe20112ef2dc8379b0781d3fbf2e0054c0029e36ec69246c6e80515e1f53191bb31
+EBUILD xl2tpd-1.3.13.ebuild 1082 BLAKE2B 0e4c91d30eb35658079bbeb69c49083f16f6becebd87d3c8ccdda183ec6f4652749a49d0d6384ffc9bbbd34af02e4b03f8b3eda36f91065dc58d464bca52617a SHA512 385303dfab5bce3b618a7234592670b6d6048d85be8c8b180bf515bc5992085a67606dcef5baa04a8339af1571b866724031ffba58b4f7477e8f2d4a15bd4a2c
 MISC metadata.xml 956 BLAKE2B 6091603a330f7056f8710c185d5bb6f83e60d7d7063d2844125568d81353da7c79a6c56d3652d2fcfd373a3f5c310a7aa64b6231ac9ed39a41485ccf788cb0ec SHA512 22a1d2541c0bd7e46a54a75d4199233d216b2678bc7c60b0c0c29d2cfc1c9f6320afb22611e1f4fd1b1801fb2084d565a79cb3eeaa5092d9e836a8fdf3dcc9cb
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild
index ff05839b9552..0fefbeec078b 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6