gentoo resync : 25.05.2018

17 files changed, 131 insertions, 209 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index f7f13fd6713e..3f8d1d39fd6a 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/connman-gtk/Manifest b/net-misc/connman-gtk/Manifest
index 81b2e263da7c..5febe08dbaaf 100644
--- a/net-misc/connman-gtk/Manifest
+++ b/net-misc/connman-gtk/Manifest
@@ -1,6 +1,3 @@
-DIST connman-gtk-1.0.tar.gz 50428 BLAKE2B bcba246411b80db9a3321854ff091d93e65ab9db3578413fdcafbcf9688dd57e033f2d0939d0a425938c128aa021f7e8704d66d02c40fc40770c099c23aa1323 SHA512 61f3004950f5905c62ff8c71afffbba9797e398b332679d495846ecfd2adce693b4ce7026adc72676868a3bdefbf3df5be93090abca215d4b0baf784324c5577
 DIST connman-gtk-1.1.1.tar.gz 61789 BLAKE2B d04d508b5bb03abe78c9b6734df919b6589cea9e7f38c41059210e62795ce79a17b6ba8b3ab1b0c403a43fa2712893bc0d00b1e5f15d9910ca45108b9e760e12 SHA512 78fd41a37370c76f118e3fb8a707b96fd6bf1234a8832d047302d4b0fa350f87316f6e2e749860b2cdf0ff6e6eb76e4d7d398dc7fc084403ca2f8682d2907553
-EBUILD connman-gtk-1.0-r1.ebuild 696 BLAKE2B c6d9941cf9a09666e35b35fc8cf86e7a32805899a0b7c8301a6495a95187424638d0ffce35f96d7f965eecc42090584cfd98b479b5cbd4fa740dae6b432a1687 SHA512 e4e2c69a7fdfa74ed3e9d1cc7e402f5fd2dc4b56c56d3d31511659c2bf47d0cdc92703eef408470d8bde951a22969ef21766ab0b061b472bc64996b3681732d3
-EBUILD connman-gtk-1.0.ebuild 687 BLAKE2B 64b34b55aa0108b543136d6fcc6f39856f04e3bcb13702fc949ec26a2e6963d98edc2de82dee79ee4a201fd7d7886e190ec8434e7a5dc32a982ad253e385bbef SHA512 4175ab3408837d4af115877ad6336ebf489aeb6c0aa39bc8786ae81602f85cd7824246d018e5d7d38fbf3eb812028c6126845d8ba83d3ae0620e7d177a9a4382
 EBUILD connman-gtk-1.1.1.ebuild 939 BLAKE2B fbf8d281f22cbddfcac61b734121df5479d89e3c4c8027751d49d5bec9cb835a9afa81143cea2986db16ca44e0567ba618898d85be6be070ea66f5e462211aa6 SHA512 628b59ca685ec0d8007fa244cf893f7b05ba44e89ad1d10f5cedb7ae9b02a58ebf3151f0dd2e2f532bf8d3f429f75f5d31651dea086257450756bb40270f5296
 MISC metadata.xml 488 BLAKE2B d55fe987103c9440307fc9db557cbb4c6add9b960e642b0d6f5735aafec2a29156a0a4ca6d51bb71c4e238bd897430e4e4065383b88ffde803bf53aae99d1314 SHA512 f84f35958b032afd49633c59fac3474148d01becdf968d62747c8a2d99aeec4f90cae7242b7f7fc00cee2903a9188bdc206308a7d692e136317959ebf9019867
