gentoo resync : 19.03.2019

12 files changed, 263 insertions, 24 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 5aba3dbfe797..95a88629d761 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 0794cd8bd0d0..bf97aa4e1856 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -4,8 +4,8 @@ AUX accel-ppp.confd 437 BLAKE2B 6b418f528877a46b4b8aba3728405459a567c264b5bb73da
 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 2475 BLAKE2B e42cec14e1510b2aea990ddb6b6887349cb844fd83ab448d51f158808a430116504f74d4526d6b9496d97304441a098d1bfed32eb6764f845da87fbf204dba65 SHA512 b624a2a986d5f08a8a7b1b1e0a215f1ea112979281ebe28e83690ffc3b9ec7c167b7763259eed3e2cd61949cbdd5e0c34e59ceee850c907fd21111993e7e55e4
-EBUILD accel-ppp-1.11.1_p20180320.ebuild 2429 BLAKE2B bbd3a4cbd446125ef99e34ee23578210e724820cae98b4272a33eb14b5d51cbe8054936a129bc60258214502df2f761b98e2d22d348ef52d8e75bf1315571217 SHA512 ba3b37861b8d3414476341af7ea20a45012bf3ff0f84f434edacb518d610dccc9bbee370c86b9d4075495dec4240937e50776fdbde6bbcc681d6a85e3328cc63
-EBUILD accel-ppp-1.11.9999.ebuild 2363 BLAKE2B 3089a984135304959cefd2acf40d73499c1b782056cd213dfeb358c1f9d3d34bc5645b18bbcd5974b86e7cb828d56cbf907e23948bbed239905dcc362c340394 SHA512 07b45ecebc0971e42b4e2aad256e11ff7df6c77e357650dd0a95b744c456d8608fcc16fb9661d9f7a7eb615d54f78940877221dffde02d8e893fc29ca15acc5f
-EBUILD accel-ppp-9999.ebuild 2344 BLAKE2B 4348a803df66dad92d16aa4b0a6e08f65d71009541aec08ddb61a693d145ff8893c7243e20b6bdda6ef2c0779cd108be658a237e8309448302e021efc63b1aec SHA512 a738aa5069291b7f82c187a51054fb8d11100d33b96f185a230cc772b0072c4eda50fa272a304c9fca221cd6f99c8ca50bda998eef692eca2e4c99466d33e1dd
+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
 MISC metadata.xml 507 BLAKE2B 7c0a985830c791f5fe40ed8b624f366eb8e39505fe128b46153740f77ce9c5bd05bf8bf7ffb8939aa42550c9ea08de8f2498d444ef2e930121bbe7f404bf88dd SHA512 6b60c890f172501225ed3da4a229298c2b05601606d047bbe46dbea88246bcce8c15695259063daf73574c9d24048b04d2422c83e2e934015768338120e9154e
diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild
index e69b411d936d..07366eb315c8 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils flag-o-matic linux-info linux-mod
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="http://accel-ppp.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
 SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
 
 LICENSE="GPL-2"
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 c8c6d3cd86f8..d583a303be53 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils flag-o-matic linux-info linux-mod
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="http://accel-ppp.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
 SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
index fa1729fe0897..817a5e3058f7 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ 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="http://accel-ppp.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index cbb628950c23..ff874dac8811 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ EGIT_REPO_URI="git://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"
-HOMEPAGE="http://accel-ppp.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index f7866d0f58a3..78f07e670381 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -4,6 +4,8 @@ AUX radius.conf-r4 465 BLAKE2B 1c17f57c088be0612b3db23e8a909d7e1f6fc114d3ff31ee1
 AUX radius.init-r3 734 BLAKE2B ba6918cf5da5ad29ca8062045c3318c2bb30e0a803bc6e6bb9104fe6e8bc2f662bddb4749e6fa57fda55d57ad41b2cb4014d5efcac557a2213f190a5dcc2f7b6 SHA512 826fd3fd576b09e7e590095b1ac63dfaec587a3b46ae1ccdec68134264fb689827aea4a446522bc2a253b9885469b6788a3dddc466ad47483dd62ef67262de49
 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
