Sync with portage [Wed Nov 7 12:29:35 MSK 2018].

2018-11-07 12:29:35 +03:00 · 2018-11-07 12:29:35 +03:00 · e42ff9f05c
commit e42ff9f05c
parent 56eee4e5b3
495 changed files with 9817 additions and 781 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
@ -16,7 +16,7 @@ fi

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="encode mad vorbis"

 COMMON_DEPEND="
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/grs/grs-0.6-r1.ebuild
+++ b/app-portage/grs/grs-0.6-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI="6"
@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 arm x86"
 fi

 DESCRIPTION="Suite to build Gentoo Reference Systems"
--- a/app-portage/grs/grs-9999.ebuild
+++ b/app-portage/grs/grs-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI="6"
@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz
 	https://dev.gentoo.org/~blueness/${PN}/${ISO}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi

 DESCRIPTION="Suite to build Gentoo Reference Systems"
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@ -5,3 +5,4 @@ DIST xapian-omega-1.4.5.tar.xz 502820 BLAKE2B 3077a9a4fd177daa7f8470bea0b8dde254
 DIST xapian-omega-1.4.6.tar.xz 510012 BLAKE2B 2c6d3479fe02eb3b44ef0995b0dfc2ce47012104bc860532967f234ccb7bb2a3357337419fbf5b79b42d0f598608fe9a071edca2195e4f025fb69760091c78ec SHA512 9376145c9c7c728bf444f5891777fe946bc574a4c91ef65779aae4cd2f40c76b33cde1231f654f23de32df8a4eea4aa0c69868d269ec79fba3abad2567ffb80d
 DIST xapian-omega-1.4.7.tar.xz 510644 BLAKE2B e2106b07a0ccf765dad25c3e83a745936156b002e638fbd9cbd1fd194f507ad663c305fc4981d72f92a74f645601aa83b1bc3133d10d8d4c308f28657a90a356 SHA512 e7e2c7dfa3e76ccdde103b34aa1b0732033e9f218346a81f1b0b865c6e2d17c356b96a4522a3a2273fb55eb2fbd2dd57e835368771f46c9fb458c0c11329893b
 DIST xapian-omega-1.4.8.tar.xz 521352 BLAKE2B 01d914c0dcd7e8a8cf7ec4b997af49c01883d83a5c9bd1c59da058d3329dab5f517bb4d3aa243a3e47ad36311acafd64505fda1ecf86d3605a38ef70760d8711 SHA512 5d27c03891ff941b23c899b1a293ed9be0129de08ff46156380638408360ea6e4aa2dfb4fe0ffb13726807849802fe8d19f6dc817a52ec5bf50c2bf94ed94c2f
+DIST xapian-omega-1.4.9.tar.xz 522100 BLAKE2B af1d01d918ff6b6355bd3ebdd28883d7f833384ba7ca53aa7e8affef77d71bc74602476ef7c6a8b11b67a60e0ff2e007e0d4da38020ddcac9d7ac7f2df4774d9 SHA512 3e784691c7de807a2eb9c00c97e03cfb7e66686d54e0ee572facad7bcfbdcc2c7aba4b60996bc56657a5ecabc79984e838b9d207cf6f1b7df1df90c108d17d1d
--- a/app-text/xapian-omega/xapian-omega-1.4.9.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.9.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+HOMEPAGE="https://xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/xapian:0/30
+	dev-lang/perl
+	dev-libs/libpcre
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/glibmm/glibmm-2.56.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.56.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"

 LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"

 RDEPEND="
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/phpmyadmin/phpmyadmin-4.8.3-r1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.8.3-r1.ebuild
@ -14,7 +14,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"

 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"

 RDEPEND="
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/leiningen-bin/Manifest
+++ b/dev-java/leiningen-bin/Manifest
@ -1,2 +1,4 @@
 DIST leiningen-2.8.0-standalone.jar 13541842 BLAKE2B 79697751b9da90a3f61bd4b8722436d1af1ce9f8db5c0e3a68d15d006f2afcb9518ab2034554b9b8a8e5f8bb991b304d51b8f45fb9a77d7337718035dc271e7d SHA512 e16359b2d211f9a72eeb9b672a94155f49531cbb731df11451b76ec30ad83be4a22e0b2ecc582bb01fdadd6822f56f27d42fa214df222f6c95e0fde64cb305ed
 DIST leiningen-2.8.0.sh 4335 BLAKE2B 951cc9b69e726bbb84c88b8b6407386c878cb1521c5cd79c7ce39ed48805cd24e9af0102f21cd7e852a024830b151751d42e7524f729bcca40f0e7de013ceb8b SHA512 08a5e2fc68ac3bd34dc32558088bd2ff79c9d72c54a610cfcd8c79fa5dcb98ad28d6950cb91b88081d024d5be881a168c2f9235c7888aa36c0f0e7e1f124169f
+DIST leiningen-2.8.1-standalone.jar 13541128 BLAKE2B f38c5d9e8e0088af352f915c2e3290bbbd97fd791607e1553109084a302c6c58d37f1d712b68b31d16d5de83239a9908bcf69aad0eaf1d2dc2e358090665fab8 SHA512 7c585d25f7089dbd718d84711b202b087ec4987f2e1a448fc00cb789a12da88967c048f2de1d087c9e81c6fcfd8b82825117220ba729096b4c946ae25504c716
+DIST leiningen-2.8.1.sh 4461 BLAKE2B ed3fe5421bfdf4fc3a0a8d09bba7c3ca4de4571bd2dcd26251af338dcff0baaa71208c83317b62067f2fcde4a70aef5593cc7c31742eed6ce5db8c3ce8a80b9b SHA512 77ef29885a87e7c23b972d519cdb052b94a74d63f8a455935c199f5f7c04ab30ed06503792ea5a21ac047c7abdcf7e4e72e54114b96f984e4bcb9790e97909de
--- a/dev-java/leiningen-bin/leiningen-bin-2.8.1.ebuild
+++ b/dev-java/leiningen-bin/leiningen-bin-2.8.1.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_PNV="${MY_PN}-${PV}"
+
+DESCRIPTION="Automate Clojure projects without setting your hair on fire"
+HOMEPAGE="https://leiningen.org/"
+SRC_URI="
+	https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.zip -> ${MY_PNV}-standalone.jar
+	https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh
+"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+RESTRICT="test"
+
+src_unpack() {
+	mkdir -p "${S}" || die "Can't mkdir ${S}"
+	cd "${S}"	|| die "Can't enter ${S}"
+	for file in ${A}; do
+		einfo "Copying ${file}"
+		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
+	done
+}
+
+src_prepare() {
+	einfo "Copying leinrc"
+	cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc"
+	einfo "Patching leinrc"
+	sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc"
+
+	einfo "Renaming lein-pkg"
+	# Rename generically to help user patching
+	mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein"
+
+	einfo "Patching lein"
+	java-pkg_init_paths_
+	sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${EPREFIX}/${JAVA_PKG_JARDEST#/}/${PN}.jar|" "${S}/lein" \
+		|| die "Can't patch LEIN_JAR in lein"
+
+	default
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin "${S}/lein"
+	java-pkg_newjar "${MY_PNV}-standalone.jar"
+	insinto /etc
+	doins "${S}/leinrc"
+	fperms 0644 "/etc/leinrc"
+}
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@ -1,7 +1,6 @@
 DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
 DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
 DIST gcc-4.9-gpl-2016-src.tar.gz 76361760 BLAKE2B 681aac3dd2e04110f58637cc9fe1eb663ce55af16a929a446eb59ce338bec9357e65517890f7fa01d61eec9c5041336722b2b94a5fea27a55ade686fe1fe9fbc SHA512 da1e26b4dbbe0ec634eab4e64d1cdb2632300c24f0885bc72fb57edba6ce29ab92b04eaedd8f8077ea623f1ef1428f53616e8c8d6630328d9790d968b60c67cf
-DIST gcc-4.9.4-patches-1.2.tar.bz2 25447 BLAKE2B 3141897688409c84cab4ffea67deb220d2218107f279a0cc1758d08c858f3a3856150df48ae37d2f14c6f69bc82de1e87f22cc356f179dfdf47ae9eef28a4182 SHA512 61b1e86e8dbc2838e7b5c88c4a3bab9ed5b6485258b7971799850ffd97cb67ad2564552af4e9ebc860dcc2a4b786c91d2079469468fb95f8e28e2fc981b4c812
 DIST gcc-4.9.4-patches-1.3.tar.bz2 26060 BLAKE2B a61cb29111e8a9e35d810c0c557e901fc0d78e3b62027f5ea622d29becff9492e350c932824b23e5a38604bc3fa6c39fed9db902df4f830a3a362f1a1c2d9f58 SHA512 0214da6712a1b583f028be60e562f742d3d484d930976e2fce7be090113517c0e07faa20f750411b5125902f38a9944fe0c1dc8605d161c5bb11843acdebab75
 DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285
 DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db
--- a/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild
@ -50,7 +50,7 @@ SRC_URI+="

 LICENSE+=" GPL-2 GPL-3"
 SLOT="${TOOLCHAIN_GCC_PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bootstrap"

 RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
--- a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.2"
-UCLIBC_VER="1.0"
-
-# Hardened gcc 4 stuff
-PIE_VER="0.6.4"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
-SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
-# uclibc need tls and nptl support for SSP support
-# uclibc need to be >= 0.9.33
-SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
-#end Hardened stuff
-
-TOOLCHAIN_GCC_PV=4.9.4
-
-inherit eutils toolchain-funcs toolchain
-
-REL=4.9
-MYP=gcc-${REL}-gpl-${PV}-src
-BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
-BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
-
-DESCRIPTION="GNAT Ada Compiler - GPL version"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI+="
-	http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f
-		-> ${P}-src.tar.gz
-	http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db
-		-> ${MYP}.tar.gz
-	http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d
-		-> gcc-interface-${REL}-gpl-${PV}-src.tar.gz
-	bootstrap? (
-		amd64? (
-			http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
-			${BTSTRP_AMD64}.tar.gz
-		)
-		x86? (
-			http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 ->
-			${BTSTRP_X86}.tar.gz
-		)
-	)"
-
-LICENSE+=" GPL-2 GPL-3"
-SLOT="${TOOLCHAIN_GCC_PV}"
-KEYWORDS="amd64 x86"
-IUSE="bootstrap"
-
-RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.8 )
-	>=sys-devel/binutils-2.20"
-
-PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-
-S="${WORKDIR}"/${MYP}
-
-FSFGCC=gcc-${TOOLCHAIN_GCC_PV}
-
-pkg_setup() {
-	toolchain_pkg_setup
-
-	if use amd64; then
-		BTSTRP=${BTSTRP_AMD64}
-	else
-		BTSTRP=${BTSTRP_X86}
-	fi
-	if use bootstrap; then
-		GCC="${WORKDIR}"/${BTSTRP}/bin/gcc
-	else
-		GCC=${ADA:-$(tc-getCC)}
-	fi
-	CC=${GCC}
-	local base=$(basename ${GCC})
-	CXX="${base/gcc/g++}"
-	GNATMAKE="${base/gcc/gnatmake}"
-	GNATBIND="${base/gcc/gnatbind}"
-	if [[ ${base} != ${GCC} ]] ; then
-		local path=$(dirname ${GCC})
-		GNATMAKE="${path}/${GNATMAKE}"
-		GNATBIND="${path}/${GNATBIND}"
-		CXX="${path}/${CXX}"
-	fi
-}
-
-src_unpack() {
-	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
-		eerror "You need a gcc compiler that provides the Ada Compiler:"
-		eerror "1) use gcc-config to select the right compiler or"
-		eerror "2) set the bootstrap use flag"
-		die "ada compiler not available"
-	fi
-
-	GCC_A_FAKEIT="${P}-src.tar.gz
-		${MYP}.tar.gz
-		${FSFGCC}.tar.bz2
-		gcc-interface-${REL}-gpl-${PV}-src.tar.gz"
-	if use bootstrap; then
-		GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz"
-	fi
-
-	toolchain_src_unpack
-	if use bootstrap; then
-		rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die
-	fi
-}
-
-src_prepare() {
-	mv ../${P}-src/src/ada gcc/ || die
-	mv ../gcc-interface-${REL}-gpl-${PV}-src gcc/ada/gcc-interface || die
-
-	sed -i \
-		-e "s:gnatmake:${GNATMAKE}:g" \
-		gcc/ada/Make-generated.in || die "sed failed"
-
-	sed -i \
-		-e "/xoscons/s:gnatmake:${GNATMAKE}:g" \
-		gcc/ada/gcc-interface/Makefile.in || die "sed failed"
-
-	mv ../${FSFGCC}/gcc/doc/gcc.info gcc/doc/ || die
-	mv ../${FSFGCC}/libjava . || die
-	rm -r ../${FSFGCC} || die
-
-	cd ..
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	rm patch/10_all_default-fortify-source.patch
-	rm piepatch/34_all_gcc48_config_i386.patch
-	cd -
-
-	if has_version '<sys-libs/glibc-2.12' ; then
-		ewarn "Your host glibc is too old; disabling automatic fortify."
-		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
-		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	fi
-
-	# Bug 638056
-	epatch "${FILESDIR}/${P}-bootstrap.patch"
-
-	toolchain_src_prepare
-
-	use vanilla && return 0
-	# Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
-}
-
-src_configure() {
-	local trueGCC_BRANCH_VER=${GCC_BRANCH_VER}
-	GCC_BRANCH_VER=$(gcc-version)
-	downgrade_arch_flags
-	GCC_BRANCH_VER=${trueGCC_BRANCH_VER}
-	toolchain_src_configure \
-		--enable-languages=ada \
-		--disable-libada \
-		CC=${GCC} \
-		GNATBIND=${GNATBIND} \
-		GNATMAKE=yes
-}
-
-src_compile() {
-	unset ADAFLAGS
-	toolchain_src_compile
-	gcc_do_make "-C gcc gnatlib-shared"
-	ln -s gcc ../build/prev-gcc || die
-	ln -s ${CHOST} ../build/prev-${CHOST} || die
-	gcc_do_make "-C gcc gnattools"
-}
-
-src_install() {
-	toolchain_src_install
-	cd "${D}"${BINPATH}
-	for x in gnat*; do
-		# For some reason, g77 gets made instead of ${CTARGET}-g77...
-		# this should take care of that
-		if [[ -f ${x} ]] ; then
-			# In case they're hardlinks, clear out the target first
-			# otherwise the mv below will complain.
-			rm -f ${CTARGET}-${x}
-			mv ${x} ${CTARGET}-${x}
-		fi
-
-		if [[ -f ${CTARGET}-${x} ]] ; then
-			if ! is_crosscompile ; then
-				ln -sf ${CTARGET}-${x} ${x}
-				dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
-					/usr/bin/${x}-${GCC_CONFIG_VER}
-			fi
-			# Create versioned symlinks
-			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
-				/usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER}
-		fi
-
-		if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then
-			rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER}
-			ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER}
-		fi
-	done
-}
-
-pkg_postinst () {
-	toolchain_pkg_postinst
-	einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
-	einfo "The compiler binary is gcc-${TOOLCHAIN_GCC_PV}"
-	einfo "Even if the c/c++ compilers are using almost the same patched"
-	einfo "source as the sys-devel/gcc package its use is not extensively"
-	einfo "tested, and not supported for updating your system, except for ada"
-	einfo "related packages"
-}
--- a/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild
@ -36,7 +36,7 @@ SRC_URI+="
 	)"

 LICENSE+=" GPL-2 GPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+bootstrap"

 RDEPEND="!sys-devel/gcc:${GCC_CONFIG_VER}"
