Merge updates from master

26 files changed, 40 insertions, 44 deletions

diff --git a/app-crypt/bcwipe/bcwipe-1.9.13.ebuild b/app-crypt/bcwipe/bcwipe-1.9.13.ebuild
index d7122d6edc81..21e09193785c 100644
--- a/app-crypt/bcwipe/bcwipe-1.9.13.ebuild
+++ b/app-crypt/bcwipe/bcwipe-1.9.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils versionator
+inherit versionator
 
 MY_PV="$(replace_version_separator 2 -)"
 
diff --git a/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild b/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild
index 78c2eecdd1f2..4ab00f225f3f 100644
--- a/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild
+++ b/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils linux-mod toolchain-funcs versionator
+inherit linux-mod toolchain-funcs versionator
 
 MY_PN="BestCrypt"
 DESCRIPTION="commercially licensed transparent filesystem encryption"
diff --git a/app-crypt/cardpeek/cardpeek-0.7.2.ebuild b/app-crypt/cardpeek/cardpeek-0.7.2.ebuild
index 4e243216f32c..9bae2cd41839 100644
--- a/app-crypt/cardpeek/cardpeek-0.7.2.ebuild
+++ b/app-crypt/cardpeek/cardpeek-0.7.2.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=6
 
-inherit eutils
-
 DESCRIPTION="Tool to read the contents of smartcards"
 HOMEPAGE="http://pannetrat.com/Cardpeek"
 SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
diff --git a/app-crypt/ccid/ccid-1.4.26.ebuild b/app-crypt/ccid/ccid-1.4.26.ebuild
index 6f60824d4ea9..f5d0eb72da13 100644
--- a/app-crypt/ccid/ccid-1.4.26.ebuild
+++ b/app-crypt/ccid/ccid-1.4.26.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 STUPID_NUM="4205"
 
-inherit eutils toolchain-funcs udev
+inherit toolchain-funcs udev
 
 DESCRIPTION="CCID free software driver"
 HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
diff --git a/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild b/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild
index f756b57ac811..79c08285e155 100644
--- a/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild
+++ b/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
-
 PATCHVER="003"
 
 DESCRIPTION="Linux Driver support for the CoolKey and CAC products"
diff --git a/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild b/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild
index 9ec1ce881eb3..fac6cb846293 100644
--- a/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild
+++ b/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=6
 
-inherit eutils
-
 DESCRIPTION="An advanced suite for testing the randomness of RNG's"
 HOMEPAGE="http://www.phy.duke.edu/~rgb/General/dieharder.php"
 SRC_URI="http://www.phy.duke.edu/~rgb/General/${PN}/${P}.tgz"
diff --git a/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild b/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild
index 7b762cce132a..3c528ef3e7a2 100644
--- a/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild
+++ b/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="GPGstats calculates statistics on the keys in your key-ring"
 HOMEPAGE="http://www.vanheusden.com/gpgstats/"
diff --git a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild
index eea8ff610b1e..abeaf0b775d7 100644
--- a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild
+++ b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils autotools toolchain-funcs libtool flag-o-matic
+inherit autotools toolchain-funcs libtool flag-o-matic
 
 MY_PV="${PV/_/-}"
 MY_P="util-linux-${MY_PV}"
@@ -25,9 +25,12 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/os-headers"
 
+PATCHES=(
+	"${WORKDIR}/${LOOPAES_P}/util-linux-${PV}.diff"
+)
+
 src_prepare() {
 	default
-	epatch "${WORKDIR}/${LOOPAES_P}/util-linux-${PV}.diff"
 	eautoreconf
 }
 
diff --git a/app-crypt/md6sum/md6sum-1.0-r2.ebuild b/app-crypt/md6sum/md6sum-1.0-r2.ebuild
index afa973669fc3..0447b87fa2ed 100644
--- a/app-crypt/md6sum/md6sum-1.0-r2.ebuild
+++ b/app-crypt/md6sum/md6sum-1.0-r2.ebuild
@@ -3,8 +3,6 @@
 
 EAPI="6"
 
-inherit eutils
-
 DESCRIPTION="A C implementation of MD6"
 HOMEPAGE="http://groups.csail.mit.edu/cis/md6"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
diff --git a/app-crypt/mdcrack/mdcrack-1.2.ebuild b/app-crypt/mdcrack/mdcrack-1.2.ebuild
index 643d6f943b4e..c9591b931761 100644
--- a/app-crypt/mdcrack/mdcrack-1.2.ebuild
+++ b/app-crypt/mdcrack/mdcrack-1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A MD4/MD5/NTML hashes bruteforcer"
 HOMEPAGE="http://mdcrack.df.ru/"
