gentoo resync : 25.09.2019

5 files changed, 93 insertions, 3 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 0d4bf319ed2d..48daf6edb8ac 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 7caa9bcc9b4a..68776980bac8 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -2,5 +2,5 @@ AUX kmymoney-5.0.5-missing-header.patch 755 BLAKE2B 156557b8e264bf56b5a5c8e2d05e
 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
+EBUILD kmymoney-5.0.6.ebuild 3244 BLAKE2B e9dab4b5fd4e4a9474414ca11a860bf091b9b3370042d7c5b0e095d3a8625900218b487993547229e56acb4eda06c2a56bef990c65c69cedda4c2a791f010baa SHA512 5daa677cbfbeac2e28a9502fa9c80b35778b0cd0b03a11e3cf7c11eed7085d71bc8eeccba4f850390769f2d326b68b895329f7008af400dfa62da6d1a80cae3c
 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
index 86b2bc4fc862..e7469b835648 100644
--- a/app-office/kmymoney/kmymoney-5.0.6.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.6.ebuild
@@ -20,7 +20,7 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then
 fi
 
 LICENSE="GPL-2"
-IUSE="activities addressbook calendar holidays ofx quotes webkit weboob"
+IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
 
 REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -66,6 +66,10 @@ COMMON_DEPEND="
 		$(add_kdeapps_dep kidentitymanagement)
 	)
 	calendar? ( dev-libs/libical:= )
+	hbci? (
+		>=net-libs/aqbanking-5.8.2
+		>=sys-libs/gwenhywfar-4.20.2[qt5]
+	)
 	holidays? ( $(add_frameworks_dep kholidays) )
 	ofx? ( dev-libs/libofx )
 	webkit? (
@@ -99,8 +103,8 @@ src_configure() {
 		$(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)
+		-DENABLE_KBANKING=$(usex hbci)
 		$(cmake-utils_use_find_package holidays KF5Holidays)
 		-DENABLE_OFXIMPORTER=$(usex ofx)
 		-DENABLE_WEBENGINE=$(usex !webkit)
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index 1c9a3c55ec34..a69b3deea978 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,4 +1,6 @@
 DIST wps-office_11.1.0.8372_amd64.deb 213018066 BLAKE2B 9769bc6c4c6d292259594f0e39361e67e00cfb4bae05119ecf12ce0666944110c5bc61f5761cf8713bb944237780883116b928a6623d8e6ec476667c64f9c8af SHA512 9a690f6ec9b46f827dcf593316f71bcb13ad55568ccb0056c679e5c803a899cad89b7399d307da07a239aeca7a08a5669b8892649f005464fe0cb2efa926d523
 DIST wps-office_11.1.0.8372_i386.deb 216082588 BLAKE2B c8d4f2f4e12b28a38553023ba281add34266266ffadbf1c0bfc3c6a08ef5b0c9f1b3ec828cc5106aea3c8d28409b87a9fc0a3c791f4e9f95e1a2a63ff2651c50 SHA512 76044bbb0cba614a2c506baef8e309f9a965009aa74922a64975a7a78f703e7091efedfb363ff0d86bf794b854cd6646226db902bf8a9afc064a64631cbb05e7
+DIST wps-office_11.1.0.8865_amd64.deb 252991358 BLAKE2B 476d7431a7690b56a2958233bd204a75a32b7f6f7598a092ede89355db6e9749194de41d1a0598e4ef02c96190a5803db007fc848540a5a1e797a32c8f918c20 SHA512 2f515fdfd3f380eb5ba2661006288b04d192ff75d02b95ae2f16a146b287aa78b24d2ae258590354fa567c2c52502ef4e7b9f2ad6ea965911208557681c4a1e7
 EBUILD wps-office-11.1.0.8372.ebuild 1920 BLAKE2B 96a5ee9eb15d3660dbbf8c6ad4a334c34103e8173cb02d17c838cb610a3acf5108c31421e98a97ff87fad2ac0ee46b07c6b63c8b93ae2337920f6eec56eb989c SHA512 bf971365a23a7330ff76be72d6435436dc9c75cd050b061bc0e4d6a66f2c7f9efdd3d2bd766a609ce3995b07001b7ff021c2cf8ca5d646b2e711a5d7aeae3757
+EBUILD wps-office-11.1.0.8865.ebuild 1812 BLAKE2B fb196d6113e5c689283b5c45f7fcce2e58e5656b771d2f1c545c56f44067fde92a93c7bfcb6e7c97a943558c9c3a9a37fbafa13876bc167b915e983c1cc4a1ac SHA512 d79e3f7aff6a492e7138bbdd73c9d3ec89e911ddb565a8276467fca6ad20d591fd146914833e3a232342243c24ed75924d1a11dc369625a1892af9d78a6ae5a7
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/app-office/wps-office/wps-office-11.1.0.8865.ebuild b/app-office/wps-office/wps-office-11.1.0.8865.ebuild
new file mode 100644
index 000000000000..a6c94fc5dbea
--- /dev/null
+++ b/app-office/wps-office/wps-office-11.1.0.8865.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit unpacker xdg
+
+MY_PV="$(ver_cut 4)"
+
+DESCRIPTION="WPS Office is an office productivity suite"
+HOMEPAGE="http://www.wps.cn/product/wpslinux/ http://wps-community.org/"
+
+KEYWORDS="~amd64"
+
+SRC_URI="http://kdl.cc.ksosoft.com/wps-community/download/${MY_PV}/${PN}_${PV}_amd64.deb"
+
+SLOT="0"
+RESTRICT="strip mirror" # mirror as explained at bug #547372
+LICENSE="WPS-EULA"
+IUSE=""
+
+# 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=""
+BDEPEND=""
+
+S="${WORKDIR}"
+
+src_install() {
+	exeinto /usr/bin
+	exeopts -m0755
+	doexe "${S}"/usr/bin/wps
+	doexe "${S}"/usr/bin/wpp
+	doexe "${S}"/usr/bin/et
+
+	insinto /usr/share
+	doins -r "${S}"/usr/share/{applications,desktop-directories,icons,mime,templates}
+
+	insinto /opt/kingsoft/wps-office
+	doins -r "${S}"/opt/kingsoft/wps-office/{office6,templates}
+
+	fperms 0755 /opt/kingsoft/wps-office/office6/{wps,wpp,et}
+}