Merge updates from master

16 files changed, 1 insertions, 1038 deletions

diff --git a/app-benchmarks/stress/Manifest b/app-benchmarks/stress/Manifest
index 97047f07ead9..57b3e20059c4 100644
--- a/app-benchmarks/stress/Manifest
+++ b/app-benchmarks/stress/Manifest
@@ -1,3 +1 @@
-DIST stress-1.0.1.tar.gz 203343 SHA256 813a9c78d0a7c27e257ab4523f1b0013e32b0eceabc19154d7d26118e9b73bed SHA512 d7de86cab38a688d2fc55f26a9b3562d58a40ef30bbfa974b6777b6a7d7e1b1f609ef78258af2d1b8aee0bcda432d5abe4f59b9529ea2730e26a054d1683d666 WHIRLPOOL 89349408fbeb654fae162f0e5435264e426b63f7ab05f3199505ded530ab5bb6c426a61440c5ecce34ea07641615a7b38c5d0c35abdb43153b6d9f71c0049c96
 DIST stress-1.0.4-r1.tar.gz 191800 SHA256 057e4fc2a7706411e1014bf172e4f94b63a12f18412378fca8684ca92408825b SHA512 623a7d9585828bed4b7673e19fb0cfdda904552cd56353d74106047b64249299d5f8da892ec135f1781ec3984c7d5835dcc6c0d8e659e06c8a1e4fb2af9fd9c4 WHIRLPOOL f61eb216ec44242c74ae86b3c5390c361c16f4466cfad231d4fbfa93f61578c36dde779db3cf0ba8a0e0751b74fb33a1085372d825d9fd0ebb8120962e9f1cdf
-DIST stress-1.0.4.tar.gz 201495 SHA256 369c997f65e8426ae8b318d4fdc8e6f07a311cfa77cc4b25dace465c582163c0 SHA512 54b3f9edbdaff228f2cfd40a7ce324eea95fc9ab54194d3bac04dc67f72b690e4748c8ff5161bca563d7dd573609092c3631cd4cceb14d813f16f7226ad1ce98 WHIRLPOOL a1ca33b3c3c4ac3e5073a9ea5fa43fe4295bfa2c26627b36366e875dc9c2b1776493d6895ca40008037e2bf2246117067b23cfab568143f1e0e3ec759aa458ea
diff --git a/app-benchmarks/stress/stress-1.0.1.ebuild b/app-benchmarks/stress/stress-1.0.1.ebuild
deleted file mode 100644
index 542cff65ab81..000000000000
--- a/app-benchmarks/stress/stress-1.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit autotools flag-o-matic
-
-MY_P="${PN}-${PV/_/}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Imposes stressful loads on different aspects of the system"
-HOMEPAGE="http://people.seas.harvard.edu/~apw/stress"
-SRC_URI="http://weather.ou.edu/~apw/projects/stress/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
-IUSE="static"
-
-DEPEND="sys-apps/help2man"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Force rebuild of the manpage.
-	rm -f doc/stress.1
-
-	# Honour Gentoo CFLAGS.
-	sed -i -e "/CFLAGS/s/-Werror//" \
-		   -e "s/CFLAGS/AM_CFLAGS/" \
-		   src/Makefile.am || die "sed cflags failed"
-
-	eautoreconf
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	econf
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog AUTHORS README
-}
diff --git a/app-benchmarks/stress/stress-1.0.4.ebuild b/app-benchmarks/stress/stress-1.0.4.ebuild
deleted file mode 100644
index 3e5d863cec74..000000000000
--- a/app-benchmarks/stress/stress-1.0.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit flag-o-matic
-
-MY_P=${PN}-${PV/_/}
-DESCRIPTION="Imposes stressful loads on different aspects of the system"
-HOMEPAGE="http://people.seas.harvard.edu/~apw/stress"
-SRC_URI="http://weather.ou.edu/~apw/projects/stress/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="static"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	use static && append-ldflags -static
-}
diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
index b64b6ac48ab3..caa64da143f9 100644
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@@ -1,4 +1,2 @@
-DIST focuswriter-1.5.5-src.tar.bz2 5249014 SHA256 b6a2085587864b2685516d20870d9375803ccdf3472e66bf457382d028c1da0e SHA512 aed6a2e203dcf349ff7fef6caa8e7ab1dbba80da988933c06d6f4ea1ad49ad4c4546b30aaacf9373d1234cb8934daac36f00d0d7b3512d9c3fc4f1e1b273a766 WHIRLPOOL 29795304e6d6687d16d2774cd4d28d0c45382474391d7ad62fa557a134e7c5d11ba6bf81bb81df2b0fb3727b4bb32f705d8fe73a7129f44c8485cc9d8b19b2e1
-DIST focuswriter-1.6.2-src.tar.bz2 10205432 SHA256 ac77139b4c9b70d26643e5707a9db9003586a6633779dec20a5c1353602b2655 SHA512 fb665e2bb59b9b449c0b68e3e72cc51c14c6c8b779ac347176bdb521922fba233da6754db4772dbcc80d5c610fb180176ade1ec8dd29c9b004223dce73faa58a WHIRLPOOL 3913609be7c934795b1e1a73c2a836c88bbbaf6282db0ac70bd685b52b902e7dd085172e489aec6420b37e6b7be769138051df0bb722adeac1676a66ec5e2b3f
 DIST focuswriter-1.6.3-src.tar.bz2 10211589 SHA256 7de693e8786738c50bde53d4e325334ecf3b8155d7c9b37e64bbd9adedcb9f40 SHA512 015a9153a331bffc1b87bb0d13c6aa1340f46da72084caad8a4a8811f213e5ae17802363570052702c1f1b990ccb3d314f179da0a94898bdc988b7798a3b9b0f WHIRLPOOL a8ed601dc2e53665af3be74cac385ec8afdc7c9029812250964ee660a52b4eafe568c4f5405a7348c64244c7c9ab7da1af3d43f6e923e0c7729e0c0f6fec80bd
 DIST focuswriter-1.6.4-src.tar.bz2 10214364 SHA256 1f019e75b5581d3e7ed96977e92c9a5f6eba8456eccbad1f481adaabae34055c SHA512 0f3e0af0efab3cae7e2c4086c500dcf75b1d48f3d4f2cfa5fa3663443f109e90ab3dac01fcac240fa0d65ffe5f11faec9145083192492c9eefa6c1b48ed22c7a WHIRLPOOL 4728d5768daaa5298632c3a2cd745cbd6aeb32b23d03aa64a021d19ab8d0084e3edf15211a2c2536c4280006fcc497204fe1a391a8c00716984679d4a0ef070c