diff --git a/net-misc/connman-gtk/connman-gtk-1.0-r1.ebuild b/net-misc/connman-gtk/connman-gtk-1.0-r1.ebuild
deleted file mode 100644
index aec310f408f8..000000000000
--- a/net-misc/connman-gtk/connman-gtk-1.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="GTK GUI for Connman"
-HOMEPAGE="https://github.com/jgke/connman-gtk"
-SRC_URI="https://github.com/jgke/connman-gtk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="openconnect"
-
-CDEPEND="
-	>=dev-libs/glib-2.0:2
-	>=x11-libs/gtk+-3.10:3
-	openconnect? ( >=net-vpn/openconnect-5.99 )
-"
-RDEPEND="${CDEPEND}
-	net-misc/connman
-"
-DEPEND="${CDEOEND}
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with openconnect)
-}
diff --git a/net-misc/connman-gtk/connman-gtk-1.0.ebuild b/net-misc/connman-gtk/connman-gtk-1.0.ebuild
deleted file mode 100644
index 3b4065d4628f..000000000000
--- a/net-misc/connman-gtk/connman-gtk-1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="GTK GUI for Connman"
-HOMEPAGE="https://github.com/jgke/connman-gtk"
-SRC_URI="https://github.com/jgke/connman-gtk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="openconnect"
-
-CDEPEND="
-	>=dev-libs/glib-2.0:2
-	>=x11-libs/gtk+-3.10:3
-	openconnect? ( >=net-vpn/openconnect-5.99 )
-"
-RDEPEND="${CDEPEND}
-	net-misc/connman
-"
-DEPEND="${CDEOEND}
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with openconnect)
-}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index d1c29dd5f88c..744e7d5fc54e 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -10,5 +10,5 @@ EBUILD curl-7.57.0-r1.ebuild 7103 BLAKE2B eb3b2a5181284c2e63d57d45e20692adf3e07d
 EBUILD curl-7.57.0.ebuild 7050 BLAKE2B ac2b9ef326caec4e07e89ea30f07140856a4ae62177c1ef7fef78a5a968f8095dbbb82e455d0f309ac35dfbbf57720d013fcb411bbaa523964da124bf0e3f140 SHA512 3b496a5d3159150b6ab7b45fe5145b97a64a9f8909f05f09604634aaf5750ed560941c17be249d7cc5c27a0e03ab353fb913795d47f285ccda7c5e3ad48c786a
 EBUILD curl-7.58.0.ebuild 7093 BLAKE2B 98eaa108a6d55f5a969fe0898e31f0a2af4b7fcb15ca993eb3d238d0a73c6a60d010ada1b1c5d6cd21b117832f8bab1e43fd9e3ff2072457144e4f5df254fc3d SHA512 a31269371ccf0948b1413cd256d6ad4df609b89c40c44a54cc1b83282353b45ea314322fc12fba279c27bfc7513a8c5ced8c09df065230ff833c7b13eebc87a5
 EBUILD curl-7.59.0.ebuild 7267 BLAKE2B 4fadca87badfa6435f391f19508a8a8818b47bf755746f9cb9597858923ea2205daa9661cf1af5cfc65e479205c03662524e18e0ef9d1dd2d2187226f5f93117 SHA512 eaf229ab649e47e2743f1d1217309df883d3513e4f3f0b7be9d1e1a5fbc04f9b0491b6be0a43c6202b0cb17dd03a3381185f5d8f9c256576173cf282dd91c411
-EBUILD curl-7.60.0.ebuild 7196 BLAKE2B f19dfe1eb84e7235d072965462044879d7eaa5e18bc6e779ab621536dd190daefed3dda77b6fd1adb5dfb20ce70130fbeaa9d32e3c31bad5fb53027bbf7b61b1 SHA512 f3edf0424f4e9b7df5acfffe0a5c49c112716c3d1f45e7737894d7a045bf66b175a8327fdb659bfabf3b49293617462458fada5ccd36df96d55b190043b3b6b3
+EBUILD curl-7.60.0.ebuild 7194 BLAKE2B ebdf0cc8c790e0c90bd764d12724a1a80b8e4fb4cc9f5cb87087d9ce2e2efaf6275344b17457faecf474852f4c80f72872007c15aa3683ac8520c7e09811c76d SHA512 846b0fba00a1d6ffcc72cf0dc2cf2a3b985b4d7d5514902511ed854c85d837ba690f20a91737e9385535f6557b1fb631291b122d6aa12d1f872b506a5b30e356
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.60.0.ebuild b/net-misc/curl/curl-7.60.0.ebuild
index d29f81320764..634359741379 100644
--- a/net-misc/curl/curl-7.60.0.ebuild
+++ b/net-misc/curl/curl-7.60.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" elibc_Winnt"
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 1a9036041757..36421cd3cece 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -1,10 +1,8 @@
 AUX dropbear-0.46-dbscp.patch 500 BLAKE2B 268b3a065ff9a9d52659c969195a712e8bfcbc6984e201b69f2a2cc04956220bcda766c932e46fdf4d75f379d1f5a9dcbab842d66a9f6c62fc7f0dd03024d1ed SHA512 33596d1b59ba266eade106e8fe058cc9d20d1657db88d51fb11c2111835f7887b3fa5714b3feb9767c48ed94d3af0c539864886e0a2586b6f58a38bb9f741210
 AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f
 AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8
