gentoo resync : 25.08.2020

14 files changed, 229 insertions, 93 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index b533fa1ef50d..bfd8034adbdf 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 caec72126bd7..0d7aced6333f 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -3,6 +3,6 @@ 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.ebuild 2603 BLAKE2B 2c1ff7d6cc55db2f3aceba681d068f9d6751a4d0a99d31661f969724e9bf7b8c043a26b773652f93ce10e45c1512942468c26440f39e703d14a2a133c75ccaa7 SHA512 e6611236f6281cb866f8c6b2747b0bff74e67e7bd578862ff88d6df11e7542682a3736cf9cd18bbca080ec1ea095751abfe390d3d88f204f96f4c7e0beae3ed9
+EBUILD accel-ppp-1.12.0-r1.ebuild 2603 BLAKE2B 2c1ff7d6cc55db2f3aceba681d068f9d6751a4d0a99d31661f969724e9bf7b8c043a26b773652f93ce10e45c1512942468c26440f39e703d14a2a133c75ccaa7 SHA512 e6611236f6281cb866f8c6b2747b0bff74e67e7bd578862ff88d6df11e7542682a3736cf9cd18bbca080ec1ea095751abfe390d3d88f204f96f4c7e0beae3ed9
 EBUILD accel-ppp-9999.ebuild 2365 BLAKE2B be66ab5ddf4691777a23fdf370f998b4c5c525b50ea266ba9ea1f0cafc90a78917fa2917599dcfca138514e23eca1fd17484addfa8a3cac036c61f12a23a6022 SHA512 470f9fbfee509aa7e425400a76eed23830a208d4d2b05b79acec54160b1796551d1214bce3e61d6dbbee7f2048b23b3ce936cb0578262c747d465c47a70e589e
 MISC metadata.xml 507 BLAKE2B 7c0a985830c791f5fe40ed8b624f366eb8e39505fe128b46153740f77ce9c5bd05bf8bf7ffb8939aa42550c9ea08de8f2498d444ef2e930121bbe7f404bf88dd SHA512 6b60c890f172501225ed3da4a229298c2b05601606d047bbe46dbea88246bcce8c15695259063daf73574c9d24048b04d2422c83e2e934015768338120e9154e
diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0-r1.ebuild
index 61e4c0092c83..61e4c0092c83 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0-r1.ebuild
diff --git a/net-dialup/cutecom/Manifest b/net-dialup/cutecom/Manifest
index 7e5d32df1aa9..cd5ef1f378da 100644
--- a/net-dialup/cutecom/Manifest
+++ b/net-dialup/cutecom/Manifest
@@ -1,5 +1,4 @@
 AUX cutecom-0.51.0-fix-for-qt-5.15.0.patch 615 BLAKE2B a39889b204d87c0812673098985b2d3bad919b10a7d923d589c0b88fa818bce77f5b08d8cf7c221a23f5f61ade8dac36f436c5be99c9b96322a1e4c2ebc4873f SHA512 5cbbb75beb4082be6e1d515b4d37a874d8a507a854e6844b6f0479af02db7575d54020c21e72fc5c2b6670de32b7edad18f7abe4ee69793782acca0ef09e4e05
 DIST cutecom-v0.51.0.tar.bz2 1296457 BLAKE2B 407bbe12fb4303e98589720c3fe9bf96a4112c816e64a3a32227d07a64c1efbb5b33c364d1f3f06ff67c9bc935c0bf62de14849b554508eaffacda1f65e7fad9 SHA512 67857977ab6444509662be4d27059e3c4cb766a69b78d806f4cd3d6cb7306d53094337fb384133a616ae397ac4d4d7c86347285a2d68f88fbf105d73ebd97731
