[gentoo-commits] repo/gentoo:master commit in: app-office/wps-office/

["Pacho Ramos" <pacho@gentoo.org>]

commit:     0e02cd2b49d85afabe3208c4d65bf929c0b629fc
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 19:05:36 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 19:06:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e02cd2b

app-office/wps-office: We also need system copy of phonon

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 ...alpha21.ebuild => wps-office-10.1.0.5672_alpha21-r1.ebuild} | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app-office/wps-office/wps-office-10.1.0.5672_alpha21.ebuild b/app-office/wps-office/wps-office-10.1.0.5672_alpha21-r1.ebuild
similarity index 92%
rename from app-office/wps-office/wps-office-10.1.0.5672_alpha21.ebuild
rename to app-office/wps-office/wps-office-10.1.0.5672_alpha21-r1.ebuild
index bb708993be7..e626ce68bd9 100644
--- a/app-office/wps-office/wps-office-10.1.0.5672_alpha21.ebuild
+++ b/app-office/wps-office/wps-office-10.1.0.5672_alpha21-r1.ebuild
@@ -1,5 +1,6 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Id$
 
 EAPI=6
 inherit fdo-mime font gnome2-utils unpacker versionator
@@ -42,12 +43,15 @@ 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
-#	media-libs/phonon
 
 NATIVE_DEPEND="
 	app-arch/bzip2
@@ -91,6 +95,8 @@ 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/