Version bump, drop corefonts USE flag as it's only used to pull in that package.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 156 insertions, 5 deletions

diff --git a/app-office/wps-office/ChangeLog b/app-office/wps-office/ChangeLog
index 65fd6d8f1527..e0e34f99d039 100644
--- a/app-office/wps-office/ChangeLog
+++ b/app-office/wps-office/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/wps-office
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/wps-office/ChangeLog,v 1.2 2015/05/26 20:39:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/wps-office/ChangeLog,v 1.3 2015/06/17 18:58:20 pacho Exp $
+
+*wps-office-9.1.0.4961_alpha18_p1 (17 Jun 2015)
+
+  17 Jun 2015; Pacho Ramos <pacho@gentoo.org>
+  +wps-office-9.1.0.4961_alpha18_p1.ebuild:
+  Version bump, drop corefonts USE flag as it's only used to pull in that
+  package.
 
 *wps-office-9.1.0.4953_alpha18-r1 (26 May 2015)
 
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index 40def66e9cbe..c3edb23f2b20 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -3,14 +3,17 @@ Hash: SHA256
 
 DIST wps-office_9.1.0.4953~a18_amd64.deb 67389656 SHA256 e98793e25261bbd92b465eca53300d36e837adb7abb1a74d5241081f7069669f SHA512 8e2d2aba488f359cc841b7513dfd50cb6abc95a4f4abffe7f8d21d0ec3ad0ac97ac35b602fd60688232847a0ba3942e47571cc6ef63d48b52a1a0f4d0dc68c08 WHIRLPOOL 70dc5382cad1de5f490085af35cac58d9edefbd2acfda37ef6bf1739ea3b047d704871a83a3562d73e425f9de86011cc0ca27a582c1133a7ce8f735c606cbc61
 DIST wps-office_9.1.0.4953~a18_i386.deb 74618126 SHA256 f471094a61c0153ef3f63081430151ebbc7cb7a7b6c191e32867f98567473851 SHA512 9e41e6805527ceb6d8099b5c0bac0d6554ee856844c422529c837a8b713acacf056b8e8c2ff311197730cef4179677be0c0246df94022c7431caa054f440af10 WHIRLPOOL 957d21b3d2fe378cc55a3f8c684c23d5c8247bfb91217ddce80e08812518da32cbdee2edfee850c213bb4b0eff2b6b82d6ace77d4b22304349ee6daf88b74ac1
+DIST wps-office_9.1.0.4961~a18p1_amd64.deb 67419632 SHA256 a37c28648d571571351582e0863d252fc7378da87683c335ee93937a09924a6f SHA512 c828f9cc3383a33db533ada811dd8ca2d80599b8c49d9f1a4fd6080386245aae7a5bc71b2e628cacb2bf9c07b2619417afebf990c6332abb4e23ade2ef0f471f WHIRLPOOL c46cf46a6bd8249c5f6643fbc61c03a374e264a3577e66c32e459b95ae7fe4ef663488657a2c4ba4ef79a32dddbe0ae63515f7efcd898dada698528d74778386
+DIST wps-office_9.1.0.4961~a18p1_i386.deb 74647622 SHA256 e5e6f2813d3e778c68c3bc810ebe95ee862700c7ebf823f10a70dffbea1cd81c SHA512 7d90812e4a5a23f7d55f30c24831f8c17825048da14de6689cd8df9c4ce0cfb62982a05da78cbdc314e174b0e965c04852b104dd4d44bd1b76af45fdeba604d8 WHIRLPOOL 83fe9921bb71e2541790bff44728cd3ae5d557819ee25f103f5b3cb4c4e8d4801d2f402029371b8a58d6bdb5459efe8f5f64777b763070ab79d9690915c2b87d
 EBUILD wps-office-9.1.0.4953_alpha18-r1.ebuild 3042 SHA256 a45c42a0f7947ab9e32e902222c26cff45e230550d424bae44d3b1af47ad5294 SHA512 e5a9005c6a235b8e4358c4a702b7faf53508e3fb4ab6d60cf268236a17be8c4af618265d11405f7acb2032640fae712109d5eea877fc35f1ef9e3c0b4af1b78b WHIRLPOOL 1f3b7c22fb666143661c89e2584c618314ed866db59f372b123b25c2d9dd85f7c10347699b552ed350373262821874376cea99e1f8621436e97f567c9f318a86
 EBUILD wps-office-9.1.0.4953_alpha18.ebuild 2572 SHA256 5a0f5562397bfa6eafd696808040cd6620a6e27ed0ab0e1443be2b6c7e39d462 SHA512 a3088006ebdee8349b77c604905133cd6642e5c4077c4397948a58529a7560c58b304e70d57868c3b2363e4dd09c7b55b48c68b5ffc183a99f5e8edafa7ef460 WHIRLPOOL 5a17778dbf63eb013770a604f3cb8b043a8aab4dffb552533915db5613e5f911429a751336e27f79f97614102674127a256c53ad8529aa73bd980aac47b1c8c3