-EBUILD cutecom-0.51.0-r1.ebuild 903 BLAKE2B ee8a14370cf3da79160cb2fa23c5cf6f3f39b33500a62a9a4eca09a0255aff333b337cacef459e8c9b12e47efd130d96d27a065324c18f46583e057231ef6d3c SHA512 3029e2627e2fae6c11ef8e3cf575896780208a5ef6c87a06aa2c12b8baeac08852e7d589222a8add3eeace93ff980aa17d10e37ffd5da81a1f0d12ed5c307ee9
-EBUILD cutecom-0.51.0.ebuild 831 BLAKE2B 5e1beb098a947089ebbb3db370b4d4cc3d5be66902e16f5162209c0a754829206e8283f8a32d409b80e25d92c0ba9fb4cbda1306c8fd8e16b4037a1c2c7b8cfa SHA512 2fe8dfb805a5247375f8127f753f28f6daf33bc0b4ed910696a4f9eaa4025b34f9089bf0f03aa4bce43001e8cd89f05540dbc52076252c28a40769bb6b7bc80c
+EBUILD cutecom-0.51.0-r1.ebuild 872 BLAKE2B 159a3406cab8fc0d9a64aa0212a17ffddda142867810c33cc21f186eeedc4363fef62ba0555551d0952c1833404c1bfdfde1df996c0deb97705b1d0db01e7ec5 SHA512 3d423abf0842d5f92689bca836a64972ddf00f20cb4cec5176f1dcda1c587f1b60a5ec89551bd0ff761affdae00b6c226d770fd8162955fd7da4851c69d93775
 MISC metadata.xml 518 BLAKE2B e409cc5cd2b57e810e408991786f22b93464167b4efe51374e6f4a5be8d5bf80f351ea37b3cd26080f731c53428d3046053ddb1e7192c8129d291a77c718fe76 SHA512 3641e21c8f46af695d3e11a27d3f67a6ef8670fc1d1621d253f2f0555ffc8a30762bf91513e5539177e640253c8f7ec2b574b8c2332a933150664bf2d3ad8880
diff --git a/net-dialup/cutecom/cutecom-0.51.0-r1.ebuild b/net-dialup/cutecom/cutecom-0.51.0-r1.ebuild
index 96ceaa41d2cb..683af0a6bb22 100644
--- a/net-dialup/cutecom/cutecom-0.51.0-r1.ebuild
+++ b/net-dialup/cutecom/cutecom-0.51.0-r1.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eutils xdg
+inherit cmake desktop xdg
 
-DESCRIPTION="CuteCom is a serial terminal, like minicom, written in qt"
+DESCRIPTION="A serial terminal, like minicom, written in Qt"
 HOMEPAGE="https://gitlab.com/cutecom/cutecom"
 SRC_URI="https://gitlab.com/cutecom/cutecom/-/archive/v${PV}/cutecom-v${PV}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
-DEPEND="dev-qt/qtcore:5
+DEPEND="
+	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtserialport:5
@@ -24,19 +25,19 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/cutecom-v${PV}"
 
-PATCHES=( "${FILESDIR}"/cutecom-0.51.0-fix-for-qt-5.15.0.patch )
+PATCHES=( "${FILESDIR}"/${P}-fix-for-qt-5.15.0.patch )
 
 src_prepare() {
+	cmake_src_prepare
+
 	sed -i \
 		-e '/Path/d' \
 		-e '/Terminal/s/0/false/' \
 		"${PN}.desktop" || die 'sed on desktop file failed'
-
-	cmake-utils_src_prepare
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	domenu "${PN}.desktop"
 	doicon "distribution/${PN}.png"
 }
