From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 803F1158086 for ; Sun, 14 Nov 2021 05:25:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BCD70E0A7D; Sun, 14 Nov 2021 05:25:15 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7D0A0E0A7D for ; Sun, 14 Nov 2021 05:25:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 72C11340B29 for ; Sun, 14 Nov 2021 05:25:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08D281C3 for ; Sun, 14 Nov 2021 05:25:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1636867473.4a153d2644a4108e8f3c8bcfe9b9413cceea7033.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/liborcus/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/liborcus/Manifest dev-libs/liborcus/liborcus-0.17.0.ebuild dev-libs/liborcus/liborcus-9999.ebuild X-VCS-Directories: dev-libs/liborcus/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4a153d2644a4108e8f3c8bcfe9b9413cceea7033 X-VCS-Branch: master Date: Sun, 14 Nov 2021 05:25:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4d725327-5197-4062-95ff-d3577b768178 X-Archives-Hash: 6a55aa923872de173d3b772402e6e531 commit: 4a153d2644a4108e8f3c8bcfe9b9413cceea7033 Author: James Beddek posteo de> AuthorDate: Sun Oct 31 02:38:39 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Nov 14 05:24:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a153d26 dev-libs/liborcus: add 0.17.0 Signed-off-by: James Beddek posteo.de> Signed-off-by: Sam James gentoo.org> dev-libs/liborcus/Manifest | 1 + ...liborcus-9999.ebuild => liborcus-0.17.0.ebuild} | 25 +++++++++++++--------- dev-libs/liborcus/liborcus-9999.ebuild | 11 +++++----- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest index 570800afb042..2f82c613714c 100644 --- a/dev-libs/liborcus/Manifest +++ b/dev-libs/liborcus/Manifest @@ -1 +1,2 @@ DIST liborcus-0.16.1.tar.xz 1805436 BLAKE2B 7df89da5a175daa6fcf759d28f8a0eaebf3db6405af3b06a01b8dad41c7706acedc74876a0b68ff9cabd5780bb7cb311cd7c98390c9ecd265e62513eadde81eb SHA512 6d75591820af65181dd3a418f051a359695083f29c7d9c77edbcab3e89d9ea367824be0b19f27a31267525f446936145f5780a0ce3c6ee2d89823742837d4739 +DIST liborcus-0.17.0.tar.xz 1826696 BLAKE2B 4cab8696f698510de6c995aa6a3e59a8407297d6a60bac89ca7ffa1f74576de555c69a38de97eac63e2aed1817a3377ec7e15b1da7b5c01b49d049092d8756ff SHA512 1ac24f3c10973d0e0f6e3db7982391434631ec998ae07bb011fa8e000e48ca430c07a0c2588871a93b6d9bf7a19e30d4f05d34aef699dfce1f59a4556c7727e8 diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-0.17.0.ebuild similarity index 70% copy from dev-libs/liborcus/liborcus-9999.ebuild copy to dev-libs/liborcus/liborcus-0.17.0.ebuild index 85508fc2f047..f8f315cf8e63 100644 --- a/dev-libs/liborcus/liborcus-9999.ebuild +++ b/dev-libs/liborcus/liborcus-0.17.0.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -inherit python-single-r1 +PYTHON_COMPAT=( python3_{8,9} ) + +inherit autotools python-single-r1 DESCRIPTION="Standalone file import filter library for spreadsheet documents" HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md" @@ -12,18 +13,20 @@ HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md" if [[ ${PV} == *9999* ]]; then MDDS_SLOT="1/9999" EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git" - inherit git-r3 autotools + inherit git-r3 else - MDDS_SLOT="1/1.5" + MDDS_SLOT="1/2.0" SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + # Unkeyworded while libreoffice has no release making use of this slot + # KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" fi LICENSE="MIT" -SLOT="0/0.16" # based on SONAME of liborcus.so -IUSE="python +spreadsheet-model tools" +SLOT="0/0.17" # based on SONAME of liborcus.so +IUSE="python +spreadsheet-model test tools" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" RDEPEND=" dev-libs/boost:=[zlib(+)] @@ -40,8 +43,11 @@ pkg_setup() { } src_prepare() { + # bug 713586 + use test && eapply "${FILESDIR}/${P}-test-fix.patch" + default - [[ ${PV} == *9999 ]] && eautoreconf + eautoreconf } src_configure() { @@ -58,5 +64,4 @@ src_configure() { src_install() { default find "${D}" -name '*.la' -type f -delete || die - use python && python_optimize } diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild index 85508fc2f047..b923d9595f82 100644 --- a/dev-libs/liborcus/liborcus-9999.ebuild +++ b/dev-libs/liborcus/liborcus-9999.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -inherit python-single-r1 + +inherit autotools python-single-r1 DESCRIPTION="Standalone file import filter library for spreadsheet documents" HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md" @@ -12,7 +13,7 @@ HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md" if [[ ${PV} == *9999* ]]; then MDDS_SLOT="1/9999" EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git" - inherit git-r3 autotools + inherit git-r3 else MDDS_SLOT="1/1.5" SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz" @@ -20,7 +21,7 @@ else fi LICENSE="MIT" -SLOT="0/0.16" # based on SONAME of liborcus.so +SLOT="0/0.17" # based on SONAME of liborcus.so IUSE="python +spreadsheet-model tools" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -41,7 +42,7 @@ pkg_setup() { src_prepare() { default - [[ ${PV} == *9999 ]] && eautoreconf + eautoreconf } src_configure() {