Sync with portage [Fri Sep 28 16:47:16 MSK 2018].

app-accessibility/brltty/brltty-5.2-r1.ebuild

@@ -169,7 +169,7 @@ src_install() {
 
 	libdir="$(get_libdir)"
 	mkdir -p "${D}"/usr/${libdir}/
-	mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/ || die
+	mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/
 	gen_usr_ldscript libbrlapi.so
 
 	cd Documents || die

app-admin/ansible/Manifest

@@ -1,3 +1,4 @@
+DIST ansible-2.5.10.tar.gz 10167484 BLAKE2B 0c60758d54fabef8037ce7e79d86c1508786a3e8cfe2cb1cc9d09cc24ece107414793f4dd12013dbc4c9a1354669288e0989374a20b7ebc035115dfd907c7279 SHA512 911f1f616206136708ceb4f9955e8bf309d7b506fcca9e0f31d770ead0a47c803d670909b6fe10b0d26056d3fd5c140e144132284ad5dbb618d3b013abc9385f
 DIST ansible-2.5.6.tar.gz 10157989 BLAKE2B 07341ab7a087e3139442d5420b461ca332f3a9e550874a746f43904763660ef12c9a2041bb991eeb315abdc7f6e31e3615d9283f407003eddddf2b661331c59a SHA512 169badaa6a94d1ea2d16cb97c7e5eb0b8c225a455edfa95f3ad9e4ec968d5b9525dec4732b60e5ba5f92412f87d8aacc0b2299f2595f3bb820ad8604be8e76d6
 DIST ansible-2.5.8.tar.gz 10169397 BLAKE2B 7cb0abb168af25a3cd7b94880309cf19f018a68277472afb24811bb4ccc329c129f754d2b97626f71052712690e372856bfb62345cdae74165eca38066e86779 SHA512 8de8ddf1925ef1465654f4bc1d54fd9f5f9d700ef2c5a4982684f3a4560ac933b05ff0661c34e61235006abc64fd6acf299d0c45f7b5796c3a89dda5382099ed
 DIST ansible-2.5.9.tar.gz 10165368 BLAKE2B 10d30d3200702958e15695d8fb0aa84ee89b65f966b2879f3d9e89c1bae9d38bffa5936f88dbd7e3b0329f07e523677898230fff424d0d61f03cbe2dab8f3020 SHA512 0962d2f30030889b07e72346452f21cdc99305920bb8e246fc19d37ca4c837dbfba3230634db398b74959a6a67f4ed9dd097eb7783a2854f0969aeeab7e00341

app-admin/ansible/ansible-2.5.10.ebuild

@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}

app-admin/calamares/Manifest

@@ -1,2 +1,3 @@
 DIST calamares-3.1.13.tar.gz 2279516 BLAKE2B ff2c81e81086d53c205c25dbdb7e8b1b60f5f10c979e9afd85c02426cd38037c6fbbf76e21fa5fb152ea9bf1c47658563ba5b2fb7e84b4e2734d6269584315df SHA512 451e04fe41448976e612b2a682cf38ed2683b490bb195ba82ad97d47dfd3eb808f8c25251be00104e3f3b4086ab37be462034bbd2866e64536e90f7ebcfb0d7a
 DIST calamares-3.2.0.tar.gz 2488863 BLAKE2B 6941cdd7eb381a6ee4f7bc2628605ee5a670de0d839b5797cec930737ec5fc09e214c484c2e8398ab2f12669bbc64768d5ee20b2aa1adae799fb96373a0b07df SHA512 0b502749ace48ce56f2bb364d265c5b9197cca2b27115663f928cb58d02ba43e93b80b5022053bca5899ce6ee35146992157408fc5af017da6d61abdcdbc4e1d
+DIST calamares-3.2.2.tar.gz 2579462 BLAKE2B f477493451e084a287f43abfdd66d4a77ce839cad61f921801462bef73df74d42e616d63682d09d59309d6f98ffe560e6c8f9176c9fb290701dfb4e5aa263b29 SHA512 f060534941e0191defa65f024ec8dbbd275d16d40e491015997f12d3eb404a3117d1f113d4dcef3421ed0d15c1e24bdd8b31fc4554d313ebbd3959058c202e63

app-admin/calamares/calamares-3.2.0.ebuild → app-admin/calamares/calamares-3.2.0-r1.ebuild