-MISC ChangeLog 632 SHA256 0d472096963e7065b7262c1ddd0d2c1b1dbf67cd999303bbbb5476a8ec634724 SHA512 d0299fcb1c03a646ab7ef756857e49ab74a1ec983858a164a65039ba1412c0f574aecaafe1cfd99af0fc1b902701d5cf9f610939278349a8aececafcd53d0eed WHIRLPOOL 192391cb5480c56a063bd3e4afc81bb5cd52962cd5b4d478dd6fc2f13131ab54541193bcad8826411fea394ac2093300f9f93560886da5bd291b3f9d68594945
+EBUILD wps-office-9.1.0.4961_alpha18_p1.ebuild 2994 SHA256 39968cc04e18403b1fb4d8ba42d9acd8aa48bab19364a4a70280b773229bc01f SHA512 9fded4a34ab62a3be85caac10a9479d3f08e630377fe5aa55bff5ed4e5b1b755217c383d284f657f5bdd4ae099ffca97c2cfc753d6fcb2960a0e5795d9cace2f WHIRLPOOL 83cab89ffc41e37d460e370d53b8b0ce9d0e1d53104c94811c30bcd557dcf42a455e8b47cd031ffeaf0c31c5224fb42858d74fa76928063266b0abc38cf72302
+MISC ChangeLog 857 SHA256 5b1950712f891946274580895146ea02167443b270b9254b155ea424ad2cf386 SHA512 10930defac05f9c80d7754a182db56051020aa4f5dd54885f211eeab310fa618d663ed224b68d9764f8cd485c56d32310e32fe1008073981022d01ef78d1626f WHIRLPOOL 9b5483e80ac07a9c90c2a2cfa1dfd218959926cb238dc6986d6e896f1ecc871b8ca39022b60a100d7a2e5fc49d396ca67a0b07bd4216426ea73f449c08dedf30
 MISC metadata.xml 377 SHA256 446175a2300682ce59b3a4991efd32e8ba804bf1fcf175f0bb2c292a907d1a0d SHA512 c7febfe6b48909f64b8d550dd4971ecd57ebf046b90cfa4650161271f145debbb8f6e8b31515c7fc4319028819c1415beba3ff7ee12e3c9a82c7a867c1265628 WHIRLPOOL b307a4f2ca4b31b96e8fbb116e16c6b12adfaf2098dea3932a4c9fe4201e1ef0030ad952b63420931a3f15d913edfe2ace72090d301b2caf84f4c4e294aae1aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVk2ggACgkQCaWpQKGI+9R+sQCffCS66Ibtt2pbZrKq0BYy1fMu
-FKcAmwQrLqJTpZ73YS3x2FKOpbMOlSKc
-=yTIo
+iEYEAREIAAYFAlWBw00ACgkQCaWpQKGI+9SRLACcDtndlXdbYE/Ew/nVaSrj+jBH
+G9EAmwWUvM/tD1ZY6yAsMq44ZUjv7N8g
+=Vp/J
 -----END PGP SIGNATURE-----
diff --git a/app-office/wps-office/wps-office-9.1.0.4961_alpha18_p1.ebuild b/app-office/wps-office/wps-office-9.1.0.4961_alpha18_p1.ebuild
new file mode 100644
index 000000000000..224b7897f128
--- /dev/null
+++ b/app-office/wps-office/wps-office-9.1.0.4961_alpha18_p1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/wps-office/wps-office-9.1.0.4961_alpha18_p1.ebuild,v 1.1 2015/06/17 18:58:20 pacho Exp $
+
+EAPI=5
+inherit fdo-mime font gnome2-utils unpacker versionator
+
+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/"
+
+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"
+
+UNBUNDLED_LIBS="
+	dev-qt/qtwebkit:4
+	media-libs/tiff:3
+"
+#	dev-qt/qtcore:4
+#	dev-qt/qtdbus:4
+#	media-libs/phonon
+
+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
+	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
+	net-print/cups
+"
+RDEPEND="
+	${UNBUNDLED_LIBS}
+	${NATIVE_DEPEND}
+	net-nds/openldap
+	dev-db/sqlite:3
+"
+DEPEND=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+	# 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
+	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() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use sharedfonts && font_pkg_postinst
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}