Merge updates from master

38 files changed, 122 insertions, 115 deletions

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 2fd3a6ce7062..66d512a22fe1 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1,3 @@
 DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65
 DIST qt-creator-opensource-src-4.2.0.tar.xz 16624096 SHA256 203e2bc6618590b5e5a7e17f1a05e65b255d742f0b8f0ba3246fb541dfdfbe80 SHA512 1801611d8db10041332d728a2af6b0c57b28b3ab9847a8875edb788d3b0fe6570103a408a7f52c989e40949743263d444e5db49d290860f2e7231f463fa86f7a WHIRLPOOL 841fb63bb6d25a640fb8db24412b05b93e9240db8c68de9555cc4baef50d6e08d13594f4e7cc675fda90359d8a4a4fbb8110f9cfd73315e1775a636f5f28a54d
-DIST qt-creator-opensource-src-4.3.0-beta1.tar.xz 16339884 SHA256 9f5e28747281a2e75e5f875d37fad9422ee264357b2e752c450dad5b568229e2 SHA512 84cee2c29cbe664c7ce10a93ce769e80d9264a707f3e390e13ed0708cdccddd6e48524b5c7c5d2520d66590f5b41361eab00025f52747bc64b16686ed953379f WHIRLPOOL 10f24ef14e1b26405eb7329c1a6112098685d7f233f8b083af3a2de11738acf9242a12d5d0f1a2263dc0b005634c026dc96fe74371a2449b9d249c1ebf94442e
+DIST qt-creator-opensource-src-4.3.0.tar.xz 17113068 SHA256 e99eaaf4098d575578424f57936bc5ad678499824523666c32d85c71fc8471d8 SHA512 462d2494d54c5b528ed187a43365a296c08ad2b104ada451a91d381f070472433ef91856f80a4d94091919296c95820e5d546800fc26a43a9709a6329fba02bb WHIRLPOOL ef3b4568bc19aa4c7eb4f1555d6cc24c719ecdde86f73225320b9d9a48a832a34c33dfbd5fb258fb33b733a8906dfc8afd368865aa537e996226fbefaf807782
diff --git a/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.0.ebuild
index 7cfd8374e2d8..74828af05408 100644
--- a/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
 
