gentoo resync : 29.08.2018

22 files changed, 199 insertions, 527 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 212397d784d4..8f05ea021cc2 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calcurse/Manifest b/app-office/calcurse/Manifest
index 53a09b6fcb62..b46867655e86 100644
--- a/app-office/calcurse/Manifest
+++ b/app-office/calcurse/Manifest
@@ -1,4 +1,5 @@
 AUX calcurse-4.2.1-tinfo.patch 644 BLAKE2B e304953d56dc8891138e909f0b7b31b85b89a16800a1e8efc64a199cb884b730c3123f902ffe2095d392c41cbf0f65b88d440fff2133816b2763ea74a5e44770 SHA512 099ead1b288717e9d9eff331c2fbb9ff8deb19b1843109549ebdab30e8e59cc9cbb01a89c87e84e9283003ce70fc595e2305936a8a0918b0996b5fab1854cb5f
 DIST calcurse-4.3.0.tar.gz 597490 BLAKE2B 7fe31fc09cae12438173d4846a1e4b0a55f9e9416ab23ffc8b78e9d0f621072d8aca96b4161d5659db088e1007f685228e9669aae2d5606939c6564252826e1d SHA512 d948354b512d406f4915ce37107d3f529031e7698d7b38465913ff37120a93283e01f09f5267ebb19bf39ea133d6fac579b218d6dfd6056003b6222f9038f4b3
-EBUILD calcurse-4.3.0.ebuild 700 BLAKE2B b39cb1fb7507d34fdd3aca5255d27f803e30ecbac408f293c28889106a829674f30088881d4bf39ccef25bb1e6b86c60eca492138a2e872363cf35c898d74ed2 SHA512 8a68cdbee97c475c7813677824c9d04a76d4d62ae7a54532d496c3a413b282dfd84607516801bdbddad65efa653131158e8ede34ecd824ef9e40e8b94ebdd5fc
+EBUILD calcurse-4.3.0-r1.ebuild 726 BLAKE2B a522325fc6057acc2c2c01fef1b992501ca13e923b516c9be5b8b6c2383298203ad687710f13c7a59584076a71e749aeff0482c509913e729551d296a6997241 SHA512 5686ad29e383eae83ce90b192604a0c4fb8020a04ded6ac551db7808a94fd46eef043ab385662ba469025ec7573a62b00d296cdbdf4066344e678ede01cce2e1
+EBUILD calcurse-4.3.0.ebuild 722 BLAKE2B eccdcacd26dbea4eb246ea151e0a0fd7a559f728d1d308ac272ee3d4225b25fbfcbc36cdb149620698d8a6cf8caec3fd5596fd8eb2a9f99f0883da3e09e79cf3 SHA512 831dc644c55537a7e93d457fdd49bd34832cf513bda717ed79aaa4ffd87d2b88ef2767d193e42dfdc0eb2f7340550d843e070b3001f00fd9506abac2ea4aa77b
 MISC metadata.xml 593 BLAKE2B 313dee286f4f73406dc3a9a00c8bb59df524df4ac3ced089fea16522d22d99580972c1e52822df1d4c7b527b3c48dce3b825d662458e6194343ec66f2024f73b SHA512 41f0c2a630723427fb5f4033b928c1dc0e4c7bd08f301240458129b08e9baab02141e214b73a393a8c7af58ef1b6f785f701407e111a49b825e5006078caa9a8
diff --git a/app-office/calcurse/calcurse-4.3.0-r1.ebuild b/app-office/calcurse/calcurse-4.3.0-r1.ebuild
new file mode 100644
index 000000000000..451271ee693f
--- /dev/null
+++ b/app-office/calcurse/calcurse-4.3.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="a text-based calendar and scheduling application"
+HOMEPAGE="https://calcurse.org/"
+SRC_URI="https://calcurse.org/files/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+
+RDEPEND="
+	dev-python/httplib2
+	sys-libs/ncurses:0="
+
+DEPEND="
+	${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.1-tinfo.patch
+)
+
+# Most tests fail.
+RESTRICT="test"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+}
+
+src_install() {
+	multilib-minimal_src_install
+}
diff --git a/app-office/calcurse/calcurse-4.3.0.ebuild b/app-office/calcurse/calcurse-4.3.0.ebuild
index e772e98c93f2..b8c051f79ba0 100644
--- a/app-office/calcurse/calcurse-4.3.0.ebuild
+++ b/app-office/calcurse/calcurse-4.3.0.ebuild
@@ -14,10 +14,12 @@ SLOT="0"
 KEYWORDS="amd64 x86 ppc ppc64"
 
 RDEPEND="
+	dev-python/httplib2
 	sys-libs/ncurses:0="
 
 DEPEND="
 	${RDEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.1-tinfo.patch
 )
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 4add610fe69f..dbb98ee06016 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,16 +1,10 @@
 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
+AUX gnucash-3.2-no-gui.patch 440 BLAKE2B 223d9527e0f290e73774b39ee25dae2c1740d4ed8b340d5d8cdfde74734ae30ebc391ca4ef8df6b162dd53cfd1b5ae3c7d5cd64446978a86969bb5fcc9ea6440 SHA512 628d38969abd7475f88ed9013d99691768abd11a751205092e04b92183551e0dce2e32f1212f66fde47e83730e1d26addbc47d990478e8a8968f9c9f0bc041bd
 DIST gnucash-2.7.4.tar.bz2 13364512 BLAKE2B 0a552efe5a4f024517c054516eb25b51abb2f934e6fc904afd4b0fb48283f9ebb89583b83b0efefba66d014df16c8997c413d05278d4290c44e4fa2278564b61 SHA512 d096ec2a3907dcd09c936f0a49ef6fb5028a17d2e0ade9e68eae7303530480ce19e08c1864efd862d363fda9ef6343260396b794b3c4ac74544baa2628a310eb