diff --git a/app-crypt/pdfcrack/pdfcrack-0.15.ebuild b/app-crypt/pdfcrack/pdfcrack-0.15.ebuild
index 42626fefe7a9..206b6b4510de 100644
--- a/app-crypt/pdfcrack/pdfcrack-0.15.ebuild
+++ b/app-crypt/pdfcrack/pdfcrack-0.15.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=6
+
+inherit toolchain-funcs
 
 DESCRIPTION="Tool for recovering passwords and content from PDF-files"
 HOMEPAGE="http://pdfcrack.sourceforge.net/"
@@ -13,9 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.14-cflags.patch
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-0.14-cflags.patch"
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)"
diff --git a/app-crypt/pinentry/pinentry-1.0.0.ebuild b/app-crypt/pinentry/pinentry-1.0.0.ebuild
index bc3bb2a3be80..df050ed83ef6 100644
--- a/app-crypt/pinentry/pinentry-1.0.0.ebuild
+++ b/app-crypt/pinentry/pinentry-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs
+inherit autotools qmake-utils multilib flag-o-matic toolchain-funcs
 
 DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
 HOMEPAGE="http://gnupg.org/aegypten2/index.html"
diff --git a/app-crypt/rainbowcrack/rainbowcrack-1.6.1.ebuild b/app-crypt/rainbowcrack/rainbowcrack-1.6.1.ebuild
index 8604b582f376..214401f6c347 100644
--- a/app-crypt/rainbowcrack/rainbowcrack-1.6.1.ebuild
+++ b/app-crypt/rainbowcrack/rainbowcrack-1.6.1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit eutils
 
 DESCRIPTION="Hash cracker that precomputes plaintext - ciphertext pairs in advance"
@@ -28,7 +29,7 @@ DOCS=(
 )
 
 src_unpack() {
-	unpack ${A}
+	default
 	mv ${P}-linux* "${S}"
 }
 
diff --git a/app-crypt/signing-party/signing-party-2.5.ebuild b/app-crypt/signing-party/signing-party-2.5.ebuild
index 1d7600eb18b7..bdac6e0dd8f9 100644
--- a/app-crypt/signing-party/signing-party-2.5.ebuild
+++ b/app-crypt/signing-party/signing-party-2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils toolchain-funcs autotools
+inherit toolchain-funcs autotools
 
 DESCRIPTION="A collection of several tools related to OpenPGP"
 HOMEPAGE="http://pgp-tools.alioth.debian.org/"
@@ -26,6 +26,7 @@ RDEPEND="${DEPEND}
 	net-mail/qprint
 	>=dev-perl/MailTools-1.62
 	dev-perl/Net-IDN-Encode
+	app-crypt/libmd
 	virtual/mailx
 	virtual/mta
 	|| (
diff --git a/app-crypt/xca/xca-1.3.2-r2.ebuild b/app-crypt/xca/xca-1.3.2-r2.ebuild
index 0efebce03082..ebb5d87a95e0 100644
--- a/app-crypt/xca/xca-1.3.2-r2.ebuild
+++ b/app-crypt/xca/xca-1.3.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils flag-o-matic toolchain-funcs autotools
+inherit flag-o-matic toolchain-funcs autotools
 
 DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
 HOMEPAGE="http://xca.sourceforge.net"
@@ -20,7 +20,10 @@ RDEPEND="
 	!libressl? ( dev-libs/openssl:0=[bindist=] )
 	libressl? ( dev-libs/libressl:0= )
 	doc? ( app-text/linuxdoc-tools )
-	qt5? ( dev-qt/qtgui:5 )
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
 	qt4? ( dev-qt/qtgui:4 )"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/botan/botan-1.10.15-r1.ebuild b/dev-libs/botan/botan-1.10.15-r1.ebuild
index 0fe8c0507d5b..0a2efeaedae6 100644
--- a/dev-libs/botan/botan-1.10.15-r1.ebuild
+++ b/dev-libs/botan/botan-1.10.15-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
-inherit eutils multilib python-r1 toolchain-funcs
+inherit multilib python-r1 toolchain-funcs
 
 MY_PN="Botan"
 MY_P="${MY_PN}-${PV}"
diff --git a/dev-libs/botan/botan-2.0.1.ebuild b/dev-libs/botan/botan-2.0.1.ebuild
index f35485dfdb95..91273a01fc99 100644
--- a/dev-libs/botan/botan-2.0.1.ebuild
+++ b/dev-libs/botan/botan-2.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
-inherit eutils multilib python-r1 toolchain-funcs
+inherit multilib python-r1 toolchain-funcs
 
 MY_PN="Botan"
 MY_P="${MY_PN}-${PV}"
diff --git a/dev-libs/cryptlib/cryptlib-3.4.3.1-r2.ebuild b/dev-libs/cryptlib/cryptlib-3.4.3.1-r2.ebuild
index 6910f74d9e12..03102530c16f 100644
--- a/dev-libs/cryptlib/cryptlib-3.4.3.1-r2.ebuild
+++ b/dev-libs/cryptlib/cryptlib-3.4.3.1-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 pypy )
 DISTUTILS_OPTIONAL=1
 