diff --git a/net-dialup/cutecom/cutecom-0.51.0.ebuild b/net-dialup/cutecom/cutecom-0.51.0.ebuild
deleted file mode 100644
index 9b50680e54e3..000000000000
--- a/net-dialup/cutecom/cutecom-0.51.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils
-
-DESCRIPTION="CuteCom is a serial terminal, like minicom, written in qt"
-HOMEPAGE="https://gitlab.com/cutecom/cutecom"
-SRC_URI="https://gitlab.com/cutecom/cutecom/-/archive/v${PV}/cutecom-v${PV}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtserialport:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}
-	net-dialup/lrzsz"
-
-S="${WORKDIR}/cutecom-v${PV}"
-
-src_prepare() {
-	sed -i \
-		-e '/Path/d' \
-		-e '/Terminal/s/0/false/' \
-		"${PN}.desktop" || die 'sed on desktop file failed'
-
-	cmake-utils_src_prepare
-}
-
-src_install() {
-	cmake-utils_src_install
-	domenu "${PN}.desktop"
-	doicon "distribution/${PN}.png"
-}
diff --git a/net-dialup/openl2tp/Manifest b/net-dialup/openl2tp/Manifest
index e32e325d708e..98f020a25678 100644
--- a/net-dialup/openl2tp/Manifest
+++ b/net-dialup/openl2tp/Manifest
@@ -8,15 +8,18 @@ AUX openl2tp-1.8-configure-Makefile.patch 1608 BLAKE2B 6c2a21be9aaabc6e60216c749
 AUX openl2tp-1.8-l2tpconfig.patch 621 BLAKE2B 31e224b78b7727c71657c3c35160e36b213cd9ae8067d4f0248c2ace649c6747d3f1a88cef43dc40daa3bba493e2a7e452fd147c6a581595214abc33b2e2cb44 SHA512 0832c38fc55169dc86e1267ef693852d93ab4cd551e4b4155d66433db551fa22ce2d044505157bd9bb5ad55b1ec357f9cd948af370d608276cbba5cdb96b97b3
 AUX openl2tp-1.8-ldflags.patch 2620 BLAKE2B bbde9a44adfb6b9ca905c88e2c0867541823b8b5adb61286562640a8c6ec9fb1b8fe60242a0a4be561a3a48743ff370115e357f23b4ac6a7bd78dc8e7ffb49ac SHA512 3c7f192c4553cc9ff68b724e9e2121452ed24c6eeb0b23ecd9a3011defc2b0b6d2f26babfdb010464ab60db2094135deed6e44759cb2fe2833c990769a9f900b
 AUX openl2tp-1.8-man.patch 1345 BLAKE2B 21db3ec18c62e44090a19e7e2c7f64987ce17abf331ed3a01f05c1ea3dde4e265469e139bb2f67bf0ef6cae4923fc669d8366835c99e753566bab267f55f18a5 SHA512 5e4cd2efc1b4edf479446a9f865f987542b38c96396fe4b107fdf3423b099818a1a48d84084606650d5bd4cf7ba90ae43f09114f98e35ee41f4d9df139a39e42
+AUX openl2tp-1.8-musl.patch 1384 BLAKE2B bfeaa27eece3ddf87eea990e0c699186b5fd6d249617c2d152274e237f87a4d9d1fb5d01983e99d75957d94ecdc94c109c501a6d1cf8a5a5183db48d9ef0b04c SHA512 8dc0c5afd4efbdce243c4826cb52578d079f62681bc41f2a2f7ad61834992b384c30c1c5b2cf12e4917fdf28f028cc788480ec4d587e2f7398ad4adbca5bb4ad
+AUX openl2tp-1.8-native-tc.patch 657 BLAKE2B 2abaed246922347424e2c7ce8809f2ccb817303c5a83a9ea210b8f543e0ab62a2434f0997c0c0accc5ffb92b1f59734b5b95cdd7f72da57b82e39e5c86d0e9cd SHA512 da32092362799e504b991170b757200bd5e81aa356e2ccdfb2123e748c074c111344f43fce33138bb450d9972a3385a42f419e482dedf656e47adfa38a3ccf12
 AUX openl2tp-1.8-optionsfile.patch 10143 BLAKE2B f1044ae2c833e7775b1152d1acd00ea44d57060897827a915dabf2c172b151a8b46d93fce75b10b8844d189ca6514b0bdbf037011edcc2c56433835fed7e844b SHA512 2a0612a6effc0a82323c904c7b51e8eabf96fedbef6024e6d6a5e02daa945c20c95540b6420443854e35ad62acc5d359bfee6e6280f68d51e2c328a34807027f
