Sync with portage [Mon Apr 24 00:33:58 MSK 2017].

7 years ago · d39d3c96f9
parent 5208c3a0f0
commit d39d3c96f9
423 changed files with 2923 additions and 4399 deletions
--- a/app-admin/gkrellm/files/gkrellmd.service
+++ b/app-admin/gkrellm/files/gkrellmd.service
@ -4,7 +4,7 @@ Documentation=man:gkrellmd(1)
 After=network.target

 [Service]
-ExecStart=/usr/sbin/gkrellmd
+ExecStart=/usr/bin/gkrellmd

 [Install]
 WantedBy=multi-user.target
--- a/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@ -18,3 +18,7 @@ DIST systemrescuecd-x86-4.9.0.iso 504498176 SHA256 1e84a298fd156826fc0a066f559b8
 DIST systemrescuecd-x86-4.9.1.iso 513009664 SHA256 d6ad5d97b676fa224bae172fbd2681d207f62031e8597e46dd2e97e0751368db SHA512 ac4c2bc65611a575c2f4d12012e9bcaf8bd94283aa8d8c0ad571352b8f33161dded68de091839c9d8a4d5101a2413864838596eed1aedcf20d9441dd59f96dfa WHIRLPOOL 123af2cc99388add86681acb3b6377275b906ccba8163b4be97f8b049ff29460c0015681a042e4d1fa1c3b134a3da1c6cb610b4873ca050200dd0f997f94a503
 DIST systemrescuecd-x86-4.9.2.iso 512159744 SHA256 40c028b4ae2f8289f8113533fdfdfeae17d998fbd7d5c284a5d21c6774d871fe SHA512 2d99c0e432ecf5b5635d597d6899518c6ee03bb79911d992d22bda993d38376028407c98ba15f9510c8723c5fba6bf8f0958574542c6035e7cce4c5096ad0a18 WHIRLPOOL 7a1a26a8a60a39217d934a59ba96eec281e197021d8f639c1950f5eb35c7916c7eebf56a5fc09d9dea6de05724faa6ea6bb1543db1934e65665374900a062e1c
 DIST systemrescuecd-x86-4.9.3.iso 515739648 SHA256 47c87b4ebebb9a3739d3434bf1cc8939d692182e39f0768e45b22ed1c8ba0382 SHA512 d60b3ba1548c98faba24e2c56ffe70be2e271b0946d2dde46cf766e6f206881f1e0450998af05c439f37edbcac67f0649830914c4354c2212518f63faa140254 WHIRLPOOL c67bb66ad0023dde57c1e1a6081de21671a49c8533cfbc9847886a1bac8321b8d80e331d94d27460918c89a193c57ae1c1078426aac0e42db7934c2005b1f7d4
+DIST systemrescuecd-x86-4.9.4.iso 516374528 SHA256 274319bd2c43b54bb901fed4e1cc07895baaaec1b94e5ddfe0443ae5dc114367 SHA512 7bfe963e7ec04f18efbeac5d40a016b56ae7bc8fe8913d8cfd0ea9fbe0f3833d2b86d1a00f30f6587b91338416884af6a65249121609ce2f58a6efa50486e139 WHIRLPOOL 97e94fd6b7bf178e4113226927832ba8b8d809bc2fc0f80fab1468487af7282bd972eebbcec8cf80dfe319affeee3ccfb9dfd1afa6db3bf746b301065f408fcd
+DIST systemrescuecd-x86-4.9.5.iso 520032256 SHA256 ffe944b6c74ca5da16396d4c647eaf5e392cf9a7cae46627a93b43d8ae272aea SHA512 6f9a3497c809c8cf1dcec114221d5d992fa2735b3fa1cc992e46a8e9c793ef7019c37c4a61f8abddafbac0cf7ce03c6fc9a3a2a750d7a82e69db3bdc6791e7fc WHIRLPOOL 087dc72dc264c04a982763f2824620ebc793a4b844b4dd53dedbc31c00c669fc50c08697704afbe0f60b5b060de4a143843423a84e27d9c56e5fdea11819d143
+DIST systemrescuecd-x86-4.9.6.iso 566126592 SHA256 345600159383a70cfd6dd8c32831ca6296610f95d3487e471e34c49721cfb1e8 SHA512 89f6fdc89f91e515d2d84543998ce2c4629c88d290d4aa16f9ad42e194ad7720ec02155a30e19a4744e5d68db0bb476fc86cafe64ec9eb62ff809c32504841b5 WHIRLPOOL 6452efa46721aabd53ebdd9d4506eeb28618481cf04858995bba2e78c4780019217575f5187b4e104e39b476da718359e3d229b4648bdcc3258f31b3a06a8b78
+DIST systemrescuecd-x86-5.0.0.iso 484790272 SHA256 0f04739b9a4c5b3174e4ffe462e23f8b700f9fdff37c75b64e7913b768bd9427 SHA512 67e442f229c55d16a13a46619134afee14fd7cf71e9d5e3d6f54a7b2ce3646e9ff89a17605c05f7a255b251c3bc56004aa9a59bd06f3ed69f7f4b9057ea6ea6c WHIRLPOOL 67b5ccec685746845361aa710e936aa6c693e08cd514283ad4805b44c385de19f5d3ba45cc349ae4b284c28046919ff8cd117a7f458a52fd488a2860f97359b4
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.4.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.4.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.5.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.5.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.6.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.6.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.0.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.0.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
--- a/app-antivirus/clamav/clamav-0.99.1.ebuild
+++ b/app-antivirus/clamav/clamav-0.99.1.ebuild
@ -45,7 +45,7 @@ src_prepare() {
 	use ppc64 && append-flags -mminimal-toc
 	use uclibc && export ac_cv_type_error_t=yes

-	epatch "${FILESDIR}"/${PN}-configure-zlib.patch # 604650, fixed in upstream HEAD
+	epatch "${FILESDIR}"/${PN}-0.99-zlib.patch # 604650, fixed in upstream HEAD
 	eautoconf
 }

--- a/app-antivirus/clamav/clamav-0.99.2-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.99.2-r1.ebuild
@ -38,7 +38,8 @@ RDEPEND="${CDEPEND}
 DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc-6.patch
-	"${FILESDIR}"/${PN}-configure-zlib.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${PN}-0.99-zlib.patch
 )

 pkg_setup() {
@ -57,18 +58,21 @@ src_configure() {
 	use uclibc && export ac_cv_type_error_t=yes

 	econf \
-		--disable-experimental \
-		--enable-id-check \
-		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
-		--with-zlib="${EPREFIX}"/usr \
 		$(use_enable bzip2) \
 		$(use_enable clamdtop) \
 		$(use_enable ipv6) \
 		$(use_enable milter) \
 		$(use_enable static-libs static) \
 		$(use_with iconv) \
-		$(use_with metadata-analysis-api libjson /usr)
+		$(use_with metadata-analysis-api libjson /usr) \
+		--cache-file="${S}"/config.cache \
+		--disable-experimental \
+		--disable-gcc-vcheck \
+		--disable-zlib-vcheck \
+		--enable-id-check \
+		--with-dbdir="${EPREFIX}"/var/lib/clamav \
+		--with-system-tommath \
+		--with-zlib="${EPREFIX}"/usr
 }

 src_install() {
--- a/app-antivirus/clamav/clamav-0.99.2.ebuild
+++ b/app-antivirus/clamav/clamav-0.99.2.ebuild
@ -47,7 +47,7 @@ src_prepare() {
 	use uclibc && export ac_cv_type_error_t=yes

 	epatch "${FILESDIR}"/${P}-gcc-6.patch #592432
-	epatch "${FILESDIR}"/${PN}-configure-zlib.patch # 604650, fixed in upstream HEAD
+	epatch "${FILESDIR}"/${PN}-0.99-zlib.patch # 604650, fixed in upstream HEAD
 	eautoconf
 }

--- a/app-antivirus/clamav/clamav-0.99.ebuild
+++ b/app-antivirus/clamav/clamav-0.99.ebuild
@ -45,7 +45,7 @@ src_prepare() {
 	use ppc64 && append-flags -mminimal-toc
 	use uclibc && export ac_cv_type_error_t=yes

-	epatch "${FILESDIR}"/${PN}-configure-zlib.patch # 604650, fixed in upstream HEAD
+	epatch "${FILESDIR}"/${P}-zlib.patch # 604650, fixed in upstream HEAD
 	eautoconf
 }

--- a/app-antivirus/clamav/files/clamav-configure-zlib.patch
+++ b/app-antivirus/clamav/files/clamav-configure-zlib.patch
--- a/app-antivirus/clamav/files/clamav-0.99.2-tinfo.patch
+++ b/app-antivirus/clamav/files/clamav-0.99.2-tinfo.patch
@ -0,0 +1,23 @@
+--- a/m4/reorganization/clamdtop.m4
+++ b/m4/reorganization/clamdtop.m4
+@@ -4,12 +4,20 @@
+ 
+ if test "$enable_clamdtop" != "no"; then
+ 
+PKG_CHECK_MODULES([CURSES],[ncurses],
+	[HAVE_LIBNCURSES=yes; CURSES_INCLUDE="<ncurses.h>"],
+	[HAVE_LIBNCURSES=no],
+)
+
+if test "X$HAVE_LIBNCURSES" != "Xyes"; then
+    HAVE_LIBNCURSES=
+ AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
+ 	    AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
+ 			    [initscr(); KEY_RESIZE;]),
+ 	    [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
+ 	     CURSES_INCLUDE="<ncurses/ncurses.h>"],
+ 	    [])
+fi
+ 
+ if test "X$HAVE_LIBNCURSES" != "Xyes"; then
+     HAVE_LIBNCURSES=
--- a/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r1.ebuild
+++ b/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r1.ebuild
@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs perl-functions latex-package
+
+DESCRIPTION="Create and manage multiple choice questionnaries, including automated marking"
+HOMEPAGE="http://home.gna.org/auto-qcm/"
+SRC_URI="http://download.gna.org/auto-qcm/${PN}_${PV}_sources.tar.gz"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+LANGS="ar es fr ja"
+# we deliberately always install de and en, since this way we dont get a problem
+# with globs and empty directories...
+#
+for lala in ${LANGS}; do
+	IUSE="${IUSE} l10n_${lala}"
+done
+
+CDEPEND="
+	app-text/texlive[dvi2tty,extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,omega,publishers]
+	app-text/poppler:=
+	dev-perl/XML-LibXML
+	media-libs/netpbm
+	media-libs/opencv
+	l10n_fr? ( app-text/texlive[l10n_fr] )
+	l10n_ja? ( app-text/texlive[l10n_ja] )
+"
+DEPEND="${CDEPEND}
+	app-text/dblatex
+	app-text/docbook-xml-simple-dtd:*
+	app-text/docbook-xsl-stylesheets
+"
+RDEPEND="${CDEPEND}
+	app-text/pdftk
+	dev-lang/perl:=
+	dev-perl/Glib-Object-Introspection
+	dev-perl/Gtk2
+	dev-perl/Gtk2-Notify
+	media-gfx/imagemagick
+	dev-perl/XML-Writer
+	dev-perl/Archive-Zip
+	dev-perl/DBI
+	dev-perl/Text-CSV
+	dev-perl/DBD-SQLite
+	dev-perl/Net-CUPS
+	dev-perl/Email-Address
+	dev-perl/Email-MIME
+	dev-perl/Email-Sender
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.0-desktop.patch"
+	"${FILESDIR}/${PN}-1.3.0-conf.patch"
+)
+
+src_prepare() {
+	default
+
+	local la
+	for la in ${L10N} ; do
+		if ! use l10n_${la} ; then
+			# remove languages that we dont want to install
+			rm -vf "I18N/lang/${la}.po"
+			rm -vf "doc/auto-multiple-choice.${la}.in.xml" "doc/doc-xhtml-site.${la}.xsl.in"
+			rm -rvf "doc/html/auto-multiple-choice.${la}" "doc/modeles/${la}"
+		fi
+	done
+}
+
+src_compile() {
+	perl_set_version
+	export VENDOR_LIB PVR
+	export TEXINPUTS="/usr/share/dblatex/latex/style:/usr/share/dblatex/latex/misc:/usr/share/dblatex/latex/graphics:"
+
+	export MAKEOPTS="-j1"
+	# when doing a parallel build, the package is acting decidedly odd
+	# e.g., the build seems to succeed while actually stuff fails
+	# and subsequent error messages do not have any relation to the real problem
+	# So let's keep this also for easier debugging
+
+	emake \
+			GCC_NETPBM="-I/usr/include/netpbm/ -lnetpbm" \
+			GCC="$(tc-getCC)" \
+			GCC_PP="$(tc-getCXX)"
+}
+
+src_install() {
+	default
+}
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.2.6.2.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.2.6.2.ebuild
@ -46,7 +46,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"

 RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"

