| 1 |
commit: b4492759eb4e4d96bcaa145d21a1c2f06dc27c4b |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 8 23:57:57 2022 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 8 23:58:14 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4492759 |
| 7 |
|
| 8 |
dev-libs/liborcus: Untested bump, work in progress |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/830457 |
| 11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 12 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-libs/liborcus/Manifest | 1 + |
| 15 |
.../{liborcus-9999.ebuild => liborcus-0.17.2.ebuild} | 18 +++++++++++------- |
| 16 |
dev-libs/liborcus/liborcus-9999.ebuild | 18 +++++++++++------- |
| 17 |
3 files changed, 23 insertions(+), 14 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest |
| 20 |
index 2f82c613714c..8ab89e05f2d6 100644 |
| 21 |
--- a/dev-libs/liborcus/Manifest |
| 22 |
+++ b/dev-libs/liborcus/Manifest |
| 23 |
@@ -1,2 +1,3 @@ |
| 24 |
DIST liborcus-0.16.1.tar.xz 1805436 BLAKE2B 7df89da5a175daa6fcf759d28f8a0eaebf3db6405af3b06a01b8dad41c7706acedc74876a0b68ff9cabd5780bb7cb311cd7c98390c9ecd265e62513eadde81eb SHA512 6d75591820af65181dd3a418f051a359695083f29c7d9c77edbcab3e89d9ea367824be0b19f27a31267525f446936145f5780a0ce3c6ee2d89823742837d4739 |
| 25 |
DIST liborcus-0.17.0.tar.xz 1826696 BLAKE2B 4cab8696f698510de6c995aa6a3e59a8407297d6a60bac89ca7ffa1f74576de555c69a38de97eac63e2aed1817a3377ec7e15b1da7b5c01b49d049092d8756ff SHA512 1ac24f3c10973d0e0f6e3db7982391434631ec998ae07bb011fa8e000e48ca430c07a0c2588871a93b6d9bf7a19e30d4f05d34aef699dfce1f59a4556c7727e8 |
| 26 |
+DIST liborcus-0.17.2.tar.xz 1839188 BLAKE2B d274e3af71df16866e305403d63d3978613915753412ac9de19d7de7802930c3886d8653d6d48a8d9a971dc0ee284f8f83af8dc07850b5f28fcdab2815b6d9b2 SHA512 8ad8db46c23673260057aff555286d95ebfeff0a027bdeae24f11f8aa12456284f7f4446edddb91936b3011eb1227cfe1618ab3c4d909f8356c8c151f5739d79 |
| 27 |
|
| 28 |
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-0.17.2.ebuild |
| 29 |
similarity index 74% |
| 30 |
copy from dev-libs/liborcus/liborcus-9999.ebuild |
| 31 |
copy to dev-libs/liborcus/liborcus-0.17.2.ebuild |
| 32 |
index b923d9595f82..16b12b9e36fa 100644 |
| 33 |
--- a/dev-libs/liborcus/liborcus-9999.ebuild |
| 34 |
+++ b/dev-libs/liborcus/liborcus-0.17.2.ebuild |
| 35 |
@@ -1,9 +1,9 @@ |
| 36 |
-# Copyright 1999-2021 Gentoo Authors |
| 37 |
+# Copyright 1999-2022 Gentoo Authors |
| 38 |
# Distributed under the terms of the GNU General Public License v2 |
| 39 |
|
| 40 |
EAPI=8 |
| 41 |
|
| 42 |
-PYTHON_COMPAT=( python3_{8..10} ) |
| 43 |
+PYTHON_COMPAT=( python3_{8,9,10} ) |
| 44 |
|
| 45 |
inherit autotools python-single-r1 |
| 46 |
|
| 47 |
@@ -11,20 +11,22 @@ DESCRIPTION="Standalone file import filter library for spreadsheet documents" |
| 48 |
HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md" |
| 49 |
|
| 50 |
if [[ ${PV} == *9999* ]]; then |
| 51 |
- MDDS_SLOT="1/9999" |
| 52 |
+ MDDS_SLOT="1/2.0" |
| 53 |
EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git" |
| 54 |
inherit git-r3 |
| 55 |
else |
| 56 |
- MDDS_SLOT="1/1.5" |
| 57 |
+ MDDS_SLOT="1/2.0" |
| 58 |
SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz" |
| 59 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
| 60 |
+ # Unkeyworded while libreoffice has no release making use of this slot |
| 61 |
+ # KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
| 62 |
fi |
| 63 |
|
| 64 |
LICENSE="MIT" |
| 65 |
SLOT="0/0.17" # based on SONAME of liborcus.so |
| 66 |
-IUSE="python +spreadsheet-model tools" |
| 67 |
+IUSE="python +spreadsheet-model test tools" |
| 68 |
|
| 69 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 70 |
+RESTRICT="!test? ( test )" |
| 71 |
|
| 72 |
RDEPEND=" |
| 73 |
dev-libs/boost:=[zlib(+)] |
| 74 |
@@ -41,6 +43,9 @@ pkg_setup() { |
| 75 |
} |
| 76 |
|
| 77 |
src_prepare() { |
| 78 |
+ # bug 713586 |
| 79 |
+ use test && eapply "${FILESDIR}/${P}-test-fix.patch" |
| 80 |
+ |
| 81 |
default |
| 82 |
eautoreconf |
| 83 |
} |
| 84 |
@@ -59,5 +64,4 @@ src_configure() { |
| 85 |
src_install() { |
| 86 |
default |
| 87 |
find "${D}" -name '*.la' -type f -delete || die |
| 88 |
- use python && python_optimize |
| 89 |
} |
| 90 |
|
| 91 |
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild |
| 92 |
index b923d9595f82..16b12b9e36fa 100644 |
| 93 |
--- a/dev-libs/liborcus/liborcus-9999.ebuild |
| 94 |
+++ b/dev-libs/liborcus/liborcus-9999.ebuild |
| 95 |
@@ -1,9 +1,9 @@ |
| 96 |
-# Copyright 1999-2021 Gentoo Authors |
| 97 |
+# Copyright 1999-2022 Gentoo Authors |
| 98 |
# Distributed under the terms of the GNU General Public License v2 |
| 99 |
|
| 100 |
EAPI=8 |
| 101 |
|
| 102 |
-PYTHON_COMPAT=( python3_{8..10} ) |
| 103 |
+PYTHON_COMPAT=( python3_{8,9,10} ) |
| 104 |
|
| 105 |
inherit autotools python-single-r1 |
| 106 |
|
| 107 |
@@ -11,20 +11,22 @@ DESCRIPTION="Standalone file import filter library for spreadsheet documents" |
| 108 |
HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md" |
| 109 |
|
| 110 |
if [[ ${PV} == *9999* ]]; then |
| 111 |
- MDDS_SLOT="1/9999" |
| 112 |
+ MDDS_SLOT="1/2.0" |
| 113 |
EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git" |
| 114 |
inherit git-r3 |
| 115 |
else |
| 116 |
- MDDS_SLOT="1/1.5" |
| 117 |
+ MDDS_SLOT="1/2.0" |
| 118 |
SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz" |
| 119 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
| 120 |
+ # Unkeyworded while libreoffice has no release making use of this slot |
| 121 |
+ # KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
| 122 |
fi |
| 123 |
|
| 124 |
LICENSE="MIT" |
| 125 |
SLOT="0/0.17" # based on SONAME of liborcus.so |
| 126 |
-IUSE="python +spreadsheet-model tools" |
| 127 |
+IUSE="python +spreadsheet-model test tools" |
| 128 |
|
| 129 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 130 |
+RESTRICT="!test? ( test )" |
| 131 |
|
| 132 |
RDEPEND=" |
| 133 |
dev-libs/boost:=[zlib(+)] |
| 134 |
@@ -41,6 +43,9 @@ pkg_setup() { |
| 135 |
} |
| 136 |
|
| 137 |
src_prepare() { |
| 138 |
+ # bug 713586 |
| 139 |
+ use test && eapply "${FILESDIR}/${P}-test-fix.patch" |
| 140 |
+ |
| 141 |
default |
| 142 |
eautoreconf |
| 143 |
} |
| 144 |
@@ -59,5 +64,4 @@ src_configure() { |
| 145 |
src_install() { |
| 146 |
default |
| 147 |
find "${D}" -name '*.la' -type f -delete || die |
| 148 |
- use python && python_optimize |
| 149 |
} |
Archives