gentoo resync : 25.01.2018

12 files changed, 267 insertions, 125 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 06dd0d5feb72..03b389c5fb5a 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 5a0a621f8270..d1179ed58374 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -5,5 +5,5 @@ DIST gnucash-2.7.3.tar.bz2 13736166 BLAKE2B 352c7bd9fe11b3b1b039acedb43be6f48960
 EBUILD gnucash-2.6.15-r1.ebuild 3216 BLAKE2B 1989921ba59e5fdf7da887aa85e9a9ad966ab7b037df69fa2827703652e679180762785ef20cc7f0c12b99a20eccb61d4cb30d70a23cc88060690fc55e5ea424 SHA512 8823d1681347cf1f4b52dce75302ca431c0b9b675c5bd6e2e97978237027511acf7f25309755f02d329aa62814881f5df927948c432339c47ef7387ed2bbbe54
 EBUILD gnucash-2.6.15.ebuild 3238 BLAKE2B 5f11f80f426e510fb46e8cdedc0dd9a8ba7f783e5d9eada1185cd4507b34945be105083a28eefacfe91f692e49436cfec3dd7747bd1a60dd87226897cb7e4098 SHA512 00fb4c31296021b9cbb7bc1a83662ff04c89aa5425f4a814ba91cab19ca6ebf8ffd29f60f641770a56b8af48d7ba8c195c0d641c3046e8d2365a841639ef74fb
 EBUILD gnucash-2.6.19.ebuild 3331 BLAKE2B 67b53dbb60ab5b8160c0e73d3135a200e41f21fd5cfceb7e7f652967af5fcf0381bcd5436f9120fb025bf4ab22a4bd4eae94ac9dacfcdfcda9efec5375fd52d4 SHA512 3c928dd6a952c570f744bae0d843b5dfd48548e12b40c15f73cc4651e49d81989eb845643ec99b175b3eaf01a042f8bf5ceadb02917ea2e998595db0b3e68b8b
-EBUILD gnucash-2.7.3.ebuild 3507 BLAKE2B b686ba37ab8566cfde98d7f0606b0b6fd5738a59ac2d08c3149fbfc00ccef117cef80ee6c0f3494480f3f81fb524a8dacb547fbf260a82ffb78dde6672a6b347 SHA512 507aa648e1dbc301b4f80b5433c0d5d925793909f31304f5b744f6ef4553a36f541adc69f08f0d6bfc2a5c1969b405c777c82c6b68d9ce034d8dd99471359d73
+EBUILD gnucash-2.7.3.ebuild 3662 BLAKE2B 235d7c3733e37de0db3dc37a15033de21211261945b045bc198519e55e6930b40bcc537525a8c3ef3e34f8585832d1043f671d9c7756ecfcacd080900f61883b SHA512 8cbac0e334419ab2eaa3142438f33b0ecd4b79b991889eef6065b84283f3f70169248fe4fe3a4d146768988ad758d6cbf11b4b6aae553c7fef5b8d028d57f0d7
 MISC metadata.xml 842 BLAKE2B 32276a0205e3726e5dc547bbac615cb04f1137cf9f34389810921ec6fe55312af21f31732cbfd998a2f1678b06b8f54a16601d0b02e580e3c4a609159f0628dd SHA512 ef6c9aacda5849e8d6a8bc03ff9266fbf38b2256f085b4e4cd3c4a91007f3a4a81740417f18d7f5f437fbf4167de4ffbdb4742e381ded06b12a8433b550ed542