diff --git a/app-editors/focuswriter/files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch b/app-editors/focuswriter/files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch
deleted file mode 100644
index e7815be0ee5f..000000000000
--- a/app-editors/focuswriter/files/focuswriter-1.5.2-unbundle-qtsingleapplication.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- focuswriter.pro.orig	2014-07-20 17:37:05.000000000 +0400
-+++ focuswriter.pro	2014-07-31 17:56:00.702801120 +0400
-@@ -90,13 +90,14 @@
- 		src/spelling/dictionary_provider_voikko.cpp
- 
- 	lessThan(QT_MAJOR_VERSION, 5) {
-+		CONFIG += qtsingleapplication
- 		SOURCES += src/sdl/sound.cpp
- 	} else {
- 		SOURCES += src/sound.cpp
- 	}
- }
- 
--INCLUDEPATH += src src/fileformats src/qtsingleapplication src/qtzip src/spelling
-+INCLUDEPATH += src src/fileformats src/qtzip src/spelling
- 
- # Specify program sources
- HEADERS += src/action_manager.h \
-@@ -155,8 +156,6 @@
- 	src/fileformats/rtf_tokenizer.h \
- 	src/fileformats/rtf_writer.h \
- 	src/fileformats/txt_reader.h \
--	src/qtsingleapplication/qtsingleapplication.h \
--	src/qtsingleapplication/qtlocalpeer.h \
- 	src/qtzip/qtzipreader.h \
- 	src/qtzip/qtzipwriter.h \
- 	src/spelling/abstract_dictionary.h \
-@@ -219,8 +218,6 @@
- 	src/fileformats/rtf_tokenizer.cpp \
- 	src/fileformats/rtf_writer.cpp \
- 	src/fileformats/txt_reader.cpp \
--	src/qtsingleapplication/qtsingleapplication.cpp \
--	src/qtsingleapplication/qtlocalpeer.cpp \
- 	src/qtzip/qtzip.cpp \
- 	src/spelling/dictionary_dialog.cpp \
- 	src/spelling/dictionary_manager.cpp \
diff --git a/app-editors/focuswriter/focuswriter-1.5.5.ebuild b/app-editors/focuswriter/focuswriter-1.5.5.ebuild
deleted file mode 100644
index 05553d16d107..000000000000
--- a/app-editors/focuswriter/focuswriter-1.5.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PLOCALES="ar ca cs da de el en en_GB es_MX es fi fr he hu hy id it ja ko nl pl
-pt_BR pt ro ru sk sr sv tr uk vi zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-inherit fdo-mime gnome2-utils l10n readme.gentoo qt4-r2
-
-DESCRIPTION="A fullscreen and distraction-free word processor"
-HOMEPAGE="http://gottcode.org/focuswriter/"
-SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="app-text/hunspell
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsingleapplication[qt4(+),X]
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog CREDITS NEWS README )
-DOC_CONTENTS="Focuswriter has optional sound support if media-libs/sdl-mixer is
-installed with wav useflag enabled."
-
-PATCHES=( "${FILESDIR}/${PN}-1.5.2-unbundle-qtsingleapplication.patch" )
-
-rm_loc() {
-	sed -e "s|translations/${PN}_${1}.ts||"	-i ${PN}.pro || die 'sed failed'
-	rm translations/${PN}_${1}.{ts,qm} || die "removing ${1} locale failed"
-}
-
-src_prepare() {
-	l10n_for_each_disabled_locale_do rm_loc
-	qt4-r2_src_prepare
-}
-
-src_configure() {
-	eqmake4 PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
-	readme.gentoo_create_doc
-	qt4-r2_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/app-editors/focuswriter/focuswriter-1.6.2.ebuild b/app-editors/focuswriter/focuswriter-1.6.2.ebuild
deleted file mode 100644
index 95ff93d90d4e..000000000000
--- a/app-editors/focuswriter/focuswriter-1.6.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fdo-mime gnome2-utils qmake-utils
-
-DESCRIPTION="A fullscreen and distraction-free word processor"
-HOMEPAGE="http://gottcode.org/focuswriter/"
-SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-text/hunspell:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[qt5,X]
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qtconcurrent:5
-	virtual/pkgconfig
-"
-
-DOCS=( ChangeLog CREDITS NEWS README )
-
-PATCHES=( "${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch" )
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 04af972112aa..54583c4443ca 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,4 +1,3 @@
-DIST cmake-3.6.3.tar.gz 6919949 SHA256 7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe SHA512 bfcb51bc01f64a6ae5fb9401c037a529e4b2c0216eef68cf862a7495560dfc80589b34af94450baf4561d217dfb8075b14fbf63e3a668943a65e36ea61c5df48 WHIRLPOOL ecf79bb1a4b18df07d15ed5cdeb513420a0b8d46f90154dbdf9a78d3294e202ade040e832f3479fca0889c4af3b3b50e0d9391120191bae390927888e6487b4a
 DIST cmake-3.7.2-x32.patch.xz 7204 SHA256 d04cc6dc7ffbb8e16426e85f50e3f3c3037fb42a0e746d0604a412a00d31444e SHA512 36140132ecbe05d07b167e2895c2909ed545371af0962cb8246beb61a400fad14f56394c90cc2319e4581d5e97116069bebe466b87451a9a83f04095ce9b0510 WHIRLPOOL 07f49188fc6d7f6eb005f8e82526c33401b7ee8ff7839c4620280774650f9be9af9aafefb6a1f9ff2648316123aa1232b53924ef9dda3ce2268f01560d53606a
 DIST cmake-3.7.2.tar.gz 7361593 SHA256 dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 SHA512 b2ed0192e12267de19eb178c2dedc69d06fc33dfadd47efbe0ccf6969ad72d290fa4bff02861c379a8752337d67d2485d7e1ba947cb219f2e4041a53a195e88d WHIRLPOOL 1861fe2887f4483856e1964ff1492e196624d3072ad1e21910fba29d0c0d654e7d5035571648386a77cd6cbe895f8cdfbb1f4cc1ad60d14015a01a22494456f7
 DIST cmake-3.8.0-rc2.tar.gz 7504498 SHA256 f6302ec906eeddd9d5bc1bb4cfc06ffeb49fe9f6cf7d25d64a3acfa05a577b9a SHA512 4ca4ea7f941e3fa9c80614e9873044425b9b5970e94885deace6750d3e0eb19c4e6b82c6d82e3c666971e523311584814e95d0787c978238b17b3d8138aaa3ee WHIRLPOOL d9446a1162477b5a575671c682af28069208dd6c516aaa1ef7daf62cb72862a8ec6012c0b40b72eebcbd1b9d3664ea830d63dfd585e2a4391cd703d3cb9c3e88
diff --git a/dev-util/cmake/cmake-3.6.3.ebuild b/dev-util/cmake/cmake-3.6.3.ebuild
deleted file mode 100644
index 4bd1a8e867d4..000000000000
--- a/dev-util/cmake/cmake-3.6.3.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-
-RDEPEND="
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/expat-2.0.1
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
-	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
-	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
-
-	# upstream fixes (can usually be removed with a version bump)
-	"${FILESDIR}"/${PN}-3.6.1-find_library-lib32.patch
-)
-
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-	if [ $? -eq 0 ]; then
-		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
-	fi
-
-	tc-export CC CXX LD
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:#IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    Qt4Deploy, which tries to break sandbox and ignores prefix
-	#    Qt5Autogen, which breaks for unknown reason
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|Qt5Autogen|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/cmake-syntax.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/cmake-indent.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -rf "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/files/cmake-3.6.1-find_library-lib32.patch b/dev-util/cmake/files/cmake-3.6.1-find_library-lib32.patch
deleted file mode 100644
index e02faa23d34f..000000000000
--- a/dev-util/cmake/files/cmake-3.6.1-find_library-lib32.patch
+++ /dev/null
@@ -1,476 +0,0 @@
-From 896ad251de49f167f4ce3cbbcf9a6cce85a16681 Mon Sep 17 00:00:00 2001
-From: Daniel Scharrer <daniel@constexpr.org>
-Date: Fri, 10 Jun 2016 16:11:18 +0200
-Subject: [PATCH] Teach find_library and find_package to search lib32 paths
- (#11260)
-
-Add a ``FIND_LIBRARY_USE_LIB32_PATHS`` global property analogous to the
-``FIND_LIBRARY_USE_LIB64_PATHS`` property.  This helps find commands on
-multilib systems that use ``lib32`` directories and either do not have
-``lib`` symlinks or point ``lib`` to ``lib64``.
----
- Help/command/find_library.rst                                 |  7 +++++++
- Help/manual/cmake-properties.7.rst                            |  1 +
- Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst                | 10 ++++++++++
- Help/release/dev/find-lib32.rst                               |  7 +++++++
- Modules/FindPkgConfig.cmake                                   |  8 ++++++--
- Modules/Platform/Linux.cmake                                  |  3 ++-
- Modules/Platform/OpenBSD.cmake                                |  1 +
- Modules/Platform/UnixPaths.cmake                              |  3 ++-
- Source/cmFindLibraryCommand.cxx                               |  9 ++++-----
- Source/cmFindPackageCommand.cxx                               | 11 +++++++++++
- Source/cmFindPackageCommand.h                                 |  1 +
- Source/cmMakefile.cxx                                         |  8 ++++++++
- Source/cmMakefile.h                                           |  3 +++
- Tests/CMakeOnly/find_library/CMakeLists.txt                   |  7 +++++++
- Tests/CMakeOnly/find_library/lib/32/libtest5.a                |  0
- Tests/CMakeOnly/find_library/lib/A/lib32/libtest3.a           |  0
- Tests/CMakeOnly/find_library/lib32/A/lib/libtest2.a           |  0
- Tests/CMakeOnly/find_library/lib32/A/lib32/libtest4.a         |  0
- Tests/CMakeOnly/find_library/lib32/A/libtest4.a               |  0
- Tests/CMakeOnly/find_library/lib32/libtest4.a                 |  0
- .../FindPkgConfig/FindPkgConfig_CMAKE_APPBUNDLE_PATH.cmake    | 11 ++++++++---
- .../FindPkgConfig/FindPkgConfig_CMAKE_FRAMEWORK_PATH.cmake    | 11 ++++++++---
- .../FindPkgConfig/FindPkgConfig_NO_PKGCONFIG_PATH.cmake       |  3 ---
- .../RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake | 11 ++++++++---
- ...ndPkgConfig_PKGCONFIG_PATH_NO_CMAKE_ENVIRONMENT_PATH.cmake | 11 ++++++++---
- .../FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_PATH.cmake          | 11 ++++++++---
- .../FindPkgConfig/pc-bar/lib32/pkgconfig/.placeholder         |  0
- .../FindPkgConfig/pc-foo/lib32/pkgconfig/.placeholder         |  0
- 28 files changed, 110 insertions(+), 27 deletions(-)
- create mode 100644 Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst
- create mode 100644 Help/release/dev/find-lib32.rst
- create mode 100644 Tests/CMakeOnly/find_library/lib/32/libtest5.a
- create mode 100644 Tests/CMakeOnly/find_library/lib/A/lib32/libtest3.a
- create mode 100644 Tests/CMakeOnly/find_library/lib32/A/lib/libtest2.a
- create mode 100644 Tests/CMakeOnly/find_library/lib32/A/lib32/libtest4.a
- create mode 100644 Tests/CMakeOnly/find_library/lib32/A/libtest4.a
- create mode 100644 Tests/CMakeOnly/find_library/lib32/libtest4.a
- create mode 100644 Tests/RunCMake/FindPkgConfig/pc-bar/lib32/pkgconfig/.placeholder
- create mode 100644 Tests/RunCMake/FindPkgConfig/pc-foo/lib32/pkgconfig/.placeholder
-
-diff --git a/Help/command/find_library.rst b/Help/command/find_library.rst
-index 31e6ec0..1eb50f7 100644
---- a/Help/command/find_library.rst
-+++ b/Help/command/find_library.rst
-@@ -49,6 +49,13 @@ path to the framework ``<fullPath>/A.framework``.  When a full path to a
- framework is used as a library, CMake will use a ``-framework A``, and a
- ``-F<fullPath>`` to link the framework to the target.
- 
-+If the :prop_gbl:`FIND_LIBRARY_USE_LIB32_PATHS` global property is set
-+all search paths will be tested as normal, with ``32/`` appended, and
-+with all matches of ``lib/`` replaced with ``lib32/``.  This property is
-+automatically set for the platforms that are known to need it if at
-+least one of the languages supported by the :command:`project` command
-+is enabled.
-+
- If the :prop_gbl:`FIND_LIBRARY_USE_LIB64_PATHS` global property is set
- all search paths will be tested as normal, with ``64/`` appended, and
- with all matches of ``lib/`` replaced with ``lib64/``.  This property is
-diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
-index 3403dcd..3574b7f 100644
---- a/Help/manual/cmake-properties.7.rst
-+++ b/Help/manual/cmake-properties.7.rst
-@@ -24,6 +24,7 @@ Properties of Global Scope
-    /prop_gbl/DISABLED_FEATURES
-    /prop_gbl/ENABLED_FEATURES
-    /prop_gbl/ENABLED_LANGUAGES
-+   /prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS
-    /prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS
-    /prop_gbl/FIND_LIBRARY_USE_OPENBSD_VERSIONING
-    /prop_gbl/GLOBAL_DEPENDS_DEBUG_MODE
-diff --git a/Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst b/Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst
-new file mode 100644
-index 0000000..ce18b65
---- /dev/null
-+++ b/Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst
-@@ -0,0 +1,10 @@
-+FIND_LIBRARY_USE_LIB32_PATHS
-+----------------------------
-+
-+Whether the :command:`find_library` command should automatically search
-+``lib32`` directories.
-+
-+``FIND_LIBRARY_USE_LIB32_PATHS`` is a boolean specifying whether the
-+:command:`find_library` command should automatically search the ``lib32``
-+variant of directories called ``lib`` in the search path when building 32-bit
-+binaries.
-diff --git a/Help/release/dev/find-lib32.rst b/Help/release/dev/find-lib32.rst
-new file mode 100644
-index 0000000..00818dc
---- /dev/null
-+++ b/Help/release/dev/find-lib32.rst
-@@ -0,0 +1,7 @@
-+find-lib32
-+----------
-+
-+* The :command:`find_library` and :command:`find_package` commands learned
-+  to search in ``lib32/`` directories when the build targets a 32-bit
-+  architecture.  See the :prop_gbl:`FIND_LIBRARY_USE_LIB32_PATHS` global
-+  property.
-diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
-index 644687c..33290c4 100644
---- a/Modules/FindPkgConfig.cmake
-+++ b/Modules/FindPkgConfig.cmake
-@@ -316,9 +316,13 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
-             list(APPEND _lib_dirs "lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig")
-           endif()
-         else()
--          # not debian, chech the FIND_LIBRARY_USE_LIB64_PATHS property
-+          # not debian, check the FIND_LIBRARY_USE_LIB32_PATHS and FIND_LIBRARY_USE_LIB64_PATHS properties
-+          get_property(uselib32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS)
-+          if(uselib32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-+            list(APPEND _lib_dirs "lib32/pkgconfig")
-+          endif()
-           get_property(uselib64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
--          if(uselib64)
-+          if(uselib64 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-             list(APPEND _lib_dirs "lib64/pkgconfig")
-           endif()
-         endif()
-diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake
-index e40a74f..1f8c1b4 100644
---- a/Modules/Platform/Linux.cmake
-+++ b/Modules/Platform/Linux.cmake
-@@ -50,8 +50,9 @@ set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_
- 
- include(Platform/UnixPaths)
- 
--# Debian has lib64 paths only for compatibility so they should not be
-+# Debian has lib32 and lib64 paths only for compatibility so they should not be
- # searched.
- if(NOT CMAKE_CROSSCOMPILING AND EXISTS "/etc/debian_version")
-+  set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE)
-   set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
- endif()
-diff --git a/Modules/Platform/OpenBSD.cmake b/Modules/Platform/OpenBSD.cmake
-index 7ac6c7e..6466a0a 100644
---- a/Modules/Platform/OpenBSD.cmake
-+++ b/Modules/Platform/OpenBSD.cmake
-@@ -18,6 +18,7 @@ endif()
- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_OPENBSD_VERSIONING 1)
- 
- # OpenBSD has no multilib
-+set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE)
- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
- 
- # OpenBSD policy requires that shared libraries be installed without
-diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
-index 20ee1d1..d6c3d41 100644
---- a/Modules/Platform/UnixPaths.cmake
-+++ b/Modules/Platform/UnixPaths.cmake
-@@ -93,5 +93,6 @@ list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
-   /usr/include
-   )
- 
--# Enable use of lib64 search path variants by default.
-+# Enable use of lib32 and lib64 search path variants by default.
-+set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS TRUE)
- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
-diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx
-index a4d4dbb..3094fcf 100644
---- a/Source/cmFindLibraryCommand.cxx
-+++ b/Source/cmFindLibraryCommand.cxx
-@@ -40,11 +40,10 @@ bool cmFindLibraryCommand::InitialPass(std::vector<std::string> const& argsIn,
-     return true;
-   }
- 
--  if (const char* abi_name =
--        this->Makefile->GetDefinition("CMAKE_INTERNAL_PLATFORM_ABI")) {
--    std::string abi = abi_name;
--    if (abi.find("ELF N32") != abi.npos) {
--      // Convert lib to lib32.
-+  if (this->Makefile->GetState()->GetGlobalPropertyAsBool(
-+        "FIND_LIBRARY_USE_LIB32_PATHS")) {
-+    // add special 32 bit paths if this is a 32 bit compile.
-+    if (this->Makefile->PlatformIs32Bit()) {
-       this->AddArchitecturePaths("32");
-     }
-   }
-diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
-index 7908afe..1a44d73 100644
---- a/Source/cmFindPackageCommand.cxx
-+++ b/Source/cmFindPackageCommand.cxx
-@@ -43,6 +43,7 @@ cmFindPackageCommand::cmFindPackageCommand()
-   this->UseConfigFiles = true;
-   this->UseFindModules = true;
-   this->DebugMode = false;
-+  this->UseLib32Paths = false;
-   this->UseLib64Paths = false;
-   this->PolicyScope = true;
-   this->VersionMajor = 0;
-@@ -110,6 +111,13 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args,
-     this->LibraryArchitecture = arch;
-   }
- 
-+  // Lookup whether lib32 paths should be used.
-+  if (this->Makefile->PlatformIs32Bit() &&
-+      this->Makefile->GetState()->GetGlobalPropertyAsBool(
-+        "FIND_LIBRARY_USE_LIB32_PATHS")) {
-+    this->UseLib32Paths = true;
-+  }
-+
-   // Lookup whether lib64 paths should be used.
-   if (this->Makefile->PlatformIs64Bit() &&
-       this->Makefile->GetState()->GetGlobalPropertyAsBool(
-@@ -1907,6 +1915,9 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
-   if (!this->LibraryArchitecture.empty()) {
-     common.push_back("lib/" + this->LibraryArchitecture);
-   }
-+  if (this->UseLib32Paths) {
-+    common.push_back("lib32");
-+  }
-   if (this->UseLib64Paths) {
-     common.push_back("lib64");
-   }
-diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h
-index eff6b80..9019f1b 100644
---- a/Source/cmFindPackageCommand.h
-+++ b/Source/cmFindPackageCommand.h
-@@ -148,6 +148,7 @@ private:
-   bool NoUserRegistry;
-   bool NoSystemRegistry;
-   bool DebugMode;
-+  bool UseLib32Paths;
-   bool UseLib64Paths;
-   bool PolicyScope;
-   std::string LibraryArchitecture;
-diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
-index ca30b3d..eaf6a7d 100644
---- a/Source/cmMakefile.cxx
-+++ b/Source/cmMakefile.cxx
-@@ -2076,6 +2076,14 @@ bool cmMakefile::IsSet(const std::string& name) const
-   return true;
- }
- 
-+bool cmMakefile::PlatformIs32Bit() const
-+{
-+  if (const char* sizeof_dptr = this->GetDefinition("CMAKE_SIZEOF_VOID_P")) {
-+    return atoi(sizeof_dptr) == 4;
-+  }
-+  return false;
-+}
-+
- bool cmMakefile::PlatformIs64Bit() const
- {
-   if (const char* sizeof_dptr = this->GetDefinition("CMAKE_SIZEOF_VOID_P")) {
-diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
-index c665b1f..1d9ccd0 100644
---- a/Source/cmMakefile.h
-+++ b/Source/cmMakefile.h
-@@ -437,6 +437,9 @@ public:
-   bool IsOn(const std::string& name) const;
-   bool IsSet(const std::string& name) const;
- 
-+  /** Return whether the target platform is 32-bit. */
-+  bool PlatformIs32Bit() const;
-+
-   /** Return whether the target platform is 64-bit.  */
-   bool PlatformIs64Bit() const;
- 
-diff --git a/Tests/CMakeOnly/find_library/CMakeLists.txt b/Tests/CMakeOnly/find_library/CMakeLists.txt
-index 2d4ecaf..9958650 100644
---- a/Tests/CMakeOnly/find_library/CMakeLists.txt
-+++ b/Tests/CMakeOnly/find_library/CMakeLists.txt
-@@ -33,16 +33,23 @@ endmacro()
- 
- set(CMAKE_FIND_LIBRARY_PREFIXES "lib")
- set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-+set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS TRUE)
- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
- 
- set(CMAKE_SIZEOF_VOID_P 4)
- foreach(lib
-+    lib/32/libtest5.a
-     lib/A/lib/libtest1.a
-+    lib/A/lib32/libtest3.a
-     lib/A/libtest1.a
-     lib/libtest1.a
-     lib/libtest2.a
-     lib/libtest3.a
-     lib/libtest3.a
-+    lib32/A/lib/libtest2.a
-+    lib32/A/lib32/libtest4.a
-+    lib32/A/libtest4.a
-+    lib32/libtest4.a
-     )
-   test_find_library_subst(${lib})
- endforeach()
-diff --git a/Tests/CMakeOnly/find_library/lib/32/libtest5.a b/Tests/CMakeOnly/find_library/lib/32/libtest5.a
-new file mode 100644
-index 0000000..e69de29
-diff --git a/Tests/CMakeOnly/find_library/lib/A/lib32/libtest3.a b/Tests/CMakeOnly/find_library/lib/A/lib32/libtest3.a
-new file mode 100644
-index 0000000..e69de29
-diff --git a/Tests/CMakeOnly/find_library/lib32/A/lib/libtest2.a b/Tests/CMakeOnly/find_library/lib32/A/lib/libtest2.a
-new file mode 100644
-index 0000000..e69de29
-diff --git a/Tests/CMakeOnly/find_library/lib32/A/lib32/libtest4.a b/Tests/CMakeOnly/find_library/lib32/A/lib32/libtest4.a
-new file mode 100644
-index 0000000..e69de29
-diff --git a/Tests/CMakeOnly/find_library/lib32/A/libtest4.a b/Tests/CMakeOnly/find_library/lib32/A/libtest4.a
-new file mode 100644
-index 0000000..e69de29
-diff --git a/Tests/CMakeOnly/find_library/lib32/libtest4.a b/Tests/CMakeOnly/find_library/lib32/libtest4.a
-new file mode 100644
-index 0000000..e69de29
-diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_CMAKE_APPBUNDLE_PATH.cmake b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_CMAKE_APPBUNDLE_PATH.cmake
-index 9d4826f..4a41533 100644
---- a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_CMAKE_APPBUNDLE_PATH.cmake
-+++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_CMAKE_APPBUNDLE_PATH.cmake
-@@ -1,4 +1,4 @@
--# Needed for CMAKE_SYSTEM_NAME, CMAKE_LIBRARY_ARCHITECTURE and FIND_LIBRARY_USE_LIB64_PATHS
-+# Needed for CMAKE_SYSTEM_NAME, CMAKE_LIBRARY_ARCHITECTURE, FIND_LIBRARY_USE_LIB32_PATHS and FIND_LIBRARY_USE_LIB64_PATHS
- enable_language(C)
- 
- # Prepare environment and variables
-@@ -29,10 +29,15 @@ if(NOT DEFINED CMAKE_SYSTEM_NAME
-       set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig")
-     endif()
-   else()
--    # not debian, chech the FIND_LIBRARY_USE_LIB64_PATHS property
-+    # not debian, check the FIND_LIBRARY_USE_LIB32_PATHS and FIND_LIBRARY_USE_LIB64_PATHS properties
-+    get_property(uselib32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS)
-     get_property(uselib64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
--    if(uselib64)
-+    if(uselib32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-+      set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib32/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib32/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig")
-+    elseif(uselib64 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-       set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib64/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib64/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig")
-+    else()
-+      set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig")
-     endif()
-   endif()
- else()
-diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_CMAKE_FRAMEWORK_PATH.cmake b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_CMAKE_FRAMEWORK_PATH.cmake
-index d9943d4..b66d02f 100644
---- a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_CMAKE_FRAMEWORK_PATH.cmake
-+++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_CMAKE_FRAMEWORK_PATH.cmake
-@@ -1,4 +1,4 @@
--# Needed for CMAKE_SYSTEM_NAME, CMAKE_LIBRARY_ARCHITECTURE and FIND_LIBRARY_USE_LIB64_PATHS
-+# Needed for CMAKE_SYSTEM_NAME, CMAKE_LIBRARY_ARCHITECTURE, FIND_LIBRARY_USE_LIB32_PATHS and FIND_LIBRARY_USE_LIB64_PATHS
- enable_language(C)
- 
- # Prepare environment and variables
-@@ -29,10 +29,15 @@ if(NOT DEFINED CMAKE_SYSTEM_NAME
-       set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig")
-     endif()
-   else()
--    # not debian, chech the FIND_LIBRARY_USE_LIB64_PATHS property
-+    # not debian, check the FIND_LIBRARY_USE_LIB64_PATHS and FIND_LIBRARY_USE_LIB64_PATHS properties
-+    get_property(uselib32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS)
-     get_property(uselib64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
--    if(uselib64)
-+    if(uselib32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-+      set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib32/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib32/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig")
-+    elseif(uselib64 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-       set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib64/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib64/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig")
-+    else()
-+      set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig")
-     endif()
-   endif()
- else()
-diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_NO_PKGCONFIG_PATH.cmake b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_NO_PKGCONFIG_PATH.cmake
-index 89ce4c6..25a775d 100644
---- a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_NO_PKGCONFIG_PATH.cmake
-+++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_NO_PKGCONFIG_PATH.cmake
-@@ -1,6 +1,3 @@
--# Needed for CMAKE_SYSTEM_NAME, CMAKE_LIBRARY_ARCHITECTURE and FIND_LIBRARY_USE_LIB64_PATHS
--enable_language(C)
--
- # Prepare environment and variables
- set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH FALSE)
- set(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/pc-foo")
-diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
-index c903279..bdecb8a 100644
---- a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
-+++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
-@@ -1,4 +1,4 @@
--# Needed for CMAKE_SYSTEM_NAME, CMAKE_LIBRARY_ARCHITECTURE and FIND_LIBRARY_USE_LIB64_PATHS
-+# Needed for CMAKE_SYSTEM_NAME, CMAKE_LIBRARY_ARCHITECTURE, FIND_LIBRARY_USE_LIB32_PATHS and FIND_LIBRARY_USE_LIB64_PATHS
- enable_language(C)
- 
- # Prepare environment and variables
-@@ -29,10 +29,15 @@ if(NOT DEFINED CMAKE_SYSTEM_NAME
-       set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig")
-     endif()
-   else()
--    # not debian, chech the FIND_LIBRARY_USE_LIB64_PATHS property
-+    # not debian, check the FIND_LIBRARY_USE_LIB32_PATHS and FIND_LIBRARY_USE_LIB64_PATHS propertie
-+    get_property(uselib32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS)
-     get_property(uselib64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
--    if(uselib64)
-+    if(uselib32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-+      set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib32/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib32/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig")
-+    elseif(uselib64 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-       set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib64/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib64/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig")
-+    else()
-+      set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig")
-     endif()
-   endif()
- else()
-diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_ENVIRONMENT_PATH.cmake b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_ENVIRONMENT_PATH.cmake
-index a52bcbf..df67235 100644
---- a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_ENVIRONMENT_PATH.cmake
-+++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_ENVIRONMENT_PATH.cmake
-@@ -1,4 +1,4 @@
--# Needed for CMAKE_SYSTEM_NAME, CMAKE_LIBRARY_ARCHITECTURE and FIND_LIBRARY_USE_LIB64_PATHS
-+# Needed for CMAKE_SYSTEM_NAME, CMAKE_LIBRARY_ARCHITECTURE, FIND_LIBRARY_USE_LIB32_PATHS and FIND_LIBRARY_USE_LIB64_PATHS
- enable_language(C)
- 
- # Prepare environment and variables
-@@ -29,10 +29,15 @@ if(NOT DEFINED CMAKE_SYSTEM_NAME
-       set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig")
-     endif()
-   else()
--    # not debian, chech the FIND_LIBRARY_USE_LIB64_PATHS property
-+    # not debian, check the FIND_LIBRARY_USE_LIB32_PATHS and FIND_LIBRARY_USE_LIB64_PATHS properties
-+    get_property(uselib32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS)
-     get_property(uselib64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
--    if(uselib64)
-+    if(uselib32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-+      set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib32/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig")
-+    elseif(uselib64 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-       set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib64/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig")
-+    else()
-+      set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig")
-     endif()
-   endif()
- else()
-diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_PATH.cmake b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_PATH.cmake
-index 2fabe5b..1351b6f 100644
---- a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_PATH.cmake
-+++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_PATH.cmake
-@@ -1,4 +1,4 @@
--# Needed for CMAKE_SYSTEM_NAME, CMAKE_LIBRARY_ARCHITECTURE and FIND_LIBRARY_USE_LIB64_PATHS
-+# Needed for CMAKE_SYSTEM_NAME, CMAKE_LIBRARY_ARCHITECTURE, FIND_LIBRARY_USE_LIB32_PATHS and FIND_LIBRARY_USE_LIB64_PATHS
- enable_language(C)
- 
- # Prepare environment and variables
-@@ -29,10 +29,15 @@ if(NOT DEFINED CMAKE_SYSTEM_NAME
-       set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig")
-     endif()
-   else()
--    # not debian, chech the FIND_LIBRARY_USE_LIB64_PATHS property
-+    # not debian, check the FIND_LIBRARY_USE_LIB64_PATHS and FIND_LIBRARY_USE_LIB32_PATHS properties
-+    get_property(uselib32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS)
-     get_property(uselib64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
--    if(uselib64)
-+    if(uselib32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-+      set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib32/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig")
-+    elseif(uselib64 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-       set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib64/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig")
-+    else()
-+      set(expected_path "/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig")
-     endif()
-   endif()
- else()
-diff --git a/Tests/RunCMake/FindPkgConfig/pc-bar/lib32/pkgconfig/.placeholder b/Tests/RunCMake/FindPkgConfig/pc-bar/lib32/pkgconfig/.placeholder
-new file mode 100644
-index 0000000..e69de29
-diff --git a/Tests/RunCMake/FindPkgConfig/pc-foo/lib32/pkgconfig/.placeholder b/Tests/RunCMake/FindPkgConfig/pc-foo/lib32/pkgconfig/.placeholder
-new file mode 100644
-index 0000000..e69de29
--- 
-2.9.3
-
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 003488dde914..07f719a62a8c 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -56,7 +56,7 @@ _CMAKE_UTILS_ECLASS=1
 # @ECLASS-VARIABLE: CMAKE_MIN_VERSION
 # @DESCRIPTION:
 # Specify the minimum required CMake version.
-: ${CMAKE_MIN_VERSION:=3.6.3}
+: ${CMAKE_MIN_VERSION:=3.7.2}
 
 # @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES
 # @DESCRIPTION:
diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index 73a220f0549e..971e206f13d4 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -1,3 +1 @@
-DIST qtermwidget-0.6.0.tar.xz 158312 SHA256 1ea148e67c3e28a53ca24a3c91532507ddd6c5d28611467e7a67334d945cd010 SHA512 2e6c5c4bee50244757aecf461c2f63f3d7306647693176df3587271129a3f12d188ea425d8db3704ec1c52df56d429b06472a7c628b5b916c0852752ebfdb79a WHIRLPOOL 55d3e9544f654dce4139f81e3d933a0d11e3e06e965671e4b17e590219e2e5e991b3bdb61db59203197789d943780f3f40d28f8b5d874479a44cc486ae9a6aad
-DIST qtermwidget-0.7.0.tar.xz 158556 SHA256 413d20a6b8feaf14b8e1106d3b01156e85cb3c4ea0f43ff5c1d79b95cd989748 SHA512 5470ef9179c5ac9e82474134fe87e0a09a853211d41d584c16bcac2028e7e9c83aad805d5c3be5fe405535f41151d51c989877f8c2866c1c26e47cc3cac44b27 WHIRLPOOL e192c13e0ca618f5c0b08e80450ae0eed7ea26320c24ae9f1bc48b7a829fdc7ba90cbd0b756b4e1b26273c347ff64de0dd3a86270be15c911f305bc3466a259a
 DIST qtermwidget-0.7.1.tar.xz 158172 SHA256 82b2f4d7cb58a34e866cf37b512e313f5f01c1d8a84ba532f0adf50e6d834d45 SHA512 a8660ca5355103cf9d9f72ec5213f3c04d02dff44ceaa26297960def07335596eba6b125a7b3ca1a02f8c19a99edffdee68c57ff0c3f357cc3df149d3e9c5c99 WHIRLPOOL d1cf25a9dcb173a96e779b8b382b7705e200aab9db351e22f3b78fe1d8427a831a2e505fa76159399945dc569877941a00a12809bbcfa9e7e8d1ffbadb5228a8
diff --git a/x11-libs/qtermwidget/qtermwidget-0.6.0-r1.ebuild b/x11-libs/qtermwidget/qtermwidget-0.6.0-r1.ebuild
deleted file mode 100644
index a9ac8b5c5f44..000000000000
--- a/x11-libs/qtermwidget/qtermwidget-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils multibuild
-
-DESCRIPTION="Qt terminal emulator widget"
-HOMEPAGE="https://github.com/lxde/qtermwidget"
-SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="qt4 qt5"
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-DEPEND="
-	qt4? ( dev-qt/designer:4
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4 )
-	qt5? ( dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-	default
-}
-
-mb_variantx() {
-	if [[ ${MULTIBUILD_VARIANT} == "$1" ]]; then
-		echo "${2-ON}"
-	else
-		echo "${3-OFF}"
-	fi
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DBUILD_DESIGNER_PLUGIN="$(mb_variantx qt4)"
-			-DUSE_QT5="$(mb_variantx qt5)"
-		)
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
-}
diff --git a/x11-libs/qtermwidget/qtermwidget-0.7.0.ebuild b/x11-libs/qtermwidget/qtermwidget-0.7.0.ebuild
deleted file mode 100644
index 5494ce29a942..000000000000
--- a/x11-libs/qtermwidget/qtermwidget-0.7.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="Qt terminal emulator widget"
-HOMEPAGE="https://github.com/lxde/qtermwidget"
-SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"
diff --git a/x11-misc/qcomicbook/Manifest b/x11-misc/qcomicbook/Manifest
index bed4a991f441..aa3fb9ff0dd4 100644
--- a/x11-misc/qcomicbook/Manifest
+++ b/x11-misc/qcomicbook/Manifest
@@ -1,2 +1 @@
-DIST qcomicbook-0.9.0.tar.gz 738514 SHA256 8e36f94d7b55798258b6df085324da150b0983020853eb270992157e9692abcb SHA512 e3df724d851822a1d7e72fd6a9fc3b14d5d406d97e0098ddd07a6329a3fe98cc8aa5e77d071f98399d60f231bd0d6dd17ab995aa5e784171aa69fa3fd1ce861b WHIRLPOOL 93234e38c3a589139e305497aaef6d70ffdd09c9fd7fa71e39287dbd3e37dd3a7831b549bf53a72bb3193ca29fd353c282af1a80554de838cbd26265bd23b578
 DIST qcomicbook-0.9.1.tar.gz 739887 SHA256 39bb6ba0e20569985c930b0e8bdb19ae9c5453f27e9f7c01c6d44f56fb204619 SHA512 87bd983c4442e220f1bc463e54e0ea583cddbc6becd9eec64801dc5e7e061cdac5805cba83167685ab454e41fcce329fa399d622d7f588940bf057ce4b1f423d WHIRLPOOL 2acebceb33ae273ce7cc7868dcde0cd20fde65a36d972719c995c3bb7fdecec4da06b5ae27c0d660e0d0043a5bf178effcfe518aa8fbdc2597cdc4297499797f
diff --git a/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild b/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild
deleted file mode 100644
index 6047fae6281b..000000000000
--- a/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CMAKE_IN_SOURCE_BUILD=1
-PLOCALES="cs_CZ de_DE es_ES fi_FI fr_CA fr_FR it_IT ko_KR nl_NL pl_PL pt_BR ru_RU uk_UA zh_CN"
-inherit cmake-utils flag-o-matic l10n
-
-DESCRIPTION="A viewer for comic book archives containing jpeg/png images"
-HOMEPAGE="http://qcomicbook.org/"
-SRC_URI="http://qcomicbook.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug"
-
-DEPEND="dev-qt/qtgui:4
-	app-text/poppler[qt4]"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_prepare() {
-	rm_loc() {
-	        rm "i18n/${PN}_${1}.ts" || die "removing ${1} locale failed"
-	}
-	rm "i18n/${PN}_en_EN.ts" || die 'removing redundant english locale failed'
-	l10n_find_plocales_changes "i18n" "${PN}_" ".ts"
-	l10n_for_each_disabled_locale_do rm_loc
-
-	# fix desktop file
-	sed -i \
-		-e '/^Encoding/d' \
-		-e '/^Icon/s/.png//' \
-		-e '/^Categories/s/Application;//' \
-		"data/${PN}.desktop" || die 'sed on desktop file failed'
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "For using QComicBook with compressed archives you may want to install:"
-	elog "    app-arch/p7zip"
-	elog "    app-arch/unace"
-	elog "    app-arch/unrar or app-arch/rar"
-	elog "    app-arch/unzip"
-}