--- a/dev-lang/ruby/ruby-2.3.8.ebuild
+++ b/dev-lang/ruby/ruby-2.3.8.ebuild
@ -30,7 +30,7 @@ SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
 		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"

 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"

 RDEPEND="
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/atk/atk-2.28.1.ebuild
+++ b/dev-libs/atk/atk-2.28.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"

 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="+introspection nls test"

 RDEPEND="
--- a/dev-libs/glib/glib-2.56.2.ebuild
+++ b/dev-libs/glib/glib-2.56.2.ebuild
@ -21,7 +21,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"

-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"

 # Added util-linux multilib dependency to have libmount support (which
 # is always turned on on linux systems, unless explicitly disabled, but
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.56.1.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.56.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"

 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
--- a/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -17,7 +17,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

 # virtual/pkgconfig needed at runtime, bug #505408
 # We force glib and g-i to be in sync by this way as explained in bug #518424
--- a/dev-libs/gost-engine/Manifest
+++ b/dev-libs/gost-engine/Manifest
@ -0,0 +1 @@
+DIST gost-engine-1.1.0.3_p20181031.tar.gz 473151 BLAKE2B fb8dc737c3bda181de168d918744d6e036886753e70cfcd0516499dd5d9a1ba3af0d44d26fc50570318375a142adfec532327dc57fac5996266b12551631b5fd SHA512 9f0df3c48191aea75d3fee5b5886ba32451889bdbb97c5e540f14a57d8d41606d858769a70b51c0c2c958565b347c5a613004e7c3f81658281d6a3eecd030707
--- a/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031.ebuild
+++ b/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A reference implementation of the Russian GOST crypto algorithms for OpenSSL"
+HOMEPAGE="https://github.com/gost-engine/engine"
+IUSE="test"
+RESTRICT="!test? ( test )"
+SLOT="0/${PV}"
+
+COMMON_DEPEND=">=dev-libs/openssl-1.1:0="
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	test? (
+		dev-lang/perl
+	)"
+RDEPEND="${COMMON_DEPEND}"
+
+LICENSE="openssl"
+
+DOCS=( INSTALL.md README.gost README.md )
+
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/gost-engine/engine.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/gost-engine/engine/archive/e5cc3684f3b3ad40e186e23b00b253d234df92ab.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/engine-e5cc3684f3b3ad40e186e23b00b253d234df92ab"
+fi
--- a/dev-libs/gost-engine/gost-engine-9999.ebuild
+++ b/dev-libs/gost-engine/gost-engine-9999.ebuild
@ -28,7 +28,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gost-engine/engine.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64"
+	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/gost-engine/engine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/engine-${PV}"
 fi
--- a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild
+++ b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
 IUSE="+daemon elibc_musl pam static-libs +tools"

 RDEPEND="pam? ( virtual/pam )"
--- a/dev-libs/libinput/libinput-1.11.3.ebuild
+++ b/dev-libs/libinput/libinput-1.11.3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"

 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
 IUSE="doc input_devices_wacom"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@ -5,3 +5,4 @@ DIST xapian-bindings-1.4.5.tar.xz 1118884 BLAKE2B 507b06f0121e5a56224250bfe7b197
 DIST xapian-bindings-1.4.6.tar.xz 1121532 BLAKE2B ecac35f9510fadb39f260c1ebd03220ebe01131e4a5fcc2842778adccdf9bf3e3ae6161dd66dc75774bfb1643f1dccc99a3bbb99894e49dbbdd65f838f827a4d SHA512 e1d8d4c79ef8eb1b890be955b14eca7e9c7aafc6051cf9080d67948455f82ed68ab518343f532cde2a1c9e07d94b3aae8b8f5130db158c6badc9b6d118ceb733
 DIST xapian-bindings-1.4.7.tar.xz 1121700 BLAKE2B f8492113b76aba322c975aa2b957a627a32e5209d8b79f435dc85c899cf14619af6165265e624e2ba8806f3c91dd35d71d98c4a47f5d6f4fba1b7fb83700c0d0 SHA512 c904cd3abf19d68495b0487ea77265fdc92a3cd8b1c2437b89034efd349ce41198bbc4abca49f259f71a1ba0fd269b2cf9b6dd4c1607678a73cbed4de9c5a1d5
 DIST xapian-bindings-1.4.8.tar.xz 1123812 BLAKE2B 5aa496ff3cfe06a40fa8db6a04cdc9041f4a0d9f12c7a61565f10c7d360490a7c8a7c745d91c9eda45b9d9bc58bd6a2bbae02aa9dd7ff1949ac59f7e09b090df SHA512 f979c32b096ecdc7a71b2bd032c6d0e7131f3d304e47e44005989ca79ea1f940c39626c60a8e52ff3cdb2cb380aa5ddf82a99bae08e06629c0bd47d8e0bfa7cc
