commit: 92487ce0347faa3a5a6c3a5728e6ce4e7c114e7d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Mar 12 22:49:20 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Mar 13 15:50:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92487ce0
app-office/libreoffice: Update dependencies New dependency: games-engines/box2d-2.4.1 Raise dev-libs/liborcus slot dep to 0/0.16 Raise net-libs/neon minimum dep to 0.31.1 and add slot op Drop nonexistent blocker against app-office/openoffice Drop appdata downstream fix: Upstream commit e98c4be2c87ba5b3f4aedc31388014b320588d4b Update skia bundled tarball Thanks-to: jospezial <jospezial <AT> gmx.de> Bug: https://bugs.gentoo.org/768570 Closes: https://bugs.gentoo.org/737720 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-office/libreoffice/Manifest | 1 + app-office/libreoffice/libreoffice-9999.ebuild | 11 +++-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 25c3a0d4e76..75a8e17cba5 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -23,3 +23,4 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd234 DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3 DIST libreoffice-help-7.0.5.2.tar.xz 110757908 BLAKE2B 34123bf06d52e6fe766179d74ce28943ff70bd1af4656c396d10c237d9f583034a6ba25586f29f1aad56b155d350827640381a3d3333b7e9e17995c0420e4bc9 SHA512 42935916ea31d2aea35386566754dbd2e37fa9cd2b29e6c2cca1ec7e672d10e345a92874e5875ced98d5625fd5329bd2db87ef81d3f00a1035044a9557202b31 DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe SHA512 4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1 +DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index e89f80aedfa..a38aba75536 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -47,7 +47,7 @@ ADDONS_SRC=( # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c "${ADDONS_URI}/dtoa-20180411.tgz" # not packaged in Gentoo, https://skia.org/ - "${ADDONS_URI}/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz" + "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz" # QR code generating library for >=libreoffice-6.4, bug #691740 "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz" "base? ( @@ -136,6 +136,7 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC + >=games-engines/box2d-2.4.1:0 dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat @@ -164,7 +165,7 @@ COMMON_DEPEND="${PYTHON_DEPS} >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf - net-libs/neon + >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib @@ -267,7 +268,6 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} !app-office/libreoffice-bin !app-office/libreoffice-bin-debug - !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( || ( @@ -639,11 +639,6 @@ EOF dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc} done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0) done - - # bug 709450 - mkdir -p "${ED}"/usr/share/metainfo || die - mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die - rmdir "${ED}"/usr/share/appdata || die } pkg_postinst() {