-inherit eutils l10n llvm qmake-utils toolchain-funcs virtualx xdg
+inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="http://doc.qt.io/qtcreator/"
@@ -56,7 +56,7 @@ CDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	clangcodemodel? ( >=sys-devel/clang-3.9:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.7.0 )
+	qbs? ( >=dev-util/qbs-1.8.0 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "
@@ -75,7 +75,7 @@ RDEPEND="${CDEPEND}
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
 	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
-	cmake? ( dev-util/cmake )
+	cmake? ( dev-util/cmake[server(+)] )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
@@ -88,6 +88,10 @@ for x in ${PLOCALES}; do
 done
 unset x
 
+pkg_setup() {
+	use clangcodemodel && llvm_pkg_setup
+}
+
 src_unpack() {
 	if tc-is-gcc; then
 		if [[ $(gcc-major-version) -lt 4 ]] || \
@@ -133,10 +137,10 @@ src_prepare() {
 	fi
 
 	# disable broken or unreliable tests
-	sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/sdktool/ d' tests/auto/auto.pro || die
+	sed -i -e '/dumpers\.pro/ d' tests/auto/debugger/debugger.pro || die
 	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
-	sed -i -e '/\(^char qmlString\|states\.qml$\)/ i return;' tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp || die
-	sed -i -e 's/\<timeline\(items\|notes\|selection\)renderpass\>//' tests/auto/timeline/timeline.pro || die
+	sed -i -e '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/timeline/timeline.pro || die
 	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
 
 	# fix path to some clang headers
@@ -178,8 +182,4 @@ src_install() {
 		doins share/doc/qtcreator/qtcreator{,-dev}.qch
 		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
 	fi
-
-	# create a desktop file
-	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Development;IDE;Qt;' \
-		'MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource;text/x-qml;text/x-qt.qml;text/x-qt.qbs;'
 }
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 7cfd8374e2d8..74828af05408 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
 
-inherit eutils l10n llvm qmake-utils toolchain-funcs virtualx xdg
+inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="http://doc.qt.io/qtcreator/"
@@ -56,7 +56,7 @@ CDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	clangcodemodel? ( >=sys-devel/clang-3.9:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.7.0 )
+	qbs? ( >=dev-util/qbs-1.8.0 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "
@@ -75,7 +75,7 @@ RDEPEND="${CDEPEND}
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
 	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
-	cmake? ( dev-util/cmake )
+	cmake? ( dev-util/cmake[server(+)] )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
@@ -88,6 +88,10 @@ for x in ${PLOCALES}; do
 done
 unset x
 
+pkg_setup() {
+	use clangcodemodel && llvm_pkg_setup
+}
+
 src_unpack() {
 	if tc-is-gcc; then
 		if [[ $(gcc-major-version) -lt 4 ]] || \
@@ -133,10 +137,10 @@ src_prepare() {
 	fi
 
 	# disable broken or unreliable tests
-	sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/sdktool/ d' tests/auto/auto.pro || die
+	sed -i -e '/dumpers\.pro/ d' tests/auto/debugger/debugger.pro || die
 	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
-	sed -i -e '/\(^char qmlString\|states\.qml$\)/ i return;' tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp || die
-	sed -i -e 's/\<timeline\(items\|notes\|selection\)renderpass\>//' tests/auto/timeline/timeline.pro || die
+	sed -i -e '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/timeline/timeline.pro || die
 	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
 
 	# fix path to some clang headers
@@ -178,8 +182,4 @@ src_install() {
 		doins share/doc/qtcreator/qtcreator{,-dev}.qch
 		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
 	fi
-
-	# create a desktop file
-	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Development;IDE;Qt;' \
-		'MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource;text/x-qml;text/x-qt.qml;text/x-qt.qbs;'
 }
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild
index f23f4af3ddda..c164d9d403c0 100644
--- a/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild
+++ b/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="chm exif gsf pdf python taglib samba test +unique"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	app-text/gnome-doc-utils
@@ -30,7 +31,10 @@ RDEPEND="
 	gsf? ( >=gnome-extra/libgsf-1.12.0 )
 	samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
 	pdf? ( >=app-text/poppler-0.18 )
-	python? ( >=dev-python/gnome-vfs-python-2.0.0 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/gnome-vfs-python-2.0.0
+	)
 	taglib? ( >=media-libs/taglib-1.4 )
 "
 DEPEND="
@@ -42,6 +46,10 @@ DEPEND="
 	test? ( >=dev-util/cppunit-1.13.2 )
 "
 
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_configure() {
 	gnome2_src_configure \
 		--disable-static \
diff --git a/net-irc/weechat/weechat-1.7.1.ebuild b/net-irc/weechat/weechat-1.7.1.ebuild
index 6e8c0992405d..670c755cecc2 100644
--- a/net-irc/weechat/weechat-1.7.1.ebuild
+++ b/net-irc/weechat/weechat-1.7.1.ebuild
@@ -26,6 +26,7 @@ PLUGINS="+alias +charset +exec +fifo +logger +relay +scripts +spell +trigger +xf
 SCRIPT_LANGS="guile lua +perl +python ruby tcl"
 LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
 IUSE="doc nls +ssl test ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	dev-libs/libgcrypt:0=
diff --git a/net-proxy/hatop/hatop-0.7.7.ebuild b/net-proxy/hatop/hatop-0.7.7.ebuild
index 5f8d6f02ca5d..f1114a42e99f 100644
--- a/net-proxy/hatop/hatop-0.7.7.ebuild
+++ b/net-proxy/hatop/hatop-0.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,8 +8,7 @@ PYTHON_REQ_USE="ncurses"
 
 inherit python-r1
 
-DESCRIPTION="interactive ncurses client and real-time monitoring,
-statistics displaying tool for the HAProxy"
+DESCRIPTION="Ncurses client and real-time monitoring and displaying of HAProxy status"
 HOMEPAGE="http://feurix.org/projects/hatop/"
 SRC_URI="https://hatop.googlecode.com/files/${P}.tar.gz"
 
@@ -17,8 +16,9 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND=""
+DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	net-proxy/haproxy"
 
diff --git a/sys-cluster/hpx/hpx-0.9.10.ebuild b/sys-cluster/hpx/hpx-0.9.10.ebuild
index c0535a43f491..3d785033e606 100644
--- a/sys-cluster/hpx/hpx-0.9.10.ebuild
+++ b/sys-cluster/hpx/hpx-0.9.10.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_4} )
 
-inherit cmake-utils fortran-2 multilib python-single-r1 versionator
+inherit cmake-utils fortran-2 multilib python-any-r1 versionator
 
 SRC_URI="http://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz"
 KEYWORDS="~amd64 ~x86"
@@ -29,17 +29,17 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	test? ( dev-lang/python )
+	test? ( ${PYTHON_DEPS} )
 	doc? ( >=dev-libs/boost-1.56.0-r1[tools] )
 "
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="
 	jemalloc? ( !perftools !tbb )
 	perftools? ( !jemalloc !tbb )
 	tbb? ( !jemalloc !perftools )
 	"
 
 pkg_setup() {
-	use test && python-single-r1_pkg_setup
+	use test && python-any-r1_pkg_setup
 }
 
 src_configure() {
diff --git a/sys-cluster/hpx/hpx-0.9.8.ebuild b/sys-cluster/hpx/hpx-0.9.8.ebuild
index 6f73d465e84e..7694c32d0565 100644
--- a/sys-cluster/hpx/hpx-0.9.8.ebuild
+++ b/sys-cluster/hpx/hpx-0.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="http://stellar.cct.lsu.edu/files/${PN}_${PV}.7z"
 KEYWORDS="~amd64 ~x86"
 S="${WORKDIR}/${PN}_${PV}"
 
-inherit cmake-utils fortran-2 multilib python-single-r1
+inherit cmake-utils fortran-2 multilib python-any-r1
 
 DESCRIPTION="C++ runtime system for parallel and distributed applications"
 HOMEPAGE="http://stellar.cct.lsu.edu/tag/hpx/"
@@ -34,9 +34,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/p7zip
 	virtual/pkgconfig
-	test? ( dev-lang/python )
+	test? ( ${PYTHON_DEPS} )
 "
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
 	"${FILESDIR}"/hpx-0.9.8-install-path.patch
@@ -45,7 +44,7 @@ PATCHES=(
 )
 
 pkg_setup() {
-	use test && python-single-r1_pkg_setup
+	use test && python-any-r1_pkg_setup
 }
 
 src_configure() {
diff --git a/sys-cluster/hpx/hpx-0.9.9.ebuild b/sys-cluster/hpx/hpx-0.9.9.ebuild
index d9b7d1a8e4a0..8001280e7023 100644
--- a/sys-cluster/hpx/hpx-0.9.9.ebuild
+++ b/sys-cluster/hpx/hpx-0.9.9.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_4} )
 
-inherit cmake-utils fortran-2 multilib python-single-r1 versionator
+inherit cmake-utils fortran-2 multilib python-any-r1 versionator
 
 MY_PV="$(replace_version_separator _ -)"
 
@@ -31,17 +31,17 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	test? ( dev-lang/python )
+	test? ( ${PYTHON_DEPS} )
 	doc? ( >=dev-libs/boost-1.56.0-r1[tools] )
 "
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="
 	jemalloc? ( !perftools !tbb )
 	perftools? ( !jemalloc !tbb )
 	tbb? ( !jemalloc !perftools )
 	"
 
 pkg_setup() {
-	use test && python-single-r1_pkg_setup
+	use test && python-any-r1_pkg_setup
 }
 
 src_configure() {
diff --git a/sys-cluster/hpx/hpx-0.9.99.ebuild b/sys-cluster/hpx/hpx-0.9.99.ebuild
index b440abe724f0..c7977e7361c5 100644
--- a/sys-cluster/hpx/hpx-0.9.99.ebuild
+++ b/sys-cluster/hpx/hpx-0.9.99.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ else
 	S="${WORKDIR}/${PN}_${PV}"
 fi
 
-inherit cmake-utils fortran-2 multilib python-single-r1
+inherit cmake-utils fortran-2 multilib python-any-r1
 
 DESCRIPTION="C++ runtime system for parallel and distributed applications"
 HOMEPAGE="http://stellar.cct.lsu.edu/tag/hpx/"
@@ -38,14 +38,14 @@ DEPEND="${RDEPEND}
 	test? ( ${PYTHON_DEPS} )
 	doc? ( >=dev-libs/boost-1.56.0-r1:=[tools] )
 "
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="
 	jemalloc? ( !perftools !tbb )
 	perftools? ( !jemalloc !tbb )
 	tbb? ( !jemalloc !perftools )
 	"
 
 pkg_setup() {
-	use test && python-single-r1_pkg_setup
+	use test && python-any-r1_pkg_setup
 }
 
 src_configure() {
diff --git a/sys-cluster/hpx/hpx-1.0.0.ebuild b/sys-cluster/hpx/hpx-1.0.0.ebuild
index f9748b81ba22..93c3d5be3feb 100644
--- a/sys-cluster/hpx/hpx-1.0.0.ebuild
+++ b/sys-cluster/hpx/hpx-1.0.0.ebuild
@@ -15,7 +15,7 @@ else
 	S="${WORKDIR}/${PN}_${PV}"
 fi
 
-inherit cmake-utils fortran-2 multilib python-single-r1
+inherit cmake-utils fortran-2 multilib python-any-r1
 
 DESCRIPTION="C++ runtime system for parallel and distributed applications"
 HOMEPAGE="http://stellar.cct.lsu.edu/tag/hpx/"
@@ -38,14 +38,14 @@ DEPEND="${RDEPEND}
 	test? ( ${PYTHON_DEPS} )
 	doc? ( >=dev-libs/boost-1.56.0-r1:=[tools] )
 "
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="
 	jemalloc? ( !perftools !tbb )
 	perftools? ( !jemalloc !tbb )
 	tbb? ( !jemalloc !perftools )
 	"
 
 pkg_setup() {
-	use test && python-single-r1_pkg_setup
+	use test && python-any-r1_pkg_setup
 }
 
 src_configure() {
diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild
index b440abe724f0..c7977e7361c5 100644
--- a/sys-cluster/hpx/hpx-9999.ebuild
+++ b/sys-cluster/hpx/hpx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ else
 	S="${WORKDIR}/${PN}_${PV}"
 fi
 
-inherit cmake-utils fortran-2 multilib python-single-r1
+inherit cmake-utils fortran-2 multilib python-any-r1
 
 DESCRIPTION="C++ runtime system for parallel and distributed applications"
 HOMEPAGE="http://stellar.cct.lsu.edu/tag/hpx/"
@@ -38,14 +38,14 @@ DEPEND="${RDEPEND}
 	test? ( ${PYTHON_DEPS} )
 	doc? ( >=dev-libs/boost-1.56.0-r1:=[tools] )
 "
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="
 	jemalloc? ( !perftools !tbb )
 	perftools? ( !jemalloc !tbb )
 	tbb? ( !jemalloc !perftools )
 	"
 
 pkg_setup() {
-	use test && python-single-r1_pkg_setup
+	use test && python-any-r1_pkg_setup
 }
 
 src_configure() {
diff --git a/sys-cluster/moosefs/moosefs-1.6.26-r1.ebuild b/sys-cluster/moosefs/moosefs-1.6.26-r1.ebuild
index 85de95a2f2f5..cdcf22ba0780 100644
--- a/sys-cluster/moosefs/moosefs-1.6.26-r1.ebuild
+++ b/sys-cluster/moosefs/moosefs-1.6.26-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -18,11 +18,10 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cgi +fuse static-libs"
-
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
-	cgi? ( dev-lang/python )
+	${PYTHON_DEPS}
 	fuse? ( >=sys-fs/fuse-2.6 )"
 DEPEND="${RDEPEND}"
 
diff --git a/sys-cluster/moosefs/moosefs-1.6.27.ebuild b/sys-cluster/moosefs/moosefs-1.6.27.ebuild
index f6b7d4e65fa7..87cbdf9bdb5b 100644
--- a/sys-cluster/moosefs/moosefs-1.6.27.ebuild
+++ b/sys-cluster/moosefs/moosefs-1.6.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -18,11 +18,10 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cgi +fuse static-libs"
-
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
-	cgi? ( dev-lang/python )
+	${PYTHON_DEPS}
 	fuse? ( >=sys-fs/fuse-2.6 )"
 DEPEND="${RDEPEND}"
 
diff --git a/sys-fs/rarfs/rarfs-0.1.1-r1.ebuild b/sys-fs/rarfs/rarfs-0.1.1-r1.ebuild
index 6e2bcdb751c7..2b9cc82b1b3e 100644
--- a/sys-fs/rarfs/rarfs-0.1.1-r1.ebuild
+++ b/sys-fs/rarfs/rarfs-0.1.1-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
+
 inherit python-r1
 
 DESCRIPTION="Fuse module to mount uncompressed RAR archives"
@@ -13,8 +14,12 @@ SRC_URI="mirror://sourceforge/rarfs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="sys-fs/fuse"
+RDEPEND="
+	${PYTHON_DEPS}
+	sys-fs/fuse"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/sys-libs/cracklib/cracklib-2.9.6-r1.ebuild b/sys-libs/cracklib/cracklib-2.9.6-r1.ebuild
index d28bf84d2399..c803ec905f64 100644
--- a/sys-libs/cracklib/cracklib-2.9.6-r1.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.6-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=5
+
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
 
@@ -16,18 +17,15 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
 IUSE="nls python static-libs test zlib"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${PYTHON_DEPS}
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	python? (
 		dev-python/setuptools[${PYTHON_USEDEP}]
 		test? ( dev-python/nose[${PYTHON_USEDEP}] )
 	)"
-RDEPEND="${RDEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r6
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild
index 6fe529292f4e..4d8132b1ac0b 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild
@@ -17,6 +17,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux"
 IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
diff --git a/sys-libs/libieee1284/libieee1284-0.2.11-r4.ebuild b/sys-libs/libieee1284/libieee1284-0.2.11-r4.ebuild
index 70f5d163f0c6..1cf8a0bd6c98 100644
--- a/sys-libs/libieee1284/libieee1284-0.2.11-r4.ebuild
+++ b/sys-libs/libieee1284/libieee1284-0.2.11-r4.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1 multilib-minimal
+
+inherit python-single-r1 multilib-minimal
 
 DESCRIPTION="Library to query devices using IEEE1284"
 HOMEPAGE="http://cyberelk.net/tim/libieee1284/index.html"
@@ -14,9 +15,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 IUSE="doc python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r9
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
+RDEPEND="
 	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	doc? (
@@ -26,23 +27,22 @@ DEPEND="${RDEPEND}
 		dev-perl/XML-RegExp
 	)"
 
-DOCS="AUTHORS NEWS README* TODO doc/interface*"
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
 multilib_src_configure() {
-	local myconf="--without-python"
-	multilib_is_native_abi && myconf="$(use_with python)"
-
 	ECONF_SOURCE="${S}" econf \
 		--enable-shared \
 		$(use_enable static-libs static) \
-		${myconf}
+		$(multilib_native_with python)
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
 	einstalldocs
+	dodoc doc/interface*
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
 }
diff --git a/sys-libs/libselinux/libselinux-2.5-r1.ebuild b/sys-libs/libselinux/libselinux-2.5-r1.ebuild
index cf10980a1540..3c2bad13eabc 100644
--- a/sys-libs/libselinux/libselinux-2.5-r1.ebuild
+++ b/sys-libs/libselinux/libselinux-2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -27,8 +27,8 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-
 IUSE="python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
 	>=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}]
diff --git a/sys-libs/libselinux/libselinux-2.5.ebuild b/sys-libs/libselinux/libselinux-2.5.ebuild
index 7f1d6927307b..5f21daabfda7 100644
--- a/sys-libs/libselinux/libselinux-2.5.ebuild
+++ b/sys-libs/libselinux/libselinux-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -18,8 +18,8 @@ SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/rel
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-
 IUSE="python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
 	>=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}]
diff --git a/sys-libs/libselinux/libselinux-2.6.ebuild b/sys-libs/libselinux/libselinux-2.6.ebuild
index de773b066d2a..d7c373a3d3d0 100644
--- a/sys-libs/libselinux/libselinux-2.6.ebuild
+++ b/sys-libs/libselinux/libselinux-2.6.ebuild
@@ -27,8 +27,8 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-
 IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
 	!pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] )
diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild
index 7c0802d63609..d41579b561b7 100644
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-9999.ebuild
@@ -27,8 +27,8 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-
 IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
 	!pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] )
diff --git a/sys-libs/libsemanage/libsemanage-2.5.ebuild b/sys-libs/libsemanage/libsemanage-2.5.ebuild
index bbe71340c2b2..58fc0bab31e4 100644
--- a/sys-libs/libsemanage/libsemanage-2.5.ebuild
+++ b/sys-libs/libsemanage/libsemanage-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,19 +19,19 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
 	>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
 	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
 	>=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}]
