gentoo resync : 06.08.2019

14 files changed, 185 insertions, 102 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index e381831db55d..7dd53bd07b97 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index a1835afc2ade..8edffe8c5a21 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -2,6 +2,6 @@ DIST gnumeric-1.12.39.tar.xz 20040688 BLAKE2B 5d99da20b567a939208881b962de3c79ab
 DIST gnumeric-1.12.43.tar.xz 18033636 BLAKE2B 32cbbefc10c0537b02b56564ed37f03d69d0865e9bd16dc8cb77aacf682087fce60f01a2e70b5dbef4d73840b6ccbe198d3c5cc5f13b0f1b2a48d0af635e607f SHA512 d2702000e6c4f4c0c7ff442a2b81e10f4d55f0cffbf7b7f1e7c9fed98fb46172b0118ca05102aa53fb4f953799e2be3534f0518b025ece26647ce67b870a34a7
 DIST gnumeric-1.12.44.tar.xz 18010384 BLAKE2B 0348714a7dae119b36a6739ea499bc0411416637fe9cbd703024f4cdcdb894e2d4b0da3212ea6e2ad1dd81f893c96341722c83ef014db7f0a6f2a048696f41c6 SHA512 ea21dcdf5fdf4e02bb9d83671675f2409f12ee928611604d7589e0047ce5d75bf6ac51e6a5322c4af520428acdccf4c2b3b8e3fc6530030e162268aea94a503f
 EBUILD gnumeric-1.12.39.ebuild 1478 BLAKE2B 09c3f7ef78dccdd75dd66a90ef4a03395ec99e622b18a8538f5b83a6161651d1195d357ad88233a38dd272c31541dbd30947804eaf9e72919505aeb95b4b215b SHA512 fbe626756b95c7e6dc7ae870390d7bda2448caec9056d7083dc66534603e6e16a0b8c69dde18e4727719c2c4aadb32d63f7a5aa848016d04c1f5586acb70a72f
-EBUILD gnumeric-1.12.43.ebuild 1832 BLAKE2B f2b87cce66479a727d60538aa28c1377e2ab9fcf963e7b026f0e5b6160bdda6c0656d0fdbb54a76a2932f392ae5d8c4539fdec3a1a6f12ce070638efe5b85652 SHA512 7e44d00c1410aef8aafccaeebeef439e697c8ade4758753743e6734bdadef3dccc9a293c9fa88aec517e36b1bd807ce064c3b52122076937a41572086f3a9d48
-EBUILD gnumeric-1.12.44.ebuild 1832 BLAKE2B f2b87cce66479a727d60538aa28c1377e2ab9fcf963e7b026f0e5b6160bdda6c0656d0fdbb54a76a2932f392ae5d8c4539fdec3a1a6f12ce070638efe5b85652 SHA512 7e44d00c1410aef8aafccaeebeef439e697c8ade4758753743e6734bdadef3dccc9a293c9fa88aec517e36b1bd807ce064c3b52122076937a41572086f3a9d48
+EBUILD gnumeric-1.12.43.ebuild 1940 BLAKE2B 2f4f3e68a5d63579e0aa32db5ff71087cdb1fb5783d2512d27e91cd58a1431e38c79801a70fc904f855c21c76227e4da6db6fa5de3732336449e4c0e54705a5b SHA512 72a3ee9d1e40609ee95c65c406b96109bbc38733ff2b5fc461743c65f7d5c2058218369c002b298de9c3b266a45cc0942c7711531a3dc2b6b420bc2e40a54c54
+EBUILD gnumeric-1.12.44.ebuild 1940 BLAKE2B 2f4f3e68a5d63579e0aa32db5ff71087cdb1fb5783d2512d27e91cd58a1431e38c79801a70fc904f855c21c76227e4da6db6fa5de3732336449e4c0e54705a5b SHA512 72a3ee9d1e40609ee95c65c406b96109bbc38733ff2b5fc461743c65f7d5c2058218369c002b298de9c3b266a45cc0942c7711531a3dc2b6b420bc2e40a54c54
 MISC metadata.xml 465 BLAKE2B c246609f5d6b20c968faeb36a0c6e33df41ae8a373360ed003541fdf816ff9399f62ababfc4aea5c557bcf9dac83a71357ce9e789ca08d94e83cdeda83aaa275 SHA512 753783aee82021a573093a0ecb7807bdf56d037032fb1afa5559db44b1d06f72bdf9aedfead48cae9917d78aaa7c39d19e528946ef45b51fd6cf5357b9b020fa