+DIST xapian-bindings-1.4.9.tar.xz 1123628 BLAKE2B 918748bb99b826485127b16511ae2fe6e7965102738308fc675eca3018c8a7131fd65f54cc396912367c4c6f43c7c28b1ba07591567fe3ae646c3e1480439d0d SHA512 cddc6cedfd571d565619ade0a4c9bfee8d688ca3d06d77368c8d673d3c9d1296b652122836debc84a4d54724c2bf0639a009396bf587ed4b8901a6bfe508851d
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.9.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.9.ebuild
@ -0,0 +1,305 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="threads(+)"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+PHP_EXT_NAME="xapian"
+PHP_EXT_INI="yes"
+PHP_EXT_OPTIONAL_USE="php"
+
+USE_RUBY="ruby22 ruby23 ruby24"
+RUBY_OPTIONAL="yes"
+
+inherit java-pkg-opt-2 mono-env multibuild php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
+
+DESCRIPTION="SWIG and JNI bindings for Xapian"
+HOMEPAGE="http://www.xapian.org/"
+SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="java lua mono perl php python ruby tcl"
+REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	ruby? ( || ( $(ruby_get_use_targets) ) )"
+
+COMMONDEPEND=">=dev-libs/xapian-1.4.9:0/30
+	lua? ( dev-lang/lua:= )
+	perl? ( dev-lang/perl:= )
+	python? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	ruby? ( $(ruby_implementations_depend) )
+	tcl? ( dev-lang/tcl:= )
+	mono? ( dev-lang/mono )"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.6 )"
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}/${P}"
+
+has_basic_bindings() {
+	# Update this list if new bindings are added that are not built
+	# multiple times for multiple versions like php, python and ruby are
+	return $(use mono || use java || use lua || use perl || use tcl)
+}
+
+php_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_copy_sources
+}
+
+php_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_foreach_variant "$@"
+}
+
+ruby_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_copy_sources
+}
+
+ruby_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_foreach_variant "$@"
+}
+
+pkg_setup() {
+	use mono && mono-env_pkg_setup
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if use php; then
+		local php_slot
+		for php_slot in $(php_get_slots); do
+			# Unfortunately required for php-ext-source-r3_createinifiles().
+			mkdir "${WORKDIR}/${php_slot}"
+		done
+	fi
+}
+
+src_prepare() {
+	use java && java-pkg-opt-2_src_prepare
+
+	# http://trac.xapian.org/ticket/702
+	export XAPIAN_CONFIG="/usr/bin/xapian-config"
+
+	if use php; then
+		php_copy_sources
+	fi
+
+	if use python; then
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		ruby_copy_sources
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	if has_basic_bindings ; then
+		local conf=(
+			--disable-documentation
+			$(use_with mono csharp)
+			$(use_with java)
+			$(use_with lua)
+			$(use_with perl)
+			$(use_with tcl)
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--without-ruby
+		)
+
+		if use java; then
+			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
+		fi
+
+		if use perl; then
+			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
+			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
+		fi
+
+		if use lua; then
+			local -x LUA_INC="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_INC lua)"
+			local -x LUA_LIB="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_CMOD lua)"
+		fi
+
+		econf "${conf[@]}"
+	fi
+
+	php_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-python
+			--without-python3
+			--without-ruby
+			--without-tcl
+		)
+		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
+			myconf+=(
+				--with-php
+				--without-php7
+			)
+			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
+			myconf+=(
+				--without-php
+				--with-php7
+			)
+			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		fi
+
+		econf "${myconf[@]}"
+	}
+
+	if use php; then
+		addpredict /usr/share/snmp/mibs/.index
+		addpredict /var/lib/net-snmp/mib_indexes
+
+		php_foreach_impl run_in_build_dir php_configure
+	fi
+
+	python_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-ruby
+			--without-tcl
+		)
+		if python_is_python3; then
+			myconf+=( --with-python3 )
+		else
+			myconf+=( --with-python )
+		fi
+
+		# Avoid sandbox failures when compiling modules
+		addpredict "$(python_get_sitedir)"
+
+		econf "${myconf[@]}"
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+
+	ruby_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--with-ruby
+			--without-tcl
+		)
+		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
+
+		econf "${myconf[@]}"
+	}
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir ruby_configure
+	fi
+}
+
+src_compile() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake
+	fi
+
+	if use python; then
+		unset PYTHONDONTWRITEBYTECODE
+		python_foreach_impl run_in_build_dir emake
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake
+	fi
+}
+
+src_test() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake check
+	fi
+}
+
+src_install() {
+	if has_basic_bindings ; then
+		emake DESTDIR="${D}" install
+	fi
+
+	if use java; then
+		java-pkg_dojar java/built/xapian.jar
+		# TODO: make the build system not install this...
+		java-pkg_doso java/.libs/libxapian_jni.so
+		rm -rf "${D}var" || die "could not remove java cruft!"
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		php-ext-source-r3_createinifiles
+		# php-ext-source-r3_createinifiles() changes current directory.
+		cd "${S}"
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	# For some USE combinations this directory is not created
+	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
+		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}" || die
+	fi
+
+	dodoc AUTHORS HACKING NEWS TODO README
+}
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@ -5,3 +5,4 @@ DIST xapian-core-1.4.5.tar.xz 2810612 BLAKE2B 7784e69e3ca064751d829173949fcde656
 DIST xapian-core-1.4.6.tar.xz 2839964 BLAKE2B ab35e3098d8cf99656539968171073683811dc9a98b7d26e389c0cb1e8d1b70f9007e0ba61defe496713cb0f304a0fed7afa253174e900c0756084ab40721573 SHA512 f08168eba26a24ea00c2219d2cdfac1d904b51162fdd98d437564786375245e00010986a7d6e9c8c7548ae19aab80434b5cb0051252f902b40db2976b1008fe2
 DIST xapian-core-1.4.7.tar.xz 2874172 BLAKE2B 917a35ca717ed4437f4a617ce0b6ac07d5936e07aac6bfa9d6878c12ed0c38e7ca994ad943b6dc7a5cd2fe131a445c5a7859f2286c2201dd048020569ce1a0bf SHA512 9e77a78bd63036966ebb9bbed91e36fef17b37c9465c8d4b7dc8041f0e24b040e6520de645babfeeade952771d145176a204328718cfa8bc2291bb6fdbe840d2
 DIST xapian-core-1.4.8.tar.xz 2880432 BLAKE2B 8468a33614d8c7617755cfe4cc79e72ab42612a79be9fb684525e268efe80c42ce902a60a44dc5548c70b719d752e15927ce24b4ab457905022ae806bffb1f11 SHA512 9ed1f34ec1bf53a4dc628ebb8d080af79a4ac6a315bf1ae52441f0ac3a63e5478ed02887382116b28157b926e685fdc730489426edce560aa4bba27cb7295e48
+DIST xapian-core-1.4.9.tar.xz 2880024 BLAKE2B 25272128fbbd7cb23dab92c87be03fee8dae5b742f26a66b9c51c649a7826639e52124f5f0748d3c12cce81a7875ed217931ddbe2b04303a08709c4a773a617f SHA512 1af23815ff9358d6407723d1a7d3dc00df8f45f4808ccaa4c57f38197763fdc2d62cb7b080fab737408db42ced85707021eac881d80767248ea22aff8a2e4aa3
--- a/dev-libs/xapian/xapian-1.4.9.ebuild
+++ b/dev-libs/xapian/xapian-1.4.9.ebuild
@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils multilib-minimal
+
+MY_P="${PN}-core-${PV}"
+
+DESCRIPTION="Xapian Probabilistic Information Retrieval library"
+HOMEPAGE="http://www.xapian.org/"
+SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/30" # ABI version of libxapian.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-solaris"
+IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="inmemory? ( chert )"
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	local myconf=""
+
+	if use cpu_flags_x86_sse2; then
+		myconf="${myconf} --enable-sse=sse2"
+	else
+		if use cpu_flags_x86_sse; then
+			myconf="${myconf} --enable-sse=sse"
+		else
+			myconf="${myconf} --disable-sse"
+		fi
+	fi
+
+	myconf="${myconf} $(use_enable static-libs static)"
+
+	use glass || myconf="${myconf} --disable-backend-glass"
+	use chert || myconf="${myconf} --disable-backend-chert"
+	use inmemory || myconf="${myconf} --disable-backend-inmemory"
+
+	myconf="${myconf} --enable-backend-remote --program-suffix="
+
+	ECONF_SOURCE=${S} econf $myconf
+}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/xapian/postingsource.h
+	/usr/include/xapian/attributes.h
+	/usr/include/xapian/valuesetmatchdecider.h
+	/usr/include/xapian/version.h
+	/usr/include/xapian/version.h
+	/usr/include/xapian/types.h
+	/usr/include/xapian/positioniterator.h
+	/usr/include/xapian/registry.h
+)
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# bug #573466
+	ln -sf "${D}usr/bin/xapian-config" "${D}usr/bin/xapian-config-1.3"
+
+	use doc || rm -rf "${D}usr/share/doc/xapian-core-${PV}"
+
+	dodoc AUTHORS HACKING PLATFORMS README NEWS
+
+	prune_libtool_files --all
+}
+
+multilib_src_test() {
+	emake check VALGRIND=
+}
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/commonmark/commonmark-0.8.1.ebuild
+++ b/dev-python/commonmark/commonmark-0.8.1.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"

 RDEPEND="
