From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- dev-libs/liborcus/Manifest | 7 ++- .../liborcus/files/liborcus-0.17.0-test-fix.patch | 51 ++++++++++++++++ dev-libs/liborcus/liborcus-0.16.1.ebuild | 13 +++-- dev-libs/liborcus/liborcus-0.17.0.ebuild | 67 ++++++++++++++++++++++ dev-libs/liborcus/liborcus-9999.ebuild | 11 ++-- 5 files changed, 138 insertions(+), 11 deletions(-) create mode 100644 dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch create mode 100644 dev-libs/liborcus/liborcus-0.17.0.ebuild (limited to 'dev-libs/liborcus') diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest index 4b91606907be..7a628b4cafb9 100644 --- a/dev-libs/liborcus/Manifest +++ b/dev-libs/liborcus/Manifest @@ -1,5 +1,8 @@ AUX liborcus-0.15.4-gcc11.patch 1874 BLAKE2B b01e145fc9204e1504e34959c0c1c97101eed287e7291734e32e81a1e219a3bbcb6487ad7cc8c248019feccbebc94e03e3b3f7346c38074c9f284a159eb1d55e SHA512 61cd9afe40f6a3da6fc1177627fb17716286d48168d282fc90de3729f46bcd4cf22cb4fa9ed2962b59806d58d0569365f80b633e74225257ff9beb5eab01ad7a +AUX liborcus-0.17.0-test-fix.patch 1691 BLAKE2B eff681313577d7964eb9c58bf9e2e68951ea6430303b81cefc26ef1e63337188f415b4a5f2b44cbe44111776c99ade992aa40ca6692e126608a9d15bd89fb44b SHA512 fb46233985a69fc9b5991efddf9e855217b4641eb558aa1b5df7bed4d1639e702500b03ce8526cdcee9cd22f139b4efabef18aa36367f840754aee49b3ec9f66 DIST liborcus-0.16.1.tar.xz 1805436 BLAKE2B 7df89da5a175daa6fcf759d28f8a0eaebf3db6405af3b06a01b8dad41c7706acedc74876a0b68ff9cabd5780bb7cb311cd7c98390c9ecd265e62513eadde81eb SHA512 6d75591820af65181dd3a418f051a359695083f29c7d9c77edbcab3e89d9ea367824be0b19f27a31267525f446936145f5780a0ce3c6ee2d89823742837d4739 -EBUILD liborcus-0.16.1.ebuild 1391 BLAKE2B 765383c3f69d834a7a53ef861a6113a40d125e914a40a131cf2667e672ef1190a42f7bc49984cb143b1a0d5d7d548f674f2a1bbdb8269f0b7bcbc976432fafba SHA512 782b9585d3bda921469159d3275c72ea3a5156ce5d41daa1a1ae7f0bdbf557d00c20a952227f765466df45df10df7d34bb8e45f7b423e79831aec42d98419874 -EBUILD liborcus-9999.ebuild 1329 BLAKE2B 9add805f039e4e7b637fca4415acb15ca67c477d398d9e8707e923f0bbf474c7c397d1a1961ae0a7bef1d911be814d562868090577e387dbf8149765937e6548 SHA512 c71b0da6e09a00030b4ef9fcad709f22489b19b80b6718b04e342991870ad7c72651bd69678ded9b6d06b04141330ece3643f4b39caa2a5dbb0650713b650a0c +DIST liborcus-0.17.0.tar.xz 1826696 BLAKE2B 4cab8696f698510de6c995aa6a3e59a8407297d6a60bac89ca7ffa1f74576de555c69a38de97eac63e2aed1817a3377ec7e15b1da7b5c01b49d049092d8756ff SHA512 1ac24f3c10973d0e0f6e3db7982391434631ec998ae07bb011fa8e000e48ca430c07a0c2588871a93b6d9bf7a19e30d4f05d34aef699dfce1f59a4556c7727e8 +EBUILD liborcus-0.16.1.ebuild 1477 BLAKE2B af207820355c3f6839538034fd406335d1cf2ac1e426ceb4aac19baadd953e2ffc45ccff7c965779bd21b22aa7e0a5a235ce0505ac7a59dcdf5c55775a146f62 SHA512 cb189f615cf0c5f040f5cefbc832c4ca3322de32015907454d479e9c1e60048f8c1db912a74ef0e2b6e003ba6645936c73b5b4338181fd375328dbabba934117 +EBUILD liborcus-0.17.0.ebuild 1448 BLAKE2B fb6c7dec3e460f1d8f3963541221fcf81a810bee065339b7c584c5e294b7554e44190d55f55610012a2425d294678c1bbc5d7aaf2d5d378a4e8aa3d59e983e01 SHA512 d5c208118bacfbe05bf501dfc9bfcba1da11f9a01bba26e13d75669d84096f1cac298c42671a9f66aaeaabe81967fcc46daf4711293a1ce3123e5aa24f719b76 +EBUILD liborcus-9999.ebuild 1306 BLAKE2B 374e57ba2e812f5b4d5851ddde95e3a6eda4e751401b2ff0aa8ccc3262771066a2f1ae8c3ae00ef4d2e112e520fe860e99e72b7c0e026cb1af701affc22c195a SHA512 de85faa06b439c8c50432749f2f43b903eb87748c1324acc28bcef9787d69a1848e159f2d3ebfa50fee9a10ce549962dda8a722348ed3e5b5ad307b55fc95254 MISC metadata.xml 557 BLAKE2B b8dd01b0df50a1c6dafedc40f4cebbbd7851ee67fd1ac94f4c8107f052db8721ce12b0ae486e42f459e0b5d337525edc0359e9e94b8da1261e3521c11f66ef64 SHA512 2eca4f5fd25121bdb3ecb9470b66c2c5373ab266c53bf7af55b3f46245ad6973f3cd65ff80c6d1c33cb738136cddf22489b61dc1863701225842ca9dfa4e2c9d diff --git a/dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch b/dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch new file mode 100644 index 000000000000..1de33a7e3f4c --- /dev/null +++ b/dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch @@ -0,0 +1,51 @@ +# https://bugs.gentoo.org/713586 + +[PATCH] Build orcus-env-dump unconditionally + +The rule for `orcus-env-dump.o` is guarded by `if WITH_TOOLS` however, +the rule for the executable `orcus-env-dump` is not. This leads to +linking errors when running the test suite without tools. + +Move the rule for `orcus-env-dump.o` out of the if WITH_TOOLS block to +always build it. +--- + src/Makefile.am | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -25,6 +25,16 @@ orcus_test_xml_LDADD = \ + + orcus_test_xml_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS) -DSRCDIR=\""$(top_srcdir)"\" + ++#---------------------------------------------------------------------------- ++ ++# orcus-env-dump ++ ++orcus_env_dump_SOURCES = orcus_env_dump.cpp ++orcus_env_dump_LDADD = \ ++ parser/liborcus-parser-@ORCUS_API_VERSION@.la \ ++ liborcus/liborcus-@ORCUS_API_VERSION@.la ++orcus_env_dump_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS) ++ + + TESTS = \ + orcus-test-xml \ +@@ -136,16 +146,6 @@ orcus_detect_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS + + #---------------------------------------------------------------------------- + +-# orcus-env-dump +- +-orcus_env_dump_SOURCES = orcus_env_dump.cpp +-orcus_env_dump_LDADD = \ +- parser/liborcus-parser-@ORCUS_API_VERSION@.la \ +- liborcus/liborcus-@ORCUS_API_VERSION@.la +-orcus_env_dump_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS) +- +-#---------------------------------------------------------------------------- +- + if BUILD_SPREADSHEET_MODEL + + orcus_json_LDADD += \ diff --git a/dev-libs/liborcus/liborcus-0.16.1.ebuild b/dev-libs/liborcus/liborcus-0.16.1.ebuild index 11e425439697..18b38d862e5e 100644 --- a/dev-libs/liborcus/liborcus-0.16.1.ebuild +++ b/dev-libs/liborcus/liborcus-0.16.1.ebuild @@ -4,7 +4,8 @@ EAPI=7 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" @@ -21,9 +22,10 @@ fi LICENSE="MIT" SLOT="0/0.16" # based on SONAME of liborcus.so -IUSE="python +spreadsheet-model tools" +IUSE="python +spreadsheet-model test tools" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" RDEPEND=" dev-libs/boost:=[zlib(+)] @@ -42,8 +44,11 @@ pkg_setup() { } src_prepare() { + # bug 713586 + use test && eapply "${FILESDIR}/${PN}-0.17.0-test-fix.patch" + default - [[ ${PV} == *9999 ]] && eautoreconf + eautoreconf } src_configure() { diff --git a/dev-libs/liborcus/liborcus-0.17.0.ebuild b/dev-libs/liborcus/liborcus-0.17.0.ebuild new file mode 100644 index 000000000000..f8f315cf8e63 --- /dev/null +++ b/dev-libs/liborcus/liborcus-0.17.0.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" + +if [[ ${PV} == *9999* ]]; then + MDDS_SLOT="1/9999" + EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git" + inherit git-r3 +else + MDDS_SLOT="1/2.0" + SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz" + # Unkeyworded while libreoffice has no release making use of this slot + # KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +fi + +LICENSE="MIT" +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(+)] + sys-libs/zlib + python? ( ${PYTHON_DEPS} ) + spreadsheet-model? ( dev-libs/libixion:${SLOT} ) +" +DEPEND="${RDEPEND} + dev-util/mdds:${MDDS_SLOT} +" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + # bug 713586 + use test && eapply "${FILESDIR}/${P}-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 +} 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() { -- cgit v1.2.3