-DIST dropbear-2016.74.tar.bz2 1622234 BLAKE2B c729a2c1afd13e1ca07f3c9cfe3ff0ea7888cc1687ea2793275134b3224118164ef81583f55dbec53d6322be53eaa7a7324216133919722390d0e2dfbd929f07 SHA512 c0f4ea7840077b8302b48e27b5b588a4babac6583740dfdb845c40f633aa3ec96174d1d2ade81d2c3e23ea99b75e906312c512d8c7580e6e4105b2dbd37e5e22
 DIST dropbear-2017.75.tar.bz2 1623392 BLAKE2B c024037d3ebcb3f16aed2a5f24e07c06699a510b327a0ea528db7160ad2a8e554af2a233a266f869e0e30c78f3b0b7792a817d9c07f058f605dbf2dc749a4fda SHA512 9c2f2a5e718339f83abc0ad7719bda12bfc75e5bcb87a7c0eec0afefc743e5c0a1575d290d5fde152ff2100b0f0e6fd5ef4431f7bbcb5ca9a332d93c20f5a8f4
 DIST dropbear-2018.76.tar.bz2 2688697 BLAKE2B 1c22d38487e94427b2678d070f8d370eb09bb2d69253fd6f76d8d80fd637ff86a44b00ab42e1f6d84042c72cbcbd4bb6cbb415f961502e0437c7c8c1b812f059 SHA512 82323279f7e78c366ba1ea07ff242259132b2576122429f54326518dd6092aba8ae5de4a0b8a3cef7efc3507015741abe2ac23376c03b40b247527da7a88120e
-EBUILD dropbear-2016.74.ebuild 2476 BLAKE2B 41d21f7aecf0d056a63ab5150af700d2fd36659dd25f29dc67cbb7acf852ee4e583b5ef1c7f2c74710d5409988ed91a4e3eecb2e9821911cf5a8c67cfef41795 SHA512 a1bf33919cce4fab7c1b23dac884db81883555eb9c249f30e5ff96cc856375e3849b18350a52abf7e78bcb3fc12418ad2d86508cd396562230cb155fb15f9420
-EBUILD dropbear-2017.75.ebuild 2481 BLAKE2B b7c8e0d00bc8f2a545d69b698d4b7f8e628e325268542e82933a8721d8753b6dfbff088318ad4af13b93771f085b3d011a93fee4e7fa4c8524742b5ab73404f2 SHA512 b362022bef74be9bdeb397c71bd21f1c72fecf5b672f398bf1b94fefd1ca267ee77688600d54a2600d3a2cb7d2e8ce9f7d1b2f8af426402808d895990edfbe4e
-EBUILD dropbear-2018.76.ebuild 2624 BLAKE2B be125d92c97eca0b2798caeb6357a854683af3ed62353aac7c988fb1dc6ac722d92a7a1a72ddee5d5d16b7e4b2f0707dd5498b27c9999b94b8ea25254e40ee2c SHA512 77a7488f5b18d326f504ea71219d4c38d8a48f45cdd0a846df8c882516413404983f7b60740b43f679c329622355bbcd4183f72f7032633fa4409ca74d46131c
+EBUILD dropbear-2017.75.ebuild 2479 BLAKE2B b200fd9ce16df2cfcfe197bbaa4d23b86fd65ac28e3a91b2b9b38780ccab35333cc946b71dc67826932dc39dd67f7c0cf4cb3f026bbded140b306c5ab464f42c SHA512 7ff7df1daccbadc9a855ade363dd8158fced88e779ac9764136ed8c42e54380cbbdba2ad6392e859c974a4c81cf54ff7af240c54ee7a03094880528b21ada6c1
+EBUILD dropbear-2018.76.ebuild 2627 BLAKE2B d558e88e05a0169795e8885003f3d3ed6e82b18199a717ab55cc144067b65b0d9fe5f4988ca4b514ab84085779ae7609c05d615fe43e65a9c23d304e2fcb922b SHA512 993b7e76ab0a6746e42f81c94fc7a5e5de07cb76a745c0161ea0d8c1f0e96c5081b785ff68aa173240d753c0bd51576e2734f2394fc8f9af4534e6008db5cf78
 MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314
