gentoo resync : 05.02.2020

16 files changed, 97 insertions, 171 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 29d4fdcbfdc3..b7ecb4357060 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 217547dc8ebf..fbc0cc638a4d 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,5 +1,5 @@
 AUX abiword-3.0.2-extern-C-template.patch 863 BLAKE2B 3b97bbc9142c98198a9a1d86dfd18c71a37f413ff89f9af7c37b5a72e29d363ae2e5027ff3727858e14c395d157f2a2935222db9d4ebd512b264045eaaf877c8 SHA512 c030b76875d034d5be38cd2e0d86362e0eb442e3a837922c62d5e1b53c4c42b13c8fcd46ed3aac595a63410b399aca34310d31f321f3e558e889f2fb11a7bfb1
 DIST abiword-3.0.2-patchset.tar.xz 11976 BLAKE2B 72acb4956543843ad445525d1f5654c63f2544933aab35a95f0ed4f49e1385c06a29a3deb5b7ba09343188e9adf8f916f0223ab6c2a037424732f5e5bffba103 SHA512 afe6f791f167b40c2fdd16f2308add67990dd1fd0856f5a96e8f486a0af2e7b67cbcde29beacd2d869508e8f98bd3fb140240480882bcd9689cbb1fba6a75743
 DIST abiword-3.0.2.tar.gz 11154333 BLAKE2B af49570ad766b0e698313a4a88f14b2370a0a230866c4e8672f56780705060dba4207d4e13358cc290fb3c1a4a6a56efa05fed1f0540f10f7572d8e717e6cd20 SHA512 29ce9e80b3b85ab2933e7d39216771d8c4e05db5255eaed0cf8e1d032ffaac2cb1880bf24e754196ad5dae4969a1c2101ce4dc9c1db14604adc2f852b6a17fe3
-EBUILD abiword-3.0.2-r2.ebuild 5361 BLAKE2B 55641fd54f66f29c88e7eea734842aecc2ff33b74c82ecaab0ba5b51daf6103f3f69e5ba26250027d0fe414bef56328c095e389bc0513774009964d29e4b73b8 SHA512 50bc048540246bb2d24972d2bfa56776b194e4ec8691388b152e6e8910dd80bb2a3959158aba0c9b9280e57cbec04dc63871afd8be220f9aade74a51360cc5ce
+EBUILD abiword-3.0.2-r2.ebuild 5363 BLAKE2B 36d69daefe0b912b878b8e37dc442496ace08301520bac363b9085182909e8a3be4208b36e752a5573c0e183f3303cbb34e6ad7ca826332b8a412de17c435466 SHA512 fd1f23cc3419358aba10c3c6da858e6864317e034d986d00f8397fa28ff6feba4d973ea632aaa435c8dfafeca8cff7879e44349a352ae006f7acca8c78661a90
 MISC metadata.xml 1226 BLAKE2B c2af3a8b9075eaf01d3837ee80724b84174731811e457b2096e049a6ac3bb76f965ed0f881e0e93675404d92c6680658d5e2009ae20f4de2f86e10455f8ec360 SHA512 e8aa23e26cb73ea421d5af8097972236f22832690d26a9725b0c8cc410b620edd593e91733f659c2c99c973a0179b5db31e96d84b957a28889fc322ed425654d
diff --git a/app-office/abiword/abiword-3.0.2-r2.ebuild b/app-office/abiword/abiword-3.0.2-r2.ebuild
index 654d4c6d1ff5..ed9646cd3f04 100644
--- a/app-office/abiword/abiword-3.0.2-r2.ebuild
+++ b/app-office/abiword/abiword-3.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -56,7 +56,7 @@ RDEPEND="
 	redland? (
 		>=dev-libs/redland-1.0.10
 		>=dev-libs/rasqal-0.9.17 )
-	spell? ( >=app-text/enchant-1.2 )
+	spell? ( >=app-text/enchant-1.2:0 )
 	!<app-office/abiword-plugins-2.8
 "
 DEPEND="${RDEPEND}