-DIST gnucash-2.7.5.tar.bz2 13330271 BLAKE2B e06328050a2dd8e80e224cf13f51c1c7151e73f9a1c9f14581f33bfcf8bf07b273962620b7281637101eab8c5eff67a3e5e8e34d81f0c8d263ac33bf6d1eb40c SHA512 68cd6e6f61a43b8837e9efe693d22f62ebe10a8bb7d593814fb6a12d035d74ec1e444f53010ad53c6b1adf28c75aa482403c06052314a91636c2a8baa30e09af
-DIST gnucash-2.7.7.tar.bz2 13368946 BLAKE2B 06e6815af713235ea31859532911303db4fa5e8dcd50b9111aa513795963eaca29a612eeced27399441f43563753d977468dfd901a49dfa689b5d36e7b985ebf SHA512 b7d91e87c4bc4e604560f4502a86deaafa4f636e9fe2af26db53b11da9f48986c970ba0ed08cb7172ca08a5fb2da451d26976963241206c388a33555c80f28fe
-DIST gnucash-3.0.tar.bz2 13366724 BLAKE2B 4c6e87d433f203cca73f1b4ee623a4bb260bdd6812aaf24af0045384cbe8fc24cc5215b4a4bbe4f7446bfd4626ef7cf09f67f2031f49c2563784528294aae8fb SHA512 5ec13b8abe1520a7e614ceeca4c41d5dba3ebae4ec965918584963022ceb5cb3b85862289a85a72767db74a0c735214a78342a53c37e6da939ff850538174a87
-DIST gnucash-3.1-1.tar.bz2 13374530 BLAKE2B 51dcdea6b91a72288a9e9583d50edbe88303b93fe0059ea3444a0965723bb29955227df5e6eda910638f28a3eacdf367fdca1783871258b8ce396598e2b5edc0 SHA512 34d675cf1434f280345c40e6f448b3c2ac5b3cde33b15e662bbda784660ad92168e4b0d14d4fbf190cdfa6a7954806520ab4b72a7460736c78f934f803b1d5e0
 DIST gnucash-3.2.tar.bz2 13383942 BLAKE2B ce4beb9eab290bbc85c4b3bf68b205a8ebb274056bf10ef1721bce48ec18e4df4b488ce885dc767b4f1e951dabcdc2ba702cb5fe239f249ec50c8d2d1d12a434 SHA512 ef74cbf396096a71316e14500a5b4e57670f9e9c0c5d46f3afe051ccbae2e46a5f14edd8dd805dfb61276b934db286d48ae044160699df82689e2718ed2f7573
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD gnucash-2.7.4-r1.ebuild 3952 BLAKE2B 011a368e9bf441c05aaaf3681ed666151ad7a68fb849c2ceca50079f47b91265f9ef10b2cf10367393f3df5243bd59e76c7a2362c3ff498c855058412112c977 SHA512 9cdf9f7b57fa0eda3d5d3d154b194bb869fc360fdac5049e327eedb9b27d91a2e4022a3388d1c372a6d84f337c7d1be96722603e05ac4028073e6a9b7baaadc2
-EBUILD gnucash-2.7.5.ebuild 3922 BLAKE2B 072fd6a6232473c97276a2a1b1988b8f3f69b6c9de963c2429150e39a444b3035e5b33fb4417bf9cea906487165bd54bcab3dd3332d429c33c411edde499cb1c SHA512 1a57b87c6c4d894e1ca4a3948916b613756e6797b1c0eafff0dea3ba380c7c28dbd53d849eae08f80522496ed710e9578ad3c48ca69a1b4f5b349abefc4a588c
-EBUILD gnucash-2.7.7-r1.ebuild 3938 BLAKE2B caeec758f850e9bf89d6baad7e2884cf9fefa3892dbaf0dbab63be92d28664dcac46122a3f5a00bcee2b7a88cd788e611e8823da3dcc5a3ee12cf066fce2da52 SHA512 0025632752b6f45f7ec5259560ff9b7998bb8247be8ead416db1c281efded6da014770b23718e067cf54e7044537b7cbf6343d8c016ef6e1230041ea0cf123cb
-EBUILD gnucash-3.0.ebuild 3858 BLAKE2B cb09a0493a8a78237459c20d6ebd38428e20a78821a766fd247f78ab6b4a65f89dc963029fdb6259bd102de3ab3179b6cc07957129cdd01e77661f0907538973 SHA512 4f5a2c4db41525605a82da65ed0231aa90b2802b69b14667c95fbc79d289e7ab31e4a8e7596bd5ae1aa270100e7a7b72b98a2a20b3f137c8ceaaafdd5c015a93
-EBUILD gnucash-3.1.ebuild 3890 BLAKE2B 9f198bce0f8bd6deae017ae8db836d09546c8ae091b80d843e59f2fb5cd898151cdcb3fb36d99bb41e6f5fe3fdfebf1f3e6c452fcc1eac8ad82c6106409b73de SHA512 4d233e8daad07eefaed440d55cc01fdc507e6d7bdfbb8e437e8fd6251455ea5223e9315efa9bd4db7a83fc6ad862e193e296facf3c1ea7a312496b3b252e26aa
+EBUILD gnucash-3.2-r1.ebuild 4034 BLAKE2B d18757f5fbdefb5a59535c5607ef49a2f821d39b56c8d17f584b8d342537a81206dab17c610935cbd8a70e58ede4bb1e334537e214302e75bf22c6f9d8dec19c SHA512 59456bc40b78511c5fd66903dad2a4a96b3a693d22866994cb3966c3d7024f0b9df581278282a547f9bbad32c9faacd56cb33cd4c789029e5757088924681335
 EBUILD gnucash-3.2.ebuild 3888 BLAKE2B 7c7f0231e94ea7c430c2007968e70cd69c74dbb804f4b8e9858eafffc29e05ad8e2a1528b902294c75115161466ae2558e1149fc8c98a2376bf3f609e742e794 SHA512 b767881302588a21edc469ca1ed91a47a4560a756e099914c23a5907c78b1b9cd615831c3024c1c6f00a4c444b7c1c03d7417e1b9d90aa967c2196ab09d22b06
