gentoo resync : 24.02.2018

18 files changed, 229 insertions, 599 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 846fba628c6b..65b7a316e8d9 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index f125c2485d0b..a675ad95bed9 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,12 +1,8 @@
-AUX gnucash-2.7.3-no-gtest-src.patch 518 BLAKE2B e61dbf22ab7f02af16289bee02ca1617e135d9e92526836efd04952e03ebe7a7e8c8710b174c2b5a9c03565ece674fd04403a146ddba793f9ec02ee4a9b22636 SHA512 d5279af31d454fc71b18c4308cb0d854c1e654190a1c43324d6bd5ab7d91415c4905c008fcd4320ebd49f12236eb43bd60da11d0c6ea6f791f7f6a8ce718e0f4
-DIST gnucash-2.6.15.tar.bz2 13406483 BLAKE2B 927838c5c9c11a19eb9f8e11726825458d5b414f4ef24baf1a7ae15c33825eeed2fd87892e728b37c43385360fd06a60df0bade4244b5c93dac5522f09849c92 SHA512 6ec0652565025ac8281152ed64f2f820ecdb17ead5f17738728e094d116e638a08af57a46c0d5b59679f30f142ce372a5f61bd164f68f6b608d09de37cec38c6
+AUX gnucash-2.7.4-double_free.patch 553 BLAKE2B 3c59299aaf868e52834a8b7c594afedcfde35b7e6058fbe87a8fce57f2773d914b971566c831ae0a998680a3cfc69c5b1c75664087abaf1023e84fd650751592 SHA512 458bf645e16cb88e7ab37b218b442a11b02f6d3eb95fd1c4ae368813bff08bb3455666942c719f17df5348a5c775bc7e0e14507825896463624252aa24a056c9
+AUX gnucash-2.7.4-fix-tests-for-32bit-platforms.patch 1840 BLAKE2B 4de54cb147d563686febad739dddbc7e7e4f1cf92a5f1961fe4ccf452e8e2c495e7a4773a615a77835f4f1ef99d0f5d22c871c1643ada67bec216ae96dff3ce2 SHA512 f89f560e3e6d594836a431831a4a384301e405be49fccece0a761f1d2c17340a68f71ddc8cde4f7e99a2e05e2d3ddc6bda5b59e54ca0baa3a76ac63f7399d48b
 DIST gnucash-2.6.19.tar.bz2 13612124 BLAKE2B cc66e4d7994274bb2ad97437333dbe62b0e9228e20e05e01fc7861bc45a8f07bc56d2a69850eda301d5e7f679d96a9d28c24c56a4860cff6727b66867482deae SHA512 0a979caf48ba96d6f37a929036e7172855cfb03af8832f479966bce72fad3400903925134d33aaa31eb6b36a2041f5e0d3f74b88e95b83c7d76e96b1503bec13
-DIST gnucash-2.7.3.tar.bz2 13736166 BLAKE2B 352c7bd9fe11b3b1b039acedb43be6f48960fac7ef6e4eaca5ca1ce944808d2d36c3a22b15b7150b8026bad10bfa0766fd19ac8d1b4f5f2cb2bcb8c112ee87bc SHA512 78c482eb3146406d561320866c480101cf35c51d8ab789e8d2688c7f7e16d1870b33feb7bcdb3cd8feaca300ce9bcf9fa05ba8e1804b221526d181763dcea611
 DIST gnucash-2.7.4.tar.bz2 13364512 BLAKE2B 0a552efe5a4f024517c054516eb25b51abb2f934e6fc904afd4b0fb48283f9ebb89583b83b0efefba66d014df16c8997c413d05278d4290c44e4fa2278564b61 SHA512 d096ec2a3907dcd09c936f0a49ef6fb5028a17d2e0ade9e68eae7303530480ce19e08c1864efd862d363fda9ef6343260396b794b3c4ac74544baa2628a310eb
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
-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 3662 BLAKE2B 235d7c3733e37de0db3dc37a15033de21211261945b045bc198519e55e6930b40bcc537525a8c3ef3e34f8585832d1043f671d9c7756ecfcacd080900f61883b SHA512 8cbac0e334419ab2eaa3142438f33b0ecd4b79b991889eef6065b84283f3f70169248fe4fe3a4d146768988ad758d6cbf11b4b6aae553c7fef5b8d028d57f0d7
-EBUILD gnucash-2.7.4.ebuild 3700 BLAKE2B 0aa4f1d0e263f00502d7cc62669235f31815d868c2653fc448dc0434c82eed376346a600f39c00e1f534aea5cec27fdf76b9f452b7f119a6e57612451d9bb965 SHA512 ce2efbac5c39455b836d643c4e383267494ecf27e30f23dd225090076a827d6769dc83eb004c3e30b13023194b9cf1b0ce67e1e8737cc5411c80be96d5a3f3e8
+EBUILD gnucash-2.7.4-r1.ebuild 3952 BLAKE2B 011a368e9bf441c05aaaf3681ed666151ad7a68fb849c2ceca50079f47b91265f9ef10b2cf10367393f3df5243bd59e76c7a2362c3ff498c855058412112c977 SHA512 9cdf9f7b57fa0eda3d5d3d154b194bb869fc360fdac5049e327eedb9b27d91a2e4022a3388d1c372a6d84f337c7d1be96722603e05ac4028073e6a9b7baaadc2
 MISC metadata.xml 842 BLAKE2B 32276a0205e3726e5dc547bbac615cb04f1137cf9f34389810921ec6fe55312af21f31732cbfd998a2f1678b06b8f54a16601d0b02e580e3c4a609159f0628dd SHA512 ef6c9aacda5849e8d6a8bc03ff9266fbf38b2256f085b4e4cd3c4a91007f3a4a81740417f18d7f5f437fbf4167de4ffbdb4742e381ded06b12a8433b550ed542
