Sync with portage [Wed Apr 3 21:49:01 MSK 2019].

2019-04-03 21:49:01 +03:00 · 2019-04-03 21:49:01 +03:00 · f9197bec75
commit f9197bec75
parent db996d147c
297 changed files with 6518 additions and 1003 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/vault/vault-1.1.0.ebuild
+++ b/app-admin/vault/vault-1.1.0.ebuild
@ -21,7 +21,7 @@ IUSE="+webui"

 RESTRICT="test"

-DEPEND=">=dev-lang/go-1.10:=
+DEPEND=">=dev-lang/go-1.11:=
 	dev-go/gox"

 FILECAPS=(
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/gvim/gvim-8.1.0648-r1.ebuild
+++ b/app-editors/gvim/gvim-8.1.0648-r1.ebuild
@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi

 DESCRIPTION="GUI version of the Vim text editor"
--- a/app-editors/vim-core/vim-core-8.1.0648.ebuild
+++ b/app-editors/vim-core/vim-core-8.1.0648.ebuild
@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="vim and gvim shared files"
--- a/app-editors/vim/vim-8.1.0648-r1.ebuild
+++ b/app-editors/vim/vim-8.1.0648-r1.ebuild
@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="Vim, an improved vi-style text editor"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/cadvisor/Manifest
+++ b/app-emulation/cadvisor/Manifest
@ -1,3 +1,4 @@
 DIST cadvisor-0.31.0.tar.gz 4604581 BLAKE2B b39cc3c2482353f1fb64ee0bb9baccdd310e6315819c21aaaef034970f39e2d6ffae05de4289b50838e8bad889f7d9a8e516768ba56a6854c76829a621e57554 SHA512 13b92c2148a439def2394232b3591c0367431f09f5998b5a79210e5b871e2986934fda8b1a3bbeb10691bb5b512556b76f32976b977005d767974c565bcf9072
 DIST cadvisor-0.32.0.tar.gz 4623510 BLAKE2B 7145d0224b3d64cd438bb94047d8682bcad842d7841d98f264a3118a2c0fabb7f67b183db80e054362428efc4f47c699692e53e651a14a1871cc3c32d3a0695f SHA512 734ad1f33e0948dba7e43a1695c3a96ce6bf4367a604b5b79f011c893e18ec697c48199ddb21edb7c176929ddd389e42de9b6f502a01c938c45612ffd96b5f5d
 DIST cadvisor-0.33.0.tar.gz 4646920 BLAKE2B ce0e264321efcfbbf422f086cd15dfde389a099d183cbc2daaefb5aa6aa36da0c6e213dc4c12a000b9049ce2a1444addee93746f5650a56fa0f7c6612aa25bd9 SHA512 3d1dd1b9dc684e71bca9dc64949911f5f3ae72c97aa3b6cd45dd51a404fc101b5591ec8c19c469d6a410de3cf46c3d8c104d34e5dd1fdc85c18c2d1b6a45b2af
+DIST cadvisor-0.33.1.tar.gz 4646909 BLAKE2B 1ba30d559c018bf11297ded8adcc77a8761f77a1a39d75fb6e704ab84b3118d14587c91fd638da59bc9a46969b0545bdcf55e482390adeef6a4841fd6a57988c SHA512 659b8c48f74ef34044c7b3d9a41d42338c9c90fa443bdf7766001ae570aab8ed61efa948d1d01c324b6f03a0d1bf3d3fb1483d40bfc3b7e67f768253e3638de5
--- a/app-emulation/cadvisor/cadvisor-0.33.0-r1.ebuild
+++ b/app-emulation/cadvisor/cadvisor-0.33.0-r1.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/google/cadvisor"
+
+inherit user golang-build golang-vcs-snapshot
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+COMMIT="511ec9e"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
+HOMEPAGE="https://github.com/google/cadvisor"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_prepare() {
+	sed -i -e "/go get/d" src/${EGO_PN}/build/assets.sh || die
+	sed -i -e "s/git describe.*/echo ${PV} )/"\
+		-e "s/git rev-parse --short HEAD.*/echo ${COMMIT} )/"\
+		src/${EGO_PN}/build/build.sh || die
+	default
+}
+
+src_compile() {
+	pushd "src/${EGO_PN}"
+	GO_FLAGS="-v -work -x" VERBOSE="true" GOPATH="${S}:$(get_golibdir_gopath)" emake build
+	popd || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	dobin src/${EGO_PN}/${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
--- a/app-emulation/cadvisor/cadvisor-0.33.1.ebuild
+++ b/app-emulation/cadvisor/cadvisor-0.33.1.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/google/cadvisor"
+
+inherit user golang-build golang-vcs-snapshot
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+COMMIT="7e9ea00"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
+HOMEPAGE="https://github.com/google/cadvisor"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_prepare() {
+	sed -i -e "/go get/d" src/${EGO_PN}/build/assets.sh || die
+	sed -i -e "s/git describe.*/echo ${PV} )/"\
+		-e "s/git rev-parse --short HEAD.*/echo ${COMMIT} )/"\
+		src/${EGO_PN}/build/build.sh || die
+	default
+}
+
+src_compile() {
+	pushd "src/${EGO_PN}"
+	GO_FLAGS="-v -work -x" VERBOSE="true" GOPATH="${S}:$(get_golibdir_gopath)" emake build
+	popd || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	dobin src/${EGO_PN}/${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
--- a/app-emulation/cadvisor/files/cadvisor.initd-r1
+++ b/app-emulation/cadvisor/files/cadvisor.initd-r1
@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="cAdvisor - Analyzes resource usage and performance characteristics of running containers"
+pidfile=${pidfile:-"/run/${SVCNAME}.pid"}
+user=${user:-${SVCNAME}}
+group=${group:-${SVCNAME}}
+
+command="/usr/bin/cadvisor"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
+	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
+
+depend() {
+	after net
+	use docker
+}
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@ -1,6 +1,8 @@
+DIST edk2-ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz 38714813 BLAKE2B 1c0670c6447aa7d2610e59481324eafe3dbf54cc0480c855380372cf5b95469de4182b569d1c4429df71ceb9be014cb414e070a808609d185b488519955b8677 SHA512 8eb88006500d9d6982e5565bdb71bf47dfe2b9669e107f48b6b237d7efbbfb54b9fd81841421c347e5c0ca45ef9c08f0b95983c8b922c2e1072b0e42b8ede92c
 DIST ovmf-20170321.tar.xz 22141096 BLAKE2B 79e991c8f9deb297865c319e88b6e6d46b1d08067d3fd639c83f2a379670779ecc60c74c2671ea4eb4a6659fe08ac2d7d4ff337b010b42a908a50829a2d18eeb SHA512 f65dabde3df967224e2072817211786ee4fc3994ee31f8f9d6f67fd74e3479e1da459c720169dd81020cdc1777e4600e531bb124b4625c2ded42c6005bdc802a
 DIST seabios-1.10.0.tar.gz 588213 BLAKE2B 254eb4572a1dac06020a545820efb53a130a027aaab035cd916009b424475f89bd151f82f1bc5103c01c4657d09da3219d2fbcc7728add473011dcfc7bff7410 SHA512 f1b83ce37b59070b488e19f98c95ca9f413cf4969663331b631c3ccb884c90b2db793d32a779ef05cead538c2fd123be4b73391ad2fa20c900a1f14237178d8c
 DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96ebc158f34303b122b7bf209408c567665d8691364df8d8e886f63e0e72a3f3cd319dfa86ef581023201b5d94e53 SHA512 e52c5363e5bb37b5286e55545aa06bd126218f9d0e3a06ac2e189de68fe3de3256c11ca1bb13357a9c384d7e3af6284083ff3aa587688b5de04ef11b97bdfa27
+DIST seabios-rel-1.11.1.tar.gz 604125 BLAKE2B df2b7322f5169fb74e7f5dd3f680e7d8ad3e6f93e8b1376d15bbda8865458648a0d6086011a8a6549e7ad1794844878736441e70067580c0eb416e20ee038d95 SHA512 69622460475b54ba77a10509dae0ef46d9c733c6c8527ab56a4f2298534dcf1f7722eb501df873ab612222e5867e334c2831cc4c95dd23771aee10740acf0273
 DIST xen-4.10.3-upstream-patches-1.tar.xz 24064 BLAKE2B ec9339d00afd4057738a78165a82dbebbab73eb561984a049daff84dfb115c0550e67796bfa775d5e5a3a4576c4ea7db408d491fe745a68c412f93a04719c58d SHA512 b3761acdb7a581d172e1e2b1e09406c4748eda3e25c81c19bb53b38e005d27e10ac64109870b47ce72372dc7b7c63ec3eca6156389c174f28ab4ad1c2b9e5634
 DIST xen-4.10.3.tar.gz 24695778 BLAKE2B 50a9e31fb4cf587eeedb357fc710405a1cd4506174a38eb9b032a0cdd9b7f7343d98624ecb07cf605b1403664c7117cdc8f011290309caa18ca9604b4008b906 SHA512 030d23109ce4c0ebf50ade6841d5525a39032bcf8fd0599ccaa9502ff301c1f61f9c5f49233b41a5934a71228958febc1e529a9fc6822ba401a0c18c490ad412
 DIST xen-4.11.1-upstream-patches-0.tar.xz 45416 BLAKE2B 3990dbf338c2aebe1cd601d7caccc6919352cc1f937677d447c3d2626143710bdfda7f1977e2ad7112abff9cad6bb660bc1b0993ca74b2eff51da6d4f4365813 SHA512 ecbc13e607581a6f9b4e318145afaa92ce641bda6fb12585408f61bcf24fa9b245004ad22150e109db5d38fcea38e6bdaf6bb2d6eaaf8e5d5fa8816b5a19e456
--- a/app-emulation/xen-tools/xen-tools-4.11.1-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.11.1-r3.ebuild
@ -24,11 +24,10 @@ else
 	# xen-tools's gentoo patches version which apply to this specific ebuild
 	GENTOO_GPV=0
 	# xen-tools ovmf's patches
-	OVMF_VER=3
+	OVMF_VER=

-	SEABIOS_VER=1.10.0
-	# OVMF upstream 5920a9d16b1ab887c2858224316a98e961d71b05
-	OVMF_PV=20170321
+	SEABIOS_VER=1.11.1
+	EDK2_COMMIT=ef529e6ab7c31290a33045bb1f1837447cc0eb56

 	[[ -n ${UPSTREAM_VER} ]] && \
 		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
@ -42,9 +41,8 @@ else
 		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"

 	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
-	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
-	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.xz
+	https://git.seabios.org/cgit/seabios.git/snapshot/seabios-rel-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
 		${OVMF_PATCHSET_URI} )
 	${UPSTREAM_PATCHSET_URI}
 	${SECURITY_PATCHSET_URI}
@ -216,7 +214,7 @@ src_prepare() {
 	fi

 	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
 	pushd tools/firmware/ > /dev/null
 	ln -s seabios-dir-remote seabios-dir || die
 	popd > /dev/null
@ -235,11 +233,12 @@ src_prepare() {
 	if use ovmf; then
 		if [[ -n ${OVMF_VER} ]];then
 			einfo "Try to apply Ovmf patch set"
-			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+			pushd "${WORKDIR}"/edk2-*/ > /dev/null
 			eapply "${WORKDIR}"/patches-ovmf
 			popd > /dev/null
 		fi
-		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
 	fi

 	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@ -1,3 +1,4 @@
 DIST homebank-5.1.3.tar.gz 2686661 BLAKE2B bd43e3bc2d5d2c42e80cfc32b2beaa923b7c9110a71a703e52d45f302d16c5d8582cbb1c8463d4457b578844c357a20e7aed67c71a11d1baabf6dfec54960d3f SHA512 c95ac2871c3219d734aeb35d11e1e678efc50e166e2f8c1f05971fd341ac1598d6d672bd4b7cd7bcc206443af5305c9e1eb0557c3fcaab1ea35f4950acdef103
 DIST homebank-5.1.8.tar.gz 2745061 BLAKE2B b2e95a65f0d352fe167aa589683f3053d6b623f0240c348ea8c08f02f66b308b84873494eb7c307bbde15be28d7feb71ef966d0ae1bbb4d2cc5d22e53a68de08 SHA512 24c02b30878b920fdf8ee190fd8cfcdead1ecb971495880db8a49ca771f4cd140a2c1ff4eb09f3e6770be694480b84c5ff3b0d49568ce81c86e83b95797dbed4
 DIST homebank-5.2.2.tar.gz 2601784 BLAKE2B e0a66cebbdc9247aeba9946c4adf5b6677abb49cd93d212fc8008c44c53a21966ee4fa1291f887196fe3168de992a892d54fe82aec228a88f613b45358076dd2 SHA512 83ccf7f96b1eb9f2e5c134b151dce53790092e2ecb06f5e6a5e50057d6a32cde6cf45b9e98c07a81e7f224d33dae5d98e4693e57c413df675f63d21b418525b0
+DIST homebank-5.2.3.tar.gz 2665397 BLAKE2B d197a113b1387c414ba8d11ebe012d0887dbfb1d9eb20c61197e0ddcf87da64e09b2bff108c07b350a1326f8b935fb4c8d56f14240e9815df5b021ab75a3f7dc SHA512 7b6530aa609ea047a19aadb65e459406226cc94d07a5a44e7ba06535cafcfe52e8b2471644b2bffbeb20cd699167858d2787ebdbc45166e4c7720fbff717b3de
--- a/app-office/homebank/homebank-5.2.3.ebuild
+++ b/app-office/homebank/homebank-5.2.3.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit xdg-utils gnome2-utils
+
+DESCRIPTION="Free, easy, personal accounting for everyone"
+HOMEPAGE="http://homebank.free.fr/index.php"
+SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+ofx"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND=">=dev-libs/glib-2.39
+	>=net-libs/libsoup-2.26
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/pango
+	ofx? ( >=dev-libs/libofx-0.8.3 )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5.8.1
+	dev-perl/XML-Parser
+	>=dev-util/intltool-0.40.5
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_configure() {
+	econf $(use_with ofx)
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@ -6,6 +6,8 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
 DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
 DIST libreoffice-6.2.2.2-patchset-01.tar.xz 6952 BLAKE2B 6b6b5280c9c65b7995d49bd0a5c0667226366f498f04d747e883d21490c88fcdd5abe4348ffe37d3060d0b685d4c3c3cd5e826351b22f24b68779bc5ca9d92b3 SHA512 63cce0839f65962df425f212306ed65e3899c6da857f74d7ea335bd48712fab2faa1de7dbc28a5022021a408f02cb972c3bb7b511f6e1209f103b8d214e163ac
 DIST libreoffice-6.2.2.2.tar.xz 214029032 BLAKE2B fc95d9dcb594bd18317285ecf593fb69825ecf061f7a339b48c01c858ee0340390d635a75f9be2d522f0b8883365d013b72b52f81cded509a2748ad354b9006c SHA512 f58f73fc76c57cbcbc24f63680ebc06f72cbbff9c1339c8186e70bf5f0f9ad0203ed2898ee7dd82cfb2bd0239d96a1534cec635847fe8fb50a0abe70848d2125
+DIST libreoffice-6.2.3.1.tar.xz 214212540 BLAKE2B 62898ab40a19e8517d32c427d68364289b73a8f13ea9c7b33f380f784908f5dbad2cbefe5e6e878c337b42306e29e2d7c574da36397b1bcd48651a519a8c04e0 SHA512 d835725f769af98c91ffe2e9cd6edb0361bbd7d8122ec6660fabebeec5830d14bc485ffa2b50a6bebcc72271440763e4aee427228c37ea81773bc83ef0650035
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
 DIST libreoffice-help-6.2.2.2.tar.xz 15267780 BLAKE2B 6e5300f8cbd202ccf411d7f5d5268075e53d004b986917a382b0bcae6e3eb2a6b69ff36bbb38b23e9661f2f0df0388032dfc2156c7e2665414137e125cc83247 SHA512 c9aebd77aa44ea54e08c9e305aa073e29a02b11fbe118f346f2bb17a6aa8c3ff13fa3ba212a29eaa4c2b3861365bf4a8683979c5e77c57fa538ef18f4aea7ae4
+DIST libreoffice-help-6.2.3.1.tar.xz 13023992 BLAKE2B 5cb0f6081f60cf2ac6fe9e1e8715c5e48a4e8769a44dda1dd8a66aed18992710c6075a18ff19d3c5dba136d41396da42fd66d9ce1f1cc4d5fbc77a5c04f72e6d SHA512 1bc10999401bd7fe2a7454eb036675fd43cca9c4d0ef817f28c82cb6d3818afd44428b75fd31b2dac84a77a79f0a026679fd582ffa572b79bba38de1470f8857
--- a/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch
+++ b/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch
@ -0,0 +1,113 @@
+From d622be2d6bcfcc2c7260421e0eaa09c76ce15da2 Mon Sep 17 00:00:00 2001
+From: Aleksei Nikiforov <darktemplar@basealt.ru>
+Date: Wed, 6 Mar 2019 16:10:17 +0300
+Subject: tdf#123406 KDE5: Update delayed frame destruction
+
+Move deleteLater() call to the different event loop.
+This fixes issue with frames not being disposed of
+deterministically, and previously opened window
+not reactivating.
+
+Also hide modal dialog window before unsetting modal mode.
+Unsetting modal mode may require to toggle window visibility.
+Window will be hidden soon anyway,
+and additional generated events might make finding correct
+focused window harder.
+
+Change-Id: Id7839f817075785287b09f6ac79eb3fb211726aa
+Reviewed-on: https://gerrit.libreoffice.org/68852
+Tested-by: Jenkins
+Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
+Reviewed-on: https://gerrit.libreoffice.org/70078
+Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
+---
+ vcl/inc/qt5/Qt5Instance.hxx  |  2 ++
+ vcl/qt5/Qt5Instance.cxx      | 12 ++++++++++--
+ vcl/source/window/dialog.cxx |  4 ++--
+ 3 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx
+index 91682bd..cece484 100644
+--- a/vcl/inc/qt5/Qt5Instance.hxx
+++ b/vcl/inc/qt5/Qt5Instance.hxx
+@@ -50,10 +50,12 @@ public:
+ 
+ private Q_SLOTS:
+     bool ImplYield(bool bWait, bool bHandleAllCurrentEvents);
+    static void deleteObjectLater(QObject* pObject);
+ 
+ Q_SIGNALS:
+     bool ImplYieldSignal(bool bWait, bool bHandleAllCurrentEvents);
+     std::unique_ptr<SalMenu> createMenuSignal(bool, Menu*);
+    void deleteObjectLaterSignal(QObject* pObject);
+ 
+ public:
+     explicit Qt5Instance(bool bUseCairo = false);
+diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
+index 8de9fc7..58f93fe 100644
+--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
+@@ -67,6 +67,12 @@ Qt5Instance::Qt5Instance(bool bUseCairo)
+             Qt::BlockingQueuedConnection);
+     connect(this, &Qt5Instance::createMenuSignal, this, &Qt5Instance::CreateMenu,
+             Qt::BlockingQueuedConnection);
+
+    // this one needs to be queued non-blocking
+    // in order to have this event arriving to correct event processing loop
+    connect(this, &Qt5Instance::deleteObjectLaterSignal, this,
+            [](QObject* pObject) { Qt5Instance::deleteObjectLater(pObject); },
+            Qt::QueuedConnection);
+ }
+ 
+ Qt5Instance::~Qt5Instance()
+@@ -78,6 +84,8 @@ Qt5Instance::~Qt5Instance()
+         free(m_pFakeArgvFreeable[i]);
+ }
+ 
+void Qt5Instance::deleteObjectLater(QObject* pObject) { pObject->deleteLater(); }
+
+ SalFrame* Qt5Instance::CreateChildFrame(SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle)
+ {
+     return new Qt5Frame(nullptr, nStyle, m_bUseCairo);
+@@ -94,7 +102,7 @@ void Qt5Instance::DestroyFrame(SalFrame* pFrame)
+     if (pFrame)
+     {
+         assert(dynamic_cast<Qt5Frame*>(pFrame));
+-        static_cast<Qt5Frame*>(pFrame)->deleteLater();
+        Q_EMIT deleteObjectLaterSignal(static_cast<Qt5Frame*>(pFrame));
+     }
+ }
+ 
+@@ -109,7 +117,7 @@ void Qt5Instance::DestroyObject(SalObject* pObject)
+     if (pObject)
+     {
+         assert(dynamic_cast<Qt5Object*>(pObject));
+-        static_cast<Qt5Object*>(pObject)->deleteLater();
+        Q_EMIT deleteObjectLaterSignal(static_cast<Qt5Object*>(pObject));
+     }
+ }
+ 
+diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
+index 0c75f85..1688163 100644
+--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
+@@ -1097,6 +1097,8 @@ void Dialog::EndDialog( long nResult )
+ 
+     const bool bModal = GetType() != WindowType::MODELESSDIALOG;
+ 
+    Hide();
+
+     if (bModal)
+     {
+         SetModalInputMode(false);
+@@ -1121,8 +1123,6 @@ void Dialog::EndDialog( long nResult )
+         }
+     }
+ 
+-    Hide();
+-
+     if (bModal && GetParent())
+     {
+         NotifyEvent aNEvt( MouseNotifyEvent::ENDEXECUTEDIALOG, this );
+-- 
+cgit v1.1
--- a/app-office/libreoffice/files/libreoffice-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch
+++ b/app-office/libreoffice/files/libreoffice-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch
@ -0,0 +1,82 @@
+From c3eeb421526f284419e90d2c4c4da5b0d7bbcc0e Mon Sep 17 00:00:00 2001
+From: Jan-Marek Glogowski <glogow@fbihome.de>
+Date: Fri, 29 Mar 2019 02:58:59 +0100
+Subject: tdf#124292 Qt5 / KDE5 disable Qt's HiDPI scaling
+
+LO does its own layouting and also all the scaling, so disable
+the automatic HiDPI scaling explicitly. Otherwise fonts will be
+rendered in LoDPI and just scaled as an image, if UI scaling is
+enabled in KDE, resulting in really blocky / ugly fonts.
+
+Change-Id: I38503ce27c1671e80d0749d21c6c6dcff1a808a6
+Reviewed-on: https://gerrit.libreoffice.org/69941
+Tested-by: Jenkins
+Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
+(cherry picked from commit b4698a2241ec26d796c66da3a814f7cc693785b6)
+Reviewed-on: https://gerrit.libreoffice.org/69984
+Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
+---
+ vcl/qt5/Qt5Graphics_GDI.cxx      | 4 ++--
+ vcl/qt5/Qt5Instance.cxx          | 2 ++
+ vcl/unx/kde5/KDE5SalGraphics.cxx | 4 ++--
+ vcl/unx/kde5/KDE5SalInstance.cxx | 2 ++
+ 4 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
+index 90baba3..851d222 100644
+--- a/vcl/qt5/Qt5Graphics_GDI.cxx
+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
+@@ -643,8 +643,8 @@ void Qt5Graphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY)
+         return;
+ 
+     QScreen* pScreen = m_pFrame->GetQWidget()->window()->windowHandle()->screen();
+-    rDPIX = pScreen->logicalDotsPerInchX();
+-    rDPIY = pScreen->logicalDotsPerInchY();
+    rDPIX = pScreen->logicalDotsPerInchX() * pScreen->devicePixelRatio() + 0.5;
+    rDPIY = pScreen->logicalDotsPerInchY() * pScreen->devicePixelRatio() + 0.5;
+ }
+ 
+ sal_uInt16 Qt5Graphics::GetBitCount() const { return getFormatBits(m_pQImage->format()); }
+diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
+index adbe70b..8de9fc7 100644
+--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
+@@ -336,6 +336,8 @@ VCLPLUG_QT5_PUBLIC SalInstance* create_SalInstance()
+         unsetenv("SESSION_MANAGER");
+     }
+ 
+    QApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
+
+     int* pFakeArgc = new int;
+     *pFakeArgc = nFakeArgc;
+     pQApplication = new QApplication(*pFakeArgc, pFakeArgv);
+diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx
+index 290127d..0b4b428 100644
+--- a/vcl/unx/kde5/KDE5SalGraphics.cxx
+++ b/vcl/unx/kde5/KDE5SalGraphics.cxx
+@@ -78,8 +78,8 @@ void KDE5SalGraphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY)
+         return;
+ 
+     QScreen* pScreen = m_pFrame->GetQWidget()->window()->windowHandle()->screen();
+-    rDPIX = pScreen->logicalDotsPerInchX();
+-    rDPIY = pScreen->logicalDotsPerInchY();
+    rDPIX = pScreen->logicalDotsPerInchX() * pScreen->devicePixelRatio() + 0.5;
+    rDPIY = pScreen->logicalDotsPerInchY() * pScreen->devicePixelRatio() + 0.5;
+ }
+ 
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx
+index 401afbc..32998cd 100644
+--- a/vcl/unx/kde5/KDE5SalInstance.cxx
+++ b/vcl/unx/kde5/KDE5SalInstance.cxx
+@@ -144,6 +144,8 @@ VCLPLUG_KDE5_PUBLIC SalInstance* create_SalInstance()
+         unsetenv("SESSION_MANAGER");
+     }
+ 
+    QApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
+
+     int* pFakeArgc = new int;
+     *pFakeArgc = nFakeArgc;
+     pQApplication = new QApplication(*pFakeArgc, pFakeArgv);
+-- 
+cgit v1.1
--- a/app-office/libreoffice/libreoffice-6.2.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.3.1.ebuild
@ -0,0 +1,549 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS=""
+# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	dev-util/intltool
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-crypt/gpgme[cxx]
+	app-text/hunspell:=
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	app-text/libepubgen
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	app-text/libnumbertext
+	>=app-text/libodfgen-0.1.0
+	app-text/libqxp
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	dev-lang/perl
+	dev-libs/boost:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	>=dev-libs/liborcus-0.14.0
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/redland-1.0.16
+	>=dev-libs/xmlsec-1.2.24[nss]
+	media-gfx/fontforge
+	media-gfx/graphite2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libepoxy-1.3.1[X]
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	media-libs/libzmf
+	net-libs/neon
+	net-misc/curl
+	sci-mathematics/lpsolve
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+	bluetooth? (
+		dev-libs/glib:2
+		net-wireless/bluez
+	)
+	coinmp? ( sci-libs/coinor-mp )
+	cups? ( net-print/cups )
+	dbus? ( sys-apps/dbus )
+	eds? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl]
+		x11-libs/gtk+:3
+		x11-libs/pango
+	)
+	gtk2? (
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-2.24:2
+		x11-libs/pango
+	)
+	kde? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtwidgets:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+	ldap? ( net-nds/openldap )
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mariadb? ( dev-db/mariadb-connector-c )
+	!mariadb? ( dev-db/mysql-connector-c )
+	pdfimport? ( app-text/poppler:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+#        tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	dev-perl/Archive-Zip
+	>=dev-util/cppunit-1.14.0
+	>=dev-util/gperf-3
+	>=dev-util/mdds-1.4.1:1=
+	media-libs/glm
+	sys-devel/ucpp
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libXtst
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-1.6
+	)
+	test? (
+		app-crypt/gnupg
+		dev-util/cppunit
+		media-fonts/dejavu
+		media-fonts/liberation-fonts
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( >=virtual/jre-1.6 )
+	kde? ( kde-frameworks/breeze-icons:* )
+	vlc? ( media-video/vlc )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+	# master branch
+	"${FILESDIR}/${PN}-6.2-ldap-optional.patch"
+	# 6.2 stable branch
+	"${FILESDIR}/${P}-qt5-kf5-disable-qt-hidpi-scaling.patch"
+	"${FILESDIR}/${P}-kf5-update-delayed-frame-destruct.patch"
+	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+	CHECKREQS_MEMORY="512M"
+	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		CHECKREQS_DISK_BUILD="22G"
+	else
+		CHECKREQS_DISK_BUILD="6G"
+	fi
+	check-reqs_$1
+}
+
+pkg_pretend() {
+	use java || \
+		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+		ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+		ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+	fi
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${MY_PV} = *9999* ]]; then
+		local base_uri branch mypv
+		base_uri="https://anongit.freedesktop.org/git"
+		branch="master"
+		mypv=${MY_PV/.9999}
+		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+		git-r3_checkout "${base_uri}/${PN}/core"
+		LOCOREGIT_VERSION=${EGIT_VERSION}
+
+		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare
+
+	# sandbox violations on many systems, we don't need it. Bug #646406
+	sed -i \
+		-e "/KF5_CONFIG/s/kf5-config/no/" \
+		configure.ac || die "Failed to disable kf5-config"
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed -i \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	sed -i \
+		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
+		bin/distro-install-desktop-integration || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+	fi
+
+	# Don't list pdfimport support in desktop when built with none, bug # 605464
+	if ! use pdfimport; then
+		sed -i \
+			-e ":MimeType: s:application/pdf;::" \
+			-e ":Keywords: s:pdf;::" \
+			sysui/desktop/menus/draw.desktop || die
+	fi
+}
+
+src_configure() {
+	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+	# Note: these are for Gentoo use ONLY. For your own distribution, please get
+	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use kde; then
+		export QT_SELECT=5 # bug 639620 needs proper fix though
+		export QT5DIR="$(qt5_get_bindir)/../"
+		export MOC5="$(qt5_get_bindir)/moc"
+	fi
+
+	local gentoo_buildid="Gentoo official package"
+	if [[ -n ${LOCOREGIT_VERSION} ]]; then
+		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	# --without-system-sane: just sane.h header that is used for scan in writer,
+	#   not linked or anything else, worthless to depend on
+	# --disable-pdfium: not yet packaged
+	local myeconfargs=(
+		--with-system-dicts
+		--with-system-epoxy
+		--with-system-headers
+		--with-system-jars
+		--with-system-libs
+		--enable-build-opensymbol
+		--enable-cairo-canvas
+		--enable-largefile
+		--enable-mergelibs
+		--enable-neon
+		--enable-python=system
+		--enable-randr
+		--enable-release-build
+		--disable-breakpad
+		--disable-bundle-mariadb
+		--disable-ccache
+		--disable-dependency-tracking
+		--disable-epm
+		--disable-fetch-external
+		--disable-gstreamer-0-10
+		--disable-online-update
+		--disable-openssl
+		--disable-pdfium
+		--disable-report-builder
+		--with-build-version="${gentoo_buildid}"
+		--enable-extension-integration
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-tar="${DISTDIR}"
+		--with-lang=""
+		--with-parallelism=$(makeopts_jobs)
+		--with-system-ucpp
+		--with-tls=nss
+		--with-vendor="Gentoo Foundation"
+		--with-x
+		--without-fonts
+		--without-myspell-dicts
+		--with-help="html"
+		--without-helppack-integration
+		--with-system-gpgmepp
+		--without-system-sane
+		$(use_enable bluetooth sdremote-bluetooth)
+		$(use_enable coinmp)
+		$(use_enable cups)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable eds evolution2)
+		$(use_enable firebird firebird-sdbc)
+		$(use_enable gstreamer gstreamer-1-0)
+		$(use_enable gtk gtk3)
+		$(use_enable gtk2 gtk)
+		$(use_enable kde kde5)
+		$(use_enable kde qt5)
+		$(use_enable ldap)
+		$(use_enable odk)
+		$(use_enable pdfimport)
+		$(use_enable postgres postgresql-sdbc)
+		$(use_enable vlc)
+		$(use_with accessibility lxml)
+		$(use_with coinmp system-coinmp)
+		$(use_with googledrive gdrive-client-id ${google_default_client_id})
+		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+		$(use_with java)
+		$(use_with odk doxygen)
+	)
+
+	if use gtk && use kde; then
+		myeconfargs+=( --enable-gtk3-kde5 )
+	fi
+
+	if use eds || use gtk; then
+		myeconfargs+=( --enable-dconf --enable-gio )
+	else
+		myeconfargs+=( --disable-dconf --disable-gio )
+	fi
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+		else
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		myeconfargs+=(
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		)
+
+		use libreoffice_extensions_scripting-beanshell && \
+			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+		use libreoffice_extensions_scripting-javascript && \
+			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+	fi
+
+	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# bug 593514
+	if use gtk; then
+		dosym libreoffice/program/liblibreofficekitgtk.so \
+			/usr/$(get_libdir)/liblibreofficekitgtk.so
+	fi
+
+	# bash completion aliases
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+	fi
+}
+
+pkg_preinst() {
+	java-utils-2_pkg_preinst
+	xdg_pkg_preinst
+}
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"

 [[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg

 DESCRIPTION="A full office productivity suite"
 HOMEPAGE="https://www.libreoffice.org"
@ -537,9 +537,6 @@ src_install() {
 		dodir /etc/env.d
 		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
 	fi
-
-	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
 }

 pkg_preinst() {
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"

 [[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg

 DESCRIPTION="A full office productivity suite"
 HOMEPAGE="https://www.libreoffice.org"
@ -535,9 +535,6 @@ src_install() {
 		dodir /etc/env.d
 		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
 	fi
-
-	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
 }

 pkg_preinst() {
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
--- a/dev-perl/Test-Strict/Manifest
+++ b/dev-perl/Test-Strict/Manifest
@ -0,0 +1 @@
+DIST Test-Strict-0.47.tar.gz 20679 BLAKE2B e72eef42fdb7c0e354147c06f4e7c418d5c302d0bca662995042d7046fd9deae3ae6b12fa0f780aff8d6f0e5cab52db76184d99471d130ce18bfd6c00657dddb SHA512 56ffc488cb2502af228ad03f3da7bf11f04c0cacc7f1ea13b3aa8e0578f0df36a9be092f71db973748c8db15f45873a384f2e24844468b9a300d2386692c21b9
--- a/dev-perl/Test-Strict/Test-Strict-0.470.0.ebuild
+++ b/dev-perl/Test-Strict/Test-Strict-0.470.0.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MANWAR
+DIST_VERSION=0.47
+inherit perl-module
+
+DESCRIPTION="Check syntax, presence of use strict; and test coverage"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/IO-stringy
+		virtual/perl-Test-Simple
+	)
+"
--- a/dev-perl/Test-Strict/metadata.xml
+++ b/dev-perl/Test-Strict/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+</pkgmetadata>
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
--- a/dev-ruby/coolio/Manifest
+++ b/dev-ruby/coolio/Manifest
@ -1 +1,2 @@
 DIST cool.io-1.5.3.gem 112128 BLAKE2B f343ee73e3796744ec21d3af13e92a0a462e10b262543c2d77ab0dd6c5250bbd6cf0d6579646d146983df1c2b288717f3d4e9f1d5d0cded58a9b1422e497dee5 SHA512 6ef61713acdccf951ebd64018a3d9ec83e2655895994fe23842e18cd2556f4d35ec42144577a83b30ef369a9047a58d1bba2224145653db0b7c203dfdca6c3c3
+DIST cool.io-1.5.4.gem 112128 BLAKE2B 49ae41e7ab3481609952d0234e3303d195f59d3a7f369c40aadf72b1c7a85cb46b189532025912d60e972d41f6abd1b4dce3b00d458f59ba80d98a3c51845adc SHA512 d618b3ff396dd2145f8af78e38cafa13c3bb8ca8b9c2d17c8d2884b15178a3f644a8afabadb1b2821b315a5625f169f58bb384f8829828303b9de0d761dec1e7
--- a/dev-ruby/coolio/coolio-1.5.4.ebuild
+++ b/dev-ruby/coolio/coolio-1.5.4.ebuild
@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+RUBY_FAKEGEM_NAME="cool.io"
+
+RUBY_FAKEGEM_GEMSPEC="cool.io.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A high performance event framework for Ruby which uses the libev C library"
+HOMEPAGE="https://coolio.github.com/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# cool.io includes a bundled version of libev that is patched to work correctly with ruby.
+
+ruby_add_rdepend ">=dev-ruby/iobuffer-1"
+
+all_ruby_prepare() {
+	rm -r Gemfile* lib/.gitignore || die
+
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '28i  s.add_dependency "iobuffer"' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on rake-compiler
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^end/ s:^:#:' Rakefile || die
+
+	# Remove specs that require network connectivity
+	rm -f spec/dns_spec.rb || die
+
+	# Use one address consistently
+	sed -i -e 's/localhost/127.0.0.1/' spec/{udp_socket,tcp_server,iobuffer}_spec.rb || die
+}
+
+each_ruby_configure() {
+	pushd ext/cool.io || die
+	${RUBY} extconf.rb || die
+	popd || die
+}
+
+each_ruby_compile() {
+	pushd ext/cool.io || die
+	emake V=1
+	popd || die
+	cp ext/cool.io/cool.io_ext$(get_modname) lib/ || die
+}
--- a/dev-ruby/ffaker/Manifest
+++ b/dev-ruby/ffaker/Manifest
@ -1,2 +1,3 @@
 DIST ffaker-2.10.0.gem 421376 BLAKE2B 30976c0bee8862623c923b3797bd6de31b803643191d55ee2a6ef101a92f43acf6e300991de43641f2564ac82d046fcb7e53ca8b9cecae4c6b339e43f020cc1a SHA512 cb54d995f39877eea0844395e52158ea898f1d3fb17af0b01261f8b359d50ffd5d7b94fba0400e7103543a96670a00b3e5a9c072bc46f7221d390ab81e6ac507
+DIST ffaker-2.11.0.gem 429568 BLAKE2B ed5a9d794caba5ad93c1ac8457ebf89412177fe48c05a66f162f8d2b7a7a3b395e59312ddc444965ec4d9500573a97c97b95a1381d07caca6bb3b3ca97fa3dc2 SHA512 b185adfe34c5d78fe47cedc9d685eb98ed0de7f9a4818fa5ab0f6fe9cad21d04e025b6d2e38e34f463874a5d9007fe0d01e604b316af4850a7a63f50140bbd78
 DIST ffaker-2.9.0.gem 413184 BLAKE2B a48977b2749b60db18d046a0df0b65c1790a4fba5920faaaf6ef93be31cc7defd375379e2e46bbe2b4d2bae8b29f7cace4ecf09fba7d80a6cfacd724edd60564 SHA512 dff411a4d8864817dacb0498ce73a9b350d4e03aa771edb5b69c5e749ba4565dbd24d09215a7397e4567a9cd3ce2baae9b8e4e21cd8db127257364395e481364
--- a/dev-ruby/ffaker/ffaker-2.11.0.ebuild
+++ b/dev-ruby/ffaker/ffaker-2.11.0.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faster Faker, generates dummy data"
+HOMEPAGE="https://github.com/emmanueloga/ffaker"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@ -1,2 +1,3 @@
 DIST rack-1.6.11.gem 230400 BLAKE2B 923a0a1ee7c3ea86c76e632764a678d47be4d4d953d3166488fdea6c198a64603017ff0bd21597dc633dbcb1f108363c52480a98ac0b80991fc4a759dd374f6f SHA512 f54d9c4d72d22c57624bb745399ac0d4f155185d01f956ad395bee2a0add6f11e8d9d25fcd330ec6aa97409ba10c2246424d067999b86f2e5cb1fd74a43c6529
 DIST rack-2.0.6.gem 255488 BLAKE2B 7b23ad825e3e82f5010e810acde5eb6f3696489a78c3c67d7ac6cd73574236f83107b8a5fc0dbd4c932e2bf866c03208933d4e5bd78bf8d57aff02f96bccf6e8 SHA512 f1b93bbd16b7e44423c0977444183d9685e3c82e806304f304620731e5b4590920dcc363026277aa4b9ee0a2151c54570be341dcb9265517c7315ca4a504ef22
+DIST rack-2.0.7.gem 254976 BLAKE2B a005cfcfb4bbd6884c415a8604aeea5a93f2c182e8fda25a64af2393485c09e06fa16b2e5905274d3c9ae8d91c9f451d7f5949a9c3c7fb6592a210f8ce1fbbea SHA512 caefa4c3b6a76dd3f57f229fa0a6b0e1d84b7e9a029c6b473695b44467ae1400d098132b206092cd900e636af6d734117fba02ec21a90500f7fab8aa9dd84cd2
--- a/dev-ruby/rack/rack-2.0.7.ebuild
+++ b/dev-ruby/rack/rack-2.0.7.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.rdoc SPEC"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="https://rack.github.com/"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/concurrent-ruby )"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all.
+
+# Block against versions in older slots that also try to install a binary.
+RDEPEND="${RDEPEND} !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6"
+
+all_ruby_prepare() {
+	# The build system tries to generate the ChangeLog from git. Create
+	# an empty file to avoid a needless dependency on git.
+	touch ChangeLog || die
+
+	# Avoid development dependency
+	sed -i -e '/minitest-sprint/ s:^:#:' rack.gemspec || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
+}
--- a/dev-ruby/regexp_property_values/Manifest
+++ b/dev-ruby/regexp_property_values/Manifest
@ -1 +1,2 @@
 DIST regexp_property_values-0.3.4.tar.gz 11273 BLAKE2B a52ab11676b58a752741240912da5fa312661a583dd74a4321f8184fef2864c74e0d5f709cb68e3ce64a3e19e9320305e80bf7614a40142c4855ccec1c40b5a5 SHA512 01ca50f831bf3364e38559e06cb54faef59fdb0b995a6bfa0aaa3943591d98f97939a47911bf8b075b34b3c401b5de51e42a71088400112ee8afd8d39f164465
+DIST regexp_property_values-0.3.5.tar.gz 11410 BLAKE2B adcf7848af9df53707a878ee35443583b03f96f60f9b23fd5f146e81b4b12a4e3ada2c48d6509b15c848b15c668d9430ef93b34f08491ce13249ec458b2be0eb SHA512 5ac91331deb12fd77ee6a5ca8f942c2b2ea0ccb42bc63548444ecfe85c3a60bad385831b408f21c848f0c0ac2db3c68f8391fd68074acb0187ae9de51ca76e47
--- a/dev-ruby/regexp_property_values/regexp_property_values-0.3.5.ebuild
+++ b/dev-ruby/regexp_property_values/regexp_property_values-0.3.5.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="See which property values are supported by the regular expression engine"
+HOMEPAGE="https://github.com/janosch-x/regexp_property_values"
+SRC_URI="https://github.com/janosch-x/regexp_property_values/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid dependency on character_set which would lead to circular
+	# dependencies.
+	sed -i -e '/returns a CharacterSet/askip "gentoo circular dependencies"' spec/regexp_property_values/extension_spec.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/regexp_property_values extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext/regexp_property_values V=1
+	cp ext/regexp_property_values/regexp_property_values.so lib/regexp_property_values/ || die
+}
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/cgdb/Manifest
+++ b/dev-util/cgdb/Manifest
@ -1,4 +1,2 @@
-DIST cgdb-0.6.6.tar.gz 954789 BLAKE2B 71a095ce0237dc00e8387349818a9af5d5afd6d3ba72f0835eab80e674bb3c2934dca361b58fe70115db3b0315cf2cd34e60640f0d10fee75c261a8cbc3d231b SHA512 9efd4e60f07f6e189fe3c91ef52c1b3c8d70623b11d08bac6d78c36e8f8f549071448212db973974b9604f84aafc73697d9d1305c3d9691fb5f19346d2e04e8f
-DIST cgdb-0.6.7.tar.gz 674132 BLAKE2B 5378bffd3bed99934b83c1db82baea86d24f83c4e586d0695193bd5ee864ca0c76ea493187ffb307d16610b2e5a8bcdd9c4b2949c1e00299eb20ceab7dd609a0 SHA512 0a9d1cc3fb00c3cdaeb060d20d3312dd738b617ff1b188db33a074e2790f9721ca58e924ecc9929b84832c3ca22a334d7a66294439341a9b6868eef1baafca3e
 DIST cgdb-0.6.8.tar.gz 435115 BLAKE2B 31efcd8740dc0a0354c8d655cd7b77b18b25842dc39d1de42a92917305879394b425d7a7b0e555b368fc6a67f535fe9244c3fedeec9105c3622ace313b24c8c8 SHA512 ef3d94820bb5a37a8d7fbac48c8d144e0ac73c4f5a9d25bea33f2c4390080bb2dbdc5e7e21a5ef8a4980515cc48d80f140f7cf1f90eebac3f8bf1cc6168585ea
 DIST cgdb-0.7.0.tar.gz 319980 BLAKE2B bfc62f9214f6726e5df081119e85ccdeaea9a2310a9bb7a1746525ab998ea94ec1181efd3a1986ec0d33103c2f2b888e4d93c4ddaa4a996db4e47b0173c3b67c SHA512 83aeb919e96cd0981d8fe5cdd257df3e8d8bfbceea720ea66c1773b28c9f0ecb0e303e0585206c55242bc4438d505e328d43b4991c6ddc4e4202e048558c30d9
--- a/dev-util/cgdb/cgdb-0.6.6.ebuild
+++ b/dev-util/cgdb/cgdb-0.6.6.ebuild
@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A curses front-end for GDB, the GNU debugger"
-HOMEPAGE="http://cgdb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cgdb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
-IUSE=""
-
-DEPEND="sys-libs/ncurses
-	>=sys-libs/readline-5.1-r2"
-RDEPEND="${DEPEND}
-	sys-devel/gdb"
--- a/dev-util/cgdb/cgdb-0.6.7.ebuild
+++ b/dev-util/cgdb/cgdb-0.6.7.ebuild
@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="A curses front-end for GDB, the GNU debugger"
-HOMEPAGE="http://cgdb.github.io/"
-SRC_URI="http://cgdb.me/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="sys-libs/ncurses
-	>=sys-libs/readline-5.1-r2"
-RDEPEND="${DEPEND}
-	sys-devel/gdb"
--- a/dev-util/cgdb/cgdb-0.7.0-r1.ebuild
+++ b/dev-util/cgdb/cgdb-0.7.0-r1.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@ -20,15 +20,18 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"

-COMMONDEPEND="
+DEPEND="
 	sys-libs/ncurses:0=
 	sys-libs/readline:0="

-DEPEND="${COMMONDEPEND}
-	test? ( dev-util/dejagnu )"
+BDEPEND="
+	test? (
+		dev-util/dejagnu
+		app-misc/dtach
+	)"

 RDEPEND="
-	${COMMONDEPEND}
+	${DEPEND}
 	sys-devel/gdb"

 DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
@ -38,6 +41,22 @@ src_prepare() {
 	./autogen.sh || die
 }

+multilib_src_test() {
+	# Tests need an interactive shell, #654986
+
+	# real-time output of the log ;-)
+	touch "${T}/dtach-test.log" || die
+	tail -f "${T}/dtach-test.log" &
+	local tail_pid=${!}
+
+	nonfatal dtach -N "${T}/dtach.sock" \
+		bash -c 'emake check &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
+
+	kill "${tail_pid}"
+	[[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
+	[[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
+}
+
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf
 }
--- a/dev-util/cgdb/cgdb-9999.ebuild
+++ b/dev-util/cgdb/cgdb-9999.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@ -20,24 +20,43 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"

-COMMONDEPEND="
+DEPEND="
 	sys-libs/ncurses:0=
 	sys-libs/readline:0="

-DEPEND="${COMMONDEPEND}
-	test? ( dev-util/dejagnu )"
+BDEPEND="
+	test? (
+		dev-util/dejagnu
+		app-misc/dtach
+	)"

 RDEPEND="
-	${COMMONDEPEND}
+	${DEPEND}
 	sys-devel/gdb"

-DOCS=( AUTHORS ChangeLog INSTALL NEWS README.md FAQ )
+DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )

 src_prepare() {
 	default
 	./autogen.sh || die
 }

+multilib_src_test() {
+	# Tests need an interactive shell, #654986
+
+	# real-time output of the log ;-)
+	touch "${T}/dtach-test.log" || die
+	tail -f "${T}/dtach-test.log" &
+	local tail_pid=${!}
+
+	nonfatal dtach -N "${T}/dtach.sock" \
+		bash -c 'emake check &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
+
+	kill "${tail_pid}"
+	[[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
+	[[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
+}
+
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf
 }
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@ -1,7 +1,5 @@
-DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b714104dba1d470c8e1e487d8e6cc5d486febae88d4a71eb9419064bcf94f9bb2c779771323221c1f117baa693 SHA512 1ba6381321cb34c3c050548a1346d3b92d590a196d8aff7435c079cd485d01f7a6cd650ad97d00931aff424fcdc195bbaa6d9d7db679bf02f72f586c7b528ae4
 DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
 DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9 SHA512 2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
 DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a SHA512 5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
-DIST cmake-3.14.0.tar.gz 8846626 BLAKE2B 1bedae3909880c71bba6cc91459a58daf98287ba76c527669d227f0540283f3902d99fca2f6db2d0bde271ee274f7ce6612da2bcead611a00319996e382b0674 SHA512 a3b47f2b8d3436860e8cc06a8c0288124289560853d24f68dfbb49a2ff3f861ee385463376ad1dafa6d4a618c06d2e9049b20fcac1d2c147b29bb93479a8d400
 DIST cmake-3.14.1.tar.gz 8849712 BLAKE2B a4f917507a7ba354889606f17b9ce2c37e69d80a4ee86e75f23e214c9db11bd7947f8abc879a23c7fe76bdda32ab49360eb53f00eb1c4c4e74a8f80a7221d41d SHA512 2f0c0fb1559f71c5c2bf1a77f6fb2ecdaf078e47b5ab8ce997c6877f5d165619bc7a101b1566a8a40f8883ffef6ee690f93f2652855825019ec153aa4543ffb5
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
--- a/dev-util/cmake/cmake-3.10.3.ebuild
+++ b/dev-util/cmake/cmake-3.10.3.ebuild
@ -1,212 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-
-RDEPEND="
-	app-crypt/rhash
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/libuv-1.0.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindImageMagick.patch
-	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
-	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-	if [ $? -eq 0 ]; then
-		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
-	fi
-
-	tc-export CC CXX LD
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:#IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    Qt4Deploy, which tries to break sandbox and ignores prefix
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
--- a/dev-util/cmake/cmake-3.14.0.ebuild
+++ b/dev-util/cmake/cmake-3.14.0.ebuild
@ -1,229 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common flag-o-matic gnome2-utils toolchain-funcs eapi7-ver virtualx xdg-utils cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-
-RDEPEND="
-	app-crypt/rhash
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	# Next patch requires new work from prefix people
-	#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.14.0_rc1-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	# boost (#660980)
-	"${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
-	if [[ $? -eq 0 ]] ; then
-		par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	tc-export CC CXX LD
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:#IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest \
-		-j "$(makeopts_jobs)" \
-		--test-load "$(makeopts_loadavg)" \
-		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_RPM|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# disable Xcode hooks, bug #652134
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
-			Source/cmGlobalXCodeGenerator.cxx || die
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -r "${ED%/}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@ -1 +1,2 @@
 DIST cmocka-1.1.3.tar.xz 78744 BLAKE2B 5043a496afab08837a73c2e0ff9c9b3c3880a2fd394a768b1f8b51d2fec517a5527e93b7e660f8dcc73af79aaf88e224f4e2869c7e31540f8e54c76481905ff6 SHA512 b1a2ce72234256d653eebf95f8744a34525b9027e1ecf6552e1620c83a4bdda8b5674b748cc5fd14abada1e374829e2e7f0bcab0b1c8d6c3b7d9b7ec474b6ed3
+DIST cmocka-1.1.5.tar.xz 81004 BLAKE2B 5625dc293ad481c654848f3de806ef88d1b651192c2461e52b54bf9d443b5e2ea5d2a685ab85b044685f57e5723ade6c4c17e38624f59c4eab240cb4feeaab1e SHA512 cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd
--- a/dev-util/cmocka/cmocka-1.1.5.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.5.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+DESCRIPTION="Unit testing framework for C"
+HOMEPAGE="https://cmocka.org/"
+SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc examples static-libs test"
+
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_STATIC_LIB=$(usex static-libs)
+		-DUNIT_TESTING=$(usex test)
+		$(multilib_is_native_abi && cmake-utils_use_find_package doc Doxygen \
+			|| echo -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON)
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc; then
+		local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	fi
+
+	cmake-utils_src_install
+}
--- a/dev-util/kdbg/files/kdbg-3.0.0-no-png-install.patch
+++ b/dev-util/kdbg/files/kdbg-3.0.0-no-png-install.patch
@ -0,0 +1,54 @@
+From 826d503da8bfe7c567fc44dee178a4fca2b52f0a Mon Sep 17 00:00:00 2001
+From: Johannes Sixt <j6t@kdbg.org>
+Date: Fri, 15 Feb 2019 20:26:03 +0100
+Subject: [PATCH] Do not install the pulse frames.
+
+Andreas Sturmlechner noticed that the frame PNGs are slightly broken:
+
+  .../pulse000000.png: broken IDAT window length
+
+Since the PNGs are only needed to build pulse.mng, do not install them.
+---
+ kdbg/pics/CMakeLists.txt | 29 -----------------------------
+ 1 file changed, 29 deletions(-)
+
+diff --git a/kdbg/pics/CMakeLists.txt b/kdbg/pics/CMakeLists.txt
+index 41625b3..9615b1b 100644
+--- a/kdbg/pics/CMakeLists.txt
+++ b/kdbg/pics/CMakeLists.txt
+@@ -31,35 +31,6 @@ set(PICTOGRAMS
+ install(FILES ${PICTOGRAMS} DESTINATION "${DATA_INSTALL_DIR}/kdbg/pics")
+ 
+ ecm_install_icons(ICONS
+-    22-actions-pulse000000.png
+-    22-actions-pulse000001.png
+-    22-actions-pulse000002.png
+-    22-actions-pulse000003.png
+-    22-actions-pulse000004.png
+-    22-actions-pulse000005.png
+-    22-actions-pulse000006.png
+-    22-actions-pulse000007.png
+-    22-actions-pulse000008.png
+-    22-actions-pulse000009.png
+-    22-actions-pulse000010.png
+-    22-actions-pulse000011.png
+-    22-actions-pulse000012.png
+-    22-actions-pulse000013.png
+-    22-actions-pulse000014.png
+-    22-actions-pulse000015.png
+-    22-actions-pulse000016.png
+-    22-actions-pulse000017.png
+-    22-actions-pulse000018.png
+-    22-actions-pulse000019.png
+-    22-actions-pulse000020.png
+-    22-actions-pulse000021.png
+-    22-actions-pulse000022.png
+-    22-actions-pulse000023.png
+-    22-actions-pulse000024.png
+-    22-actions-pulse000025.png
+-    22-actions-pulse000026.png
+-    22-actions-pulse000027.png
+-    22-actions-pulse000028.png
+     22-actions-pulse.mng
+     DESTINATION "${DATA_INSTALL_DIR}/kdbg/icons"
+     THEME hicolor
--- a/dev-util/kdbg/kdbg-3.0.0-r1.ebuild
+++ b/dev-util/kdbg/kdbg-3.0.0-r1.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 KDE_HANDBOOK="true"
 inherit kde5
@ -11,10 +11,10 @@ HOMEPAGE="http://www.kdbg.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

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

-COMMON_DEPEND="
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@ -26,13 +26,12 @@ COMMON_DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!dev-util/kdbg:4
 	sys-devel/gdb
 "
-DEPEND="${COMMON_DEPEND}
-	media-libs/libpng:0
-"
+
+PATCHES=( "${FILESDIR}/${P}-no-png-install.patch" )

 src_prepare() {
 	# allow documentation to be handled by eclass
@ -40,12 +39,5 @@ src_prepare() {
 	sed -i -e '/add_subdirectory(doc)/d' kdbg/CMakeLists.txt || die
 	echo "add_subdirectory ( doc ) " >> CMakeLists.txt || die

-	local png
-	for png in kdbg/pics/*.png; do
-		pngfix -q --out=${png/.png/fixed.png} ${png}
-		[[ $? -gt 15 ]] && die "Failed to fix ${png}"
-		mv -f ${png/.png/fixed.png} ${png} || die
-	done
-
 	kde5_src_prepare
 }
--- a/dev-util/ninka/ninka-2.0_pre1_p20170402.ebuild
+++ b/dev-util/ninka/ninka-2.0_pre1_p20170402.ebuild
@ -13,8 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 LICENSE="GPL-2+ myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="sqlite"
-RESTRICT="test"
+IUSE="sqlite test"

 RDEPEND="dev-perl/IO-CaptureOutput
 	dev-perl/Spreadsheet-WriteExcel
@ -24,13 +23,13 @@ RDEPEND="dev-perl/IO-CaptureOutput
 		dev-perl/DBI
 	)"

-DEPEND="virtual/perl-ExtUtils-MakeMaker"
-#	test? (
-#		${RDEPEND}
-#		virtual/perl-Test-Simple
-#		dev-perl/Test-Pod
-#	)"
-# Test::Strict not packaged yet
+DEPEND="virtual/perl-ExtUtils-MakeMaker
+	test? (
+		${RDEPEND}
+		dev-perl/Test-Pod
+		dev-perl/Test-Strict
+		virtual/perl-Test-Simple
+	)"

 S="${WORKDIR}/${PN}"

--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
--- a/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild
+++ b/dev-vcs/cvs2svn/cvs2svn-2.4.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -21,8 +21,8 @@ IUSE="bazaar git test"

 DEPEND=">=dev-vcs/subversion-1.0.9"
 RDEPEND="${DEPEND}
-	bazaar? ( >=dev-vcs/bzr-1.13[${PYTHON_USEDEP}] )
-	git? ( >=dev-vcs/git-1.5.4.4[${PYTHON_USEDEP}] )
+	bazaar? ( >=dev-vcs/bzr-1.13 )
+	git? ( >=dev-vcs/git-1.5.4.4 )
 	dev-vcs/rcs"

 pkg_setup() {
--- a/dev-vcs/cvs2svn/cvs2svn-2.5.0.ebuild
+++ b/dev-vcs/cvs2svn/cvs2svn-2.5.0.ebuild
@ -21,8 +21,8 @@ IUSE="bazaar git test"

 DEPEND=">=dev-vcs/subversion-1.0.9"
 RDEPEND="${DEPEND}
-	bazaar? ( >=dev-vcs/bzr-1.13[${PYTHON_USEDEP}] )
-	git? ( >=dev-vcs/git-1.5.4.4[${PYTHON_USEDEP}] )
+	bazaar? ( >=dev-vcs/bzr-1.13 )
+	git? ( >=dev-vcs/git-1.5.4.4 )
 	dev-vcs/rcs"

 pkg_setup() {
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@ -2,3 +2,4 @@ DIST PySolFC-2.0.tar.bz2 4208776 BLAKE2B 0675de0923c6ee381f58f8abbaef5e27bd6fc85
 DIST PySolFC-Cardsets-2.0.tar.bz2 30687905 BLAKE2B f17f5095a05cf42ea9eb3e7a3a7fefe055cc3452882bf96db82bb4d1bebb2307ffc2d0fd8836f7414bfcd93b1d8de52adb43ef22701a0806f2c6c036d9306501 SHA512 24275cd3656024e268a49487ac75e1e67e61ec20e0a9f88e2d1c287f91314a1a9343856d1202ce468f8863f4e9a9bf27526fbb1979a7d765718b38e64ca0cfc8
 DIST pysolfc-2.2.0.tar.gz 4504375 BLAKE2B ea48910d36b704667654292cd4fc2e62bcf259d9a3677369371ab7aadd387505d5ae658496ad8982e08ca0405b44971bc1e2375e91cd90f84c569f8f26249ff3 SHA512 c6d09803eab8fe7fc2c4203537d75b8db3216dfcbd5cc60be5b89f23544c871a37f7b16d20df7be4b70c6f014d47b8c361e1557ab04cb1008451f41b456d0ad2
 DIST pysolfc-2.4.0.tar.gz 6788273 BLAKE2B c852ec9912aabc37317f92941fea2c0fb7230467d188ac3a0a8a78b4a4e243bfac8b3d1ddbb03dde136d7518d03cf3fb02b48386e35218ce5891b54049e9c981 SHA512 177edf60797346b763c9da9daf73feae5fb3ef88529227a60e98b68eb6120289cd0cd76b8ca5925b0452cf43298b12acbb16a53872c892d56b71cbcf0fe93e03
+DIST pysolfc-2.6.2.tar.gz 6791741 BLAKE2B 473105f04bfb2fb174d3b50de5a7a55d586756a75e37eb36a9ff688a5a4b148ee940467b18fa4710f828d461d9156163c8fc9cd323b1562da18f0eb02e096916 SHA512 37b4f5f5f53c8041e7b908719456ad3c26401744389ffd44f445402d653b515c44e02ba55950e24d6a3aa2fc2bf914f8575f630335fe1b52c698154b47fb5717
--- a/games-board/pysolfc/files/pysolfc-pillow-6.patch
+++ b/games-board/pysolfc/files/pysolfc-pillow-6.patch
@ -0,0 +1,20 @@
+diff -U2 -r PySolFC-pysolfc-2.6.2.orig/pysollib/mfxutil.py PySolFC-pysolfc-2.6.2/pysollib/mfxutil.py
+--- PySolFC-pysolfc-2.6.2.orig/pysollib/mfxutil.py	2019-02-27 21:52:26.000000000 +0100
+++ PySolFC-pysolfc-2.6.2/pysollib/mfxutil.py	2019-04-03 14:09:51.059349643 +0200
+@@ -52,5 +52,5 @@
+         Image._initialized = 2
+ USE_PIL = False
+-if TOOLKIT == 'tk' and Image and Image.VERSION >= '1.1.7':
+if TOOLKIT == 'tk' and Image:
+     USE_PIL = True
+ 
+diff -U2 -r PySolFC-pysolfc-2.6.2.orig/pysollib/ui/tktile/tkutil.py PySolFC-pysolfc-2.6.2/pysollib/ui/tktile/tkutil.py
+--- PySolFC-pysolfc-2.6.2.orig/pysollib/ui/tktile/tkutil.py	2019-02-27 21:52:26.000000000 +0100
+++ PySolFC-pysolfc-2.6.2/pysollib/ui/tktile/tkutil.py	2019-04-03 14:19:22.450363811 +0200
+@@ -354,5 +354,5 @@
+         return None
+     im = image._pil_image
+-    if Image.VERSION >= '1.1.7':
+    if True:
+         # use an alpha image
+         sh = Image.new('RGBA', im.size, color)
--- a/games-board/pysolfc/pysolfc-2.6.2.ebuild
+++ b/games-board/pysolfc/pysolfc-2.6.2.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_REQ_USE="tk"
+
+inherit eutils distutils-r1
+
+MY_PN=PySolFC
+
+DESCRIPTION="An exciting collection of more than 1000 solitaire card games"
+HOMEPAGE="http://pysolfc.sourceforge.net/"
+SRC_URI="https://github.com/shlomif/${MY_PN}/archive/${P}.tar.gz
+	extra-cardsets? ( mirror://sourceforge/${PN}/archive/${P}/${MY_PN}-Cardsets-2.0.tar.bz2 )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="extra-cardsets minimal +sound"
+
+S=${WORKDIR}/${MY_PN}-${P}
+
+DEPEND="dev-python/six"
+RDEPEND="${DEPEND}
+	python_targets_python3_5? ( dev-python/random2[python_targets_python3_5] )
+	python_targets_python3_6? ( dev-python/random2[python_targets_python3_6] )
+	!minimal? ( dev-python/pillow[tk,${PYTHON_USEDEP}]
+		dev-tcltk/tktable )
+	sound? ( dev-python/pygame[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-gentoo.patch" #591904
+	"${FILESDIR}/${PN}-locales.patch"
+	"${FILESDIR}/${PN}-pillow-6.patch"
+)
+
+python_prepare_all() {
+	sed -i \
+		-e "/pysol.desktop/d" \
+		-e "s:share/icons:share/pixmaps:" \
+		-e "s:data_dir =.*:data_dir = \'/usr/share/${PN}\':" \
+		setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	pushd html-src > /dev/null || die "html-src not found"
+	PYTHONPATH=.. "${EPYTHON}" gen-html.py || die "gen-html failed"
+	mv images html/ || die "mv images failed"
+	popd > /dev/null
+}
+
+python_install_all() {
+	make_desktop_entry pysol.py "PySol Fan Club Edition" pysol02
+
+	if use extra-cardsets; then
+		insinto /usr/share/${PN}
+		doins -r "${WORKDIR}"/${MY_PN}-Cardsets-2.0/*
+	fi
+
+	dosym /usr/share/doc/${PF}/html /usr/share/${PN}/html
+
+	doman docs/*.6
+	DOCS=( README.md AUTHORS docs/README docs/README.SOURCE )
+	HTML_DOCS=( html-src/html/. )
+	distutils-r1_python_install_all
+}
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
--- a/games-puzzle/pingus/files/pingus-0.7.6-boost_signals2.patch
+++ b/games-puzzle/pingus/files/pingus-0.7.6-boost_signals2.patch
@ -0,0 +1,380 @@
+From 6b5f2eb72359ce9cece7543eebb02f2c1ac0dcf9 Mon Sep 17 00:00:00 2001
+From: Ingo Ruhnke <grumbel@gmail.com>
+Date: Sat, 26 Jul 2014 20:49:11 +0200
+Subject: [PATCH] Switched to boost::signals2
+
+---
+ SConscript                           |  5 ++---
+ src/editor/button.hpp                |  4 ++--
+ src/editor/checkbox.hpp              |  4 ++--
+ src/editor/combobox.hpp              |  4 ++--
+ src/editor/file_list.hpp             |  4 ++--
+ src/editor/inputbox.hpp              |  6 +++---
+ src/editor/message_box.hpp           |  2 +-
+ src/editor/object_selector.cpp       |  4 ++--
+ src/editor/viewport.hpp              |  4 ++--
+ src/pingus/components/check_box.hpp  |  4 ++--
+ src/pingus/components/choice_box.hpp |  4 ++--
+ src/pingus/components/slider_box.hpp |  4 ++--
+ src/pingus/config_manager.hpp        | 28 ++++++++++++++--------------
+ src/pingus/screens/option_menu.hpp   |  4 ++--
+ 14 files changed, 40 insertions(+), 41 deletions(-)
+
+diff --git a/SConscript b/SConscript
+index 54b64680d..9caa931b6 100644
+--- a/SConscript
+++ b/SConscript
+@@ -187,9 +187,8 @@ class Project:
+                                                      'src/engine/input/xinput/xinput_device.cpp'])
+             
+     def configure_boost(self):
+-        if not self.conf.CheckLibWithHeader('boost_signals', 'boost/signals.hpp', 'c++'):
+-            if not self.conf.CheckLibWithHeader('boost_signals-mt', 'boost/signals.hpp', 'c++'):
+-                self.fatal_error += "  * library 'boost_signals' not found\n"
+        if not self.conf.CheckHeader('boost/signals2.hpp', '<>', 'c++'):
+            self.fatal_error += "  * library 'boost_signals2' not found\n"
+ 
+     def configure_png(self):
+         if self.conf.CheckMyProgram('pkg-config'):
+diff --git a/src/editor/button.hpp b/src/editor/button.hpp
+index c85d7da9e..d89dfe669 100644
+--- a/src/editor/button.hpp
+++ b/src/editor/button.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_BUTTON_HPP
+ #define HEADER_PINGUS_EDITOR_BUTTON_HPP
+ 
+-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
+ 
+ #include "engine/gui/rect_component.hpp"
+ 
+@@ -48,7 +48,7 @@ public:
+   void enable()  { enabled = true; }
+   void disable() { enabled = false; }
+ 
+-  boost::signal<void()> on_click;
+  boost::signals2::signal<void()> on_click;
+ 
+ private:
+   Button (const Button&);
+diff --git a/src/editor/checkbox.hpp b/src/editor/checkbox.hpp
+index 7c3bc835f..66382d79b 100644
+--- a/src/editor/checkbox.hpp
+++ b/src/editor/checkbox.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_CHECKBOX_HPP
+ #define HEADER_PINGUS_EDITOR_CHECKBOX_HPP
+ 
+-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
+ 
+ #include "engine/gui/rect_component.hpp"
+ 
+@@ -40,7 +40,7 @@ public:
+   bool is_checked() const { return checked; }
+   void on_primary_button_press(int x, int y);
+ 
+-  boost::signal<void (bool)> on_change;
+  boost::signals2::signal<void (bool)> on_change;
+  
+ private:
+   Checkbox (const Checkbox&);
+diff --git a/src/editor/combobox.hpp b/src/editor/combobox.hpp
+index 0ca742593..603556bd9 100644
+--- a/src/editor/combobox.hpp
+++ b/src/editor/combobox.hpp
+@@ -18,7 +18,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_COMBOBOX_HPP
+ #define HEADER_PINGUS_EDITOR_COMBOBOX_HPP
+ 
+-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
+ 
+ #include "engine/display/sprite.hpp"
+ #include "engine/gui/rect_component.hpp"
+@@ -88,7 +88,7 @@ public:
+   
+   void update_layout() {}
+   
+-  boost::signal<void (const ComboItem&)> on_select;
+  boost::signals2::signal<void (const ComboItem&)> on_select;
+ 
+ private:
+   Combobox();
+diff --git a/src/editor/file_list.hpp b/src/editor/file_list.hpp
+index cc4bba2de..85efe6aa0 100644
+--- a/src/editor/file_list.hpp
+++ b/src/editor/file_list.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_FILE_LIST_HPP
+ #define HEADER_PINGUS_EDITOR_FILE_LIST_HPP
+ 
+-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
+ 
+ #include "engine/display/sprite.hpp"
+ #include "engine/gui/rect_component.hpp"
+@@ -61,7 +61,7 @@ public:
+   bool has_more_next_pages();
+   bool has_more_prev_pages();
+ 
+-  boost::signal<void (const System::DirectoryEntry&)> on_click;
+  boost::signals2::signal<void (const System::DirectoryEntry&)> on_click;
+ 
+ private:
+   int items_per_page();
+diff --git a/src/editor/inputbox.hpp b/src/editor/inputbox.hpp
+index cad9663ec..87321dbba 100644
+--- a/src/editor/inputbox.hpp
+++ b/src/editor/inputbox.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_INPUTBOX_HPP
+ #define HEADER_PINGUS_EDITOR_INPUTBOX_HPP
+ 
+-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
+ 
+ #include "engine/gui/rect_component.hpp"
+ 
+@@ -40,8 +40,8 @@ public:
+ 
+   void update_layout() {}
+ 
+-  boost::signal<void (const std::string&)> on_change;
+-  boost::signal<void (const std::string&)> on_enter;
+  boost::signals2::signal<void (const std::string&)> on_change;
+  boost::signals2::signal<void (const std::string&)> on_enter;
+ 
+ private:
+   Inputbox (const Inputbox&);
+diff --git a/src/editor/message_box.hpp b/src/editor/message_box.hpp
+index 385387a61..d885767cf 100644
+--- a/src/editor/message_box.hpp
+++ b/src/editor/message_box.hpp
+@@ -45,7 +45,7 @@ public:
+   void on_cancel_button();
+ 
+ public:
+-  boost::signal<void()> on_ok;
+  boost::signals2::signal<void()> on_ok;
+ 
+ private:
+   MessageBox(const MessageBox&);
+diff --git a/src/editor/object_selector.cpp b/src/editor/object_selector.cpp
+index 28e306826..f3a36b5e8 100644
+--- a/src/editor/object_selector.cpp
+++ b/src/editor/object_selector.cpp
+@@ -16,7 +16,7 @@
+ 
+ #include "editor/object_selector.hpp"
+ 
+-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
+ 
+ #include "editor/generic_level_obj.hpp"
+ #include "editor/gui_style.hpp"
+@@ -47,7 +47,7 @@ private:
+   std::string tooltip;
+   
+ public:
+-  boost::signal<void()> on_click;
+  boost::signals2::signal<void()> on_click;
+ 
+ public:
+   ObjectSelectorButton(ObjectSelectorList* object_list_,
+diff --git a/src/editor/viewport.hpp b/src/editor/viewport.hpp
+index 1ae9eff7c..18868254d 100644
+--- a/src/editor/viewport.hpp
+++ b/src/editor/viewport.hpp
+@@ -18,7 +18,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_VIEWPORT_HPP
+ #define HEADER_PINGUS_EDITOR_VIEWPORT_HPP
+ 
+-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
+ #include <set>
+ 
+ #include "editor/selection.hpp"
+@@ -148,7 +148,7 @@ public:
+ 
+   void clear_selection();
+ 
+-  boost::signal<void (const Selection&)> selection_changed;
+  boost::signals2::signal<void (const Selection&)> selection_changed;
+ private:
+   Viewport();
+   Viewport (const Viewport&);
+diff --git a/src/pingus/components/check_box.hpp b/src/pingus/components/check_box.hpp
+index 00e23b764..5bef50f6b 100644
+--- a/src/pingus/components/check_box.hpp
+++ b/src/pingus/components/check_box.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_PINGUS_COMPONENTS_CHECK_BOX_HPP
+ #define HEADER_PINGUS_PINGUS_COMPONENTS_CHECK_BOX_HPP
+ 
+-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
+ 
+ #include "engine/display/sprite.hpp"
+ #include "engine/gui/rect_component.hpp"
+@@ -39,7 +39,7 @@ public:
+ 
+   void set_state(bool v, bool send_signal);
+ 
+-  boost::signal<void (bool)> on_change;
+  boost::signals2::signal<void (bool)> on_change;
+ 
+ private:
+   CheckBox (const CheckBox&);
+diff --git a/src/pingus/components/choice_box.hpp b/src/pingus/components/choice_box.hpp
+index 49d6e1948..ef51b6dd2 100644
+--- a/src/pingus/components/choice_box.hpp
+++ b/src/pingus/components/choice_box.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_PINGUS_COMPONENTS_CHOICE_BOX_HPP
+ #define HEADER_PINGUS_PINGUS_COMPONENTS_CHOICE_BOX_HPP
+ 
+-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
+ 
+ #include "engine/gui/rect_component.hpp"
+ 
+@@ -36,7 +36,7 @@ public:
+   void add_choice(const std::string& str);
+   void set_current_choice(int choice);
+   
+-  boost::signal<void (std::string)> on_change;
+  boost::signals2::signal<void (std::string)> on_change;
+   
+ private:
+   ChoiceBox (const ChoiceBox&);
+diff --git a/src/pingus/components/slider_box.hpp b/src/pingus/components/slider_box.hpp
+index ae4d92406..75118eac2 100644
+--- a/src/pingus/components/slider_box.hpp
+++ b/src/pingus/components/slider_box.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_PINGUS_COMPONENTS_SLIDER_BOX_HPP
+ #define HEADER_PINGUS_PINGUS_COMPONENTS_SLIDER_BOX_HPP
+ 
+-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
+ 
+ #include "engine/gui/rect_component.hpp"
+ 
+@@ -39,7 +39,7 @@ public:
+ 
+   void set_value(int v);
+ 
+-  boost::signal<void (int)> on_change;
+  boost::signals2::signal<void (int)> on_change;
+ 
+ private:
+   SliderBox (const SliderBox&);
+diff --git a/src/pingus/config_manager.hpp b/src/pingus/config_manager.hpp
+index b07b83e65..4cf08e046 100644
+--- a/src/pingus/config_manager.hpp
+++ b/src/pingus/config_manager.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_PINGUS_CONFIG_MANAGER_HPP
+ #define HEADER_PINGUS_PINGUS_CONFIG_MANAGER_HPP
+ 
+-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
+ 
+ #include "math/size.hpp"
+ #include "pingus/options.hpp"
+@@ -39,55 +39,55 @@ public:
+ 
+   void set_master_volume(int);
+   int  get_master_volume() const;
+-  boost::signal<void(int)> on_master_volume_change;
+  boost::signals2::signal<void(int)> on_master_volume_change;
+ 
+   void set_sound_volume(int);
+   int  get_sound_volume() const;
+-  boost::signal<void(int)> on_sound_volume_change;
+  boost::signals2::signal<void(int)> on_sound_volume_change;
+ 
+   void set_music_volume(int);
+   int  get_music_volume() const;
+-  boost::signal<void(int)> on_music_volume_change;
+  boost::signals2::signal<void(int)> on_music_volume_change;
+ 
+   void set_fullscreen_resolution(const Size& size);
+   Size get_fullscreen_resolution() const;
+-  boost::signal<void(Size)> on_fullscreen_resolution_change;
+  boost::signals2::signal<void(Size)> on_fullscreen_resolution_change;
+ 
+   void set_fullscreen(bool);
+   bool get_fullscreen() const;
+-  boost::signal<void(bool)> on_fullscreen_change;
+  boost::signals2::signal<void(bool)> on_fullscreen_change;
+ 
+   void set_renderer(FramebufferType type);
+   FramebufferType get_renderer() const;
+-  boost::signal<void(FramebufferType)> on_renderer_change;
+  boost::signals2::signal<void(FramebufferType)> on_renderer_change;
+ 
+   void set_resizable(bool);
+   bool get_resizable() const;
+-  boost::signal<void(bool)> on_resizable_change;
+  boost::signals2::signal<void(bool)> on_resizable_change;
+ 
+   void set_mouse_grab(bool);
+   bool get_mouse_grab() const;
+-  boost::signal<void(bool)> on_mouse_grab_change;
+  boost::signals2::signal<void(bool)> on_mouse_grab_change;
+ 
+   void set_print_fps(bool);
+   bool get_print_fps() const;
+-  boost::signal<void(bool)> on_print_fps_change;
+  boost::signals2::signal<void(bool)> on_print_fps_change;
+ 
+   void set_language(const tinygettext::Language&);
+   tinygettext::Language get_language() const;
+-  boost::signal<void(const tinygettext::Language&)> on_language_change;
+  boost::signals2::signal<void(const tinygettext::Language&)> on_language_change;
+ 
+   void set_software_cursor(bool);
+   bool get_software_cursor() const;
+-  boost::signal<void(bool)> on_software_cursor_change;
+  boost::signals2::signal<void(bool)> on_software_cursor_change;
+ 
+   void set_auto_scrolling(bool);
+   bool get_auto_scrolling() const;
+-  boost::signal<void(bool)> on_auto_scrolling_change;
+  boost::signals2::signal<void(bool)> on_auto_scrolling_change;
+ 
+   void set_drag_drop_scrolling(bool);
+   bool get_drag_drop_scrolling() const;
+-  boost::signal<void(bool)> on_drag_drop_scrolling_change;
+  boost::signals2::signal<void(bool)> on_drag_drop_scrolling_change;
+ 
+ private:
+   ConfigManager (const ConfigManager&);
+diff --git a/src/pingus/screens/option_menu.hpp b/src/pingus/screens/option_menu.hpp
+index 60b1578d2..154ef0f69 100644
+--- a/src/pingus/screens/option_menu.hpp
+++ b/src/pingus/screens/option_menu.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_PINGUS_SCREENS_OPTION_MENU_HPP
+ #define HEADER_PINGUS_PINGUS_SCREENS_OPTION_MENU_HPP
+ 
+-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>
+ #include <map>
+ #include <vector>
+ 
+@@ -66,7 +66,7 @@ private:
+   //Label* defaults_label;
+   //CheckBox* defaults_box;
+ 
+-  typedef std::vector<boost::signals::connection> Connections;
+  typedef std::vector<boost::signals2::connection> Connections;
+   Connections connections;
+ 
+   tinygettext::Language m_language;
+-- 
+2.21.0
+
--- a/games-puzzle/pingus/files/pingus-9999-no_libexec.patch
+++ b/games-puzzle/pingus/files/pingus-9999-no_libexec.patch
@ -0,0 +1,33 @@
+From ef01ebf5401419a0e98dfe32efa9a0bc8564e26f Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 3 Apr 2019 18:35:28 +0200
+Subject: [PATCH] Don't install pingus executable into libexec
+
+This doesn't really make any sense.
+---
+ CMakeLists.txt | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f3a92be64..fa835236d 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -213,15 +213,6 @@ if(BUILD_TESTS)
+ endif(BUILD_TESTS)
+ 
+ install(TARGETS pingus
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})
+-
+-configure_file(
+-  ${CMAKE_CURRENT_SOURCE_DIR}/pingus.sh.in
+-  ${CMAKE_BINARY_DIR}/pingus.sh)
+-
+-install(FILES
+-  ${CMAKE_BINARY_DIR}/pingus.sh
+-  RENAME pingus
+   PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+   DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+-- 
+2.21.0
+
--- a/games-puzzle/pingus/pingus-0.7.6-r2.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6-r2.ebuild
@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit scons-utils toolchain-funcs flag-o-matic xdg-utils
+
+DESCRIPTION="free Lemmings clone"
+HOMEPAGE="https://pingus.seul.org"
+SRC_URI="https://pingus.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="opengl music"
+
+RDEPEND="media-libs/libsdl[joystick,opengl?,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer
+	music? ( media-libs/sdl-mixer[mod] )
+	opengl? ( virtual/opengl )
+	media-libs/libpng:0=
+	dev-libs/boost:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-noopengl.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+	"${FILESDIR}"/${P}-echo-e.patch
+	"${FILESDIR}"/${P}-gcc7.patch
+	"${FILESDIR}"/${P}-boost_signals2.patch
+)
+
+src_prepare() {
+	default
+	strip-flags
+}
+
+src_compile() {
+	escons \
+		CXX="$(tc-getCXX)" \
+		CCFLAGS="${CXXFLAGS}" \
+		LINKFLAGS="${LDFLAGS}" \
+		with_opengl=$(usex opengl 1 0)
+}
+
+src_install() {
+	emake install-exec install-data \
+		DESTDIR="${D}" \
+		PREFIX="/usr"
+	doman doc/man/pingus.6
+	doicon data/images/icons/pingus.svg
+	make_desktop_entry ${PN} Pingus
+	dodoc AUTHORS NEWS README TODO
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
--- a/games-puzzle/pingus/pingus-9999.ebuild
+++ b/games-puzzle/pingus/pingus-9999.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils toolchain-funcs flag-o-matic xdg-utils
+
+DESCRIPTION="free Lemmings clone"
+HOMEPAGE="http://pingus.gitlab.io/"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/pingus/pingus.git"
+else
+	SRC_URI="https://github.com/Pingus/pingus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/jsoncpp
+	media-libs/libpng:0=
+	media-libs/libsdl2[joystick,opengl,video]
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-mixer[mod]
+	virtual/opengl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.6-noopengl.patch
+	"${FILESDIR}"/${P}-no_libexec.patch
+)
+
+src_prepare() {
+	sed '/find_package(Boost/s@ signals@@' -i CMakeLists.txt || die
+	cmake-utils_src_prepare
+	strip-flags
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@ -1,3 +1,2 @@
-DIST openttd-1.7.1-source.tar.gz 10090311 BLAKE2B 339171cd2895398ee1fedcfd24d1126fbc060b6d4530b267310b3f220448f8e6469a726e71e9882bea117585ea7b9f7271205f576ee2b26de6dec079f57f1620 SHA512 4a0d2ee424374b50fe0d089b86ff16b5de3159848a38143ca6745e349b6126567f1e4beda9afe2e6bc21ffffce1166acf719d3f5c95703a14c1379f8857e83d3
-DIST openttd-1.7.2-source.tar.gz 10097175 BLAKE2B a027b6ca6d3116dc3e6ad6ae43965682107268e367032418200cf1c1e16c5b5dad39c275ea57d923f17564d80cceb0e9909dc5aaf7ee230242f0ce0f46f06b1a SHA512 44d25061c42cb9c81baa67a40ff31a6681dcbb121c61db74c5179a31f189919471a82b7fd3f79c2cdeef02af5b47ec35fdbdc7feed74ca2360c028869fe772e8
 DIST openttd-1.8.0-source.tar.xz 6521016 BLAKE2B b3a608fd21d21f861af6eba235c028a59f071ab4698cfdcdd499b6ea7ece853679b064935368d95330414a24ac90aaa3c426afc12a2e135d5b0a48170879b807 SHA512 a2d61b3c94a550c8f3a581127df8c3459b1ddff5ba924942c468cbc70e88e0bf4405cecb68a91243b544ead64f215aa8d489a07b38dce507ae7d59e8ec155d7a
+DIST openttd-1.9.0-source.tar.xz 6575956 BLAKE2B 31d663b2f8aa67d9e3eb7899795468e8641671bb977957fdc6e55c8dedf3f2a00757de67ed034bf6180cc6091006a1b0bfba8af22d09744eb839a54ca662cbd9 SHA512 fcc044ea93810c99e9b3e80676676272c6f0efb43faa7ef4bfa7184aea793680df22504a1831837cc5ae8481e898d0636b992d1ddb8560cd4848463343adba2d
--- a/games-simulation/openttd/files/openttd-1.9.0-cflags.patch
+++ b/games-simulation/openttd/files/openttd-1.9.0-cflags.patch
@ -0,0 +1,56 @@
+From 6d72f33efe9f911d1427795a06c13d9dcd6fa222 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 3 Apr 2019 14:11:42 +0200
+Subject: [PATCH] Don't mess with our CFLAGS
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ config.lib | 18 ------------------
+ 1 file changed, 18 deletions(-)
+
+diff --git a/config.lib b/config.lib
+index f65aaa535..7789c0bea 100644
+--- a/config.lib
+++ b/config.lib
+@@ -1499,11 +1499,6 @@ make_cflags_and_ldflags() {
+ 		# No debug, add default stuff
+ 		OBJS_SUBDIR="release"
+ 
+-		if [ "$enable_profiling" = "0" ]; then
+-			# -fomit-frame-pointer and -pg do not go well together (gcc errors they are incompatible)
+-			CFLAGS="-fomit-frame-pointer $CFLAGS"
+-		fi
+-		CFLAGS="-O2 $CFLAGS"
+ 	else
+ 		OBJS_SUBDIR="debug"
+ 
+@@ -1511,14 +1506,6 @@ make_cflags_and_ldflags() {
+ 		if [ $enable_debug -ge 1 ]; then
+ 			CFLAGS="$CFLAGS -g -D_DEBUG"
+ 		fi
+-		if [ $enable_debug -ge 2 ]; then
+-			CFLAGS="$CFLAGS -fno-inline"
+-		fi
+-		if [ $enable_debug -ge 3 ]; then
+-			CFLAGS="$CFLAGS -O0"
+-		else
+-			CFLAGS="$CFLAGS -O2"
+-		fi
+ 	fi
+ 
+ 	if [ $enable_debug -le 2 ]; then
+@@ -1543,11 +1530,6 @@ make_cflags_and_ldflags() {
+ 		CFLAGS="$CFLAGS -fno-expensive-optimizations"
+ 	fi
+ 
+-	if [ "$enable_profiling" != "0" ]; then
+-		CFLAGS="$CFLAGS -pg"
+-		LDFLAGS="$LDFLAGS -pg"
+-	fi
+-
+ 	if [ "$with_threads" = "0" ]; then
+ 		CFLAGS="$CFLAGS -DNO_THREADS"
+ 	fi
+-- 
+2.21.0
+
--- a/games-simulation/openttd/files/openttd-1.9.0-dont_compress_manpages.patch
+++ b/games-simulation/openttd/files/openttd-1.9.0-dont_compress_manpages.patch
@ -0,0 +1,34 @@
+From da54b0365997181979d5c7131e99957424d4a167 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 3 Apr 2019 13:53:50 +0200
+Subject: [PATCH] Do not compress man-pages by default
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ Makefile.bundle.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile.bundle.in b/Makefile.bundle.in
+index eaf7134dd..1c2523181 100644
+--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
+@@ -77,7 +77,6 @@ endif
+ ifdef MAN_DIR
+ 	$(Q)mkdir -p "$(BUNDLE_DIR)/man/"
+ 	$(Q)cp "$(ROOT_DIR)/docs/openttd.6"       "$(BUNDLE_DIR)/man/"
+-	$(Q)gzip -9 "$(BUNDLE_DIR)/man/openttd.6"
+ endif
+ 	$(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/"
+ 	$(Q)cp "$(ROOT_DIR)/media/openttd."*.png  "$(BUNDLE_DIR)/media/"
+@@ -219,7 +218,7 @@ endif
+ ifdef MAN_DIR
+ ifndef DO_NOT_INSTALL_MAN
+ 	$(Q)install -d "$(INSTALL_MAN_DIR)"
+-	$(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6.gz" "$(INSTALL_MAN_DIR)/${BINARY_NAME}.6.gz"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6" "$(INSTALL_MAN_DIR)/${BINARY_NAME}.6"
+ endif
+ endif
+ ifdef MENU_DIR
+-- 
+2.21.0
+
--- a/games-simulation/openttd/files/openttd.initd
+++ b/games-simulation/openttd/files/openttd.initd
@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting OpenTTD dedicated server"
-	start-stop-daemon --start -q --exec /usr/games/bin/openttd -- -D -f > /dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping OpenTTD dedicated server"
-	start-stop-daemon --stop -q -n openttd
-	eend $?
-}
--- a/games-simulation/openttd/openttd-1.7.2.ebuild
+++ b/games-simulation/openttd/openttd-1.7.2.ebuild
@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils
-
-DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
-HOMEPAGE="http://www.openttd.org/"
-SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib"
-RESTRICT="test" # needs a graphics set in order to test
-
-RDEPEND="!dedicated? (
-		media-libs/libsdl[sound,X,video]
-		icu? (
-			dev-libs/icu-layoutex
-			dev-libs/icu-le-hb
-			>=dev-libs/icu-58.1:=
-		)
-		truetype? (
-			media-libs/fontconfig
-			media-libs/freetype:2
-			sys-libs/zlib
-		)
-	)
-	lzo? ( dev-libs/lzo:2 )
-	iconv? ( virtual/libiconv )
-	png? ( media-libs/libpng:0 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="
-	!dedicated? (
-		openmedia? (
-			games-misc/openmsx
-			games-misc/opensfx
-		)
-		aplaymidi? ( media-sound/alsa-utils )
-		!aplaymidi? ( timidity? ( media-sound/timidity++ ) )
-	)
-	openmedia? ( >=games-misc/opengfx-0.4.7 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-cflags.patch
-)
-
-src_configure() {
-	local myopts=()
-	# there is an allegro interface available as well as sdl, but
-	# the configure for it looks broken so the sdl interface is
-	# always built instead.
-	local myopts+=( --without-allegro )
-
-	# libtimidity not needed except for some embedded platform
-	# nevertheless, it will be automagically linked if it is
-	# installed. Hence, we disable it.
-	myopts+=( --without-libtimidity )
-
-	use debug && myopts+=( --enable-debug=3 )
-
-	if use dedicated ; then
-		myopts+=( --enable-dedicated )
-	else
-		use aplaymidi && myopts+=( --with-midi='/usr/bin/aplaymidi' )
-		myopts+=(
-			$(use_with truetype freetype)
-			$(use_with icu)
-			--with-sdl
-		)
-	fi
-	if use png || { use !dedicated && use truetype; } || use zlib ; then
-		myopts+=( --with-zlib )
-	else
-		myopts+=( --without-zlib )
-	fi
-
-	# configure is a hand-written bash-script, so econf will not work.
-	# It's all built as C++, upstream uses CFLAGS internally.
-	CFLAGS="" ./configure \
-		--disable-strip \
-		--prefix-dir="${EPREFIX%/}/usr" \
-		--binary-dir="bin" \
-		--install-dir="${D}" \
-		--menu-group="Game;Simulation;" \
-		${myopts[@]} \
-		$(use_with iconv) \
-		$(use_with png) \
-		$(use_with cpu_flags_x86_sse sse) \
-		$(use_with lzo liblzo2) \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-	if use dedicated ; then
-		newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-		rm -rf "${ED}"/usr/share/{applications,icons,pixmaps}
-	fi
-	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if ! use lzo ; then
-		elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
-		elog "required, disabling it does mean that loading old savegames"
-		elog "or scenarios from ancient versions (~0.2) will fail."
-		elog
-	fi
-
-	if use dedicated ; then
-		ewarn "Warning: The init script will kill all running openttd"
-		ewarn "processes when triggered, including any running client sessions!"
-	else
-		if use aplaymidi ; then
-			elog "You have emerged with 'aplaymidi' for playing MIDI."
-			elog "This option is for those with a hardware midi device,"
-			elog "or who have set up ALSA to handle midi ports."
-			elog "You must set the environment variable ALSA_OUTPUT_PORTS."
-			elog "Available ports can be listed by using 'aplaymidi -l'."
-		else
-			if ! use timidity ; then
-				elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'"
-				elog "in USE. Music may or may not work in-game. If you happen"
-				elog "to have timidity++ installed, music will work so long"
-				elog "as it remains installed, but OpenTTD will not depend on it."
-			fi
-		fi
-		if ! use openmedia ; then
-			elog
-			elog "OpenTTD was compiled without the 'openmedia' USE flag."
-			elog
-			elog "In order to play, you must at least install:"
-			elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
-			elog "following 6 files from a version of Transport Tycoon Deluxe"
-			elog "(windows or DOS) to ~/.openttd/data/ or"
-			elog "${GAMES_DATADIR}/${PN}/data/."
-			elog
-			elog "From the WINDOWS version you need: "
-			elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
-			elog "OR from the DOS version you need: "
-			elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
-			elog
-			elog "File names are case sensitive, but should work either with"
-			elog "all upper or all lower case names"
-			elog
-			elog "In addition, in-game music will be unavailable: for music,"
-			elog "install games-misc/openmsx, or use the in-game download"
-			elog "functionality to get a music set"
-			elog
-		fi
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
--- a/games-simulation/openttd/openttd-1.7.1-r1.ebuild
+++ b/games-simulation/openttd/openttd-1.7.1-r1.ebuild
@ -1,16 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
-inherit eutils gnome2-utils
+EAPI=7
+inherit xdg
+
+MY_PV="${PV/_rc/-RC}"
+MY_P="${PN}-${MY_PV}"

 DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
 HOMEPAGE="http://www.openttd.org/"
-SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OpenTTD/OpenTTD.git"
+else
+	SRC_URI="https://proxy.binaries.openttd.org/openttd-releases/${MY_PV}/${MY_P}-source.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib"
 RESTRICT="test" # needs a graphics set in order to test

@ -24,14 +33,18 @@ RDEPEND="!dedicated? (
 		truetype? (
 			media-libs/fontconfig
 			media-libs/freetype:2
-			sys-libs/zlib
+			sys-libs/zlib:=
 		)
 	)
 	lzo? ( dev-libs/lzo:2 )
 	iconv? ( virtual/libiconv )
-	png? ( media-libs/libpng:0 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
+	png? (
+		media-libs/libpng:0
+		sys-libs/zlib:=
+	)
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig"
 PDEPEND="
 	!dedicated? (
@ -45,28 +58,41 @@ PDEPEND="
 	openmedia? ( >=games-misc/opengfx-0.4.7 )"

 PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-cflags.patch
+	"${FILESDIR}"/${PN}-1.9.0-cflags.patch
+	"${FILESDIR}"/${PN}-1.9.0-dont_compress_manpages.patch
 )

 src_configure() {
-	local myopts=()
-	# there is an allegro interface available as well as sdl, but
-	# the configure for it looks broken so the sdl interface is
-	# always built instead.
-	local myopts+=( --without-allegro )
+	local myopts=(
+		--binary-dir="bin"
+		--disable-strip
+		--doc-dir="share/doc/${PF}"
+		--install-dir="${D}"
+		--menu-group="Game;Simulation;"
+		--prefix-dir="${EPREFIX}/usr"
+		$(use_with cpu_flags_x86_sse sse)
+		$(use_with iconv)
+		$(use_with lzo liblzo2)
+		$(use_with png)
+		$(usex debug '--enable-debug=3' '')
+		# there is an allegro interface available as well as sdl, but
+		# the configure for it looks broken so the sdl interface is
+		# always built instead.
+		--without-allegro

-	# libtimidity not needed except for some embedded platform
-	# nevertheless, it will be automagically linked if it is
-	# installed. Hence, we disable it.
-	myopts+=( --without-libtimidity )
+		# libtimidity not needed except for some embedded platform
+		# nevertheless, it will be automagically linked if it is
+		# installed. Hence, we disable it.
+		--without-libtimidity

-	use debug && myopts+=( --enable-debug=3 )
+		--without-fluidsynth
+	)

 	if use dedicated ; then
 		myopts+=( --enable-dedicated )
 	else
-		use aplaymidi && myopts+=( --with-midi='/usr/bin/aplaymidi' )
 		myopts+=(
+			$(usex aplaymidi '--with-midi=/usr/bin/aplaymidi' '')
 			$(use_with truetype freetype)
 			$(use_with icu)
 			--with-sdl
@ -80,18 +106,7 @@ src_configure() {

 	# configure is a hand-written bash-script, so econf will not work.
 	# It's all built as C++, upstream uses CFLAGS internally.
-	CFLAGS="" ./configure \
-		--disable-strip \
-		--prefix-dir="${EPREFIX%/}/usr" \
-		--binary-dir="bin" \
-		--install-dir="${D}" \
-		--menu-group="Game;Simulation;" \
-		${myopts[@]} \
-		$(use_with iconv) \
-		$(use_with png) \
-		$(use_with cpu_flags_x86_sse sse) \
-		$(use_with lzo liblzo2) \
-		|| die
+	CFLAGS="" ./configure ${myopts[@]} || die
 }

 src_compile() {
@ -108,11 +123,11 @@ src_install() {
 }

 pkg_preinst() {
-	gnome2_icon_savelist
+	xdg_pkg_preinst
 }

 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst

 	if ! use lzo ; then
 		elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
@ -166,5 +181,5 @@ pkg_postinst() {
 }

 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postrm
 }
--- a/games-simulation/openttd/openttd-9999.ebuild
+++ b/games-simulation/openttd/openttd-9999.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
-inherit gnome2-utils
+EAPI=7
+inherit xdg

 MY_PV="${PV/_rc/-RC}"
 MY_P="${PN}-${MY_PV}"
@ -13,8 +13,9 @@ if [[ "${PV}" == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/OpenTTD/OpenTTD.git"
 else
-	SRC_URI="http://binaries.openttd.org/releases/${MY_PV}/${MY_P}-source.tar.xz"
+	SRC_URI="https://proxy.binaries.openttd.org/openttd-releases/${MY_PV}/${MY_P}-source.tar.xz"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
+	S="${WORKDIR}/${MY_P}"
 fi

 LICENSE="GPL-2"
@ -32,14 +33,18 @@ RDEPEND="!dedicated? (
 		truetype? (
 			media-libs/fontconfig
 			media-libs/freetype:2
-			sys-libs/zlib
+			sys-libs/zlib:=
 		)
 	)
 	lzo? ( dev-libs/lzo:2 )
 	iconv? ( virtual/libiconv )
-	png? ( media-libs/libpng:0 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
+	png? (
+		media-libs/libpng:0
+		sys-libs/zlib:=
+	)
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig"
 PDEPEND="
 	!dedicated? (
@ -52,32 +57,30 @@ PDEPEND="
 	)
 	openmedia? ( >=games-misc/opengfx-0.4.7 )"

-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-cflags.patch
+	"${FILESDIR}"/${PN}-1.9.0-cflags.patch
+	"${FILESDIR}"/${PN}-1.9.0-dont_compress_manpages.patch
 )

 src_configure() {
 	local myopts=(
-		--disable-strip
-		--prefix-dir="${EPREFIX%/}/usr"
 		--binary-dir="bin"
+		--disable-strip
+		--doc-dir="share/doc/${PF}"
 		--install-dir="${D}"
 		--menu-group="Game;Simulation;"
-		$(use_with iconv)
-		$(use_with png)
+		--prefix-dir="${EPREFIX}/usr"
 		$(use_with cpu_flags_x86_sse sse)
+		$(use_with iconv)
 		$(use_with lzo liblzo2)
+		$(use_with png)
 		$(usex debug '--enable-debug=3' '')
 		# there is an allegro interface available as well as sdl, but
 		# the configure for it looks broken so the sdl interface is
 		# always built instead.
 		--without-allegro
-		# libtimidity not needed except for some embedded platform
-		# nevertheless, it will be automagically linked if it is
-		# installed. Hence, we disable it.
-		--without-libtimidity
+
+		--without-fluidsynth
 	)

 	if use dedicated ; then
@ -109,17 +112,17 @@ src_install() {
 	default
 	if use dedicated ; then
 		newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-		rm -rf "${ED%/}"/usr/share/{applications,icons,pixmaps}
+		rm -rf "${ED}"/usr/share/{applications,icons,pixmaps}
 	fi
-	rm -f "${ED%/}"/usr/share/doc/${PF}/COPYING
+	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
 }

 pkg_preinst() {
-	gnome2_icon_savelist
+	xdg_pkg_preinst
 }

 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst

 	if ! use lzo ; then
 		elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
@ -173,5 +176,5 @@ pkg_postinst() {
 }

 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postrm
 }
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
--- a/kde-apps/akonadi-calendar/akonadi-calendar-18.12.3-r1.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-18.12.3-r1.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for akonadi calendar integration"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(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 kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+"
+
+RESTRICT+=" test"
--- a/kde-apps/akonadi-contacts/akonadi-contacts-18.12.3-r1.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-18.12.3-r1.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Library for akonadi contact integration"
+KEYWORDS="~amd64 ~arm64 ~x86"
+LICENSE="GPL-2+"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep prison)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+"
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.12.3-r1.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.12.3-r1.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
+HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep mailimporter)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
--- a/kde-apps/akonadi-mime/akonadi-mime-18.12.3-r1.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-18.12.3-r1.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for akonadi mime types"
+KEYWORDS="~amd64 ~arm64 ~x86"
+LICENSE="GPL-2+ LGPL-2.1+"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+	!kde-apps/kdepimlibs:4
+"
--- a/kde-apps/akonadi-notes/akonadi-notes-18.12.3-r1.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-18.12.3-r1.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for akonadi notes integration"
+KEYWORDS="~amd64 ~arm64 ~x86"
+LICENSE="GPL-2+"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
--- a/kde-apps/akonadi-search/akonadi-search-18.12.3-r2.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-18.12.3-r2.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
+HOMEPAGE="https://cgit.kde.org/akonadi-search.git"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="
+	test? ( $(add_kdeapps_dep akonadi 'tools' 18.12.3-r1) )
+"
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep krunner)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=dev-libs/xapian-1.3:=[chert(+)]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	test? ( $(add_kdeapps_dep akonadi 'mysql,postgres,sqlite' 18.12.3-r1) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+PATCHES=( "${FILESDIR}/${PN}-18.12.0-cmake.patch" )
--- a/kde-apps/akonadi/akonadi-18.12.3-r1.ebuild
+++ b/kde-apps/akonadi/akonadi-18.12.3-r1.ebuild
@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_DESIGNERPLUGIN="true"
+KDE_TEST="forceoptional"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
+HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LICENSE="LGPL-2.1+"
+IUSE="+mysql postgres sqlite tools xml"
+
+REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
+
+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 kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql 'mysql?,postgres?')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	sqlite? (
+		$(add_qt_dep qtsql 'sqlite' '' '5=')
+		dev-db/sqlite:3
+	)
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	dev-libs/libxslt
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/akonadi:4
+	!<kde-apps/kapptemplate-17.11.80
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepimlibs
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+"
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch"
+	"${FILESDIR}/${P}-major-regression-updating-attributes.patch"
+	"${FILESDIR}/${P}-collection-detach-at-wrong-time-in-attribute.patch"
+)
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
+	# reverse driver check to keep the order
+	use sqlite && DRIVER="QSQLITE3"
+	use postgres && DRIVER="QPSQL"
+	use mysql && DRIVER="QMYSQL"
+
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+		ewarn "We strongly recommend you change your Akonadi database backend to either MySQL"
+		ewarn "or PostgreSQL in your user configuration."
+		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
+	fi
+
+	kde5_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
+		-DBUILD_TOOLS=$(usex tools)
+		$(cmake-utils_use_find_package xml LibXml2)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	kde5_src_install
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are:"
+	use mysql && elog "  QMYSQL"
+	use postgres && elog "  QPSQL"
+	use sqlite && elog "  QSQLITE3"
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+}
--- a/kde-apps/akonadi/files/akonadi-18.12.3-collection-detach-at-wrong-time-in-attribute.patch
+++ b/kde-apps/akonadi/files/akonadi-18.12.3-collection-detach-at-wrong-time-in-attribute.patch
@ -0,0 +1,97 @@
+From 53ad3b6d73d92ea289cf0183c10e2b8a35c8127a Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Thu, 21 Mar 2019 23:37:36 +0100
+Subject: Fix collection detaching at the wrong time in attribute()
+
+Summary:
+Found in FatCRM where changes to collection attributes were not stored
+anymore.
+
+Test Plan:
+New unittest to ensure that we get the attribute from the
+detached collection, not from the original one.
+
+Reviewers: dvratil
+
+Reviewed By: dvratil
+
+Subscribers: kde-pim
+
+Tags: #kde_pim
+
+Differential Revision: https://phabricator.kde.org/D19741
+---
+ autotests/libs/collectionattributetest.cpp | 15 +++++++++++++++
+ autotests/libs/collectionattributetest.h   |  1 +
+ src/core/collection.h                      |  8 ++------
+ 3 files changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/autotests/libs/collectionattributetest.cpp b/autotests/libs/collectionattributetest.cpp
+index e264a37..9c46561 100644
+--- a/autotests/libs/collectionattributetest.cpp
+++ b/autotests/libs/collectionattributetest.cpp
+@@ -240,3 +240,18 @@ void CollectionAttributeTest::testCollectionIdentificationAttribute()
+     QCOMPARE(parsed.identifier(), id);
+     QCOMPARE(parsed.collectionNamespace(), ns);
+ }
+
+void CollectionAttributeTest::testDetach()
+{
+    // GIVEN a collection with an attribute
+    Collection col;
+    col.attribute<TestAttribute>(Akonadi::Collection::AddIfMissing);
+    Collection col2 = col; // and a copy, so that non-const access detaches
+
+    // WHEN
+    TestAttribute *attr = col2.attribute<TestAttribute>(Akonadi::Collection::AddIfMissing);
+    TestAttribute *attr2 = col2.attribute<TestAttribute>();
+
+    // THEN
+    QCOMPARE(attr, attr2);
+}
+diff --git a/autotests/libs/collectionattributetest.h b/autotests/libs/collectionattributetest.h
+index 420df78..2afa9eb 100644
+--- a/autotests/libs/collectionattributetest.h
+++ b/autotests/libs/collectionattributetest.h
+@@ -32,6 +32,7 @@ private Q_SLOTS:
+     void testDefaultAttributes();
+     void testCollectionRightsAttribute();
+     void testCollectionIdentificationAttribute();
+    void testDetach();
+ };
+ 
+ #endif
+diff --git a/src/core/collection.h b/src/core/collection.h
+index b5a496c..9c19cc9 100644
+--- a/src/core/collection.h
+++ b/src/core/collection.h
+@@ -565,10 +565,10 @@ inline T *Akonadi::Collection::attribute(Collection::CreateOption option)
+     Q_UNUSED(option);
+ 
+     const T dummy;
+    markAttributesChanged();
+     if (hasAttribute(dummy.type())) {
+         T *attr = dynamic_cast<T *>(attribute(dummy.type()));
+         if (attr) {
+-            markAttributesChanged();
+             return attr;
+         }
+         //Reuse 5250
+@@ -585,14 +585,10 @@ template <typename T>
+ inline T *Akonadi::Collection::attribute() const
+ {
+     const QByteArray type = T().type();
+    const_cast<Collection*>(this)->markAttributesChanged();
+     if (hasAttribute(type)) {
+         T *attr = dynamic_cast<T *>(attribute(type));
+         if (attr) {
+-            // FIXME: This method returns a non-const pointer, so callers may still modify the
+-            // attribute. Unfortunately, just making this function return a const pointer and
+-            // creating a non-const overload does not work, as many users of this function abuse the
+-            // non-const pointer and modify the attribute even on a const object.
+-            const_cast<Collection*>(this)->markAttributesChanged();
+             return attr;
+         }
+         //reuse 5250
+-- 
+cgit v1.1
--- a/kde-apps/akonadi/files/akonadi-18.12.3-major-regression-updating-attributes.patch
+++ b/kde-apps/akonadi/files/akonadi-18.12.3-major-regression-updating-attributes.patch
@ -0,0 +1,55 @@
+From 1d8851495bcfa6ff5d3fa35882b68fdf68b21a7f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
+Date: Thu, 21 Mar 2019 13:22:58 +0100
+Subject: Fix a regression when updating attributes
+
+This fixes a regression introduced in 3a062e6a and 6054e42d where some
+attributes were not sent to the Akonadi server in update job even though
+they were modified. This was due to a bad API design which returns a
+non-const pointer to an attribute from a const method, so callers sometimes
+modify the returned attribute on a const object. Since the method itself
+is const though, it did not mark the attribute as modified.
+
+Proper fix is to introduce a purely const and non-const overloads for
+the attribute accessors, unfortunatelly this requires fixing a lot of our code
+in many places first to not abuse the non-constness of the returned
+attribute.
+
+Note that since the code is in an inlined method, all clients should be
+recompiled.
+
+CCMAIL: faure@kde.org
+---
+ src/core/collection.h | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/src/core/collection.h b/src/core/collection.h
+index 50c0926..b5a496c 100644
+--- a/src/core/collection.h
+++ b/src/core/collection.h
+@@ -584,14 +584,19 @@ inline T *Akonadi::Collection::attribute(Collection::CreateOption option)
+ template <typename T>
+ inline T *Akonadi::Collection::attribute() const
+ {
+-    const T dummy;
+-    if (hasAttribute(dummy.type())) {
+-        T *attr = dynamic_cast<T *>(attribute(dummy.type()));
+    const QByteArray type = T().type();
+    if (hasAttribute(type)) {
+        T *attr = dynamic_cast<T *>(attribute(type));
+         if (attr) {
+            // FIXME: This method returns a non-const pointer, so callers may still modify the
+            // attribute. Unfortunately, just making this function return a const pointer and
+            // creating a non-const overload does not work, as many users of this function abuse the
+            // non-const pointer and modify the attribute even on a const object.
+            const_cast<Collection*>(this)->markAttributesChanged();
+             return attr;
+         }
+         //reuse 5250
+-        qWarning() << "Found attribute of unknown type" << dummy.type()
+        qWarning() << "Found attribute of unknown type" << type
+                    << ". Did you forget to call AttributeFactory::registerAttribute()?";
+     }
+ 
+-- 
+cgit v1.1
--- a/kde-apps/akonadiconsole/akonadiconsole-18.12.3-r1.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-18.12.3-r1.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+inherit kde5
+
+DESCRIPTION="Application for debugging Akonadi Resources"
+LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
+HOMEPAGE="https://www.kde.org/"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE=""
+
+DEPEND="
+	$(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 kio)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep messagelib)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	dev-libs/xapian:=
+"
+RDEPEND="${DEPEND}"
--- a/kde-apps/calendarjanitor/calendarjanitor-18.12.3-r1.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-18.12.3-r1.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+KDE_TEST="false"
+KMNAME="akonadi-calendar-tools"
+inherit kde5
+
+DESCRIPTION="Tool to scan calendar data for buggy instances"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	cmake_comment_add_subdirectory doc konsolekalendar
+	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
+
+	# delete colliding konsolekalendar translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		rm -f po/*/konsolekalendar.po || die
+		rm -rf po/*/docs/konsolekalendar || die
+	fi
+}
--- a/kde-apps/calendarsupport/calendarsupport-18.12.3-r1.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-18.12.3-r1.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Calendar support library"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep kholidays)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep designer)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libical
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
--- a/kde-apps/dolphin/dolphin-18.12.3.ebuild
+++ b/kde-apps/dolphin/dolphin-18.12.3.ebuild
@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Plasma filemanager focusing on usability"
 HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE="semantic-desktop thumbnail"
+IUSE="semantic-desktop +thumbnail"

 DEPEND="
 	$(add_frameworks_dep kbookmarks)
--- a/kde-apps/eventviews/eventviews-18.12.3-r1.ebuild
+++ b/kde-apps/eventviews/eventviews-18.12.3-r1.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Calendar viewer for KDE PIM"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_qt_dep designer)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/kdiagram:5
+	dev-libs/libical
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
--- a/kde-apps/incidenceeditor/incidenceeditor-18.12.3-r1.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-18.12.3-r1.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Incidence editor for korganizer"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(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 kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/kdiagram:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+"
--- a/kde-apps/kaddressbook/kaddressbook-18.12.3-r1.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-18.12.3-r1.ebuild
@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Address book application based on KDE Frameworks"
+HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(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 kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep prison)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+	dev-libs/grantlee:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kaddressbook:4
+	!kde-apps/kdepim-l10n
+	$(add_kdeapps_dep kdepim-runtime)
+"
--- a/kde-apps/kalarm/kalarm-18.12.3-r1.ebuild
+++ b/kde-apps/kalarm/kalarm-18.12.3-r1.ebuild
@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
+HOMEPAGE+=" https://userbase.kde.org/KAlarm"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="X"
+
+BDEPEND="
+	dev-libs/libxslt
+"
+DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(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 kdelibs4support)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep kholidays)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kalarmcal)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5(+)]
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kalarm:4
+	!kde-apps/kdepim-l10n
+	$(add_kdeapps_dep kdepim-runtime)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
--- a/kde-apps/kalarmcal/kalarmcal-18.12.3-r1.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-18.12.3-r1.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Client library to access and handling of KAlarm calendar data"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kholidays)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_qt_dep qtgui)
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_qt_dep qtdbus) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+"
+
+src_test() {
+	LANG="C" kde5_src_test #bug 665626
+}
--- a/kde-apps/kdepim-addons/kdepim-addons-18.12.3-r1.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-18.12.3-r1.ebuild
@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_EXAMPLES="true"
+KDE_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plugins for KDE Personal Information Management Suite"
+HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="importwizard markdown"
+
+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 khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep prison)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kitinerary)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpkpass)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	importwizard? ( $(add_kdeapps_dep akonadi-import-wizard) )
+	markdown? ( app-text/discount )
+"
+DEPEND="${COMMON_DEPEND}
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kaddressbook:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
+		$(cmake-utils_use_find_package importwizard KPimImportWizard)
+		$(cmake-utils_use_find_package markdown Discount)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if [[ ${KDE_BUILD_TYPE} = live ]] && ! has_version "kde-misc/kregexpeditor" ; then
+		elog "${PN} Sieve editor plugin can make use of kde-misc/kregexpeditor if installed."
+	fi
+}
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.12.3-r1.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.12.3-r1.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Libraries for KDE PIM applications"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(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 prison)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=dev-libs/grantlee-5.1.0:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
--- a/kde-apps/kdepim-runtime/kdepim-runtime-18.12.3-r1.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-18.12.3-r1.ebuild
@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+oauth"
+
+# TODO kolab
+BDEPEND="
+	dev-libs/libxslt
+"
+COMMON_DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(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 kholidays)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep kalarmcal)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdav)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkgapi)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtspeech)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/cyrus-sasl:2
+	dev-libs/libical:=
+	oauth? ( $(add_qt_dep qtnetworkauth) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtxmlpatterns)
+	test? ( $(add_kdeapps_dep kimap 'test') )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-misc/akonadi-ews
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package oauth Qt5NetworkAuth)
+	)
+
+	kde5_src_configure
+}
--- a/kde-apps/kgpg/kgpg-18.12.3-r1.ebuild
+++ b/kde-apps/kgpg/kgpg-18.12.3-r1.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="gpg"
+inherit kde5
+
+DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
+HOMEPAGE="https://www.kde.org/applications/utilities/kgpg
+https://utils.kde.org/projects/kgpg/"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep kcontacts)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	app-crypt/gpgme
+"
+RDEPEND="${COMMON_DEPEND}
+	app-crypt/gnupg
+"
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-18.12.3-r1.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.12.3-r1.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Assistant for KMail accounts configuration"
+HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepim-runtime:4
+"
--- a/kde-apps/kmail/kmail-18.12.3-r1.ebuild
+++ b/kde-apps/kmail/kmail-18.12.3-r1.ebuild
@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
+HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-libs/libxslt
+	test? ( $(add_kdeapps_dep akonadi 'tools' 18.12.3-r1) )
+"
+COMMON_DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(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 kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kldap)
+	test? ( $(add_kdeapps_dep akonadi 'sqlite' 18.12.3-r1) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+	!kde-apps/ktnef
+	$(add_kdeapps_dep kdepim-runtime)
+	$(add_kdeapps_dep kmail-account-wizard)
+"
+
+RESTRICT+=" test" # bug 616878
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use handbook; then
+		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
+	fi
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	pkg_is_installed() {
+		echo "${1} ($(has_version ${1} || echo "not ")installed)"
+	}
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "KMail supports the following runtime dependencies:"
+		elog "  Virus detection:"
+		elog "    $(pkg_is_installed app-antivirus/clamav)"
+		elog "  Spam filtering:"
+		elog "    $(pkg_is_installed mail-filter/bogofilter)"
+		elog "    $(pkg_is_installed mail-filter/spamassassin)"
+		elog "  Fancy e-mail headers and various useful plugins:"
+		elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
+		elog "  Crypto config and certificate details GUI:"
+		elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
+	fi
+}
--- a/kde-apps/kmailtransport/kmailtransport-18.12.3-r1.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-18.12.3-r1.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Mail transport service"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+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 ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep ksmtp)
+	$(add_kdeapps_dep libkgapi)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_frameworks_dep ktextwidgets) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepimlibs:4
+"
+
+RESTRICT+=" test"
--- a/kde-apps/knotes/knotes-18.12.3-r1.ebuild
+++ b/kde-apps/knotes/knotes-18.12.3-r1.ebuild
@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Note taking application"
+HOMEPAGE="https://www.kde.org/"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE=""
+
+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 kdelibs4support)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+	dev-libs/libxslt
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/knotes:4
+	$(add_kdeapps_dep kdepim-runtime)
+"
+
+src_configure() {
+# 	local mycmakeargs=(
+# 	# FIXME: Does not build (last checked 2016-02-17)
+# 		$(cmake-utils_use_find_package X Qt5X11Extras)
+# 		$(cmake-utils_use_find_package X X11)
+# 	)
+
+	kde5_src_configure
+}
--- a/kde-apps/konsolekalendar/konsolekalendar-18.12.3-r1.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-18.12.3-r1.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KMNAME="akonadi-calendar-tools"
+inherit kde5
+
+DESCRIPTION="Command line interface to KDE calendars"
+HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/konsolekalendar:4
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	# delete colliding calendarjanitor translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		rm -f po/*/calendarjanitor.po || die
+	fi
+
+	cmake_comment_add_subdirectory calendarjanitor
+}
--- a/kde-apps/kontact/kontact-18.12.3-r1.ebuild
+++ b/kde-apps/kontact/kontact-18.12.3-r1.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Container application to unify several major PIM applications within one"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+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 ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep mailcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kontact:4
+"
--- a/kde-apps/korganizer/korganizer-18.12.3-r1.ebuild
+++ b/kde-apps/korganizer/korganizer-18.12.3-r1.ebuild
@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
+HOMEPAGE="https://www.kde.org/applications/office/korganizer/"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="X"
+
+BDEPEND="
+	test? ( $(add_kdeapps_dep akonadi 'tools' 18.12.3-r1) )
+"
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(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 kholidays)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5(+)]
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kldap)
+	$(add_qt_dep designer)
+	test? ( $(add_kdeapps_dep akonadi 'sqlite' 18.12.3-r1) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/korganizer:4
+	$(add_kdeapps_dep kdepim-runtime)
+"
+
+# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST Test-Strict-0.47.tar.gz 20679 BLAKE2B e72eef42fdb7c0e354147c06f4e7c418d5c302d0bca662995042d7046fd9deae3ae6b12fa0f780aff8d6f0e5cab52db76184d99471d130ce18bfd6c00657dddb SHA512 56ffc488cb2502af228ad03f3da7bf11f04c0cacc7f1ea13b3aa8e0578f0df36a9be092f71db973748c8db15f45873a384f2e24844468b9a300d2386692c21b9`