--- a/dev-python/ipython/ipython-5.4.1-r1.ebuild
+++ b/dev-python/ipython/ipython-5.4.1-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -23,6 +23,7 @@ CDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	dev-python/pickleshare[${PYTHON_USEDEP}]
 	>=dev-python/prompt_toolkit-1.0.4[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
 	dev-python/simplegeneric[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
--- a/dev-python/ipython/ipython-5.8.0.ebuild
+++ b/dev-python/ipython/ipython-5.8.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -24,6 +24,7 @@ CDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	dev-python/pickleshare[${PYTHON_USEDEP}]
 	>=dev-python/prompt_toolkit-1.0.4[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
 	dev-python/simplegeneric[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@ -3,4 +3,4 @@ DIST pbr-1.10.0.tar.gz 111425 BLAKE2B 2cef589ada2892dd8357ad3248c4b544d58c699d24
 DIST pbr-3.1.1.tar.gz 102665 BLAKE2B 301515d50f8550f5553a29faacb1daef589b41b8116320abd4552bb67886498d89eced1f95e1efdd6ac0511a5587eb479dc9d2963a74e92300463c3c53201e7d SHA512 c01fb83678f8fc3acddc153dd341a17ed9d602b6770f0ff244b1c5b54c37d4ddcbd0c3d726f7d7020865819e02797c1c79a0c15e9ee2ae5c1510fce7112b2a3a
 DIST pbr-4.1.1.tar.gz 108683 BLAKE2B 5c0157ff14590113e7baae0bdca1ff46108a7a10d6eae8bd0a2d06bee62b4aa65eed25c900ae1b67324ac6b416641081c63a274c9694db1877b5d9073c1c04d9 SHA512 ed739901b3a2d1eafa1d4d408a39f1e5d967776571efe0913877145aaccee3114558e107a4e5704403288324c63a08cfbca07a3409bd1baafcbc33105abdf3e4
 DIST pbr-4.2.0.tar.gz 107958 BLAKE2B 716283ceb7b1a8da41e77441c7526bf8cbdb5be7c710013630d3bbddf7de0ce37f3abd063f6103f3ec27fc5c09796f6452d8117df3b533b3c7377bf6dce7d37f SHA512 d46d93333b4d0d3fd5c14e0a474ca7beceddf794a5dbcf66f810993b8d33b48602518072effcd429566f4eede2a38c4aec289df262c2c0e7ab4b82474e14f14d
-DIST pbr-5.1.0.tar.gz 114412 BLAKE2B 9a886d3ee564f800208529be7a6e1999691a92ce68d8e9da09f36ff7b4c5fe497461ec2c21d09e969e912a8475aaa07154b74fc110ca1f58d62366e67df412b5 SHA512 f09b75c18e1acebb60e478c660aa6cc86c8c52834db40972e74729a13d53990d15d9efc887a584b8176af892845fed861a9cc3291bccc5d85673612c10eb0154
+DIST pbr-5.1.1.tar.gz 113476 BLAKE2B 9e4857f13eba2e18abffa3d7c56f05eb5a5997b855f02770a807cec110e6eb4596b333b67beba2a507bb8cb55fcd3ed87a012b4a3a245b81d0a74737c010f157 SHA512 cd6f8bdc6db80841e948dbb278423556861aa681b970050a40c920dd00e32704a29cfdd28aabd4d14e0e577fff1bc816f0646a62c9450d0d85233ab5802606f1
--- a/dev-python/pbr/pbr-5.1.1.ebuild
+++ b/dev-python/pbr/pbr-5.1.1.ebuild
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
--- a/dev-ros/rostest/rostest-1.14.3.ebuild
+++ b/dev-ros/rostest/rostest-1.14.3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -29,4 +29,5 @@ DEPEND="${DEPEND}
 	test? (
 		${RDEPEND}
 		dev-cpp/gtest
+		dev-ros/rostopic
 	)"
--- a/dev-ros/rostest/rostest-9999.ebuild
+++ b/dev-ros/rostest/rostest-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -29,4 +29,5 @@ DEPEND="${DEPEND}
 	test? (
 		${RDEPEND}
 		dev-cpp/gtest
+		dev-ros/rostopic
 	)"
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
--- a/dev-ruby/ed25519/ed25519-1.2.4.ebuild
+++ b/dev-ruby/ed25519/ed25519-1.2.4.ebuild
@ -18,7 +18,7 @@ SRC_URI="https://github.com/crypto-rb/ed25519/archive/v${PV}.tar.gz -> ${P}.tar.

 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""

 all_ruby_prepare() {
--- a/dev-ruby/net-ssh/net-ssh-5.0.2.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-5.0.2.ebuild
@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${P

 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="ed25519 test"

 ruby_add_rdepend "virtual/ruby-ssl ed25519? ( dev-ruby/ed25519 dev-ruby/bcrypt_pbkdf )"
--- a/dev-ruby/stringex/Manifest
+++ b/dev-ruby/stringex/Manifest
@ -1,2 +1,3 @@
 DIST stringex-2.8.2.gem 130048 BLAKE2B 3f3e88d69924a26eba830d94d9bc9240eb2b7a32cc9d3e444fb55af5f462d2091f2069c8c0ba39c9bebc7c4a48b54d23ee5b3fb9ba18f93a4c122d5b2f237e51 SHA512 e5750df84eeea6787d85f9289200d1f32fe9feb31c44c583a8e2e153c7d6cbcd940ca1cfd7cfd6f9a958e4a866f0ea3204ddb584ff2a43893da274e9813a4497
 DIST stringex-2.8.4.gem 130048 BLAKE2B 69cf894a0d7a6828197d70c474f6075083c41cf36171808d8f16763283654c7907938411b44bdd6a2af85ae445442bf018788c851f72276f89eeae467c01da59 SHA512 5ab6e096133e49ef426c8faee897bd8fbb6fc61db87a80ced13900f7191639b8f5abe223bdfc5170e5049ef7b340883a436ab53feefb708c47207d6fead9094a
+DIST stringex-2.8.5.gem 130048 BLAKE2B c07eaaee07bf348690166b41b0846bc49eb49c5ba9e39c7eaeea2a3a60d6089edd7c7d1d75fd9a5208c9883c4bff8840ccf56c6f186daeabcf79e7f4fb6b4d25 SHA512 53f9908f176f465d2e884e92dffb26abcdf75593c94ee8250253da0eb29eddf489cf5b3f539135659ad4c0e2dd738d2affff6a946c50abd5f36517148d8338ce
--- a/dev-ruby/stringex/stringex-2.8.5.ebuild
+++ b/dev-ruby/stringex/stringex-2.8.5.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Extensions for Ruby's String class"
+HOMEPAGE="https://github.com/rsl/stringex"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+IUSE="test"
+
+# we could rely on activerecord[sqlite3], but since we do not remove the
+# sqlite3 adapter from activerecord when building -sqlite3, it's easier
+# to just add another dependency, so the user doesn't have to change the
+# USE flags at all.
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/i18n-0.7.0:0.7
+		dev-ruby/redcloth
+		dev-ruby/test-unit:2
+		>=dev-ruby/activerecord-3
+		dev-ruby/sqlite3 )"
+
+all_ruby_prepare() {
+	sed -i -e '1agem "i18n", "~>0.7.0"' test/test_helper.rb || die
+}
--- a/dev-ruby/timers/Manifest
+++ b/dev-ruby/timers/Manifest
@ -1 +1,2 @@
 DIST timers-4.1.2.gem 15360 BLAKE2B 2480b6051825e26c9c30418e4acd7f9d8d0173d21038349ff16c086a2712eff7e9349720d270ed6505d8f90b14fc4dc99cf06d948922a222196d338b7933b5a8 SHA512 8c43f6ab09b918fc047056de20e85371929cd6841d7e26dedf54d565585eba040e23cef83c8747eb0ec43df8c9d9cf5915b5ea0ac6f6d551a0b086de3a9f3499
+DIST timers-4.2.0.gem 14848 BLAKE2B 0d3c1b70e6b4dade1664eac6951dfa1ff876098747d2f6eab21a2dff2f334cd614ac2c73e0651b93e92b3850c7933445a14bc4f43b50adbf1895b49c05d9507d SHA512 c5516c45e47bcd35bb5f16be0ddb31a2b1370bf06ee833c50b3121a7c36437fb418c58986b0d71979cd01af47bceb1ccd2ff50b1472592868175c4271c85e15c
--- a/dev-ruby/timers/timers-4.2.0.ebuild
+++ b/dev-ruby/timers/timers-4.2.0.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pure Ruby one-shot and periodic timers"
+HOMEPAGE="https://github.com/tarcieri/timers"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/hitimes"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/coveralls/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/Coveralls/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid performance specs to avoid ruby-prof dependency and 
+	# because we cannot provide a good environment for performance testing.
+	rm -f spec/timers/performance_spec.rb || die
+}
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.56.2-r1.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.56.2-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"

 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""

 RDEPEND="${PYTHON_DEPS}"
--- a/dev-util/meson/meson-0.47.1.ebuild
+++ b/dev-util/meson/meson-0.47.1.ebuild
@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
 fi

 inherit distutils-r1
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@ -1 +1,2 @@
 DIST vbam-2.0.2.tar.gz 2959204 BLAKE2B 79b288e59a843d2065eac63e74984bf134d9f5dadbc687da245030ad16b138125baab0fe1fb19acac9c117e30b95e57f1880b43817f75361600fb62efd1d5272 SHA512 9aafb8ef307fbbfbc5ae6dc35bc3042934e25a30069a71949e4c8e777fd862d94ec60c189823f4acdea4cb1338098fa85a55e090fa6023c07368cbb7638dd910
+DIST vbam-2.1.0.tar.gz 2977888 BLAKE2B 48884b10d13cdeddfae1dc5a94a4576ebfd7aab263225650a7d4f7138854da3c8bbffa4a8f08e9da001cd967f0e85a7beb82f86350031264a66bfdd5403d36dd SHA512 e4489c84880a7a70e7e94104ffbbdd805e9f15d5c962c0c13a7470496d2fdad8e21c1ddb161b776eb0b1a0c7583182df5838da5a523ce31dac620aa2a7842321
--- a/games-emulation/vbam/files/vbam-2.1.0-performance_fixup.patch
+++ b/games-emulation/vbam/files/vbam-2.1.0-performance_fixup.patch
@ -0,0 +1,43 @@
+From a8d0508cf299a58b2a659d6017b049db121de8ba Mon Sep 17 00:00:00 2001
+From: Rafael Kitover <rkitover@gmail.com>
+Date: Mon, 2 Jul 2018 18:32:18 -0700
+Subject: [PATCH] use GetWindow()->Refresh() in Wayland only
+
+Some people are reporting stuttering, and @retro-wertz tested both
+DrawArea() and Refresh() on wxgtk3 under xorg and found that the
+Refresh() method produces more stuttering.
+
+Change the compile check for wxgtk2 to a runtime check for wayland, and
+use Refresh() under Wayland only.
+---
+ src/wx/panel.cpp | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/src/wx/panel.cpp b/src/wx/panel.cpp
+index e4b86301..faaf6e4d 100644
+--- a/src/wx/panel.cpp
+++ b/src/wx/panel.cpp
+@@ -1817,19 +1817,16 @@ void DrawingPanelBase::DrawArea(uint8_t** data)
+     }
+ 
+     // next, draw the frame (queue a PaintEv) Refresh must be used under
+-    // Wayland or nothing is drawn, however it causes high CPU usage with GTK2,
+-    // so use the old method in that case
+-#if !defined(__WXGTK__) || defined(__WXGTK3__)
+-    GetWindow()->Refresh();
+-#else
+-    {
+    // Wayland or nothing is drawn.
+    if (wxGetApp().UsingWayland())
+        GetWindow()->Refresh();
+    else {
+         DrawingPanelBase* panel = wxGetApp().frame->GetPanel()->panel;
+         if (panel) {
+             wxClientDC dc(panel->GetWindow());
+             panel->DrawArea(dc);
+         }
+     }
+-#endif
+ 
+     // finally, draw on-screen text using wx method, if possible
+     // this method flickers too much right now
--- a/games-emulation/vbam/vbam-2.1.0.ebuild
+++ b/games-emulation/vbam/vbam-2.1.0.ebuild
@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+inherit gnome2-utils wxwidgets xdg-utils cmake-utils
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/visualboyadvance-m-${PV}"
+fi
+
+DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
+HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
+REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
+
+RDEPEND="
+	>=media-libs/libpng-1.4:0=
+	media-libs/libsdl2[joystick]
+	link? ( >=media-libs/libsfml-2.0:= )
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/opengl
+	ffmpeg? ( =media-video/ffmpeg-3*:= )
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	wxwidgets? (
+		openal? ( media-libs/openal )
+		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	)"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	wxwidgets? ( virtual/imagemagick-tools )
+	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-performance_fixup.patch"
+)
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+	local mycmakeargs=(
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_LINK=$(usex link)
+		-DENABLE_LIRC=$(usex lirc)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_OPENAL=$(usex openal)
+		-DENABLE_SDL=$(usex sdl)
+		-DENABLE_WX=$(usex wxwidgets)
+		-DENABLE_ASM_CORE=$(usex x86)
+		-DENABLE_ASM_SCALERS=$(usex x86)
+		-DCMAKE_SKIP_RPATH=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use sdl ; then
+		dodoc doc/ReadMe.SDL.txt
+		doman src/debian/vbam.6
+	fi
+	use wxwidgets && doman src/debian/visualboyadvance-m.6
+}
+
+pkg_preinst() {
+	if use wxwidgets ; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use wxwidgets ; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use wxwidgets ; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@ -1,3 +1,4 @@
 DIST bluedevil-5.12.7.tar.xz 149616 BLAKE2B a149542050a45509f14e667209002787290fc5b49e4e3cba8448cc1586e12a7d5c218ad1c65ba3d9c499e4d856cee5fc6117abfa675db49fcd87b619b13d9a69 SHA512 618256feca8ba3c64d4381d87a65b3de74a3a8f07327888ab499377008045169c46188c579fa78e3f80953e2f1779759b485cd4c84ecbea903a7a4b0d72da76d
 DIST bluedevil-5.13.5.tar.xz 149356 BLAKE2B 5c56c17c920b5d10ef8e221917a43d78ccbb9c5006dcddff3ef8e14e07e38519eeeb5acbc5272e790c4a4424e4580876343abf1f0cd58f420dbc21b5ee5e85ea SHA512 757d7886225d2d3698fc743fe9b04d833a82c394d28b0d3708867bcb34e06cc6bbc46e6a2f3f2bab83126bcd13293c158cc0b9527b79677d53f389758cd9cdd9
 DIST bluedevil-5.14.2.tar.xz 157124 BLAKE2B c92b66dded297dcab203eb6ff1a182b95e70568dbb570517f05e79c21aaeba3344e78ae3efbc9eee06c24226d37f2c23a984d8b56d00730ce9f4ea08421972ed SHA512 bf6225e636f3b0932c7ec993b6486861d1d765e3ad8a4ced957080f641f8921ab3fc4b2a795bb92d65f028157d4130a178579bb19c4ae42f48c486fd35846b07
+DIST bluedevil-5.14.3.tar.xz 158780 BLAKE2B 83437d1dd778b1d46d6024f2d244326d0b46433ca8f0d6a0370a487c09924057912f6725f0fedaec9eeab2db65cce500ce2492a65e4b6f11bd88518a38e2c3d5 SHA512 62fc66b2d5dfdf32bc64c14b871a097a38772ba7d5c25970753930b796c23f51c5f928167bed7dfe028118b5914c6f9af1c885ba1cc1d7432834ce14004b4f28
--- a/kde-plasma/bluedevil/bluedevil-5.14.3.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.14.3.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Bluetooth stack for KDE Plasma"
+HOMEPAGE="https://cgit.kde.org/bluedevil.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep bluez-qt)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	x11-misc/shared-mime-info
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!app-mobilephone/obexd
+	!app-mobilephone/obex-data-server
+	!kde-plasma/bluedevil:4
+"
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@ -1,3 +1,4 @@
 DIST breeze-grub-5.12.7.tar.xz 3142328 BLAKE2B 8c57ddcc102d1c0ae5373200a441d4cfacf059edc2a392371a0339e14cd834c8a9786c96328f49eb19cf59fb823612c12cecb1759f27c0c094b12aface28a279 SHA512 80e3a512108189fc211428864ad57c77546a126bbb0f71a1cc5380fa6cb93b433d0d4665145b44f4f8ab5ebcec570e9f03eb53a4cbf2362d2b64f0ae9bd9d140
 DIST breeze-grub-5.13.5.tar.xz 3142644 BLAKE2B 40c0c2327c0a6bbd0c1f3420b6f9ba7e8fe9876263835eb6ba7ff4b443ea40fa72635f9c5a64e91ca291f6faafa8bbc11a0b8a1f79961f8c7cf498861c86f09b SHA512 aebb9e02b40c1d3701c3f279122e5110e62a00b55c6c5a7908ea2828aa49c64afa663950c723fa81433ed6542f74797a39813cf3fdd9fc8ab0e4b39a807b8f51
 DIST breeze-grub-5.14.2.tar.xz 3137452 BLAKE2B ab4a90c6e7ede99994f32e94e291a8b6e2032f5559d63f17d3e16d36244ca8f6279d674cab116550becfb5f83b85b23717de0cca9e7265c8c1042fc4dbe5efce SHA512 390ffe3844a92745750314cefa5bc956f1ef133a4db37e6c82f46571aebb8135964333693ed7073617668efaa20c8007f32064e1301ec9539ea54ffdfe2f7944
+DIST breeze-grub-5.14.3.tar.xz 3146484 BLAKE2B 71e6aa9fccfdd7a9b87634ae22ef98a4ec4ee14bd1e196ddd32cb5b333d6a342261016e6e6416d8b1be112c3f12706232600e792fffca97f533f720904e7990f SHA512 ad1df5c705f3e3e548b37f33989049e08b695a1f96af4cdf8b7dca3a3907c284757b5c7961f95f2a220af2f538aed526ef9c5207a271aad55aae56a2b431eed4
--- a/kde-plasma/breeze-grub/breeze-grub-5.14.3.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.14.3.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5
+
+DESCRIPTION="Breeze theme for GRUB"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	insinto /usr/share/grub/themes
+	doins -r breeze
+}
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@ -1,3 +1,4 @@
 DIST breeze-gtk-5.12.7.tar.xz 213816 BLAKE2B b5507b4eaaff9e08763dc50ff377dd746f8c87a8dcf4bd6371bb57b09fe8d2b7e50bdd3924db9a99880a5ad0a35c13e6b28f496177b6bb8293dce25b1afd975a SHA512 5be51fc6a884e4f3338b3ad3044b918f7267205c5234b2053edd4773be42b90fb8f665e339a40c1d49d6eea16e90e1e51f58f149002568e2e7ce0be69ee412d9
 DIST breeze-gtk-5.13.5.tar.xz 202192 BLAKE2B ab1ac52e77a43219517659e76917817e845e3a4a6e90e6720f17369fdf10862d5d0c2834b043b07d6800a005c1d497238f9f653474da90c70e97eb045a60edc5 SHA512 6d760e3ccc2f987590c6285736a859ab06e4bbbbdf7a885bbe08b34ef3846d5be34607b25d5ded0f1d7b9af240f2903da6bf053a3d16afeae8fbe0ce28da0087
 DIST breeze-gtk-5.14.2.tar.xz 201104 BLAKE2B bc0ddddae9f0ed991c87a1511b8dca86cf25945ce440c48924b04632d883838b7ecac1399e4f2b817e95212b69500ea7f621ae5982bc3eb71376d0729b02146d SHA512 a11100646d2324962ecf541edcc004ed15025e6884c2bfaff2e7e6b9b7456aabb4deb87c41f77ae6f04c6a64749fc8e19acd305d6494f27c7c0ffb2464e036e3
+DIST breeze-gtk-5.14.3.tar.xz 202364 BLAKE2B 399a6cf0f68e9876c02b5c627740436e775dfc50c806e0413b6e66d53a1bfc62a670168d2027e4943c5cfa17e36fcb3873a9575cde87a44961ab14dde19fb402 SHA512 9330fdc88c7407cbf236ac83046dfae7fbcb61798ed5a1c440a35da12cbed72a7fc7cb0d496ad0dde943b4918a8deb8bc45411a304e926546042b58c19e7b019
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.14.3.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.14.3.ebuild
@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
+HOMEPAGE="https://cgit.kde.org/breeze-gtk.git"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@ -1,3 +1,4 @@
 DIST breeze-plymouth-5.12.7.tar.xz 105592 BLAKE2B ebfe4cfaf7656de884b9da62fd682bd65cf6c7ce4ae96154d41ed436f1e189fc7f1b5ea6ee237f4f07318e6b7a1a8872d3e93f22da14f8301e050dc289fa65d2 SHA512 d50158838204fd5fa541fb3e7c8b0d992e43ee06f4e4698ef01c2ecbd22ef1b4e25d634ab6f9864b0f330870ee22f85fe26aff06fb2b4b0472764d62e944cc44
 DIST breeze-plymouth-5.13.5.tar.xz 105628 BLAKE2B 652b09b80dbe45535a7e5ad417c09aa02418ae2117d5a4d612f2bfa1f7a74a207fcea8a83eceeedb422b351b4a205e9be68583edddcc8cd18b22805a00cce5be SHA512 13495b3cdace829fbf8e9b0b6888f9b3e50856209e2f172a29e812705d5df23f983aec04a9b2e0fad7a9a54b255158707df452fd2cd9d5c539ea6318f51969f2
 DIST breeze-plymouth-5.14.2.tar.xz 105336 BLAKE2B fd457858c6c5f7f5958ba8f486b7c5064da5d6dea00a38b1c63573a012b2f475a6fd17c7cdf5145d257869c220caef9d1ddc71fe03a45c40b5571df1e126e285 SHA512 e0138e7132f9ea9ab074359f0926d3c5f0b98c4f0f3e33dde2bb1a6c4d920bbb4451cbbbc23116631afea94209f6ea2ff317fecf7bf94bd2b0183e53b6fafe8e
+DIST breeze-plymouth-5.14.3.tar.xz 105456 BLAKE2B 4c9315a56a26d86930d9de2397c767599ac795cb5198c67ea04971d2103af6587b22996612e2a958339d592db264b04b08d7a65d3e6293155e3753883e5b4f38 SHA512 9a35a1c9c0ceaaaebec1dfcb9bb7deaa2279bcd3a189a07c3623e0107537eb917ad15f3c9c54fdf32a3ba9effd61b556b05f1189b655ce9feea6bb0bf9b25bf9
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.3.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.3.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+inherit kde5
+
+DESCRIPTION="Breeze theme for Plymouth"
+LICENSE="GPL-2+ GPL-3+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="sys-boot/plymouth"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep extra-cmake-modules)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISTRO_NAME="Gentoo Linux"
+		-DDISTRO_VERSION=
+	)
+
+	kde5_src_configure
+}
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@ -1,3 +1,4 @@
 DIST breeze-5.12.7.tar.xz 22209420 BLAKE2B 4ccb04778b0dd0681b5d9a13bd58ebc62ed14f96381424c5dc1e495f46e141dd4f0cecb3801326d94eefd9a6d2d5daae43836885c8d2b8e2726e4ad2a2031116 SHA512 c0e564fa6df64c225ea7754271c138d4b4304068c5fcf2e0502f109af3478f37d2781ac13d068b0818c819c8f60d6c4a333ff8940334c3ee5030607f80080b99
 DIST breeze-5.13.5.tar.xz 24781812 BLAKE2B 6e68d26297f958045b1ffde4c08b0b7ba9a927f51c8f62bc30ea29cb79d0f48dc793f7faa1bdef8cce0408beda67165df52896dc94d87c41675d276957d11628 SHA512 7e2ba028070062602314798151320595e81b2bfae47040885939a0f61cf74e6159b646cf91296d0aad092250d90eb3d94cd6b2081e2debcb3b1813b8cca3aad4
 DIST breeze-5.14.2.tar.xz 24896728 BLAKE2B 78194f61661deddffbfb45fbae97759b705b9e62ec89ff256e52c7d47a034698f7648aba16281f85b0c04b9b0cc3fdd982d202a75b12e68ec671fb31868355b6 SHA512 4aaa537f2999a2a05afb612569857ee770e04fc47968cb48fbb07b3d73b255994877959394897bf209ce480c29d0d7760534b84b10e933a42db6b150f2942d8e
+DIST breeze-5.14.3.tar.xz 24905232 BLAKE2B 278e332298478666f833df99187202d0286db0296ee90cbcb56cbde80e75e5e342fcede11ac7166cf2009e0855d2bdf2ff5cdda4ea8fbe9e56b00d2a384d8583 SHA512 070d9477802ecd9f9427976b48c841982d660aa1e59c59a3dce92f11e87e80ea0f418114e70a8231ba97031d854a856d67c2c72bed02b92cc8ccc93852a4c8ac
--- a/kde-plasma/breeze/breeze-5.14.3.ebuild
+++ b/kde-plasma/breeze/breeze-5.14.3.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://cgit.kde.org/breeze.git"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="wayland X"
+
+RDEPEND="
+	$(add_frameworks_dep frameworkintegration)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep kdecoration)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	sci-libs/fftw:3.0=
+	wayland? ( $(add_frameworks_dep kwayland) )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kpackage)
+"
+PDEPEND="
+	$(add_frameworks_dep breeze-icons)
+	$(add_plasma_dep kde-cli-tools)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake-utils_use_find_package X XCB)
+	)
+	kde5_src_configure
+}
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@ -1,3 +1,4 @@
 DIST drkonqi-5.12.7.tar.xz 737848 BLAKE2B e54f75003464ea55ab2cb4f0d7c55ed26ca1f0afe409d60a93ba017c8ff06fe6fe9b65ef22a7432c0318105081f4b4dd713cbfb3db4e98cf9013f9f2557284cd SHA512 011759e7edc4c7901b2c8f5362f084dbd7e726612a8ecb76ad174c219eb5ae5d09442d7076db856359a1270acc1d438102f1444b41782477352bda6e82c21f7b
 DIST drkonqi-5.13.5.tar.xz 736196 BLAKE2B e7d9eaa299c4988d08dfdb9c95965a3cdd2e9b2a5eb76b46f98083713efd0f29fcf3bacbaedd40fe599e1bbcc1dfa62832b1ab5a2a6c256854f81cc6181dc121 SHA512 2318e82afb2bf776dee5c61b502f7554d796705ae2fc77d3b7166c24b5f577a7a4dc1322ef42e57b085a0b7cb48eeda638da2cb697dca828cc6c8d5c4042861f
 DIST drkonqi-5.14.2.tar.xz 734752 BLAKE2B 20b588f136726a02dcf2fdc31b7c25bd0732b199c8388e2e6b0a53328b6a4cee3a521e07aa37890c9916003dbfb6f6b1c2a6b9c4aed6e7f6e88dfd32a78ffeca SHA512 e31e69b97a5ea01e3fe0ce52fd922fb8d415bf10fc4b569220c258aafcd2283785baecfe23b5429d0d0ceb6c464ce1d771c67e6c10ca46868cc3c66df9c1081a
