From f4fc10428424904caf2035cffc442195cb088b2c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Jul 2021 10:27:13 +0100 Subject: gentoo resync : 28.07.2021 --- app-office/Manifest.gz | Bin 8065 -> 8060 bytes app-office/mdbtools/Manifest | 1 - .../files/mdbtools-0.7.1-parallel-make.patch | 17 ---- app-office/wps-office/Manifest | 2 +- .../wps-office/wps-office-11.1.0.10161-r1.ebuild | 93 +++++++++++++++++++++ .../wps-office/wps-office-11.1.0.10161.ebuild | 93 --------------------- 6 files changed, 94 insertions(+), 112 deletions(-) delete mode 100644 app-office/mdbtools/files/mdbtools-0.7.1-parallel-make.patch create mode 100644 app-office/wps-office/wps-office-11.1.0.10161-r1.ebuild delete mode 100644 app-office/wps-office/wps-office-11.1.0.10161.ebuild (limited to 'app-office') diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz index 7b8c6f5cfe37..ca8f9c507ff8 100644 Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest index 4a72d9ca272b..2d6df9f1dd6a 100644 --- a/app-office/mdbtools/Manifest +++ b/app-office/mdbtools/Manifest @@ -1,4 +1,3 @@ -AUX mdbtools-0.7.1-parallel-make.patch 513 BLAKE2B 1f9e2ccebe4dbf4bbf4655eef237da00016fe060a43ef7a2479b6bd83f98f198959fb3101a97ad016c81ab7d09cf006cb8531c675a066bb6e185282cc8e16609 SHA512 946139271a757a8beeeb03a909104bc348cbc081a9ef6dde7f739865c775cce06717de57560a49b5055d5196b1f3985824b80b728f139cf7684c0ba847f4bd85 AUX mdbtools-0.9.2-unixODBC-respect-libdir.patch 1439 BLAKE2B 9afc3b2951947593c029eeff66ebcc93da8ff34ef5d1cf25d08848fb950b2cafa533e08b682cf1a5f11eeec1dcc6e1d0df2f9712d576ac2f63bb207ab6c16b42 SHA512 08df20d8f60a8a1323685571649c7fa0127fa4a29a9fbbf431d51265e06194017f71eb6c7d186a3160679971ebd7cc64b5c1f2e428c939dd7dd79b98952816d7 DIST mdbtools-0.9.2.tar.gz 214246 BLAKE2B f62ffae2b084e53f7222ab969aa7f57f65735281383f93aeb025cff38b32b9aa22ffffb819532f816cc45a9156f7136bd9de953b17b86817380123451d51170c SHA512 cb2bddca83eb9867b765f6fc57fb289f91ce4e2e09dd953e338c26f6c4bcfe9ddb53368c4eef6d02927e582c2e10312462b82916c2e956fa269f25a765371d8d DIST mdbtools-0.9.3.tar.gz 214697 BLAKE2B 59aca58d11b9c513c8d5b8401423b04484657543d742e20e058e7b29e8225a2c2c3b6e5a95a61a2214a1323b1c5d80b08a71c9f9bcdbf2f35b079a7b05919841 SHA512 3ceb9e374fd638a01d087a1f5e8fb357b24f0a85a8f9c65743a78ec1d6a981fed299744610382ae525f3781e73e268de5c4bb2e48eff78e48b197e2add23587e diff --git a/app-office/mdbtools/files/mdbtools-0.7.1-parallel-make.patch b/app-office/mdbtools/files/mdbtools-0.7.1-parallel-make.patch deleted file mode 100644 index 25201aac643d..000000000000 --- a/app-office/mdbtools/files/mdbtools-0.7.1-parallel-make.patch +++ /dev/null @@ -1,17 +0,0 @@ -Patch for fixing parallel make issue, bug #486434 - -Related links: - -https://github.com/brianb/mdbtools/issues/33 -https://github.com/brianb/mdbtools/issues/35 - -diff --git a/src/sql/Makefile.am b/src/sql/Makefile.am -index 633f0c3..94b0838 100644 ---- a/src/sql/Makefile.am -+++ b/src/sql/Makefile.am -@@ -1,3 +1,5 @@ -+BUILT_SOURCES = parser.h -+AM_YFLAGS = -d - lib_LTLIBRARIES = libmdbsql.la - libmdbsql_la_SOURCES= mdbsql.c parser.y lexer.l - libmdbsql_la_LDFLAGS = -version-info 2:0:0 -export-symbols-regex '^mdb_sql_' diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest index 83a395ac925b..97f651020a67 100644 --- a/app-office/wps-office/Manifest +++ b/app-office/wps-office/Manifest @@ -1,3 +1,3 @@ DIST wps-office_11.1.0.10161.XA_amd64.deb 228984666 BLAKE2B 2b2a5f2048c0e5b292571875197fa51cc5ec25bd59a03bdedad20513b203bc92ea9420881c87352cbe5a0aca25f386f773bb1e1e250fec5ba774b240fc649c95 SHA512 bdc0b8e8c04a904ed5e8f6ecf332db1217c0929dc845b63f13ea074fa508332c5272d087a0502ed92601ab964936c7b458ac5f37a72049d3a5f579649765285f -EBUILD wps-office-11.1.0.10161.ebuild 2037 BLAKE2B 6d973156070e35aface94ab5033b8da5e426f175ae7da53dcec4bc668c78c1c89a88544a0f4ec78355363d70edda342c7ff29f938be4d5e1a981c95d9c23f6dc SHA512 a8bf0b09a52a617acc117496566767ec509962c3071342545786a5bb32d3d7cb4b6e12260cb83f414bc4adefe4bded828819616cdfd32c64ec3ed52622a7dc42 +EBUILD wps-office-11.1.0.10161-r1.ebuild 2041 BLAKE2B bbaebbac15181853f37c0657133747d982fe81f6eb9f503774df9b7aca2067aa6537e5145b342f0d9736014a331c818f765ce228657ac7c68314c008f67ee31a SHA512 ea7a25cbc7fea34df90945448af4284c1243ca60c1d737bfd5118678a1ff37d380ba32308cffd190cd27d3cb242e573f8db5250fa451203752cba1059792d370 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623 diff --git a/app-office/wps-office/wps-office-11.1.0.10161-r1.ebuild b/app-office/wps-office/wps-office-11.1.0.10161-r1.ebuild new file mode 100644 index 000000000000..03337b3698f2 --- /dev/null +++ b/app-office/wps-office/wps-office-11.1.0.10161-r1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit unpacker xdg + +MY_PV="$(ver_cut 4)" + +DESCRIPTION="WPS Office is an office productivity suite" +HOMEPAGE="https://www.wps.cn/product/wpslinux/ http://linux.wps.com/" + +KEYWORDS="~amd64" + +SRC_URI="https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}.XA_amd64.deb" + +SLOT="0" +RESTRICT="strip mirror" # mirror as explained at bug #547372 +QA_PREBUILT="*" +LICENSE="WPS-EULA" +IUSE="" + +# Deps got from this (listed in order): +# rpm -qpR wps-office-10.1.0.5707-1.a21.x86_64.rpm +# ldd /opt/kingsoft/wps-office/office6/wps +# ldd /opt/kingsoft/wps-office/office6/wpp +RDEPEND=" + app-arch/bzip2:0 + app-arch/xz-utils + app-arch/lz4 + dev-libs/atk + dev-libs/expat + dev-libs/glib:2 + dev-libs/libbsd + dev-libs/libffi:0/7 + dev-libs/libgcrypt:0 + dev-libs/libgpg-error + dev-libs/libpcre:3 + dev-libs/nspr + dev-libs/nss + media-libs/fontconfig:1.0 + media-libs/freetype:2 + media-libs/flac + media-libs/libogg + media-libs/libsndfile + media-libs/libvorbis + media-libs/libpng:0 + media-sound/pulseaudio + net-libs/libasyncns + net-print/cups + sys-apps/attr + sys-apps/util-linux + sys-apps/dbus + sys-apps/tcp-wrappers + sys-libs/libcap + sys-libs/zlib:0 + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXau + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libXv + x11-libs/libxcb + x11-libs/pango + virtual/glu +" +DEPEND="" +BDEPEND="" + +S="${WORKDIR}" + +src_install() { + exeinto /usr/bin + exeopts -m0755 + doexe "${S}"/usr/bin/* + + insinto /usr/share + # Skip mime subdir to not get prefence over rest of office suites + doins -r "${S}"/usr/share/{applications,desktop-directories,icons,templates} + + insinto /opt/kingsoft/wps-office + doins -r "${S}"/opt/kingsoft/wps-office/{office6,templates} + + fperms 0755 /opt/kingsoft/wps-office/office6/{et,wpp,wps,wpspdf} +} diff --git a/app-office/wps-office/wps-office-11.1.0.10161.ebuild b/app-office/wps-office/wps-office-11.1.0.10161.ebuild deleted file mode 100644 index aa409f0236cf..000000000000 --- a/app-office/wps-office/wps-office-11.1.0.10161.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit unpacker xdg - -MY_PV="$(ver_cut 4)" - -DESCRIPTION="WPS Office is an office productivity suite" -HOMEPAGE="https://www.wps.cn/product/wpslinux/ http://linux.wps.com/" - -KEYWORDS="~amd64" - -SRC_URI="https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}.XA_amd64.deb" - -SLOT="0" -RESTRICT="strip mirror" # mirror as explained at bug #547372 -QA_PREBUILT="*" -LICENSE="WPS-EULA" -IUSE="" - -# Deps got from this (listed in order): -# rpm -qpR wps-office-10.1.0.5707-1.a21.x86_64.rpm -# ldd /opt/kingsoft/wps-office/office6/wps -# ldd /opt/kingsoft/wps-office/office6/wpp -RDEPEND=" - app-arch/bzip2:0 - app-arch/xz-utils - app-arch/lz4 - dev-libs/atk - dev-libs/expat - dev-libs/glib:2 - dev-libs/libbsd - dev-libs/libffi - dev-libs/libgcrypt:0 - dev-libs/libgpg-error - dev-libs/libpcre:3 - dev-libs/nspr - dev-libs/nss - media-libs/fontconfig:1.0 - media-libs/freetype:2 - media-libs/flac - media-libs/libogg - media-libs/libsndfile - media-libs/libvorbis - media-libs/libpng:0 - media-sound/pulseaudio - net-libs/libasyncns - net-print/cups - sys-apps/attr - sys-apps/util-linux - sys-apps/dbus - sys-apps/tcp-wrappers - sys-libs/libcap - sys-libs/zlib:0 - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXau - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXrender - x11-libs/libXtst - x11-libs/libXv - x11-libs/libxcb - x11-libs/pango - virtual/glu -" -DEPEND="" -BDEPEND="" - -S="${WORKDIR}" - -src_install() { - exeinto /usr/bin - exeopts -m0755 - doexe "${S}"/usr/bin/* - - insinto /usr/share - # Skip mime subdir to not get prefence over rest of office suites - doins -r "${S}"/usr/share/{applications,desktop-directories,icons,templates} - - insinto /opt/kingsoft/wps-office - doins -r "${S}"/opt/kingsoft/wps-office/{office6,templates} - - fperms 0755 /opt/kingsoft/wps-office/office6/{et,wpp,wps,wpspdf} -} -- cgit v1.2.3