@@ -53,6 +53,7 @@ RDEPEND="${DEPEND}
 	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
 	sys-boot/os-prober
 	sys-fs/squashfs-tools
+	sys-libs/timezone-data
 	virtual/udev
 	networkmanager? ( net-misc/networkmanager )
 	upower? ( sys-power/upower )

app-admin/calamares/calamares-3.2.2.ebuild

@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_5,3_6} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io"
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_qt_dep linguist-tools)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-cpp/yaml-cpp:=
+	>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+	dev-libs/libpwquality[${PYTHON_USEDEP}]
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-auth/polkit-qt[qt5(+)]
+	>=sys-libs/kpmcore-3.0.3:5=
+	pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+	app-admin/sudo
+	dev-libs/libatasmart
+	net-misc/rsync
+	>=sys-block/parted-3.0
+	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
+	sys-boot/os-prober
+	sys-fs/squashfs-tools
+	sys-libs/timezone-data
+	virtual/udev
+	networkmanager? ( net-misc/networkmanager )
+	upower? ( sys-power/upower )
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	python_setup
+	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+	       PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+	       PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+	       PYTHON_LIBS="$(python_get_LIBS)"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWEBVIEW_FORCE_WEBKIT=OFF
+		-DWITH_PYTHONQT=$(usex pythonqt)
+	)
+
+	kde5_src_configure
+	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
+	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
+}
+
+src_install() {
+	kde5_src_install
+	dobin "${FILESDIR}"/calamares-pkexec
+}

app-admin/mongo-tools/Manifest

@@ -12,6 +12,7 @@ DIST mongo-tools-3.6.4.tar.gz 4693872 BLAKE2B 5d72b32fa8ad7bc106c6ea3c09a27a093b
 DIST mongo-tools-3.6.5.tar.gz 4720814 BLAKE2B 5dd064f70557ec1ab979d08523f3dd305fb310c533b69bc99be3ad3d006036354f62b9f3d61c242e1481a254bed538a5e1cf5662f0e35705f1c50a76f31fddbb SHA512 dd2d7cc64043b42a70b5de0ea493f94722a4476248bfd77d6892861e4be6ab20175992367965dfd687bf8b7ebece6113b7f7a3e59256497e3ecd7e2678875965
 DIST mongo-tools-3.6.6.tar.gz 4723751 BLAKE2B 876d46c47190398d1218a760bdeb8167c9224ef000a96b5f6080d6dcd44fe8187fdfbc38b1a61dbf437132e16e053212cf122daec3915647448d114983e51fc3 SHA512 b8cc02626accb90d8dacf50ea851619885a01503e28b17ed6a12cc9ccec2680a8cd12a566b32187d472f74c9625bf013afcdebed1a42d78ff613c49d3fc838b2
 DIST mongo-tools-3.6.7.tar.gz 4723244 BLAKE2B 82a61b8e72122a9a2b80aceeaa6767fcb13740c324c83c53b18297d9138807950dc656506ffd8a694d2f697c934342541c0ca6f62539bb07be266093e82a17a6 SHA512 5367259f27cf21234db2f69693fc2e21051b42b1acc7eaf8f9b366ed264943cff179c8565239fe36bb1d5d21f5e08ec58ff0df5d4c60526d321d63389f37fac2
