gentoo resync : 15.02.2018

2 files changed, 46 insertions, 61 deletions

diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index de9773122186..dbc278c5b319 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,4 +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
-EBUILD wps-office-10.1.0.5707_alpha21.ebuild 3070 BLAKE2B 804e1b24c2edda2ddf3852974b1ae9549b911b9f9e7d7472796526fcf94c2eb8dca28a6f84919e767486e1d880a9a96430bc66c430dd22f27ba04aed29a12521 SHA512 7cc98570d739126a8f32ee5c8ab86ef004257cd790d72012de8673c4389b053245cb85abf714bd6b227342e675e36d4ae9dc9e78eadddf8e866f8e0a9e258bee
+EBUILD wps-office-10.1.0.5707_alpha21-r1.ebuild 2629 BLAKE2B 0f8590d1e61368cb3153c2dc6ae04ddba1fb7ecc42a8e658d3de1ba0e290f6beba54084215a5858b9393d9279cdd6a0d2238bed5adf14c4899b8c4527aeafe8a SHA512 7d147ca953112aa9d1e121ee5b53ab7f841e5744706dd7a29509c2c798c5489f821430de74b08782808e619bc10ddd48404fbca3e7e711e1c0e95ffacf5e5319
 MISC metadata.xml 325 BLAKE2B e69a86660b1803578e847d64001b10f79bf3bb1fde9a226bcfe4b972183c947dfaaa292c8256cf635db263dae17ca34e796a89142fc6bce87f2efc8514821eb7 SHA512 f0dc46dcbbf409c15db60a6dc1b0e002300d0813385ff5bc006c333bea01be8c037edab4808b67256cd90a31790ad70f432eaedd41f8da8e4fa78e3f7440ac84
diff --git a/app-office/wps-office/wps-office-10.1.0.5707_alpha21.ebuild b/app-office/wps-office/wps-office-10.1.0.5707_alpha21-r1.ebuild
index e480a1469eb2..d892d28e7b2d 100644
--- a/app-office/wps-office/wps-office-10.1.0.5707_alpha21.ebuild
+++ b/app-office/wps-office/wps-office-10.1.0.5707_alpha21-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit fdo-mime font gnome2-utils unpacker versionator
+inherit font gnome2-utils unpacker versionator xdg
 
 MY_PV="$(get_version_component_range 1-4)"
 MY_V="$(get_version_component_range 5)"
@@ -41,72 +41,57 @@ RESTRICT="strip mirror" # mirror as explained at bug #547372
 LICENSE="WPS-EULA"
 IUSE="+sharedfonts"
 
-UNBUNDLED_LIBS="
-	media-libs/phonon
-"
-# Not fully unbundled: media-libs/phonon , libkso.so needs system copy, but
-# wpp fails to run if bundled one is not present due to invalid symbols
-#	media-libs/phonon
-#	media-libs/tiff:3
-#	dev-qt/qtwebkit:4
-#	dev-qt/qtcore:4
-#	dev-qt/qtdbus:4
-
-NATIVE_DEPEND="
-	app-arch/bzip2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libffi
-	dev-libs/libxml2:2
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	media-libs/glu
-	media-libs/gst-plugins-base:0.10
-	media-libs/gstreamer:0.10
-	media-libs/libpng:1.2
-	virtual/opengl
-	media-libs/tiff:3
-	sys-apps/util-linux
-	sys-libs/zlib
-	x11-libs/libdrm
+# 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/libXau
-	x11-libs/libxcb
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
 	x11-libs/libXext
-	x11-libs/libXfixes
 	x11-libs/libXrender
-	x11-libs/libXxf86vm
-	media-libs/libmng
+	x11-libs/libxcb
+	sys-devel/gcc
+	sys-libs/glibc
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	dev-libs/glib:2
+	sys-libs/zlib:0
 	net-print/cups
-"
-RDEPEND="
-	${UNBUNDLED_LIBS}
-	${NATIVE_DEPEND}
-	net-nds/openldap
-	dev-db/sqlite:3
+	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/systemd
+	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
-
-	# Remove bundled libs and rely on system versions if possible
-	# Commented lines are about the libs that cannot be unbundled yet.
-#	cd "${S}"/opt/kingsoft/wps-office/office6/
-#	rm -f libQtCore.so* || die
-#	rm -f libQtDBus.so* || die
-#	rm -f libQtNetwork.so || die
-#	rm -f libQtWebKit.so* || die
-#	rm -f libphonon.so*
-#	rm -f libtiff.so.4* || die
-#}
-
 src_install() {
 	exeinto /usr/bin
 	exeopts -m0755
@@ -129,17 +114,17 @@ src_install() {
 }
 
 pkg_preinst() {
+	xdg_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
 	use sharedfonts && font_pkg_postinst
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_pkg_postinst
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_pkg_postrm
 	gnome2_icon_cache_update
 }