diff --git a/app-office/gnumeric/gnumeric-1.12.43.ebuild b/app-office/gnumeric/gnumeric-1.12.43.ebuild
index ed6ea6ba93b7..903ec136a3a5 100644
--- a/app-office/gnumeric/gnumeric-1.12.43.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.43.ebuild
@@ -16,7 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE="+introspection libgda perl python"
 # python-loader plugin is python2.7 only
-REQUIRED_USE="python? ( $(python_gen_useflags -2) )"
+REQUIRED_USE="
+	introspection? ( ${PYTHON_REQUIRED_USE} )
+	python? ( || ( $(python_gen_useflags -2) ) )"
 
 # Missing gnome-extra/libgnomedb required version in tree
 # but its upstream is dead and will be dropped soon.
@@ -37,9 +39,10 @@ RDEPEND="
 	>=x11-libs/gtk+-3.8.7:3
 	x11-libs/cairo:=[svg]
 
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	introspection? ( ${PYTHON_DEPS}
+	>=dev-libs/gobject-introspection-1:= )
 	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS}
+	python? ( $(python_gen_impl_dep '' -2)
 		>=dev-python/pygobject-3:3[${PYTHON_USEDEP}] )
 	libgda? ( gnome-extra/libgda:5[gtk] )
 "
@@ -59,7 +62,7 @@ src_prepare() {
 
 src_configure() {
 	if use python ; then
-		python_setup 'python2*'
+		python_setup -2
 	fi
 	gnome2_src_configure \
 		--disable-static \
@@ -72,6 +75,8 @@ src_configure() {
 
 src_install() {
 	gnome2_src_install
-	python_moduleinto gi.overrides
-	python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
+	if use introspection; then
+		python_moduleinto gi.overrides
+		python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
+	fi
 }
diff --git a/app-office/gnumeric/gnumeric-1.12.44.ebuild b/app-office/gnumeric/gnumeric-1.12.44.ebuild
index ed6ea6ba93b7..903ec136a3a5 100644
--- a/app-office/gnumeric/gnumeric-1.12.44.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.44.ebuild
@@ -16,7 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE="+introspection libgda perl python"
 # python-loader plugin is python2.7 only
-REQUIRED_USE="python? ( $(python_gen_useflags -2) )"
+REQUIRED_USE="
+	introspection? ( ${PYTHON_REQUIRED_USE} )
+	python? ( || ( $(python_gen_useflags -2) ) )"
 
 # Missing gnome-extra/libgnomedb required version in tree
 # but its upstream is dead and will be dropped soon.
@@ -37,9 +39,10 @@ RDEPEND="
 	>=x11-libs/gtk+-3.8.7:3
 	x11-libs/cairo:=[svg]
 
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	introspection? ( ${PYTHON_DEPS}
+	>=dev-libs/gobject-introspection-1:= )
 	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS}
+	python? ( $(python_gen_impl_dep '' -2)
 		>=dev-python/pygobject-3:3[${PYTHON_USEDEP}] )
 	libgda? ( gnome-extra/libgda:5[gtk] )
 "
@@ -59,7 +62,7 @@ src_prepare() {
 
 src_configure() {
 	if use python ; then
-		python_setup 'python2*'
+		python_setup -2
 	fi
 	gnome2_src_configure \
 		--disable-static \
@@ -72,6 +75,8 @@ src_configure() {
 
 src_install() {
 	gnome2_src_install
-	python_moduleinto gi.overrides
-	python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
+	if use introspection; then
+		python_moduleinto gi.overrides
+		python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
+	fi
 }
diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest
index c4af589cd79c..bd4989605b72 100644
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@@ -1,4 +1,5 @@
 AUX kexi-3.2.0-missing-header.patch 739 BLAKE2B da09cf24f4852222040112a7774bd5d0463f85d52d52c352b453f4d0502085a0faa67ae3ae8fd44102c2fa3b8840525929e53c9ad1a05acfb5c23747cdbb6d91 SHA512 14779c27e47d7e3c0f3f8de917deae8fed7b38673bcc5ec53fa0ca7c89c354a3601af80c6fe17ab3231f633852c47c0dcd2858834cee79a961fc3d02a1043fa1
+AUX kexi-3.2.0-postgresql-9.12.patch 1094 BLAKE2B ac9ba4ff8f5c29ae8ebdcfa6820ed8663aa0f13a9fb55f4eff85265fa3d76a3e33e6c1000400a7a21721e9f45ba58006dbb97c312fd4b96f9d0e9e49dfd88690 SHA512 cfde38090e163ff441477c7f8262629589c9ab49c2687eefe7e0a107f4d70fd447cc35e1031612a6ce970e3b3ec3b9394f13e6e2876c29614cb43ba0b9fc9fbd
 DIST kexi-3.2.0.tar.xz 3624956 BLAKE2B 8d0b3712f07d13f606c4c0d714b3d4ea0fe9f56e4d4a3aeeb144ffda56cd5ef89e4f08d5660550364103c86acd60923ddc74fcea135a23fffbae87853a7c00f4 SHA512 5cb9e0747c8e7ea19020b62345571ba10f65278dcc718bb0772827721bf8812d0ffee3c35d53b57285884c66e0406520835c7b00789fbe5459717722dff13e93
-EBUILD kexi-3.2.0.ebuild 2283 BLAKE2B 1193a1da88dd931f14c920a54435ae5fe524b654e5b2b2a177f1ff0e2956e50f8e1c87a208112980b762d07b66f097b5bd770b17e8659fd44b0acab6b47b6fd0 SHA512 199f3d0c67c77a7684e73591ad56367c8b178ed37b27c9af585dee8625ee1787827696f1d27c63b69c42a14887775d37d752172a036c434009125e3544e70863
+EBUILD kexi-3.2.0-r1.ebuild 2330 BLAKE2B 93a140281ac2503dd3c4e06889542840c7d03b3c3317f691b8b5071f2bde8d3af1275b91b6ef1d7c414c553fb85f279c656f9562f50f4529251be49f0e8d77c4 SHA512 1582cde00f8d9d293c32554fdf76217970ff704b7eeb047c17088538d81f289075d279f651784cad27e97dc27ec5e9fd4bc35c28ddfc28e127f3fd66554b44bc
 MISC metadata.xml 600 BLAKE2B 383b28f24ff8522330ed843789c30ac771b4ecb03f45f7f60503463ead5e6a6fd4480eea83be7904d3e0cfecaca73c6fc9d8d29214fbfb2082aa97c45ba607ff SHA512 fc7615150e90fb963d4ae2775b5d0dda7667c0fd975cdcd8e5d52a87d01935471c37c9256e894c68fe88268d61d7a3cde42f36171f9160dae20ce8140eaab22f
diff --git a/app-office/kexi/files/kexi-3.2.0-postgresql-9.12.patch b/app-office/kexi/files/kexi-3.2.0-postgresql-9.12.patch
new file mode 100644
index 000000000000..8835c5ea13db
--- /dev/null
+++ b/app-office/kexi/files/kexi-3.2.0-postgresql-9.12.patch
@@ -0,0 +1,24 @@
+From 88ac2b4a1386bc05f0e3965f31949039eaf4d3ff Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Sat, 25 May 2019 07:12:17 +0200
+Subject: cmake: find PostgreSQL 12
+
+---
+ cmake/modules/FindPostgreSQL.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake
+index 56e6e56..1579be0 100644
+--- a/cmake/modules/FindPostgreSQL.cmake
++++ b/cmake/modules/FindPostgreSQL.cmake
+@@ -86,7 +86,7 @@ set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache e
+ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4")
+ 
+ set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
+-    "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
++    "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+ 
+ # Define additional search paths for root directories.
+ foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )
+-- 
+cgit v1.1
diff --git a/app-office/kexi/kexi-3.2.0.ebuild b/app-office/kexi/kexi-3.2.0-r1.ebuild
index 5bef8c3c8265..fcd7857e501d 100644
--- a/app-office/kexi/kexi-3.2.0.ebuild
+++ b/app-office/kexi/kexi-3.2.0-r1.ebuild
@@ -47,7 +47,7 @@ DEPEND="
 		dev-libs/glib:2
 		virtual/libiconv
 	)
-	mysql? ( virtual/libmysqlclient )
+	mysql? ( dev-db/mysql-connector-c:= )
 	postgres? (
 		dev-db/postgresql:*
 		dev-libs/libpqxx
@@ -56,7 +56,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-missing-header.patch
+	"${FILESDIR}"/${P}-postgresql-9.12.patch
+)
 
 src_prepare() {
 	if ! use webkit; then
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 0871af7d0303..7caa9bcc9b4a 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,4 +1,6 @@
 AUX kmymoney-5.0.5-missing-header.patch 755 BLAKE2B 156557b8e264bf56b5a5c8e2d05e4fc3646d660776ceef66089af19c24e8a6f866e398a97d71073b80e4305e7ba8450a76ac492f180155010f62f0e1e0370b32 SHA512 02d589e7b2c90495835cc020f42377c93a1a478ea00a7a7a59b407a097d96306664536fc99fa4bfea359b8accb47ae0c08f63d28feca0c6fa0bbfd44addb7893
 DIST kmymoney-5.0.5.tar.xz 11706112 BLAKE2B 7c0e51ad2404a88affd7b99c8ca59b813b646a7d995b5d7f6db311c8813f2966d14b34271f3d9de73d07c763fb191e9f4c0737e64feb35a62cd719856c20bab1 SHA512 ba8033b974b93d47cd2a732a352025715845d3dff016a49babb6b724d5e9b726f84f5e2a1f1f42765a6ff35a00d3d995397f2831981d48cb8468d1407030584c
+DIST kmymoney-5.0.6.tar.xz 11713976 BLAKE2B bfc4aacff79f0c92145257e7398271385f80d9ac7460b35f691c1e45dc115ebe91418a98a1a5e6a6c0cdc376beff7b92c8f7d7a29af3d2529503e7db4dc4b77a SHA512 237918b0844d5d9129d086f403090acf21be6e2ba1f41d575ff9de514a9ddcb7bd616da1377ecc34c4436e12481e425615ab640e7549c783d9010b22c0460480
 EBUILD kmymoney-5.0.5.ebuild 3278 BLAKE2B 91e564fbfa0323bee326b1adad12c1c903161feb65707d3d001d6679f9eb51a1d21757578bcbffc247de0682a20d3b9d7706f8ac3567e4d8eb2947cb7dc7ee92 SHA512 755df5db3e7d4623498df44c9d0acf5ba4edea706d7d1e087d3ebf4422d011c254d9f711401323ba162c316ea557c1c45d21df189abcc3934fa26085e0adf56a
+EBUILD kmymoney-5.0.6.ebuild 3153 BLAKE2B c35efcc8bd17a774e1c7907e050ead00256c409c7f040137e0138940cf26247549c8b9841081d57bce97ed2906f319b8ebb84bb7e016f2af05d70c1becccbc1a SHA512 3e5beaf804ac8fcbdb7f30cef0415bd601d41df229ec7ac5cf477a3d6d528bf5c35767b270a16acf451cc237f6c1b392a21f3e670dffca585b2cf6dfa91d7a2f
 MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
diff --git a/app-office/kmymoney/kmymoney-5.0.6.ebuild b/app-office/kmymoney/kmymoney-5.0.6.ebuild
new file mode 100644
index 000000000000..86b2bc4fc862
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-5.0.6.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_BRANCH="5.0"
+PYTHON_COMPAT=( python2_7 )
+
+KDE_HANDBOOK="optional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit kde5 python-single-r1
+
+DESCRIPTION="Personal finance manager based on KDE Frameworks"
+HOMEPAGE="https://kmymoney.org"
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+IUSE="activities addressbook calendar holidays ofx quotes webkit weboob"
+
+REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="virtual/pkgconfig"
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=app-crypt/gpgme-1.7.1-r1[cxx]
+	>=app-office/libalkimia-7.0.0:=
+	dev-libs/gmp:0=
+	dev-libs/kdiagram:5
+	dev-libs/libgpg-error
+	activities? ( $(add_frameworks_dep kactivities) )
+	addressbook? (
+		$(add_kdeapps_dep akonadi)
+		$(add_kdeapps_dep kcontacts)
+		$(add_kdeapps_dep kidentitymanagement)
+	)
+	calendar? ( dev-libs/libical:= )
+	holidays? ( $(add_frameworks_dep kholidays) )
+	ofx? ( dev-libs/libofx )
+	webkit? (
+		$(add_frameworks_dep kdewebkit)
+		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
+	)
+	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+	weboob? (
+		${PYTHON_DEPS}
+		$(add_qt_dep qtconcurrent)
+		www-client/weboob[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/kmymoney:4
+	quotes? ( dev-perl/Finance-Quote )
+"
+
+pkg_setup() {
+	use weboob && python_setup
+	kde5_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT_DESIGNER=OFF
+		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package addressbook KF5Akonadi)
+		$(cmake-utils_use_find_package addressbook KF5Contacts)
+		$(cmake-utils_use_find_package addressbook KF5IdentityManagement)
+		-DENABLE_KBANKING=OFF
+		-DENABLE_LIBICAL=$(usex calendar)
+		$(cmake-utils_use_find_package holidays KF5Holidays)
+		-DENABLE_OFXIMPORTER=$(usex ofx)
+		-DENABLE_WEBENGINE=$(usex !webkit)
+		-DENABLE_WEBOOB=$(usex weboob)
+		$(cmake-utils_use_find_package weboob PythonLibs)
+	)
+	kde5_src_configure
+}
+
+src_test() {
+	# bug 652636; bug 673052: needs kmymoney installed to succeed
+	local myctestargs=(
+		-E "(reports-chart-test|qsqlcipher-test)"
+	)
+
+	kde5_src_test
+}
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index 86ce9a5ae8fa..4c42ffcb994a 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -80,5 +80,5 @@ DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_tr.tar.gz 12196002 BLAKE2B b
 DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_vi.tar.gz 13438574 BLAKE2B 78a946da888cdda4edfcd7398386925f1e7e27ab10dc0f9d6e43b1fa7269b5282574774185e8e964fbbbc2aaf60f960862feee2927e918e46defac5b94ea604d SHA512 f406f5f4e7d21ea9031f316c73bfaa8e06f6eeb724a79db0bd38607e5dc73f043d55e37528c5d48bf7cc031bae751f792447fce70feee9ca5f2e46b738d1c7f1
 DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_zh-CN.tar.gz 13874438 BLAKE2B edb1cc8b0a6b94f7fa47166ad26f45d58774bd9567cbb6e3a1643f038d335f33f92a8ff2b2d84bc59a5b4cd020e3f68826fd9b7aacc4f1534683288c58c5cacc SHA512 722b8a1e8fb39a01dff92ccc5db61428348b4f033efa6e9d150241a2e34010444ae43dac54b8bb72b90d98304c62328db8e39cd2de8077dc49f2e1cb3a475c24
 DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_zh-TW.tar.gz 14085971 BLAKE2B fba2234bf067ebc12e691ed32800bdbabd6cb328def31dce7fbbe589437c7490b6ef6d2bbd543240c7be7be3a4bc6ef4a1685ad0c3f1ae7ed3af7a1c2268bea8 SHA512 775184deade61bc8059a5adc8ad63fec4b157491edb8c4094ec8f80b3c66f2d7de574bf20817fc3077203bdaa029f6c5e4efc4ec39f15f41ff93d760be44e213
-EBUILD openoffice-bin-4.1.6.ebuild 5194 BLAKE2B f8d899b08e596560c7342672448c83b64fab37c40de278274c79335897f9ed6dda342ff271fe8003dda52412815d7dc0daeaa609384fc0de3b2dc48c2ce0385e SHA512 e3b5f8850faad0b92dc8747a0d82341337762e77b8e247a0986bd06ea3dedbf537969065cb00c429507f5376099ccc45cace3f463f98b77a17dc0504c45118e9
+EBUILD openoffice-bin-4.1.6.ebuild 5262 BLAKE2B dab4a0426ddf27e15a763e92e970db16e696569e59310911daff5b8bd5bb75e0869463094c73b5e5c0fcf9c9bb09db964e4df5955f9193490b643b050c3118dd SHA512 a77c55ae576385290b210f3428d4576dd9280fef03935ac82afabf55fe3f642fa4b74f2127226cd53b2f8c3350ac8156858be24d3712f03a2e6d2a76ba108e08
 MISC metadata.xml 654 BLAKE2B 2373a48bc130966ace2a26ec4b666e4e5c0e533922ac41be7b13983cf8a905ae8b62c59f06b0d7c0eaa0219e2eefaf0d1f1edb8b57d9ad4a37687f807401e93c SHA512 e797f235f01e6f92a5bf7f10db539429aceca40b1c2fb703b736e83ee356126671977a8145907a43e84eb05e3914923ded9b0db4d4755954d9f4f519040b7162
diff --git a/app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild b/app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild
index d3a0c2c488bb..1cf8dc185577 100644
--- a/app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild
@@ -3,7 +3,9 @@
 
 EAPI="6"
 
-inherit eutils xdg-utils gnome2-utils pax-utils prefix rpm multilib
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils xdg-utils gnome2-utils pax-utils prefix python-single-r1 rpm multilib
 
 IUSE="gnome java"
 
@@ -42,6 +44,7 @@ done
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	!app-office/openoffice
@@ -49,7 +52,7 @@ RDEPEND="
 	app-arch/unzip
 	app-arch/zip
 	>=dev-lang/perl-5.0
-	dev-lang/python:2.7
+	${PYTHON_DEPS}
 	>=media-libs/freetype-2.1.10-r2
 	sys-libs/ncurses:5/5
 	x11-libs/libXaw
@@ -70,7 +73,6 @@ pkg_setup() {
 }
 
 src_unpack() {
-
 	unpack ${A}
 
 	cp "${FILESDIR}"/{50-${PN},wrapper.in} "${T}"
@@ -115,11 +117,9 @@ src_unpack() {
 
 		fi
 	done
-
 }
 
 src_install () {
-
 	INSTDIR="/usr/$(get_libdir)/${NM}"
 	dodir ${INSTDIR}
 	# mv "${WORKDIR}"/opt/${NM}/* "${ED}${INSTDIR}" || die
@@ -166,24 +166,18 @@ src_install () {
 }
 
 pkg_preinst() {
-
 	use gnome && gnome2_icon_savelist
-
 }
 
 pkg_postinst() {
-
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 	use gnome && gnome2_icon_cache_update
 
 	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/${NM}/program/soffice.bin
-
 }
 
 pkg_postrm() {
-
 	xdg_desktop_database_update
 	use gnome && gnome2_icon_cache_update
-
 }
diff --git a/app-office/pybliographer/Manifest b/app-office/pybliographer/Manifest
index eba6f371cd53..c638f8d1a8ed 100644
--- a/app-office/pybliographer/Manifest
+++ b/app-office/pybliographer/Manifest
@@ -1,5 +1,3 @@
-DIST pybliographer-1.2.18.tar.gz 2174899 BLAKE2B 4723a01d386a1da6f1de6b730e4e38ef1dedfeb7a72310f40fd7475710fd92236bdb484e102bf93340c8b826ddda0353e143cc741cd6b57acbedd82e40e4181b SHA512 b4a97d7e0aec3b4d7c68169d4d8799911b4da0591e819a67429c45d2b451be6be129214631770cf26f2083a935b55575d35c4f3b11ea74a9b39e55feea376204
 DIST pybliographer-1.4.0.tar.xz 1834356 BLAKE2B ba4892f707c2da3f007cb916b158258a59a41cc631e49deacdd784213d506d8e4286c463afb4148c7cb30ed7084ae1a60eee0e62d1bfe13a26bd9fd70a9e60f8 SHA512 aef50e9815b9ff28618ca72c0b50033a24a1bcaa91c9fdbf3014371bb9b4bcaf8fcdffb0fa38e59d37ccfdb4c1383cd601c73aa2e34f4078c514ae9de7341f2a
-EBUILD pybliographer-1.2.18.ebuild 1856 BLAKE2B a8730b705bb5abc370d9f3863d63738998463aa101cab6a252ab9deb71984d8f0aacc788576c6a5f8233711c09978a032975288a483b9724dc437043ca74289b SHA512 47e3d3422c29aa13f90c531337f365780fb4c4522b46010789df593f47c525a4bb4feafafd66816c9697ad28857db92449f34daee4e8b59eac750531c5130adc
-EBUILD pybliographer-1.4.0-r1.ebuild 1716 BLAKE2B b5dd9ff298e484efb4a3e71779d66263ff42cef1fbcfec4b4db55ccf4358fa87e081e3c5929246679f04229ea9fcb2ca9f8f0aa4fb3c673cd3be6b56b8d15d94 SHA512 5a4d6e5c12b497f52d3d893a7129b5cdb768557fac13a32a09910698713c148171e8cdf74285d046b37965b04196cc218ecb9b5e6ddfb12bfc90a5236ee9ad87
+EBUILD pybliographer-1.4.0-r2.ebuild 1761 BLAKE2B f63d1c712b5e8d6ee7b23b9ef327b0051363cd78711d499329bfef6ae82da650235de21415cc7cdceadc3805f62d61b91916057d1c31211ba9b576eef6708ff9 SHA512 111dcc0ab79067fddef9af9d11ac4fee3a7f47a5ef5c02494233080e7558df9c92778c79f30ee1155a1255097a51494559a5714ea131467b5e823c1a8566638c
 MISC metadata.xml 798 BLAKE2B 186a835eadc561bbb17ce369742b5c4d27ce31b3de5ee5d3e2d4ec8c81dee3e96c8c3c86c50fc3d77136738551f74f9346825a754ab4401d6c212057ebd73a76 SHA512 9719f3d541a00da1445210482b9b4f6cfc104b59629b472e50ca2869bdaed6f3a3cf7ff1e28b06806407db368c6c998d46c1e22919f4e4c6cafa9dca1808c2b1
diff --git a/app-office/pybliographer/pybliographer-1.2.18.ebuild b/app-office/pybliographer/pybliographer-1.2.18.ebuild
deleted file mode 100644
index d70519a480d3..000000000000
--- a/app-office/pybliographer/pybliographer-1.2.18.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Pybliographer is a tool for working with bibliographic databases"
-HOMEPAGE="https://pybliographer.org"
-SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/recode-3.6-r1
-	app-text/rarian
-	dev-libs/glib:2
-	dev-python/gconf-python:2[${PYTHON_USEDEP}]
-	dev-python/gnome-vfs-python:2[${PYTHON_USEDEP}]
-	dev-python/libgnome-python:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	>=dev-python/python-bibtex-1.2.5[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-"
-
-# Tests broken for a long time, recheck in 1.4, bug #678444
-RESTRICT="test"
-
-src_prepare() {
-	# Workaround for bug 487204.
-	sed -i \
-		-e 's:\$(srcdir)/::g' \
-		tests/Makefile.am || die "sed failed"
-
-	# Install Python modules into site-packages directories.
-	find -name Makefile.am | xargs sed -i \
-		-e "/^pybdir[[:space:]]*=[[:space:]]*/s:\$(datadir):$(python_get_sitedir):" || die "sed failed"
-	sed -i \
-		-e "s:\${datadir}/@PACKAGE@:$(python_get_sitedir)/@PACKAGE@:" \
-		etc/installer.in || die "sed failed"
-	sed -i \
-		-e "s:gladedir = \$(datadir):gladedir = $(python_get_sitedir):" \
-		Pyblio/GnomeUI/glade/Makefile.am || die "sed failed"
-
-	# Fix shebang manually as otherwise python_fix_shebang gets confused
-	sed -i -e 's: @python_path@:/usr/bin/python2:' pybliographer.py || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-depchecks \
-		--disable-update-desktop-database
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${D}"
-}
diff --git a/app-office/pybliographer/pybliographer-1.4.0-r1.ebuild b/app-office/pybliographer/pybliographer-1.4.0-r2.ebuild
index 13679af58184..4cf3e67ada7b 100644
--- a/app-office/pybliographer/pybliographer-1.4.0-r1.ebuild
+++ b/app-office/pybliographer/pybliographer-1.4.0-r2.ebuild
@@ -21,6 +21,7 @@ RDEPEND="${PYTHON_DEPS}
 	>=app-text/recode-3.6-r1
 	app-text/rarian
 	dev-libs/glib:2
+	dev-python/gconf-python:2[${PYTHON_USEDEP}]
 	dev-python/pygobject:2[${PYTHON_USEDEP}]
 	>=dev-python/pygtk-2.24.0:2[${PYTHON_USEDEP}]
 	>=dev-python/python-bibtex-1.2.5[${PYTHON_USEDEP}]