gentoo Easter resync : 12.04.2020

4 files changed, 10 insertions, 11 deletions

diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index e825a8d3472b..2e95696b66cc 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -4,6 +4,6 @@ AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d45
 DIST netkit-telnet-0.17.tar.gz 133749 BLAKE2B 0eef225adeb0dd332ffd9cce0285213e6aa89f04263fb37e3dac35462492732265b2c29bd2a86277e39e0ad55267ff1a150f1140823c91d44c29cf6a20df8e7e SHA512 e2cfabed12326af5e288def1821353eacffb4586008263dcd1bed1a9dd9d8548e51e68d7ede58ea75927783ba534ea8807ec722271843a77146f064f3d826dd3
 DIST netkit-telnet_0.17-36.diff.gz 27226 BLAKE2B c19370f6462295bb7e8d09307121ec3356e9d1751b3ce5b7985844f54506351f633de381ffb3cd3209995c1826aaaa9ce716084742d4689d626b28aee8a3eb43 SHA512 7cd1ec5f96fcacee551700d65f62b6c217e0d9b5220a218aa60fceb3883d0754831606a247355dc2bf6486a02175b8d9b27058d6bc788de8e1b80545fdedbf9a
 DIST netkit-telnet_0.17-41.debian.tar.xz 36592 BLAKE2B 6db35c25e14b219c15c4dd180f0dab064e5b101b42f29e7b71d99f797d22a51b376e6de148cf83fa479039f0ecbc811ecc36953dd89ae11f079b4ed42690d18f SHA512 4de0d51c6cc3c9113b38c9ab76553d22294a02a86d2e02a0481bdad77887782902d41f99eb5dd268bee175ebee5489b3e9871012234a7480a431ef47015cdf5c
-EBUILD netkit-telnetd-0.17-r10.ebuild 2479 BLAKE2B 83a574cc11e77c557021f9b81f0a2d06791241503aeac7b5abe5a4938dd2f24fc276cad2945c30e144f355d347ff58d857f6a5d61b2b452cb2523e6fb75b8bf3 SHA512 9f74811026e3c390606edfcbda7b2c5aef36bb131621aa919581ad768ee97302da974995e8b433464a7adf62b3dcffe3443a90dcec3d753427912406ece33181
-EBUILD netkit-telnetd-0.17-r12.ebuild 2510 BLAKE2B ab803c9689175733cc7daea94d042815c81834d1c62a4e0bc1655eda5b862334950d81515711d289d3e4da4b62a64292e9bf6c15f43510f00cb5ea4ed6062b3e SHA512 a9e8ee0c760810d365bab47f6278840076c52ebdcabe0d63175a2f3cc13fe0138bb7c926c1a034588737679ada21d09a9a28c9ab8316a18f5075f7e5b97a9c00
-MISC metadata.xml 598 BLAKE2B d8e784ee117674b8820d1dda844282c296535255872239741bd8fd731a27979ea6b4e2fa276ff16bae355934a34f87cc0fe1bfe99e1d4d36f824d806a22dd735 SHA512 0e67cc6f6f92fd784726eb82124652850e84be55006f00fd4b8071272219f7d9581d2f52c82df26a509a6dd1abcfe8ea7cb0c1eb442750a3700d637163335f83
+EBUILD netkit-telnetd-0.17-r10.ebuild 2477 BLAKE2B 7719524ef10775ac242aff780e1d272cd1b064577dcc45b83c3a974ac4923a88735859071c5c1403c3d5118a8e5944fe05b3f4f52b4818279e157146a6b2676a SHA512 dc261e2c8a9cbc0555fb6d4016f6914002630449fe74ce152d0eba4db15f31cc88d0608b40d8a2c12d2c0de999abd333ee8f571ac28370ac3cfa565d6415810d
+EBUILD netkit-telnetd-0.17-r12.ebuild 2503 BLAKE2B 6024fe44a87d4598e78056042911ac5144d68536f24c5135fdace3a408772aeda0ba6741d081048858392037c97d75d20f1f936b3b3500cba1d53b90480df7fc SHA512 d9bc334131caca69607979d1416d909188c367f0e9fcc6d2494bac8ad2f558cf668a3d448daa19da87adf455adf4ce37802fde2bea0dab1c4d5a052805c2e5d5
+MISC metadata.xml 462 BLAKE2B 430d6a3e7d34a5dd9a1601da947199fbd2c5b7baed723525064ae6335e02b59e6cbd8309a82f864cf9a8bb245f49ae01155f7effa8412ea91dd792585decd296 SHA512 f607e0ea0ea03ae7f941c5e27672b8b46bd14164460a8b2c86e4d57df68b549668f9298413f7293dd96dab53d18bd19c46f55e7e77a88ed581553c4502a8f3c2
diff --git a/net-misc/netkit-telnetd/metadata.xml b/net-misc/netkit-telnetd/metadata.xml
index 428ad1b85200..bd198f872437 100644
--- a/net-misc/netkit-telnetd/metadata.xml
+++ b/net-misc/netkit-telnetd/metadata.xml
@@ -9,7 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
-	<longdescription>The telnetd program is a server which supports the DARPA telnet interactive communication protocol.</longdescription>
 	<upstream>
 		<remote-id type="launchpad">netkit-telnet</remote-id>
 	</upstream>
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
index a543bc37a961..9d8090cf6e5b 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://gentoo/netkit-telnet-${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.2:=
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
index e041e858c76c..aacfc0d9e905 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.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="6"
@@ -19,7 +19,7 @@ SRC_URI="mirror://gentoo/netkit-telnet-${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.2:=
@@ -46,7 +46,7 @@ src_prepare() {
 
 	# Fix portability issues.
 	sed -i \
-		-e 's:echo -n:printf %s:' \
+		-e 's/echo -n/printf %s/' \
 		configure || die
 	default
 }
@@ -58,9 +58,9 @@ src_configure() {
 	./configure --prefix=/usr || die
 
 	sed -i \
-		-e "s:-pipe -O2:${CFLAGS}:" \
-		-e "s:^\(LDFLAGS=\).*:\1${LDFLAGS}:" \
-		-e "s:-Wpointer-arith::" \
+		-e "s/-pipe -O2/${CFLAGS}/" \
+		-e "s/^\(LDFLAGS=\).*/\1${LDFLAGS}/" \
+		-e "s/-Wpointer-arith//" \
 		MCONFIG || die
 }