gentoo resync : 15.12.2019

3 files changed, 2 insertions, 92 deletions

diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index a355722d51af..c3aa8ef78155 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,6 +1,3 @@
-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-r1.ebuild 1927 BLAKE2B e4f3111f103e6a8f7326da8a7fd23b41b85b71aeccf32dbe3551028a417c09c3cfa3df623e4c907de45ff025e93ac4f09954631eab78d77a1adcfdab99f56868 SHA512 a07826ae3b27bd84a7b4dba98f7e669bb27b4b736efd497ab7d006f0a6e490a6ebeb6d4414ab31895877a123895423b5478efdfab21da83fa58accee271bb6d0
-EBUILD wps-office-11.1.0.8865-r1.ebuild 1819 BLAKE2B cd8993666633350c99df97b78651b9f04172e5120dd274e428c354d7f29b156ba63d5a909beedf11e836fc89df846dd5e37af5feb5a3e2841f5fcb7acc950183 SHA512 84d37b01f65788122b53513ac2145261af910c0b7121f9e58667df701cbef7f002dc8b8ea1bb123695881ba93298b6b38f01f9c2bd100dd6cb6bdfd5ba87c71a
+EBUILD wps-office-11.1.0.8865-r1.ebuild 1835 BLAKE2B f1bd17458a814b4d324397b71b17cfeae8ae536862249d13bff65bc333315d2d46bf692bb02ee0c63b853041a6762d852dd948fb2b3bc97961254301245d26e0 SHA512 ade3439fcde452a850347b182ab7595efc7753d29fc938e18b43a9d36b69c7a26c849e6a67ed1e2c44d45e6d8b0c26e0e2425346230ca67fc92af29cb5598b11
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/app-office/wps-office/wps-office-11.1.0.8372-r1.ebuild b/app-office/wps-office/wps-office-11.1.0.8372-r1.ebuild
deleted file mode 100644
index 9bd4cf23a68e..000000000000
--- a/app-office/wps-office/wps-office-11.1.0.8372-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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 ~x86"
-
-SRC_URI="
-	amd64? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_PV}/${PN}_${PV}_amd64.deb )
-	x86? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_PV}/${PN}_${PV}_i386.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}
-}
diff --git a/app-office/wps-office/wps-office-11.1.0.8865-r1.ebuild b/app-office/wps-office/wps-office-11.1.0.8865-r1.ebuild
index 490d154afda2..fdde184764a3 100644
--- a/app-office/wps-office/wps-office-11.1.0.8865-r1.ebuild
+++ b/app-office/wps-office/wps-office-11.1.0.8865-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+SRC_URI="http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}_amd64.deb"
 
 SLOT="0"
 RESTRICT="strip mirror" # mirror as explained at bug #547372