--- a/app-office/libreoffice-bin/libreoffice-bin-5.2.6.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-5.2.6.2.ebuild
@ -54,7 +54,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"

 BIN_COMMON_DEPEND="
 	app-text/hunspell:0/1.6
--- a/app-office/libreoffice-l10n/libreoffice-l10n-5.2.6.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.2.6.2.ebuild
@ -14,7 +14,7 @@ BASE_SRC_URI_STABLE="http://download.documentfoundation.org/${PN/-l10n/}/stable/

 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="offlinehelp"

 #
--- a/app-office/libreoffice/libreoffice-5.2.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.6.2.ebuild
@ -83,7 +83,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"

 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
--- a/app-text/hunspell/hunspell-1.6.1-r1.ebuild
+++ b/app-text/hunspell/hunspell-1.6.1-r1.ebuild
@ -13,7 +13,7 @@ HOMEPAGE="http://hunspell.sourceforge.net/"
 SLOT="0/$(get_version_component_range 1-2)"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"

 RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
--- a/app-text/ocrad/Manifest
+++ b/app-text/ocrad/Manifest
@ -2,3 +2,4 @@ DIST ocrad-0.22.tar.lz 87698 SHA256 d6c9dcbcf4c9cc643edfe5a03cb6125d6c39abe59e83
 DIST ocrad-0.23.tar.lz 87385 SHA256 f5bc9479c01fe8c64aa836c8636dff65e9b459c2edbd4fc0656f47f435d9a06f SHA512 db3c282dd121b5138d7e0e8d52fe88a3d392aa5ba2a5b821c74a84b1f66f0bfb8f3b9f08a276b6814c6bb6c31b1a51f5bcaf0c6e66e1a4d659ea72f60b383d13 WHIRLPOOL 4fdf1b8d8061fc116295b8984465b5cea0be1406b0a76bff7b779ba8e3ee4dba07c6dc7345a36fc0fbc523013a721d8baf136d19f7e429144d282039248ba9d5
 DIST ocrad-0.24.tar.lz 84506 SHA256 9beaede0a0ba8ac39c5fb78aef2ed31313ac7f2cd20215718a0b80260ee81442 SHA512 c43cb4dc678e9588e7061af6ea83a0514181e56201fe5ab68b50b8a1c8e1ae7c7fbf959cdf172b7200b89d9e6b1f42261ead4fbf3a6d0123860feff7954e532d WHIRLPOOL dffc5c39e71901205c890bd78e186128295874344f1e989dab784cd623b553b0a42cc2faf3e778d45816a482158d938c13cb478a95c292960848c5a338c49aa3
 DIST ocrad-0.25.tar.lz 91464 SHA256 e710be9c030fbcbce2315077326c8268feb422c0bc39fa744644cbbd1f5d4dd4 SHA512 48a0753d699af909d4d0295005e12ec626dad8772a5212c0d579df3b24cf01f6e457ec61edc708a0f6eebace75f37ce0544e8b19c11c9a25166aafedc92c258f WHIRLPOOL a4c7a8a84270d33f2722d86464e138cc0454ca2b055e7d0416dacf402c3ab998d8daa6f32ab80ac57f9ae2c832737eeede4f8fcc660ffcbf64f063e0e3085bf0
+DIST ocrad-0.26.tar.lz 91450 SHA256 c383d37869baa0990d38d38836d4d567e9e2862aa0cd704868b62dafeac18e3c SHA512 6cf4c97c4dbbc3a623192de2da261e4854dc3082a26d9731fd00feb8ed371cb18d41f5a8ed992f98e2a00aed68d60f1f3aa90b05f8472431fcf5bc5e3d10e70c WHIRLPOOL 6fbb55eb6ac006d46019f0903e6db35a4f038e7b0436a3c7933d87afe8081d2f591d00865bebf0d42ffb8c1948cae722c0bc3df389e021db2eb659391c3d111c
--- a/app-text/ocrad/ocrad-0.26.ebuild
+++ b/app-text/ocrad/ocrad-0.26.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit unpacker toolchain-funcs
+
+DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
+HOMEPAGE="https://www.gnu.org/software/ocrad/ocrad.html"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="$(unpacker_src_uri_depends)"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_configure() {
+	# ./configure is not based on autotools
+	./configure \
+		CPPFLAGS="${CPPFLAGS}" \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		--prefix=/usr
+}
+
+src_install() {
+	default
+	doman doc/${PN}.1
+	doinfo doc/${PN}.info
+}
--- a/dev-libs/double-conversion/double-conversion-2.0.1.ebuild
+++ b/dev-libs/double-conversion/double-conversion-2.0.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"

 LIBNAME=lib${PN}
--- a/dev-perl/Apache-LogFormat-Compiler/Apache-LogFormat-Compiler-0.350.0.ebuild
+++ b/dev-perl/Apache-LogFormat-Compiler/Apache-LogFormat-Compiler-0.350.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Compile an Apache log format string to perl-code"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"

 # POSIX -> perl
--- a/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.8.1.ebuild
+++ b/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.8.1.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert arbitrary Perl Modules' versions into normalised Gentoo versions"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/Text-CSV_XS/Text-CSV_XS-1.280.0.ebuild
+++ b/dev-perl/Text-CSV_XS/Text-CSV_XS-1.280.0.ebuild
@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Comma-separated values manipulation routines"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"

 RDEPEND="
--- a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild
+++ b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~x86"
+KEYWORDS="~alpha amd64 ~arm ~x86"
 IUSE="doc test"

 DEPEND="
--- a/dev-python/configparser/configparser-3.5.0.ebuild
+++ b/dev-python/configparser/configparser-3.5.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""

 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/isort/isort-4.2.5.ebuild
+++ b/dev-python/isort/isort-4.2.5.ebuild
@ -12,5 +12,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
--- a/dev-python/pylint/pylint-1.6.5-r1.ebuild
+++ b/dev-python/pylint/pylint-1.6.5-r1.ebuild
@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~x86"
+KEYWORDS="~alpha amd64 ~arm ~x86"
 IUSE="doc examples test"

 RDEPEND="