+DIST drkonqi-5.14.3.tar.xz 740084 BLAKE2B 350876d0f67fdb1a4a9c45a11026bb37b9084f1f2c2e5a7701400e2af07e93bff89b71f8659f8ebb21c448257922a7bc2d6f8c4018cdca605842cbe21d70242a SHA512 3b6d64061073c795e3bea1c0ac168f1dbeeab709b8e067d3c862151a83899c031d3c06c063c509f604a8db58f5247f4c369dd39c971a89267783c0e170cc48eb
--- a/kde-plasma/drkonqi/drkonqi-5.14.3.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.14.3.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlrpcclient)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/drkonqi:4
+	!<kde-plasma/plasma-workspace-5.10.95:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	if ! has_version "sys-devel/gdb"; then
+		elog "For more usability consider installing the following package:"
+		elog "    sys-devel/gdb - Easier debugging support"
+	fi
+}
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@ -1,3 +1,4 @@
 DIST kactivitymanagerd-5.12.7.tar.xz 85316 BLAKE2B e69f1df2157e21e59bc1db54c4551b99c37e7754393e9e72b531446c300e856890f97cf4cba39364e414c28312d7c4c80c6d5a7481bbb3cd8fdf6818f9f1d63e SHA512 3825a79e9f1092af177606d8eb4acaeb0a7022eecc09a5066d6f8f404319e313bc16c7d5f8c22e34f19cbfbfd1dfabd1e01c8df954f8cbdd147c06492ce67245
 DIST kactivitymanagerd-5.13.5.tar.xz 85412 BLAKE2B 37c74f63c38cfee000ebe293b1b6f2d4fab90184325ed23c25b9affa078ac7a548e46ba88822f4e948d359e92b47372f6b2efeb6832811252f83e69dee96b328 SHA512 e0f0518bdc8397139c445dfd4bc604cb924add54fc00b44b9b9bdce514bb579fd6c600926b213e5f4b4735714a2f402cfe259c17712c9f71be2dc184012d1713
 DIST kactivitymanagerd-5.14.2.tar.xz 85332 BLAKE2B 9a61874858cba84a9124317f526c596e175581483270a15df33f852627a489a415d1444dea0e9a2c7ecfbe201db5a7785647161d5c4a1c3c851d5884d2737461 SHA512 c9351ea1d98044371af3ba7cc4b7b49917bd8eeee18482e3eb2aa3394117b3d449da4c1f224cbb446fe5b3d66918b9e0d81f6fa3eb839486ea7eadd339587363