-inherit distutils-r1 eutils flag-o-matic multilib toolchain-funcs versionator
+inherit distutils-r1 flag-o-matic multilib toolchain-funcs versionator
 
 MY_PV="${PV//.}"
 
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
index d5b5c9ea7415..b5bbdb50890b 100644
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="libmcrypt provides uniform interface to access several encryption algorithms"
 HOMEPAGE="http://mcrypt.sourceforge.net/"
diff --git a/dev-libs/nettle/nettle-3.3-r1.ebuild b/dev-libs/nettle/nettle-3.3-r1.ebuild
index 025a1ceca63f..d0c2971ccbec 100644
--- a/dev-libs/nettle/nettle-3.3-r1.ebuild
+++ b/dev-libs/nettle/nettle-3.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools eutils multilib-build multilib-minimal multilib toolchain-funcs
+inherit autotools multilib-build multilib-minimal multilib toolchain-funcs
 
 DESCRIPTION="Low-level cryptographic library"
 HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
diff --git a/dev-libs/nettle/nettle-3.3.ebuild b/dev-libs/nettle/nettle-3.3.ebuild
index dd6ac538eee9..44409ba976ad 100644
--- a/dev-libs/nettle/nettle-3.3.ebuild
+++ b/dev-libs/nettle/nettle-3.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools eutils multilib-build multilib-minimal multilib toolchain-funcs
+inherit autotools multilib-build multilib-minimal multilib toolchain-funcs
 
 DESCRIPTION="Low-level cryptographic library"
 HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
diff --git a/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild b/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild
index cf463557340f..d4bd59a028f0 100644
--- a/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild
+++ b/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=6
 
-inherit eutils
-
 DESCRIPTION="Enhanced version of WepAttack a tool for breaking 802.11 WEP keys"
 HOMEPAGE="http://wepdecrypt.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wepdecrypt/${P}.tar.gz"
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.20.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.20.ebuild
index b8f373aa1c1e..935b738b30cf 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.20.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.20.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils python-single-r1 systemd udev user multilib-minimal
+inherit python-single-r1 systemd udev user multilib-minimal
 
 DESCRIPTION="PC/SC Architecture smartcard middleware library"
 HOMEPAGE="http://pcsclite.alioth.debian.org/"
diff --git a/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild b/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild
index 8bf3d01ad97e..2ef864e624f7 100644
--- a/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild
+++ b/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_P="slb_rf72"
 S=${WORKDIR}/${MY_P}
diff --git a/sys-fs/loop-aes/loop-aes-3.7j.ebuild b/sys-fs/loop-aes/loop-aes-3.7j.ebuild
index 72eb14430aef..b548d0430472 100644
--- a/sys-fs/loop-aes/loop-aes-3.7j.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.7j.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils linux-mod
+inherit linux-mod
 
 MY_P="${PN/aes/AES}-v${PV}"
 
diff --git a/sys-power/hibernate-script/hibernate-script-2.0-r6.ebuild b/sys-power/hibernate-script/hibernate-script-2.0-r6.ebuild
index 673655309af5..fb36cefcf9ad 100644
--- a/sys-power/hibernate-script/hibernate-script-2.0-r6.ebuild
+++ b/sys-power/hibernate-script/hibernate-script-2.0-r6.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=6
 
-inherit eutils
-
 PATCH_VERSION="5"
 
 DESCRIPTION="Hibernate script supporting multiple suspend methods"
@@ -27,10 +25,9 @@ DOCS=(
 	SCRIPTLET-API
 )
 
-src_prepare() {
-	default
-	epatch "${WORKDIR}/${PV}/"*.patch
-}
+PATCHES=(
+	"${WORKDIR}/${PV}"
+)
 
 src_install() {
 	BASE_DIR="${D}" \