diff --git a/app-office/grisbi/Manifest b/app-office/grisbi/Manifest
index b44452489ef0..3b5a17aab722 100644
--- a/app-office/grisbi/Manifest
+++ b/app-office/grisbi/Manifest
@@ -1,7 +1,3 @@
-DIST grisbi-1.0.4.tar.bz2 6965398 BLAKE2B f53b5cd7f2e4b0cdcf14732ba7e03315ec7d419c7f6ab3a290fd30a9dc9f7c0dde69b473dca3873aeb90b793cd90287c516f2fe4b7a50d71368abc3e12ce16f6 SHA512 9761ed94db563c39cab793ee076b6a729470231e3111d7ce57d188a6f1681cbb715174f67c15741320f295d4efdf0784f6e3d4d4d58267759efbad56561c7064
-DIST grisbi-1.2.1.tar.bz2 7314316 BLAKE2B b34aaaba79608561383e09fa1af7749f8c3cfa322f47a6d9cf350af1a3b96c575140246ed65b33127d92f84a57d959f24c99ef748ab80097ffce2ed8f16319aa SHA512 0193d5777ed191f7f3dac67fc9754f5588f35b9486567f3a7e7f9dd998865ff2130ad04b78a98dae1e1164fbd400a58328bdee777e9d0ff1100d1fd189a5aa2f
 DIST grisbi-1.2.2.tar.bz2 7325947 BLAKE2B 559ffc8c46edc629fd17aa38042a7d9a39dd9c1866bddc86560bae2750a53916a6e0a451dc6e482b9d21bc1d8d493701d656dfa85b131f5f9b5b3c014249dcd2 SHA512 7d627f9ae588c0d5a8235bb86f3ed160a572114ccfec1dce9c7137296e5525411600033ca4e42b242004edddc42f2160e95c18c0c0cd13516cf62486e081acdd
-EBUILD grisbi-1.0.4.ebuild 848 BLAKE2B cdab027ce150b2947949f4f3ffb4d33b7229fda1c92a5e18eb80ba797600afbb75c998be877856beaaa167dceaba9a6a243269c4beb709dd5125e914d0c2e700 SHA512 473f2bf7f32edf9305263604682c296159695aa964a9a70428884a7cd3f0a885f5eeeb67ef26b76751d03eb1d674ab78814c32e137d2eee06aff245f56a959c6
-EBUILD grisbi-1.2.1.ebuild 985 BLAKE2B f21a415e2b3163150acee52ce18c3b73eb0960cc5c624e5bca607654fb406089f7d2be162468bf29b819d73f0b304df8d84b70686121170fa6af15382f9ee25b SHA512 95b72ff46513a35ff80d1da97850e2dc830b0e537e5fad69c13de0e731062d8ff645c88897b38a589888575601b891060a6c34655ad15f77b857cbd5efc8f741
-EBUILD grisbi-1.2.2.ebuild 985 BLAKE2B f21a415e2b3163150acee52ce18c3b73eb0960cc5c624e5bca607654fb406089f7d2be162468bf29b819d73f0b304df8d84b70686121170fa6af15382f9ee25b SHA512 95b72ff46513a35ff80d1da97850e2dc830b0e537e5fad69c13de0e731062d8ff645c88897b38a589888575601b891060a6c34655ad15f77b857cbd5efc8f741
+EBUILD grisbi-1.2.2.ebuild 983 BLAKE2B 14cbcad4fbac6e25a309fb979b905914a7e450e6ba7285a4b033f10defbf2418ce89de112588b8dd6603bf5685bd638e06f3cb2a8469ef32b1d2652091e2cac3 SHA512 2660e6bfdc05f3b6ceb587e8d13baab51e44dd9cc3b7342973ab987ad38fd5aecf06b525e470555aeb7b5c51dd37ceb854866bb051d053e73c0316ecd02023d1
 MISC metadata.xml 711 BLAKE2B be72967e4680a341903aa29e9f2627beb6a9084696d6b0f8b5048e2902220b5ed2a1fee71e7458f7a2df8639a532b554fe437dbabc2a055ab8ce05dd942a699e SHA512 f8fca475d676c5a4fd504f045471a767e67cc397d4ecb5a6d6e2b89d0532d3e59e12a693f56adb12101283b7614e8e62eed269c9785ffeee5b7ab9c26e568230