-AUX openl2tp-1.8-parallelbuild.patch 935 BLAKE2B e1a3aaeea2d53bac083518c6f3b230f9eb4523db34a0473ddd16602edf74b0d31e381928b456c751e87028cc42d4d2d02b8b5851fd5955c737e4db13cad13226 SHA512 5741e1db53c6d41cc87205283f7048f83a6873b56a749a041fc4268a67ed344e48b417be3bbd978dfc14f67c0dd9fc69291844efddb9208b7554974b7f0133b7
+AUX openl2tp-1.8-parallelbuild.patch 1310 BLAKE2B e379f046111662f21fca21eaa04279413f49d9d806438d38b9ce7b964beba2174caffbc0ae75353df6c4c5e2ffff75cf5c4dc67b409e39762b5eeecc06976330 SHA512 a67e0a0d3fcdd8c4a2ca1a37e88b6eba8f81834b4ce3e0a5f92546ec033f158ca811e9cc5f0396ccf6142df4c4b15679cf53b5b306a3eb3c2389d929d32148a5
 AUX openl2tp-1.8-pppd-2.patch 485 BLAKE2B 587a655b884b92bff9915c8f5d3a38801f843363d0585930192ff0daafff68b2d2855ea19ae7bcdeb92fff8dc191dd22fb945576a44e1ea9ce375860dc68262e SHA512 5c7007a4920d24f9fdf39dd36e3d435708793954c3dbb897969664a03bbd6bf220319a9c794180f91d42130ae177ff18d227a77eaf40a357cfb0d1b81459db47
 AUX openl2tp-1.8-setkey.patch 483 BLAKE2B be8d6d3911426494bbfdc5949762168cc3b0a486e23364a13eb7138e3668d5c533736618109b64f3631d90518745145378d5f749145e6ee209036223e7f44f6e SHA512 da1935e969d8100230434cf6393696563220ecf3785712e1ceb0922e34034624e5a9999671721e530ad74368fab9d89d403677b417934e379fedd5060463e3ab
+AUX openl2tp-1.8-strings.patch 3658 BLAKE2B dfb8ebc747b68ea1bde4885fb82b0bef91071d16587d9acb436befe7469a3f0f53812ab1a3d4966c00fd802b111638c186d2636a9a65cef4cc02a1bb583f43a0 SHA512 7d4fd950ad738959ce9190a48f4b3cfa0be4b315ffa080bd437add78fcfba3c7be38a8ee6e8389419fd0def2dff1467f8bdbbc24dccc0a7af88eed737f726441
 AUX openl2tp-1.8-tirpc.patch 2017 BLAKE2B 981a394dda194b4359e9f39148cc8b210cc3e90c826a17af87910b760ff3070d12b46ad865be72dd2fc9c1dc9fccfa543192b6c0924f837322b6e5259c549a60 SHA512 2325e4d2bb43975c244f0e77c607a2864746242cd8fc1ff0ff9b6cf9af3ef93d256b934e1a3465650658e8793e77cb32f1dab734dfb6d45535cb821cf60bec82
 AUX openl2tp-1.8-unused-var.patch 605 BLAKE2B 886f407aebd5b2479068b26550f7c2377baa6d44a8a7187b153a96ba684f3f05d396fb25cff5371487b63b0fa01c12e63878ce419d2acfa861378323db04d117 SHA512 2ac1f04004a06e6a97224a04395a72cc2699e398efaafbdd74773819dc148d8d314ac3e4865722886db53d70eff1a4f021e4a39fb3e5d18011ef1b473ded9ac9
 AUX openl2tp-1.8-werror.patch 1466 BLAKE2B 44003bec2469c04dfa80ee4a87080723f57bb443832eb09fe5f27b8bf3d7e82d3f33f786773a7fb376a7390dc3a60720fcb4567ccc98f36c2bf6a7261e168be8 SHA512 99967159458f9ee806b72372142a5895793daad46b4aa9a6f0876eafc9c89b2016d72883c6c77adee6cebd4126fb9ba463b2b8bf7119456a4ea72d86374fb10d
 AUX openl2tpd.confd 717 BLAKE2B 7c92d47880c57c39deee6eebe458f0a1367fff616af3377145a0938e073068630f76245299b4c6886b34c06a975d41996adf05c6c145194e6af00abc66a317a0 SHA512 b120c80c352cfb810f808722a5fbbc63519e07b72f16a1b42f4e577da9a4607b24e8ce82bf25ccd90c69ad640ad929be89c7e1e3fb429c61088ce93ddab2ceb4
 AUX openl2tpd.initd 1788 BLAKE2B cccc7e9f907ccf5abe5dc84d0e3228b8e5a542e6f864325cf5eb7fd2d84e50e0d5cf86ec276a59bef7bf576d52b4b9c00bb34c1ec706dd6ee719030f64ba55e0 SHA512 8f84e847eb9b3f7d6c07bef1d6e8a051a0ded8ec6c4d21be26c55eacdb3d12fce60dce7b4c94d4e9358c4d724c868bf84c2a6262772f8fdfb3e54931cee0ce10
 DIST openl2tp-1.8.tar.gz 491160 BLAKE2B 70c78cd4d7daba600f9a9115025acb38b82adc0a04bbf6e9d46daebf2c7c37cc8fe9df6fa7157a05525e998063f5200a85893bb5b33dbe3e66ca7b6a4d2c7972 SHA512 360f9032b2bb104cfaa41a18fc37005510ab604b31a34a3412563e0de3e8dad946ca61840cd41a19f0202d92d758d812f45479659c9fa4d4e9e13dd226f03fda