-EBUILD freeradius-3.0.15.ebuild 6008 BLAKE2B 817e8aebe29f8bee672c3df92f3caab7e00a10f3d0f78688822e61c0fd7414ffff7398a80b72c3f52514c59f420f7b19dd4b8dd716c840e1cabd9c6496a3867e SHA512 f86167e707fbb91a06afeb94a155fae9a786523af31ea33adbf8544fcc2a8f8ca1fb64aa5544e1db5ff24754af0801c4ed0f9e4a037c2f3d17c7c73241049058
-EBUILD freeradius-3.0.17.ebuild 6756 BLAKE2B 432fe8a118dd70f91c7cd89b3178d6b19395815cdfd5c46f0a88b8f52102c3827727a417043439feeb4a3ff8c3e116789ff88e8828e80e7aafd911b19bd81e8f SHA512 48f61cc95b5431642887e62a5acc1f1be656b1d8fc8a5974b5e47858ed0bd472312a4ed70c710311c1330ad3a094de664afd5cabc6fec170a7d0075ea26b7b9b
+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 6733 BLAKE2B 30290ea42a5b2792a07ed40a61a2aca587f1f2ff7177aa9e8300ba5207ff425564a79931ef10743387eef15d7ebd1c66a534eaf58af13f163411402fe3ae18cb SHA512 ff34c419ad7f77375ecf19de1f72dd3280cbaaedffb98de77a7f5175caf88fae818c5c09286020fab98072a0efe2552c2315ee7dc290a255e16a57f33b051c47
+EBUILD freeradius-3.0.18.ebuild 6794 BLAKE2B 48e7d204313c9021419a53efccf9e502e3fa2510eb19a7ccc08e02d08771e094ead8045b8fa06c7e57928d115bd5cfbe91a717460068314e65147e7c68aaeec3 SHA512 58059ca1a819bd25ad7468a3f9bb1e29996ac99bcf83ecd4959240dd2555b3736208a218f0a47ba733779141028490deab6961c2c1d42b76fac44d83b7899240
 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 bf595e6d93b7..ede4f9100e10 100644
