Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
Date: Mon, 04 Jul 2022 16:29:19
Message-Id: 1656952135.1f6eaf50b2d30a9fbc4cdb3a2f1a31bc1879fd12.asturm@gentoo
1 commit: 1f6eaf50b2d30a9fbc4cdb3a2f1a31bc1879fd12
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 4 15:30:10 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 4 16:28:55 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f6eaf50
7
8 app-office/libreoffice: py3_11; depend on >=app-text/poppler-22.06
9
10 Upstream commits:
11 56c7e666ebf47d6cdf29adf85fc5de56246be86d (in 7.3.5 branch)
12 0d0469b4302dfe95b016a6f04b145834b79d5ed3 (in master branch)
13
14 Package-Manager: Portage-3.0.30, Repoman-3.0.3
15 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
16
17 app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild | 2 +-
18 app-office/libreoffice/libreoffice-7.3.4.2.ebuild | 2 +-
19 app-office/libreoffice/libreoffice-7.3.9999.ebuild | 6 +++---
20 app-office/libreoffice/libreoffice-9999.ebuild | 6 +++---
21 4 files changed, 8 insertions(+), 8 deletions(-)
22
23 diff --git a/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild b/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
24 index 9c8dd7f4efdc..4c7509c6d65a 100644
25 --- a/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
26 +++ b/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
27 @@ -4,7 +4,7 @@
28 EAPI=8
29
30 PYTHON_COMPAT=( python3_{8..10} )
31 -PYTHON_REQ_USE="threads(+),xml"
32 +PYTHON_REQ_USE="threads(+),xml(+)"
33
34 MY_PV="${PV/_alpha/.alpha}"
35 MY_PV="${MY_PV/_beta/.beta}"
36
37 diff --git a/app-office/libreoffice/libreoffice-7.3.4.2.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
38 index ba2c51a3aab7..99329d166bc3 100644
39 --- a/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
40 +++ b/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
41 @@ -4,7 +4,7 @@
42 EAPI=8
43
44 PYTHON_COMPAT=( python3_{8..10} )
45 -PYTHON_REQ_USE="threads(+),xml"
46 +PYTHON_REQ_USE="threads(+),xml(+)"
47
48 MY_PV="${PV/_alpha/.alpha}"
49 MY_PV="${MY_PV/_beta/.beta}"
50
51 diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
52 index 05a70aea66a3..86e77b20eb76 100644
53 --- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
54 +++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
55 @@ -3,8 +3,8 @@
56
57 EAPI=8
58
59 -PYTHON_COMPAT=( python3_{8..10} )
60 -PYTHON_REQ_USE="threads(+),xml"
61 +PYTHON_COMPAT=( python3_{8..11} )
62 +PYTHON_REQ_USE="threads(+),xml(+)"
63
64 MY_PV="${PV/_alpha/.alpha}"
65 MY_PV="${MY_PV/_beta/.beta}"
66 @@ -217,7 +217,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
67 libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
68 mariadb? ( dev-db/mariadb-connector-c:= )
69 !mariadb? ( dev-db/mysql-connector-c:= )
70 - pdfimport? ( app-text/poppler:=[cxx] )
71 + pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
72 postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
73 "
74 # FIXME: cppunit should be moved to test conditional
75
76 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
77 index 20d275f63d6f..cb77e652cea2 100644
78 --- a/app-office/libreoffice/libreoffice-9999.ebuild
79 +++ b/app-office/libreoffice/libreoffice-9999.ebuild
80 @@ -3,8 +3,8 @@
81
82 EAPI=8
83
84 -PYTHON_COMPAT=( python3_{8..10} )
85 -PYTHON_REQ_USE="threads(+),xml"
86 +PYTHON_COMPAT=( python3_{8..11} )
87 +PYTHON_REQ_USE="threads(+),xml(+)"
88
89 MY_PV="${PV/_alpha/.alpha}"
90 MY_PV="${MY_PV/_beta/.beta}"
91 @@ -217,7 +217,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
92 libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
93 mariadb? ( dev-db/mariadb-connector-c:= )
94 !mariadb? ( dev-db/mysql-connector-c:= )
95 - pdfimport? ( app-text/poppler:=[cxx] )
96 + pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
97 postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
98 "
99 # FIXME: cppunit should be moved to test conditional