-EBUILD openl2tp-1.8-r1.ebuild 3370 BLAKE2B c9f3cf228938e4a836fd3a0cbd906450cf3070b7d78dfda858c795f714a9bd80bc974944bfb693d51a2e48a73f35a1dcef112a1665400247f4b02b4abb41f247 SHA512 9d708627a2892163c9ecc56182fab61db5cab098b4f5a010dd41d671a14fa6eacd87d55bc91713c8fb67dc31f70d2a652c9a0a39218866f10fa48d32185be0ed
+EBUILD openl2tp-1.8-r2.ebuild 3486 BLAKE2B becd16fc76b639d6fb62b3103951c1bd21d366e03f8074a552ed00c820d5843f9a5750265c773cce018b80a68f7601ca9d5a129f3ddccd76a5c2a78e74d06c0c SHA512 9bc441671c71a407b55551680018f48b7b8d4b5aeb5e94b1657df591ebc2a84d31e653638ceccc17b4f40b3577fe4610b2c61664504e0ed41998f6f7ffde7eaf
 MISC metadata.xml 669 BLAKE2B 98bd7762042c36ccfc4219807014ec3c6a9c65827820d174ae87eeb16a5ae64212a68fea18ebd46c2ff7ea3b4996aa63b383ab14dbd4009e491b76437b234e67 SHA512 1d4880fea1badcdbbdf6e7259e968907c4d74ece0c309e8bbd556763e377b6bda56d1d2e1de67177c9867de1fcb36e294723d02b2c6ee22c7cdcb99973b6b8e4
diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-musl.patch b/net-dialup/openl2tp/files/openl2tp-1.8-musl.patch
new file mode 100644
index 000000000000..437f96f4d6fc
--- /dev/null
+++ b/net-dialup/openl2tp/files/openl2tp-1.8-musl.patch
@@ -0,0 +1,55 @@
+diff -u openl2tp-1.8/cli/cli_readline.c openl2tp-1.8/cli/cli_readline.c
+--- openl2tp-1.8/cli/cli_readline.c	2020-07-12 11:16:13.583798412 +0300
++++ openl2tp-1.8/cli/cli_readline.c	2020-07-12 11:35:50.872615494 +0300
+@@ -18,12 +18,15 @@
+  *
+  *****************************************************************************/
+ 
++#define _GNU_SOURCE
++
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/file.h>
+ #include <sys/stat.h>
+-#include <sys/errno.h>
++#include <fcntl.h>
++#include <errno.h>
+ #include <signal.h>
+ 
+ #include <readline/readline.h>
+@@ -633,7 +636,7 @@
+ 
+ static int cli_rl_install_signal_handlers(void)
+ {
+-	__sighandler_t handler;
++	sighandler_t handler;
+ 
+ 	rl_catch_signals = 0;
+ 	rl_clear_signals();
+unchanged:
+--- openl2tp-1.8.orig/usl/usl_pid.c	2008-05-08 00:44:20.000000000 +0400
++++ openl2tp-1.8/usl/usl_pid.c	2020-07-12 10:29:47.047052036 +0300
+@@ -26,6 +26,10 @@
+ 
+ #include "usl.h"
+ 
++#ifndef WAIT_ANY
++#define WAIT_ANY (-1)
++#endif
++
+ /* We maintain a list of child process pids and functions to call when
+  * they exit.
+  */
+unchanged:
+--- openl2tp-1.8.orig/l2tp_main.c	2010-02-12 22:09:23.000000000 +0300
++++ openl2tp-1.8/l2tp_main.c	2020-07-12 10:58:59.343655159 +0300
+@@ -42,7 +42,7 @@
+ #include <setjmp.h>
+ #include <sys/utsname.h>
+ 
+-#include <wait.h>
++#include <sys/wait.h>
+ 
+ #include "usl.h"
+ #include "l2tp_private.h"
diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-native-tc.patch b/net-dialup/openl2tp/files/openl2tp-1.8-native-tc.patch
new file mode 100644
index 000000000000..9e5ff3411af5
--- /dev/null
+++ b/net-dialup/openl2tp/files/openl2tp-1.8-native-tc.patch
@@ -0,0 +1,23 @@
+--- openl2tp-1.8/Makefile.orig	2020-07-11 10:04:54.485853377 +0300
++++ openl2tp-1.8/Makefile	2020-07-11 10:21:10.616327547 +0300
+@@ -69,13 +69,13 @@
+ 
+ # END CONFIGURABLE SETTINGS
+ 
+-AS		= $(CROSS_COMPILE)as
+-LD		= $(CROSS_COMPILE)ld
+-CC		= $(CROSS_COMPILE)gcc
+-AR		= $(CROSS_COMPILE)ar
+-NM		= $(CROSS_COMPILE)nm
+-STRIP		= $(CROSS_COMPILE)strip
+-INSTALL		= $(CROSS_COMPILE)install
++AS		?= $(CROSS_COMPILE)as
++LD		?= $(CROSS_COMPILE)ld
++CC		?= $(CROSS_COMPILE)gcc
++AR		?= $(CROSS_COMPILE)ar
++NM		?= $(CROSS_COMPILE)nm
++STRIP		?= $(CROSS_COMPILE)strip
++INSTALL		?= $(CROSS_COMPILE)install
+ 
+ ifneq ($(READLINE_DIR),)
+ READLINE_LDFLAGS=	-L $(READLINE_DIR)/lib
diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-parallelbuild.patch b/net-dialup/openl2tp/files/openl2tp-1.8-parallelbuild.patch
index fb6b9f96b354..8851f321f27a 100644
--- a/net-dialup/openl2tp/files/openl2tp-1.8-parallelbuild.patch
+++ b/net-dialup/openl2tp/files/openl2tp-1.8-parallelbuild.patch
@@ -1,6 +1,5 @@
-diff -rau openl2tp-1.8.o/Makefile openl2tp-1.8/Makefile
---- openl2tp-1.8.o/Makefile	2011-06-03 18:21:09.000000000 +0200
-+++ openl2tp-1.8/Makefile	2011-06-03 18:54:43.000000000 +0200
+--- openl2tp-1.8/Makefile.orig	2020-07-12 12:53:31.484055262 +0300
++++ openl2tp-1.8/Makefile	2020-07-12 12:56:45.783822669 +0300
 @@ -197,7 +197,7 @@
  
  .PHONY:			$(SUBDIRS:%=subdir-%)
@@ -19,9 +18,19 @@ diff -rau openl2tp-1.8.o/Makefile openl2tp-1.8/Makefile
  			$(CC) -I. -MMD -w $(CFLAGS.optimize) -c -DYY_NO_UNPUT $<
  
  l2tp_config_parse.o:	l2tp_config_parse.c l2tp_config_parse.h
-@@ -271,7 +271,7 @@
- l2tpconfig:		$(L2TPCONFIG_SRCS.o)
- 			$(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS.l2tpconfig)
+@@ -265,13 +265,13 @@
+ 			@for d in $(SUBDIRS); do $(MAKE) -C $$d $(MFLAGS) $@; done
+ 			etags $(wildcard *.c) $(wildcard *.h)
+ 
+-openl2tpd:		$(L2TPD_SRCS.o)
+-			$(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS.l2tpd)
++openl2tpd:	generated-files $(SUBDIRS:%=subdir-%) 	$(L2TPD_SRCS.o)
++			$(CC) $(LDFLAGS) -o $@ $(L2TPD_SRCS.o) $(LDFLAGS.l2tpd)
+ 
+-l2tpconfig:		$(L2TPCONFIG_SRCS.o)
+-			$(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS.l2tpconfig)
++l2tpconfig:	openl2tpd	$(L2TPCONFIG_SRCS.o)
++			$(CC) $(LDFLAGS) -o $@ $(L2TPCONFIG_SRCS.o) $(LDFLAGS.l2tpconfig)
  
 -%.o:	%.c
 +%.o:	%.c generated-files
diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-strings.patch b/net-dialup/openl2tp/files/openl2tp-1.8-strings.patch
new file mode 100644
index 000000000000..16b7beffb212
--- /dev/null
+++ b/net-dialup/openl2tp/files/openl2tp-1.8-strings.patch
@@ -0,0 +1,114 @@
+diff '--color=auto' -Naurd openl2tp-1.8.orig/l2tp_plugin.c openl2tp-1.8/l2tp_plugin.c
+--- openl2tp-1.8.orig/l2tp_plugin.c	2008-09-25 19:00:55.000000000 +0400
++++ openl2tp-1.8/l2tp_plugin.c	2020-07-12 11:55:23.292225206 +0300
+@@ -85,16 +85,20 @@
+ 
+ 	if (strchr(name, '/') == 0) {
+ 		const char *base = L2TP_PLUGIN_DIR;
+-		int len = strlen(base) + strlen(name) + 2;
++		size_t len_base, len_name, len;
++		len_base = strlen(base);
++		len_name = strlen(name);
++		len = len_base + len_name + 2;
+ 		path = malloc(len);
+ 		if (path == NULL) {
+ 			l2tp_log(LOG_ERR, "OOM: plugin file path");
+ 			return -ENOMEM;
+ 		}
+ 
+-		strncpy(path, base, len);
+-		strncat(path, "/", len);
+-		strncat(path, name, len);
++		memcpy(path, base, len_base);
++		path[len_base] = '/';
++		memcpy(path + len_base + 1, name, len_name);
++		path[len - 1] = '\0';
+ 	} else {
+ 		path = strdup(name);
+ 		if (path == NULL) {
+diff '--color=auto' -Naurd openl2tp-1.8.orig/plugins/ppp_unix.c openl2tp-1.8/plugins/ppp_unix.c
+--- openl2tp-1.8.orig/plugins/ppp_unix.c	2020-07-12 11:37:06.287914337 +0300
++++ openl2tp-1.8/plugins/ppp_unix.c	2020-07-12 12:31:26.042810957 +0300
+@@ -811,7 +811,7 @@
+ {
+ 	pid_t pid;
+ 	int result = 0;
+-	char str[10];
++	char str[11];
+ 	struct l2tp_session_config const *scfg;
+ 
+ 	pid = usl_pid_safe_fork();
+@@ -1362,7 +1362,8 @@
+ 		tmp_fd = socket(AF_INET, SOCK_DGRAM, 0);
+ 		if (tmp_fd >= 0) {
+ 			memset (&ifr, '\0', sizeof (ifr));
+-			strncpy(ifr.ifr_name, ppp->interface_name, sizeof (ifr.ifr_name));
++			strncpy(ifr.ifr_name, ppp->interface_name, sizeof (ifr.ifr_name) - 1);
++			ifr.ifr_name[sizeof(ifr.ifr_name)-1] = '\0';
+ 			ifr.ifr_mtu = mtu;
+ 
+ 			result = ioctl(tmp_fd, SIOCSIFMTU, (caddr_t) &ifr);
+diff '--color=auto' -Naurd openl2tp-1.8.orig/l2tp_statusfile.c openl2tp-1.8/l2tp_statusfile.c
+--- openl2tp-1.8.orig/l2tp_statusfile.c	2020-07-12 15:58:52.279211936 +0300
++++ openl2tp-1.8/l2tp_statusfile.c	2020-07-12 15:59:07.949273953 +0300
+@@ -48,7 +48,7 @@
+ 
+ static FILE *l2tp_statusfile_file_create(const char *parent, const char *name)
+ {
+-	char filename[256];
++	char filename[257];
+ 	FILE *file;
+ 
+ 	if (name != NULL) {
+@@ -66,7 +66,7 @@
+ static int l2tp_statusfile_file_delete(const char *root, const char *parent, const char *name)
+ {
+ 	int result;
+-	char filename[256];
++	char filename[257];
+ 
+ 	if (root == NULL) {
+ 		if (name != NULL) {
+@@ -102,7 +102,7 @@
+ static int l2tp_statusfile_dir_create(const char *parent, const char *name)
+ {
+ 	int result;
+-	char dirname[256];
++	char dirname[257];
+ 
+ 	if (name != NULL) {
+ 		sprintf(dirname, L2TP_STATUSFILE_DIR "/%s/%s", parent, name);
+@@ -127,8 +127,8 @@
+ static int l2tp_statusfile_dir_delete(const char *root, const char *parent, const char *name, int recursive)
+ {
+ 	int result;
+-	char dirname[256];
+-	char filename[256];
++	char dirname[257];
++	char filename[257];
+ 	DIR *dir;
+ 	struct dirent *entry;
+ 	struct stat statbuf;
+diff '--color=auto' -Naurd openl2tp-1.8.orig/l2tp_config.c openl2tp-1.8/l2tp_config.c
+--- openl2tp-1.8.orig/l2tp_config.c	2020-07-12 16:03:00.062192426 +0300
++++ openl2tp-1.8/l2tp_config.c	2020-07-12 16:07:00.035142012 +0300
+@@ -135,7 +135,8 @@
+ 		goto out;
+ 	}
+ 	if (strcmp(server_name, &server[0])) {
+-		strncpy(&server[0], server_name, sizeof(server));
++		strncpy(&server[0], server_name, sizeof(server) - 1);
++		server[sizeof(server) - 1] = '\0';
+ 
+ 		clnt_destroy(cl);
+ 		cl = clnt_create(server, L2TP_PROG, L2TP_VERSION, opt_rpc_protocol);
+@@ -6629,7 +6630,8 @@
+ 		arg++;
+ 		break;
+ 	case 'R':
+-		strncpy(server, optarg, sizeof(server));
++		strncpy(server, optarg, sizeof(server) - 1);
++		server[sizeof(server) - 1] = '\0';
+ 		arg += 2;
+ 		l2tp_set_prompt(server);
+ 		break;
diff --git a/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild b/net-dialup/openl2tp/openl2tp-1.8-r2.ebuild
index fb5611675f4e..31d207b45529 100644
--- a/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild
+++ b/net-dialup/openl2tp/openl2tp-1.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit linux-info
 
 DESCRIPTION="Userspace tools for kernel L2TP implementation"
-HOMEPAGE="http://www.openl2tp.org/"
+HOMEPAGE="https://sourceforge.net/projects/openl2tp/"
 SRC_URI="mirror://sourceforge/openl2tp/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -47,6 +47,9 @@ PATCHES=(
 	"${FILESDIR}/${P}-configure-Makefile.patch"
 	"${FILESDIR}/${P}-cflags.patch"
 	"${FILESDIR}/${P}-tirpc.patch"
+	"${FILESDIR}/${P}-native-tc.patch"
+	"${FILESDIR}/${P}-musl.patch"
+	"${FILESDIR}/${P}-strings.patch"
 )
 
 src_prepare() {
diff --git a/net-dialup/picocom/Manifest b/net-dialup/picocom/Manifest
index fa643491ad20..62a393cb89f8 100644
--- a/net-dialup/picocom/Manifest
+++ b/net-dialup/picocom/Manifest
@@ -1,5 +1,3 @@
-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 787 BLAKE2B cd98ff71e4a6a5c8c562ab8b4f171cb36f27cde64cd9a4348270cab1072ac01c039e5175032693b80de139440b45f6b2e407153adbdd6eaf4f7d7c4bc29ff072 SHA512 b688ba193495309f74d07e0f3da49841206685bc14c9ef4e3b5ae8e95cee247c51b368f94ec951258568e9343d9a0ff9fd041d3be0a63ad0d187ef26e75be3cf
 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
deleted file mode 100644
index 6df84e7d4d6a..000000000000
--- a/net-dialup/picocom/picocom-2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="minimal dumb-terminal emulation program"
-HOMEPAGE="https://github.com/npat-efault/picocom"
-SRC_URI="https://github.com/npat-efault/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-src_compile() {
-	# CPPFLAGS is shared between CFLAGS and CXXFLAGS, but there is no
-	# C++ file, and the pre-processor is never called directly, this
-	# is easier than patching it out.
-	emake LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS} ${CPPFLAGS} -Wall" \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin picocom pc{asc,xm,ym,zm}
-	doman picocom.1
-	dodoc CHANGES.old CONTRIBUTORS README.md
-}