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

[Heather Cynede]

commit:     f1c6ebcfd29c7c07739d10ed125c8a90259bae22
Author:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 14:19:30 2016 +0000
Commit:     Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Wed Jul  6 12:22:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1c6ebcf

app-office/wps-office: bump/repair

Package-Manager: portage-2.3.0

 app-office/wps-office/Manifest                     |   6 +-
 .../wps-office-10.1.0.5460_alpha20_p1.ebuild       | 141 ---------------------
 ...build => wps-office-10.1.0.5672_alpha21.ebuild} |   4 +-
 3 files changed, 4 insertions(+), 147 deletions(-)

diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index bc9f0ed..dd037ce 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,4 +1,2 @@
-DIST wps-office_10.1.0.5460~a20p1_amd64.deb 81891888 SHA256 5e4844a0da411f2ff01d3b1dd03ff7291799001ee7a78925d8c5dd3ca3fce8d0 SHA512 ae3ff4923177f6fa8e097099045b7c7c7b03473cb55a074cc84a184e0e263445287783b9a123847645573928393708f0480300132614067c04fd2cb3a11076ec WHIRLPOOL 8d0c6b596401e6dcdc5c11cd3cf2f842a3dbf52232a2b128a8678c86107ddc0aae9191de93bbb555fc3c0b57293348a1998cd20a8bd6063b7deb3855b813856e
-DIST wps-office_10.1.0.5460~a20p1_i386.deb 81407384 SHA256 cf314da6a7f82a72664633f90bbfc75940a931661c01b6904db5229445d00fd0 SHA512 d720ca78a35bf60fcdb209bd19b5c0d865da87681e08cf7848a01a76f260f23f5de41ba9d3c635f300cd27518f6b0643f6476970128fbb40429ffbc0d76d945c WHIRLPOOL edf33b0a1e2ebf2288bf6a6bf3ad216d99efd7bf68fad1c5c1aab216fc42c03ec503dacb60e6140873374006520b6d292ff03455d1368124fab3ab88989169c1
-DIST wps-office_10.1.0.5503~a20p2_amd64.deb 82023734 SHA256 c6667a590eddc6b7478a6493f5c700ccec04b6a164fdcbc06765afaf8322b4c2 SHA512 e2d5b21d116763d95438218a3beff3a9450271d7d972a95e86824436991c6ac5b77e0ed443ce48a4b2ea0edda15989fdffaf99c553c30fb81ef60e4015802e43 WHIRLPOOL 10aeee458a1b3a6a3555a5ff726c27a09fe743cb009ffedf3483f20774890e63287e50d162c9a6888863117434e03627065dabb6fd8a1f1405e0657daf941c0f
-DIST wps-office_10.1.0.5503~a20p2_i386.deb 81588594 SHA256 b5635fc5b00eea3de1e95875378426b7002b9944295a7a5e6290602fe0282a0c SHA512 843d8d59a2ac60f21354f9028db6de3ec1e28bffb08366e859b2d3aac4a0cd31e510ecbf6eb6445e5b1357e124d6d273fdf9d3b8124d7ff57c7421f28574d642 WHIRLPOOL 3d80f3cc6bcd03ab350dcc5fc7fea2ba71e34d6fe83cf4a543722080e2c08f5b358f00aadcb77f8dc62b65d5dbda9f52f90de8f2dc5cf92779aa0e573d6d69d8
+DIST wps-office_10.1.0.5672~a21_amd64.deb 82319222 SHA256 d6d27039a9a70f4f12cc2522a64a318533746da71f29d012e79b3aef63425bdc SHA512 f90491819795b73ed6cca8b133c3ba76ae8bf26f01c6166e63e3d4f9dfc60acb3115a4612eec87fc3f6aaf6e8f7514d7f82d995e36013fe6486a819cf67734ba WHIRLPOOL b04e39b8a5efe24340c24932503a2eb72ff0217ac0a625ae810776aab616303730d81c50544ee7ac61c28a5ed5f9bc5776b09ed5de78b62e7cd526b82e9cd141
+DIST wps-office_10.1.0.5672~a21_i386.deb 81926170 SHA256 c5bf75e057b7070c803bf74cd8a12689322d8397b906219d41f9ebacdfbb2880 SHA512 47d52f51419fed6671626ef2ced5f31b40787044d604b0168b3e185eab505e211f029ad5ec7d1170b00849f19c02e474896b09829541bf0177a7f047f9a7dbf0 WHIRLPOOL a1473b1ea21a28ca719567833cfe4eb57d97fe726fa751e37794988f51571186bc5e29f453c5411b551ee7ae7ef469311962e7b8e9020f71efe0ef26bcbd9647

diff --git a/app-office/wps-office/wps-office-10.1.0.5460_alpha20_p1.ebuild b/app-office/wps-office/wps-office-10.1.0.5460_alpha20_p1.ebuild
deleted file mode 100644
index cd7c16f..0000000
--- a/app-office/wps-office/wps-office-10.1.0.5460_alpha20_p1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="
-"
-#	media-libs/tiff:3
-#	dev-qt/qtwebkit:4
-#	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
-}

diff --git a/app-office/wps-office/wps-office-10.1.0.5503_alpha20_p2.ebuild b/app-office/wps-office/wps-office-10.1.0.5672_alpha21.ebuild
similarity index 98%
rename from app-office/wps-office/wps-office-10.1.0.5503_alpha20_p2.ebuild
rename to app-office/wps-office/wps-office-10.1.0.5672_alpha21.ebuild
index c124c38..3ccf239 100644
--- a/app-office/wps-office/wps-office-10.1.0.5503_alpha20_p2.ebuild
+++ b/app-office/wps-office/wps-office-10.1.0.5672_alpha21.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI=5
 inherit fdo-mime font gnome2-utils unpacker versionator
 
 MY_PV="$(get_version_component_range 1-4)"