+DIST mongo-tools-3.6.8.tar.gz 4723878 BLAKE2B a1693024d60f69d25c268eaaa30a478b1e4c0042c5fb7a3fd6252ed00aef2fee3fba94516fe825165a1a57887ed38e4fbce488c48ddd4f45349f0b7a1b244020 SHA512 359e8ce2d847d005d48ff12bc2e8af73213d81cd1521d2b5b5ac94792468218248bebbe808e1bd8fd49234eab8480608f294c1b63f317aed58f456b84ef17dcf
 DIST mongo-tools-4.0.0.tar.gz 10872217 BLAKE2B 84e92178c0e4827926de525a70d6124635d59e270a3d37e23ec8653cc64d99bb7489fa6266917437ca45aa3ca5e00bc59b81e65c5b72e717db2701c6f7327bec SHA512 d67c4aca9b41266109adc39bb1a642206738fda393e1f9f05570c02a00a02e29ec71c71e67ad232c72d66543ae7e7bfe07fbcf26958d48ed0e631da452c1904d
 DIST mongo-tools-4.0.1.tar.gz 10872813 BLAKE2B 21b36c550ee7147b013414d24042ca720d3fdb961759d8857b0ffb3ba1aa3f7f3bcb363c97287d1c7084dae246f9d7f49d2d0d5c8a11bc939fa9d3113b4c2b6e SHA512 69355ca7c8d97a9a8b257aa1cde672b3b4af7ceb5b37e2cf601746e102ca6ac290ec35c20728fdb6736dd28feb8e6b6e1b948e88fd2fb4c9b53c8a3cd3688d67
 DIST mongo-tools-4.0.2.tar.gz 10872395 BLAKE2B 6d02a51677509abb5a00f7f4f324a2c979d7e55ebd55754023c80e51e9e8121bea84692574739f83882c0426074c0a3a5c5df2cb8cba58ee80c06e5a75504a8d SHA512 45971d96c512a920c40052f0d11097e88db137e975125de375a63e8f0eefbe22ae5252d239455c60e12ef65e0abce7a658dfb9dda0cbcc153718bb6711cf5e43

app-admin/mongo-tools/mongo-tools-3.6.8.ebuild

@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# 1) ensure we use bash wrt #582906
+	# 2) do not substitute version because it uses git
+	sed -e 's@/bin/sh@/bin/bash@g' \
+		-e '/^sed/,+3d' \
+		-e '/^stty/d' \
+		-e '/^mv/d' \
+		-i build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	./build.sh "${myconf[@]}" || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}

app-admin/ranpwd/ranpwd-1.2.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Generate random passwords using the in-kernel cryptographically"
 HOMEPAGE="https://www.kernel.org/pub/software/utils/admin/ranpwd/"
@@ -10,10 +10,6 @@ SRC_URI="mirror://kernel/software/utils/admin/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
 
 src_test() {
 	einfo "generating random passwords"

app-arch/createrepo/createrepo-0.10.4.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='xml'

app-arch/deltarpm/deltarpm-3.6.ebuild

@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 

app-benchmarks/stress-ng/Manifest

@@ -1 +1 @@
-DIST stress-ng-0.09.40.tar.xz 358268 BLAKE2B 4c52af04ea4579c53ac2e44a32322f2b4a962e78a44fea088ae1046e6e4d9e77c3b8110864d02088c99379d12f0f4edab29bc8be5102c6a8dd0f27ff4ed20c31 SHA512 f60057596e80488d3160e984c547471fb7874e76bb13d5d57407336d2770ed480902c05b013c7e27e682ca84954daa7fd9a4bbe2b45b3307ba3361ec747a21d6
+DIST stress-ng-0.09.41.tar.xz 359760 BLAKE2B d57d9350744db29d3e61201f146cd6569efae599743cf3e5971d645beba5de99b4162ec735e0f143c1c3cd8cc9e318441bfd97dfcf5db1b26cd7e4543bfcc918 SHA512 d1e2a6442c208d5d32ab688460475a59a2edd73220e44402632650eee022faf5728d282a374f22bcb86ce83662122823a7ba72f9824058d86d9b22a3c1791524

app-benchmarks/stress-ng/stress-ng-0.09.40.ebuild → app-benchmarks/stress-ng/stress-ng-0.09.41.ebuild

@@ -25,4 +25,4 @@ RDEPEND="${DEPEND}"
 
 DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
 
-PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.09.40-makefile.patch" )

app-crypt/acr38u/acr38u-1.7.11-r3.ebuild

@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools ltprune versionator toolchain-funcs udev
+inherit autotools toolchain-funcs udev
 
-MY_P=ACR38_LINUX_$(get_version_component_range 1)00$(get_version_component_range 2)$(get_version_component_range 3)_P
+MY_P=ACR38_LINUX_$(ver_cut 1)00$(ver_cut 2)$(ver_cut 3)_P
 
 SLOT="0"
 LICENSE="LGPL-2.1"
@@ -25,12 +25,10 @@ HOMEPAGE="https://www.acs.com.hk"
 # libusb-compat is marked stable and primary in the virtual. -ssuominen
 RDEPEND=">=sys-apps/pcsc-lite-1.6.4
 	virtual/libusb:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-S=${WORKDIR}/${MY_P}
-
-IUSE=""
+S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-build.patch
@@ -43,8 +41,8 @@ src_prepare() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+	find "${D}" -name '*.la' -delete || die
 
 	# note: for eudev support this pkg may always need to install rules to /usr
-	udev_newrules "${FILESDIR}"/${PV}-bis.rules 92-pcscd-acr38u.rules
+	udev_newrules "${FILESDIR}/${PV}-bis.rules" 92-pcscd-acr38u.rules
 }