+DIST kactivitymanagerd-5.14.3.tar.xz 86148 BLAKE2B 27d574a8b0197b017139aaff4b77dceee44f92bec3b4988a3030caa72f87f42d5f47da7d1090170fc4cfbb7b2114cb2eb5252e3ac7ea76926ca58aa3a9d88024 SHA512 1f293709a86cac57557542fc4b545bc11e3df7f868500b5d8be4107b4a80a0c04d50ed5fc94709e6a630017fe2c3122e082faa7c2d12fbdd4f6666d5de2bb68a
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.3.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.3.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
+LICENSE="|| ( GPL-2 GPL-3 )"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-frameworks/kactivities-4.13.3-r2:4
+	!kde-plasma/kactivitymanagerd:4
+"
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@ -1,3 +1,4 @@
 DIST kde-cli-tools-5.12.7.tar.xz 583788 BLAKE2B a813436cb49eacdb30eafd5af968475bed529b6ee36bbf784f8a658a313760ba7eb73ec0d5cf6d48c2a0d2fdaf70fd2ef20c9b4a38f92476c7c57bf80532a5c5 SHA512 44dd8a9b999dd0f4fb9f5953da7b9af805ba0508b18bbcb8420418049318b095d9553b1723e1ddab8b7d3d48ed42ca75fb0ede17043c2a82c95769938130ad77
 DIST kde-cli-tools-5.13.5.tar.xz 585436 BLAKE2B d288e55297428a2535e073fd82509658dda1c9da8e671c70c2bdce080268950ad8d7901cf173b09c0b4978852686e193daba15c9506366bc87a481c2bafe4554 SHA512 88aaa5c5a70da7d7f43f9d1b01d61d68c60e87942556955927cfb8655a8f6219d5220aff0c1a937f00444b3d03877d539bf544488a432108bf74434fc89566d7
 DIST kde-cli-tools-5.14.2.tar.xz 585116 BLAKE2B 69966175788182868bef94e7f49f12174fd7ff4a09398e54da4b62153333be22d78b579877111631e22618be0391216c98255dd53458cc608f735cd8c2a554cc SHA512 5ff5d0cbe014a95349284d85b07951bb606502115811001e06450f78a3f821aa011fc6e8fdc03df5497c4b6e3bf56653e63fe88661b4490f16e78245a184a4cc
+DIST kde-cli-tools-5.14.3.tar.xz 587012 BLAKE2B a5fcc690d21f246d7cd2f7eaba0dae7368e63b6efee4080919f2816baf2381e112cf31f00228591f166061ab1871136ed97af8dfe8bf9dc58d29f8555adcf89c SHA512 4578bbf6bbaf266a19c317945f33b3c9c2c3290855287947382be04a7f66e9e7da4bd8970994786e2d3cf1b4ef26a065f960b89a81dbdbd5263813fae19f114c
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.3.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.3.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+kdesu X"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep libkworkspace)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	kdesu? ( $(add_frameworks_dep kdesu) )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdesu
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kdesu KF5Su)
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
+	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu5
+}
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@ -1,3 +1,4 @@
 DIST kde-gtk-config-5.12.7.tar.xz 156880 BLAKE2B 40902d816b8559234e5aac73e116538f2bef18bd71203f67e09af57d8f04582da8565657d931083a2c02e1e8435578ddb2b4ca8f1fd9f54c47d7a3d2630bcda7 SHA512 b6698fba63f5a9d3d58112ecd2c198e9edb9b0ad9d6c8a670bef3f0e836fcf0c5f2c5444d6cbdf7370f2bfcfe5ad8a770b513ebb7a693c19624bf52bf9d02056
 DIST kde-gtk-config-5.13.5.tar.xz 156428 BLAKE2B 54461c4e58c9abf6ac7bc96a12e7a92f5615ab0cb00ce76f07bbba1d48dd40e7651643ed3c22af948efea873e5a1a68dde1759f261575a3fa482f4f3efb5da08 SHA512 bc9b75961a0a0efd9824a1913266831c27a9840af1f87fdef46527065321731b3c35b550cff2727f62c360ee72f9495d96cfab3a38c06b661bae9bdf7d739575
 DIST kde-gtk-config-5.14.2.tar.xz 156600 BLAKE2B 0d01b97558c7844528079a0b58cdb33d725641e1c9fd2f37966d7312f20cd9677d9adf01f19aa1b136147670af239c267fdeef52c907a2620ab1e29502a7536a SHA512 c18c428106fd5511613b448e428557b43d261d346a052c153b55ce4fced5df31e40e17ccd468f9cc02c3cb564b8a56359e15a298feca884d0154ff8d786cbf86
+DIST kde-gtk-config-5.14.3.tar.xz 157292 BLAKE2B fd060e1810058472e24a82819c2b3b737637d8a5430912e22511085c0c361ccc5f355f7d1235d9514dabdaede799528f5522fd83b452c33e06689c70ada3502e SHA512 5c8d14d77cd6707d32f09361247445ff4399bb7331125d795bf2046bd7f8467c374ad68a11899bcc1592c9c207a4f94e9ef523074184550577c9c85fa7de49ef
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.3.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.3.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
+HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/glib:2
+	gnome-base/gsettings-desktop-schemas
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/libXcursor
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-plasma/kde-gtk-config:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "If you notice missing icons in your GTK applications, you may have to install"
+	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
+	elog "for example."
+}
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@ -1,3 +1,4 @@
 DIST kdecoration-5.12.7.tar.xz 35576 BLAKE2B 7046ef70d5a9afd87e112e40cd041840db91071e8b5038f68b211db70dd6effb7fd315425c877e02b75ffb462f7b59e59dafc07b8d5fc89347e220e43969cac4 SHA512 acebb17f42e46dfcb57b5f94e2612e0c4f773ad15e911543281c578de4a409b8f65a028b458afd01f578abb69906316b3c6f2b6d6edd4918b302a8a26227ad95
 DIST kdecoration-5.13.5.tar.xz 41808 BLAKE2B 319094f68cfb8ac9f6664f6b0548c60a3961e29571386e0acc22956d83bd8ce6b98aab37b281751c2c35c168c344c906a36d7531a64c5c6616c0c80b3d96683e SHA512 a40dc81dc51fda184253986e2b9e4b9b4e5e0ac543a03ae67c80d7ec6dad07f857d05bfa757fd37a77cbe51ee4c43c7185e52a62ed344ddca6f8f10e54cf4ad8
 DIST kdecoration-5.14.2.tar.xz 41996 BLAKE2B cb647ed500205a925416049c6d19ca5b2d34a45a8450010d57fcfd701272093311f95f32c31fc9d4bc6037605d612426df08b0dbf03c917f34d74a0223b3455a SHA512 a49e2cceb27ed3c5a27809b37f89fe54b5cf4e0607de02e509443dcb27d9225e57a2143a6cff9fd7f8fa30c47584da9cb7b2d94410f4bf32383bb629a59bf57f
+DIST kdecoration-5.14.3.tar.xz 42196 BLAKE2B 4fc93f64d151d83c539ba7f1504c5f44b12d9a3e6c804e702c31ecdd0d8f67cdac2f8c4b71b19eefb49de2bf7333c0891102084279907f35cef06ee02a587650 SHA512 f43368fbb4799c12452232b1a8d28d5befaaa81922f7b189192a73343dd5a4ce21f5ff9b779cf552cabd95a4721ef2d937518f34759d3cdc90c76d3152ec5915
--- a/kde-plasma/kdecoration/kdecoration-5.14.3.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.14.3.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plugin based library to create window decorations"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtgui)
+"
+RDEPEND="${DEPEND}"
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@ -1,3 +1,4 @@
 DIST kdeplasma-addons-5.12.7.tar.xz 572624 BLAKE2B c1f5e0442994722297c2989e327825727e2a581209e7c689ae5f46d77f3ead67874cbce8ac857de7c6e3ae278a760e8f94e0a872780a41d750b942ad172a9abc SHA512 7af90cee5605dd1b3548c033216b57128e3ef99043168a165b75d3a97fd54794182ffb97846bac91cf806ba4e1a82365a5d61c58f8537de43364c626de392bc7
 DIST kdeplasma-addons-5.13.5.tar.xz 602896 BLAKE2B 62494961cc1e5c61656a566ac558747378feb44161e26df31692a68c5e1d3154997facbbebd584af437e29e6448c4c4ca1863e0611ff7afc8237c85036217689 SHA512 e7f8f3b5c149519ba49ed3bab49a72995c5c16cd2cb426daa104d52c3eef924f698267d741ecefcdd9455894d19b1d66ab3bc940d5e8137c13ae213b1ef03e85
 DIST kdeplasma-addons-5.14.2.tar.xz 603008 BLAKE2B 93b63f6ede0ebfd1acada3d98294f270e4e26887c7d31bf6798386675a7a9cb60afb2c9e4ec535fb10c967e807a96b575640def7732faa93d607171c0d77b4bb SHA512 b1e6e9f76dac33aa8f687c6e496d3f21dcf23420cb0e2395d7fe41dbdf0594623ac50f48b5072054437aa684f125245c5c2e051dd95fa04c354a9a6b08f23605
+DIST kdeplasma-addons-5.14.3.tar.xz 603632 BLAKE2B 77ad5c876efa8e13f790b0b822afa43b79d3187955580e31611cfbc5a1e93d9a5905128a0057dccd28f6ddd45e5636207a8833896f51a6bed8fbd723e19d79f0 SHA512 dd53e18d6fd25e6fa17863aa80bd648e1526b72b852de10cf37363c722879244cb9ad22dc98932ddbcf96321b71acb36c8ecdecb2a7c3304e55346d5da08a704
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.3.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.3.ebuild
@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Extra Plasma applets and engines"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="share webengine"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kholidays)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	share? ( $(add_frameworks_dep purpose) )
+	webengine? ( $(add_qt_dep qtwebengine) )
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtquickcontrols2)
+	!kde-plasma/kdeplasma-addons:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package share KF5Purpose)
+		$(cmake-utils_use_find_package webengine Qt5WebEngine)
+	)
+
+	kde5_src_configure
+}
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@ -1,3 +1,4 @@
 DIST kgamma5-5.12.7.tar.xz 60936 BLAKE2B a4d47d0feb18bc1aae87f3a5bd534ffc1e6527ffe7ff15b6b8ae67f823e6bcb85c96c2ca0481a2152d1805ea468a7b6177f2d0f16b33f15167ed62860f74b8dc SHA512 074dffc56a333bf88bb1942b3021c690822a234e26d41ff1b2d3e81f7f86f6ac272cb80f6f2552cbc5098880de520aebb8549f2a004608b824ea0c48f4e01cc6
 DIST kgamma5-5.13.5.tar.xz 79232 BLAKE2B 52542622a30aef92b38d15d38128a2b9fcbfeffcb9624dc2aafdd93814d749f3049adb19ac38047d8dd3c1c3593ecae5a2b3a0577e29c8789934a05b52deb91f SHA512 98f5fa770303f57e548b6110ad8bbc3af75705a9a103b0cb0370e25dcda209d9b405051611f2f21941b95a428760580fd2cafad0af76e1528c0672b8511aba8a
 DIST kgamma5-5.14.2.tar.xz 79152 BLAKE2B 3ee68198752186671ddc4f993939010f639d0d6982522fd84c8d458de46d1dd2eca0f433befad41b7ec43c65138ebed472bad405db87628f2dbfe4e1fafa98c0 SHA512 8d2415ead948ba85e9736c8ae6ee59eb807a3cc1a75b25934c8f7d2ee5d27991d586f40f47f446a0367dd7e721f4309e72ff6dd15f1927506b25820c29816b40