-MISC metadata.xml 766 BLAKE2B 8da7802829c98dfc8a219d6ad339081af2ed5506668e0331ce944e61a69eb7c9bfb5ac2b7a27616cf2b59081aee348654774937336b5540bab8f2333c1d577c5 SHA512 5e64d4d0a7e9570bb12793d983852deacf8a94a79a153c18e490109d68f1275f82dc584d0bda4b5e3df119660cba90c7c03852ee046a7c7a29626c05cdea6784
+MISC metadata.xml 877 BLAKE2B 0fcba4a83ba82aa6634bc2e3d71da766f2890340e827ba478157fae994456daaecd12722991626069e04086d670a77f156e378a5b0d7b8ee35717561ca944a03 SHA512 1654790fbffc4ec76fc9520221877ad7eaa8fc774f4a05e9e250e44c0fb989081bafcacb018c8d2f6a4787d1794672a87e09c1687919b544a8f1fb36bb449bdc
diff --git a/app-office/gnucash/files/gnucash-3.2-no-gui.patch b/app-office/gnucash/files/gnucash-3.2-no-gui.patch
new file mode 100644
index 000000000000..896aafd17f15
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-3.2-no-gui.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5e10a09..cdbdb7a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -770,7 +770,9 @@ set(SCHEME_INSTALLED_CACHE_DIR ${PKGLIBDIR}/scm/ccache/${GUILE_EFFECTIVE_VERSION
+ # The subdirectories
+ add_subdirectory (borrowed)
+ add_subdirectory (data)
++if (WITH_GNUCASH)
+ add_subdirectory (doc)
++endif (WITH_GNUCASH)
+ add_subdirectory (po)
+ add_subdirectory (common)
+ add_subdirectory (libgnucash)
diff --git a/app-office/gnucash/gnucash-2.7.5.ebuild b/app-office/gnucash/gnucash-2.7.5.ebuild
deleted file mode 100644
index 5b65c36fec6c..000000000000
--- a/app-office/gnucash/gnucash-2.7.5.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# google{test,mock} version
-GV="1.8.0"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-		 https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
-
-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 examples 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-${GV}
-	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
-# )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.7.4-fix-tests-for-32bit-platforms.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
-		-DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
-
-		-DDISABLE_NLS=$(usex !nls)
-		-DENABLE_REGISTER2=$(usex register2)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-	)
-
-	cmake-utils_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
-	XDG_DATA_HOME="${T}/$(whoami)" emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
-	rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
-
-	if use examples ; then
-		mv "${ED%/}"/usr/share/doc/gnucash \
-		   "${ED%/}"/usr/share/doc/${PF}/examples || die
-		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
-		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
-		   *win32-bin.txt || die
-		popd > /dev/null || die
-		docompress -x /usr/share/doc/${PF}/examples/
-	else
-		rm -r "${ED%/}"/usr/share/doc/gnucash || die
-	fi
-
-	use aqbanking && dodoc doc/README.HBCI
-	use ofx && dodoc doc/README.OFX
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	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."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/gnucash/gnucash-2.7.7-r1.ebuild b/app-office/gnucash/gnucash-2.7.7-r1.ebuild
deleted file mode 100644
index 5b5dde99e048..000000000000
--- a/app-office/gnucash/gnucash-2.7.7-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# google{test,mock} version
-GV="1.8.0"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-		 https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
-
-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 examples 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-${GV}
-	>=sys-devel/gettext-0.19.6
-	dev-lang/perl
-	dev-perl/XML-Parser
-	gnome-base/gnome-common
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-# Uncomment for 3.0
-# PDEPEND="doc? (
-# 	~app-doc/gnucash-docs-${PV}
-# 	gnome-extra/yelp
-# )"
-
-#PATCHES=( "${FILESDIR}"/${PN}-2.7.4-fix-tests-for-32bit-platforms.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
-		-DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
-
-		-DDISABLE_NLS=$(usex !nls)
-		-DENABLE_REGISTER2=$(usex register2)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-	)
-
-	cmake-utils_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
-	XDG_DATA_HOME="${T}/$(whoami)" emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
-	rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
-
-	if use examples ; then
-		mv "${ED%/}"/usr/share/doc/gnucash \
-		   "${ED%/}"/usr/share/doc/${PF}/examples || die
-		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
-		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
-		   *win32-bin.txt || die
-		popd > /dev/null || die
-		docompress -x /usr/share/doc/${PF}/examples/
-	else
-		rm -r "${ED%/}"/usr/share/doc/gnucash || die
-	fi
-
-	use aqbanking && dodoc doc/README.HBCI
-	use ofx && dodoc doc/README.OFX
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	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."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/gnucash/gnucash-3.0.ebuild b/app-office/gnucash/gnucash-3.0.ebuild
deleted file mode 100644
index bc347e50c6fb..000000000000
--- a/app-office/gnucash/gnucash-3.0.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# google{test,mock} version
-GV="1.8.0"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-		 https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="aqbanking chipcard debug doc examples 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-${GV}
-	>=sys-devel/gettext-0.19.6
-	dev-lang/perl
-	dev-perl/XML-Parser
-	gnome-base/gnome-common
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-PDEPEND="doc? (
-	~app-doc/gnucash-docs-${PV}
-	gnome-extra/yelp
-)"
-
-#PATCHES=( "${FILESDIR}"/${PN}-2.7.4-fix-tests-for-32bit-platforms.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
-		-DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
-
-		-DDISABLE_NLS=$(usex !nls)
-		-DENABLE_REGISTER2=$(usex register2)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-	)
-
-	cmake-utils_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
-	XDG_DATA_HOME="${T}/$(whoami)" emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
-	rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
-
-	if use examples ; then
-		mv "${ED%/}"/usr/share/doc/gnucash \
-		   "${ED%/}"/usr/share/doc/${PF}/examples || die
-		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
-		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
-		   *win32-bin.txt || die
-		popd > /dev/null || die
-		docompress -x /usr/share/doc/${PF}/examples/
-	else
-		rm -r "${ED%/}"/usr/share/doc/gnucash || die
-	fi
-
-	use aqbanking && dodoc doc/README.HBCI
-	use ofx && dodoc doc/README.OFX
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	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."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/gnucash/gnucash-3.1.ebuild b/app-office/gnucash/gnucash-3.2-r1.ebuild
index d75f0e734e36..64b817987f96 100644
--- a/app-office/gnucash/gnucash-3.1.ebuild
+++ b/app-office/gnucash/gnucash-3.2-r1.ebuild
@@ -11,7 +11,7 @@ inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="A personal finance manager"
 HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}-1.tar.bz2
+SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2
 		 https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
 
 SLOT="0"
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 IUSE="aqbanking chipcard debug doc examples gnome-keyring mysql nls ofx postgres
-	  python quotes -register2 sqlite"
+	  python quotes -register2 sqlite +gui"
 REQUIRED_USE="
 	chipcard? ( aqbanking )
 	python? ( ${PYTHON_REQUIRED_USE} )"
@@ -30,14 +30,16 @@ REQUIRED_USE="
 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-scheme/guile-2.0.0:12=[regex]
+	gui? (
+	  gnome-base/dconf
+	  net-libs/webkit-gtk: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]
@@ -70,7 +72,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.19.6
 	dev-lang/perl
 	dev-perl/XML-Parser
-	gnome-base/gnome-common
+	gui? ( gnome-base/gnome-common )
 	sys-devel/libtool
 	virtual/pkgconfig
 "
@@ -80,13 +82,16 @@ PDEPEND="doc? (
 	gnome-extra/yelp
 )"
 
-#PATCHES=( "${FILESDIR}"/${PN}-2.7.4-fix-tests-for-32bit-platforms.patch )
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 	xdg_environment_reset
 }
 
+src_prepare() {
+	use gui || eapply "${FILESDIR}"/${PN}-3.2-no-gui.patch
+	default
+}
+
 src_configure() {
 	local sql_on_off="OFF"
 	if use mysql || use postgres || use sqlite ; then
@@ -103,6 +108,7 @@ src_configure() {
 		-DWITH_OFX=$(usex ofx)
 		-DWITH_PYTHON=$(usex python)
 		-DWITH_SQL=${sql_on_off}
+		-DWITH_GNUCASH=$(usex gui)
 	)
 
 	cmake-utils_src_configure
@@ -122,7 +128,10 @@ src_install() {
 	cmake-utils_src_install
 
 	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
-	rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
+
+	if use gui ; then
+	  rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
+	fi
 
 	if use examples ; then
 		mv "${ED%/}"/usr/share/doc/gnucash \
@@ -141,8 +150,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
+	if use gui ; then
+		gnome2_icon_cache_update
+		gnome2_schemas_update
+	fi
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 
@@ -153,8 +164,10 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
+	if use gui ; then
+		gnome2_icon_cache_update
+		gnome2_schemas_update
+	fi
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 }
diff --git a/app-office/gnucash/metadata.xml b/app-office/gnucash/metadata.xml
index f0b8ab6233e1..3ce301801507 100644
--- a/app-office/gnucash/metadata.xml
+++ b/app-office/gnucash/metadata.xml
@@ -16,6 +16,10 @@
 		<flag name="chipcard">
 			Enable support for chipcard reading and processing.
 		</flag>
+		<flag name="gui">
+			Enable graphic interface (needs net-libs/webkit-gtk:4
+			and x11-libs/gtk+:3)
+		</flag>
 		<flag name="quotes">Enable Online Stock Quote retrieval</flag>
 		<flag name="register2">Use the new register (Experimental)</flag>
 	</use>
diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
index 2f38d3f76a5a..53d56da2c652 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -4,6 +4,6 @@ AUX ledger-3.1.1-r1-boost-python.patch 368 BLAKE2B c9a07bfdf02908bab8f20ebc9da5d
 DIST de1b48a013b6f4bdf68f7edf333db63a0994ef20.patch 4533 BLAKE2B 39a2ef3b9e6a8e495837376c8a36c9276fbf58bd4ff45a07926e71ca40d65ddb5761e107752247fa2986e63d454e6461bdf0a3bc7bc773db97dcd3027091a841 SHA512 019c862fecb3f3a0682c2f1237ecebec40eafae0b38d6b5d8e56f9829155353569f889dac468ff5b1b2e23f15ae9fe538a0b027f628776f27ea818c12fd1d0b2
 DIST ledger-3.1.1.tar.gz 842364 BLAKE2B 83f9008f6daf4da39ece192388e0231719bc7297d2a911f1209662f57d2963b9ea09a5b6de9450ed29c5973efa47d9d6a250e052c155d9ba742cdb3ee075f341 SHA512 3f81b98a414cdfc0e272de4e958770149fb1acc8bda880d270e1459ce35294a220c52820bb9af49a751ac3a80b878f81fc7799ba41e0a1be43eba72081351bf5
 EBUILD ledger-3.1.1-r1.ebuild 2636 BLAKE2B 79c1885af47d053f0a0a5e8f86bc87f7e457095209079ab0bf88d167cb6c9659810b26e3ec14c269e09e309ff3476dcaaf8b3ebef2bc0f49e4c3227748d03112 SHA512 fa6103bb7636ab421c7e805261841d02e1c930fe2a180e7671b87d2d886b289b7d83057d8bd1323e4f3c67ec39bf2fcf1c56d6a0c72ddf4fc15d5c9ff1d5594e
-EBUILD ledger-3.1.1-r2.ebuild 2833 BLAKE2B 07e4ee049ad23f015fc3cac768a8baaed11d8e62bf8e59f6e5926a3c96a7a63d647fbc40fd9539ba4adf49bdab29f9b09703a92f532c8e22694f771f4c1a33cb SHA512 880e91a0bbd05168606f1a87b66ca13bbee9ed86b345bdcd8ed15666016530d410da760d47203a33d900422313bfb5ff97ce53d5fc2a61686f791e089115458f
+EBUILD ledger-3.1.1-r2.ebuild 2831 BLAKE2B 35814c1235e99aaae2a083d95c20a2c97d313d515bcc5fee4a7e3d1ba6b609984f7b1ac1ad3cab41fe01b296cbc93fd7d420ccff6fcf0f4d1bde27d2668f6f54 SHA512 2fea320b118e57575526f83e3f436c4fce0c78e3f73def2e9ea75adf2e692fdd027d97ae5aea014cd3b73e99e389f53931ec9c9dda8fdad81b39f25367ebe9fc
 EBUILD ledger-3.1.1.ebuild 3207 BLAKE2B 7a6764868596f6ba5d807a06abb17123a86ecca02e977d5c5f983b41176f6f5a48947acb0e2084459f44615cb52efe5b0669f1304e7bdc7ec7e86a335fd2efb1 SHA512 d8543a0877eb080b97c01eb5306ad2967dab2cf5d522875cc03d07d4b6f899aaa01cb0333e5e0aaba8341939e09207a4f19acfa62c1ea0c1c67d6afd9b413fde
 MISC metadata.xml 306 BLAKE2B 58c3d0307a4358f50e8ede8ddf3f598a55ad03dd9af3351b4f15a46465a844c24f9d5966ee5fbbcb9a68d65eb509a18a87aa95400094539475f65493e34f1839 SHA512 c83b1be9474bbfa3296040c56bf14e22afd214835a44907bcb4db2a8047f05e1fe49b1d1ebe5bcd72fe5ed2f27c832d20169aa813f0d9bd619fc1f7a1c5e15cb
diff --git a/app-office/ledger/ledger-3.1.1-r2.ebuild b/app-office/ledger/ledger-3.1.1-r2.ebuild
index 241adb83c964..48b69eb0fcda 100644
--- a/app-office/ledger/ledger-3.1.1-r2.ebuild
+++ b/app-office/ledger/ledger-3.1.1-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.ledger-cli.org/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		 https://github.com/ledger/ledger/commit/de1b48a013b6f4bdf68f7edf333db63a0994ef20.patch"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE="debug doc emacs python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index d1127e778389..3faf87d7b15a 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,6 +20,6 @@ DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3a
 DIST libreoffice-help-6.0.6.2.tar.xz 2972748 BLAKE2B 38534d5fd08751af587fd5b5be03b39b086e2bc26878c50e98bafd7a2b48f517ac29b8d434748449b0a3e8a451c31f40255094d64965800aadfd94c111295be5 SHA512 89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13
 EBUILD libreoffice-6.0.3.2.ebuild 16953 BLAKE2B 9b17913bb18d607ac0141226e54199b1d48c5f88a66d9ba8a6bb40459e35c1301a57c0b111a23f12e03daba9e9e6b850e874d64e4d2a37bba809dbff24201eb8 SHA512 acd68e679413031897fe17a27b1da7c688522ca4e773174be5ab1595c588b62e0969f72fa758f1548d9adce54cca151ecd5edfee1193dcf568ec5fc4b8265a22
 EBUILD libreoffice-6.0.6.2.ebuild 16750 BLAKE2B 7ea6bb2645ee81c15ed71d5353d15507ba5c29d05758de31af8528897f251880f08e08dad979c43d27a9199429c182ec618a038f772e5827106b824343e31948 SHA512 d7dafe868dfb5a59199f71090bc05cb6402aa247ee309e5fa199dcd00d2c44f57a5ddfc6e97f7f851c457d0fe7fb0d8033795b58ae626ff2c616dbbeb0c13e64
-EBUILD libreoffice-6.1.9999.ebuild 16533 BLAKE2B ac11c68340706f89e7e25dee5fb2e6ad2f1301c20ebc7883892fa78ba997225c48121ba4882eb2dc12399281dea013c024e6fd713ef84ee04da82069ee2aab4d SHA512 a370fafd44229c2df400754b53f261f3fc3388adf96bf8b2c1d6e408e7fe8a695487921e78621311f87506732841569c0e63161ae4f4d8ed8af4b95f941f5be7
-EBUILD libreoffice-9999.ebuild 16527 BLAKE2B 7941f76ce5f0030d1995394cf9bbcec24e4bbf70688dcd43d88cb13e3673dc4b627da06c256748c0adfda4508a0b669acf167c688f6041c230409a3d5673ff11 SHA512 a196eacab025ce720c58ec95d70a6337913916b660db670afb5a16a5427abf235cbf60747a7036c24b3ab5fbf70a412df71433f0ae7e4d7b23a901aec0f60fb2
+EBUILD libreoffice-6.1.9999.ebuild 16517 BLAKE2B 82b9cf3fad314a2a9099678beeeaf32b8cc10dd435161e072eafe75f5f804664c6f886da1cd3f5b5e2b143321bf5f1d66b239c1844988f3ce7f5c3a6f1c80058 SHA512 343504186ab1d951f6096b370910120b80d6dd8d329551763cdfd1762e3d0aed9aa83f42274a5c80317b7c0cc1792770563cd7cc06a547295c768ab23c1dfd80
+EBUILD libreoffice-9999.ebuild 16604 BLAKE2B df09b1b62b6dabdcbfaffbac81d5d27a3b53a18e88703bb1a2a4950a1a77f2856153f302499349fba8fe63150357e056275a6f3f694ce4acbbdcfbf40aa595cb SHA512 aa24bbb10b5d879a011b6924bdb2e21ae86fec3991a83dfcbfa00e200b75ba7b01e245bbc9c73854cdb2808c4c6036196efb925f2f619891058a809117261968
 MISC metadata.xml 1090 BLAKE2B b30fc707317ea0601859f327540712eae38a9fc7365675501fca648e17e2ee3b35c2391e76dc7878b53e5216ca4eb2618595fbac2e07d8680f8daeaa67aaeeeb SHA512 4ffa1f2d605bc5666e25ce126d3264f9ed272ae1b12b9dd17ae366462d58de4a64767ee63928b233c21a15a77b549eb5c574064e73164cb20b0adb6ce12a9ec2
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index 46abef27e981..11cbcd4c3e81 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -398,9 +398,11 @@ src_configure() {
 		--disable-epm
 		--disable-fetch-external
 		--disable-gstreamer-0-10
+		--disable-kde5
 		--disable-online-update
 		--disable-openssl
 		--disable-pdfium
+		--disable-qt5
 		--disable-report-builder
 		--with-alloc=system
 		--with-build-version="Gentoo official package"
@@ -432,8 +434,6 @@ src_configure() {
 		$(use_enable gtk gtk3)
 		$(use_enable gtk2 gtk)
 		$(use_enable kde gtk3-kde5)
-		$(use_enable kde kde5)
-		$(use_enable kde qt5)
 		$(use_enable mysql ext-mariadb-connector)
 		$(use_enable odk)
 		$(use_enable pdfimport)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 8654bb522fb3..fa678928f90a 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -69,7 +69,6 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	bluetooth? ( dbus )
-	kde? ( gtk )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
@@ -120,6 +119,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/nss
 	>=dev-libs/redland-1.0.16
 	>=dev-libs/xmlsec-1.2.24[nss]
+	media-gfx/fontforge
 	media-gfx/graphite2
 	media-libs/fontconfig
 	media-libs/freetype:2
@@ -222,7 +222,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/cppunit-1.14.0
 	>=dev-util/gperf-3
 	dev-util/intltool
-	>=dev-util/mdds-1.2.3:1=
+	>=dev-util/mdds-1.4.1:1=
 	media-libs/glm
 	sys-devel/bison
 	sys-devel/flex
@@ -388,6 +388,7 @@ src_configure() {
 		--with-system-headers
 		--with-system-jars
 		--with-system-libs
+		--enable-build-opensymbol
 		--enable-cairo-canvas
 		--enable-largefile
 		--enable-mergelibs
@@ -433,7 +434,6 @@ src_configure() {
 		$(use_enable gstreamer gstreamer-1-0)
 		$(use_enable gtk gtk3)
 		$(use_enable gtk2 gtk)
-		$(use_enable kde gtk3-kde5)
 		$(use_enable kde kde5)
 		$(use_enable kde qt5)
 		$(use_enable mysql ext-mariadb-connector)
@@ -449,6 +449,10 @@ src_configure() {
 		$(use_with odk doxygen)
 	)
 
+	if use gtk && use kde; then
+		myeconfargs+=( --enable-gtk3-kde5 )
+	fi
+
 	if use eds || use gtk; then
 		myeconfargs+=( --enable-dconf --enable-gio )
 	else
diff --git a/app-office/orage/Manifest b/app-office/orage/Manifest
index 33c4a7253bc3..f812b96eeb44 100644
--- a/app-office/orage/Manifest
+++ b/app-office/orage/Manifest
@@ -1,3 +1,4 @@
+AUX 0001-fix-build-with-libical-version-3.patch 2947 BLAKE2B 240a87ca1ca6d383a7a31724a1dc32dc4266210d883fc0e3d327238451b70abf2f6b51f05a0b4c8b167ebad3a200759b1f9c133e20eddc68310fa79b5dfbac39 SHA512 4f46c99ee3354861d2dca34b9a87bdacc8cd9ad0ad935a364b45b850c08b461c32550bb4df185b66c3963c12f8171ba700c46c263baf92ded8eabc2476bb8cc0
 DIST orage-4.12.1.tar.bz2 2590788 BLAKE2B 0f00b5704e11923c2ceaac81f0956457402a90f65709c165c98b6942745ea3adee176691555a18548ead258951693187e1b3ce9a718abb3b13c2a1c2a4754e7e SHA512 3fec0201171140586cdc9bcf151450a7086515e18b5815afe4fe4c4726ba554c50582b0479e52985b330140c51b7233ef81f678f986f848afbeee74c66b2d196
-EBUILD orage-4.12.1-r1.ebuild 1551 BLAKE2B 7b68711f09b5263f72248ea59a11616f61c9e188fb3105ca7c3ffa54f6e88abdc5d6e235175cba3f8130d9ae4431d5a2a286da77c90fd574cde7f0b44ddce12a SHA512 83e6b2110405c82c3c72389563f9180e26646c9d91b8d82383cf9fed91acc90ca005658c00be8283bcdc5d2dcd5a4ab93eb31182defda79b82d553e8ef3ea773
+EBUILD orage-4.12.1-r1.ebuild 1623 BLAKE2B e88df94b15e5f1967980f6c219a6db9cc27997ea84e0d77a2ed2d77fe268300662d2c5942261254aa3f5ca60abf109cff5c0230a3262f64a709a3e6a9571c17a SHA512 084f907144c044ef03d2bf8e955316cbc240f3b3979f763074f0d9855aec3da6e789e7573a6a8583156d7062c17a685747608b402bcee1a8637a98ae37178d75
 MISC metadata.xml 355 BLAKE2B 4ddbf38a80be81b7e131d7c616dfb88dff1e900952c17c4cc4dd26711e720351177d92d8225825dd57354399ecdb8b7bccd18f883fcd927846e8614dd4ac4a99 SHA512 a5d3f875ac31caa10ca77ce8eb38449b3007094d1b9d7d307bd15ee29644c09530d44ac6a4953e10adfa3bd45b6a3fe44dbbb3b80ab7d0c8572c48523ef287eb
diff --git a/app-office/orage/files/0001-fix-build-with-libical-version-3.patch b/app-office/orage/files/0001-fix-build-with-libical-version-3.patch
new file mode 100644
index 000000000000..ad57fd3cbc91
--- /dev/null
+++ b/app-office/orage/files/0001-fix-build-with-libical-version-3.patch
@@ -0,0 +1,76 @@
+From 58e4bb4d3b982876dec33d55003d591559439598 Mon Sep 17 00:00:00 2001
+From: Stefan Seyfried <seife+dev@b1-systems.com>
+Date: Sat, 3 Mar 2018 20:25:24 +0100
+Subject: [PATCH] fix build with libical version 3
+
+---
+ src/ical-code.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/ical-code.c b/src/ical-code.c
+index d5831404..c40042c3 100644
+--- a/src/ical-code.c
++++ b/src/ical-code.c
+@@ -2579,7 +2579,9 @@ static struct icaltimetype count_first_alarm_time(xfical_period per
+  * when counting alarm time. */
+         if (rel == ICAL_RELATED_START) {
+             per.stime.is_date       = 0;
++#if ICAL_MAJOR_VERSION < 3
+             per.stime.is_utc        = 1;
++#endif
+             per.stime.is_daylight   = 0;
+             per.stime.zone          = utc_icaltimezone;
+             per.stime.hour          = 0;
+@@ -2588,7 +2590,9 @@ static struct icaltimetype count_first_alarm_time(xfical_period per
+         }
+         else {
+             per.etime.is_date       = 0;
++#if ICAL_MAJOR_VERSION < 3
+             per.etime.is_utc        = 1;
++#endif
+             per.etime.is_daylight   = 0;
+             per.etime.zone          = utc_icaltimezone;
+             per.etime.hour          = 0;
+@@ -2613,7 +2617,9 @@ static struct icaltimetype count_next_alarm_time(struct icaltimetype start_time
+ /* HACK: convert to UTC time so that we can use time arithmetic
+  * when counting alarm time. */
+         start_time.is_date       = 0;
++#if ICAL_MAJOR_VERSION < 3
+         start_time.is_utc        = 1;
++#endif
+         start_time.is_daylight   = 0;
+         start_time.zone          = utc_icaltimezone;
+         start_time.hour          = 0;
+@@ -2768,7 +2774,9 @@ static alarm_struct *process_alarm_trigger(icalcomponent *c
+      */
+     if (icaltime_is_date(per.stime)) {
+         if (local_icaltimezone != utc_icaltimezone) {
++#if ICAL_MAJOR_VERSION < 3
+             next_alarm_time.is_utc        = 0;
++#endif
+             next_alarm_time.is_daylight   = 0;
+             next_alarm_time.zone          = local_icaltimezone;
+         }
+@@ -2850,7 +2858,9 @@ orage_message(120, P_N "Alarm rec loop next_start:%s next_alarm:%s per.stime:%s"
+          */
+         if (icaltime_is_date(per.stime)) {
+             if (local_icaltimezone != utc_icaltimezone) {
++#if ICAL_MAJOR_VERSION < 3
+                 next_alarm_time.is_utc        = 0;
++#endif
+                 next_alarm_time.is_daylight   = 0;
+                 next_alarm_time.zone          = local_icaltimezone;
+             }
+@@ -2944,7 +2954,9 @@ orage_message(120, P_N "*****After loop Alarm %s %s", icaltime_as_ical_string(ne
+          */
+         if (icaltime_is_date(per.stime)) {
+             if (local_icaltimezone != utc_icaltimezone) {
++#if ICAL_MAJOR_VERSION < 3
+                 next_alarm_time.is_utc        = 0;
++#endif
+                 next_alarm_time.is_daylight   = 0;
+                 next_alarm_time.zone          = local_icaltimezone;
+             }
+-- 
+2.16.2
+
diff --git a/app-office/orage/orage-4.12.1-r1.ebuild b/app-office/orage/orage-4.12.1-r1.ebuild
index afbcd0af7e23..9dcf63abcbc6 100644
--- a/app-office/orage/orage-4.12.1-r1.ebuild
+++ b/app-office/orage/orage-4.12.1-r1.ebuild
@@ -27,6 +27,10 @@ DEPEND="${RDEPEND}
 	>=sys-devel/libtool-2.2.6
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/0001-fix-build-with-libical-version-3.patch
+)
+
 src_configure() {
 	local myconf=(
 		--libexecdir="${EPREFIX}/usr/$(get_libdir)"
diff --git a/app-office/taskcoach/Manifest b/app-office/taskcoach/Manifest
index 760ecbeb8810..cc68cb85bf41 100644
--- a/app-office/taskcoach/Manifest
+++ b/app-office/taskcoach/Manifest
@@ -1,5 +1,5 @@
 AUX taskcoach-1.4.2-fix-desktop-file.patch 825 BLAKE2B ef63d5a14e93585afe401bfadf5dea06725f5680473f66cb08b718f59db26d0bbb85b339383fc2f0168e2c4d465b4d55b974bcc3e9984017adb1bace152222b9 SHA512 f34353c8d5b6142e4d5cba973b3d2f7bb7d76f7bd3384ffa6157f3b0bf1194d9071736f8a1b20526999c86602c6343461d16be4cb0466ef2597342ebbd2645f7
 AUX taskcoach-1.4.3-version-check.patch 771 BLAKE2B c11431b1cfa0aee1911e2478cc8abd2a5d0389f22b8046851530794f3d8ebe889e335897cb986a936106399fa784532a0bf668edcbe8974d2f0d8a1caf8b0ff2 SHA512 018a9c1b678e07d1f7433e28b631917c551da4e65a5544a4cc1b1824cbb14d7c207361c6c5844c30686852d2f295fc1b6dd15095a53f371b20ac1d183e45d2cc
 DIST TaskCoach-1.4.3.tar.gz 2927984 BLAKE2B 998a53fa53624bce8497423e68924962e2cec705b87cfab192a6c5869a915f0de9d5c4394a190d07a50220258e7165b6aaee18449b9b9643a37dd9d9838a6679 SHA512 ae449ae66d29ec884de680179853d5e39814a4e7b10d8e5ca2066f1c85fda328470852a10600e74ade1e4a52c5cdc8f749eceaf4f861f8852c2f47d654e9fc88
-EBUILD taskcoach-1.4.3-r1.ebuild 1121 BLAKE2B 5f802740b016e232935087d0e6c3d097de8f62a962b156857540f20c200aee3ed2f72fd99046f8d05fa4b56c5b03d7aa75509e87b468e5ae80986312f4e7dc3a SHA512 618df2afba937985777ed7bdd6d7551ea18a8d569c0b459a04acc7b3aed4ba0ecd5abd3aaa1a3b05105065cbfc69f7d4037cdf9532628cb397c9646a9487c14b
-MISC metadata.xml 218 BLAKE2B 64a90c0a72e8e847db60485df95369e48710f662fec60c4ab9bbba2eb0f37c58667fd7f7d44cda0ecd72aa9eb6708245e19a7e451e363c17e8d24b9a2f436867 SHA512 3d4294255ecceb5a75271241310a79460d28f3d12ecfbe97f7c11948a8da7be5ccbf38931506a1614cf8d1cd8af4495ab757d2167ce6dc18d2dda825d82645fa
+EBUILD taskcoach-1.4.3-r1.ebuild 1053 BLAKE2B 752810fb3ff54f24f4a8ffe4b05ff38708ca14868b4c426d7cf6008fc52431d5166e4fb93c067becfbdf75cc65ed112a61820fc26510915ded04f9fac4128813 SHA512 aa5534c4ee8fecf098d22ffe82dab224e5c88796eeff2e99632bc7ef9d383695afc9243afc24ec6950d44cff81f9a5cd20d425205d20a7fc537783634dd435a1
+MISC metadata.xml 246 BLAKE2B e58a269f220d8dc6a6aa3ebe77996fe79dc433b43f35347eaa5ca4fb7c95bc288a6a14ed1225b1435aae118f4b2467b48dff39dd500d4c0b2867cd368a687a6e SHA512 1b06a533acb63ad6314679db7cafaacf1ee60145fc45e717b06998182c8eee6c62eb553bb6fbcb380a241f038db4bbf89e8570a5a4e6278ed73d80b948a55eb1
diff --git a/app-office/taskcoach/metadata.xml b/app-office/taskcoach/metadata.xml
index d519527e0775..10caf0ae4d5c 100644
--- a/app-office/taskcoach/metadata.xml
+++ b/app-office/taskcoach/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">taskcoach</remote-id>
 	</upstream>
diff --git a/app-office/taskcoach/taskcoach-1.4.3-r1.ebuild b/app-office/taskcoach/taskcoach-1.4.3-r1.ebuild
index 09fb8d2f78a3..fc81b9f5eca0 100644
--- a/app-office/taskcoach/taskcoach-1.4.3-r1.ebuild
+++ b/app-office/taskcoach/taskcoach-1.4.3-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=5
@@ -19,14 +19,11 @@ KEYWORDS="amd64 x86"
 IUSE="libnotify"
 
 DEPEND="
+	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
 	|| (
-		>=dev-python/wxpython-2.8.9.2:2.8[${PYTHON_USEDEP}]
-		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+		>=dev-python/twisted-core-10.0
 	)
-		|| (
-			>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-			>=dev-python/twisted-core-10.0
-		)
 "
 RDEPEND="${DEPEND}
 	x11-libs/libXScrnSaver