From 6471b382a951b256ffa1b8ea3e6e7d7f5b189281 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 6 Nov 2023 04:13:54 +0000 Subject: gentoo auto-resync : 06:11:2023 - 04:13:53 --- app-office/Manifest.gz | Bin 8070 -> 8067 bytes app-office/libreoffice/Manifest | 5 +- app-office/libreoffice/libreoffice-7.5.8.2.ebuild | 3 + app-office/libreoffice/libreoffice-7.5.9999.ebuild | 658 --------------------- app-office/libreoffice/libreoffice-9999.ebuild | 3 + app-office/skrooge/Manifest | 2 - app-office/skrooge/skrooge-2.30.0.ebuild | 99 ---- 7 files changed, 8 insertions(+), 762 deletions(-) delete mode 100644 app-office/libreoffice/libreoffice-7.5.9999.ebuild delete mode 100644 app-office/skrooge/skrooge-2.30.0.ebuild (limited to 'app-office') diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz index f494d831494a..3b259cf81672 100644 Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 31e74b4fb3e7..484de50854b2 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -39,7 +39,6 @@ DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B EBUILD libreoffice-7.5.5.2.ebuild 19359 BLAKE2B ba0b4be02b431b686461fb10e4df551e12a6fbcf871fff563af1a7c4385e99ea11217da69dd6eb94ba1121432991314b1d1565d4032cc523eadc328a288b0798 SHA512 0fdaa16a16e7d91ec8335eb853f2c6e71a9e9f61ffb3f05ae311745b50217ac92a096f02814b1ffabc0431b1a36de9b914a078dd92761cc06190256cd27419df EBUILD libreoffice-7.5.6.2.ebuild 19446 BLAKE2B 7bc24fdae7098c30a0f54f62a61285fde75b2859b42dcf7c5cc5000e00ea01660ee985b9b5830ab4cee65af3205a979c9f955b45e6640f1079a1af4e58ccc2dc SHA512 040fbe601f618075ddda4dedbbbb15fe16a549fb76f2afc71bb5f99775ca16f561b3f316e030624f87b277cda35e411c2f7921b82adee80bf18df9a9d0824a5a EBUILD libreoffice-7.5.7.1.ebuild 19449 BLAKE2B 12fc9e583e53cd5d74b994c9a0370ccec25f0c14ed9a268c0aacb837c69f4987d3cdf859e47f444f2857548c7cd4e2d4366b383c343320a032d4cc5d7b0576f4 SHA512 e3ad6263ba419952fb0f527d19dd31cfb9f479f55a44a3ef2d85bb4cd451f82116ed3cc1099390d8406c68d7f1859d0bc917f514bc0474bd6bba867dddf73fe7 -EBUILD libreoffice-7.5.8.2.ebuild 19449 BLAKE2B b8b0f912095943c6a9c653621b00c3157f516a09eb309cc754aad77c8900d04d5c0551a9d0a77dfb141d986290bd6c2135984ffa2cc0a23157976176183809de SHA512 f77a5384b539e41cde25ba7968875cd08e199b6be3908a38d3485e230f8565e553bcd90ad88988fe2f176ae3484ffe9c7f88b29da967992ec9a5e89764c07510 -EBUILD libreoffice-7.5.9999.ebuild 19449 BLAKE2B b8b0f912095943c6a9c653621b00c3157f516a09eb309cc754aad77c8900d04d5c0551a9d0a77dfb141d986290bd6c2135984ffa2cc0a23157976176183809de SHA512 f77a5384b539e41cde25ba7968875cd08e199b6be3908a38d3485e230f8565e553bcd90ad88988fe2f176ae3484ffe9c7f88b29da967992ec9a5e89764c07510 -EBUILD libreoffice-9999.ebuild 19378 BLAKE2B 7b973cb09b96fe8467ef4e871cbde56b26a334ca1c57c6df4f9216501daf74009f43a940fc5203bc9604c130ede022efb1b87daf02e934bfdd686fa4cb331405 SHA512 dda1b919b55423334b6b8fb70c88a0171565f4f820bc6d4ec78a0b0b58213fcd59aeb287084f94005d459e928e5dc54ad0e7b297bc93098980e8b388598db054 +EBUILD libreoffice-7.5.8.2.ebuild 19520 BLAKE2B 119d01b5ab7efcdec41787b5cf981bbf5757da9da2b261d75e31a103c6de0283c03d68a89d1ab5b155a54e1e5eb4299a94ecdbdcb4b48b6a97fa28031a7ed1f9 SHA512 a1c4cb82b15c939b2abbae52b892764a5ec1b9a85d18a99230da846521499e248d5c579cdf5546ee2a90fb3a69fd556cca3d467309b22934cc0b721dfe1b5cb2 +EBUILD libreoffice-9999.ebuild 19449 BLAKE2B 55ee235108d625f6805369959a4aadf89140856239ec64ec0b2edb728953b7373148b4705598d56cb2bfe01e3fe6e3b2a48f8d48cc1f1d70d1bcde9cae0d9f03 SHA512 b6010e9ae393cfe49f4e09a1c5d5d2e273dd1dc8eb54e1462ea5cded2b76410dd17494516aec30700da48a7f136c5e52b45c2559e230c049176dcbcf8b26907c MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686 diff --git a/app-office/libreoffice/libreoffice-7.5.8.2.ebuild b/app-office/libreoffice/libreoffice-7.5.8.2.ebuild index 996c240bfb6e..6bc10de8a41e 100644 --- a/app-office/libreoffice/libreoffice-7.5.8.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.5.8.2.ebuild @@ -263,6 +263,9 @@ BDEPEND=" virtual/pkgconfig clang? ( || ( + ( sys-devel/clang:17 + sys-devel/llvm:17 + =sys-devel/lld-17* ) ( sys-devel/clang:16 sys-devel/llvm:16 =sys-devel/lld-16* ) diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild deleted file mode 100644 index 996c240bfb6e..000000000000 --- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild +++ /dev/null @@ -1,658 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE="threads(+),xml(+)" - -MY_PV="${PV/_alpha/.alpha}" -MY_PV="${MY_PV/_beta/.beta}" -# experimental ; release ; old -# Usually the tarballs are moved a lot so this should make everyone happy. -DEV_URI=" - https://dev-builds.libreoffice.org/pre-releases/src - https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/ - https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src -" -ADDONS_URI="https://dev-www.libreoffice.org/src/" - -BRANDING="${PN}-branding-gentoo-0.8.tar.xz" -# PATCHSET="${P}-patchset-01.tar.xz" - -[[ ${MY_PV} == *9999* ]] && inherit git-r3 -inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils - -DESCRIPTION="A full office productivity suite" -HOMEPAGE="https://www.libreoffice.org" -SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-7.5.2.2-loong-buildsys-fix.patch.xz" -[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" - -# Split modules following git/tarballs; Core MUST be first! -# Help is used for the image generator -# Only release has the tarballs -if [[ ${MY_PV} != *9999* ]]; then - for i in ${DEV_URI}; do - SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz" - SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz" - done - unset i -fi -unset DEV_URI - -# Really required addons -# These are bundles that can't be removed for now due to huge patchsets. -# If you want them gone, patches are welcome. -ADDONS_SRC=( - # not packaged in Gentoo - "${ADDONS_URI}/dragonbox-1.1.3.tar.gz" - # 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-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz" - "base? ( - ${ADDONS_URI}/commons-logging-1.2-src.tar.gz - ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - )" - "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" - # no release for 8 years, should we package it? - "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" - # Does not build with 1.6 rhino at all - "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" - # requirement of rhino - "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" - # not packageable - "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" -) -SRC_URI+=" ${ADDONS_SRC[*]}" - -unset ADDONS_URI -unset ADDONS_SRC - -# Extensions that need extra work: -LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" - -IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird -googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test valgrind vulkan -$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - base? ( java ) - bluetooth? ( dbus ) - libreoffice_extensions_nlpsolver? ( java ) - libreoffice_extensions_scripting-beanshell? ( java ) - libreoffice_extensions_scripting-javascript? ( java ) - libreoffice_extensions_wiki-publisher? ( java ) -" - -RESTRICT="!test? ( test )" - -LICENSE="|| ( LGPL-3 MPL-1.1 )" -SLOT="0" - -[[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux" - -COMMON_DEPEND="${PYTHON_DEPS} - app-arch/unzip - app-arch/zip - app-crypt/gpgme:=[cxx] - app-text/hunspell:= - >=app-text/libabw-0.1.0 - >=app-text/libebook-0.1 - app-text/libepubgen - >=app-text/libetonyek-0.1 - app-text/libexttextcat - app-text/liblangtag - >=app-text/libmspub-0.1.0 - >=app-text/libmwaw-0.3.21 - >=app-text/libnumbertext-1.0.6 - >=app-text/libodfgen-0.1.0 - app-text/libqxp - app-text/libstaroffice - app-text/libwpd:0.10[tools] - app-text/libwpg:0.3 - >=app-text/libwps-0.4 - app-text/mythes - >=dev-cpp/clucene-2.3.3.4-r2 - >=dev-cpp/libcmis-0.5.2-r2 - dev-db/unixODBC - dev-lang/perl - dev-libs/boost:=[nls] - dev-libs/expat - dev-libs/hyphen - dev-libs/icu:= - dev-libs/libassuan - dev-libs/libgpg-error - >=dev-libs/liborcus-0.17.2:0/0.17 - dev-libs/librevenge - dev-libs/libxml2 - dev-libs/libxslt - dev-libs/nspr - dev-libs/nss - >=dev-libs/redland-1.0.16 - >=dev-libs/xmlsec-1.2.35:=[nss] - >=games-engines/box2d-2.4.1:0 - media-gfx/fontforge - media-gfx/graphite2 - media-libs/fontconfig - >=media-libs/freetype-2.11.0-r1:2 - >=media-libs/harfbuzz-5.1.0:=[graphite,icu] - media-libs/lcms:2 - >=media-libs/libcdr-0.1.0 - >=media-libs/libepoxy-1.3.1[X] - >=media-libs/libfreehand-0.1.0 - media-libs/libjpeg-turbo:= - media-libs/libpagemaker - >=media-libs/libpng-1.4:0= - >=media-libs/libvisio-0.1.0 - media-libs/libwebp:= - media-libs/libzmf - media-libs/openjpeg:= - media-libs/tiff:= - media-libs/zxing-cpp:= - net-misc/curl - sci-mathematics/lpsolve:= - sys-libs/zlib - virtual/opengl - x11-libs/cairo[X] - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - accessibility? ( - $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]') - ) - bluetooth? ( - dev-libs/glib:2 - net-wireless/bluez - ) - coinmp? ( sci-libs/coinor-mp ) - cups? ( net-print/cups ) - dbus? ( sys-apps/dbus ) - eds? ( - dev-libs/glib:2 - gnome-base/dconf - gnome-extra/evolution-data-server - ) - firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - gtk? ( - app-accessibility/at-spi2-core:2 - dev-libs/glib:2 - dev-libs/gobject-introspection - gnome-base/dconf - media-libs/mesa[egl(+)] - x11-libs/gtk+:3[X] - x11-libs/pango - ) - kde? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - kde-frameworks/kconfig:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/ki18n:5 - kde-frameworks/kio:5 - kde-frameworks/kwindowsystem:5 - ) - ldap? ( net-nds/openldap:= ) - libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) - libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) - mariadb? ( dev-db/mariadb-connector-c:= ) - !mariadb? ( dev-db/mysql-connector-c:= ) - pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) - postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) -" -# FIXME: cppunit should be moved to test conditional -# after everything upstream is under gbuild -# as dmake execute tests right away -# tests apparently also need google-carlito-fonts (not packaged) -DEPEND="${COMMON_DEPEND} - >=dev-libs/libatomic_ops-7.2d - dev-perl/Archive-Zip - >=dev-util/cppunit-1.14.0 - >=dev-util/gperf-3.1 - dev-util/mdds:1/2.0 - media-libs/glm - x11-base/xorg-proto - x11-libs/libXt - x11-libs/libXtst - java? ( - dev-java/ant-core - >=virtual/jdk-11 - ) - test? ( - app-crypt/gnupg - dev-util/cppunit - media-fonts/dejavu - media-fonts/liberation-fonts - ) - valgrind? ( dev-util/valgrind ) -" -RDEPEND="${COMMON_DEPEND} - acct-group/libreoffice - acct-user/libreoffice - !app-office/libreoffice-bin - !app-office/libreoffice-bin-debug - media-fonts/liberation-fonts - || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) - java? ( >=virtual/jre-11 ) - kde? ( kde-frameworks/breeze-icons:* ) -" -BDEPEND=" - dev-util/intltool - sys-apps/which - sys-devel/bison - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - clang? ( - || ( - ( sys-devel/clang:16 - sys-devel/llvm:16 - =sys-devel/lld-16* ) - ( sys-devel/clang:15 - sys-devel/llvm:15 - =sys-devel/lld-15* ) - ( sys-devel/clang:14 - sys-devel/llvm:14 - =sys-devel/lld-14* ) - ) - ) - odk? ( >=app-doc/doxygen-1.8.4 ) -" -if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then - PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" -else - # Translations are not reliable on live ebuilds - # rather force people to use english only. - RDEPEND+=" !app-office/libreoffice-l10n" -fi - -PATCHES=( - # "${WORKDIR}"/${PATCHSET/.tar.xz/} - - # not upstreamable stuff - "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" - "${FILESDIR}/${PN}-6.1-nomancompress.patch" - "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch" - - # git master - "${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch" - "${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch" -) - -S="${WORKDIR}/${PN}-${MY_PV}" - -_check_reqs() { - CHECKREQS_MEMORY="512M" - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - CHECKREQS_DISK_BUILD="22G" - else - CHECKREQS_DISK_BUILD="6G" - fi - check-reqs_$1 -} - -pkg_pretend() { - use base || - ewarn "If you plan to use Base application you must enable USE base." - use java || - ewarn "Without USE java, several wizards are not going to be available." - - [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - python-single-r1_pkg_setup - xdg_environment_reset - - [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup -} - -src_unpack() { - default - - if [[ ${MY_PV} = *9999* ]]; then - local base_uri branch mypv - base_uri="https://anongit.freedesktop.org/git" - branch="master" - mypv=${MY_PV/.9999} - [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}" - git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" - git-r3_checkout "${base_uri}/${PN}/core" - LOCOREGIT_VERSION=${EGIT_VERSION} - - git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master" - git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help - fi -} - -src_prepare() { - default - - # sandbox violations on many systems, we don't need it. Bug #646406 - sed -i \ - -e "/KF5_CONFIG/s/kf5-config/no/" \ - configure.ac || die "Failed to disable kf5-config" - - AT_M4DIR="m4" eautoreconf - # hack in the autogen.sh - touch autogen.lastrun - - # sed in the tests - sed -i \ - -e "s#all : build unitcheck#all : build#g" \ - solenv/gbuild/Module.mk || die - sed -i \ - -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \ - -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \ - Makefile.in || die - - sed -i \ - -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \ - -e "s,\$INSTALLDIRNAME.sh,${PN}," \ - bin/distro-install-desktop-integration || die - - if use branding; then - # hack... - mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die - fi - - # Don't list pdfimport support in desktop when built with none, bug # 605464 - if ! use pdfimport; then - sed -i \ - -e ":MimeType: s:application/pdf;::" \ - -e ":Keywords: s:pdf;::" \ - sysui/desktop/menus/draw.desktop || die - fi -} - -src_configure() { - # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys - # Note: these are for Gentoo use ONLY. For your own distribution, please get - # your own set of keys. Feel free to contact chromium@gentoo.org for more info. - local google_default_client_id="329227923882.apps.googleusercontent.com" - local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" - - # Show flags set at the beginning - einfo "Preset CFLAGS: ${CFLAGS}" - einfo "Preset LDFLAGS: ${LDFLAGS}" - - if use clang ; then - # Force clang - einfo "Enforcing the use of clang due to USE=clang ..." - AR=llvm-ar - CC=${CHOST}-clang - CXX=${CHOST}-clang++ - NM=llvm-nm - RANLIB=llvm-ranlib - LDFLAGS+=" -fuse-ld=lld" - - # Workaround for bug #915067 - append-ldflags -Wl,--undefined-version - - # Not implemented by Clang, bug #903889 - filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch - else - # Force gcc - einfo "Enforcing the use of gcc due to USE=-clang ..." - AR=gcc-ar - CC=${CHOST}-gcc - CXX=${CHOST}-g++ - NM=gcc-nm - RANLIB=gcc-ranlib - - # Apparently the Clang flags get used even for GCC builds sometimes. - # bug #838115 - sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die - fi - - if use custom-cflags ; then - elog "USE=custom-cflags has been selected. You are on your own to make sure that" - elog "the build succeeds. Good luck!" - else - strip-flags - fi - - export LO_CLANG_CC=${CC} - export LO_CLANG_CXX=${CXX} - - # Show flags set at the end - einfo " Used CFLAGS: ${CFLAGS}" - einfo " Used LDFLAGS: ${LDFLAGS}" - - # Ensure we use correct toolchain - tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG - - # optimization flags - export GMAKE_OPTIONS="${MAKEOPTS}" - # System python enablement: - export PYTHON_CFLAGS=$(python_get_CFLAGS) - export PYTHON_LIBS=$(python_get_LIBS) - - use kde && export QT5DIR="$(qt5_get_bindir)/.." - - local gentoo_buildid="Gentoo official package" - if [[ -n ${LOCOREGIT_VERSION} ]]; then - gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})" - fi - - # system headers/libs/...: enforce using system packages - # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad - # --enable-cairo: ensure that cairo is always required - # --enable-*-link: link to the library rather than just dlopen on runtime - # --enable-release-build: build the libreoffice as release - # --disable-fetch-external: prevent dowloading during compile phase - # --enable-extension-integration: enable any extension integration support - # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs - # --disable-report-builder: too much java packages pulled in without pkgs - # --without-system-sane: just sane.h header that is used for scan in writer, - # not linked or anything else, worthless to depend on - # --disable-pdfium: not yet packaged - local myeconfargs=( - --with-system-dicts - --with-system-epoxy - --with-system-headers - --with-system-jars - --with-system-libs - --enable-build-opensymbol - --enable-cairo-canvas - --enable-largefile - --enable-mergelibs - --enable-python=system - --enable-randr - --enable-release-build - --disable-breakpad - --disable-bundle-mariadb - --disable-ccache - --disable-epm - --disable-fetch-external - --disable-gtk3-kde5 - --disable-online-update - --disable-openssl - --disable-pdfium - --disable-qt6 - --with-extra-buildid="${gentoo_buildid}" - --enable-extension-integration - --with-external-dict-dir="${EPREFIX}/usr/share/myspell" - --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" - --with-external-thes-dir="${EPREFIX}/usr/share/myspell" - --with-external-tar="${DISTDIR}" - --with-lang="" - --with-parallelism=$(makeopts_jobs) - --with-system-openjpeg - --with-tls=nss - --with-vendor="Gentoo Foundation" - --with-x - --without-fonts - --without-myspell-dicts - --with-help="html" - --without-helppack-integration - --with-system-gpgmepp - --without-system-abseil - --without-system-dragonbox - --without-system-jfreereport - --without-system-libfixmath - --without-system-sane - $(use_enable base report-builder) - $(use_enable bluetooth sdremote-bluetooth) - $(use_enable coinmp) - $(use_enable cups) - $(use_enable dbus) - $(use_enable debug) - $(use_enable eds evolution2) - $(use_enable firebird firebird-sdbc) - $(use_enable gstreamer gstreamer-1-0) - $(use_enable gtk gtk3) - $(use_enable kde kf5) - $(use_enable kde qt5) - $(use_enable ldap) - $(use_enable odk) - $(use_enable pdfimport) - $(use_enable postgres postgresql-sdbc) - $(use_enable vulkan skia) - $(use_with accessibility lxml) - $(use_with coinmp system-coinmp) - $(use_with googledrive gdrive-client-id ${google_default_client_id}) - $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) - $(use_with java) - $(use_with odk doxygen) - $(use_with valgrind) - ) - - if use eds || use gtk; then - myeconfargs+=( --enable-dconf --enable-gio ) - else - myeconfargs+=( --disable-dconf --disable-gio ) - fi - - # libreoffice extensions handling - for lo_xt in ${LO_EXTS}; do - if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then - myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) ) - else - myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) ) - fi - done - - if use java; then - # hsqldb: system one is too new - myeconfargs+=( - --without-junit - --without-system-hsqldb - --with-ant-home="${ANT_HOME}" - --with-jdk-home="${JAVA_HOME}" - ) - - use libreoffice_extensions_scripting-beanshell && \ - myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) - - use libreoffice_extensions_scripting-javascript && \ - myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) - fi - - is-flagq "-flto*" && myeconfargs+=( --enable-lto ) - - MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ - econf "${myeconfargs[@]}" -} - -src_compile() { - # more and more LO stuff tries to use OpenGL, including tests during build - # bug 501508, bug 540624, bug 545974 and probably more - addpredict /dev/dri - addpredict /dev/ati - addpredict /dev/nvidiactl - - default -} - -src_test() { - emake unitcheck - emake slowcheck -} - -src_install() { - emake DESTDIR="${D}" distro-pack-install -o build -o check - - # bug 593514 - if use gtk; then - dosym libreoffice/program/liblibreofficekitgtk.so \ - /usr/$(get_libdir)/liblibreofficekitgtk.so - fi - - # bash completion aliases - bashcomp_alias \ - libreoffice \ - unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice - - if use branding; then - insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die - fi - - # bug 703474 - insinto /usr/include - doins -r include/LibreOfficeKit - - local lodir=/usr/$(get_libdir)/libreoffice - # patching this would break tests - cat <<-EOF > "${T}"/uno.py -import sys, os -sys.path.append('${EPREFIX}${lodir}/program') -os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc') -EOF - sed -e "/^import sys/d" -e "/^import os/d" \ - -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed" - cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die - cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die - - # more system pyuno mess - sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \ - -i "${D}"${lodir}/program/officehelper.py || die - - python_optimize "${D}"${lodir}/program - # link python bridge in site-packages, bug 667802 - local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program - for py in uno.py unohelper.py officehelper.py; do - dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py} - while IFS="" read -d $'\0' -r pyc; do - pyc=${pyc//*\/} - dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc} - done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0) - done - - newinitd "${FILESDIR}/libreoffice.initd" libreoffice - newconfd "${FILESDIR}/libreoffice.confd" libreoffice -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 8f10333a4643..a24e522bc074 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -264,6 +264,9 @@ BDEPEND=" virtual/pkgconfig clang? ( || ( + ( sys-devel/clang:17 + sys-devel/llvm:17 + =sys-devel/lld-17* ) ( sys-devel/clang:16 sys-devel/llvm:16 =sys-devel/lld-16* ) diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest index 73fcb6f6180c..9eafd858bbee 100644 --- a/app-office/skrooge/Manifest +++ b/app-office/skrooge/Manifest @@ -1,5 +1,3 @@ -DIST skrooge-2.30.0.tar.xz 22661568 BLAKE2B 32bbd16b40afd836016c9d590c17d71fde7225802890d862e275c6c694fa11db504f757f158ab94c4c034481e577a0f45d013f4d4d21d6d200265c7131f98c11 SHA512 5a96c7263fcbc0313562dd5a64de3c31219c0a6a8e610fd0cbabe0f16903b1123390f07d466341b8fd31695861ab5a006b7f5aee7986fbd0028138ec90aa8902 DIST skrooge-2.31.0.tar.xz 22372292 BLAKE2B 3eafe194a9783ae2f3841f6c32211cdf3c425033b63084bf47e526482830d1d53ae66446aa04f0d93497a59054e229bbadd6f46ec0782e4ab05d902d0e809596 SHA512 3a09b9e6017b0ebce7170285a8ca6a27c8942f16c310450e76dc9deb87e0d016edb49b74c8ea784bed5f9b5a10ed515016266584f53fc0144f4bf02bc7769be1 -EBUILD skrooge-2.30.0.ebuild 2593 BLAKE2B 6367b62c8b8d39a2a8b8c0718191defe1745c8bd1e4dbe806923a28899eb00fae0982be5d0e682225128bc9139fe0cd2ddb31c6a319aea44721d467250a16fac SHA512 0b7785d16eeb228f196587c92c456f4e0da1095f2172ab39dffe97993c6e5cf0202cef5d8fdf0bb2998668fec5928f82444d90fb997339b04469a1cb1687f766 EBUILD skrooge-2.31.0.ebuild 2593 BLAKE2B 6367b62c8b8d39a2a8b8c0718191defe1745c8bd1e4dbe806923a28899eb00fae0982be5d0e682225128bc9139fe0cd2ddb31c6a319aea44721d467250a16fac SHA512 0b7785d16eeb228f196587c92c456f4e0da1095f2172ab39dffe97993c6e5cf0202cef5d8fdf0bb2998668fec5928f82444d90fb997339b04469a1cb1687f766 MISC metadata.xml 393 BLAKE2B f192bb06b0b86aba02ffc2ade42d2e46927758d90759cb4c4c0edaea49e1aa82a119f073233b0028ece6a3ee976e942cb55becdf420d09c93dbb06230eedf4e7 SHA512 741040cc75c5a4df36ef09ee97fe652501754fca36884f52177936bd7b1a512e5f248e95a3e4c674918f56f76275c41899577b3621aa5e3fb97f18410f109c8a diff --git a/app-office/skrooge/skrooge-2.30.0.ebuild b/app-office/skrooge/skrooge-2.30.0.ebuild deleted file mode 100644 index 99ad0d061eb0..000000000000 --- a/app-office/skrooge/skrooge-2.30.0.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="forceoptional" -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm kde.org - -DESCRIPTION="Personal finances manager, aiming at being simple and intuitive" -HOMEPAGE="https://skrooge.org/" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="5" -IUSE="activities kde ofx" - -# hangs + installs files (also requires KF5DesignerPlugin) -RESTRICT="test" - -COMMON_DEPEND=" - >=app-crypt/qca-2.3.0:2[qt5(+)] - dev-db/sqlcipher - dev-libs/grantlee:5 - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtscript-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5= - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=dev-qt/qtxmlpatterns-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) - kde? ( >=kde-frameworks/krunner-${KFMIN}:5 ) - ofx? ( dev-libs/libofx:= ) -" -DEPEND="${COMMON_DEPEND} - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 -" -RDEPEND="${COMMON_DEPEND} - >=dev-qt/qtquickcontrols-${QTMIN}:5 -" -BDEPEND=" - dev-libs/libxslt - virtual/pkgconfig -" - -src_configure() { - local mycmakeargs=( - -DSKG_WEBENGINE=ON - -DSKG_WEBKIT=OFF - -DSKG_DESIGNER=OFF - $(cmake_use_find_package activities KF5Activities) - $(cmake_use_find_package kde KF5Runner) - $(cmake_use_find_package ofx LibOfx) - -DSKG_BUILD_TEST=$(usex test) - ) - - ecm_src_configure -} - -src_test() { - local mycmakeargs=( - -DSKG_BUILD_TEST=ON - ) - ecm_src_test -} -- cgit v1.2.3