app-crypt/aescrypt/aescrypt-3.0.6b.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs flag-o-matic
 
@@ -14,9 +14,6 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="static"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
 PATCHES=(
 	"${FILESDIR}/${P}-build.patch"
 	"${FILESDIR}/${P}-iconv.patch"

app-crypt/aespipe/aespipe-2.4e.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic
 

app-crypt/asedriveiiie-serial/asedriveiiie-serial-3.5.ebuild

@@ -1,18 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="ASEDriveIIIe Serial Card Reader"
 HOMEPAGE="http://www.athena-scs.com"
 SRC_URI="http://www.athena-scs.com/downloads/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
 KEYWORDS="~amd64 ~x86"
 RDEPEND=">=sys-apps/pcsc-lite-1.3.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_install() {
 	default

app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="ASEDriveIIIe USB Card Reader"
 HOMEPAGE="http://www.athena-scs.com"
@@ -12,8 +12,8 @@ IUSE=""
 KEYWORDS="~amd64 ~x86"
 RDEPEND=">=sys-apps/pcsc-lite-1.3.0
 	virtual/libusb:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 pkg_postinst() {
 	elog "NOTICE:"

app-crypt/asekey/asekey-3.7.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit udev
 
@@ -11,14 +11,12 @@ SRC_URI="${HOMEPAGE}/docs/reader-drivers/${PN}-${PV/./-}-tar.bz2 -> ${P}.tar.bz2
 LICENSE="BSD LGPL-2.1"
 
 SLOT="0"
-IUSE=""
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="sys-apps/pcsc-lite[udev]"
-RDEPEND="${RDEPEND}
+RDEPEND="sys-apps/pcsc-lite[udev]
 	virtual/libusb:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}-bundle.patch"

app-crypt/bcwipe/bcwipe-1.9.13.ebuild

@@ -1,11 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit versionator
-
-MY_PV="$(replace_version_separator 2 -)"
+MY_PV="$(ver_rs 2- -)"
 
 DESCRIPTION="Secure file removal utility"
 HOMEPAGE="http://www.jetico.com/"
@@ -17,9 +15,6 @@ SLOT="0"
 IUSE="doc"
 KEYWORDS="amd64 ~arm ppc x86"
 
-DEPEND=""
-RDEPEND=""
-
 PATCHES=(
 	"${FILESDIR}/${PN}-1.9.7-fix_warnings.patch"
 	"${FILESDIR}/${PN}-1.9.8-fix-flags.patch"

app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild

@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit linux-mod toolchain-funcs versionator
+inherit linux-mod toolchain-funcs
 
 MY_PN="BestCrypt"
 DESCRIPTION="commercially licensed transparent filesystem encryption"
@@ -12,12 +12,10 @@ SRC_URI="http://www.jetico.com/linux/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="bestcrypt"
 SLOT="0"
-IUSE=""
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="virtual/linux-sources
 	app-shells/bash"
-RDEPEND=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 

app-crypt/bsign/bsign-0.4.5-r1.ebuild

@@ -1,11 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools flag-o-matic
 
 DESCRIPTION="embed secure hashes (SHA1) and digital signatures (GNU Privacy Guard) into files"
-HOMEPAGE="http://packages.debian.org/sid/bsign"
+HOMEPAGE="https://packages.debian.org/jessie/bsign"
 SRC_URI="mirror://debian/pool/main/b/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"

app-crypt/cardpeek/cardpeek-0.7.2.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Tool to read the contents of smartcards"
 HOMEPAGE="http://pannetrat.com/Cardpeek"
@@ -17,6 +17,5 @@ RDEPEND=">=x11-libs/gtk+-2.12:2
 	dev-lang/lua:0
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"

app-crypt/cardpeek/cardpeek-0.8.4.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Tool to read the contents of smartcards"
 HOMEPAGE="http://pannetrat.com/Cardpeek"
@@ -18,6 +18,5 @@ RDEPEND="sys-apps/pcsc-lite
 	net-misc/curl
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"

app-crypt/ccid/ccid-1.4.29.ebuild

@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs udev
 
@@ -16,8 +16,8 @@ IUSE="twinserial kobil-midentity +usb"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3
 	usb? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}
-	kernel_linux? ( virtual/pkgconfig )"
+DEPEND="${RDEPEND}"
+BDEPEND="kernel_linux? ( virtual/pkgconfig )"
 
 DOCS=( README AUTHORS )
 

app-crypt/ccrypt/ccrypt-1.10.ebuild

@@ -1,12 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 DESCRIPTION="Encryption and decryption"
-HOMEPAGE="http://ccrypt.sourceforge.net"
+HOMEPAGE="https://ccrypt.sourceforge.net"
 SRC_URI="http://ccrypt.sourceforge.net/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""

app-crypt/chntpw/chntpw-140201.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -21,7 +21,10 @@ DEPEND="${RDEPEND}
 	static? ( dev-libs/openssl:0[static-libs] )"
 
 DOCS=(
-	HISTORY.txt README.txt regedit.txt WinReg.txt
+	HISTORY.txt
+	README.txt
+	WinReg.txt
+	regedit.txt
 )
 
 src_prepare() {

app-crypt/coolkey/coolkey-1.1.0-r7.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PATCHVER="003"
 
@@ -18,10 +18,9 @@ IUSE="debug"
 RDEPEND=">=sys-apps/pcsc-lite-1.6.4
 	dev-libs/nss[utils]
 	sys-libs/zlib"
-
 DEPEND="${RDEPEND}
-	>=app-crypt/ccid-1.4.0
-	virtual/pkgconfig"
+	>=app-crypt/ccid-1.4.0"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${WORKDIR}/${PN}-patches"

app-crypt/dieharder/dieharder-3.31.1-r1.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="An advanced suite for testing the randomness of RNG's"
 HOMEPAGE="http://www.phy.duke.edu/~rgb/General/dieharder.php"

app-crypt/fcrackzip/fcrackzip-1.0.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="a zip password cracker"
 HOMEPAGE="http://oldhome.schmorp.de/marc/fcrackzip.html"
@@ -10,10 +10,8 @@ SRC_URI="http://oldhome.schmorp.de/marc/data/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="app-arch/unzip"
-DEPEND=""
 
 src_prepare() {
 	default

app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.1.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit user
 
@@ -21,8 +21,8 @@ RDEPEND="
 	>=dev-libs/libgcrypt-1.2.2:=
 	>=dev-libs/libgpg-error-1.3:=
 	>=dev-libs/pkcs11-helper-1.02:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 pkg_setup() {
 	if use proxy; then

app-crypt/gpa/gpa-0.9.10.ebuild

@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG"
 HOMEPAGE="http://gpa.wald.intevation.org"
@@ -19,8 +19,8 @@ RDEPEND="
 	>=dev-libs/libgpg-error-1.4
 	>=x11-libs/gtk+-2.10.0:2
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
 src_prepare() {

app-crypt/gpgme/gpgme-1.11.1.ebuild

@@ -1,12 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 DISTUTILS_OPTIONAL=1
 
-inherit distutils-r1 flag-o-matic libtool ltprune qmake-utils toolchain-funcs
+inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
 
 DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
 HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
@@ -24,7 +24,6 @@ COMMON_DEPEND=">=app-crypt/gnupg-2
 	qt5? ( dev-qt/qtcore:5 )"
 	#doc? ( app-doc/doxygen[dot] )
 DEPEND="${COMMON_DEPEND}
-	python? ( dev-lang/swig )
 	qt5? ( dev-qt/qttest:5 )"
 RDEPEND="${COMMON_DEPEND}
 	cxx? (
@@ -33,6 +32,7 @@ RDEPEND="${COMMON_DEPEND}
 		!<kde-apps/kdepimlibs-4.14.10_p20160611:4
 		!=kde-apps/kdepimlibs-4.14.11_pre20160211*:4
 	)"
+BDEPEND="python? ( dev-lang/swig )"
 
 REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -108,7 +108,7 @@ src_test() {
 src_install() {
 	default
 	do_python
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 
 	# backward compatibility for gentoo
 	# in the past we had slots

app-crypt/gpgstats/gpgstats-0.5-r1.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -11,7 +11,6 @@ SRC_URI="http://www.vanheusden.com/gpgstats/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RDEPEND="app-crypt/gpgme"
 DEPEND="${RDEPEND}"
 

app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild

@@ -1,7 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit multilib-minimal
 
 DESCRIPTION="Tools for computing and checking HMAC values for files"

app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit cuda eutils flag-o-matic toolchain-funcs pax-utils multilib
 
@@ -27,7 +27,7 @@ REQUIRED_USE="openmp? ( !minimal )
 	opencl? ( !minimal )
 	mozilla? ( !minimal )"
 
-DEPEND="sys-libs/zlib
+RDEPEND="sys-libs/zlib
 	!minimal? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
@@ -37,7 +37,7 @@ DEPEND="sys-libs/zlib
 		dev-util/nvidia-cuda-toolkit:= )
 	opencl? ( virtual/opencl )
 	mozilla? ( dev-libs/nss dev-libs/nspr )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 

app-crypt/libu2f-host/libu2f-host-1.1.3.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit linux-info udev user
 
@@ -14,13 +14,11 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="kernel_linux static-libs systemd"
 
-RDEPEND="
-	dev-libs/hidapi
+DEPEND="dev-libs/hidapi
 	dev-libs/json-c:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
+RDEPEND="${DEPEND}
 	systemd? ( sys-apps/systemd[acl] )"
+BDEPEND="virtual/pkgconfig"
 
 CONFIG_CHECK="~HIDRAW"
 

app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit udev
 
@@ -14,12 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="kernel_linux"
 
-RDEPEND="sys-apps/pcsc-lite
+DEPEND="sys-apps/pcsc-lite
 	dev-libs/libzip"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
+RDEPEND="${DEPEND}
 	>=app-crypt/ccid-1.4.18[usb]"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	econf \

app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit autotools toolchain-funcs libtool flag-o-matic
+inherit autotools toolchain-funcs flag-o-matic
 
 MY_PV="${PV/_/-}"
 MY_P="util-linux-${MY_PV}"

app-crypt/mcrypt/mcrypt-2.6.8-r3.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 DESCRIPTION="replacement of the old unix crypt(1)"
 HOMEPAGE="http://mcrypt.sourceforge.net/"
@@ -12,10 +12,10 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86 ~x86-macos"
 IUSE="nls"
 
-DEPEND=">=dev-libs/libmcrypt-2.5.8
+RDEPEND=">=dev-libs/libmcrypt-2.5.8
 	>=app-crypt/mhash-0.9.9
 	sys-libs/zlib"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.6.7-qa.patch"

app-crypt/md6sum/md6sum-1.0-r2.ebuild

@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 DESCRIPTION="A C implementation of MD6"
 HOMEPAGE="https://groups.csail.mit.edu/cis/md6"
@@ -10,7 +10,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 PATCHES=(
 	"${FILESDIR}/${P}-ldflags.patch"

app-crypt/mhash/mhash-0.9.9.9-r2.ebuild

@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="library providing a uniform interface to a large number of hash algorithms"
 HOMEPAGE="http://mhash.sourceforge.net/"
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND=""
-DEPEND="dev-lang/perl" # pod2html
+BDEPEND="dev-lang/perl" # pod2html
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.9.9-fix-mem-leak.patch"

app-crypt/nasty/nasty-0.6-r1.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -11,7 +11,6 @@ SRC_URI="http://www.vanheusden.com/nasty/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RDEPEND="app-crypt/gpgme"
 DEPEND="${RDEPEND}"
 

app-crypt/nwipe/nwipe-0.21.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -16,8 +16,8 @@ IUSE=""
 
 RDEPEND=">=sys-block/parted-2.3
 	>=sys-libs/ncurses-5.7-r7:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default

app-crypt/onak/onak-0.5.0.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 

app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.2.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools ltprune
+inherit autotools
 
 MY_P="${P/-tpm-/_tpm_}"
 
@@ -38,5 +38,5 @@ src_prepare() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+	find "${D}" -name '*.la' -delete || die
 }

app-crypt/p11-kit/p11-kit-0.23.12.ebuild

@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit ltprune multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
 HOMEPAGE="https://p11-glue.freedesktop.org/p11-kit.html https://github.com/p11-glue/p11-kit"
@@ -18,8 +18,8 @@ REQUIRED_USE="trust? ( asn1 )"
 RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4[${MULTILIB_USEDEP}] )
 	libffi? ( >=dev-libs/libffi-3.0.0[${MULTILIB_USEDEP}] )
 	trust? ( app-misc/ca-certificates )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 pkg_setup() {
 	# disable unsafe tests, bug#502088
@@ -56,5 +56,5 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	prune_libtool_files --modules
+	find "${D}" -name '*.la' -delete || die
 }

app-crypt/pdfcrack/pdfcrack-0.16.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.14-cflags.patch"

app-crypt/pinentry/pinentry-1.1.0-r2.ebuild

@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static"
 
 CDEPEND="

app-crypt/pius/pius-2.2.4.ebuild

@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1

app-crypt/pkcrack/files/pkcrack-1.2.2-build.patch

@@ -0,0 +1,102 @@
+From 7bcbfd712044a5455f03d607a60c557f90d16671 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 23 Sep 2018 15:49:32 +0300
+Subject: [PATCH] build
+
+---
+ src/extract.c  | 2 +-
+ src/findkey.c  | 2 +-
+ src/main.c     | 2 +-
+ src/makekey.c  | 3 ++-
+ src/mktmptbl.c | 1 +
+ src/zdmain.c   | 2 +-
+ 6 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/extract.c b/src/extract.c
+index 6cb7800..58e740d 100644
+--- a/src/extract.c
++++ b/src/extract.c
+@@ -90,7 +90,7 @@ static void usage( char *prg )
+     fprintf( stderr, " -s <size>\textract only specified number of bytes\n" );
+ }
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+ char	*ret, *outname;
+ int	outfile, err=0, i, caseflg=0, size=0;
+diff --git a/src/findkey.c b/src/findkey.c
+index 0de9dd3..ab2094a 100644
+--- a/src/findkey.c
++++ b/src/findkey.c
+@@ -56,7 +56,7 @@ static void usage( char *name )
+     exit( 1 );
+ }
+ 
+-void main( int argc, char **argv )
++int main( int argc, char **argv )
+ {
+ uword	key0, key1, key2;
+ int	pwdLen=0;
+diff --git a/src/main.c b/src/main.c
+index 8e58072..d84b339 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -128,7 +128,7 @@ static void usage( char *myself )
+     fprintf( stderr, " -n\tno progress indicator\n" );
+ }
+ 
+-void main( int argc, char **argv )
++int main( int argc, char **argv )
+ {
+ int		crypt, plain, cryptlength, plainlength;
+ struct stat	filestat;
+diff --git a/src/makekey.c b/src/makekey.c
+index 271fab3..f28029c 100644
+--- a/src/makekey.c
++++ b/src/makekey.c
+@@ -12,6 +12,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ #include "pkcrack.h"
+ #include "keystuff.h"
+ #include "crc.h"
+@@ -24,7 +25,7 @@ static void usage( char *name )
+     exit( 1 );
+ }
+ 
+-void main( int argc, char **argv )
++int main( int argc, char **argv )
+ {
+ char *	pwd;  
+ int	pwdLen, i;
+diff --git a/src/mktmptbl.c b/src/mktmptbl.c
+index 46f1402..848f171 100644
+--- a/src/mktmptbl.c
++++ b/src/mktmptbl.c
+@@ -43,6 +43,7 @@
+ static char RCSID[]="$Id: mktmptbl.c,v 1.9 2002/11/02 15:12:06 lucifer Exp $";
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include "mktmptbl.h"
+ 
+ ushort	tempTable[256][64];
+diff --git a/src/zdmain.c b/src/zdmain.c
+index bfb1f6b..6909b2d 100644
+--- a/src/zdmain.c
++++ b/src/zdmain.c
+@@ -35,7 +35,7 @@ static char RCSID[]="$Id: zdmain.c,v 1.4 2002/12/28 17:01:42 lucifer Exp $";
+ 
+ extern void zipdecrypt( char*infile, char*outfile, int k0, int k1, int k2 );
+ 
+-void main( int argc, char **argv )
++int main( int argc, char **argv )
+ {
+ char *c;
+ 
+-- 
+2.16.4
+

app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild

@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="PkZip cipher breaker"
@@ -13,38 +13,37 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 
-DEPEND="test? ( app-arch/zip[crypt] )"
 RDEPEND="!<app-text/html-xml-utils-5.3"
+BDEPEND="test? ( app-arch/zip[crypt] )"
 
 DOCS=(
-	../doc/KNOWN_BUGS
-	../doc/appnote.iz.txt
-	../doc/README.W32
-	../doc/pkzip.ps.gz
-	../doc/CHANGES
-	../doc/LIESMICH
-	../doc/README.html
-	../doc/README
+	doc/KNOWN_BUGS
+	doc/appnote.iz.txt
+	doc/README.W32
+	doc/pkzip.ps.gz
+	doc/CHANGES
+	doc/LIESMICH
+	doc/README.html
+	doc/README
 )
 
-S="${WORKDIR}/${P}/src"
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
 
-src_prepare() {
-	default
-	sed -i -e "s/^CC=.*/CC=$(tc-getCC)/" \
-		-e "/^CFLAGS=.*/d" \
-		-e "s/CFLAGS/LDFLAGS/" \
-		Makefile
-	sed -i -e "s:void main:int main:" *.c
+src_compile() {
+	cd src
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" all
 }
 
 src_test() {
-	cd "${S}/../test"
-	make CC="$(tc-getCC)" all
+	cd test
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" all
 }
 
 src_install() {
 	einstalldocs
+	cd src
 	dobin pkcrack zipdecrypt findkey makekey
 	newbin extract "$PN-extract"
 }

app-crypt/pkcs11-data/pkcs11-data-0.7.4.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Utilities for PKCS#11 data object manipulation in"
 HOMEPAGE="https://github.com/alonbl/pkcs11-data"
@@ -12,8 +12,6 @@ SLOT="0"
 
 KEYWORDS="~amd64"
 
-IUSE=""
-
 RDEPEND=">=dev-libs/pkcs11-helper-1.02"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"

app-crypt/pkcs11-dump/pkcs11-dump-0.3.4.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Utilities for PKCS#11 token content dump"
 HOMEPAGE="https://github.com/alonbl/pkcs11-dump"
@@ -17,5 +17,5 @@ IUSE="libressl"
 RDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"

app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 MY_P=${P/-/_}
 S=${WORKDIR}/${MY_P}
@@ -12,7 +12,6 @@ SRC_URI="http://linux.netpimpz.com/quickcrypt/download/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
-IUSE=""
 
 DEPEND=">=dev-lang/perl-5.6
 	virtual/perl-Digest-MD5"

app-crypt/rainbowcrack/rainbowcrack-1.6.1.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="amd64? ( http://project-${PN}.com/${P}-linux64.zip )
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 -*"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
 RESTRICT="bindist mirror" #444426

app-crypt/scrypt/scrypt-1.2.0.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

app-crypt/scute/scute-1.5.0.ebuild

@@ -1,9 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit ltprune
+EAPI=7
 
 DESCRIPTION="A PKCS #11 module for OpenPGP smartcards"
 HOMEPAGE="http://www.scute.org/"
@@ -12,18 +10,17 @@ SRC_URI="mirror://gnupg/scute/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 # configure script try to check the version of gpgsm and gpg-agent when
 # non-crosscompiling so we need to have them as build-time dependency as
 # well as runtime.  Require a version of gnupg that is patched to have
 # gpgsm-gencert.sh working (as that's what the documentation describe).
-DEPEND="
-	>=dev-libs/libgpg-error-1.4
-	>=dev-libs/libassuan-2.0.0
-	>=app-crypt/pinentry-0.7.0
+BDEPEND=">=app-crypt/pinentry-0.7.0
 	>=app-crypt/gnupg-2.0.17-r1[smartcard]"
-RDEPEND="${DEPEND}"
+DEPEND=">=dev-libs/libgpg-error-1.4
+	>=dev-libs/libassuan-2.0.0"
+RDEPEND="${DEPEND}
+	${BDEPEND}"
 
 src_configure() {
 	econf \
@@ -33,5 +30,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+	find "${D}" -name '*.la' -delete || die
 }

app-crypt/signing-party/signing-party-2.7.ebuild

@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit toolchain-funcs autotools