gentoo resync : 22.01.2019

3 files changed, 1 insertions, 141 deletions

diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index bcd18d8a00f4..43e748f16dde 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,7 +1,4 @@
-DIST wps-office_10.1.0.5707~a21_amd64.deb 88085156 BLAKE2B 2288080715f0130b70bfcdb2886cfdf9c4648a1373367dde1f9d12b179a2816b75f5e342f73edeedf8305af9e65ecb290a297fb85d6a468087360537f0ef7ae9 SHA512 3812237ef2662a9b7e3777dc253c8c410fca73627eb42e33c177b7a2c52b27324fd3ff75b24e1309ecf77279086ab639e3b7fe3e42a4a420036e2989e1941ebd
-DIST wps-office_10.1.0.5707~a21_i386.deb 87863566 BLAKE2B 617b9f874b063ddbe2040f0a5bf30ec07149dae3f90f84fcba86b2bd2950a233190db72a9ba9d8563413c422a1da0d1b41767a864de6f13974467296f2dcb32e SHA512 0fb3eb873f0017d9dbe7a3dc7d849086cdbbd5eaaf5fbfb9bdbe737c40029799df83d98e4e0bf04f6737a0033c76fccba206a3342624b045e309b6d2c35fffe7
 DIST wps-office_10.1.0.6757_x86.tar.xz 134095644 BLAKE2B ad44db7aa752055b59a52870041aa4c16d146e3068a8d95c8939efcc979a514a3ae6fcde1bca5eb90833c47c051295722e547316337c5f56727252cae133b994 SHA512 ba5001f0fd2a605c3688084d34aa293a728ac46d52379cea6db8c5232c4331e60476d5845087002071f89ec9d8bdf7c020222b4aaff780736eaeff5a273f40ee
 DIST wps-office_10.1.0.6757_x86_64.tar.xz 131336404 BLAKE2B dfaa30f643d9fb08db711cd4ddec76ad3c10bc5435f4c6a2b245b9232059a22f918364e585c9a9551612ee10eff1535a44b5f300a8863f39d4cabb2f7c76b467 SHA512 5f9f88cc9795a317267531cb1cd260d86e1613dc5eef34005eaa58dd8ac0715ce3ba1da60ee83c617cb16d759b0da9274963f8a4fb4a86c4890eca0565af9c62
-EBUILD wps-office-10.1.0.5707_alpha21-r2.ebuild 2804 BLAKE2B c86101eebe727d4d95d405d9e9788b1b4eaa24202c1a0496e97ec96af01101021e28c7e5f61d4e05c2256fce1e5ce2147541bb0763bcf882c0801bdd9b4b5c1d SHA512 2c9df6a7fcc200f2fb4890adac7b73fc6f1407bd534df924960e9518031f9c2a53a701f851cab80c13826bc5624c4b5088760839a48ee5277f27d75065692de4
 EBUILD wps-office-10.1.0.6757.ebuild 2358 BLAKE2B 4f7d0e48f56025adfa7b8b1b79806cb1a4fa57a57e15efcc397b33985b27707f48bfdca811e75aae72b5d9bb513cf6c97b0a23706cdbe4e08b8aa92b1452064c SHA512 bfec3ffabd76717950b4a1a1c09c892ca22a95fc6c8f54a7bbfc3440b07783accdc95303901e3847b179c9790400f7e527fb83327169ed51c81a896f1bb71d5c
-MISC metadata.xml 325 BLAKE2B e69a86660b1803578e847d64001b10f79bf3bb1fde9a226bcfe4b972183c947dfaaa292c8256cf635db263dae17ca34e796a89142fc6bce87f2efc8514821eb7 SHA512 f0dc46dcbbf409c15db60a6dc1b0e002300d0813385ff5bc006c333bea01be8c037edab4808b67256cd90a31790ad70f432eaedd41f8da8e4fa78e3f7440ac84
+MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/app-office/wps-office/metadata.xml b/app-office/wps-office/metadata.xml
index c659f42cdfe7..f61881680816 100644
--- a/app-office/wps-office/metadata.xml
+++ b/app-office/wps-office/metadata.xml
@@ -5,7 +5,4 @@
 	<email>pacho@gentoo.org</email>
 	<name>Pacho Ramos</name>
 </maintainer>
-<use>
-	<flag name="sharedfonts">Install WPS fonts available system wide</flag>
-</use>
 </pkgmetadata>
diff --git a/app-office/wps-office/wps-office-10.1.0.5707_alpha21-r2.ebuild b/app-office/wps-office/wps-office-10.1.0.5707_alpha21-r2.ebuild
deleted file mode 100644
index e2d25752dda6..000000000000
--- a/app-office/wps-office/wps-office-10.1.0.5707_alpha21-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit font gnome2-utils unpacker versionator xdg
-
-MY_PV="$(get_version_component_range 1-4)"
-MY_V="$(get_version_component_range 5)"
-
-if [ -z "$(get_version_component_range 6)" ]; then
-	MY_SP=""
-else
-	MY_SP="$(get_version_component_range 6)"
-fi
-
-case ${PV} in
-	*_alpha*)
-		MY_BRANCH=${MY_V/alpha/a}
-		;;
-	*_beta*)
-		MY_BRANCH=${MY_V/beta/b}
-		;;
-	*)
-		die "Invalid value for \${PV}: ${PV}"
-		;;
-esac
-MY_VV=${MY_PV}~${MY_BRANCH}${MY_SP}
-
-DESCRIPTION="WPS Office is an office productivity suite"
-HOMEPAGE="http://linux.wps.cn/ http://wps-community.org/"
-
-KEYWORDS="~amd64 ~x86"
-
-SRC_URI="
-	x86? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_i386.deb )
-	amd64? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_amd64.deb )
-"
-
-SLOT="0"
-RESTRICT="strip mirror" # mirror as explained at bug #547372
-LICENSE="WPS-EULA"
-IUSE="+sharedfonts"
-
-# 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=""
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-	# We need to drop qtwebkit bundled lib completely because it causes
-	# crashes in *some* setups (https://bugs.gentoo.org/647950)
-	rm -f "${S}"/opt/kingsoft/wps-office/office6/libQtWebKit* || die
-}
-
-src_install() {
-	exeinto /usr/bin
-	exeopts -m0755
-	doexe "${S}"/usr/bin/wps
-	doexe "${S}"/usr/bin/wpp
-	doexe "${S}"/usr/bin/et
-
-	if ! use sharedfonts; then
-		insinto /opt/kingsoft/wps-office/office6/fonts
-		doins -r "${S}"/usr/share/fonts/wps-office/*
-		rm -rf "${S}"/usr/share/fonts || die
-	fi
-
-	insinto /usr
-	doins -r "${S}"/usr/share
-
-	insinto /
-	doins -r "${S}"/opt
-	fperms 0755 /opt/kingsoft/wps-office/office6/{wps,wpp,et}
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use sharedfonts && font_pkg_postinst
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}