diff --git a/net-misc/dropbear/dropbear-2016.74.ebuild b/net-misc/dropbear/dropbear-2016.74.ebuild
deleted file mode 100644
index ef89e09d0f11..000000000000
--- a/net-misc/dropbear/dropbear-2016.74.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils savedconfig pam user
-
-DESCRIPTION="small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
-	http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
-
-LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
-	dev-libs/libtommath[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
-
-REQUIRED_USE="pam? ( !static )"
-
-set_options() {
-	progs=(
-		dropbear dbclient dropbearkey
-		$(usex minimal "" "dropbearconvert scp")
-	)
-	makeopts=(
-		MULTI=$(usex multicall 1 0)
-		STATIC=$(usex static 1 0)
-	)
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
-	sed -i \
-		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
-		options.h || die
-	sed -i \
-		-e '/pam_start/s:sshd:dropbear:' \
-		svr-authpam.c || die
-	restore_config options.h
-}
-
-src_configure() {
-	# XXX: Need to add libtomcrypt to the tree and re-enable this.
-	#	--disable-bundled-libtom
-	econf \
-		$(use_enable zlib) \
-		$(use_enable pam) \
-		$(use_enable !bsdpty openpty) \
-		$(use_enable shadow) \
-		$(use_enable syslog)
-}
-
-src_compile() {
-	set_options
-	emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
-}
-
-src_install() {
-	set_options
-	emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
-	doman *.8
-	newinitd "${FILESDIR}"/dropbear.init.d dropbear
-	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
-	dodoc CHANGES README TODO SMALL MULTI
-
-	# The multi install target does not install the links right.
-	if use multicall ; then
-		cd "${ED}"/usr/bin
-		local x
-		for x in "${progs[@]}" ; do
-			ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
-		done
-		rm -f dropbear
-		dodir /usr/sbin
-		dosym ../bin/dropbearmulti /usr/sbin/dropbear
-		cd "${S}"
-	fi
-	save_config options.h
-
-	if ! use minimal ; then
-		mv "${ED}"/usr/bin/{,db}scp || die
-	fi
-
-	pamd_mimic system-remote-login dropbear auth account password session
-}
-
-pkg_preinst() {
-	enewgroup sshd 22
-	enewuser sshd 22 -1 /var/empty sshd
-}
diff --git a/net-misc/dropbear/dropbear-2017.75.ebuild b/net-misc/dropbear/dropbear-2017.75.ebuild
index 7e8d1c97a5bd..ad5c7c8986c2 100644
--- a/net-misc/dropbear/dropbear-2017.75.ebuild
+++ b/net-misc/dropbear/dropbear-2017.75.ebuild
@@ -6,13 +6,13 @@ EAPI="5"
 inherit eutils savedconfig pam user
 
 DESCRIPTION="small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
-	http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
+HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
+SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
 
 LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
diff --git a/net-misc/dropbear/dropbear-2018.76.ebuild b/net-misc/dropbear/dropbear-2018.76.ebuild
index d2800db5b260..f73f40c403a4 100644
--- a/net-misc/dropbear/dropbear-2018.76.ebuild
+++ b/net-misc/dropbear/dropbear-2018.76.ebuild
@@ -6,9 +6,9 @@ EAPI="5"
 inherit eutils savedconfig pam user
 
 DESCRIPTION="small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
-	http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
+HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
+SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 9ba41ac9723c..8b1568d6259d 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -9,8 +9,10 @@ DIST stunnel-5.36.tar.gz 645205 BLAKE2B 6287794b162212783c54fe199fde43d72347f7ae
 DIST stunnel-5.40.tar.gz 648828 BLAKE2B ce0e9cdd1d6c9ec2eb318e1a31307a4e4f27849b548ba755272c71c49b164cc1a6fb31a5dbec56c399349e590232aff84251670b6d8738c2b00ff182fdbb5dd7 SHA512 2dd403f212f701370775516d25ea441fe41564daf1460f8a9ba4eb960adfb5f007ebfb51a90503fa168c420f06e17a6d20f1b0eab697e2abb6a42dc6f1f898b2
 DIST stunnel-5.43.tar.gz 698715 BLAKE2B 21ac7014e571e1c22b1b21b6dc5c4f22ec91197c7088756fb65dd4dd22541538179d5b389cbd1c3bd8f8d61436eab36e23f6317757229035cd8e9f04ba536f0e SHA512 3158ab7573d8c548ee71aecb3f94e141bd80e123a62848945263004e28668050a8a08c904dbf61df28c4f5c1d94eb380943ab39835ccd18273a6acf05a3488a8
 DIST stunnel-5.44.tar.gz 699117 BLAKE2B 956c7ce8987f79efab3baaa5071263466ec01f0475bd7e66dff41e8de66811a10be3a5f14bd6430e26159682bd3c2abe93a0d5824a854ae0243e6bbfae14a664 SHA512 a1aa4f234926208bf1b2c9acc0bf83dc0f2c8f575bc57f5ce89b32b4e3fde0412ea0ef7c2edb364fbe0b52fdd89773fab4df53950c58797c11b7668f3e4e7638
+DIST stunnel-5.45.tar.gz 706423 BLAKE2B 81c5355419de3b0bc88d59ea8c98d1a4523d7a1ae6a3d12464f7ab6a1df1f5dd798d2f50ec7adce7515e68a650149321f13e34791781620ad071824246502dce SHA512 653fea6e5002983bb9231a542ab1bab078428821910b8e257adbeea88e583e84d080615f232d5d3086e8d6069c43ddbdfc7923c4b50071ab0c0be547e76d8983
 EBUILD stunnel-5.36.ebuild 2899 BLAKE2B a4c62a1a79157b5b24a8904dacbe45a44b22b53710b44a5bb5c3823e29df666024e8300d82cc6fc5e52a9f8cedad0beaaadc5ee4bec4d366f2544587009c73db SHA512 ffeac1d20a4a83fcda56ae36b81e7a230ae18ad786fdbd51024b0f87b013c9988538cb92d8757869b3337fc78cf25e605fa31fe3d54b437df59c3f1d4a8ec595
 EBUILD stunnel-5.40.ebuild 2930 BLAKE2B b18d32b276cb28e83b8f99b5c495c929c3c6ddff54a7580be3387aa4d5e114feed917bdf4a7faa4136850cdea0ba019fdc3c86fb28268f23f23a125ceb7b896e SHA512 6034f34af01ed21b16474f1ec4a76249d9ee2f14e4312ecf8d7cb75f66f49e9e641328fa4904cc9adec6d9cb480e63187ed9bb9a6263846ef2eaf7a2d8f3eb20
-EBUILD stunnel-5.43.ebuild 2930 BLAKE2B 2f027288047c1efa62cbcff7869b492422b925576e2f672a851f8c101de4c9a8dbe87d6746050eb5d6115ccaab81c5006b5ee046b3356cf161142c99c6ee6372 SHA512 af327981e004f8a56473fcfa88d8f5027991461a6ffc791db6a840919513dd0e0d3de47828e7a4d6425bef432b76d2d8a05b3a6ab742668e5da4051d44aead7d
+EBUILD stunnel-5.43.ebuild 2929 BLAKE2B 2a995a0d14865b98816e60bcd64527df796f00a3ab0c1b12d98d5dcf21eecd63b907be0d6adcb68ad75be565907ef0e24a9a22da3fb2dc0d5cc84eedb529b0ef SHA512 760053ada4475fd78c48c751c86d1c40e4acd47e5b22fd868ae271f68844fd553c13d4ef12c44fcf6349d22d6ceeb82c4e70c74cd115f06fd63c453927df6928
 EBUILD stunnel-5.44.ebuild 2930 BLAKE2B 2f027288047c1efa62cbcff7869b492422b925576e2f672a851f8c101de4c9a8dbe87d6746050eb5d6115ccaab81c5006b5ee046b3356cf161142c99c6ee6372 SHA512 af327981e004f8a56473fcfa88d8f5027991461a6ffc791db6a840919513dd0e0d3de47828e7a4d6425bef432b76d2d8a05b3a6ab742668e5da4051d44aead7d
+EBUILD stunnel-5.45.ebuild 2930 BLAKE2B 95ade179eb9d81e66ea6fe7523a299c8e6dd58d43867568b8e22d22125f6a6111d1f8b988df153cb438afba2736db811507d87acf0f2b5b00469904c12657f34 SHA512 c8fca15345e1a955af0824d847dc0e06a220da7dcdff9a5144e567f54ea7e6c36a14d74fb407b5981249c3076811e7da2fcb668855cdcbca019aa27e464c9229
 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/stunnel-5.43.ebuild b/net-misc/stunnel/stunnel-5.43.ebuild
index cb4aa4447841..d5432ff30286 100644
--- a/net-misc/stunnel/stunnel-5.43.ebuild
+++ b/net-misc/stunnel/stunnel-5.43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/stunnel/stunnel-5.45.ebuild b/net-misc/stunnel/stunnel-5.45.ebuild
new file mode 100644
index 000000000000..d30f1845da1c
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.45.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ssl-cert multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html"
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+	stunnel3? ( dev-lang/perl )
+	selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup stunnel
+	enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+
+	# libressl compat
+	eapply "${FILESDIR}"/${PN}-5.43-compat-libressl.patch
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable ipv6) \
+		$(use_enable tcpd libwrap) \
+		--with-ssl="${EPREFIX}"/usr \
+		--disable-fips
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+	# The binary was moved to /usr/bin with 4.21,
+	# symlink for backwards compatibility
+	dosym ../bin/stunnel /usr/sbin/stunnel
+
+	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+	docinto html
+	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r1 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename."
+}
diff --git a/net-misc/taylor-uucp/Manifest b/net-misc/taylor-uucp/Manifest
index df44df549e21..071a5f05af4f 100644
--- a/net-misc/taylor-uucp/Manifest
+++ b/net-misc/taylor-uucp/Manifest
@@ -2,5 +2,5 @@ AUX taylor-uucp-1.07-fprintf.patch 188 BLAKE2B 13900fdaffd964d5e38a4bc3d2acce267
 AUX taylor-uucp-1.07-gentoo.patch 5049 BLAKE2B 3d010ff0841df59196d38e7450b85c4d36c2ccd770a4c31d29962e3c3f87d5a264977fa2f715a9bb91fec44f60dd5e045eed440e0fb482be525702497f3ad2a1 SHA512 8d259ddf10c80ff6c349d3bec531f858d561f3f488fd6066d69ddb8d2242e9f22ff8781ce47dcdb10f3dbf4a073bc4bf3492f6fced30d8d129e6f81e860f971a
 DIST uucp-1.07.tar.gz 1013234 BLAKE2B 5734bd1b8afcc9cb9b0dcc25afe73ee89b6007249a73d286bc39975bc0cd7a1907e360dfaa050175d87e34a7d468a70a7cae75124c920f00f03ff52f16629bb3 SHA512 13d215890234e638bed53dce7bab6eb78e0ce6b658f23ac1d7f8abc6e1d97963bef76aa4148ca644f450d5a1678fac940b73fbcd5845d7f5bea3afbd8055229b
 EBUILD taylor-uucp-1.07-r2.ebuild 1336 BLAKE2B 4ab6366c61aa8c1ea815a3c5a02616ca0d7a08b496d114efedf78069f2f632c9908dfcd7f93bdda6c36c2ac905f5886b85ef7f2fd7f4436b8a2c34931393239c SHA512 e499cea422bb755a588a98991bb00acb466db6b55d85a8b8d495c1fab2c5cbb6d70b527df95ec9914f2c773c05b5e804f86ecfecf3cf540099434f5143447194