-	"
+	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex
 	python? (
 		>=dev-lang/swig-2.0.4-r1
 		virtual/pkgconfig
-		${PYTHON_DEPS}
 	)"
 
 # tests are not meant to be run outside of the
diff --git a/sys-libs/libsemanage/libsemanage-2.6.ebuild b/sys-libs/libsemanage/libsemanage-2.6.ebuild
index 605dd3573fc1..e027c1f35ac8 100644
--- a/sys-libs/libsemanage/libsemanage-2.6.ebuild
+++ b/sys-libs/libsemanage/libsemanage-2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -28,19 +28,19 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
 	>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
 	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
 	>=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}]
-	"
+	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex
 	python? (
 		>=dev-lang/swig-2.0.4-r1
 		virtual/pkgconfig
-		${PYTHON_DEPS}
 	)"
 
 # tests are not meant to be run outside of the
diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild
index 085031fc41ef..2b9f9cf3743b 100644
--- a/sys-libs/libsemanage/libsemanage-9999.ebuild
+++ b/sys-libs/libsemanage/libsemanage-9999.ebuild
@@ -28,19 +28,19 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
 	>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
 	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
 	>=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}]
-	"
+	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex
 	python? (
 		>=dev-lang/swig-2.0.4-r1
 		virtual/pkgconfig
-		${PYTHON_DEPS}
 	)"
 
 # tests are not meant to be run outside of the
