gentoo resync : 16.09.2020

26 files changed, 148 insertions, 44 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index bfd8034adbdf..ecad5bcfef91 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 0d7aced6333f..1dbeddc5cebf 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -3,6 +3,8 @@ AUX accel-ppp-1.12.0-kernel-5.2.patch 8304 BLAKE2B f28a0720dd9d99948cd4552986fdd
 AUX accel-ppp.confd 437 BLAKE2B 6b418f528877a46b4b8aba3728405459a567c264b5bb73da79a08649f604f99f6b9d5a665599836b902c554b9fa5c62b8e399cb60bf4e0bcf85e21a0d4959b54 SHA512 66dad6b7b4497c5768206e7990e4034f1de03d9608e1470888e061ba0ff6be934f1dd329336fd3978a43a99a8e3971a00be4da327bfc01a64dadfe91da2cea30
 AUX accel-ppp.initd 998 BLAKE2B 974407e0e974fb79b3ea17bd1526d1f6343d7284cb10a93bcb2713f955244a91a664fd7187287a7b090edee340f76181f88645b2d4bf0e5470d825407ddebe83 SHA512 ebee03f6c448f1158831bb563568ce027b2824c185852d380f079456f25dcb69e0fe5c6d6235eed33f028825786f091853c05fcba5eb3c287790353629823764
 DIST accel-ppp-1.12.0.tar 6758400 BLAKE2B 776c0946decec2d88a0dfeb8e840573ae8d53d53d0fe921604667eaf4a5658e7d0cfa57f0b54eb61fcdf62b7a62a94ee405a01ad2a66ab76042d59cc3f79d42b SHA512 f1d3b31ca36395a429214b7599a43755317d89391c5631dfd02df79ed8dd51c39f75fc56ac625fbc6e7d5b0f9c85699c5da612eb4e8af9eae8ad2d9b13a187ba
-EBUILD accel-ppp-1.12.0-r1.ebuild 2603 BLAKE2B 2c1ff7d6cc55db2f3aceba681d068f9d6751a4d0a99d31661f969724e9bf7b8c043a26b773652f93ce10e45c1512942468c26440f39e703d14a2a133c75ccaa7 SHA512 e6611236f6281cb866f8c6b2747b0bff74e67e7bd578862ff88d6df11e7542682a3736cf9cd18bbca080ec1ea095751abfe390d3d88f204f96f4c7e0beae3ed9
-EBUILD accel-ppp-9999.ebuild 2365 BLAKE2B be66ab5ddf4691777a23fdf370f998b4c5c525b50ea266ba9ea1f0cafc90a78917fa2917599dcfca138514e23eca1fd17484addfa8a3cac036c61f12a23a6022 SHA512 470f9fbfee509aa7e425400a76eed23830a208d4d2b05b79acec54160b1796551d1214bce3e61d6dbbee7f2048b23b3ce936cb0578262c747d465c47a70e589e
+DIST accel-ppp-1.12.0_p20200913.tar.bz2 1661195 BLAKE2B 6ffdb140486e98c19c981999873f94e767682bec1a2bea1f2feb7bed6ce9d8b15a824605da0b60897501773f4ece9d71612385dd1eff61483fff5daadad9713d SHA512 ecf325774507a8ddb1c6fe3c90aa2e25c72d006e9d96eabf66c7f1b67cfa70fc1073cf120c195d0823ad2532fa3504f6ab482d1842eb8b3e3dbafdb8b16a2ac6
+EBUILD accel-ppp-1.12.0-r1.ebuild 2605 BLAKE2B d0b0d44969d655546aadf0d5ce567055dfb427ed2a0822ee8b8c0c5af6241ff03f36a7cc235789b8fe474d3d981609978c98c1c20b524b1466fdd2d2d4baf2c4 SHA512 6a26a93f5ff1e12fb4a6d93ec06be22544e7bcef3bfaa36081b169fdf4d9fe77e92389610379a99abe14bd5f031330fb46f79ac793b96a07f667ecbc8b3329c5
+EBUILD accel-ppp-1.12.0_p20200913.ebuild 2552 BLAKE2B 65b6d290ba6cf136b0fc6e4c3c99737c951303054b882bd00cbcade908ceaa0a5b9e1135ebbd326e8517ae6333c63353b63fb504a36c3d52b8b20ee630fc7187 SHA512 383e8599243b59125fe1a0063511244235130e91dbb207a9ccaab80fb3b54fde7ca9bd94f9549bdd1d54bc424c599b180e9b7fc0791a5e86520b6f0a71712e37
+EBUILD accel-ppp-9999.ebuild 2339 BLAKE2B 50c5f3d4a5daf59e5af62580c4ccd6ebc24d7754d69b1c58096c02b46204519706de7bba1bf0e6214b968f0ca37220e25c54e03417ba37d5eca95eca76c4c2d9 SHA512 998b01a8b96f2371a0dfe669830b994030dd2bd3fb2cad787ada047b32c87f689548a9a972d834c7b266454ed728a0408872d03e191f3e11b5dba14d179344f5
 MISC metadata.xml 507 BLAKE2B 7c0a985830c791f5fe40ed8b624f366eb8e39505fe128b46153740f77ce9c5bd05bf8bf7ffb8939aa42550c9ea08de8f2498d444ef2e930121bbe7f404bf88dd SHA512 6b60c890f172501225ed3da4a229298c2b05601606d047bbe46dbea88246bcce8c15695259063daf73574c9d24048b04d2422c83e2e934015768338120e9154e
diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0-r1.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0-r1.ebuild
index 61e4c0092c83..7c3f0f8b2be4 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.12.0-r1.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0-r1.ebuild
@@ -104,5 +104,5 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
 
-	dodir /var/log/accel-ppp
+	keepdir /var/log/accel-ppp
 }
diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913.ebuild
new file mode 100644
index 000000000000..43549ba9cb33
--- /dev/null
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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
+
+	# 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
+
+	cmake_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 TRUE FALSE)"
+		-DMEMDEBUG="$(usex debug)"
+		-DNETSNMP="$(usex snmp)"
+		-DRADIUS="$(usex radius)"
+		-DSHAPER="$(usex shaper)"
+		$(use debug && echo "-DVALGRIND=$(usex valgrind)")
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_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_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
+
+	keepdir /var/log/accel-ppp
+}
diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index 68e1f642d6f6..3f8aec7348a9 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-EGIT_REPO_URI="https://git.code.sf.net/p/accel-ppp/code"
-inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod
+EGIT_REPO_URI="https://github.com/accel-ppp/accel-ppp.git"
+inherit cmake flag-o-matic git-r3 linux-info linux-mod
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
 HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
@@ -51,7 +51,7 @@ src_prepare() {
 	# Bug #549918
 	append-ldflags -Wl,-z,lazy
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -71,11 +71,11 @@ src_configure() {
 		-DSHAPER="$(usex shaper)"
 		$(use debug && echo "-DVALGRIND=$(usex valgrind)")
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 }
 
 src_install() {
@@ -84,7 +84,7 @@ src_install() {
 		linux-mod_src_install
 	fi
 
-	cmake-utils_src_install
+	cmake_src_install
 
 	use doc && dodoc -r rfc
 
@@ -96,5 +96,5 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
 
-	dodir /var/log/accel-ppp
+	keepdir /var/log/accel-ppp
 }
diff --git a/net-dialup/cistronradius/Manifest b/net-dialup/cistronradius/Manifest
index 39ebd90055a3..85494d685f2b 100644
--- a/net-dialup/cistronradius/Manifest
+++ b/net-dialup/cistronradius/Manifest
@@ -2,4 +2,4 @@ AUX cistronradius-1.6.8-gcc41.patch 452 BLAKE2B 04fba1ec6c17ce64af916563e06cd970
 AUX cistronradius.rc 716 BLAKE2B 3bbc2458da0a7d05df9ef72e41baf5c4b53c15f5c658acfbfc806b94e91d96912ee26dc5e718c03bc8234274cda34b03c58786854f21bf5ca8280c211c5259fe SHA512 d86029f75b922f2b382f34e219462f898ffb1ca8d0517d7a57b33b239396906a89da8afa5667257995aa7bac2f3f7eda4e5284672682405d131d2cdb79491fc3
 DIST radiusd-cistron-1.6.8.tar.gz 199459 BLAKE2B 5cd40915597e8d02c4624c0ea9161ee50a09c85137f9cf2d84f99504af1581a58c52d99aab473a034ef557beefd1fc7753757b4a04c1bd460871d37a6c7479da SHA512 9d42ec39eaa78f0c35ca036cf891d45a99c38af03416e4bca2d9d883a9aac818a0da1a52b5c1d4e54a1bdb108b237ed92c16309b61b7aa24f8782d0d0e0f8de5
 EBUILD cistronradius-1.6.8-r2.ebuild 1155 BLAKE2B 1cd68bbfdd422f06eda622a5d5eca68c37f3f23cfd093c60d1ea850cac6381ad31979c0c47967531115ded51740115dbd9b258627dbfc3d5bb3979f865babf95 SHA512 3a292d873b36eb0faa0d95314816cbcbb6f585603be3b506c82bebe2912e80e3b47b955aee2d86cf4b60d6824c7b9ad0d1695b04d746fcd79e56f5acaba20360
-MISC metadata.xml 296 BLAKE2B 274aacd7d5ff9ab7419b77fafdfcef2e4041412e910eb79f3b168d9ed28e213e249a11cef9aa14b7df957d5de2f04fe51eae2049abdf5f43cccdcf907bb26642 SHA512 46978f543efeb23b4fe607a276f36658ca471dc3b6b4558f836971ea1074676586bdf069ff28efb45aa49ca8d874af66ed4ba93bdc82efca90ad4d896929b49f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dialup/cistronradius/metadata.xml b/net-dialup/cistronradius/metadata.xml
index 2f725d0fbf41..6f49eba8f496 100644
--- a/net-dialup/cistronradius/metadata.xml
+++ b/net-dialup/cistronradius/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
-<longdescription>
-An authentication and accounting server for terminal servers that speak the RADIUS protocol.
-</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/freeradius-client/Manifest b/net-dialup/freeradius-client/Manifest
index 8ca1f2d0e1d4..1fc315f8d98a 100644
--- a/net-dialup/freeradius-client/Manifest
+++ b/net-dialup/freeradius-client/Manifest
@@ -1,4 +1,5 @@
+AUX freeradius-client-1.1.7-ar-configure.in.patch 241 BLAKE2B fc58d9477275ddbe7724adba4cbd7d1f4a5a134ca355aa41375376e056c321e22fe4f355602c0cffa70cb532cfee32f2c0728cea93c9e0d579cceea6425c8147 SHA512 654f142be0ff695ab4b9c8c9fa52e3a448c3d0027b5e7d8e776323e49be0cf268cb7cab82a5dd2ccf067a7089a8ff618296755973af1155ab40034cd93a6bea8
 DIST freeradius-client-1.1.7.tar.gz 433141 BLAKE2B 3a1ba65eb8b66d28362fd66a905af0a4e12b67e664da2c64dab87616e3787cded58d0c3bf56705bdb879d41f1a9a984cf5256b06eeb382209caebf748f679e12 SHA512 20e79ec97da79f46b334e1c2880803a692885a4038196a4d016094d349f675e2d0521d921140c5ab06703008619417f7a20d3e90cdfc7b3578faccbd232be0ce
-EBUILD freeradius-client-1.1.7-r1.ebuild 1163 BLAKE2B 246604b5aafb6d0f603cc410bd3cac7906e36f089f66edd6f0a290714bcac06e43987482069e444707c79044de64ffa15b795cfe2f0f4ce9e7c90f580ceba510 SHA512 3a3acb9be24723974f91351ee9461d2af7442d57688a714acd7d15a8e24fcaaa4749f341b168610b3e2292663cec4c69f4b9922ed216839bc5a9738a0b77eb8c
+EBUILD freeradius-client-1.1.7-r1.ebuild 1038 BLAKE2B f75888164228262d2cac4e99d370882a7141c16133388db56174c677e42960ff5bd8986294001783d6e92a521017c9b5dd95bab5307f5cbca9cc2eee0f057054 SHA512 d4382365b5953cd6ba989f1388c1218c735fd01285bb68aed335257f827f6da5cf2012bcd59c45ac168957b753d36b9c732744890206b82fcb7e7c537f221bdd
 EBUILD freeradius-client-1.1.7.ebuild 836 BLAKE2B 38271f1900af8aaf48a0fdfb5247ff33660c52086bb4c92065b9cb30669d54e3fc3d686f814c09a55271fcae3db4f6fc4572f2540bffb4c134b874f0574f88cd SHA512 718cba62d2996bdbd4c38bca123e35862ea99a34f08b66c61523498c1d3efcfde8eef41b9c71846b5e2973875c86f1c8404ea9ad14c91a073e4d3c6ba0ce6dff
 MISC metadata.xml 937 BLAKE2B dd3e76a7a6a71b1d0ad75eb4190154124c8c15c8026ee35947067fc403369a348117dbb72f3986b81234777896aeef6ebc32f6ad32e6d41ae24dc772e9f57a28 SHA512 49a0f971e1bac986e6f6dfb02370011afeda182eb733b1c11cc1307d43881fadf924af84c42d8ed44937a01faa9b5793a8ec112e87d6648ba0d1737ee4c5495d
diff --git a/net-dialup/freeradius-client/files/freeradius-client-1.1.7-ar-configure.in.patch b/net-dialup/freeradius-client/files/freeradius-client-1.1.7-ar-configure.in.patch
new file mode 100644
index 000000000000..07d477bcc901
--- /dev/null
+++ b/net-dialup/freeradius-client/files/freeradius-client-1.1.7-ar-configure.in.patch
@@ -0,0 +1,10 @@
+--- a/configure.in	2020-07-08 19:20:38.180447370 +0200
++++ b/configure.in	2020-07-08 19:21:00.840479965 +0200
+@@ -33,6 +33,6 @@
+ 
+ dnl Needed for normal compile
+-AC_PATH_PROG(AR, ar)
++AM_PROG_AR
+ AM_PROG_LIBTOOL
+ 
+ dnl HAVE_SHADOW_PASSWORDS
diff --git a/net-dialup/freeradius-client/freeradius-client-1.1.7-r1.ebuild b/net-dialup/freeradius-client/freeradius-client-1.1.7-r1.ebuild
index 0b182155d465..c22a345c3f27 100644
--- a/net-dialup/freeradius-client/freeradius-client-1.1.7-r1.ebuild
+++ b/net-dialup/freeradius-client/freeradius-client-1.1.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools toolchain-funcs
+inherit autotools
 
 DESCRIPTION="FreeRADIUS Client framework"
 HOMEPAGE="https://wiki.freeradius.org/project/Radiusclient"
@@ -23,27 +23,25 @@ DOCS=(
 	README.{radexample,rst}
 )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.7-ar-configure.in.patch"
+)
+
 src_prepare() {
 	default
 	mv configure.in configure.ac || die \
 		"Renaming configure.in to configure.ac failed"
+
 	eautoreconf
 }
 
 src_configure() {
-	tc-export AR
-
 	local myeconfargs=(
 		$(use_enable scp)
 		$(use_enable shadow)
 		--with-secure-path
 	)
 	econf "${myeconfargs[@]}"
-
-	for MAKEFILE in $(find -name Makefile) libtool; do
-		sed -i "s|/usr/bin/ar|${AR}|" "${MAKEFILE}" || \
-			die "Patching ${MAKEFILE} for ${AR} failed"
-	done
 }
 
 src_install() {
diff --git a/net-dialup/isdn-firmware/Manifest b/net-dialup/isdn-firmware/Manifest
index 3b7622733e7b..8490c897c8f9 100644
--- a/net-dialup/isdn-firmware/Manifest
+++ b/net-dialup/isdn-firmware/Manifest
@@ -1,3 +1,3 @@
 DIST i4lfirm-2005.8.15-2.i586.rpm 2530426 BLAKE2B 9232a64e6c9faa19f8ce3dceabb82e9d19fc9eee76dbc56f21f6bd46c4e711c14feb05f2dd7b37dff085c2b690ed3b6b95830f4a734f7292ef8e3769fe526001 SHA512 fe943d33b38fa4f2d1c87b31cfe0fd1a99fc930660b88b8e5a138ca8be4c8abcfb7f09f7cd39ed7d12da34b61b0b60bec22b84a38818b478a802eba8a2191153
 EBUILD isdn-firmware-2005.8.15.2.ebuild 695 BLAKE2B c3cec6bcc8bb7fef6f458e2ddfcb0df3bde391a6b2ea1049a0d4b5a793c4c8e6c7cffee5c0117355cf893f03a55b898f5e776e75e2dae825b2d12792fae251f5 SHA512 405d1c8a7c31d85996bab0ed76d2137de79012711d4695e63c5264a49c72fea24d70081379e85e704f17ec50ce180fa1aaae502ecb640f9c8efe2e3c275ad2a1
-MISC metadata.xml 273 BLAKE2B 7e929ea896f0e63794bb6b39454c16086d12730f36d5c4fa40a2dd145a5c61a30a20beac44ef7963e8f92c8e76ff3fd2ccd669bba001393510ffeae20f4d8318 SHA512 df17921ad6d2ac8087652db27af1188ca9ca87acbf3c5d37d1197a6337e10a2fc763d5333bca9306362b08c1c0b5ed9da358017be1ae0d53dc14e6e87f8a1766
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-dialup/isdn-firmware/metadata.xml b/net-dialup/isdn-firmware/metadata.xml
index f28529eb62f5..7a38bb900964 100644
--- a/net-dialup/isdn-firmware/metadata.xml
+++ b/net-dialup/isdn-firmware/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		ISDN firmware for active ISDN cards (AVM, Eicon, etc.)
-	</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/linux-atm/Manifest b/net-dialup/linux-atm/Manifest
index 89d138a31764..aeb926a4bd55 100644
--- a/net-dialup/linux-atm/Manifest
+++ b/net-dialup/linux-atm/Manifest
@@ -2,4 +2,4 @@ AUX linux-atm-2.5.2-headers.patch 646 BLAKE2B 1a1280f70c9232ddc39b664e1a533258c6
 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 955 BLAKE2B dd417448c766e383a5a40f5301025eaa44abad3ff55d312f7de10ff25555dd37c5b2b87b2c0970ec5d3cb3bce133b3b5b9002d27c2f91c1f61136c51ad8e5538 SHA512 31b26d7b4abdf8c06889b81301aa913dc53a4327c80607624be3ad67564fd0f54d508f0b1d824b89416193d62b762b9b3608403d89cc3eed598be49303ca8955
-MISC metadata.xml 303 BLAKE2B 064756eecade63aaa1040f2712c005a677f365f7c6e6bb5743c4cf8deb59bee599f42b3b38160e5e2a04402a9b2167e618b4f891cc80a30a3e48b2f7851813ac SHA512 86ae1e28bb9f9d2db0a9607d58dd8cb48f96e76c4aaf5e7027f9ae792ef41ca6ac8da92adf13a40c4bcc1bd2cbea67cd4535232116616f687011c777789bc79b
+MISC metadata.xml 251 BLAKE2B 2cb2469d547d2f3ca552692a021dbd5259b7402d2cea686916d73ecb7ce7bb520cfb55da0478e85dbed91b69f87a9cac89dda5be9736e2ccf77aaca392f82d7b SHA512 5e556ac292e2a0cb07531af98ac9da974e97534c1cf510e77daa2bf59c5e40bc445501f587e266fe694bf445ffd99219a0077dd66e4c3d4776372a84f6743efd
diff --git a/net-dialup/linux-atm/metadata.xml b/net-dialup/linux-atm/metadata.xml
index 44b11c5f4517..f9b417f9b31d 100644
--- a/net-dialup/linux-atm/metadata.xml
+++ b/net-dialup/linux-atm/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>Tools for ATM.</longdescription>
   <upstream>
     <remote-id type="sourceforge">linux-atm</remote-id>
   </upstream>
diff --git a/net-dialup/lrzsz/Manifest b/net-dialup/lrzsz/Manifest
index 4d0313f9429c..a98f12b826bd 100644
--- a/net-dialup/lrzsz/Manifest
+++ b/net-dialup/lrzsz/Manifest
@@ -6,4 +6,4 @@ AUX lrzsz-autotools.patch 8725 BLAKE2B 8f499974f0184784d1e800a43e8fdd09b389bb2a2
 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 1584 BLAKE2B c61639d04209dd753ff8edc70ca186ebf393bdb53035f6611b75b88d0092e1f203a332b26cfd768fef022277dde353522f2cd1e202a3f517bb058a5426871769 SHA512 cb17646273224eaa223a3f22806c4daed8233911147ad6170971155ffdbbef30370d7b26b0e07284a1428064b5b952a606b8420caa93b0c54ee8ebbca78b0a3d
-MISC metadata.xml 359 BLAKE2B 842a9354b4b11a8894d58eda8cee0a31b60bb74981333e3e8ee383cb8caa1f0ee0577060880b123c3d73fb7cb5562a542c346f04bba3e60c5e40d9ef83a26c26 SHA512 5e033194af9899fd66ee44372089c3e63a2839a486f845ba139786a862f1b0534902465e776d901155ddffb794e7419f338b4c5ed43d6a8301c98ae8dc24db70
+MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/net-dialup/lrzsz/metadata.xml b/net-dialup/lrzsz/metadata.xml
index bc795c3823a6..71b1461e1146 100644
--- a/net-dialup/lrzsz/metadata.xml
+++ b/net-dialup/lrzsz/metadata.xml
@@ -5,5 +5,4 @@
 	<email>embedded@gentoo.org</email>
 	<name>Embedded Gentoo</name>
 </maintainer>
-<longdescription>Communication package providing the X, Y, and ZMODEM file transfer protocols</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/moserial/Manifest b/net-dialup/moserial/Manifest
index 554dbff2adfd..dd289cc085f9 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 483 BLAKE2B 881d3c1e204cb0789e1390f2a723d1c781bab92254b21f3f68367792f682546aefeead9a61ad077a65af419d4b91d6283d1466e731afeef8f66887bb5161708a SHA512 b59c105395f2dff688c4859f1753578bf5f533647f405c06057814f7d34a1e4d7edb4ee599b9f629d8f81fbcd610aebca4c90a68ac9873ee4082899ee16d1aaa
-MISC metadata.xml 376 BLAKE2B 14e9a86d159786b9124fa98e8abc3573d68d3e98b6b89fff7b6b23a0264a450681d3b224f332cde42385bfa4dd832c6c5f27a50dbff95226bfc99c50ba6062eb SHA512 28b905f1f7f41bc8f6609307e8fe37d7bb8938a1f7eb21eb306a509daa7c094490a0a0efac758e15d807e647b6765e534481fe73581717498450080e0ff480dc
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-dialup/moserial/metadata.xml b/net-dialup/moserial/metadata.xml
index c925342f04ff..39980802b1da 100644
--- a/net-dialup/moserial/metadata.xml
+++ b/net-dialup/moserial/metadata.xml
@@ -5,7 +5,4 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
-<longdescription lang="en">
-	moserial is a clean, friendly gtk-based serial terminal for the gnome desktop.
-</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/mwavem/Manifest b/net-dialup/mwavem/Manifest
index 8a0d5419a338..06fd3341b516 100644
--- a/net-dialup/mwavem/Manifest
+++ b/net-dialup/mwavem/Manifest
@@ -5,4 +5,4 @@ AUX mwavem-2.0-gentoo.patch 1010 BLAKE2B 1a3d7126af9201bf8bcd2440f362b13a7037c8f
 AUX mwavem-2.0-glibc-2.10.patch 1389 BLAKE2B 93073cdb8ef48b89b6f2603730d5a970e04202d1f249b1afeb3edbbde413fced88cfd31c2b56e0e9f981271a3830725047b98c1b3f9e8914460a730b5a86403a SHA512 a946530d607361c189d4cda8d8dcd3454caed695894dea8e7c25f53a2ae33a0e4684f738527f635eb0ddcbd238ce5007b9bd54c0c34f5b78d83d49ad530ba474
 DIST mwavem-2.0.tar.gz 1443167 BLAKE2B d70e3088b13a83f5dfd93690e67fa68497ef793b840fa3cba45efe4e72448abeba5312e0bbf1176825a62c366d47829ebd135461bf9600ba1b971b1db00a55e7 SHA512 e1bb3c7e5511abc784b0359b844498389a9cb970fe46752775aaae6146d8cf25998a6e12dfc70df5c5f4287fd57abb49252f81a00528db5f7c2c96e3e7efb516
 EBUILD mwavem-2.0-r2.ebuild 1162 BLAKE2B b1e70d390d1d61066e7e1da9d301545d82db93339819c5cc73f08465951514412ca8ff546f2ad2b9ad1ebac38ec8de45ddc63b7df62f80eabc48d3397392f32f SHA512 901a041819af6daf5177141570273f75748c14d353d58bbcffcb115c82b025f6ffbab434886a4c8cc66c587bc239ce7c41e92927b830aad9ae6c08f00981c0d1
-MISC metadata.xml 245 BLAKE2B 7056c9f6265066dc7da276e30d63545a119cff18149d7dd89b1b0ee100eafe46d05d01b4048192cce57063e0cf4e4bd4c59678e74e62c96d6d9d01e004099047 SHA512 870dd73eec3bfd31c5545ebbce07fc74ccd06a1d44bad15d71858f756572f89e5af9387f3e207d08c1146c7397a325ce9d01497816d4d9bad6472d5a27b65c1f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dialup/mwavem/metadata.xml b/net-dialup/mwavem/metadata.xml
index a122370406ef..6f49eba8f496 100644
--- a/net-dialup/mwavem/metadata.xml
+++ b/net-dialup/mwavem/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
-<longdescription>User level application for IBM Mwave modem.</longdescription>
 </pkgmetadata>
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 31b2d0aa3bec..27c304e88fef 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -4,4 +4,4 @@ DIST ppp-2.4.8-patches-02.tar.xz 39700 BLAKE2B 8e03ecf306ff415370a96ba2eca4ecdb9
 DIST ppp-2.4.8.tar.gz 697530 BLAKE2B 235114288699db45501bc7d9ce8f36c0b5684ab0dab09da93d7f2b4f7c3eca030ae26e34dfff25efa971374fbd7fde62f121ea6aa69872658f44c5ac8c7850a2 SHA512 a99b3b6c7bd80cd133bda4e29d33c793a76f3b67e1f8db774547e88932ce29564fad390a4f51d3fe30a75e006499b95000b042ae0f64cd360548426f8091a478
 DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
 EBUILD ppp-2.4.8.ebuild 7050 BLAKE2B 73d45d7f1566829635419974334947f39c75e83b39a5c8ee6e04b2989db4004f6d4514c932596a0ee8c24ea8a937b07e69daefb8f9082c857c07a58351ca4979 SHA512 bfeea63a830626374cc52084565264f3b9a7e031d9620728e76ad77619de78cc0d35f0b30957a8791c68fd614fa06d6f3cb43d539d46d8a222cad13a20cecb0c
-MISC metadata.xml 1383 BLAKE2B 446bbb4679748003bef81dfea623121504d8e6384cc79baa25c58ddeb6d91c0437b744241d9a7b53e2857cdec55c8021affd202329d4af664e4f7bc76386be23 SHA512 3ed22fd5382f9c8e6d9a529c4f66a606ac2a952e355e92c594452325310ddf68e2f625df4d72f6fb017a1a164b845bcc27336ac859e1c2ffe4c2cd702afe6d73
+MISC metadata.xml 1248 BLAKE2B 2c0facefb3f71aa967481dbd0b0f212d17bf2827b94ed40a9a253c053c9e9d3700aa1bdf8610abead16f290f93551139f4a9022b38e3c6dcbcc5ed61fba7f34b SHA512 e309d63a5611ee607b820803e82e9b4da4ebb33cd010660ce701d261726c4f635b0c4ad98bd80c20d01eb1d9004dfa076fbd59521a2bbe66d7dae78eeae65f6e
diff --git a/net-dialup/ppp/metadata.xml b/net-dialup/ppp/metadata.xml
index bca37ed11ed2..a0beaacabe4a 100644
--- a/net-dialup/ppp/metadata.xml
+++ b/net-dialup/ppp/metadata.xml
@@ -9,8 +9,6 @@
     <email>base-system@gentoo.org</email>
     <name>Gentoo Base System</name>
   </maintainer>
-  <longdescription>ppp (Paul's PPP Package) is an open source package which
-  implements the Point-to-Point Protocol</longdescription>
   <use>
     <flag name="activefilter">Enables active filter support</flag>
     <flag name="atm">Enables ATM (Asynchronous Transfer Mode) protocol
diff --git a/net-dialup/pptpclient/Manifest b/net-dialup/pptpclient/Manifest
index 9cdb9813153b..5dcf4dc5be32 100644
--- a/net-dialup/pptpclient/Manifest
+++ b/net-dialup/pptpclient/Manifest
@@ -3,4 +3,4 @@ AUX xpptp_fe.pl 5620 BLAKE2B 682623fe03b8d9e90f4e86837b850dd57a2a1b960e9f0554d65
 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 f7058e66f6d5edeef077eecdc239f689f967d1ede674bc4ee55a31ae77db9b081af0c06eaae87256c53eb6734a915c97bb55a06c560591aa43c21d47d85f6a28 SHA512 86db3eb9b317623bb0cec5a21696cf93fb8996131eb014268b5a0ea6ebc50d1c98f002c99af57f4c86d131c4a521e7eccfb784f4941909d0fe1f1f6f7a4923f2
-MISC metadata.xml 378 BLAKE2B 224be6ab2aa2334074dce847a6527f713f1c82f797862e58bb5ed972a4c1f464a53b67a28ea10635fd949a5aa927a9419f85163172f26376001c85e4784cb894 SHA512 7a4b7cfeecee2503bcf7171f7a66edc27962a6f461695dfad358421be6c1bfc794e438d9136448278b11a4fd0761df03132d8ee66b7e43f7b407c0a5bad09ea7
+MISC metadata.xml 252 BLAKE2B 838871cf3b0d2c4da46fdbe7112e1d6a2ba981e682c5e935b791ff5f2f28e793c572edeb414b6036023981b8e1c6eac38ed5d5aa7fd4bfad7b057fb84afcbc2f SHA512 7073a9e7a348f55d2ab7599873da0e4ceaf760582de33a8fa82ad436f584deca701350db75d2860f3170aee4ec8f0d31b8fd52c23522d5635da6120cef39450f
diff --git a/net-dialup/pptpclient/metadata.xml b/net-dialup/pptpclient/metadata.xml
index 15734ef7acba..a0d5b0510d78 100644
--- a/net-dialup/pptpclient/metadata.xml
+++ b/net-dialup/pptpclient/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>PPTP Client is a client for the proprietary Microsoft Point-to-Point Tunneling Protocol.</longdescription>
   <upstream>
     <remote-id type="sourceforge">pptpclient</remote-id>
   </upstream>
diff --git a/net-dialup/speedtouch-usb/Manifest b/net-dialup/speedtouch-usb/Manifest
index c506a45ba1ce..86d41e5f0d64 100644
--- a/net-dialup/speedtouch-usb/Manifest
+++ b/net-dialup/speedtouch-usb/Manifest
@@ -1,4 +1,4 @@
 AUX README 9246 BLAKE2B 177c2863d5149bacac3b058851f7719b0651adeebc445fc825ef33cd567f28904bc89f521573b03cd70ee84d7ee495d303beebccddfd1a4bbc7a3d584e9e6bac SHA512 5b08cc8323de5bf0c0e528266e18a85c28e13bfaa462b3abeda9a2abaa0063b9872153bc97b2be88e489c949ddabd65f7d19a39600f9c0d2375e40d511c0ee2a
 DIST SpeedTouch330_firmware_3012.zip 769125 BLAKE2B 4f7569ab3d123837f3854af02aaf53972dca6a031fcbb7c1bd965f6b389509ff588de78488ad19a5b7f58997aaa9f53462713a7df0b0d7a05d8e77a2562ee0af SHA512 d4ec1b609eb58b15b0c569fc2c96e453517f6a8141c706f342549093c2c7bbdc09bbc3f05ecf75f3018e54f03a974b84e625fb9401f02d4f4143b721eee0b3c3
 EBUILD speedtouch-usb-3.0.1.2-r3.ebuild 3092 BLAKE2B 9fff723c30ce0191329eba708569d9512ba592f2325e9528d809b87eb669fff5019f44009868b79705165c58b9f9bce26b6e0b54a1a02128051aa58f759721b3 SHA512 d4a316bca29c6d9c6ad3c3f109eb19c1cd951a001245b229cfd88ab586b559d8e27999656ee2663056cb6602a598f6775b52cccd93d9da7f88021f3f011283a6
-MISC metadata.xml 304 BLAKE2B f5533ed38b116f69f2a78c297761fc7b72cd797a90c273bde4f8b2c173a3a8088ca27b7290f70e574455aba1f305d8a513af71856a4825121357159b891b744d SHA512 9618d6334a65643fa426e3074c3ee566a1db0e380dcbf00a432d54c0877efb639ce35b09477d0de3b313ec56ae7d84382382e5d260b2df240dd7eaa32b1e65f7
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dialup/speedtouch-usb/metadata.xml b/net-dialup/speedtouch-usb/metadata.xml
index f7a6559b0fc3..6f49eba8f496 100644
--- a/net-dialup/speedtouch-usb/metadata.xml
+++ b/net-dialup/speedtouch-usb/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
-<longdescription>Firmware and configuration instructions for the kernel-space driver for Alcatel SpeedTouch USB modems.</longdescription>
 </pkgmetadata>