--- a/dev-qt/qtcore/files/qtcore-5.7.1-qipm.patch
+++ b/dev-qt/qtcore/files/qtcore-5.7.1-qipm.patch
@ -0,0 +1,152 @@
+From baad82d242a4d8c1af6c87faaa7f25584183fd53 Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <steveire@gmail.com>
+Date: Tue, 20 Dec 2016 00:44:12 +0000
+Subject: [PATCH] QIPM: Persist model indexes after emitting layoutChange, not
+ before
+
+Callers can persist a QModelIndex which was not persisted before in a
+slot connected to the signal, and such a persisted index must be updated
+in the course of the layoutChange.
+
+Store the indexes to persist after emitting the signal.
+
+Task-number: QTBUG-32981
+Change-Id: Ibee4c0d84817d72603a03fe5b22fdeefeac0695e
+Reviewed-by: David Faure <david.faure@kdab.com>
+---
+ src/corelib/itemmodels/qidentityproxymodel.cpp     | 18 ++---
+ .../tst_qidentityproxymodel.cpp                    | 76 ++++++++++++++++++++++
+ 2 files changed, 85 insertions(+), 9 deletions(-)
+
+diff --git a/src/corelib/itemmodels/qidentityproxymodel.cpp b/src/corelib/itemmodels/qidentityproxymodel.cpp
+index e537793..7c30679 100644
+--- a/src/corelib/itemmodels/qidentityproxymodel.cpp
+++ b/src/corelib/itemmodels/qidentityproxymodel.cpp
+@@ -496,15 +496,6 @@ void QIdentityProxyModelPrivate::_q_sourceLayoutAboutToBeChanged(const QList<QPe
+ {
+     Q_Q(QIdentityProxyModel);
+ 
+-    const auto proxyPersistentIndexes = q->persistentIndexList();
+-    for (const QPersistentModelIndex &proxyPersistentIndex : proxyPersistentIndexes) {
+-        proxyIndexes << proxyPersistentIndex;
+-        Q_ASSERT(proxyPersistentIndex.isValid());
+-        const QPersistentModelIndex srcPersistentIndex = q->mapToSource(proxyPersistentIndex);
+-        Q_ASSERT(srcPersistentIndex.isValid());
+-        layoutChangePersistentIndexes << srcPersistentIndex;
+-    }
+-
+     QList<QPersistentModelIndex> parents;
+     parents.reserve(sourceParents.size());
+     for (const QPersistentModelIndex &parent : sourceParents) {
+@@ -518,6 +509,15 @@ void QIdentityProxyModelPrivate::_q_sourceLayoutAboutToBeChanged(const QList<QPe
+     }
+ 
+     q->layoutAboutToBeChanged(parents, hint);
+
+    const auto proxyPersistentIndexes = q->persistentIndexList();
+    for (const QPersistentModelIndex &proxyPersistentIndex : proxyPersistentIndexes) {
+        proxyIndexes << proxyPersistentIndex;
+        Q_ASSERT(proxyPersistentIndex.isValid());
+        const QPersistentModelIndex srcPersistentIndex = q->mapToSource(proxyPersistentIndex);
+        Q_ASSERT(srcPersistentIndex.isValid());
+        layoutChangePersistentIndexes << srcPersistentIndex;
+    }
+ }
+ 
+ void QIdentityProxyModelPrivate::_q_sourceLayoutChanged(const QList<QPersistentModelIndex> &sourceParents, QAbstractItemModel::LayoutChangeHint hint)
+diff --git a/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp b/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
+index e946f31..564b854 100644
+--- a/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
+@@ -68,6 +68,8 @@ private slots:
+ 
+     void itemData();
+ 
+    void persistIndexOnLayoutChange();
+
+ protected:
+     void verifyIdentity(QAbstractItemModel *model, const QModelIndex &parent = QModelIndex());
+ 
+@@ -377,5 +379,79 @@ void tst_QIdentityProxyModel::itemData()
+     QCOMPARE(proxy.itemData(topIndex).value(Qt::DisplayRole).toString(), QStringLiteral("Monday_appended"));
+ }
+ 
+void dump(QAbstractItemModel* model, QString const& indent = " - ", QModelIndex const& parent = {})
+{
+    for (auto row = 0; row < model->rowCount(parent); ++row)
+    {
+        auto idx = model->index(row, 0, parent);
+        qDebug() << (indent + idx.data().toString());
+        dump(model, indent + "- ", idx);
+    }
+}
+
+void tst_QIdentityProxyModel::persistIndexOnLayoutChange()
+{
+    DynamicTreeModel model;
+
+    QList<int> ancestors;
+    for (auto i = 0; i < 3; ++i)
+    {
+        Q_UNUSED(i);
+        ModelInsertCommand insertCommand(&model);
+        insertCommand.setAncestorRowNumbers(ancestors);
+        insertCommand.setStartRow(0);
+        insertCommand.setEndRow(0);
+        insertCommand.doCommand();
+        ancestors.push_back(0);
+    }
+    ModelInsertCommand insertCommand(&model);
+    insertCommand.setAncestorRowNumbers(ancestors);
+    insertCommand.setStartRow(0);
+    insertCommand.setEndRow(1);
+    insertCommand.doCommand();
+
+    // dump(&model);
+    // " - 1"
+    // " - - 2"
+    // " - - - 3"
+    // " - - - - 4"
+    // " - - - - 5"
+
+    QIdentityProxyModel proxy;
+    proxy.setSourceModel(&model);
+
+    QPersistentModelIndex persistentIndex;
+
+    QPersistentModelIndex sourcePersistentIndex = model.match(model.index(0, 0), Qt::DisplayRole, "5", 1, Qt::MatchRecursive).first();
+
+    QCOMPARE(sourcePersistentIndex.data().toString(), QStringLiteral("5"));
+
+    bool gotLayoutAboutToBeChanged = false;
+    bool gotLayoutChanged = false;
+
+    QObject::connect(&proxy, &QAbstractItemModel::layoutAboutToBeChanged, &proxy, [&proxy, &persistentIndex, &gotLayoutAboutToBeChanged]
+    {
+        gotLayoutAboutToBeChanged = true;
+        persistentIndex = proxy.match(proxy.index(0, 0), Qt::DisplayRole, "5", 1, Qt::MatchRecursive).first();
+    });
+
+    QObject::connect(&proxy, &QAbstractItemModel::layoutChanged, &proxy, [&proxy, &persistentIndex, &sourcePersistentIndex, &gotLayoutChanged]
+    {
+        gotLayoutChanged = true;
+        QCOMPARE(QModelIndex(persistentIndex), proxy.mapFromSource(sourcePersistentIndex));
+    });
+
+    ModelChangeChildrenLayoutsCommand layoutChangeCommand(&model, 0);
+
+    layoutChangeCommand.setAncestorRowNumbers(QList<int>{0, 0, 0});
+    layoutChangeCommand.setSecondAncestorRowNumbers(QList<int>{0, 0});
+
+    layoutChangeCommand.doCommand();
+
+    QVERIFY(gotLayoutAboutToBeChanged);
+    QVERIFY(gotLayoutChanged);
+    QVERIFY(persistentIndex.isValid());
+}
+
+ QTEST_MAIN(tst_QIdentityProxyModel)
+ #include "tst_qidentityproxymodel.moc"
+-- 
+2.7.4
+
--- a/dev-qt/qtcore/files/qtcore-5.7.1-qsfpm-1.patch
+++ b/dev-qt/qtcore/files/qtcore-5.7.1-qsfpm-1.patch
@ -0,0 +1,252 @@
+From 3bd0fd8f97e7a33a874929a383a42e6c710bfff3 Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <steveire@gmail.com>
+Date: Sat, 17 Dec 2016 06:20:06 +0000
+Subject: [PATCH] QSFPM: Fix handling of source model layout change
+
+In sourceLayoutAboutToBeChanged the source model update is ignored if
+the affected parents are filtered out anyway.  The same logic is
+attempted in the sourceLayoutChanged slot, but there the early-return
+logic is applied too late - the mapping is cleared before performing the
+early-return.  Because pointers into the mapping are used in the
+internalPointer of QModelIndexes in this class, persistent indexes used
+later will segfault when attempting to dereference it.
+
+Additionally, if a parent becomes invalid as a result of the
+layoutChange, it would be filtered out by the condition in the loop,
+resulting in a different result in the comparison of emptiness of the
+parents container.
+
+Fix that by persisting the parent's container, and performing the test
+for early-return before clearing the mapping.
+
+Task-number: QTBUG-47711
+Task-number: QTBUG-32981
+Change-Id: If45e8a1c97d39454160f52041bc9ae7e337dce97
+Reviewed-by: David Faure <david.faure@kdab.com>
+---
+ src/corelib/itemmodels/qsortfilterproxymodel.cpp   |  31 ++---
+ .../tst_qsortfilterproxymodel.cpp                  | 126 +++++++++++++++++++++
+ 2 files changed, 137 insertions(+), 20 deletions(-)
+
+diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+index b0ddfa8..3331521 100644
+--- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+@@ -171,6 +171,7 @@ public:
+     QRowsRemoval itemsBeingRemoved;
+ 
+     QModelIndexPairList saved_persistent_indexes;
+    QList<QPersistentModelIndex> saved_layoutChange_parents;
+ 
+     QHash<QModelIndex, Mapping *>::const_iterator create_mapping(
+         const QModelIndex &source_parent) const;
+@@ -1331,23 +1332,23 @@ void QSortFilterProxyModelPrivate::_q_sourceLayoutAboutToBeChanged(const QList<Q
+     Q_UNUSED(hint); // We can't forward Hint because we might filter additional rows or columns
+     saved_persistent_indexes.clear();
+ 
+-    QList<QPersistentModelIndex> parents;
+    saved_layoutChange_parents.clear();
+     for (const QPersistentModelIndex &parent : sourceParents) {
+         if (!parent.isValid()) {
+-            parents << QPersistentModelIndex();
+            saved_layoutChange_parents << QPersistentModelIndex();
+             continue;
+         }
+         const QModelIndex mappedParent = q->mapFromSource(parent);
+         // Might be filtered out.
+         if (mappedParent.isValid())
+-            parents << mappedParent;
+            saved_layoutChange_parents << mappedParent;
+     }
+ 
+     // All parents filtered out.
+-    if (!sourceParents.isEmpty() && parents.isEmpty())
+    if (!sourceParents.isEmpty() && saved_layoutChange_parents.isEmpty())
+         return;
+ 
+-    emit q->layoutAboutToBeChanged(parents);
+    emit q->layoutAboutToBeChanged(saved_layoutChange_parents);
+     if (persistent.indexes.isEmpty())
+         return;
+ 
+@@ -1359,6 +1360,9 @@ void QSortFilterProxyModelPrivate::_q_sourceLayoutChanged(const QList<QPersisten
+     Q_Q(QSortFilterProxyModel);
+     Q_UNUSED(hint); // We can't forward Hint because we might filter additional rows or columns
+ 
+    if (!sourceParents.isEmpty() && saved_layoutChange_parents.isEmpty())
+        return;
+
+     // Optimize: We only actually have to clear the mapping related to the contents of
+     // sourceParents, not everything.
+     qDeleteAll(source_index_mapping);
+@@ -1373,21 +1377,8 @@ void QSortFilterProxyModelPrivate::_q_sourceLayoutChanged(const QList<QPersisten
+         source_index_mapping.clear();
+     }
+ 
+-    QList<QPersistentModelIndex> parents;
+-    for (const QPersistentModelIndex &parent : sourceParents) {
+-        if (!parent.isValid()) {
+-            parents << QPersistentModelIndex();
+-            continue;
+-        }
+-        const QModelIndex mappedParent = q->mapFromSource(parent);
+-        if (mappedParent.isValid())
+-            parents << mappedParent;
+-    }
+-
+-    if (!sourceParents.isEmpty() && parents.isEmpty())
+-        return;
+-
+-    emit q->layoutChanged(parents);
+    emit q->layoutChanged(saved_layoutChange_parents);
+    saved_layoutChange_parents.clear();
+ }
+ 
+ void QSortFilterProxyModelPrivate::_q_sourceRowsAboutToBeInserted(
+diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+index 38e3c68..6b98d9f 100644
+--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+@@ -145,6 +145,8 @@ private slots:
+     void canDropMimeData();
+     void filterHint();
+ 
+    void sourceLayoutChangeLeavesValidPersistentIndexes();
+
+ protected:
+     void buildHierarchy(const QStringList &data, QAbstractItemModel *model);
+     void checkHierarchy(const QStringList &data, const QAbstractItemModel *model);
+@@ -4181,5 +4183,129 @@ void tst_QSortFilterProxyModel::filterHint()
+              QAbstractItemModel::NoLayoutChangeHint);
+ }
+ 
+/**
+
+  Creates a model where each item has one child, to a set depth,
+  and the last item has no children.  For a model created with
+  setDepth(4):
+
+    - 1
+    - - 2
+    - - - 3
+    - - - - 4
+*/
+class StepTreeModel : public QAbstractItemModel
+{
+    Q_OBJECT
+public:
+    StepTreeModel(QObject * parent = 0)
+        : QAbstractItemModel(parent), m_depth(0) {}
+
+    int columnCount(const QModelIndex& = QModelIndex()) const override { return 1; }
+
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override
+    {
+        quintptr parentId = (parent.isValid()) ? parent.internalId() : 0;
+        return (parentId < m_depth) ? 1 : 0;
+    }
+
+    QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override
+    {
+        if (role != Qt::DisplayRole)
+            return QVariant();
+
+        return QString::number(index.internalId());
+    }
+
+    QModelIndex index(int, int, const QModelIndex& parent = QModelIndex()) const override
+    {
+        quintptr parentId = (parent.isValid()) ? parent.internalId() : 0;
+        if (parentId >= m_depth)
+            return QModelIndex();
+
+        return createIndex(0, 0, parentId + 1);
+    }
+
+    QModelIndex parent(const QModelIndex& index) const override
+    {
+        if (index.internalId() == 0)
+            return QModelIndex();
+
+        return createIndex(0, 0, index.internalId() - 1);
+    }
+
+    void setDepth(quintptr depth)
+    {
+        int parentIdWithLayoutChange = (m_depth < depth) ? m_depth : depth;
+
+        QList<QPersistentModelIndex> parentsOfLayoutChange;
+        parentsOfLayoutChange.push_back(createIndex(0, 0, parentIdWithLayoutChange));
+
+        layoutAboutToBeChanged(parentsOfLayoutChange);
+
+        auto existing = persistentIndexList();
+
+        QList<QModelIndex> updated;
+
+        for (auto idx : existing) {
+            if (indexDepth(idx) <= depth)
+                updated.push_back(idx);
+            else
+                updated.push_back({});
+        }
+
+        m_depth = depth;
+
+        changePersistentIndexList(existing, updated);
+
+        layoutChanged(parentsOfLayoutChange);
+    }
+
+private:
+    static quintptr indexDepth(QModelIndex const& index)
+    {
+        return (index.isValid()) ? 1 + indexDepth(index.parent()) : 0;
+    }
+
+private:
+    quintptr m_depth;
+};
+
+void tst_QSortFilterProxyModel::sourceLayoutChangeLeavesValidPersistentIndexes()
+{
+    StepTreeModel model;
+    Q_SET_OBJECT_NAME(model);
+    model.setDepth(4);
+
+    QSortFilterProxyModel proxy1;
+    proxy1.setSourceModel(&model);
+    Q_SET_OBJECT_NAME(proxy1);
+
+    proxy1.setFilterRegExp("1|2");
+
+    // The current state of things:
+    //  model         proxy
+    //   - 1           - 1
+    //   - - 2         - - 2
+    //   - - - 3
+    //   - - - - 4
+
+    // The setDepth call below removes '4' with a layoutChanged call.
+    // Because the proxy filters that out anyway, the proxy doesn't need
+    // to emit any signals or update persistent indexes.
+
+    QPersistentModelIndex persistentIndex = proxy1.index(0, 0, proxy1.index(0, 0));
+
+    model.setDepth(3);
+
+    // Calling parent() causes the internalPointer to be used.
+    // Before fixing QTBUG-47711, that could be a dangling pointer.
+    // The use of qDebug here makes sufficient use of the heap to
+    // cause corruption at runtime with normal use on linux (before
+    // the fix). valgrind confirms the fix.
+    qDebug() << persistentIndex.parent();
+    QVERIFY(persistentIndex.parent().isValid());
+}
+
+ QTEST_MAIN(tst_QSortFilterProxyModel)
+ #include "tst_qsortfilterproxymodel.moc"
+-- 
+2.7.4
+
+
--- a/dev-qt/qtcore/files/qtcore-5.7.1-qsfpm-2.patch
+++ b/dev-qt/qtcore/files/qtcore-5.7.1-qsfpm-2.patch
@ -0,0 +1,195 @@
+From 0874861bcc70313c343aba5e5566ed30b69eed1c Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <steveire@gmail.com>
+Date: Mon, 19 Dec 2016 21:13:57 +0000
+Subject: [PATCH] QSFPM: Remove data manipulation from move handlers
+
+Similar to the fix in the parent commit, incorrect updating of the
+internal data structures during layout changes can lead to dangling
+pointers being dereferenced later.  Moves are treated as layoutChanges
+by this proxy by forwarding to the appropriate method.  However, data is
+incorrectly cleared prior to that forwarding.  Remove that, and let the
+layoutChange handling take appropriate action.
+
+Change-Id: Iee951e37152328a4e6a5fb8e5385c32a2fe4c0bd
+Reviewed-by: David Faure <david.faure@kdab.com>
+---
+ src/corelib/itemmodels/qsortfilterproxymodel.cpp   | 67 ++++------------------
+ .../tst_qsortfilterproxymodel.cpp                  | 46 +++++++++++++++
+ 2 files changed, 58 insertions(+), 55 deletions(-)
+
+diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+index 3331521..226a240 100644
+--- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+@@ -1418,49 +1418,27 @@ void QSortFilterProxyModelPrivate::_q_sourceRowsRemoved(
+ void QSortFilterProxyModelPrivate::_q_sourceRowsAboutToBeMoved(
+     const QModelIndex &sourceParent, int /* sourceStart */, int /* sourceEnd */, const QModelIndex &destParent, int /* dest */)
+ {
+-    Q_Q(QSortFilterProxyModel);
+     // Because rows which are contiguous in the source model might not be contiguous
+     // in the proxy due to sorting, the best thing we can do here is be specific about what
+     // parents are having their children changed.
+     // Optimize: Emit move signals if the proxy is not sorted. Will need to account for rows
+     // being filtered out though.
+ 
+-    saved_persistent_indexes.clear();
+-
+     QList<QPersistentModelIndex> parents;
+-    parents << q->mapFromSource(sourceParent);
+    parents << sourceParent;
+     if (sourceParent != destParent)
+-      parents << q->mapFromSource(destParent);
+-    emit q->layoutAboutToBeChanged(parents);
+-    if (persistent.indexes.isEmpty())
+-        return;
+-    saved_persistent_indexes = store_persistent_indexes();
+        parents << destParent;
+    _q_sourceLayoutAboutToBeChanged(parents, QAbstractItemModel::NoLayoutChangeHint);
+ }
+ 
+ void QSortFilterProxyModelPrivate::_q_sourceRowsMoved(
+     const QModelIndex &sourceParent, int /* sourceStart */, int /* sourceEnd */, const QModelIndex &destParent, int /* dest */)
+ {
+-    Q_Q(QSortFilterProxyModel);
+-
+-    // Optimize: We only need to clear and update the persistent indexes which are children of
+-    // sourceParent or destParent
+-    qDeleteAll(source_index_mapping);
+-    source_index_mapping.clear();
+-
+-    update_persistent_indexes(saved_persistent_indexes);
+-    saved_persistent_indexes.clear();
+-
+-    if (dynamic_sortfilter && update_source_sort_column()) {
+-        //update_source_sort_column might have created wrong mapping so we have to clear it again
+-        qDeleteAll(source_index_mapping);
+-        source_index_mapping.clear();
+-    }
+-
+     QList<QPersistentModelIndex> parents;
+-    parents << q->mapFromSource(sourceParent);
+    parents << sourceParent;
+     if (sourceParent != destParent)
+-      parents << q->mapFromSource(destParent);
+-    emit q->layoutChanged(parents);
+        parents << destParent;
+    _q_sourceLayoutChanged(parents, QAbstractItemModel::NoLayoutChangeHint);
+ }
+ 
+ void QSortFilterProxyModelPrivate::_q_sourceColumnsAboutToBeInserted(
+@@ -1522,42 +1500,21 @@ void QSortFilterProxyModelPrivate::_q_sourceColumnsRemoved(
+ void QSortFilterProxyModelPrivate::_q_sourceColumnsAboutToBeMoved(
+     const QModelIndex &sourceParent, int /* sourceStart */, int /* sourceEnd */, const QModelIndex &destParent, int /* dest */)
+ {
+-    Q_Q(QSortFilterProxyModel);
+-
+-    saved_persistent_indexes.clear();
+-
+     QList<QPersistentModelIndex> parents;
+-    parents << q->mapFromSource(sourceParent);
+    parents << sourceParent;
+     if (sourceParent != destParent)
+-      parents << q->mapFromSource(destParent);
+-    emit q->layoutAboutToBeChanged(parents);
+-
+-    if (persistent.indexes.isEmpty())
+-        return;
+-    saved_persistent_indexes = store_persistent_indexes();
+        parents << destParent;
+    _q_sourceLayoutAboutToBeChanged(parents, QAbstractItemModel::NoLayoutChangeHint);
+ }
+ 
+ void QSortFilterProxyModelPrivate::_q_sourceColumnsMoved(
+     const QModelIndex &sourceParent, int /* sourceStart */, int /* sourceEnd */, const QModelIndex &destParent, int /* dest */)
+ {
+-    Q_Q(QSortFilterProxyModel);
+-
+-    qDeleteAll(source_index_mapping);
+-    source_index_mapping.clear();
+-
+-    update_persistent_indexes(saved_persistent_indexes);
+-    saved_persistent_indexes.clear();
+-
+-    if (dynamic_sortfilter && update_source_sort_column()) {
+-        qDeleteAll(source_index_mapping);
+-        source_index_mapping.clear();
+-    }
+-
+     QList<QPersistentModelIndex> parents;
+-    parents << q->mapFromSource(sourceParent);
+    parents << sourceParent;
+     if (sourceParent != destParent)
+-      parents << q->mapFromSource(destParent);
+-    emit q->layoutChanged(parents);
+        parents << destParent;
+    _q_sourceLayoutChanged(parents, QAbstractItemModel::NoLayoutChangeHint);
+ }
+ 
+ /*!
+diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+index 6b98d9f..7b6c470 100644
+--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+@@ -146,6 +146,7 @@ private slots:
+     void filterHint();
+ 
+     void sourceLayoutChangeLeavesValidPersistentIndexes();
+    void rowMoveLeavesValidPersistentIndexes();
+ 
+ protected:
+     void buildHierarchy(const QStringList &data, QAbstractItemModel *model);
+@@ -4307,5 +4308,50 @@ void tst_QSortFilterProxyModel::sourceLayoutChangeLeavesValidPersistentIndexes()
+     QVERIFY(persistentIndex.parent().isValid());
+ }
+ 
+void tst_QSortFilterProxyModel::rowMoveLeavesValidPersistentIndexes()
+{
+    DynamicTreeModel model;
+    Q_SET_OBJECT_NAME(model);
+
+    QList<int> ancestors;
+    for (auto i = 0; i < 5; ++i)
+    {
+        Q_UNUSED(i);
+        ModelInsertCommand insertCommand(&model);
+        insertCommand.setAncestorRowNumbers(ancestors);
+        insertCommand.setStartRow(0);
+        insertCommand.setEndRow(0);
+        insertCommand.doCommand();
+        ancestors.push_back(0);
+    }
+
+    QSortFilterProxyModel proxy1;
+    proxy1.setSourceModel(&model);
+    Q_SET_OBJECT_NAME(proxy1);
+
+    proxy1.setFilterRegExp("1|2");
+
+    auto item5 = model.match(model.index(0, 0), Qt::DisplayRole, "5", 1, Qt::MatchRecursive).first();
+    auto item3 = model.match(model.index(0, 0), Qt::DisplayRole, "3", 1, Qt::MatchRecursive).first();
+
+    Q_ASSERT(item5.isValid());
+    Q_ASSERT(item3.isValid());
+
+    QPersistentModelIndex persistentIndex = proxy1.match(proxy1.index(0, 0), Qt::DisplayRole, "2", 1, Qt::MatchRecursive).first();
+
+    ModelMoveCommand moveCommand(&model, 0);
+    moveCommand.setAncestorRowNumbers(QList<int>{0, 0, 0, 0});
+    moveCommand.setStartRow(0);
+    moveCommand.setEndRow(0);
+    moveCommand.setDestRow(0);
+    moveCommand.setDestAncestors(QList<int>{0, 0, 0});
+    moveCommand.doCommand();
+
+    // Calling parent() causes the internalPointer to be used.
+    // Before fixing QTBUG-47711 (moveRows case), that could be
+    // a dangling pointer.
+    QVERIFY(persistentIndex.parent().isValid());
+}
+
+ QTEST_MAIN(tst_QSortFilterProxyModel)
+ #include "tst_qsortfilterproxymodel.moc"
+-- 
+2.7.4
+
+
--- a/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="icu systemd"
+
+DEPEND="
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	>=dev-libs/libpcre-8.38[pcre16,unicode]
+	>=sys-libs/zlib-1.2.5
+	virtual/libiconv
+	icu? ( dev-libs/icu:= )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.6.2-plugins.patch
+	"${FILESDIR}"/${P}-qipm.patch
+	"${FILESDIR}"/${P}-qsfpm-{1,2}.patch
+)
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/corelib
+	src/tools/qlalr
+	doc
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use icu)
+		$(qt_use systemd journald)
+	)
+	qt5-build_src_configure
+}
--- a/dev-ros/rospack/files/multipy.patch
+++ b/dev-ros/rospack/files/multipy.patch
@ -0,0 +1,40 @@
+Install separate libraries linking to different python implementations.
+
+Index: rospack-2.4.1/CMakeLists.txt
+===================================================================
+--- rospack-2.4.1.orig/CMakeLists.txt
+++ rospack-2.4.1/CMakeLists.txt
+@@ -23,28 +23,28 @@ endif()
+ 
+ include_directories(include ${TinyXML2_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
+ 
+-add_library(rospack
+add_library(rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
+   src/rospack.cpp
+   ${backcompat_source}
+   src/rospack_cmdline.cpp
+   src/utils.cpp
+ )
+-target_link_libraries(rospack ${TinyXML2_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
+target_link_libraries(rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} ${TinyXML2_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
+ 
+ add_executable(rospackexe src/rospack_main.cpp)
+ # Set the name, and make it a "global" executable
+ set_target_properties(rospackexe PROPERTIES
+   OUTPUT_NAME rospack
+   RUNTIME_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/bin)
+-target_link_libraries(rospackexe rospack ${Boost_LIBRARIES})
+target_link_libraries(rospackexe rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} ${Boost_LIBRARIES})
+ add_executable(rosstackexe src/rosstack_main.cpp)
+-target_link_libraries(rosstackexe rospack ${Boost_LIBRARIES})
+target_link_libraries(rosstackexe rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} ${Boost_LIBRARIES})
+ # Set the name, and make it a "global" executable
+ set_target_properties(rosstackexe PROPERTIES
+   OUTPUT_NAME rosstack
+   RUNTIME_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/bin)
+ 
+-install(TARGETS rospack rospackexe rosstackexe
+install(TARGETS rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} rospackexe rosstackexe
+   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+   RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION})
--- a/dev-ros/rospack/rospack-2.4.1.ebuild
+++ b/dev-ros/rospack/rospack-2.4.1.ebuild
@ -5,13 +5,10 @@ EAPI=5

 ROS_REPO_URI="https://github.com/ros/rospack"
 KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )

 inherit ros-catkin

-# Do it that way to avoid ros-catkin pulling in python-r1
-PYTHON_COMPAT=( python{2_7,3_4} )
-inherit python-single-r1
-
 DESCRIPTION="Retrieves information about ROS packages available on the filesystem"

 LICENSE="BSD"
@ -30,4 +27,15 @@ DEPEND="${RDEPEND}
 		dev-python/nose
 	)"

-PATCHES=( "${FILESDIR}/gentoo.patch" )
+PATCHES=(
+	"${FILESDIR}/gentoo.patch"
+	"${FILESDIR}/multipy.patch"
+)
+
+src_install() {
+	ros-catkin_src_install
+	# Assume greatest alphabetically is what we want as default implementation
+	for i in "${ED}"/usr/$(get_libdir)/librospack*.so ; do
+		dosym $(basename "${i}") /usr/$(get_libdir)/librospack.so
+	done
+}
--- a/dev-ros/rospack/rospack-9999.ebuild
+++ b/dev-ros/rospack/rospack-9999.ebuild
@ -5,13 +5,10 @@ EAPI=5

 ROS_REPO_URI="https://github.com/ros/rospack"
 KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )

 inherit ros-catkin

-# Do it that way to avoid ros-catkin pulling in python-r1
-PYTHON_COMPAT=( python{2_7,3_4} )
-inherit python-single-r1
-
 DESCRIPTION="Retrieves information about ROS packages available on the filesystem"

 LICENSE="BSD"
@ -30,4 +27,15 @@ DEPEND="${RDEPEND}
 		dev-python/nose
 	)"

-PATCHES=( "${FILESDIR}/gentoo.patch" )
+PATCHES=(
+	"${FILESDIR}/gentoo.patch"
+	"${FILESDIR}/multipy.patch"
+)
+
+src_install() {
+	ros-catkin_src_install
+	# Assume greatest alphabetically is what we want as default implementation
+	for i in "${ED}"/usr/$(get_libdir)/librospack*.so ; do
+		dosym $(basename "${i}") /usr/$(get_libdir)/librospack.so
+	done
+}
--- a/dev-tex/latex2rtf/Manifest
+++ b/dev-tex/latex2rtf/Manifest
@ -1 +1,2 @@
 DIST latex2rtf-2.3.11a.tar.gz 1582004 SHA256 d4e5d84e8cbf7de13f7cce5572bfeb97b5c18e338513b7398e23c744acc147c2 SHA512 b6e6000b4f919ecfb5174f32887cb4e1b765530547b3b50103e778d0244f0ce37d0ec14bbd1fa6b2ef2569f0c437b34b29586c4bdb2e3caf50584847819f54c0 WHIRLPOOL daa9d989816229549af9f3d35ce4d8a3a8049e2844d3d32910b75838d2eb25f77c64fb46fa5ea647449b50d212102731bcad7adfc035c9a20f35e9f30ceea179
+DIST latex2rtf-2.3.15.tar.gz 1648297 SHA256 92cc98b765190d028a843ed497a67c69b9007346e33ee55138d592994c87c58b SHA512 ef4603bd4d484eadd2accc16b1e20165450cf2ee56b29f950549028954f00ab6e99ec695959b8971d112617f641f8cca193e990a17053ee5cbe0c1bfc8b8630c WHIRLPOOL a8b890e98f2a7f7c36a4dfdaa4810aa2bb7e44a230e7ea4605445fd7fb2150ede818d9225942bbf82ee1e6d2bf33a7f84bd12d2b94ea56958825f82db62c152f
--- a/dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild
+++ b/dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="LaTeX to RTF converter"
+HOMEPAGE="http://latex2rtf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/latex2rtf/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="test"
+S="${WORKDIR}/${P%b}"
+
+RDEPEND="
+	virtual/latex-base
+	media-gfx/imagemagick
+"
+DEPEND="${RDEPEND}
+	virtual/texi2dvi
+	test? (
+		dev-texlive/texlive-langgerman
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-tex/latex2html
+	)
+"
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	tc-export CC
+	# Set DESTDIR here too so that compiled-in paths are correct.
+	emake DESTDIR="${EPREFIX}/usr" || die "emake failed"
+
+	# Needed for tests
+	chmod +x test/bracecheck || die
+
+	cd "${S}/doc"
+	emake realclean
+	emake -j1
+}
+
+src_install() {
+	dodoc README* HACKING ToDo ChangeLog doc/credits
+	emake DESTDIR="${ED}/usr" -j1 install install-info
+}
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@ -1,2 +1 @@
-DIST akonadi-calendar-16.12.3.tar.xz 115216 SHA256 0f147a81bd40b3e8b847863b2848b516efdf2dcf5642c49f62ae9c8e9419664f SHA512 dfc10af89a7d3895fc7155e2acc45404826e37416baf113d43631251f285b41b0622daae99731402e0f03023aa1be6299348a7bca715f2d8d374bf070d65351c WHIRLPOOL 5ccc017dad8390016c15cf0e5d43cb3c6fbbf40202aef56144591abb80de0f820403baeac9d68756421cb0b4999d55144ebd55b89d770467230efae93e50c91f
 DIST akonadi-calendar-17.04.0.tar.xz 279260 SHA256 09eec82f4bab3ebabc37ba54682fc1734b887dff8cf5fe9262c1278263ea5221 SHA512 26f18ea069a99a20c86aeacd7a58adb72afb7989ef95f736b5f4f78f1fa5bbaed197af5c642dfd880e1fcf1864fe50df573178cd8981f574c8e844b914dc1436 WHIRLPOOL 9bc303ef77ffde06d6e81056a5e213366df49a2c6b2695b91dc0e9a8d63f353c10442e335be5352156050bf224f9b8ed410eccada6f6599ef71eb37f4f79e0d9
--- a/kde-apps/akonadi-calendar/akonadi-calendar-16.12.3.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-16.12.3.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi calendar integration"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~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 kdelibs4support)
-	$(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)
-	$(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}"
-
-RESTRICT+=" test"
--- a/kde-apps/akonadi-calendar/akonadi-calendar-17.04.0.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-17.04.0.ebuild
@ -39,6 +39,8 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"

 RESTRICT+=" test"
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@ -1,2 +1 @@
-DIST akonadi-contacts-16.12.3.tar.xz 149268 SHA256 54345dc2dfbafce76533a2b461fe11a7a266406516d6cc359202fc5c3e790588 SHA512 752674655df328a2e083fc475655e38e9a4fee7a0a78c44c08d62628a39a831c5be3cd3c63971959dc3000947bd4eafc0fd73a497682b3544c611a2c2f56948f WHIRLPOOL 70a9aac22d911192270d5582eb2265b8c04ee9a6c308859efe6c3ce3e6827d58508fa75fe8ed96a718010ed9ca4981cfe64252985120a59685e20c119218cc5b
 DIST akonadi-contacts-17.04.0.tar.xz 348192 SHA256 67fc0795c10f43c2c6a27ad5619ab044f3c527789a84ce8fbf6ce9652b06dc05 SHA512 8eed24cba8b85a9a05738a5fe5820d7fb4b785fbf12d58fb6830ba272a2b84908f7f65c48888d881f9080a5a502ece90ff21fdf27df8596967153b823025d206 WHIRLPOOL e8b3abeb17598cc4f1ac7361f3322df854cd3662cb91a757bacdc60792b02067d8e4c79b96121432c4fa414e3136afdd9cd6d516bbcd659ff79abf2b928288a4
--- a/kde-apps/akonadi-contacts/akonadi-contacts-16.12.3.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-16.12.3.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Library for akonadi contact integration"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
-IUSE="prison"
-
-# 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 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)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/grantlee-5.1.0:5
-	prison? ( $(add_frameworks_dep prison) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package prison KF5Prison)
-	)
-
-	kde5_src_configure
-}
--- a/kde-apps/akonadi-contacts/akonadi-contacts-17.04.0.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-17.04.0.ebuild
@ -40,7 +40,9 @@ DEPEND="
 	>=dev-libs/grantlee-5.1.0:5
 	prison? ( $(add_frameworks_dep prison) )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"

 src_configure() {
 	local mycmakeargs=(
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@ -1,2 +1 @@
-DIST akonadi-import-wizard-16.12.3.tar.xz 240384 SHA256 d8e518ae7876d46b5af0ad430b018c05aaf320cf4c05e1cce9a2c25b198ed736 SHA512 84c73164af8a58dda2792e15493d58b4de81c2851142f6dda4bd254d6c0e7f9b1c7029525bf1267486959abaabb555d891b2b46a4afad1d9b8bc8f97cbe9bf42 WHIRLPOOL 7c592f513e7c3280b9add21cee8b304b2e5b7f139a563fd70f6e9397ba7777625bdebc596f44ca103512e588abe4da1fd89a11beb11025e1b8d3276c8bd2a764
 DIST akonadi-import-wizard-17.04.0.tar.xz 433864 SHA256 bb29c6970d76831758d84e84397ef832fa4fcfbf8be3d385b8e9f152383a3329 SHA512 559afef7b58dafbc2f556d8c182d8e269f0a2508f3c1050eb53dfda0aca071a62b3159953d661710340549b60c2ea3e3aea2fb821149fa5b9acf72ebb4861c7f WHIRLPOOL 69f8b228e673f0cf9fd524094198e40301e22e957f8dfb6efe02882efbe4e94837df77d126aa84de88f9860d6e14c804f754747c55294a44f47337c469f98d3a
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-16.12.3.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-16.12.3.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(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)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim:5
-	!kde-apps/kmail:4
-"
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.04.0.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.04.0.ebuild
@ -36,5 +36,6 @@ DEPEND="
 	$(add_qt_dep qtxml)
 "
 RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
 	!kde-apps/kmail:4
 "
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@ -1,2 +1 @@
-DIST akonadi-mime-16.12.3.tar.xz 55584 SHA256 073cd60dc5e535d69dedf98efababaad57cb455a929b322e4d0eb6e7691e5ef5 SHA512 17e86f5854fd8355a8bb7698532aaba8a67a7b67e4cc33b8dc5d707930ef2ae286318b2e8b1545db129972947e7d5165c421b9b1247bd52353680e4ee5d582a7 WHIRLPOOL 3a5f111bf80e8059fb7141b982e5fc7000484a12dd2e998d588f40d21c3b0efc9d4a29a81751ac6d4442929a221bacab3bac8465b2af5ecbef6620a0bfff9bd1
 DIST akonadi-mime-17.04.0.tar.xz 131056 SHA256 db86817e10a06d3c253c02892d07dbcc4519d07b42ffebefddbd74bdc2aa2daa SHA512 6c5c53719462151c836c0173ec2201364a63fa2f2b6603c414b21827fd3847b8550c83c04bbfdc3368adf87666f837e85e28c6644523e32ec607987aa0dcaf78 WHIRLPOOL d1115f44c54c056d7fb3891d941a776d3056acc79f9b3d957266f885d9951990bd76bb08a1c59556c7b901d193929af68fff93d759194a5cc635acf0c02453a8
--- a/kde-apps/akonadi-mime/akonadi-mime-16.12.3.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-16.12.3.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi mime types"
-KEYWORDS="~amd64 ~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)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libxslt
-	x11-misc/shared-mime-info
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepimlibs:4
-"
--- a/kde-apps/akonadi-mime/akonadi-mime-17.04.0.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-17.04.0.ebuild
@ -32,5 +32,6 @@ DEPEND="
 	x11-misc/shared-mime-info
 "
 RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
 	!kde-apps/kdepimlibs:4
 "
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@ -1,2 +1 @@
-DIST akonadi-notes-16.12.3.tar.xz 19328 SHA256 278f9517d2640b99fd86dd5817ea15baea177adbccf3fd28a338c59cfeb40510 SHA512 0ff10a467586e65ae809451fe40b4dfabcc429ef80247c4e9d1b00ff7c72f17fd2ae64ef545aeeba641f788041256a4758955da35456e0fef7e0bc3e2b4f0169 WHIRLPOOL 95c928ce6e7c47d1cb82adaf0c299a99c84fd4556acbdc09abd09cc5e12176fb3cf016b9efafe62356d95662c629c53f596e1a1a7e402bd3411c3d393faa14ab
 DIST akonadi-notes-17.04.0.tar.xz 24636 SHA256 597ef6594abeaa5a5da5da983870a03dc1b16931e093c0026f1ee60069e2cc49 SHA512 f3ed6ad91e7c423427c80e2075d385766fa3303490ca1edf02e4c820ee8f0f0bc065511d207a95b3e8341187512bf613e340c5f209a07273f1d20dfb2c9a9b17 WHIRLPOOL 03293c7e6bf516fe1a6f8c1749b244b23082af078e825cdbcc2353749aef9e977bd9751b0eeb97cd320b274a54754b216c0692f9b547194e8594848628070537
--- a/kde-apps/akonadi-notes/akonadi-notes-16.12.3.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-16.12.3.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi notes integration"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-RDEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	$(add_kdeapps_dep akonadi)
-"
--- a/kde-apps/akonadi-notes/akonadi-notes-17.04.0.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-17.04.0.ebuild
@ -14,12 +14,15 @@ IUSE=""
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
 RESTRICT+=" test"

-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep ki18n)
 	$(add_kdeapps_dep kmime)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtxml)
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep akonadi)
 "
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@ -1,2 +1 @@
-DIST akonadi-search-16.12.3.tar.xz 72300 SHA256 f71f2c781f7916148a5e843b59e4157a4e978ef8fed0fe0d8fe190ef6a16c271 SHA512 17152163ae538b85bda9f59fae1e3a04849a345ce01c95bc5f18bc0bbd21e27ec81380c93569d72542171a4f2cab38d540c3e00ff58a8166891e87b5ac637862 WHIRLPOOL b3c0fbd32d8899bf125ad989995a69d0f526f6ef610e66f168ac1ece8a4757cc56d6faaeb78c025402d1903f3c01f4e746d342cf01a4b09edfabee0bb9400388
 DIST akonadi-search-17.04.0.tar.xz 78824 SHA256 e3864fb676f90a9cdfd1ec8267f69c39671a950b3a67cda5fa212bf48b05f8d5 SHA512 6ddb8222d0a09720703799848fb4630587b2cfd839297fff59df2ace5908ff7ac9d12ce41be734eb1055209b19221283a49375367976c79f4de6f339111e8e8f WHIRLPOOL af62acbfe88246e0f06d21017703415e4ab8b0f0adf301e9a5b9b88056812ea48b1a6fc3e8757946acde09969e2525a0be6b1d28777f5c4c0f46b00e18dae343
--- a/kde-apps/akonadi-search/akonadi-search-16.12.3.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-16.12.3.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
-HOMEPAGE="https://projects.kde.org/projects/playground/pim/akonadi-search"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep krunner)
-	$(add_kdeapps_dep akonadi)
-	$(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="${RDEPEND}
-	dev-libs/boost
-"
--- a/kde-apps/akonadi-search/akonadi-search-17.04.0.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-17.04.0.ebuild
@ -11,7 +11,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
@ -30,6 +30,9 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	>=dev-libs/xapian-1.3:=[chert]
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
 "
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@ -1,3 +1,2 @@
 DIST akonadi-1.13.1_pre20160203.tar.gz 384556 SHA256 4243b32e529be6aadc38dc4463cb6e7cede9442c05cfc04ba679dde28f37aa96 SHA512 0ef8213f504ad1e500a2c1ce19a7575cd1fd8b7ffc7e5fb0bd2437639d8c458c47bbfea7734fcd3e200136a661331dde32af0b064f0b25d324138ce6e35d15f3 WHIRLPOOL 69eff1889a19f8d5714d7e71a106871172cd25c651ea30046ab81270cf7e46c7a1983cf20fd8d5fd8ad243d70e881be705d57b0b93b54248d086e7b253a4873a
-DIST akonadi-16.12.3.tar.xz 1037568 SHA256 fc48a200c27331d5a9ac6bfb8d7d61f3c4240f133bb23c996c78493f24644b03 SHA512 b1e02f80d11aa6f6d116bfbd963dee952ad03acbdf451b3cd0f8ca4d0037cea9afcd3723b7743bf5beeeb8d0db865094c0178be82e1a74deddaa45834f57c77f WHIRLPOOL b14b453ebfee66d4bb3ab6806406765c74e6f0edd5b4d40346c038d29330afa2efbcb8794564c9a0bce0e693ec04ab540580467411ae869b3c30263d6ed69f7e
 DIST akonadi-17.04.0.tar.xz 1301104 SHA256 962f7694ff67e32b965a07da282d2af7a0777353b11f537c147c8777b03901d4 SHA512 64050b53515ef1fc6321bbe08e30dacbf4ebd945da2510605ad2a2f0f6baa207cfef0f5a1e29c7fa71458ece941593525425d6a1de244ee38cabff817d4da8e0 WHIRLPOOL 340d295553cdc62bd202a927b63a14b39d438ef7e537935b4bcabfd765bd5d9549d233617bffd2c27c71a7b509c822cf61f4e07f3a512196009f173d66677d13
--- a/kde-apps/akonadi/akonadi-16.12.3.ebuild
+++ b/kde-apps/akonadi/akonadi-16.12.3.ebuild
@ -1,125 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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://pim.kde.org/akonadi"
-KEYWORDS="~amd64 ~arm ~x86"
-LICENSE="LGPL-2.1+"
-IUSE="+mysql postgres sqlite tools xml"
-
-REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.7.0
-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 '' '' '5=')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'mysql?,postgres?')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	x11-misc/shared-mime-info
-	sqlite? ( dev-db/sqlite:3 )
-	xml? ( dev-libs/libxml2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	dev-libs/libxslt
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${COMMON_DEPEND}
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	!kde-apps/kdepimlibs
-"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-16.12.0-mysql56-crash.patch"
-	"${FILESDIR}/${PN}-16.12.1-revert-abs-path.patch"
-	"${FILESDIR}/${PN}-16.12.1-rename-header.patch"
-	"${FILESDIR}/${PN}-16.12.3-akonadixml.patch"
-)
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, SQLite PostgreSQL
-	# reverse driver check to keep the order
-	if use postgres; then
-		DRIVER="QPSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use sqlite; then
-		DRIVER="QSQLITE3"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use mysql; then
-		DRIVER="QMYSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	# Notify about MySQL is recommend by upstream
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn
-		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
-		ewarn "user configuration. This is the backend recommended by KDE upstream."
-		ewarn "In particular, kde-apps/kmail-4.10 does not work properly with the sqlite"
-		ewarn "backend anymore."
-		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
-		ewarn "Available drivers are:${AVAILABLE}"
-		ewarn
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-		-DBUILD_TOOLS=$(usex tools)
-		$(cmake-utils_use_find_package xml LibXml2)
-		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-	)
-
-	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() {
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are: ${AVAILABLE}"
-}
--- a/kde-apps/akonadi/akonadi-17.04.0.ebuild
+++ b/kde-apps/akonadi/akonadi-17.04.0.ebuild
@ -49,9 +49,10 @@ DEPEND="${COMMON_DEPEND}
 	test? ( sys-apps/dbus )
 "
 RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepimlibs
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql )
-	!kde-apps/kdepimlibs
 "

 # some akonadi tests time out, that probably needs more work as it's ~700 tests
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@ -1,3 +1,2 @@
-DIST akonadiconsole-16.12.3.tar.xz 177312 SHA256 63339a45b85c6f7fd87f8a67da16bd9e070a562fe4a962cc6bbe78108cadaaa4 SHA512 e4cbadafd67744aefe40a7bed359390a285bbbed9cf3569114acf74c12d6b0337517fe7f01497ea878dd84c35e55e40f17b644825edc2196d5ced065d3cde8f1 WHIRLPOOL 7da1480ea8e865a35d048902b982f0a54baadb2f378343aafe9941bcec32a1d6ef125913a10edc9a960d216a3d8259a63918e9078f0c82c0c061a192e54bcb77
 DIST akonadiconsole-17.04.0.tar.xz 185444 SHA256 6dccfa21b11149f9786a30800aec191c24c1c0a846e92b4474fe8bf4c3fe4d05 SHA512 e59181f4e2b4f431c8ceba2ad4683815ffd067e6afec06a09ec2404ade719552d36dd11d3dbe78b004f88cd5da5f6895986b41083aaad0da91dca328a70a98fd WHIRLPOOL d67cd0e95488aac19698928aa8abf5c1811c6ebd139c31aafcf8017fb02c7769bf44369da81e82234f36541d7f5c23c705fa39c6ed4c2784a9ea18e0c138419a
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
--- a/kde-apps/akonadiconsole/akonadiconsole-16.12.3.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-16.12.3.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~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 kdelibs4support)
-	$(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)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep messagelib)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@ -1,4 +1,3 @@
-DIST akregator-16.12.3.tar.xz 885632 SHA256 488474dea3edce1c83e70e3440666d009c40390e7ee7edf893991b05cb78d2ec SHA512 bbe65e28abbeadc353b8b3db2aa4aa28925d1da12129396fff62b7d866f26bae386a282aed598db1f17e76f8abb86748ffc2c7a62929074218e745f46520a604 WHIRLPOOL baaf6be56284697fbf80e2a2798fc09f03b024b5e016b3f9d7e0d4400870cf679d7cd668cbd0de9c9638f7cc6092bb03d63c02beff3f5716cf991a2200fa26bb
 DIST akregator-17.04.0.tar.xz 2254720 SHA256 a5c6389d7a6f83a81b3cb062653c667272df596215650c6fbd817a3a42f7fbb6 SHA512 6544fe124a6e82e6af06e66a8997f3cee3ae10fc993c9cad0a007b2c342d626a866794f4b060d0f019a5fbc345903c50a35ba9069b5de08cdd233ba46b4356b6 WHIRLPOOL 402e852db5cd2209782cee11625ec7d538ec6b63550144cbee3b33e091067e84da9dcb9db360d1871a308baeec8889051f15856db7a7ed9cd10d3862dbc687ca
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
--- a/kde-apps/akregator/akregator-16.12.3.ebuild
+++ b/kde-apps/akregator/akregator-16.12.3.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="News feed aggregator"
-HOMEPAGE="https://www.kde.org/applications/internet/akregator"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-# drop qtwebengine subslot operator when QT_MINIMAL >= 5.8.0
-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 kdelibs4support)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(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_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_kdeapps_dep syndication)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwebengine '' '' '5=')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	dev-libs/libxslt
-"
-RDEPEND="${DEPEND}"
--- a/kde-apps/akregator/akregator-17.04.0.ebuild
+++ b/kde-apps/akregator/akregator-17.04.0.ebuild
@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""

 # drop qtwebengine subslot operator when QT_MINIMAL >= 5.8.0
-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
@ -48,6 +48,9 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	dev-libs/grantlee:5
 "
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
--- a/kde-apps/analitza/analitza-17.04.0.ebuild
+++ b/kde-apps/analitza/analitza-17.04.0.ebuild
@ -9,7 +9,7 @@ inherit kde5

 DESCRIPTION="KDE library for mathematical features"
 KEYWORDS="~amd64 ~x86"
-IUSE="eigen opengl"
+IUSE="eigen"

 DEPEND="
 	$(add_qt_dep qtdeclarative)
--- a/kde-apps/blogilo/Manifest
+++ b/kde-apps/blogilo/Manifest
@ -1,4 +1,3 @@
-DIST blogilo-16.12.3.tar.xz 331264 SHA256 0e84a82b6e56dbd5733d9f60392dac35e7f3f85270deb3845c689d8eaa28d493 SHA512 14a46a98bb53a5133924751ea2e59ba43e3c7096adccbad72605916d731c22b38700f71cd1ce1eb5d04e8f72b3a60effdee19a88bf9fee2f33ddeaacd82b2df9 WHIRLPOOL 1236986115220ed0560530753052a4c1f286c81d26c858858dd3c4fd160e3416877279e606309f8feb2de4b3312690d909f1ef0439632d8d79cca49a8ca04feb
 DIST blogilo-17.04.0.tar.xz 804220 SHA256 ab3951df4a110ef6d8ffcaf2f5c99da0df45239e983a9fdcdaabe8e864d83b6d SHA512 9f576294e62f04a2eeaa1652917d92faeaf54dc0d474032277e7aa3619f3f9b8418bda6b44c620e4cdb38cba6dacf31c1e5e11ddc55c5159ef1288cb9f03348e WHIRLPOOL 8568079bc31642aa6dcfff1180524d3f31a361fb857b26616850873665ae5541da93b008d3470ee51f2baabbdc2d932cccfcda237f0795c19bf240dfe676589a
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
--- a/kde-apps/blogilo/blogilo-16.12.3.ebuild
+++ b/kde-apps/blogilo/blogilo-16.12.3.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Application to create, edit and update blog content"
-HOMEPAGE="https://www.kde.org/applications/internet/blogilo"
-LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="google"
-
-DEPEND="
-	$(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 kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep kblog)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	google? ( $(add_kdeapps_dep libkgapi '' 5.3.1) )
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-apps-libs-16.04.50
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package google KF5GAPI)
-	)
-
-	kde5_src_configure
-}
--- a/kde-apps/blogilo/blogilo-17.04.0.ebuild
+++ b/kde-apps/blogilo/blogilo-17.04.0.ebuild
@ -40,6 +40,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-apps-libs-16.04.50
+	!kde-apps/kdepim-l10n
 "

 src_configure() {
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@ -1,3 +1,2 @@
-DIST akonadi-calendar-tools-16.12.3.tar.xz 61980 SHA256 87f47068abcd78dad54903c9c29399ef965bcce03d64beb41743de7328abf394 SHA512 2bce7a50a1ca13641752a191d43379444115c874d6ab852b83eaa5ea0e5ee7c357640755685f7175f98a5dcdb1bc04c08e3e224970c70f3dd324458920ea6d63 WHIRLPOOL 5693b938e8e13f60c06010ee920167a616105648ece8e63041aba24d08cf2a577bb1937fed7cb67ee946f46905f75c12c6018eb54667d99cfd84b755f409a095
 DIST akonadi-calendar-tools-17.04.0.tar.xz 221520 SHA256 3578d824b54055f80404fde67e0ede910a7cb6aa22ec215673a178124daa6468 SHA512 27595ad1ed647858c70b9d9b4e3e32e8d5107fb1123d7c50ea49a7601f3db6b2c8d1d3b32c8818d756dec841a7650d5706d7aca29a4081f46f54b16aa96f3290 WHIRLPOOL 673a8099f7c6560a67c25cae31776a5c802cd35f9fdaac93c449fc00f3af36db0498bb713cfee9234f694db4fc69a1a711e12f8c48b89583bec3d367e1252e30
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
--- a/kde-apps/calendarjanitor/calendarjanitor-16.12.3.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-16.12.3.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~x86"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim:5
-"
-
-src_prepare() {
-	cmake_comment_add_subdirectory doc konsolekalendar
-	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
-	kde5_src_prepare
-}
--- a/kde-apps/calendarjanitor/calendarjanitor-17.04.0.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-17.04.0.ebuild
@ -24,7 +24,9 @@ DEPEND="
 	$(add_kdeapps_dep kcalcore)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"

 src_prepare() {
 	kde5_src_prepare
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@ -1,2 +1 @@
-DIST calendarsupport-16.12.3.tar.xz 100400 SHA256 c0a356ca87e114215555462f84d21348dee29dde91028ff4a94757ffb9f86064 SHA512 55277604b5d839ff01108dde8c4696fa3f5cd29d341a4523bce6759af9580fbea78990b6c29528c372ae645e570c97c1f4fd332a693ec3866bc3afde920e96ee WHIRLPOOL 397f5bca7230bea783d6c3f748139da1d345f80c90ea77c61b2962c631b479375d1bb1eb3d4c6169cc5747f42a3c93b93ee515218deb5280db83615ea37b4226
 DIST calendarsupport-17.04.0.tar.xz 672080 SHA256 ca03a37c1d3b69ff75c7432d80bccc5b54e3a5f7af3e7dac3a0531454454ece4 SHA512 6b95ce0fa3bd8d71ceff06f719ebc74a81a00c1165c651a9ed956c1667534636fb768c5adda85086da1ffc7431588aed370a7f02985c9cd5370e8f1b2b147906 WHIRLPOOL c32afa186be3f542f4da2e87619d7c2ba4fa6c9b8d42334c80a6a6215f230f818c78f067c12e74b2e10640bcdd867bf58ea3815b4d257a2d2d1f0c36fb0ef981
--- a/kde-apps/calendarsupport/calendarsupport-16.12.3.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-16.12.3.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Calendar support library"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(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 kholidays)
-	$(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}"
--- a/kde-apps/calendarsupport/calendarsupport-17.04.0.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-17.04.0.ebuild
@ -40,4 +40,6 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	dev-libs/libical
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@ -1,2 +1 @@
-DIST eventviews-16.12.3.tar.xz 147360 SHA256 acfcbecfcead0a3ee9c52de135772ca8804cd643851c4a69fe1a5ac1b7fd127d SHA512 d8694c9f8f7a29086d0fa71e10f99de0fa078d0dfb6a0e1e55fa96da82540cc74351415fdd9c1bdf424c0969061ee8dbaf8dffe6e6b1ea15d94266b291b61bf1 WHIRLPOOL 23c8458ef6ac0a110ebbcf7b9f3af8dd5d1e389cd202e07b09fc95ab4547d39e752ab04ab08777965c3abb224b6db2f3f7773bef3a15033a858a500cbc1aac83
 DIST eventviews-17.04.0.tar.xz 434832 SHA256 00fdfb9fe5bf588717079e7bc27c87bf6f67c1c33d35cbf224cfa49d6ed9d4bf SHA512 4a86c9c02ec79d631abeb530158b603b5de7dc03e203dc8c43164549839c339a218fb7bb7378cb0a8cbc4458871f5d0e32fdac2997cdd89cf66732f45cb3fdcf WHIRLPOOL 2483f63a98a3d35d7786bbedcb9334e56a4db27e2da31bbc735886b449f25ed3f91f5d2ec5ba2e7afd4c2879146f048238c3a8ff43350aaadc7b0ed53fc392c5
--- a/kde-apps/eventviews/eventviews-16.12.3.ebuild
+++ b/kde-apps/eventviews/eventviews-16.12.3.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Calendar viewer for KDE PIM"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~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 kdelibs4support)
-	$(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)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(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}"
--- a/kde-apps/eventviews/eventviews-17.04.0.ebuild
+++ b/kde-apps/eventviews/eventviews-17.04.0.ebuild
@ -38,4 +38,6 @@ DEPEND="
 	dev-libs/kdiagram:5
 	dev-libs/libical
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@ -1,2 +1 @@
-DIST grantlee-editor-16.12.3.tar.xz 45408 SHA256 f1df143df3cd6754b51e08985534af65c1366a59c28bca9be17f0f571633f800 SHA512 cfc6d73926598ca53116307b9f6ad15cae4dafd07c66d16b7d82dd3030de49232fb6dbdebfd00ad917f0d28e4c4427445df73c3e8992cad5b2205275b18a14b8 WHIRLPOOL 4b46689dc825d74159539e2743d2cc764011bc8072135b85bd05731267de8a432b45d19d4500b729c0a670dabf63c0b48797dbff189e3a9af0afac95d626b11a
 DIST grantlee-editor-17.04.0.tar.xz 111384 SHA256 0b9825762e65d4b6680169dcddca35146632519c38aa732b88a88a914d7555b9 SHA512 7f46b526a326fbbf706b100b05fc3022623652e97eeb7fbcf9551757ecade3a1cc59c1d0099f179a0affa174d301a91c1101b12f0d6605c425fa148022742bc1 WHIRLPOOL bd44591f41979dbcee19bffda4cd81ada99849e8a8aa85eb411dff993e4cde5469bbf51ab43f93e05c646fb845f7ba9060f0a8c85b8c1aebd372fcd1e34d898a
--- a/kde-apps/grantlee-editor/grantlee-editor-16.12.3.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-16.12.3.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(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 kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kblog)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kaddressbook:4
-	!kde-apps/kdepim:5
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kmail:4
-"
--- a/kde-apps/grantlee-editor/grantlee-editor-17.04.0.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-17.04.0.ebuild
@ -40,5 +40,6 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!kde-apps/kaddressbook:4
 	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
 	!kde-apps/kmail:4
 "
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@ -1,2 +1 @@
-DIST grantleetheme-16.12.3.tar.xz 44032 SHA256 135de45f766a4bb3a6831177f0e3bf6b48298bf0e0ac98b2d91697738551b3a6 SHA512 b5a36282e0406e67269c84401ba5122dd9c3694071730664b178f8b7593beb32c70ed092a39d44c1e7ce3977855de531da636a81e4e71296030fa18eb4ecf0e0 WHIRLPOOL 50711227a352fdd8e3e01ededdc9b6bd29ba0c89ecbca635d3d10d7437e8738767c01e00fef7263dd9bcf587539adbf335fac296b25b516d89cde6bd6789f4fa
 DIST grantleetheme-17.04.0.tar.xz 50892 SHA256 240ebec772d0361ad21a6396425ccb8fddb90ae219f1dabf30ad140a925b33b6 SHA512 4b2d2e002ab0c6b3f13d9c87f674851ba3087ecef38664619b90a877a54f9a20385e401a518525dad4113554e023ef5698e1187bac45a56ad857ee1c51302d8a WHIRLPOOL 951fd178d74dfbcd24e6f71ef13bf9f0ff05453e43312bffdac2f2db2fce6180cd62066ba1ac99e98f1cc2cb7e15b47257d1e4d6fc8a00afe5d9e6cd1aabc0f4
--- a/kde-apps/grantleetheme/grantleetheme-16.12.3.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-16.12.3.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Library for Grantlee plugins"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtnetwork)
-"
-
-# fails if package not already installed
-RESTRICT+=" test"
--- a/kde-apps/grantleetheme/grantleetheme-17.04.0.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-17.04.0.ebuild
@ -11,7 +11,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
@ -23,9 +23,12 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	dev-libs/grantlee:5
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtnetwork)
 "
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"

 # fails if package not already installed
 RESTRICT+=" test"
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@ -1,2 +1 @@
-DIST incidenceeditor-16.12.3.tar.xz 121148 SHA256 f76ec9ec5525000d917109c09136a9ac77feff0b9b6338e5ddde3eeb06a75786 SHA512 97c8fc87ec215b581986b129bd5965ba5cd5f51146e7d768e85e008befc420d9951e6a9298ac833f7d137c974205cfb06689057392203818c711296fa5b220ea WHIRLPOOL 86bf856960facacd1c2df5265b008f756fb4130069ebc622dd41e3786ad24dca3b8cf38a7737c19c2986e1b35ca2a948672e8772233e261741968558797c2853
 DIST incidenceeditor-17.04.0.tar.xz 523160 SHA256 871db40c324cddf0179419fd9a54200c60b92a9e7f229c535cb6dce23044d183 SHA512 1b9baebb42cfb4f141c362fe4f0d2a53d4ce25e5252e1943bba648d6db40ae86e8207a9af7058eb3f7dcd51220c853feb35c43adda4a3ff042b25e98b91a6f6b WHIRLPOOL 5d4cf0440409cfe9f9579858e7acf2f24c17c1f510936b57cf2c390d6b2c5cb4697471b55b7be922f2c09244e288d6d5ed420d76907f0205d6a543fa27d50f11
--- a/kde-apps/incidenceeditor/incidenceeditor-16.12.3.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-16.12.3.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Incidence editor for korganizer"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~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 kdelibs4support)
-	$(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)
-	$(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
-"
--- a/kde-apps/incidenceeditor/incidenceeditor-17.04.0.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-17.04.0.ebuild
@ -50,4 +50,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
 "
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@ -1,4 +1,3 @@
-DIST kaddressbook-16.12.3.tar.xz 164940 SHA256 300b448c8cd367b13cfb92aa7297a27775a2a3aa822b759edf11f10bbc5606a9 SHA512 48ca122c0cb8dabdc0dd0d707fa61ade73b3c6db0570ba140cb2f9743c27248fe96ad0817505677a1721b2d5ba70366bb98d3b290b8a2b51fa617b0e46b6904c WHIRLPOOL 45bb344a1b03a4fdcf65740e4072ef5555d77d80766ce2d36d27dec560ea51cc91f569294deb5aeee295613ba8248cd555cb4593d20ceeafcecc17e29910df2b
 DIST kaddressbook-17.04.0.tar.xz 561852 SHA256 9f50478678b2b9073b8bc9ca3de5d8174d9d08aba2e9af248d78451b85edf4e1 SHA512 db9f61c87721ed3c4ace8b4063ab34fce31402e2f8c5c9c1a108cbee3e34c3af2de48b9f30b82edf0d81d3bd8006743cded1632a53fbab5c09f3de4f8fe9b095 WHIRLPOOL 40952cd3ab27f4103a5509a25b7a5318fdfa5713ceeaaed143f2c0324ccb39c82c8bc64d8747927364e721a6c9d1eb86c5692281513bb7ba7688d154efa6dd83
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
--- a/kde-apps/kaddressbook/kaddressbook-16.12.3.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-16.12.3.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="forceoptional-recursive"
-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 ~x86"
-
-IUSE="prison"
-
-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 kdelibs4support)
-	$(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_kdeapps_dep akonadi)
-	$(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 mailcommon)
-	$(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
-	prison? ( $(add_frameworks_dep prison) )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kdepim-runtime)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package prison KF5Prison)
-	)
-
-	kde5_src_configure
-}
--- a/kde-apps/kaddressbook/kaddressbook-17.04.0.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-17.04.0.ebuild
@ -55,6 +55,7 @@ DEPEND="${COMMON_DEPEND}
 	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
 "
 RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
 	$(add_kdeapps_dep kdepim-runtime)
 "

--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@ -1,4 +1,3 @@
-DIST kalarm-16.12.3.tar.xz 566936 SHA256 1f5f78697197503ae716d247b8391a19cf2ae4eb03fb4cfa0a2be2cd441170d8 SHA512 5fe7a83acd5f7e6925c16e93d99afce20b84da05431290abfb6eb905991d34320bc8f6b30b9939d2c599cf147bbbadaf703183cce3d84e6d46c16cd1fdd4f407 WHIRLPOOL 4e2d26d80494b6c128f088f58001578026e5d73043e377a2048f82cafb9c5c53ed000626ce1553a417c95dca713509608f6434f9032809834df883a2cbc8246b
 DIST kalarm-17.04.0.tar.xz 1823760 SHA256 e7911fee91804f9e401a11ac0423f0a2fe5e04741146dcdcf08053c7cba30bff SHA512 1c7eba06e9998addb1ca36375f556f2ffbc401acaf8a6240b14ff245ec52eddfa503ea2ccfa608b743522c1e3787d9a5f4f6488e67803552cad1519efd907545 WHIRLPOOL 10b45398ced32722439925399ed6b6f9a7ef68725cae1b5e73593a8de643feb86e7ced15de7183b1cf0a205bd59b2ca205d691423aefd8173b0fbde196ec00d1
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
--- a/kde-apps/kalarm/kalarm-16.12.3.ebuild
+++ b/kde-apps/kalarm/kalarm-16.12.3.ebuild
@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~x86"
-IUSE="X"
-
-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 kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(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)
-	$(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 kholidays)
-	$(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)
-	dev-libs/libxslt
-	media-libs/phonon[qt5]
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim:5
-	$(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/kalarm/kalarm-17.04.0.ebuild
+++ b/kde-apps/kalarm/kalarm-17.04.0.ebuild
@ -63,6 +63,7 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
 	$(add_kdeapps_dep kdepim-runtime)
 "

--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@ -1,2 +1 @@
-DIST kalarmcal-16.12.3.tar.xz 87612 SHA256 79ed115271378110a25482c260ede827a32ab836f8951db7e121b6a5198c9a18 SHA512 9857b3f7aed45627ad9db2d869b4c2b13ec207f24ab273381130717cbaec72038e0136119101677bfb8f2067acda4229af24408c5d58334b6196ef61e7a82bc8 WHIRLPOOL 5eadc1fafdd67b7ec86f21b7b03a845f04f04ad69c368ac0eae407f00407ca2a5404e70fe837cba5427c9094fa8d5286ffd781691c5158ccc6c2683aa58fe69d
 DIST kalarmcal-17.04.0.tar.xz 504300 SHA256 8464258e576d23fcc43732203c8cf190cf77bbad54d4b46938e58fa9b4e0db8c SHA512 af0b07f14eaf0f62af9931b72272ad22c9408a2009008896e21da14b6fcc0da87be05dff6919b5927fb3e8337d502b070c4e02a6d1f9a33cabeeaf9e2c04f9a1 WHIRLPOOL f14d5129ddd0732f1f3896728542922c64e3ff304a72d92a838d9ff66afd37d55efba6107365300beef160dfcfc4de036c9894e322321f7f96201d50a0c9f614
--- a/kde-apps/kalarmcal/kalarmcal-16.12.3.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-16.12.3.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Client library to access and handling of KAlarm calendar data"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kholidays)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_qt_dep qtgui)
-"
-RDEPEND="${DEPEND}
-"
--- a/kde-apps/kalarmcal/kalarmcal-17.04.0.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-17.04.0.ebuild
@ -20,4 +20,5 @@ DEPEND="
 	$(add_qt_dep qtgui)
 "
 RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
 "
--- a/kde-apps/kblog/Manifest
+++ b/kde-apps/kblog/Manifest
@ -1,2 +1 @@
-DIST kblog-16.12.3.tar.xz 43744 SHA256 7dd0b54e22349433a11db95c0a76d5ad396df465e6ab99e696c0bf761ed73860 SHA512 7e1d7c97b9bc9c2b0c61a0dbdcc30ff06a79573efac43f08c056899166b353295948b391933a390482f8d2f6a6000bdfe5b04f574e8b6cafd6b367959e4af8aa WHIRLPOOL eeedfd15d34bd95c1d73197250c021305597de9267e84432902dd936daf727d2c669bab14e702ed6407bf6a5eff6b9101289f9c4481d5a092beb63986db22edf
 DIST kblog-17.04.0.tar.xz 72516 SHA256 2b19f5fbc17a8a80768f88e523c1442aca59518396941768251947346211c21c SHA512 7c2a23460e932982782568b0be14617b8adf22d50c1d53d080b5ea6e182b88e38203bbf4023bffb234dffce4bfa1856485dcaba89490a3f1203578b12963aab4 WHIRLPOOL 9f42bfc3670b21a3e0fc76a9e11d5106db72f899594a5c945400ad43b4ec6587cf8d306114555fa538b40e8df42259096a4bbc84ce29912a6a36329c229c4754
--- a/kde-apps/kblog/kblog-16.12.3.ebuild
+++ b/kde-apps/kblog/kblog-16.12.3.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library providing client-side support for web application remote blogging APIs"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kxmlrpcclient)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep syndication)
-"
-RDEPEND="${DEPEND}"
--- a/kde-apps/kblog/kblog-17.04.0.ebuild
+++ b/kde-apps/kblog/kblog-17.04.0.ebuild
@ -20,4 +20,6 @@ DEPEND="
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep syndication)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@ -1,2 +1 @@
-DIST kcalutils-16.12.3.tar.xz 94664 SHA256 96288ad3a564709c1b2804ea18820d00cdaacad22ca0559d498407e592008910 SHA512 785d693d0f6bdc34e301d5d65fb1d9737658ea0eb3d5a7683032dcb188f063b9c80984641fc1298885ce93a55f74979a0251aa6dd227869c4198c3ec22bb599d WHIRLPOOL 9c6af4e066c61a3c2ca25334a1596d46fb996f8eaff69d767ee2e2615830f6234acf3d63ba9dc05748c72c475dac175f2928334ec1a09f22a00b9a71fe87742b
 DIST kcalutils-17.04.0.tar.xz 326796 SHA256 904933cdbad929e5db8b394bc1c7fc8366de275d80d56319568620955062c445 SHA512 a3f42ac6a992c6d19f97d871c7ffb29eb01f87f2233ca852a396eab3c858681318d3043dd1f5f7e2b32cb82991bd39d39e4b3339d7152da02646d50a07969af7 WHIRLPOOL 023b5f16a0af8b3187a29025d1c2043fdf6a306ccb0c9ad4d151e49943771ce100df0fda66181c209e621308c0e29d33f248d2cb61c383876f6fbeb18e2857f4
--- a/kde-apps/kcalutils/kcalutils-16.12.3.ebuild
+++ b/kde-apps/kcalutils/kcalutils-16.12.3.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library providing utility functions for the handling of calendar data"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
--- a/Show More
+++ b/Show More