diff --git a/app-office/grisbi/grisbi-1.0.4.ebuild b/app-office/grisbi/grisbi-1.0.4.ebuild
deleted file mode 100644
index 996e90a1e3c2..000000000000
--- a/app-office/grisbi/grisbi-1.0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Grisbi is a personal accounting application for Linux"
-HOMEPAGE="http://www.grisbi.org"
-SRC_URI="mirror://sourceforge/grisbi/grisbi%20stable/1.0.x/${P}.tar.bz2"
-IUSE="libressl nls ofx ssl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	dev-libs/libxml2:2
-	>=dev-libs/glib-2.18.0:2
-	>=x11-libs/gtk+-2.12.0:2
-	x11-misc/xdg-utils
-	ssl? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( >=dev-libs/openssl-0.9.5:0= ) )
-	ofx? ( >=dev-libs/libofx-0.7.0 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--with-libxml2 \
-		--without-cunit \
-		--disable-static \
-		$(use_with ssl openssl) \
-		$(use_with ofx) \
-		$(use_enable nls)
-}
diff --git a/app-office/grisbi/grisbi-1.2.1.ebuild b/app-office/grisbi/grisbi-1.2.1.ebuild
deleted file mode 100644
index 1cb4dfed2119..000000000000
--- a/app-office/grisbi/grisbi-1.2.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Grisbi is a personal accounting application for Linux"
-HOMEPAGE="http://www.grisbi.org https://github.com/grisbi/grisbi"
-SRC_URI="mirror://sourceforge/${PN}/grisbi%20stable/1.2.x/${P}.tar.bz2"
-IUSE="goffice libressl nls ofx ssl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.5:2
-	>=dev-libs/glib-2.44.0:2
-	>=x11-libs/gtk+-3.20:3
-	x11-misc/xdg-utils
-	>=gnome-extra/libgsf-1.14
-	ssl? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= ) )
-	ofx? ( >=dev-libs/libofx-0.9.0 )
-	goffice? ( >=x11-libs/goffice-0.10.0 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--with-libxml2 \
-		--without-cunit \
-		--disable-static \
-		$(use_with ssl openssl) \
-		$(use_with ofx) \
-		$(use_with goffice) \
-		$(use_enable nls)
-}
diff --git a/app-office/grisbi/grisbi-1.2.2.ebuild b/app-office/grisbi/grisbi-1.2.2.ebuild
index 1cb4dfed2119..4ef1aa7ac930 100644
--- a/app-office/grisbi/grisbi-1.2.2.ebuild
+++ b/app-office/grisbi/grisbi-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ IUSE="goffice libressl nls ofx ssl"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.5:2
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index ef35d67357c3..b42e3c81de32 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,4 +1,4 @@
 AUX lyx-2.3.0-python.patch 1049 BLAKE2B 94591099e6b0d52429fa1e066475283ae35ba89a5d07f190dd80aa38ad040cbf53dda3f85f4f12894fc39822309aa7b4cc2bf947d8720caf228c734b7fcee8b1 SHA512 8f2fda91c4c35ffdf3325fc6613df1c5ecd87ced88e4d690aef5c7085edda1b66c0ae704e266521627f7a82eb8b4e2f35fed0f14b37feb367422ef1c5693e31d
 DIST lyx-2.3.3.tar.xz 15998188 BLAKE2B 491732d1e567dfc8372a7dc7810cfc46cbe7e3b6a67637f772adddcff96225e174fe8c3db4c7f9e663cf3423da8b4bf08f67679874c9aaf556973ad46159a6cc SHA512 7b42df9da9f2906f626d568222e559bb921d003674d70c805657488180856a77143b2a3d073686116c95034e84fe8f58ee1ff8a74d47a40bd5fda7564335a0c3