+DIST kgamma5-5.14.3.tar.xz 79512 BLAKE2B 055e260d53f068e8faf6f2349d620e29cbae0c3b2b556f203175178b05906ee12ddbbd135bcd396b097030f2bf0bf9a83f4191150bae9f3dc53e32188ac0bb22 SHA512 aaf35fa7c502cc12a47819ef3a13f7fab9fdf4ee88fbe4c8d7af2e087eca055aa9c15f0ebacd5ed8454678d4f97581a4c27e05a5c908af0eeda2678dc361b36f
--- a/kde-plasma/kgamma/kgamma-5.14.3.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.14.3.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KMNAME="${PN}5"
+inherit kde5
+
+DESCRIPTION="Screen gamma values kcontrol module"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@ -1,3 +1,4 @@
 DIST khotkeys-5.12.7.tar.xz 1435272 BLAKE2B 1e7388b52a71c9f1d31d89a25724c0cc4d6460da46e080aaa1f9a376b43502e3abd07d8999f497f7f75a18752dd0d6f5bdbeaf5e7437396749a202031910e7f6 SHA512 5cdfb182fc6c5edabc7bd979c86c423243ab390e25981359c68cfb1a258503fdf26b723399f4e3a688212c3a92703aaeb359b7c71ada216657282952dd4092b4
 DIST khotkeys-5.13.5.tar.xz 1381272 BLAKE2B 490ed8a323249a6eacfc10025bb49b4c792f8d1347d35348230e7ef079389da54b17965d544f9b0467bc516dd7bcdae7211bdf24f0604d6894f3ede2005ec638 SHA512 1eb22e42ecc43d2f78d67e0b6c7e86104c484b1597e063e1d78b7ebfb28950d09583c84d60b261791e282cc14fed63c99f0d070690ed0b43eaf2f23a5e01dfa1
 DIST khotkeys-5.14.2.tar.xz 1378696 BLAKE2B 1c8d1f5e9046783335957b6124fbe377ea407d7148e7da25f621383fcc000af010711a6fa28df7022cd53e56ed0a99303a1954ed4daae8ae7f5a3743cd1f09c6 SHA512 7e33d2e34f535eca8cf430e888540ac8cc725b4b5279110abd3fbc6daf5a87e09fd1ecfb43e964d894dd0b61136f5355375beab423071a26391c747f045a6c4c
+DIST khotkeys-5.14.3.tar.xz 1380280 BLAKE2B bc292790fbf68ccf97e4c77dc0aadedf2c31e0cce4095c90cd59133083da0103d6056950a7937c38565ef90922a463dbae26c4dbdf3dc3d1a7f1b6f7066a6543 SHA512 81a1e6fd2def3babf2a48026021266d091f935468309fc34fbc36bb8338e8e138b4c9e029d272a240399cefc8a87ed78a0a53fb546cf87656f5477dde29d7ee5
--- a/kde-plasma/khotkeys/khotkeys-5.14.3.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.14.3.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE Plasma workspace hotkey module"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support X)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep libkworkspace)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_plasma_dep kde-cli-tools)
+	!kde-plasma/khotkeys:4
+	!kde-plasma/systemsettings:4
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libxcb
+	x11-libs/libXtst
+"
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@ -2,3 +2,4 @@ DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26
 DIST kinfocenter-5.12.7.tar.xz 1286660 BLAKE2B fd1548666a9f47e6bcb168942ff9071c16dfc1095434bdee4a3626bc04bd64d89b75cb7bcff4e085fb52125b84faf4acd1cd2c7812dfcb18970a462245a1333e SHA512 440e1d9c6be280fee95681148f6f9c069529431f3367fd5938663afa840cd191c85fd995b9a0a4fb6ae143d2c74415cafcfc99e4a7d7e25dc99fdd3820608f9b
 DIST kinfocenter-5.13.5.tar.xz 1286000 BLAKE2B d8e9278f3c7214e13403970e86ac72f5cad3ed2506752c297860d91f26e986b6bce806a7498b78e4517b8d6c8a0ff31e2d2b6f0117babb93839dc8c923cf6bbd SHA512 a54b3ef5df1855f3002965f70c2e627ddc0b1e69eaa36461da1018b9ffd6e033ca61c4890a358ddc22f6f9e66cab5cdbaa1ff5386dda29fe87248f8af5567e50
 DIST kinfocenter-5.14.2.tar.xz 1316660 BLAKE2B 8a6905531cc856e4e1f5aa084eb88c4edd76bf5a20749be0b6a5a8df96638a933207f8c19f7febd229a62d7fe1b48387fc9702df8fa4f8426a17ae28a1eef3c9 SHA512 562c4227cee6e0136a095f8807c5e143299353fb9a241f8bbf4e5048e2a30f780c6a75056cef5bf4b8e6418cd96e4e229181f7a13dd5d80ec92a98b15e90b806
+DIST kinfocenter-5.14.3.tar.xz 1322480 BLAKE2B 447de617a858fee4cb807cf776a945207387317c5e8be6cc41c445f3ea8647620ab30b2495d26c3446ace3447fb3693e6ed7e385874bca34b8118658bca608c1 SHA512 6d07299cb2145cfe172dc79cfe849b03000fe770e397fd050b053b2f40f09dec5d5ffa9336223320597b965a0c612c0b09333e20fb54c3edb41773d473f9998a
--- a/kde-plasma/kinfocenter/kinfocenter-5.14.3.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.14.3.ebuild
@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="A utility that provides information about a computer system"
+HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
+SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gles2 ieee1394 +opengl +pci wayland"
+
+REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	x11-libs/libX11
+	ieee1394? ( sys-libs/libraw1394 )
+	opengl? (
+		$(add_qt_dep qtgui 'gles2=')
+		media-libs/mesa[gles2?]
+		!gles2? ( media-libs/glu )
+	)
+	pci? ( sys-apps/pciutils )
+	wayland? (
+		$(add_frameworks_dep kwayland)
+		media-libs/mesa[egl]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep plasma)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	$(add_qt_dep qtquickcontrols)
+	!kde-apps/kcontrol:4
+	!kde-misc/about-distro
+	!kde-plasma/kinfocenter:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package ieee1394 RAW1394)
+		$(cmake-utils_use_find_package pci PCIUTILS)
+		$(cmake-utils_use_find_package wayland EGL)
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+	)
+
+	if has_version "dev-qt/qtgui[gles2]"; then
+		mycmakeargs+=( $(cmake-utils_use_find_package gles2 OpenGLES) )
+	else
+		mycmakeargs+=( $(cmake-utils_use_find_package opengl OpenGL) )
+	fi
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	insinto /etc/xdg
+	doins "${FILESDIR}"/kcm-about-distrorc
+
+	insinto /usr/share/${PN}
+	doins "${DISTDIR}"/glogo-small.png
+}
+
+pkg_postinst() {
+	if ! has_version "net-fs/nfs-utils"; then
+		elog "Installing net-fs/nfs-utils will enable the NFS information module."
+	fi
+	if ! has_version "net-fs/samba"; then
+		elog "Installing net-fs/samba will enable the Samba status information module."
+	fi
+}
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@ -1,3 +1,4 @@
 DIST kmenuedit-5.12.7.tar.xz 817080 BLAKE2B 3c33d99acfef942cb4f36b1827bae3a318d7ef9253e76594f4d5dd2e7ea3e0679e925d86dbea773120e998d86720fe67ceff9dc3358f55b45c5c73998cb27087 SHA512 7bc5df0512b58bcc9e403449a3cafd7889a815d17d7387986750477e1420e71fce4d98980a789a16240ef6d2a7f316df9e0a1525c96b89df193aa601a2571062
 DIST kmenuedit-5.13.5.tar.xz 774524 BLAKE2B 1ae7f9f1b507f719054000a918b7d6ad16eb5b73eb201e3cb4c19b6d6e29333c2fea8a54f6d32fdf94f5fb87d945db8c50eab92fb817dbc50b8471874954b382 SHA512 3289003f986d9e92708e0af49f9425ea71ec679377ece863e6f5411a00854bae56c86f0fb8b4398fa477829074c55474f9ca47f0d92a8ae314bd3701261d08c9
 DIST kmenuedit-5.14.2.tar.xz 770348 BLAKE2B abdfc423a64c98e2de2fd5318bf5672bfe335b33a99bc2ff125e25d90578fba09b482c142eff0c27204636af56d050830722d81237fd299a33d44abecf3c0718 SHA512 0fc70c1883a840e2eebcaa891992acbbaf17502ac1b18a0382573db909d8905ea54c395f3ad691772272c9d7946c774e4224e2a0663d2bfd5e0c96d1d5d2b858
+DIST kmenuedit-5.14.3.tar.xz 770680 BLAKE2B 27bcd385c3e3b82585c96cf07f2040db2774f71729f7e52ea58d919375502e86fe47677d90df3acffdaf6e99dc91632beea7f801e00cba50a08cf9b33af77238 SHA512 889651562d92874ee62e6edd4d9ab119af5ba301262602d52ccc811faffaee0f89ba909bbd2645f062fa060ab58252206f34c73b7b5924f0e22d16e07a7a31e0
--- a/kde-plasma/kmenuedit/kmenuedit-5.14.3.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.14.3.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Plasma menu editor"
+HOMEPAGE="https://cgit.kde.org/kmenuedit.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+hotkeys"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	hotkeys? ( $(add_plasma_dep khotkeys) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kinit)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/kmenuedit:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
+	)
+
+	kde5_src_configure
+}
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@ -1,3 +1,4 @@
 DIST kscreen-5.12.7.tar.xz 118748 BLAKE2B f7790360820f92d2949648f4ca0d30708d7d36c8c027dca14fbcca7b92d0bc1fdbbfe9850f65a38e91e2bcb17326997fbc1297d29a5940a4d1371831559a87c3 SHA512 4967511dfc6ad1444fb51d7f85e8dba42c3c36d490228dac28eef176771b993e1340cdd09a3f38e2abdb835681f4c3435c36b22c0d828487510ce68bba0919ad
 DIST kscreen-5.13.5.tar.xz 112972 BLAKE2B b8c61e651efefd4517d5fa75965d481c21aab9d9f9f3b5c757a80c388114db4fc352c62ccad28c5215cd97b381a31b56b17c47e11d3fd46124c686b6572d9268 SHA512 86e0edbd6f4ad9639fc79198fde74ba7c0872878ee3eddf9edcb9515a4d68e09699777c1dc8cabb77cb2f1360e7b294a15edd84c0bdc32e985faa9cbcb174e37
 DIST kscreen-5.14.2.tar.xz 121464 BLAKE2B ce294486815a1134ef9dda985a59e4be12596dff7e6a3a30d3409a417c922ca3a7847e369487e79ea5d0e53cb8f60d446e43576192a5991a49fb85e3461252aa SHA512 b51cc899d3dd4ae5b6c7c4a3a16cf1ff18a4dfa4a2baca3b01ae65eae0e6724473160805ddfc5d40175ea04389735ef47bf392fd592346926e85b5ef172a0bb5