--- a/net-dialup/freeradius/freeradius-3.0.15.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -213,10 +213,9 @@ src_install() {
 
 pkg_config() {
 	if use ssl; then
-		cd "${ROOT}"/etc/raddb/certs
-		./bootstrap
-
-		chown -R root:radius "${ROOT}"/etc/raddb/certs
+		cd "${ROOT}"/etc/raddb/certs || die
+		./bootstrap || die "Error while running ./bootstrap script."
+		fowners -R root:radius "${ROOT}"/etc/raddb/certs
 	fi
 }
 
diff --git a/net-dialup/freeradius/freeradius-3.0.17.ebuild b/net-dialup/freeradius/freeradius-3.0.17.ebuild
index 8aa7879f35c5..36c59cc9a08e 100644
--- a/net-dialup/freeradius/freeradius-3.0.17.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~x86-fbsd"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -30,7 +30,6 @@ RESTRICT="test firebird? ( bindist )"
 #       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)
 RDEPEND="!net-dialup/cistronradius
 	!net-dialup/gnuradius
-	sys-devel/libtool
 	dev-lang/perl:=
 	sys-libs/gdbm:=
 	sys-libs/talloc
diff --git a/net-dialup/freeradius/freeradius-3.0.18.ebuild b/net-dialup/freeradius/freeradius-3.0.18.ebuild
new file mode 100644
index 000000000000..939365c85fc8
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-3.0.18.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit autotools pam python-single-r1 systemd user
+
+MY_P="${PN}-server-${PV}"
+
+DESCRIPTION="Highly configurable free RADIUS server"
+SRC_URI="
+	ftp://ftp.freeradius.org/pub/radius/${MY_P}.tar.gz
+	ftp://ftp.freeradius.org/pub/radius/old/${MY_P}.tar.gz
+"
+HOMEPAGE="http://www.freeradius.org/"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="
+	debug firebird iodbc kerberos ldap libressl memcached mysql odbc oracle pam
+	pcap postgres python readline rest samba sqlite ssl redis
+"
+RESTRICT="test firebird? ( bindist )"
+
+# NOTE: Temporary freeradius doesn't support linking with mariadb client
+#       libs also if code is compliant, will be available in the next release.
+#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)
+RDEPEND="!net-dialup/cistronradius
+	!net-dialup/gnuradius
+	dev-lang/perl:=
+	sys-libs/gdbm:=
+	sys-libs/talloc
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	pcap? ( net-libs/libpcap )
+	memcached? ( dev-libs/libmemcached )
+	mysql? ( dev-db/mysql-connector-c )
+	postgres? ( dev-db/postgresql:= )
+	firebird? ( dev-db/firebird )
+	pam? ( virtual/pam )
+	rest? ( dev-libs/json-c:= )
+	samba? ( net-fs/samba )
+	redis? ( dev-libs/hiredis:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[-bindist] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	sqlite? ( dev-db/sqlite:3 )
+	odbc? ( dev-db/unixODBC )
+	iodbc? ( dev-db/libiodbc )
+	oracle? ( dev-db/oracle-instantclient-basic )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup radius
+	enewuser radius -1 -1 /var/log/radius radius
+
+	if use python ; then
+		python-single-r1_pkg_setup
+		export PYTHONBIN="${EPYTHON}"
+	fi
+}
+
+src_prepare() {
+	# most of the configuration options do not appear as ./configure
+	# switches. Instead it identifies the directories that are available
+	# and run through them. These might check for the presence of
+	# various libraries, in which case they are not built.  To avoid
+	# automagic dependencies, we just remove all the modules that we're
+	# not interested in using.
+
+	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
+	use ldap || { rm -r src/modules/rlm_ldap || die ; }
+	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
+	use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
+	use pam || { rm -r src/modules/rlm_pam || die ; }
+	use python || { rm -r src/modules/rlm_python || die ; }
+	use rest || { rm -r src/modules/rlm_rest || die ; }
+	use redis || { rm -r src/modules/rlm_redis{,who} || die ; }
+	# can't just nuke rlm_mschap because many modules rely on smbdes.h
+	use samba || { rm -r src/modules/rlm_mschap/{configure,*.mk} || die ; }
+	# Do not install ruby rlm module, bug #483108
+	rm -r src/modules/rlm_ruby || die
+
+	# these are all things we don't have in portage/I don't want to deal
+	# with myself
+	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die # requires TNCS library
+	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die # requires libeap-ikev2
+	rm -r src/modules/rlm_opendirectory || die # requires some membership.h
+	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
+
+	# sql drivers that are not part of experimental are loaded from a
+	# file, so we have to remove them from the file itself when we
+	# remove them.
+	usesqldriver() {
+		local flag=$1
+		local driver=rlm_sql_${2:-${flag}}
+
+		if ! use ${flag}; then
+			rm -r src/modules/rlm_sql/drivers/${driver} || die
+			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
+		fi
+	}
+
+	sed -i \
+		-e 's:^#\tuser = :\tuser = :g' \
+		-e 's:^#\tgroup = :\tgroup = :g' \
+		-e 's:/var/run/radiusd:/run/radiusd:g' \
+		-e '/^run_dir/s:${localstatedir}::g' \
+		raddb/radiusd.conf.in || die
+
+	# verbosity
+	# build shared libraries using jlibtool --shared
+	sed -i \
+		-e '/$(LIBTOOL)/s|--quiet ||g' \
+		-e 's:--mode=\(compile\|link\):& --shared:g' \
+		Make.inc.in || die
+
+	sed -i \
+		-e 's|--silent ||g' \
+		-e 's:--mode=\(compile\|link\):& --shared:g' \
+		scripts/libtool.mk || die
+
+	# crude measure to stop jlibtool from running ranlib and ar
+	sed -i \
+		-e '/LIBRARIAN/s|".*"|"true"|g' \
+		-e '/RANLIB/s|".*"|"true"|g' \
+		scripts/jlibtool.c || die
+
+	usesqldriver mysql
+	usesqldriver postgres postgresql
+	usesqldriver firebird
+	usesqldriver iodbc
+	usesqldriver odbc unixodbc
+	usesqldriver oracle
+	usesqldriver sqlite
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# do not try to enable static with static-libs; upstream is a
+	# massacre of libtool best practices so you also have to make sure
+	# to --enable-shared explicitly.
+	local myeconfargs=(
+		--enable-shared
+		--disable-static
+		--disable-ltdl-install
+		--with-system-libtool
+		--with-system-libltdl
+		--with-ascend-binary
+		--with-udpfromto
+		--with-dhcp
+		--with-iodbc-include-dir=/usr/include/iodbc
+		--with-experimental-modules
+		--with-docdir=/usr/share/doc/${PF}
+		--with-logdir=/var/log/radius
+		$(use_enable debug developer)
+		$(use_with ldap edir)
+		$(use_with ssl openssl)
+	)
+	# fix bug #77613
+	if has_version app-crypt/heimdal; then
+		myeconfargs+=( --enable-heimdal-krb5 )
+	fi
+
+	use readline || export ac_cv_lib_readline=no
+	use pcap || export ac_cv_lib_pcap_pcap_open_live=no
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# verbose, do not generate certificates
+	emake \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS=''
+}
+
+src_install() {
+	dodir /etc
+	diropts -m0750 -o root -g radius
+	dodir /etc/raddb
+	diropts -m0750 -o radius -g radius
+	dodir /var/log/radius
+	keepdir /var/log/radius/radacct
+	diropts
+
+	# verbose, do not install certificates
+	# Parallel install fails (#509498)
+	emake -j1 \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS='' \
+		R="${D}" \
+		install
+
+	fowners -R root:radius /etc/raddb
+	fowners -R radius:radius /var/log/radius
+
+	pamd_mimic_system radiusd auth account password session
+
+	dodoc CREDITS
+
+	rm "${ED}/usr/sbin/rc.radiusd" || die
+
+	newinitd "${FILESDIR}/radius.init-r3" radiusd
+	newconfd "${FILESDIR}/radius.conf-r4" radiusd
+
+	systemd_newtmpfilesd "${FILESDIR}"/freeradius.tmpfiles freeradius.conf
+	systemd_dounit "${FILESDIR}"/freeradius.service
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_config() {
+	if use ssl; then
+		cd "${ROOT}"/etc/raddb/certs || die
+		./bootstrap || die "Error while running ./bootstrap script."
+		fowners -R root:radius "${ROOT}"/etc/raddb/certs
+	fi
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} && use ssl; then
+		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
+		elog "to start the radiusd service."
+	fi
+}
diff --git a/net-dialup/mgetty/Manifest b/net-dialup/mgetty/Manifest
index c829963fe4f5..f7dd9a101d8b 100644
--- a/net-dialup/mgetty/Manifest
+++ b/net-dialup/mgetty/Manifest
@@ -10,5 +10,5 @@ AUX mgetty-1.2.1-gentoo.patch 4020 BLAKE2B fa9f609cc93cbc2287e415888bfcafc3f4069
 DIST mgetty-1.2.1.tar.gz 1077415 BLAKE2B 09d48c6cb7917a3dbbfc97c1d32ce43b9a3e64e8a44c8a3a7bfdd168421c287357a9d43504fb4d1b354ffb0f8e2a9c52b56ac3464f196f56064d96a7651e0d6e SHA512 2a82dfb782044d9daf8d41158fa10e991dbd7bd37ab43ea44422166554dd790e989ac49e4ff471d168d1cbb49edc5bedb8762ab61884e4653650686d1bbc2a9b
 DIST mgetty1.1.37-Jun05.tar.gz 1057939 BLAKE2B de22751e72d72d19293794739c29ed115a6810cd7d57c07228526817120898ca597ba35afad36c324562c220ab67dd44655247ac46a2d6612c704557f3ec149d SHA512 577d740c7d209b830bf8e783bf71edb666cb8bbfe8e7dceaa51dda6095d88724715394bcbd24eacfb1c377999f5779b547a7ec79cd9cdc13de6de18c4d857188
 EBUILD mgetty-1.1.37-r1.ebuild 4800 BLAKE2B bf3f72f94a27ead49b1fa58dd3d236aee0d4451e0458d170f831103c39c9f5e51739b588e4bef1b94202c692c1a88682b76a16477ac2be8e0db074dfb3b2a7ba SHA512 61a5de1af9f74ab59fd625d9b6723208abc1e24645f0e3da991b0a3abe43387c27d26e0436c7e56276f49d84b83252a14af1b9bbdd53369980d7898a586700c8
-EBUILD mgetty-1.2.1.ebuild 4665 BLAKE2B 1f86728e9c5b7392fc742dc39ba625c6ad905f47edc924c9f459a60ac35e2e6a6dec0db6d265af4c4f5b091a27b0d500beba2e9bbf508e8401304438d0cc9be4 SHA512 914477cf59a2686ade5dd452b540778aa8cb5c54adc6617d9354eeab1b19336a89569f62d7702182701a98a948aef59162fe769ae437a3af5f5dc3f529b55e6e
+EBUILD mgetty-1.2.1.ebuild 4666 BLAKE2B 5d0203a864722ce9ce93b5783d925a14f09912ef81ad8ecdf73599ea1fc189e10e84b8a479562342062a7c088a70ad2d6d9d1e25d598177d0eab0c26d552bd5c SHA512 ee0a113b7ca5b70bd453e138c09a97130d3e4e10dc529d2ee1ddb1767e08edfe45028d0f4456b3712c008908b2f31bc436256497fb2986660d2882a252b4203e
 MISC metadata.xml 491 BLAKE2B 41dd8488152f14cb26c4db838c6a7267d0cc8063263aa7879971b2afc24e6df481cc76452ff58d07d1c86dab5d27e6d551a1d4c9b721214a71e14af4f33020ba SHA512 e975c8e98834b587752c566c0f52fd16fbbcd1b6b930407d5bf027b5717eb898af0c7c7aff94a31a18a8033d561e934e151f17b1ebbfe406c2cff22f88adba36
diff --git a/net-dialup/mgetty/mgetty-1.2.1.ebuild b/net-dialup/mgetty/mgetty-1.2.1.ebuild
index b3c900b91edc..3f2e2683eddd 100644
--- a/net-dialup/mgetty/mgetty-1.2.1.ebuild
+++ b/net-dialup/mgetty/mgetty-1.2.1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="+fax fidonet"
 
 pkg_setup() {