-EBUILD lyx-2.3.3.ebuild 4100 BLAKE2B 3dd38e0a1562f7eeff43408a8e559d8788401082cf3d7192ebb9673a2c695e8f7487e970190d4053b18ca53f97303830f46616874ade4b9d5bf1cd54e90d8c57 SHA512 b1c120536eb09d1289f52c4a90d124e5e0f7b74c0d26bae84d6b87aef235073d5bbd186fc50a1be165dcc7d601b7bfe7df0d1ee2bac0cc30b70707c4c8aac0a2
+EBUILD lyx-2.3.3.ebuild 4102 BLAKE2B 78926fc9dc9dc7967dfdb57ef6a85f2e194100a8a6013f259c9716351026ae25e1df0ca36362dc4a1ceb042514e02cd9ff9c05f5990a127cad38fa69313618df SHA512 2873b10aeb94b9223b259c4a44aad755a0667bab281dcf7fac9989cb05d795237d7cd4cd63b7bcebadae2a7d464b566f728d808c260cd775772c798b279fa4b3
 MISC metadata.xml 1539 BLAKE2B 124b453cd6f7a6eccaa0e4db033edf451f9e21f16915de2576fb8c8920af472fe330e4b3bde2c7659d57a512f571b543b745bdb2177f6bd28b29da7e9fa703af SHA512 603a568a98ca584f5baebdfbdb6c83c892fba1df71fab12449d625e5c58b8961322bbdf1263d2493dbb68f61c747655d2b84360b7f34851c235fa10c3f3c2f52
diff --git a/app-office/lyx/lyx-2.3.3.ebuild b/app-office/lyx/lyx-2.3.3.ebuild
index fab590d38203..37c1439a3f8e 100644
--- a/app-office/lyx/lyx-2.3.3.ebuild
+++ b/app-office/lyx/lyx-2.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,7 +36,7 @@ RDEPEND="${PYTHON_DEPS}
 	dia? ( app-office/dia )
 	docbook? ( app-text/sgmltools-lite )
 	dot? ( media-gfx/graphviz )
-	enchant? ( app-text/enchant )
+	enchant? ( app-text/enchant:0 )
 	gnumeric? ( app-office/gnumeric )
 	html? ( dev-tex/html2latex )
 	hunspell? ( app-text/hunspell )
diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
index eda12d62ca66..3f9220f820f3 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -1,4 +1,4 @@
 AUX mdbtools-0.7.1-parallel-make.patch 513 BLAKE2B 1f9e2ccebe4dbf4bbf4655eef237da00016fe060a43ef7a2479b6bd83f98f198959fb3101a97ad016c81ab7d09cf006cb8531c675a066bb6e185282cc8e16609 SHA512 946139271a757a8beeeb03a909104bc348cbc081a9ef6dde7f739865c775cce06717de57560a49b5055d5196b1f3985824b80b728f139cf7684c0ba847f4bd85
 DIST mdbtools-0.7.1.tar.gz 277257 BLAKE2B 3740c543b1ea2e898a96dc1a560fd83cf079d37f5d02805891c5902b75a417c9efbf421346902766017113d447b088656afbfd0297b26655aa07fce973adc216 SHA512 bbad415c59a3f54c11bcd04971220b1370046c5dfd7300d1f23e597615a1df6af850c6f767e78033676d486d87a11c72dfdb141abbee8378337c3fda9a450b75
-EBUILD mdbtools-0.7.1-r2.ebuild 1025 BLAKE2B d1e100d8057cebda2139c9a2be0d25085d51ec81c51c30a72d52e20b3cf753df0e29e4776beeabdc624a82d1e8b8726f30e0d28e8754a7dbb95aec42c1df0a24 SHA512 0ae7f721b4585331f9e28542c56fbe39d5f6397916c255612071960def961bd50f810200ddb1ec2c35de11aa1d3861a4ddeea2534218329ace519ebe9b8cc0e9
+EBUILD mdbtools-0.7.1-r2.ebuild 1026 BLAKE2B be6052dc86d634c7fe501f908bb0085a13215cd4239a889165f3dbe0ddbc53e779ee5608e1dd08a6df4de7344aa6e17d7ae5f690d47608c8488d4ade02fa44b8 SHA512 031fce2911a32e008ac96bc4f2fff25a16c789addddd5385f6fa61184ec5824fc3d032cc0eb6600ad7f5efe80558e203c81377ee7f304c4ffc7a602eb78277c4
 MISC metadata.xml 305 BLAKE2B dd17b4d37e6710ac92701b8d9f8302689686ac0489b047fa96344951a82942cb8e3bc33b8267e62dfae6c65990749ffeeb27bf353a6e4b9e8a07131d5ee79771 SHA512 c983d77cdf17f16a0abd47ba086e024f0e08c09a3d4e22ffea164d1af1b4e61d557675afae550beac7806ebec8e0dafb0257511cb3fed6d381489d67e56b1c71