diff --git a/sys-libs/libsmbios/libsmbios-2.3.0-r1.ebuild b/sys-libs/libsmbios/libsmbios-2.3.0-r1.ebuild
index b751c8eb01c6..9c7ce6e794e9 100644
--- a/sys-libs/libsmbios/libsmbios-2.3.0-r1.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.3.0-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2 OSL-2.0"
 SLOT="0"
 KEYWORDS="amd64 ia64 x86"
 IUSE="doc graphviz nls python static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/libxml2
 	sys-libs/zlib
@@ -40,8 +41,6 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	>pkg/py-compile
-
 	# Don't build yum-plugin - we don't need it
 	sed '/yum-plugin/d' -i Makefile.am || die
 
diff --git a/sys-libs/libsmbios/libsmbios-2.3.2.ebuild b/sys-libs/libsmbios/libsmbios-2.3.2.ebuild
index 36ba92886277..1d257c3a29f4 100644
--- a/sys-libs/libsmbios/libsmbios-2.3.2.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.3.2.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-2 OSL-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~ia64 x86"
 IUSE="doc graphviz nls python static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/libxml2
 	sys-libs/zlib
@@ -39,8 +40,6 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	>pkg/py-compile
-
 	# Don't build yum-plugin - we don't need it
 	sed '/yum-plugin/d' -i Makefile.am || die
 