+DIST kscreen-5.14.3.tar.xz 122344 BLAKE2B 7a0861586440eb4c03b632bd665ffb0e1afb9b7ebe78a120af855c53c06c8fb08a02532f4686221144b75fc8a7fccb3a37bd11729c7a9ffbda2549f29f5606a0 SHA512 f0331d8ec7cf7868ada1b537ba1b89cec2938e11cc0148722f0ddcf193e2067e73cf41955309bbb0779095df1836f27a105963c8840dfc01615d04c61c23ab82
--- a/kde-plasma/kscreen/kscreen-5.14.3.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.14.3.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Plasma screen management"
+HOMEPAGE="https://cgit.kde.org/kscreen.git"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_plasma_dep libkscreen)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	$(add_qt_dep qtgraphicaleffects)
+	!kde-plasma/kscreen:4
+"
+
+# bug #580440, last checked 5.6.3
+RESTRICT+=" test"
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@ -1,3 +1,4 @@
 DIST kscreenlocker-5.12.7.tar.xz 119484 BLAKE2B d8f0e60ec3c3f294d9daf109fc327d895f32e0c9b26841787a1ed20b5b6d3ba8113b30858caec0e8782b56d717d91979f13187466c174f4c2153678e14e7d7f3 SHA512 76554e8ad6872705e903bda5f55f650d859b282b400ca739f346e392ce7961891057c8a8a43b5dcb85c83860e4744252500c338e5d99fd67a33df529a7e040c6
 DIST kscreenlocker-5.13.5.tar.xz 122112 BLAKE2B 4effbfd26b15ca9a0225031b11b892092351a95eddf2bad659b7a97e347db402d5f28415d6d8fb11eb3ad095faa7ad430e949d5f21abaf33da8cc8f47ba8e26e SHA512 c09f55da12893f162fcdc7559e55fa50d48bb642673de84809939e695ee93843e97a5224cfc79cb6bea6a1146ac757c45eab0bd1aa20e36206290c0155d8dfe2
 DIST kscreenlocker-5.14.2.tar.xz 121316 BLAKE2B ec43b818ab95b2c8112ac39f8d46587e325184914bf2f3591e6002e027109cf978dbf16ec5f970b4530c8660de4e4936ea5b0660a611da88d35c4d5f76443915 SHA512 a7b875827890958e4014f74071a03f3140f18063fb45483ad615b4c36232bf8a35862dc1e072f214d665d688bdad8dc2f38667e5141c67a7a57afdf5f95ca43c
+DIST kscreenlocker-5.14.3.tar.xz 122280 BLAKE2B 03182f4ffa11727606221e8c0c77f610c18ced1392ac0059e743074cb80cb80b35cc0a5e82f6cc3457df493599e0223b5bb2bef134c45e780ba7ecb649496772 SHA512 186f693a931936658624274c7de77e8cb06c433355932a17a6c600c6cf349f848b90642b613c786c0585f050599a545d0e596d81968a6ec0b7188eb34a6e2a71
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.14.3.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.14.3.ebuild
@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 pam
+
+DESCRIPTION="Library and components for secure lock screen architecture"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+pam seccomp"
+
+REQUIRED_USE="seccomp? ( pam )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	dev-libs/wayland
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	pam? ( virtual/pam )
+	seccomp? ( sys-libs/libseccomp )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/kcheckpass-4.11.22-r1:4
+	!kde-plasma/kdebase-pam:0
+"
+PDEPEND="
+	$(add_plasma_dep kde-cli-tools)
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+
+	use test || sed -i \
+		-e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die
+}
+
+src_test() {
+	# requires running environment
+	local myctestargs=(
+		-E x11LockerTest
+	)
+	kde5_src_test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPAM_REQUIRED=$(usex pam)
+		$(cmake-utils_use_find_package pam PAM)
+		$(cmake-utils_use_find_package seccomp Seccomp)
+	)
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	use pam && newpamd "${FILESDIR}/kde.pam" kde
+	use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np
+
+	if ! use pam; then
+		chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+		chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+	fi
+}
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@ -1,3 +1,4 @@
 DIST ksshaskpass-5.12.7.tar.xz 21332 BLAKE2B bef0308071942b1c964ddb6f53574e46ecf04018636d6aa34c42d7cdc9f7cc51110678746d5debdc4dfe8c2463c3369dc91fd7c3446be897c1ff670ad88a8d9e SHA512 0c613b5263721a510844b24f4311d906f229acdbb72967902973f995b88973f68f13fd098bf702d1281023f17eafb87de388589062da1b58923479e6fe831a7a
 DIST ksshaskpass-5.13.5.tar.xz 21408 BLAKE2B f69798427ca5e4681543580158fc0ded5c4c3d352e31476cbc7832e99844cd30d8134785c460900724fdbd922ef526974dfc28d76ef89369ac309bcbf495e334 SHA512 88712a268710bac6c60bb111d79bf52f5b34e0a7e0f27ea1affb32bc1a18925998a5040e1b96907e4e1648304706ca2c3c2815d98b7807d972fbf8f57f285e96
 DIST ksshaskpass-5.14.2.tar.xz 21348 BLAKE2B c47fb45efad17eb53a2e3f85d7a01d78e473748b42083831c2905ec09ee4dcbc6785bf624f05b1e24b694c8a12855f1289803c271a54d7b8113f8fd2506273c8 SHA512 88926caa8b476af041f7c044ac5da1af5433ccf0cde1f231a66708f8e25ed792d4136d2121a534884a34476bd2c3519c7d43710584731235229ae272dcf94d81
+DIST ksshaskpass-5.14.3.tar.xz 21400 BLAKE2B 86606d6de13b785a5b78cbd08e588d88057818b91799aedecee5514e88a34c4cfc4b1cc0910d0ff145963aa74f979f80d17146342f5fc4e64a794cb85f701a0a SHA512 d4aa1870c9e484e8e855d701585076e6ff25af6647e3c97075b3296a4a7603b32833e147dcd8c42073c67ffa9fff77b2f65697bb5885529ce0fd17e29dbe8e76
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.14.3.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.14.3.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
+HOMEPAGE="https://cgit.kde.org/ksshaskpass.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="
+	${DEPEND}
+	!kde-plasma/ksshaskpass:4
+"
+
+src_install() {
+	kde5_src_install
+
+	insinto /etc/plasma/startup
+	doins "${FILESDIR}/05-ksshaskpass.sh"
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	elog ""
+	elog "In order to have ssh-agent start at kde startup,"
+	elog "edit /etc/plasma/startup/10-agent-startup.sh and uncomment"
+	elog "the lines enabling ssh-agent."
+	elog
+	elog "If you do so, do not forget to uncomment the respective"
+	elog "lines in /etc/plasma/shutdown/10-agent-shutdown.sh to"
+	elog "properly kill the agent when the session ends."
+	elog
+	elog "${PN} has been installed as your default askpass application"
+	elog "for Plasma 5 sessions."
+	elog "If that's not desired, select the one you want to use in"
+	elog "/etc/plasma/startup/05-ksshaskpass.sh"
+	elog ""
+}
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@ -1,3 +1,4 @@
 DIST ksysguard-5.12.7.tar.xz 496904 BLAKE2B da069b522a5f4de685f7b5421fc427026f7bff892e9aee30bad4713717f4864edf0a8314066fc97749fb5e712944c07e29d95ac26afb8f4a05a81104f7844e2f SHA512 745958c74914d9b21373919b0e54cf7d1dd0621769aa8a480bac924862c494c68c86fa36c019fb13d71d8d86c8d923161290ef9a967b98c1182df88da63bbb35
 DIST ksysguard-5.13.5.tar.xz 497776 BLAKE2B 15daec09221993a9c5f39845a3cd168d01ee9a367020312507ac96615722fdf0e5244b3130dd5f09905db8a95b7ddf5df58cdada64a1e291c069f1b58912e684 SHA512 3df272468c6ea1a1211fd9f1e40bab5be8cdff8cb02556999cde8dde81042d6a0d8ad3958faf507323d7770f6dc2631d9ceba7ade796f8927719ce4a8659ca21
 DIST ksysguard-5.14.2.tar.xz 499208 BLAKE2B 7c1034313fb73831ec6f670fd77f35a3a438519aad6a3cd44a05da085e7ed868d741e77715fbb54b5863c685b2f04c0da05104e83ce62a6240356f3d2e8339e2 SHA512 506db81ee9bad037a3f41fe2956040c1a890981bf38895a3e7a0b85323ba066cbd2ec1753c1b913026640cd81f6cf7b1dc03db17a22065a177b61b1efe9e6e8b
+DIST ksysguard-5.14.3.tar.xz 501720 BLAKE2B b3b4ef98ba78c3c30fa76b6914ed93d5a002b1806fc59ad778b27082eb39acdafb68f815743f88cf4d43a4c10cc2de4070603ae5ee18d93a25e7299f0cd0839e SHA512 aa1d2007ffe0b4ad30e3e54a98cb56980d7666a36c879039952a2e589fe054ee773d3b495fbf3605777ed616e90f6f959ade3768e874f45f44223666b398de25
--- a/kde-plasma/ksysguard/ksysguard-5.14.3.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.14.3.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Network-enabled task manager and system monitor"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="lm_sensors"
+
+DEPEND="
+	$(add_plasma_dep libksysguard '-minimal(-)')
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/ksysguard:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package lm_sensors Sensors)
+	)
+
+	kde5_src_configure
+}
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@ -1,3 +1,4 @@
 DIST kwallet-pam-5.12.7.tar.xz 18728 BLAKE2B 66386c982597a4a1024a9a0e8317106900423959213a543a14ba1d3f3c2cf6aed21ace24b01cffcd2ed0a7acf409111d4488ecb3183a71bb026f606fd76520cf SHA512 7d2c8776f481bd03396056321f8c94f8bcea4b821c3cf58531077cd09922dacbe8896998d56a7856721f0dbaf7b2f7e24188292aed7b17c288d0346e8d14695b
 DIST kwallet-pam-5.13.5.tar.xz 18668 BLAKE2B 4dac7c037fe8ad89be884d5e4c7e850b62d2838161a9086e6f193345d4001860e7ff286e4052009f2010f6517ee30b3f6838c955bef5efc30c9e6999076b231e SHA512 cdd273d13406a927f93ce4f6189484b67d7ad146c5eb42f4d99d85c95938fe457082790453709c3d7129b2321c723e12ef93468e8febb68a19132f6f0fe72f62
 DIST kwallet-pam-5.14.2.tar.xz 19060 BLAKE2B 8c74b8879da598cf9f91bcb2f55a758b7214ab4ec4cbeb76af16e9d3e8afe14a1fd2220b0370d5a59d2cc019f0b001138590a008def60880ad2b0baef90fa331 SHA512 91175b545b30b46d48a4112411482330b6842c9a202576534db651209b5ea0f60f10114f74a6271359b50598462c961c72d9acb5b30a77a2fcc48182c1e617be
+DIST kwallet-pam-5.14.3.tar.xz 19104 BLAKE2B a804e6786cfc860af1c2de17348cb128a9f7922c1399d50fc69382ef139e959e54bde36b8d46f3995b4800de12ea79528a6ef0f3df45d5cf9d7fb4a26b15fc35 SHA512 b6011aa8dbff209e7645f3a6f8ce2c8bc33239bd91c756cc3baa8555f6339f20c7d5c9efae7f5fbb8c85844973b5be28833b513f4432e7cfe39e8fec78032298
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.14.3.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.14.3.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KWallet PAM module to not enter password again"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	virtual/pam
+"
+RDEPEND="${DEPEND}
+	net-misc/socat
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+		-DKWALLET4=0
+	)
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
+	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
+}
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST gost-engine-1.1.0.3_p20181031.tar.gz 473151 BLAKE2B fb8dc737c3bda181de168d918744d6e036886753e70cfcd0516499dd5d9a1ba3af0d44d26fc50570318375a142adfec532327dc57fac5996266b12551631b5fd SHA512 9f0df3c48191aea75d3fee5b5886ba32451889bdbb97c5e540f14a57d8d41606d858769a70b51c0c2c958565b347c5a613004e7c3f81658281d6a3eecd030707`