diff --git a/app-office/mdbtools/mdbtools-0.7.1-r2.ebuild b/app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
index 900dafbba5a7..73d5fa027883 100644
--- a/app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
+++ b/app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/brianb/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 
 IUSE="odbc static-libs"
 
diff --git a/app-office/taskcoach/Manifest b/app-office/taskcoach/Manifest
index 531c1e59c7e1..7385072ebd0c 100644
--- a/app-office/taskcoach/Manifest
+++ b/app-office/taskcoach/Manifest
@@ -1,7 +1,4 @@
-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
 DIST TaskCoach-1.4.6.tar.gz 2927090 BLAKE2B 24f7b2f293d34d8ef0084c7065fdf5de6b01f437c971ad0d504125793ec71581ccedbd6db0701653db409ce04fb99b55f995037510daa58f10e2b15b439dc64b SHA512 f393f9e7d8422e1453a1bd711d08ba6bdcccd5634095262475538dfbd1fb7a943798b6ff197e38367cf8e6162e25fef50178458f73b76f483495d61545bec8fe
-EBUILD taskcoach-1.4.3-r1.ebuild 1053 BLAKE2B 752810fb3ff54f24f4a8ffe4b05ff38708ca14868b4c426d7cf6008fc52431d5166e4fb93c067becfbdf75cc65ed112a61820fc26510915ded04f9fac4128813 SHA512 aa5534c4ee8fecf098d22ffe82dab224e5c88796eeff2e99632bc7ef9d383695afc9243afc24ec6950d44cff81f9a5cd20d425205d20a7fc537783634dd435a1
 EBUILD taskcoach-1.4.6.ebuild 1051 BLAKE2B 76c97e4a19c1f993da73070b44b8c1d243ae15800089078116356cf2ed809c0d64205310e090c3ac6aaf15e432b489ed0e7a648ec3d81d8f7892ccad78f56c84 SHA512 117360b937925307c947bde2c2867144251c60336f0677b8fd08a0d1c5f2c6c0926c6f96735b921110c8dfa97ea6bbf0cd508adcfd84e5a831676aee4d25d026
 MISC metadata.xml 742 BLAKE2B 26655a8f07586e447245578ec5405c455b0b796cb61f3f43c90f5b8bc55adffe60dad39c9636e5d5478bf2c9b94326745ffcc0d6d10c6b52b93b256fd977c832 SHA512 1e8ad0e623b769b5060bf50a7b3f9ecd0981039c7e6cc994413f16382e16e8b9515c7bf0901968ea6f17ace60dbd2f155a285f77678d5446c8560c5ac2d9d329