diff --git a/app-office/gnucash/gnucash-2.7.3.ebuild b/app-office/gnucash/gnucash-2.7.3.ebuild
index 9bf87b6b7157..1dacaa9f6593 100644
--- a/app-office/gnucash/gnucash-2.7.3.ebuild
+++ b/app-office/gnucash/gnucash-2.7.3.ebuild
@@ -131,7 +131,9 @@ src_test() {
 }
 
 src_install() {
-	gnome2_src_install
+	# Parallel installation fails from time to time, bug #359123
+	# Usually reproducible after removing any gnucash installed copy
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
 
 	rm "${ED}"/usr/share/doc/${PF}/{COPYING,INSTALL,projects.html} || die
 	rm "${ED}"/usr/share/doc/${PF}/*win32-bin.txt || die
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 68264a80cb27..b994c3696a20 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -9,5 +9,5 @@ AUX kmymoney-4.8.0-tests.patch 7303 BLAKE2B 9af6e4438ddd5f0a992744f9b063a3b5e4d1
 DIST kmymoney-4.8.0.tar.xz 20785888 BLAKE2B 23819f5ef4f1ec0951f8b598041b7516efae94ccc6677404b133039023e6141e078226938d2c6d6fa6332803d4ee23d1c855e4db1945ada3d02d8302103876d0 SHA512 883635a94333341cbe3d6c835fe1dbc1cc5ed5cc834f76c945030ec680aee4fc6ceb367fdde811672a392eb5cd7b735c858e0be5a7f7964a4ccf5f9ba8865381
 DIST kmymoney-4.8.1.1.tar.xz 20963444 BLAKE2B d2be72a1c7dc41f48405ee406c419b9eb74cc02a80949965b8241331c00fbec23c32177aea0a401a76ef64a97e25e9e532c28e4f29bf88c9c2fd04f608790df6 SHA512 1f730f7db9117469aebaab33891f6064f648fa0ad25afff9ac1fab8d638c376d8e1f013401512c4be060436d6bbdfdacad6427b1e0911ac6b46288db1e242783
 EBUILD kmymoney-4.8.0-r3.ebuild 2080 BLAKE2B 47916c64c9bc3f9fcc906d11c2e1a02df5224f40297454ab228b99f8a5d8ca4df5dd068052fccc0a218efe3bcf9e8b16f53bad2b0d691acf0a0357d12dda9362 SHA512 f74c37356f2059c14c224aa600af5fc0b6cb6217be1ce431bf57223d93299ca515ecdd1801487c06502703b61bb81faa42be6358e3cda17c4099335d6c19dfaf
-EBUILD kmymoney-4.8.1.1.ebuild 1637 BLAKE2B 5d4356523d4258df4691253bc15186a26e9a2c5620442c409a59f86515d61599e8c2818fd86eba336e70aa4d7524e2394ae0e3355c7439239e8aa1a8ad502966 SHA512 b3383ff299aa42d89d274c4c4244d9d058634f558f46e13fbb39f7a215a9448fc1a1494500b696eaee701c977df6fd4e404e62eb0d7420028be09abe7934bc78
+EBUILD kmymoney-4.8.1.1-r1.ebuild 3311 BLAKE2B 7ea9f95e3b07439bb0745d7fdc8e783f82343747c5c601c19ccdd7723fed22b23aff47a3f245d69496fe107287853360f319f4eee5e898234e801a2e6318e325 SHA512 bc5b019ba2ab8c5871e86cf30cf7090b687052ca66ba3ed5dda8645f7c1290f875b5a3ad2d39c9e2bb3f236fda243ad4f8087ef719dde904ce79fafd8d43fa23
 MISC metadata.xml 607 BLAKE2B 3c2d771c20d49a41fef17d5b82bb7530f7db7611f19fa708045a81c55392cb06c0a82df7c0e9c80f8f2fb089e9233ea5a570700c37d3f0ca8782505ddf5216df SHA512 53ff98b9a6a419763e03670c0f6b5da707ff0b17f9f6ac8c03df46502599225d8780c099627fe8bc1c35f13452b80deb88d6fd0da450634f42a9aed827d256e1
diff --git a/app-office/kmymoney/kmymoney-4.8.1.1-r1.ebuild b/app-office/kmymoney/kmymoney-4.8.1.1-r1.ebuild
new file mode 100644
index 000000000000..612279679a18
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-4.8.1.1-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic virtualx
+
+DESCRIPTION="Personal finance manager by KDE"
+HOMEPAGE="https://kmymoney.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="calendar debug doc +handbook hbci ofx quotes test weboob"
+
+COMMON_DEPEND="
+	>=app-crypt/gpgme-1.7.0[cxx]
+	<app-office/libalkimia-6.0.0
+	dev-libs/gmp:0=
+	dev-libs/libgpg-error
+	dev-qt/qtcore:4[ssl]
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	dev-qt/qtsql:4
+	dev-qt/qtsvg:4
+	kde-frameworks/kdelibs:4
+	x11-misc/shared-mime-info
+	calendar? ( dev-libs/libical:= )
+	hbci? (
+		>=net-libs/aqbanking-5.5.1
+		>=sys-libs/gwenhywfar-4.15.3[qt4]
+	)
+	ofx? ( >=dev-libs/libofx-0.9.4 )
+	weboob? ( www-client/weboob )
+"
+RDEPEND="${COMMON_DEPEND}
+	kde-frameworks/oxygen-icons:*
+	handbook? ( kde-frameworks/kdelibs:4[handbook] )
+	quotes? ( dev-perl/Finance-Quote )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	handbook? (
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xsl-stylesheets
+	)
+	test? ( dev-qt/qttest:4 )
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if [[ -v LINGUAS ]] ; then
+		pushd po > /dev/null || die
+		local lang
+		for lang in *; do
+			if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
+				case ${lang} in
+					CMakeLists.txt) ;;
+					*) rm -r ${lang} || die ;;
+				esac
+				cmake_comment_add_subdirectory ${lang}
+				sed -e "/add_subdirectory([[:space:]]*${lang}\/.*[[:space:]]*)/d" \
+					-i CMakeLists.txt || die
+			fi
+		done
+		popd > /dev/null || die
+	fi
+
+	if ! use handbook; then
+		cmake_comment_add_subdirectory doc
+	else
+		if [[ -d doc && -v LINGUAS ]] ; then
+			pushd doc > /dev/null || die
+			local lang
+			for lang in *; do
+				if ! has ${lang} ${LINGUAS} && [[ ${lang} != "en_US" ]]; then
+					cmake_comment_add_subdirectory ${lang}
+				fi
+			done
+			popd > /dev/null || die
+		fi
+	fi
+
+	# don't install as executable
+	sed -i kmymoney/CMakeLists.txt \
+		-e "/install.*kmymoney.appdata/ s/PROGRAMS/FILES/" || die
+}
+
+src_configure() {
+	use debug || append-cppflags -DQT_NO_DEBUG
+
+	local mycmakeargs=(
+		-DUSE_QT_DESIGNER=OFF
+		-DENABLE_LIBICAL=$(usex calendar)
+		-DUSE_DEVELOPER_DOC=$(usex doc)
+		-DENABLE_KBANKING=$(usex hbci)
+		-DENABLE_LIBOFX=$(usex ofx)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KdepimLibs=ON
+		-DKDE4_BUILD_TESTS=$(usex test)
+		-DENABLE_WEBOOB=$(usex weboob)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile apidoc
+}
+
+src_test() {
+	local kded4_pid
+
+	_test_runner() {
+		export $(dbus-launch)
+		kded4 2>&1 > /dev/null &
+		kded4_pid=$!
+
+		cmake-utils_src_test
+	}
+
+	unset DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID
+
+	local myctestargs=( -E "(kmymoney-querytabletest)" ) # requires ktimezoned
+	virtx _test_runner
+
+	if [[ -n "${kded4_pid}" ]] ; then
+		kill ${kded4_pid}
+	fi
+
+	if [[ -n "${DBUS_SESSION_BUS_PID}" ]] ; then
+		kill ${DBUS_SESSION_BUS_PID}
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}/apidocs/html/." )
+	cmake-utils_src_install
+
+	# We don't want /usr/share/doc/HTML to be compressed,
+	# because then khelpcenter can't find the docs
+	[[ -d ${ED%/}/usr/share/doc/HTML ]] &&
+		docompress -x /usr/share/doc/HTML
+}
diff --git a/app-office/kmymoney/kmymoney-4.8.1.1.ebuild b/app-office/kmymoney/kmymoney-4.8.1.1.ebuild
deleted file mode 100644
index 24a7abd20135..000000000000
--- a/app-office/kmymoney/kmymoney-4.8.1.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-SQL_REQUIRED="always"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde4-base
-
-DESCRIPTION="Personal finance manager by KDE"
-HOMEPAGE="https://kmymoney.org/"
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="calendar debug doc hbci ofx quotes weboob"
-
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.7.0[cxx]
-	<app-office/libalkimia-6.0.0
-	dev-libs/gmp:0=
-	dev-libs/libgpg-error
-	x11-misc/shared-mime-info
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=net-libs/aqbanking-5.5.1
-		>=sys-libs/gwenhywfar-4.15.3[qt4]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.4 )
-	weboob? ( www-client/weboob )
-"
-RDEPEND="${COMMON_DEPEND}
-	quotes? ( dev-perl/Finance-Quote )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# don't install as executable
-	sed -i kmymoney/CMakeLists.txt \
-		-e "/install.*kmymoney.appdata/ s/PROGRAMS/FILES/" || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT_DESIGNER=OFF
-		-DENABLE_LIBICAL=$(usex calendar)
-		-DUSE_DEVELOPER_DOC=$(usex doc)
-		-DENABLE_KBANKING=$(usex hbci)
-		-DENABLE_LIBOFX=$(usex ofx)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KdepimLibs=ON
-		-DENABLE_WEBOOB=$(usex weboob)
-	)
-	kde4-base_src_configure
-}
-
-src_compile() {
-	kde4-base_src_compile
-	use doc && kde4-base_src_compile apidoc
-}
-
-src_install() {
-	use doc && HTML_DOCS=("${BUILD_DIR}/apidocs/html/")
-	kde4-base_src_install
-}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 3fb05e7286ea..f64f4211471d 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,6 +18,6 @@ DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84b
 EBUILD libreoffice-5.4.2.2.ebuild 17284 BLAKE2B 2f1c4a8f7a661b36fa3eaa8559eeeb9e7140cb3e1cc71ca1f4272512e3a268c7e24e60bebd9088a76f06e546bf0307a6e18626fc2e4fe55f04f7ad081befdc27 SHA512 3fde8087bbe39bc3bbf6509bb2faa9635a9e7ced06df58c67f143de24fc49f9e3742d5e61001a28fa9a0d600e8bb5ff72fb578acdd5637ac37c51679408cc810
 EBUILD libreoffice-5.4.4.2.ebuild 17361 BLAKE2B 7fa4ca01338ac8cd9e07288e672ddd033368a5a0281b4c56c2ebe21d6814fec6d1aedf9f06cab4ffa4d0b54f3285cf64781d205926860e3c03907c1b34171086 SHA512 8f551d2d9de46e3ecf10953ece19d9bd005164c6d407e4b980a57dfa74b82d6fce3481d9466a909a938d17cbcf87e27c57e12c186ae8d2c405d9cb32ac76a9b1
 EBUILD libreoffice-5.4.9999.ebuild 17313 BLAKE2B 1701bda68e2ebfdba50ed889d6d13a261a6e8127aa2f47aae68a4e7f39d771f716983f8beee7c927244e101783ba9e50512f35a16c959c979d1475c2baff8b55 SHA512 640c75d7e9b1806249d61006b9b6524c28cf68a6b90936effd0dcca45f5b58bc1b327ed2b37fda815d09c827bd3c5805780bf3e65078fea658518d5219e0fc21
-EBUILD libreoffice-6.0.9999.ebuild 16469 BLAKE2B dc113589f06ccf9d5521d2663a07d756a759bb0c339c30318912b29fd2b7cbb091dabbcf6fd9b50ae15f72bd40fd4dd54a4147a637b6694999d8ebb1caa6cb88 SHA512 f1848d7709e544fd6f082e3cd912049b046ef979c713aa1f165b4c6893595448f6033f688872b413e46bedc7d99ac764a7a34f395c7445380f299aabee23d780
-EBUILD libreoffice-9999.ebuild 16668 BLAKE2B 0625317ed1b43d21ab6e96f001a69f75ae04cccc6bed712bbb6b6e623f0c1e76795420a4275d63ab53b5e4458a7d23c906e7c68b81a1dc1f094e5bd12a39d5db SHA512 e5e80d8bafaf32d0ff3dad306d456c2b2fa09e003974bca70c7742fde62c2215389ac0876c378e0f235ae9bb1953ce961496bb0dc79cc530f0dc9af96003bf41
-MISC metadata.xml 1393 BLAKE2B 011d5a2e756882852e46eedb9ef66977b93131c570491008a9ebc547b91276bc2e6a7a3db045d3de0758d1ea6ca486d3ea5b4d5c7c667b08534212cce25c0867 SHA512 72cff0c78665cb79e4cb3df72a87af3dc02d9d46f6293a02974602387b50245553d90e1d7d3134d8143ffda809b3a497b43279652ede8ae7eeee9e724918bef7
+EBUILD libreoffice-6.0.9999.ebuild 16476 BLAKE2B 1fd7de3ce7a351fb0f65831e28cd8e3768144f9f861fe5a69d4821f65ec4d419989259fbd48500c31a460c18629fb516adc147375bae73453dffab8441caf3fa SHA512 bd2eff8e04a3569d88d83a11af8389576fee8a364db5c54ed24da533846c14536bcf5f3877c35742ef4f2608f2f34d97593de020be5fe9e1051b77012f5019ad
+EBUILD libreoffice-9999.ebuild 16574 BLAKE2B 409d86e1d165ec3e40e72e5cc8e1c150ab1903fe68f46565cb2ada5428f2124e95b6bcafe87cc5017550f952ae5852bb0162e9740aef6fc4e91109e203eb9b73 SHA512 6c26fccf3293d87f8a4be53ecc0261cd36f8db8a1844121397af7afd8787ae1ca7fdb01a70f64f4b18095ff130afc8f8140e2b24ee39c182f206c7c01a93751c
+MISC metadata.xml 1443 BLAKE2B cbf2c4306fdcde291bcb0692af7dc9f43f1eaf05fe93d6faffbc85833dc4d5ae653cc299a9bdb55dfb335c8aff316893a72ac48488fb372f667f81212648fe75 SHA512 df37d47b0f2f9f9c229b0d558d69fcda897a54b8ef1584d9940a7817885d52aa6b17b1879cf3103a9129fcac0611b4fe49213876bd2e446c70e57735a144b323
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 5b58caa856a0..90f72941a9bd 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
 IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres test vlc
+gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -148,15 +148,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		media-libs/gst-plugins-base:1.0
 	)
 	gtk? (
-		x11-libs/gdk-pixbuf
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
 		gnome-base/dconf
 		x11-libs/gtk+:3
 	)
+	gtk2? (
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-2.24:2
+	)
 	jemalloc? ( dev-libs/jemalloc )
 	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
 	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
@@ -426,8 +426,8 @@ src_configure() {
 		$(use_enable eds evolution2)
 		$(use_enable firebird firebird-sdbc)
 		$(use_enable gstreamer gstreamer-1-0)
-		$(use_enable gtk)
-		$(use_enable gtk3)
+		$(use_enable gtk gtk3)
+		$(use_enable gtk2 gtk)
 		$(use_enable mysql ext-mariadb-connector)
 		$(use_enable odk)
 		$(use_enable pdfimport)
@@ -442,7 +442,7 @@ src_configure() {
 		$(use_with odk doxygen)
 	)
 
-	if use eds || use gtk3; then
+	if use eds || use gtk; then
 		myeconfargs+=( --enable-dconf --enable-gio )
 	else
 		myeconfargs+=( --disable-dconf --disable-gio )
@@ -519,7 +519,7 @@ src_install() {
 	make DESTDIR="${D}" distro-pack-install -o build -o check || die
 
 	# bug 593514
-	if use gtk3; then
+	if use gtk; then
 		dosym libreoffice/program/liblibreofficekitgtk.so \
 			/usr/$(get_libdir)/liblibreofficekitgtk.so
 	fi
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 664bacbda8ea..1142e018d213 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
 IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk3 kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
+gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -96,7 +96,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	=dev-cpp/libcmis-0.5*
 	dev-db/unixODBC
 	dev-lang/perl
-	dev-libs/boost:=
+	>=dev-libs/boost-1.65.0:=
 	dev-libs/expat
 	dev-libs/hyphen
 	dev-libs/icu:=
@@ -148,30 +148,31 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		media-libs/gst-plugins-base:1.0
 	)
 	gtk? (
-		x11-libs/gdk-pixbuf
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
 		gnome-base/dconf
 		x11-libs/gtk+:3
 	)
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mysql? ( dev-db/mysql-connector-c++ )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		kde-frameworks/kdelibs
+	gtk2? (
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-2.24:2
 	)
-	qt5? (
+	kde? (
 		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtx11extras:5
 		dev-qt/qtwidgets:5
+		kde-frameworks/kconfig:5
 		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
 	)
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mysql? ( dev-db/mysql-connector-c++ )
+	pdfimport? ( app-text/poppler:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
 "
 
 RDEPEND="${COMMON_DEPEND}
@@ -234,12 +235,11 @@ DEPEND="${COMMON_DEPEND}
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	bluetooth? ( dbus )
-	kde? ( || ( qt4 qt5 ) )
+	kde? ( gtk )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
 	libreoffice_extensions_wiki-publisher? ( java )
-	qt4? ( kde )
 "
 
 PATCHES=(
@@ -252,9 +252,6 @@ PATCHES=(
 )
 
 pkg_pretend() {
-	use qt5 && \
-		ewarn "Qt5 is a work in progress. Do _NOT_ file bugs at bugs.gentoo.org related to Qt5 support!"
-
 	use java || \
 		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
 
@@ -367,13 +364,8 @@ src_configure() {
 	export PYTHON_CFLAGS=$(python_get_CFLAGS)
 	export PYTHON_LIBS=$(python_get_LIBS)
 
-	if use qt4; then
-		# bug 544108, bug 599076
-		export QMAKE4="$(qt4_get_bindir)/qmake"
-		export MOCQT4="$(qt4_get_bindir)/moc"
-	fi
-
-	if use qt5; then
+	if use kde; then
+		export QT_SELECT=5 # bug 639620 needs proper fix though
 		export QT5DIR="$(qt5_get_bindir)/../"
 		export MOC5="$(qt5_get_bindir)/moc"
 	fi
@@ -438,14 +430,15 @@ src_configure() {
 		$(use_enable eds evolution2)
 		$(use_enable firebird firebird-sdbc)
 		$(use_enable gstreamer gstreamer-1-0)
-		$(use_enable gtk)
-		$(use_enable gtk3)
+		$(use_enable gtk gtk3)
+		$(use_enable gtk2 gtk)
+		$(use_enable kde qt5)
+		$(use_enable kde kde5)
+		$(use_enable kde gtk3-kde5)
 		$(use_enable mysql ext-mariadb-connector)
 		$(use_enable odk)
 		$(use_enable pdfimport)
 		$(use_enable postgres postgresql-sdbc)
-		$(use_enable qt4 kde4)
-		$(use_enable qt5)
 		$(use_enable vlc)
 		$(use_with coinmp system-coinmp)
 		$(use_with googledrive gdrive-client-id ${google_default_client_id})
@@ -455,7 +448,7 @@ src_configure() {
 		$(use_with odk doxygen)
 	)
 
-	if use eds || use gtk3; then
+	if use eds || use gtk; then
 		myeconfargs+=( --enable-dconf --enable-gio )
 	else
 		myeconfargs+=( --disable-dconf --disable-gio )
@@ -532,7 +525,7 @@ src_install() {
 	make DESTDIR="${D}" distro-pack-install -o build -o check || die
 
 	# bug 593514
-	if use gtk3; then
+	if use gtk; then
 		dosym libreoffice/program/liblibreofficekitgtk.so \
 			/usr/$(get_libdir)/liblibreofficekitgtk.so
 	fi
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 1d3010d41306..f72d5cc7d181 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -15,7 +15,8 @@ version</longdescription>
     <flag name="collada">Enable Collada for rendering 3D models stored in *.dae and *.kmz format</flag>
     <flag name="gltf">Use media-libs/libgltf for inserting 3D models in the glTF format into presentations</flag>
     <flag name="googledrive">Enable support for remote files on Google Drive</flag>
-    <flag name="gtk3">Enable highly experimental gtk3 frontend</flag>
+    <flag name="gtk2">Enable legacy gtk2 frontend</flag>
+    <flag name="gtk3">Enable experimental gtk3 frontend</flag>
     <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
     <flag name="odk">Build the Office Development Kit</flag>
     <flag name="pdfimport">Enable PDF import via the Poppler library</flag>
diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index b6bae89ee8ba..3cc1845256ec 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -11,5 +11,6 @@ DIST TeXmacs-1.99.6-src.tar.gz 25081652 BLAKE2B 08d0a141ff1b8ab59def50c636d917f9
 EBUILD texmacs-1.99.2-r1.ebuild 1859 BLAKE2B 5169eff496b09fb03b8756fa2e75f0b2904e333c6dafa93dd348915ccc633ef23c06973b39e4fbd6067ad39a7b982f2e8fe1f9dd52813e12e219a5ef933b08ad SHA512 0d530b0ab47462b964650ad0bd8a28c2c05cb2cd09b2c8054123c5e794fe8093b47645b3713edc1ecc772f846dae37bb821e3925048764480182aa4ac0b63a6a
 EBUILD texmacs-1.99.5.ebuild 1840 BLAKE2B ea7932a639605afeaad05ba624caf118a353f20880174923d4b2fc55b835efca2c661721e21fcf037a2a7c8805791c1f91cb5cf201f3f28d47e1ad8c7a7d3863 SHA512 cf5241fa735e93f87f5c630a13172c4ef7682ce1303f6a001bab79c2d573bc71322e359dc5a13f3430333fe75ec875ab6c1af921d05ccd4d5ff1dfacf719edef
 EBUILD texmacs-1.99.6-r1.ebuild 1619 BLAKE2B ddeaf9804ca92f537d24d759e3cf1683c02b3b849f688c08a501481ad1e838f2613ac6911f57df259b5fa58a52d30823690d3dda781d8c5a4e6588079a4457b2 SHA512 fd3858ad690822ddc9d6806fb98a8567230948d50fc65a5309bf2a1f7f060f100b813c5b4fa0d72c819b854964767fe8c52c2c2305c984fc0ef00521068940d5
+EBUILD texmacs-1.99.6-r2.ebuild 1684 BLAKE2B 16de10fae7384d3ccf642a62c7e3ed1df2e5acc09658bbbe2e3ff6f4f2bf283edb8470f16d9264892b56207457b8fa815d65abdee021dbca8a16674606141609 SHA512 532c5654a3009f70d491b1f830ca7901863c76d967d311989bae18abe1493ecc1ace3d0c9068f12e21d90a22686b0a60cd3230fccaf885dde06f8fdde111c756
 EBUILD texmacs-1.99.6.ebuild 1725 BLAKE2B f7687d9048bdd782c3ffa31e3f0f423d0609e334c090b66c89a09afa47ee53687054589d955fd4de61d82ca8bd86ba579d3a6bb314f0fc56dc00dc667dba3a89 SHA512 b3d58e9de7f1368bf6099bf2d5d98437f0ac9a81e734a9b0a9bba47eba315721dd356edc1d5c947ce5b697196453c7e896a63de44e9c251ab7ba2d5608018e00
 MISC metadata.xml 532 BLAKE2B 8f4a56ce00b94350aa8597db3fa2f65d676675ee212040b1bd5518563cf7c13e9499d2cb800b4e03e5159280ef17c6ca389b151833e587efe710835cc49ac1f4 SHA512 f7a15d31b19285e863c32dbe1a6e77b10d4a9295dc2f9444a69173eb13e5334acedb0b547253dbe0734a33402e11cd9859c07d8d5db1be3370e547cd96266601
diff --git a/app-office/texmacs/texmacs-1.99.6-r2.ebuild b/app-office/texmacs/texmacs-1.99.6-r2.ebuild
new file mode 100644
index 000000000000..a5c61a4633ff
--- /dev/null
+++ b/app-office/texmacs/texmacs-1.99.6-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils gnome2-utils qmake-utils
+
+MY_P=${P/tex/TeX}-src
+
+DESCRIPTION="Wysiwyg text processor with high-quality maths"
+HOMEPAGE="http://www.texmacs.org/"
+SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="jpeg netpbm sqlite svg spell"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	<dev-scheme/guile-1.9[deprecated]
+	media-libs/freetype
+	x11-apps/xmodmap
+	x11-libs/libXext
+	virtual/latex-base
+	>=dev-qt/qtcore-5.9.1:5
+	>=dev-qt/qtgui-5.9.1:5
+	>=dev-qt/qtwidgets-5.9.1:5
+	>=dev-qt/qtprintsupport-5.9.1:5
+	sqlite? ( dev-db/sqlite )
+	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
+	netpbm? ( media-libs/netpbm )
+	spell? ( app-text/aspell )
+	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
+"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# respect LDFLAGS, bug #338459
+	"${FILESDIR}"/${PN}-plugins-1.patch
+
+	# dont update mime and desktop databases and icon cache
+	"${FILESDIR}"/${PN}-updates.patch
+
+	"${FILESDIR}"/${PN}-1.99.2-desktop.patch
+
+	# remove new/delete declarations, bug 590002
+	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
+
+	"${FILESDIR}"/${PN}-1.99.6-math_util.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_SQLITE=$(usex sqlite sqlite3)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}