diff --git a/app-office/gnucash/files/gnucash-2.7.3-no-gtest-src.patch b/app-office/gnucash/files/gnucash-2.7.3-no-gtest-src.patch
deleted file mode 100644
index 66c1f9fec852..000000000000
--- a/app-office/gnucash/files/gnucash-2.7.3-no-gtest-src.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Bug: https://bugs.gentoo.org/643566
-
---- a/common/test-core/Makefile.am
-+++ b/common/test-core/Makefile.am
-@@ -80,9 +80,9 @@
-         libgmock.a
- nodist_libgtest_a_SOURCES = ${GTEST_SRC}/src/gtest-all.cc
- libgtest_a_CPPFLAGS = ${AM_CPPFLAGS} -I${GTEST_HEADERS} -I${GTEST_SRC}
--endif
- nodist_libgmock_a_SOURCES = ${GMOCK_SRC_PATH}/gmock-all.cc
- libgmock_a_CPPFLAGS = ${libgtest_a_CPPFLAGS} -I${GMOCK_HEADERS} -I${GMOCK_SRC}
-+endif
- 
- gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
- gncscmmod_DATA = unittest-support.scm
diff --git a/app-office/gnucash/files/gnucash-2.7.4-double_free.patch b/app-office/gnucash/files/gnucash-2.7.4-double_free.patch
new file mode 100644
index 000000000000..9d82e72f96b3
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-2.7.4-double_free.patch
@@ -0,0 +1,12 @@
+diff --git a/libgnucash/core-utils/test/test-userdata-dir.c b/libgnucash/core-utils/test/test-userdata-dir.c
+index 5a8cd5c50..a702a56aa 100644
+--- a/libgnucash/core-utils/test/test-userdata-dir.c
++++ b/libgnucash/core-utils/test/test-userdata-dir.c
+@@ -338,7 +338,6 @@ main(int argc, char **argv)
+ 
+     /* Clean up the temporaries that were created for the GNC_DATA_HOME test run */
+     g_free (home_dir);
+-    g_free (tmp_dir);
+     tmp_dir = g_build_filename(gnc_data_home_dir, "data", (gchar *)NULL);
+     g_rmdir (tmp_dir);
+     g_free (tmp_dir);
diff --git a/app-office/gnucash/files/gnucash-2.7.4-fix-tests-for-32bit-platforms.patch b/app-office/gnucash/files/gnucash-2.7.4-fix-tests-for-32bit-platforms.patch
new file mode 100644
index 000000000000..ec0e83a80bf5
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-2.7.4-fix-tests-for-32bit-platforms.patch
@@ -0,0 +1,56 @@
+From 3a0d2009741cdf825492020acab7c85867a60589 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Thu, 22 Feb 2018 12:27:36 +0100
+Subject: [PATCH] tests: Skip tests for dates on 32-bit platforms which cannot
+ be representated
+
+Tests "test_IANA_Perth_tz" and "test_IANA_Minsk_tz" are failing on 32-bit
+platforms because the earliest timestamp which can be representated on a
+32-bit platform is "1901-12-13 20:45:52" but the test ranges start before
+that date.
+
+To be safe, this commit will add code to skip tests before year 1902 on
+32-bit platforms.
+
+Bug: https://bugs.gentoo.org/647596
+---
+ libgnucash/engine/test/gtest-gnc-timezone.cpp | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/libgnucash/engine/test/gtest-gnc-timezone.cpp b/libgnucash/engine/test/gtest-gnc-timezone.cpp
+index 5c46b2618..298220f6e 100644
+--- a/libgnucash/engine/test/gtest-gnc-timezone.cpp
++++ b/libgnucash/engine/test/gtest-gnc-timezone.cpp
+@@ -154,6 +154,14 @@ TEST(gnc_timezone_constructors, test_IANA_Perth_tz)
+         }
+         else if (year < 1916)
+ #else
++        if (year < 1902)
++        {
++            // Earliest timestamp which can be represented on a 32-bit
++            // system is "1901-12-13 20:45:52" -- so skip tests until we
++            // reach a year >1901 to be safe
++            continue;
++        }
++
+         if (year < 1916)
+ #endif
+         {
+@@ -216,6 +224,14 @@ TEST(gnc_timezone_constructors, test_IANA_Minsk_tz)
+         }
+         else if (year < 1924)
+ #else
++        if (year < 1902)
++        {
++            // Earliest timestamp which can be represented on a 32-bit
++            // system is "1901-12-13 20:45:52" -- so skip tests until we
++            // reach a year >1901 to be safe
++            continue;
++        }
++
+         if (year < 1924)
+ #endif
+         {
+-- 
+2.16.2
+
diff --git a/app-office/gnucash/gnucash-2.6.15-r1.ebuild b/app-office/gnucash/gnucash-2.6.15-r1.ebuild
deleted file mode 100644
index 9cf0d0ea6d36..000000000000
--- a/app-office/gnucash/gnucash-2.6.15-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2 python-single-r1
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
-# libdbi version requirement for sqlite taken from bug #455134
-RDEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/popt-1.5
-	>=dev-libs/libxml2-2.5.10:2
-	dev-libs/libxslt
-	>=dev-scheme/guile-2.0.0:12=[deprecated,regex]
-	dev-scheme/guile-www
-	gnome-base/libgnomecanvas
-	>=net-libs/webkit-gtk-1.2:2
-	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-2.24:2
-	>=x11-libs/goffice-0.7.0:0.8[gnome]
-	x11-libs/pango
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	hbci? ( >=net-libs/aqbanking-5[gtk,ofx?]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	python? ( ${PYTHON_DEPS} )
-	quotes? ( dev-perl/Date-Manip
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/HTML-TableExtract )
-	sqlite? ( >=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite] )
-	postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] )
-	mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] )
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-PDEPEND="doc? ( >=app-doc/gnucash-docs-2.2.0 )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Skip test that needs some locales to be present
-	sed -i -e '/test_suite_gnc_date/d' src/libqof/qof/test/test-qof.c || die
-
-	# We need to run eautoreconf to prevent linking against system libs,
-	# this can be noticed, for example, when updating an old version
-	# compiled against guile-1.8 to a newer one relying on 2.0
-	# https://bugs.gentoo.org/show_bug.cgi?id=590536#c39
-	# https://bugzilla.gnome.org/show_bug.cgi?id=775634
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-
-	DOCS="doc/README.OFX doc/README.HBCI"
-
-	if use sqlite || use mysql || use postgres ; then
-		myconf+=" --enable-dbi"
-	else
-		myconf+=" --disable-dbi"
-	fi
-
-	# gtkmm is experimental and shouldn't be enabled, upstream bug #684166
-	gnome2_src_configure \
-		$(use_enable debug) \
-		$(use_enable gnome-keyring password-storage) \
-		$(use_enable ofx) \
-		$(use_enable hbci aqbanking) \
-		$(use_enable python) \
-		--disable-doxygen \
-		--disable-gtkmm \
-		--enable-locale-specific-tax \
-		--disable-error-on-warning \
-		--with-guile=2.0 \
-		${myconf}
-}
-
-src_install() {
-	# Parallel installation fails from time to time, bug #359123
-	# Usually reproducible after removing any gnucash installed copy
-	MAKEOPTS="${MAKEOPTS} -j1" GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF} \
-	gnome2_src_install
-
-	rm -rf "${ED}"/usr/share/doc/${PF}/{examples/,COPYING,INSTALL,*win32-bin.txt,projects.html}
-	mv "${ED}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die
-	dodoc "${T}"/cantuseprepalldocs/*
-}
diff --git a/app-office/gnucash/gnucash-2.6.15.ebuild b/app-office/gnucash/gnucash-2.6.15.ebuild
deleted file mode 100644
index 9860cdd822dc..000000000000
--- a/app-office/gnucash/gnucash-2.6.15.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2 python-single-r1
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
-# libdbi version requirement for sqlite taken from bug #455134
-RDEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/popt-1.5
-	>=dev-libs/libxml2-2.5.10:2
-	dev-libs/libxslt
-	>=dev-scheme/guile-1.8.3:12=[deprecated,regex]
-	<dev-scheme/guile-2:12
-	dev-scheme/guile-www
-	gnome-base/libgnomecanvas
-	>=net-libs/webkit-gtk-1.2:2
-	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-2.24:2
-	>=x11-libs/goffice-0.7.0:0.8[gnome]
-	x11-libs/pango
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	hbci? ( >=net-libs/aqbanking-5[gtk,ofx?]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	python? ( ${PYTHON_DEPS} )
-	quotes? ( dev-perl/Date-Manip
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/HTML-TableExtract )
-	sqlite? ( >=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite] )
-	postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] )
-	mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] )
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-PDEPEND="doc? ( >=app-doc/gnucash-docs-2.2.0 )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Skip test that needs some locales to be present
-	sed -i -e '/test_suite_gnc_date/d' src/libqof/qof/test/test-qof.c || die
-
-	# We need to run eautoreconf to prevent linking against system libs,
-	# this can be noticed, for example, when updating an old version
-	# compiled against guile-1.8 to a newer one relying on 2.0
-	# https://bugs.gentoo.org/show_bug.cgi?id=590536#c39
-	# https://bugzilla.gnome.org/show_bug.cgi?id=775634
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-
-	DOCS="doc/README.OFX doc/README.HBCI"
-
-	if use sqlite || use mysql || use postgres ; then
-		myconf+=" --enable-dbi"
-	else
-		myconf+=" --disable-dbi"
-	fi
-
-	# gtkmm is experimental and shouldn't be enabled, upstream bug #684166
-	gnome2_src_configure \
-		$(use_enable debug) \
-		$(use_enable gnome-keyring password-storage) \
-		$(use_enable ofx) \
-		$(use_enable hbci aqbanking) \
-		$(use_enable python) \
-		--disable-doxygen \
-		--disable-gtkmm \
-		--enable-locale-specific-tax \
-		--disable-error-on-warning \
-		--with-guile=1.8 \
-		${myconf}
-}
-
-src_install() {
-	# Parallel installation fails from time to time, bug #359123
-	# Usually reproducible after removing any gnucash installed copy
-	MAKEOPTS="${MAKEOPTS} -j1" GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF} \
-	gnome2_src_install
-
-	rm -rf "${ED}"/usr/share/doc/${PF}/{examples/,COPYING,INSTALL,*win32-bin.txt,projects.html}
-	mv "${ED}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die
-	dodoc "${T}"/cantuseprepalldocs/*
-}
diff --git a/app-office/gnucash/gnucash-2.7.3.ebuild b/app-office/gnucash/gnucash-2.7.3.ebuild
deleted file mode 100644
index 1dacaa9f6593..000000000000
--- a/app-office/gnucash/gnucash-2.7.3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# We need to run eautoreconf to prevent linking against system libs,
-# this can be noticed, for example, when updating an old version
-# compiled against guile-1.8 to a newer one relying on 2.0
-# https://bugs.gentoo.org/show_bug.cgi?id=590536#c39
-# https://bugzilla.gnome.org/show_bug.cgi?id=775634
-GNOME2_EAUTORECONF="yes"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-# Add doc back in for 3.0 and bump app-doc/gnucash-docs
-IUSE="aqbanking chipcard debug gnome-keyring mysql nls ofx postgres python
-	  quotes -register2 sqlite"
-REQUIRED_USE="
-	chipcard? ( aqbanking )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# libdbi version requirement for sqlite taken from bug #455134
-#
-# dev-libs/boost must always be built with nls enabled.
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/libxml2-2.7.0:2
-	>=dev-scheme/guile-2.0.0:12=[regex]
-	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-3.14.0:3
-	dev-libs/boost:=[icu,nls]
-	dev-libs/icu:=
-	dev-libs/libxslt
-	gnome-base/dconf
-	net-libs/webkit-gtk:4=
-	aqbanking? (
-		>=net-libs/aqbanking-5[gtk,ofx?]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	mysql? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[mysql]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	postgres? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[postgres]
-	)
-	python? ( ${PYTHON_DEPS} )
-	quotes? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/Date-Manip
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		>=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite]
-	)
-"
-
-DEPEND="${RDEPEND}
-	|| (
-		>=dev-cpp/gtest-1.8.0
-		(
-			dev-cpp/gmock
-			dev-cpp/gtest
-		)
-	)
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-# Uncomment for 3.0
-# PDEPEND="doc? (
-# 	~app-doc/gnucash-docs-${PV}
-# 	gnome-extra/yelp
-# )"
-
-# Bug 643566: Conditional didn't enclose everything related to gtest source
-# files and they're not needed.
-PATCHES=( "${FILESDIR}"/gnucash-2.7.3-no-gtest-src.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myconf
-
-	if use sqlite || use mysql || use postgres ; then
-		myconf+=" --enable-dbi"
-	else
-		myconf+=" --disable-dbi"
-	fi
-
-	# As of 2.7.3, the presence of --disable-register2 would enable register2 as
-	# well.
-	use register2 && myconf+=" --enable-register2"
-
-	gnome2_src_configure \
-		--disable-doxygen \
-		--disable-error-on-warning \
-		--disable-binreloc \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		$(use_enable gnome-keyring password-storage) \
-		$(use_enable aqbanking) \
-		$(use_enable ofx) \
-		$(use_enable python) \
-		${myconf}
-}
-
-src_test() {
-	emake check
-}
-
-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
-
-	use aqbanking && dodoc doc/README.HBCI
-	use ofx && dodoc doc/README.OFX
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
-	ewarn
-	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
-	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
-
-}
diff --git a/app-office/gnucash/gnucash-2.7.4.ebuild b/app-office/gnucash/gnucash-2.7.4-r1.ebuild
index a3320783baaf..770723b97a17 100644
--- a/app-office/gnucash/gnucash-2.7.4.ebuild
+++ b/app-office/gnucash/gnucash-2.7.4-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 # Add doc back in for 3.0 and bump app-doc/gnucash-docs
 IUSE="aqbanking chipcard debug examples gnome-keyring mysql nls ofx postgres
@@ -82,6 +82,11 @@ DEPEND="${RDEPEND}
 # 	gnome-extra/yelp
 # )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-double_free.patch
+	"${FILESDIR}"/${P}-fix-tests-for-32bit-platforms.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 	xdg_environment_reset
@@ -109,8 +114,13 @@ src_configure() {
 }
 
 src_test() {
+	if use python ; then
+		cp common/test-core/unittest_support.py \
+		   "${BUILD_DIR}"/common/test-core/ || die
+	fi
+
 	cd "${BUILD_DIR}" || die
-	emake check
+	XDG_DATA_HOME="${T}/$(whoami)" emake check
 }
 
 src_install() {
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 3edc4f2a151a..3d7351c82d95 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -3,6 +3,5 @@ DIST lyx-2.1.5.tar.xz 10361112 BLAKE2B ddc6e10974f495bb465fced0bfe95e0530831e924
 DIST lyx-2.2.3.tar.xz 15501856 BLAKE2B 08606f0c18d9cb5891bd7d612361597e3efc7e7855f7607c2620f10ddb22b7078d5085f725911496198d2d8a47ece54cbfe67cfbf4ec8eb15450271cd133b095 SHA512 b5a4a16b22680022651a0f3911c2c24bcd3541a573e672e541cb0af6572089e4b0e0ec1cafb40850e75c377e7da5b286d0314886e0c57d55f57645d8e4a07708
 EBUILD lyx-2.1.5-r1.ebuild 4110 BLAKE2B b2e1a28dc3a86d58e44e8b6a2ed00123c2047c21eb7703a3b35d476b6fa40dc10d28f98240ba4a4943cab15c57a66327d93cf613ddff381156f47b32fc5684ea SHA512 e75260bbde4c3de28071e3d1fd15c49435cc9edc2fd0e48cf4ecee09b783fb698dae23e5489ee0dbc8de53501e1fb4624e7359a948b110342855a6c5c48fa8b2
 EBUILD lyx-2.2.3-r1.ebuild 4399 BLAKE2B 754fed823766e2927b7dabec8f8488974a17a2b7141e9b3d15f05128ede7f32a720ff35f09741607833d5bfe48bb5a10647c2150edab8c4f21d9e2d3b8d93592 SHA512 8ab5677b4759e000dc913e869234abcb3c3de155f069f007c19be932722c5a9a23cf8d646a921b82d2e063518de312d30adcd564d73f13a81dd3e04ade9f82d2
-EBUILD lyx-2.2.3-r2.ebuild 4369 BLAKE2B a1d9af492e94b1471f8755756cebfb057eebf98f4cfe4c1b16d8b3e520aaee384fe8175cd44ee7e58ecf25b0ce566a1713250e340287d673c2b8fe4c6ba35d01 SHA512 23f0ff39ee3efc573663e6769ecad71b215d2893428170abf346c606e9506667ad0657a4673300da736abefa920cc21b31a8868729d0d9dbf67ddeea7eb13093
-EBUILD lyx-2.2.3-r3.ebuild 4392 BLAKE2B 08334757610b0d7624e5c60e4451e7047acd962b0492bfadebfefa30e238e09e6555a043956e7ce9c2e6c2290cedc9210d97c054f0819c97e1bf8c263a65ea57 SHA512 fe4301072c27b0a251506ec8c6a2525a76b233a5e18032f2642a5cc81af26ea1668cf9d5b6012aade0a95c03e466b567207ebc86acfb91fd9959cc0da0ecb39f
+EBUILD lyx-2.2.3-r3.ebuild 4386 BLAKE2B 1b1e1d7013669ebe97703ce687f93b5c698314d88f3ee0f5b3b22249a24eb088d61b448bfa4807679a99662dffb80713d438f69f80b790fa04dd667387e8c94b SHA512 8f80f7acdfa453d19757e92f37a67e6e4892dca6d40a119aef7f4fac1a64d673727e1f7d642217d90903fc6c9db1ed85a4f055575e736355b969c0a8d74cabc2
 MISC metadata.xml 1760 BLAKE2B 8a223f94b48a92104942b9ae94c2746da8628c260fc597a836ae3b468bbe277b6383af960883fcd731f2ad288cc34d2ed6a58c118e1bfbdd3c2b766e99514328 SHA512 416c99a6d19a9e736a546c4f939cc5238de5027f1151d49d1bed800a5b2a026868d4197198e86c250b77be568f45f94ace125d83700316a5b001e21ed48b91b4
diff --git a/app-office/lyx/lyx-2.2.3-r2.ebuild b/app-office/lyx/lyx-2.2.3-r2.ebuild
deleted file mode 100644
index edd854b92386..000000000000
--- a/app-office/lyx/lyx-2.2.3-r2.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit gnome2-utils xdg flag-o-matic font python-single-r1 qmake-utils toolchain-funcs
-
-MY_P="${P/_}"
-
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}/lib/fonts"
-FONT_SUFFIX="ttf"
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="https://www.lyx.org/"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
-	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/${MY_P}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
-IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls +qt5 rcs rtf subversion svg l10n_he"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-texlive/texlive-fontsextra
-	sys-apps/file
-	sys-libs/zlib
-	virtual/imagemagick-tools[png,svg?]
-	aspell? ( app-text/aspell )
-	cups? ( net-print/cups )
-	dia? ( app-office/dia )
-	docbook? ( app-text/sgmltools-lite )
-	dot? ( media-gfx/graphviz )
-	enchant? ( app-text/enchant )
-	gnumeric? ( app-office/gnumeric )
-	html? ( dev-tex/html2latex )
-	hunspell? ( app-text/hunspell )
-	latex? (
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/noweb
-		app-text/ps2eps
-		app-text/texlive
-		dev-tex/chktex
-		dev-tex/dvipost
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-pictures
-		|| ( dev-texlive/texlive-mathscience dev-texlive/texlive-science )
-		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra )
-		|| (
-			dev-tex/hevea
-			dev-tex/latex2html
-			dev-tex/tex4ht[java]
-			dev-tex/tth
-		)
-	)
-	l10n_he? ( dev-tex/culmus-latex )
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
-	rcs? ( dev-vcs/rcs )
-	rtf? (
-		app-text/unrtf
-		dev-tex/html2latex
-		dev-tex/latex2rtf
-	)
-	subversion? ( dev-vcs/subversion )
-	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	!qt5? ( dev-qt/qtsvg:4 )
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtx11extras:5
-	)
-"
-
-DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
-
-PATCHES=( "${FILESDIR}"/2.1-python.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	font_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
-}
-
-src_configure() {
-	tc-export CXX
-	#bug 221921
-	export VARTEXFONTS=${T}/fonts
-
-	econf \
-		$(use_with aspell) \
-		$(use_enable debug) \
-		$(use_with enchant) \
-		$(use_with hunspell) \
-		$(use_enable monolithic-build) \
-		$(use_enable nls) \
-		$(use_enable qt5) \
-		--with-qt-dir=$(usex qt5 $(qt5_get_libdir)/qt5 $(qt4_get_libdir)) \
-		--disable-stdlib-debug \
-		--without-included-boost \
-		--with-packaging=posix
-}
-
-src_install() {
-	default
-
-	if use l10n_he ; then
-		echo "\bind_file cua" > "${T}"/hebrew.bind
-		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
-
-		insinto /usr/share/lyx/bind
-		doins "${T}"/hebrew.bind
-	fi
-
-	newicon -s 32 "${S}/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
-	doicon -s 48 "${S}/lib/images/lyx.png"
-	doicon -s scalable "${S}/lib/images/lyx.svg"
-
-	# fix for bug 91108
-	if use latex ; then
-		dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx
-	fi
-
-	# fonts needed for proper math display, see also bug #15629
-	font_src_install
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-
-	if use hunspell ; then
-		dosym ../myspell /usr/share/lyx/dicts
-		dosym ../myspell /usr/share/lyx/thes
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	font_pkg_postinst
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	# fix for bug 91108
-	if use latex ; then
-		texhash
-	fi
-
-	# instructions for RTL support. See also bug 168331.
-	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
-		elog
-		elog "Enabling RTL support in LyX:"
-		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
-		elog "You must enable RTL support in LyX. To do so start LyX and go to"
-		elog "Tools->Preferences->Language settings->Language"
-		elog "and make sure the \"Right-to-left language support\" is checked"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	if use latex ; then
-		texhash
-	fi
-}
diff --git a/app-office/lyx/lyx-2.2.3-r3.ebuild b/app-office/lyx/lyx-2.2.3-r3.ebuild
index fbb69f057bf9..512def000660 100644
--- a/app-office/lyx/lyx-2.2.3-r3.ebuild
+++ b/app-office/lyx/lyx-2.2.3-r3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x86-macos"
 IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls +qt5 rcs rtf subversion svg l10n_he"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index d7998b987abe..6807e441bfd8 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -6,5 +6,5 @@ DIST texmaker-4.5.tar.bz2 11287724 BLAKE2B 9138e4765e439419384573aed210b1df30890
 DIST texmaker-5.0.tar.bz2 15728938 BLAKE2B 14d0ea9e7f8b5f4b4e40bfdbe706b585215d0df8546aeb5d614c73314f41b3f0d443ccf5d4ddb0d7eab00bf76a358cbd51e14ff21ac15e0f8e89b884f12719df SHA512 2473e0ad701da399f428caf8b067129c069a86d8cc5f1d0993ba53025961f7caab816195495d63788d58dafa7a208ca8fbcebbac118a49b20f3f639ee377a636
 EBUILD texmaker-4.5-r2.ebuild 1742 BLAKE2B ea63bccc8295e79ccc35d448ea9c6c28ac83f8a2d6ab5243d9f5aa1ad271cc71febd8a116bb268b3e0ba8b8645e8ea47fe72df0614cad38c6f15c7aaab920c06 SHA512 1c6a44109f3f21eee419f18585d7ca5beca7f408cca0ce87fb9d7cbf405de24d20753fc8e9fd7656ff9ea1dfa685c96e40333a9f12a946b9917442da4165c142
 EBUILD texmaker-4.5-r3.ebuild 1747 BLAKE2B 5ba82e830b53cbd72053932c74965a9537f26a22e2d5ca914cabb8e2fb3f4053cca3589e2e5d523b94158e658c94cb450b9a15f26b7256bcb2a26c0319a51cc9 SHA512 359fc6de06824a19cd6541e61efeeaaff63d3bd1f92b375a9a4d0793ae9569d2641d35f4624e8538f602c8ab9b3a933521b9474be222b90337d842454de7b36c
-EBUILD texmaker-5.0.ebuild 1732 BLAKE2B cb209550cee05733b9e1bb3bf648c60220e894a7d413638a420c6d530042d88adf0c371f0d3de0421772aabf81699b47c65826f95102eb55a491247de3b45bac SHA512 1819c2d1b4485d392c79aa096266a5d982fef49ec803923582c084a7bfd696f5ffc8ef4113963e11d66eef9eef9fa11f84f2ce94321e231cc756c3356798eadb
+EBUILD texmaker-5.0-r1.ebuild 1737 BLAKE2B 9aa3ef14ff70d86ab839537a46006bb7728b505ae34e6274b8e503e43230e0bffc3cf0cf025a362eed797f85c96bed651dfc2ca0765ee10fef8b83f133c3bf00 SHA512 adba9834c2c7404d4a53c1e815c00d63bddd4c452c5a12a9858fb8f76ebff0284540058179fb793b60edc5e03f33d3f831ece5f7c1ef8bc8caa62039c2146435
 MISC metadata.xml 371 BLAKE2B 5e48352072e5e7318de74bfd9e5d2fbd6c746092f7a3d89ecd0f60f3c781993f1af0a37754073f5d31d480feb45992d7939ac7c230167650d4a7c859ee4b5f7d SHA512 fc327d181a4a8194af71244eb082e8e9c749b250687f038b740d1f5f62cac02f300becdbaca84b997edf8372b3352a8d840eadc2f06c8171fef339ac5537914c
diff --git a/app-office/texmaker/texmaker-5.0.ebuild b/app-office/texmaker/texmaker-5.0-r1.ebuild
index 6e6dacfa8359..f91b5375634a 100644
--- a/app-office/texmaker/texmaker-5.0.ebuild
+++ b/app-office/texmaker/texmaker-5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,14 +19,14 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
-	app-text/poppler:=[qt5]
+	app-text/poppler:=[qt5(+)]
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtlockedfile
 	dev-qt/qtnetwork:5
 	dev-qt/qtscript:5
-	dev-qt/qtsingleapplication[X,qt5]
+	dev-qt/qtsingleapplication[X,qt5(+)]
 	dev-qt/qtwebkit:5[printsupport]
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
@@ -41,7 +41,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-		"${FILESDIR}/${P}-unbundle-hunspell-singleapp.patch"
+	"${FILESDIR}/${P}-unbundle-hunspell-singleapp.patch"
 )
 
 DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index ce9c54a6a548..3c9f9f8f36f7 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -6,5 +6,5 @@ DIST texstudio-2.12.6.tar.gz 26511069 BLAKE2B 95f2043222e15f96ed56dabb9bbbb937e3
 EBUILD texstudio-2.11.2-r1.ebuild 2078 BLAKE2B 30839bf7a4381478264178bae93d8a27b5685dd166b241254b0550b6d2388bbbf0f965937fd4a7c6123d7988d6df76a72ee450c830446c15dba9e0185772a7fe SHA512 98cf771d4aaaeec2a8ee95dc97c90978f29501e212eeafde332dcd505c2bc65475ddbc4828aa742b2d0b5a910bdf43a358f2aaddbcf8aca2f9f4271cf20e46c1
 EBUILD texstudio-2.12.2.ebuild 1970 BLAKE2B 41567a33175fe3bc434f64a861b5e9a0f15ad2a49a834f1a2c8aa1d4d73ea231557c399d04067031ef10f88dac35926561be6c7533819e3c0431db8eedae16cb SHA512 be81a9aafadd25daec6248bd09bf31cf9c9611b49d3996c79caf912e70d47a16f5430a0b37e25fee408374309130b924f1fd58e8ffcd6ea69e98d8b1175ff8ec
 EBUILD texstudio-2.12.4.ebuild 1970 BLAKE2B 41567a33175fe3bc434f64a861b5e9a0f15ad2a49a834f1a2c8aa1d4d73ea231557c399d04067031ef10f88dac35926561be6c7533819e3c0431db8eedae16cb SHA512 be81a9aafadd25daec6248bd09bf31cf9c9611b49d3996c79caf912e70d47a16f5430a0b37e25fee408374309130b924f1fd58e8ffcd6ea69e98d8b1175ff8ec
-EBUILD texstudio-2.12.6.ebuild 2251 BLAKE2B d4b417dc49f30348d25d6f73f261db4cddb310e9de70c6d315c1242fd1d2908eebade81409cb7574e9a4a9d72a5b88b19965c2c0ca206f098c1be0b61cef9c07 SHA512 0716eaefca1b0eac1c55c96939e39fa52089df304458d3853a411e3470804f39dcb1800b373e2000cd14a9c4608c9ba6766143f1e46ae21464c94bce3edad10b
+EBUILD texstudio-2.12.6-r1.ebuild 2257 BLAKE2B 8c79671fffbfbede559c3a79ecd74cc70dc685a11647b96df25f78a0b0b9509c9169cdf218049768c84ef75483412c577adb910351eb843ffa75d08aa7165c77 SHA512 ebc851e41cd051b4fbed009c9726fcb298158091074416e2183d873fcfb03a1dc768f32f7f722876ceff61c329d3533e00b8b45305dd0cabbdcdb7f7e5b00cbd
 MISC metadata.xml 402 BLAKE2B 175128174922bf7356817c3752f7207f5c6b2827c0d52e8e0d837fbd19b4429eb6d0154b729d89ff5eff2ed777fad5f05b43c52a3bd5d57ebca3d31c09439964 SHA512 f587cb59a103c39e4685815677a9cc6de4b0db189332b520aaefb3011fe1537485f184395e19f2c18a24dd7f2101e5d5dc2f3eed38f18623cb7a69ebd52da41f
diff --git a/app-office/texstudio/texstudio-2.12.6.ebuild b/app-office/texstudio/texstudio-2.12.6-r1.ebuild
index 7423c9bac35b..e2f4d46a76fa 100644
--- a/app-office/texstudio/texstudio-2.12.6.ebuild
+++ b/app-office/texstudio/texstudio-2.12.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ IUSE="video"
 
 COMMON_DEPEND="
 	app-text/hunspell:=
-	app-text/poppler[qt5]
+	app-text/poppler[qt5(+)]
 	>=dev-libs/quazip-0.7.2[qt5(+)]
 	dev-qt/designer:5
 	dev-qt/qtcore:5
@@ -30,7 +30,7 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtscript:5
-	dev-qt/qtsingleapplication[qt5,X]
+	dev-qt/qtsingleapplication[qt5(+),X]
 	dev-qt/qtsvg:5
 	dev-qt/qttest:5
 	dev-qt/qtwidgets:5
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index dbc278c5b319..9de35eb9b9ec 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,4 +1,5 @@
 DIST wps-office_10.1.0.5707~a21_amd64.deb 88085156 BLAKE2B 2288080715f0130b70bfcdb2886cfdf9c4648a1373367dde1f9d12b179a2816b75f5e342f73edeedf8305af9e65ecb290a297fb85d6a468087360537f0ef7ae9 SHA512 3812237ef2662a9b7e3777dc253c8c410fca73627eb42e33c177b7a2c52b27324fd3ff75b24e1309ecf77279086ab639e3b7fe3e42a4a420036e2989e1941ebd
 DIST wps-office_10.1.0.5707~a21_i386.deb 87863566 BLAKE2B 617b9f874b063ddbe2040f0a5bf30ec07149dae3f90f84fcba86b2bd2950a233190db72a9ba9d8563413c422a1da0d1b41767a864de6f13974467296f2dcb32e SHA512 0fb3eb873f0017d9dbe7a3dc7d849086cdbbd5eaaf5fbfb9bdbe737c40029799df83d98e4e0bf04f6737a0033c76fccba206a3342624b045e309b6d2c35fffe7
 EBUILD wps-office-10.1.0.5707_alpha21-r1.ebuild 2629 BLAKE2B 0f8590d1e61368cb3153c2dc6ae04ddba1fb7ecc42a8e658d3de1ba0e290f6beba54084215a5858b9393d9279cdd6a0d2238bed5adf14c4899b8c4527aeafe8a SHA512 7d147ca953112aa9d1e121ee5b53ab7f841e5744706dd7a29509c2c798c5489f821430de74b08782808e619bc10ddd48404fbca3e7e711e1c0e95ffacf5e5319
+EBUILD wps-office-10.1.0.5707_alpha21-r2.ebuild 2804 BLAKE2B c86101eebe727d4d95d405d9e9788b1b4eaa24202c1a0496e97ec96af01101021e28c7e5f61d4e05c2256fce1e5ce2147541bb0763bcf882c0801bdd9b4b5c1d SHA512 2c9df6a7fcc200f2fb4890adac7b73fc6f1407bd534df924960e9518031f9c2a53a701f851cab80c13826bc5624c4b5088760839a48ee5277f27d75065692de4
 MISC metadata.xml 325 BLAKE2B e69a86660b1803578e847d64001b10f79bf3bb1fde9a226bcfe4b972183c947dfaaa292c8256cf635db263dae17ca34e796a89142fc6bce87f2efc8514821eb7 SHA512 f0dc46dcbbf409c15db60a6dc1b0e002300d0813385ff5bc006c333bea01be8c037edab4808b67256cd90a31790ad70f432eaedd41f8da8e4fa78e3f7440ac84
diff --git a/app-office/wps-office/wps-office-10.1.0.5707_alpha21-r2.ebuild b/app-office/wps-office/wps-office-10.1.0.5707_alpha21-r2.ebuild
new file mode 100644
index 000000000000..e2d25752dda6
--- /dev/null
+++ b/app-office/wps-office/wps-office-10.1.0.5707_alpha21-r2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit font gnome2-utils unpacker versionator xdg
+
+MY_PV="$(get_version_component_range 1-4)"
+MY_V="$(get_version_component_range 5)"
+
+if [ -z "$(get_version_component_range 6)" ]; then
+	MY_SP=""
+else
+	MY_SP="$(get_version_component_range 6)"
+fi
+
+case ${PV} in
+	*_alpha*)
+		MY_BRANCH=${MY_V/alpha/a}
+		;;
+	*_beta*)
+		MY_BRANCH=${MY_V/beta/b}
+		;;
+	*)
+		die "Invalid value for \${PV}: ${PV}"
+		;;
+esac
+MY_VV=${MY_PV}~${MY_BRANCH}${MY_SP}
+
+DESCRIPTION="WPS Office is an office productivity suite"
+HOMEPAGE="http://linux.wps.cn/ http://wps-community.org/"
+
+KEYWORDS="~amd64 ~x86"
+
+SRC_URI="
+	x86? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_i386.deb )
+	amd64? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_amd64.deb )
+"
+
+SLOT="0"
+RESTRICT="strip mirror" # mirror as explained at bug #547372
+LICENSE="WPS-EULA"
+IUSE="+sharedfonts"
+
+# Deps got from this (listed in order):
+# rpm -qpR wps-office-10.1.0.5707-1.a21.x86_64.rpm
+# ldd /opt/kingsoft/wps-office/office6/wps
+# ldd /opt/kingsoft/wps-office/office6/wpp
+RDEPEND="
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libxcb
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	dev-libs/glib:2
+	sys-libs/zlib:0
+	net-print/cups
+	media-libs/libpng:1.2
+	virtual/glu
+
+	dev-libs/libpcre:3
+	dev-libs/libffi
+	media-sound/pulseaudio
+	app-arch/bzip2:0
+	media-libs/libpng:0
+	dev-libs/expat
+	sys-apps/util-linux
+	dev-libs/libbsd
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	sys-apps/dbus
+	x11-libs/libXtst
+	sys-apps/tcp-wrappers
+	media-libs/libsndfile
+	net-libs/libasyncns
+	dev-libs/libgcrypt:0
+	app-arch/xz-utils
+	app-arch/lz4
+	sys-libs/libcap
+	media-libs/flac
+	media-libs/libogg
+	media-libs/libvorbis
+	dev-libs/libgpg-error
+	sys-apps/attr
+"
+DEPEND=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+	# We need to drop qtwebkit bundled lib completely because it causes
+	# crashes in *some* setups (https://bugs.gentoo.org/647950)
+	rm -f "${S}"/opt/kingsoft/wps-office/office6/libQtWebKit* || die
+}
+
+src_install() {
+	exeinto /usr/bin
+	exeopts -m0755
+	doexe "${S}"/usr/bin/wps
+	doexe "${S}"/usr/bin/wpp
+	doexe "${S}"/usr/bin/et
+
+	if ! use sharedfonts; then
+		insinto /opt/kingsoft/wps-office/office6/fonts
+		doins -r "${S}"/usr/share/fonts/wps-office/*
+		rm -rf "${S}"/usr/share/fonts || die
+	fi
+
+	insinto /usr
+	doins -r "${S}"/usr/share
+
+	insinto /
+	doins -r "${S}"/opt
+	fperms 0755 /opt/kingsoft/wps-office/office6/{wps,wpp,et}
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use sharedfonts && font_pkg_postinst
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}