Merge updates from master

This commit is contained in:
Repository QA checks
2015-09-05 04:07:27 -04:00
4 changed files with 7 additions and 130 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
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
DIST wps-office_9.1.0.4975~a19p1_amd64.deb 64716800 SHA256 79a49c9db0c4482c894e3c334e38bd299302e1c4bb4cd387f6a615f9e054a25d SHA512 f92415eb8d652afa6601dbea8f87949ed05d970e610c5aedebda21f2b0386a80bcea164f86e7c680946302d2f953067fc88889891a346353e4f15b547ecb8a3a WHIRLPOOL b8603756e4d3b09691974966d62f80dbe1ec668ae2eb5d99bbe2ad39a6c944de89292ede651143d894fad2631f7686036cd4a281ed5265a09f1af6361d75ea77
DIST wps-office_9.1.0.4975~a19p1_i386.deb 15731896 SHA256 c2732b2cf5a2f5166388546d895d74636353770ff9697c3e5120deacbc475b9d SHA512 6455becb978403efc5c2a8266c4a95b3bc880c33430a88e8f79af9967b685fe313281c1e0792ec22778f81c2502dcae63668d58b40195d5707ef50fdc29a89ad WHIRLPOOL cd2f5b06949cecf052e36cbd7df1e37f4e105257ee3c015aa115828a50c1c4eaee942151200e7248f05ee066f6d4d1d1c6be376fa5d22cf391111c2b8509dcaf
-1
View File
@@ -6,7 +6,6 @@
<name>Pacho Ramos</name>
</maintainer>
<use>
<flag name="corefonts">Ensure <pkg>media-fonts/corefonts</pkg> is present</flag>
<flag name="sharedfonts">Preserve fonts from WPS</flag>
</use>
</pkgmetadata>
@@ -1,121 +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="corefonts +sharedfonts"
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="
${NATIVE_DEPEND}
corefonts? ( media-fonts/corefonts )
net-nds/openldap
dev-db/sqlite:3
"
DEPEND=""
S="${WORKDIR}"
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
}
@@ -40,12 +40,12 @@ SRC_URI="
SLOT="0"
RESTRICT="strip mirror" # mirror as explained at bug #547372
LICENSE="WPS-EULA"
IUSE="corefonts +sharedfonts"
IUSE="+sharedfonts"
UNBUNDLED_LIBS="
dev-qt/qtwebkit:4
media-libs/tiff:3
"
# media-libs/tiff:3
# dev-qt/qtwebkit:4
# dev-qt/qtcore:4
# dev-qt/qtdbus:4
# media-libs/phonon
@@ -84,7 +84,6 @@ NATIVE_DEPEND="
RDEPEND="
${UNBUNDLED_LIBS}
${NATIVE_DEPEND}
corefonts? ( media-fonts/corefonts )
net-nds/openldap
dev-db/sqlite:3
"
@@ -99,9 +98,9 @@ src_prepare() {
# rm -f libQtCore.so* || die
# rm -f libQtDBus.so* || die
# rm -f libQtNetwork.so || die
rm -f libQtWebKit.so* || die
# rm -f libQtWebKit.so* || die
# rm -f libphonon.so*
rm -f libtiff.so.4* || die
# rm -f libtiff.so.4* || die
}
src_install() {