gentoo resync : 29.01.2021

3 files changed, 6 insertions, 101 deletions

diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index 03e38a4ea948..83a395ac925b 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,5 +1,3 @@
-DIST wps-office_11.1.0.9615.XA_amd64.deb 226220962 BLAKE2B 4ef64d1e610bf9eb8cd03b204229d6dbc7d50e1850034aeaa6b80863cf060db8c7ac276f33047b84948af29cfa511ab5141f57d821d01999828a47066281303e SHA512 23a788c592688649a7d3e789934af37e1892b3a817b1ea3689fa88322500a2ef16794623e98b8ab61288ca800925df243579e0b76c5bec1dda0b77d8f704e3db
-DIST wps-office_11.1.0.9719.XA_amd64.deb 225790936 BLAKE2B fea8ccda302605525904d4399b134dec1567b702a9a30f337ae24bd35459512661539be27b4c06ae9fb71f893e4dcb1d906dc1221abc09264dc349cf9bbfe224 SHA512 231d5e824a66c64a41a38d3b421061da8562d53a0c5517b452d57f25dd2bb3252faaf8a3d3ac83f57d916b38cc288c13eaaa20bfba83fc334b6db508db015ce5
-EBUILD wps-office-11.1.0.9615.ebuild 2009 BLAKE2B ceb62af12fd51a28d1eb34096979fcfcf37f202ca2bf91eee35d0ca868a41c62407f22bb19541b71e1c14f4cbc873c8ae5d9dcac470699054cbbdbd90063fca8 SHA512 a9fc91664b3b87b638a5dd8d9d8b97e2bdaa0770af781ded9ac78ca22335579d041f32705df1351732682aa38589985d6a357c223c549e995b140a0dc0b9c033
-EBUILD wps-office-11.1.0.9719.ebuild 2009 BLAKE2B ceb62af12fd51a28d1eb34096979fcfcf37f202ca2bf91eee35d0ca868a41c62407f22bb19541b71e1c14f4cbc873c8ae5d9dcac470699054cbbdbd90063fca8 SHA512 a9fc91664b3b87b638a5dd8d9d8b97e2bdaa0770af781ded9ac78ca22335579d041f32705df1351732682aa38589985d6a357c223c549e995b140a0dc0b9c033
+DIST wps-office_11.1.0.10161.XA_amd64.deb 228984666 BLAKE2B 2b2a5f2048c0e5b292571875197fa51cc5ec25bd59a03bdedad20513b203bc92ea9420881c87352cbe5a0aca25f386f773bb1e1e250fec5ba774b240fc649c95 SHA512 bdc0b8e8c04a904ed5e8f6ecf332db1217c0929dc845b63f13ea074fa508332c5272d087a0502ed92601ab964936c7b458ac5f37a72049d3a5f579649765285f
+EBUILD wps-office-11.1.0.10161.ebuild 2037 BLAKE2B 6d973156070e35aface94ab5033b8da5e426f175ae7da53dcec4bc668c78c1c89a88544a0f4ec78355363d70edda342c7ff29f938be4d5e1a981c95d9c23f6dc SHA512 a8bf0b09a52a617acc117496566767ec509962c3071342545786a5bb32d3d7cb4b6e12260cb83f414bc4adefe4bded828819616cdfd32c64ec3ed52622a7dc42
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/app-office/wps-office/wps-office-11.1.0.9615.ebuild b/app-office/wps-office/wps-office-11.1.0.10161.ebuild
index 9989ac889b6b..aa409f0236cf 100644
--- a/app-office/wps-office/wps-office-11.1.0.9615.ebuild
+++ b/app-office/wps-office/wps-office-11.1.0.10161.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit unpacker xdg
 MY_PV="$(ver_cut 4)"
 
 DESCRIPTION="WPS Office is an office productivity suite"
-HOMEPAGE="https://www.wps.cn/product/wpslinux/ http://wps-community.org/"
+HOMEPAGE="https://www.wps.cn/product/wpslinux/ http://linux.wps.com/"
 
 KEYWORDS="~amd64"
 
@@ -43,7 +43,6 @@ RDEPEND="
 	media-libs/libogg
 	media-libs/libsndfile
 	media-libs/libvorbis
-	media-libs/libpng-compat:1.2
 	media-libs/libpng:0
 	media-sound/pulseaudio
 	net-libs/libasyncns
@@ -84,7 +83,8 @@ src_install() {
 	doexe "${S}"/usr/bin/*
 
 	insinto /usr/share
-	doins -r "${S}"/usr/share/{applications,desktop-directories,icons,mime,templates}
+	# Skip mime subdir to not get prefence over rest of office suites
+	doins -r "${S}"/usr/share/{applications,desktop-directories,icons,templates}
 
 	insinto /opt/kingsoft/wps-office
 	doins -r "${S}"/opt/kingsoft/wps-office/{office6,templates}
diff --git a/app-office/wps-office/wps-office-11.1.0.9719.ebuild b/app-office/wps-office/wps-office-11.1.0.9719.ebuild
deleted file mode 100644
index 9989ac889b6b..000000000000
--- a/app-office/wps-office/wps-office-11.1.0.9719.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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="https://www.wps.cn/product/wpslinux/ http://wps-community.org/"
-
-KEYWORDS="~amd64"
-
-SRC_URI="https://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
-QA_PREBUILT="*"
-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="
-	app-arch/bzip2:0
-	app-arch/xz-utils
-	app-arch/lz4
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libbsd
-	dev-libs/libffi
-	dev-libs/libgcrypt:0
-	dev-libs/libgpg-error
-	dev-libs/libpcre:3
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libsndfile
-	media-libs/libvorbis
-	media-libs/libpng-compat:1.2
-	media-libs/libpng:0
-	media-sound/pulseaudio
-	net-libs/libasyncns
-	net-print/cups
-	sys-apps/attr
-	sys-apps/util-linux
-	sys-apps/dbus
-	sys-apps/tcp-wrappers
-	sys-libs/libcap
-	sys-libs/zlib:0
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libXv
-	x11-libs/libxcb
-	x11-libs/pango
-	virtual/glu
-"
-DEPEND=""
-BDEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
-	exeinto /usr/bin
-	exeopts -m0755
-	doexe "${S}"/usr/bin/*
-
-	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/{et,wpp,wps,wpspdf}
-}