diff --git a/sys-libs/libsmbios/libsmbios-2.3.3.ebuild b/sys-libs/libsmbios/libsmbios-2.3.3.ebuild
index 9064df57b931..f6024bfa3475 100644
--- a/sys-libs/libsmbios/libsmbios-2.3.3.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.3.3.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-2 OSL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~x86"
 IUSE="doc graphviz nls python static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/libxml2
 	sys-libs/zlib
@@ -39,8 +40,6 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	>pkg/py-compile
-
 	# Don't build yum-plugin - we don't need it
 	sed '/yum-plugin/d' -i Makefile.am || die
 
diff --git a/sys-process/audit/audit-2.6.4.ebuild b/sys-process/audit/audit-2.6.4.ebuild
index b19cfd0a017f..e83cf86b2dd1 100644
--- a/sys-process/audit/audit-2.6.4.ebuild
+++ b/sys-process/audit/audit-2.6.4.ebuild
@@ -15,22 +15,19 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="gssapi ldap python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # Testcases are pretty useless as they are built for RedHat users/groups and kernels.
 RESTRICT="test"
 
 RDEPEND="gssapi? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	sys-libs/libcap-ng"
+	sys-libs/libcap-ng
+	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-2.6.34
-	python? (
-		${PYTHON_DEPS}
-		dev-lang/swig:0
-	)"
+	python? ( dev-lang/swig:0 )"
 # Do not use os-headers as this is linux specific
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
 CONFIG_CHECK="~AUDIT"
 
 pkg_setup() {
diff --git a/sys-process/audit/audit-2.7.1.ebuild b/sys-process/audit/audit-2.7.1.ebuild
index 04b917cb1c74..85a1f9a420fb 100644
--- a/sys-process/audit/audit-2.7.1.ebuild
+++ b/sys-process/audit/audit-2.7.1.ebuild
@@ -15,22 +15,19 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="gssapi ldap python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # Testcases are pretty useless as they are built for RedHat users/groups and kernels.
 RESTRICT="test"
 
 RDEPEND="gssapi? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	sys-libs/libcap-ng"
+	sys-libs/libcap-ng
+	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-2.6.34
-	python? (
-		${PYTHON_DEPS}
-		dev-lang/swig:0
-	)"
+	python? ( dev-lang/swig:0 )"
 # Do not use os-headers as this is linux specific
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
 CONFIG_CHECK="~AUDIT"
 
 pkg_setup() {
diff --git a/sys-process/criu/criu-2.10.ebuild b/sys-process/criu/criu-2.10.ebuild
index 8c982903f88b..fd0c92becf69 100644
--- a/sys-process/criu/criu-2.10.ebuild
+++ b/sys-process/criu/criu-2.10.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="python setproctitle"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/protobuf-c
 	dev-libs/libnl:3
diff --git a/sys-process/criu/criu-2.11.1.ebuild b/sys-process/criu/criu-2.11.1.ebuild
index 8c982903f88b..fd0c92becf69 100644
--- a/sys-process/criu/criu-2.11.1.ebuild
+++ b/sys-process/criu/criu-2.11.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="python setproctitle"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/protobuf-c
 	dev-libs/libnl:3
diff --git a/sys-process/criu/criu-2.11.ebuild b/sys-process/criu/criu-2.11.ebuild
index 8c982903f88b..fd0c92becf69 100644
--- a/sys-process/criu/criu-2.11.ebuild
+++ b/sys-process/criu/criu-2.11.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="python setproctitle"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/protobuf-c
 	dev-libs/libnl:3
diff --git a/sys-process/criu/criu-2.12.1.ebuild b/sys-process/criu/criu-2.12.1.ebuild
index 8c982903f88b..fd0c92becf69 100644
--- a/sys-process/criu/criu-2.12.1.ebuild
+++ b/sys-process/criu/criu-2.12.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="python setproctitle"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/protobuf-c
 	dev-libs/libnl:3
diff --git a/sys-process/criu/criu-2.12.ebuild b/sys-process/criu/criu-2.12.ebuild
index 8c982903f88b..fd0c92becf69 100644
--- a/sys-process/criu/criu-2.12.ebuild
+++ b/sys-process/criu/criu-2.12.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="python setproctitle"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/protobuf-c
 	dev-libs/libnl:3
diff --git a/sys-process/criu/criu-2.5.ebuild b/sys-process/criu/criu-2.5.ebuild
index c36c8b556660..ed448fa13e2c 100644
--- a/sys-process/criu/criu-2.5.ebuild
+++ b/sys-process/criu/criu-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64"
 IUSE="python setproctitle"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/protobuf-c
 	dev-libs/libnl:3
diff --git a/virtual/python-dnspython/python-dnspython-1.ebuild b/virtual/python-dnspython/python-dnspython-1.ebuild
index 063bbe7ce66f..6a16bf1905bf 100644
--- a/virtual/python-dnspython/python-dnspython-1.ebuild
+++ b/virtual/python-dnspython/python-dnspython-1.ebuild
@@ -16,4 +16,3 @@ RDEPEND="${PYTHON_DEPS}
 	!dev-python/dnspython:0
 	$(python_gen_cond_dep 'dev-python/dnspython:py2[${PYTHON_USEDEP}]' python2*)
 	$(python_gen_cond_dep 'dev-python/dnspython:py3[${PYTHON_USEDEP}]' python3*)"
-DEPEND="!dev-python/dnspython:0"
diff --git a/virtual/python-dnspython/python-dnspython-2.ebuild b/virtual/python-dnspython/python-dnspython-2.ebuild
index 46ef51fed82a..5a3494459d70 100644
--- a/virtual/python-dnspython/python-dnspython-2.ebuild
+++ b/virtual/python-dnspython/python-dnspython-2.ebuild
@@ -12,4 +12,5 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND=">=dev-python/dnspython-1.15.0:0[${PYTHON_USEDEP}]"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/dnspython-1.15.0:0[${PYTHON_USEDEP}]"