-EBUILD taylor-uucp-1.07-r3.ebuild 1370 BLAKE2B 4525bc6154c0ee2f667e02e54fcdc7041718fc7ffde2ec7a050a2a63fe0cf83ed3238b9ec1cc68e71d44c2ee3f52adabf1ebabfea7928b55fc75aad56e9b16e2 SHA512 cecd33904ad314e7b3f58c38c8bc0e2a428833a2bf371ab6fcb3e4cb1041f66037889b3ba786b6ac6264d214e0dceb18ca03be3c744fc314ef48f17194729861
+EBUILD taylor-uucp-1.07-r3.ebuild 1369 BLAKE2B 7b9f6ad62d03d980157178077e02388596121728c346c18f75d740f89ecb8f64a76b15367dde165a8eeb4b4cdc05bbefbd19c8107ec3ef8a8b32d322195420f5 SHA512 87e29758cdcdd4badc190e18643a1b0e668c60254d9f27df9262daab34f643605219e5100d989169d13f684a5d6d4e5c3122979cef7c242b0e8c4c87a5d26217
 MISC metadata.xml 319 BLAKE2B f7bd226c6082b2d19d38b6d20aa6d859e6076e226cf2ae3a4013ee5ff558f7dba27cee1fcd159785679fe03b37082d57232d7ecf6f86e832a60e3d8c4f528d57 SHA512 14fddbb3e6a6f0defe184c909d8ae29072782e3060dd5c91f852572039ca81be95f9cae98f6a4a011711cd991bcfa886638d725372463b3af4ee7f15654ad22d
