gentoo resync : 25.08.2020

3 files changed, 49 insertions, 37 deletions

diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index 991dc0a34a34..7f756cf3d6aa 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,5 +1,5 @@
-DIST wps-office_11.1.0.9126.XA_amd64.deb 205954802 BLAKE2B 7736d28349fcc6f4d0c69b8f13ec96af42b1de4f073bf14d2c05949cc2d9d51389125d1ef83dee8ebe7cdccb44ba6b70b9425e9397d386e02e0fe8779bf7c029 SHA512 7c2d8b3459ac37ced45b25d19b6ff7f8afca2bae7ee026dfc3ef068f5a1e774baff457ddbcc5d8495f8dca1699ddd5ad67b0f3927ac6e4e99503c67a6dab414c
 DIST wps-office_11.1.0.9505.XA_amd64.deb 212685550 BLAKE2B 56c38f01837c33e55ea2266a6b55781a911becb3af89baa8089c59ae43a565a46558e677c7d84f91ef51e64dd3024f4729027dd0621ea9b4a10188f4e63a1db5 SHA512 d6d7e4fd85fbf24b08281d68ad3be9280d9b337555e328f75db1e53b9ce1bb47b2265b73e2da00df7b1a9b0a9775152920bd439368307f2373f611de6eaf19a7
-EBUILD wps-office-11.1.0.9126.ebuild 1792 BLAKE2B 84f21bd931f053f0827dc43547dd208d2be3f243c270b370ab4e596a2d0442f7b0da2afcd536115384751050051b93e130ec3033f02edee91c62f3efd7be2fce SHA512 7c4287707d9166776cbe0c61a99ef9759438e585fefe885168d405bb64d72fc062ddd6a443fb794e1c600f43062dc38360076f96e678f820bc8f240b87b1e94e
-EBUILD wps-office-11.1.0.9505.ebuild 1792 BLAKE2B 84f21bd931f053f0827dc43547dd208d2be3f243c270b370ab4e596a2d0442f7b0da2afcd536115384751050051b93e130ec3033f02edee91c62f3efd7be2fce SHA512 7c4287707d9166776cbe0c61a99ef9759438e585fefe885168d405bb64d72fc062ddd6a443fb794e1c600f43062dc38360076f96e678f820bc8f240b87b1e94e
+DIST wps-office_11.1.0.9615.XA_amd64.deb 226220962 BLAKE2B 4ef64d1e610bf9eb8cd03b204229d6dbc7d50e1850034aeaa6b80863cf060db8c7ac276f33047b84948af29cfa511ab5141f57d821d01999828a47066281303e SHA512 23a788c592688649a7d3e789934af37e1892b3a817b1ea3689fa88322500a2ef16794623e98b8ab61288ca800925df243579e0b76c5bec1dda0b77d8f704e3db
+EBUILD wps-office-11.1.0.9505.ebuild 1810 BLAKE2B 78271d9b00951c59d0f1e80bd855a738106d1f60fb302567bd2e5a2be309cb195319cc113e63b5e0f19163638e69b7535ae97c23a23e1135a67713995e19bb2d SHA512 0ecc8e561fff1f8bfee3333badec2fb23cd4f5f7720b12e7e4901a22f4ec8ef50d8e1ae21b46ea6cd051eae3ed007b2d55623198473465b6bb02187f34ceac94
+EBUILD wps-office-11.1.0.9615.ebuild 2009 BLAKE2B ceb62af12fd51a28d1eb34096979fcfcf37f202ca2bf91eee35d0ca868a41c62407f22bb19541b71e1c14f4cbc873c8ae5d9dcac470699054cbbdbd90063fca8 SHA512 a9fc91664b3b87b638a5dd8d9d8b97e2bdaa0770af781ded9ac78ca22335579d041f32705df1351732682aa38589985d6a357c223c549e995b140a0dc0b9c033
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/app-office/wps-office/wps-office-11.1.0.9505.ebuild b/app-office/wps-office/wps-office-11.1.0.9505.ebuild
index 961aa55ae4af..d5f3f6b5f1cd 100644
--- a/app-office/wps-office/wps-office-11.1.0.9505.ebuild
+++ b/app-office/wps-office/wps-office-11.1.0.9505.ebuild
@@ -7,14 +7,15 @@ 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/"
+HOMEPAGE="https://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"
+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=""
 
diff --git a/app-office/wps-office/wps-office-11.1.0.9126.ebuild b/app-office/wps-office/wps-office-11.1.0.9615.ebuild
index 961aa55ae4af..9989ac889b6b 100644
--- a/app-office/wps-office/wps-office-11.1.0.9126.ebuild
+++ b/app-office/wps-office/wps-office-11.1.0.9615.ebuild
@@ -7,14 +7,15 @@ 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/"
+HOMEPAGE="https://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"
+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=""
 
@@ -23,44 +24,54 @@ IUSE=""
 # 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
+	app-arch/xz-utils
+	app-arch/lz4
+	dev-libs/atk
 	dev-libs/expat
-	sys-apps/util-linux
+	dev-libs/glib:2
 	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/libffi
 	dev-libs/libgcrypt:0
-	app-arch/xz-utils
-	app-arch/lz4
-	sys-libs/libcap
+	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
-	dev-libs/libgpg-error
+	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=""