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

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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 bb708993be7200f78471a155d8575db775f3e370..e626ce68bd92c7e0133f1783c7516b0daa024894 100644 (file)
--- 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/