diff --git a/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild
index 43fa15c222c2..14488693e4c2 100644
--- a/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild
+++ b/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/uucp/uucp-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ~ppc sparc x86"
+KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86"
 
 S="${WORKDIR}/uucp-${PV}"
 
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 445ef53eef23..79c22814c247 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,9 +1,9 @@
 AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
-DIST whois_5.2.12.tar.xz 80428 BLAKE2B 53aa08d4e45ab417585aaaff03beb588a01e88c35d508f96e0738e6934659df6ab78c21d5794d86ce90c775fe5a32242710e8cf93b9f46c52dc32597ad113f40 SHA512 df40e2e7cbd11d00984f865e122ad4ece882a6a45e2f75ad5ea24ce937b7e9452b01fd886f43bae55fd065a6556cfc4577e7126151b5fd43fa806c4b0c886ced
 DIST whois_5.2.20.tar.xz 82336 BLAKE2B b10d7e22f41bfb68cdd1264016bbfeeb93436a5c46b0ddcfc79834d0446ea8c21cd8ff95bc440bbe4fda0d5b08a16c50fe9504c98c3de3cf4ce18892203518e1 SHA512 3308d9f5562babe007e46b7764718f13c1e7cd8ef7f501161353e4b1b81efacec9742ec25dec3b1cc80940898c785c1920a1aa68af10081f952ebde320075808
 DIST whois_5.3.0.tar.xz 82728 BLAKE2B ac5e9bdd070c3a79306f79709d6450455ff74fc7c3a8c81380f79b98cdd36d25932032673710a39ec55da2220f1d0a21221e1a2b70c36e8798affe9b7f46f3bb SHA512 a507f38254d826a9112d1f5a7888fbd4b79eeaa372977c02e4e8235509d133540ba647ddece95376f6ac704f9b1042d276051d4a3a36d10906ad11f69561432f
