commit:     1f35da24db50158e1f0e37ac0e2c33c9ed30aaa9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 19:50:38 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 20:28:36 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f35da24

app-office/libreoffice: Add LLVM 19, cleanup obsolete IUSE=odk tarball

Fix some pkgcheck warnings

Closes: https://bugs.gentoo.org/946290
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/libreoffice/libreoffice-9999.ebuild | 53 +++++++++++++-------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild 
b/app-office/libreoffice/libreoffice-9999.ebuild
index ad4fe9385106..72dd4f135404 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -75,14 +75,20 @@ ADDONS_SRC=(
        )"
        # no release for 8 years, should we package it?
        "libreoffice_extensions_wiki-publisher? ( 
${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-       # not packageable
-       "odk? ( 
http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll 
)"
 )
 SRC_URI+=" ${ADDONS_SRC[*]}"
 
 unset ADDONS_URI
 unset ADDONS_SRC
 
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+
 # Extensions that need extra work:
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
@@ -102,12 +108,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 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
@@ -262,22 +262,23 @@ BDEPEND="
        app-alternatives/lex
        sys-devel/gettext
        virtual/pkgconfig
-       clang? (
-               || (
-                       (       llvm-core/clang:18
-                               llvm-core/llvm:18
-                               =llvm-core/lld-18*      )
-                       (       llvm-core/clang:17
-                               llvm-core/llvm:17
-                               =llvm-core/lld-17*      )
-                       (       llvm-core/clang:16
-                               llvm-core/llvm:16
-                               =llvm-core/lld-16*      )
-                       (       llvm-core/clang:15
-                               llvm-core/llvm:15
-                               =llvm-core/lld-15*      )
-               )
-       )
+       clang? ( || (
+               (       llvm-core/clang:19
+                       llvm-core/llvm:19
+                       =llvm-core/lld-19*      )
+               (       llvm-core/clang:18
+                       llvm-core/llvm:18
+                       =llvm-core/lld-18*      )
+               (       llvm-core/clang:17
+                       llvm-core/llvm:17
+                       =llvm-core/lld-17*      )
+               (       llvm-core/clang:16
+                       llvm-core/llvm:16
+                       =llvm-core/lld-16*      )
+               (       llvm-core/clang:15
+                       llvm-core/llvm:15
+                       =llvm-core/lld-15*      )
+       ) )
        odk? ( >=app-text/doxygen-1.8.4 )
 "
 if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
@@ -300,8 +301,6 @@ PATCHES=(
        "${FILESDIR}/${PN}-24.8-unused-qt6network.patch"
 )
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 _check_reqs() {
        CHECKREQS_MEMORY="512M"
        if is-flagq "-g*" && ! is-flagq "-g*0" ; then

Reply via email to