diff --git a/app-office/taskcoach/files/taskcoach-1.4.2-fix-desktop-file.patch b/app-office/taskcoach/files/taskcoach-1.4.2-fix-desktop-file.patch
deleted file mode 100644
index 9f57beb8d054..000000000000
--- a/app-office/taskcoach/files/taskcoach-1.4.2-fix-desktop-file.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From dd39524692896995daabc69c7090ecf66e64858e Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 10 Jan 2016 01:34:13 +0100
-Subject: [PATCH] Fix .desktop file
-
-error: value "task;todo;reminder" for locale string list key "Keywords" in group "Desktop Entry" does not have a semicolon (';') as trailing character
----
- build.in/linux_common/taskcoach.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build.in/linux_common/taskcoach.desktop b/build.in/linux_common/taskcoach.desktop
-index 9382b0b..b1a4bd1 100644
---- a/build.in/linux_common/taskcoach.desktop
-+++ b/build.in/linux_common/taskcoach.desktop
-@@ -7,4 +7,4 @@ Icon=taskcoach
- Terminal=false
- Type=Application
- Categories=Office;Calendar;
--Keywords=task;todo;reminder
-+Keywords=task;todo;reminder;
--- 
-2.7.0
-
diff --git a/app-office/taskcoach/taskcoach-1.4.3-r1.ebuild b/app-office/taskcoach/taskcoach-1.4.3-r1.ebuild
deleted file mode 100644
index fc81b9f5eca0..000000000000
--- a/app-office/taskcoach/taskcoach-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils versionator
-
-MY_PN="TaskCoach"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple personal tasks and todo lists manager"
-HOMEPAGE="http://www.taskcoach.org https://pypi.org/project/TaskCoach/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libnotify"
-
-DEPEND="
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	|| (
-		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-		>=dev-python/twisted-core-10.0
-	)
-"
-RDEPEND="${DEPEND}
-	x11-libs/libXScrnSaver
-	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGES.txt README.txt )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4.2-fix-desktop-file.patch
-	epatch "${FILESDIR}"/${PN}-1.4.3-version-check.patch
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doicon "icons.in/${PN}.png"
-	make_desktop_entry ${PN}.py "Task Coach" ${PN} Office
-}
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index 0fc5371a2ebd..76aaf75557a7 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,3 +1,5 @@
 DIST wps-office_11.1.0.8865_amd64.deb 252362146 BLAKE2B 97d3260920a19ee6d4c50a8bdd124110916bb556a1585ed078fca3576c089f0865f157765c4f0ac51b762da10649cb4515356b40372c26cb123a202eefd7eb8c SHA512 25b14593dd143f131ba3228d3d19815efdd6cdb8985cf707125b2c7ed5ff13037d7bdcadd6e20e5b2169d2e01bfc00817e523dcfa93b2b2e9b7aad551b466004
+DIST wps-office_11.1.0.9080.XA_amd64.deb 204126446 BLAKE2B 8cee00cd674e46a0d88263ef8bd8fb841a3479ea49dbfdfedde7e6f0df4c8a8eb0a1b56da685f3e9d4152baea5128dcdfdae37b0b3337ebdd4d72649d51668b5 SHA512 c910d05478402ac2b9e51f411bb15dc1d5069f02d9a3ded549116f207521ee8c8c5cbe03ba7c86c9a6ef152f174e6284815ac4a4057b4257f0a5c119ed6159cc
 EBUILD wps-office-11.1.0.8865-r1.ebuild 1835 BLAKE2B f1bd17458a814b4d324397b71b17cfeae8ae536862249d13bff65bc333315d2d46bf692bb02ee0c63b853041a6762d852dd948fb2b3bc97961254301245d26e0 SHA512 ade3439fcde452a850347b182ab7595efc7753d29fc938e18b43a9d36b69c7a26c849e6a67ed1e2c44d45e6d8b0c26e0e2425346230ca67fc92af29cb5598b11
+EBUILD wps-office-11.1.0.9080.ebuild 1838 BLAKE2B 5c87b88ba9c38978d575f3165cdce262b885bb3c46621b43b7ccd30e80d94c0bf057ef95bd2c714bfd6d288d5996ce0d22aaf6b0b6feaaf90f011a53a3d0feb5 SHA512 c8003afe261ed64f50e13af17fef13cb2998fbdd75c42da674bdc11e947f2ab0596a5f14aedac632ec6a549a20bc9decb361fed992f62a55baa10bf51e2d23c2
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/app-office/wps-office/wps-office-11.1.0.9080.ebuild b/app-office/wps-office/wps-office-11.1.0.9080.ebuild
new file mode 100644
index 000000000000..05e9a5d2e7c7
--- /dev/null
+++ b/app-office/wps-office/wps-office-11.1.0.9080.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 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://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}.XA_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-compat: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}
+}