-EBUILD whois-5.2.12.ebuild 1494 BLAKE2B b84e9fa6367d3f977423ff590d54d094f2d2cf218937f410619646f574b7810029a7b587a8d8600baed31cf050f19f67e5cb56f189175f516dad5af1cf9dce52 SHA512 ca9371338ccbba81f3a60a611e82b6702c4a43166d57c02cb029d1303fc2cee92cf2173f9381d888a48785191dd05719f66d3eb687bf90e4d987377d092700ff
+DIST whois_5.3.1.tar.xz 82920 BLAKE2B b4e58ae3f58c8e5de8bca5be3c0e753e0de91651bea1aa4789d389bc65e5155cddb1e87a2adc39340f33360533ef2b86eb9b7b13116a2d64e8a68496529e65e5 SHA512 4840ceecaef1d47bda436f8de8b539ff2b1446dd99ec0867d0bb2b478c13fac190a4a265ab31abb30a779f1a221062f298cd01a1b19ce873221b39dbd3a4a3d7
 EBUILD whois-5.2.20.ebuild 1503 BLAKE2B 7796f9e7992a0179441bd428ec512290aceb4f0a6b616c5990713a09c5a099658a26d4d5f6c41f1310271befeb8c91da9d33ad1ede8438c07f23d3fb01dc7575 SHA512 78cd52f619d4665decb06c6ce40ffc845ca949980a76d8b7e996c1aec28ace1217d76aaa1803f06b25e778ee057ff9031b5faeebe371530927e077106e669a49
 EBUILD whois-5.3.0.ebuild 1588 BLAKE2B 4518cbf6d72192faa8ac482d752571d9df527cdf61e856c9c4c572e307e334269c00e031d80beeab44b4ecab207eb9e6428b0e8b3fb5979c197c317cd02dc39f SHA512 fe7028e212fc0a1062e081b46c4c16ff57622b95062ef7533cee5ecaafdfda8200b047e2f24670058652f5c1c2ba7e07fd6c244dfa039cc7716d647da23c64f2
