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 73786158091 for ; Tue, 14 Jun 2022 15:20:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35600E08EC; Tue, 14 Jun 2022 15:20:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 16456E08EC for ; Tue, 14 Jun 2022 15:20:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 smtp.gentoo.org (Postfix) with ESMTPS id E545E341402 for ; Tue, 14 Jun 2022 15:20:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 01D2F50A for ; Tue, 14 Jun 2022 15:20:23 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1655219980.6b07f09a4b8f79ac28c03c033c89b272d658642c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/liborcus/, dev-libs/liborcus/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/liborcus/Manifest dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch dev-libs/liborcus/liborcus-0.16.1.ebuild X-VCS-Directories: dev-libs/liborcus/files/ dev-libs/liborcus/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6b07f09a4b8f79ac28c03c033c89b272d658642c X-VCS-Branch: master Date: Tue, 14 Jun 2022 15:20:23 +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: 373d02e2-80e7-40b2-9a38-0ee102de9e2a X-Archives-Hash: eb4160768063d49341d795677d7823e4 commit: 6b07f09a4b8f79ac28c03c033c89b272d658642c Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 14 13:33:42 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 14 15:19:40 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b07f09a dev-libs/liborcus: Drop 0.16.1 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/liborcus/Manifest | 1 - .../liborcus/files/liborcus-0.15.4-gcc11.patch | 72 ---------------------- dev-libs/liborcus/liborcus-0.16.1.ebuild | 69 --------------------- 3 files changed, 142 deletions(-) diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest index b440e512ac7d..a10f5c5f0982 100644 --- a/dev-libs/liborcus/Manifest +++ b/dev-libs/liborcus/Manifest @@ -1,2 +1 @@ -DIST liborcus-0.16.1.tar.xz 1805436 BLAKE2B 7df89da5a175daa6fcf759d28f8a0eaebf3db6405af3b06a01b8dad41c7706acedc74876a0b68ff9cabd5780bb7cb311cd7c98390c9ecd265e62513eadde81eb SHA512 6d75591820af65181dd3a418f051a359695083f29c7d9c77edbcab3e89d9ea367824be0b19f27a31267525f446936145f5780a0ce3c6ee2d89823742837d4739 DIST liborcus-0.17.2.tar.xz 1839188 BLAKE2B d274e3af71df16866e305403d63d3978613915753412ac9de19d7de7802930c3886d8653d6d48a8d9a971dc0ee284f8f83af8dc07850b5f28fcdab2815b6d9b2 SHA512 8ad8db46c23673260057aff555286d95ebfeff0a027bdeae24f11f8aa12456284f7f4446edddb91936b3011eb1227cfe1618ab3c4d909f8356c8c151f5739d79 diff --git a/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch b/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch deleted file mode 100644 index f1dda1390539..000000000000 --- a/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 50506d534230d90de2b0a2af3fb072428c942a4e Mon Sep 17 00:00:00 2001 -From: hedmo -Date: Fri, 8 Jan 2021 07:30:16 +0000 -Subject: [PATCH] Update orcus_xlsx.cpp to build with gcc-11 - ---- - src/liborcus/orcus_xlsx.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/liborcus/orcus_xlsx.cpp b/src/liborcus/orcus_xlsx.cpp -index 6df72a32..a59b2b9d 100644 ---- a/src/liborcus/orcus_xlsx.cpp -+++ b/src/liborcus/orcus_xlsx.cpp -@@ -32,6 +32,7 @@ - - #include - #include -+#include - #include - #include - #include --- -GitLab - -From 3bfa1a000e4639fe68781c584356ceea7c6b1a72 Mon Sep 17 00:00:00 2001 -From: hedmo -Date: Fri, 8 Jan 2021 07:32:53 +0000 -Subject: [PATCH] Update xls_xml_context.cpp to build with gcc-11 - ---- - src/liborcus/xls_xml_context.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/liborcus/xls_xml_context.cpp b/src/liborcus/xls_xml_context.cpp -index 538f5607..ca3dc4d0 100644 ---- a/src/liborcus/xls_xml_context.cpp -+++ b/src/liborcus/xls_xml_context.cpp -@@ -16,6 +16,7 @@ - #include - - #include -+#include - - using namespace std; - namespace ss = orcus::spreadsheet; --- -GitLab - -From 5e8fb255dc6bc9b7084a05b8dc24f31417542e5e Mon Sep 17 00:00:00 2001 -From: hedmo -Date: Fri, 8 Jan 2021 07:34:17 +0000 -Subject: [PATCH] Update xlsx_revision_context.cpp to build with gcc-11 - ---- - src/liborcus/xlsx_revision_context.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/liborcus/xlsx_revision_context.cpp b/src/liborcus/xlsx_revision_context.cpp -index edfd9eed..0b6ec0af 100644 ---- a/src/liborcus/xlsx_revision_context.cpp -+++ b/src/liborcus/xlsx_revision_context.cpp -@@ -16,6 +16,7 @@ - #include "orcus/global.hpp" - - #include -+#include - - using namespace std; - --- -GitLab - diff --git a/dev-libs/liborcus/liborcus-0.16.1.ebuild b/dev-libs/liborcus/liborcus-0.16.1.ebuild deleted file mode 100644 index 18b38d862e5e..000000000000 --- a/dev-libs/liborcus/liborcus-0.16.1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit autotools python-single-r1 - -DESCRIPTION="Standalone file import filter library for spreadsheet documents" -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 -else - MDDS_SLOT="1/1.5" - SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86" -fi - -LICENSE="MIT" -SLOT="0/0.16" # 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(+)] - sys-libs/zlib - python? ( ${PYTHON_DEPS} ) - spreadsheet-model? ( dev-libs/libixion:${SLOT} ) -" -DEPEND="${RDEPEND} - dev-util/mdds:${MDDS_SLOT} -" - -PATCHES=( "${FILESDIR}/${PN}-0.15.4-gcc11.patch" ) # bug 764035 - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # bug 713586 - use test && eapply "${FILESDIR}/${PN}-0.17.0-test-fix.patch" - - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-static - --disable-werror - $(use_enable python) - $(use_enable spreadsheet-model) - $(use_with tools) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -type f -delete || die - use python && python_optimize -}