+EBUILD whois-5.3.1.ebuild 1591 BLAKE2B 7d9add8c38f90d2fd1ea587f5cdd8ca4647eef05baff86dac641c5c28277200ff80d7aa031ce97797d52a3f694bc4212a52bdced8800f8aea905a2fb01095dbe SHA512 3c7f7c289ac6aa0df9de40ec17b19caff55c3b1943050365be1ba85b642f622b4cf125ffb63fb28012ab6b71543e7af894bedccbb37a86f74fdb697d430595a1
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/whois/whois-5.2.12.ebuild b/net-misc/whois/whois-5.3.1.ebuild
index b29486572d8b..c1b043c47406 100644
--- a/net-misc/whois/whois-5.2.12.ebuild
+++ b/net-misc/whois/whois-5.3.1.ebuild
@@ -1,31 +1,36 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=6
+inherit toolchain-funcs
 
-MY_P=${P/-/_}
+MY_P="${P/-/_}"
 DESCRIPTION="improved Whois Client"
 HOMEPAGE="https://www.linux.it/~md/software/"
 SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="iconv idn nls"
 RESTRICT="test" #59327
 
 RDEPEND="iconv? ( virtual/libiconv )
-	idn? ( net-dns/libidn )
+	idn? ( net-dns/libidn2 )
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	>=dev-lang/perl-5
+	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
+	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
+)
 
+src_prepare() {
+	default
 	if use nls ; then
 		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
 	else
@@ -37,7 +42,7 @@ src_prepare() {
 	fi
 }
 
-src_configure() { :;} # expected no-op
+src_configure() { :; } # expected no-op
 
 src_compile() {
 	unset HAVE_ICONV HAVE_LIBIDN
@@ -54,7 +59,7 @@ src_install() {
 	dodoc README debian/changelog
 
 	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
-		mv "${ED}"/usr/bin/{whois,mdwhois} || die
+		mv "${ED%/}"/usr/share/man/man1/{whois,mdwhois}.1 || die
+		mv "${ED%/}"/usr/bin/{whois,mdwhois} || die
 	fi
 }