[gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/, dev-libs/libixion/files/
commit: 6c639c8f0a66a951d04d27b6190262d54e07e5ba Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 14 13:33:11 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 14 15:19:40 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c639c8f dev-libs/libixion: Drop 0.16.1 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libixion/Manifest | 1 - .../libixion/files/libixion-0.16.1-clang.patch | 18 --- dev-libs/libixion/libixion-0.16.1.ebuild | 63 -- 3 files changed, 82 deletions(-) diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest index aff640dd2314..5513636ebc08 100644 --- a/dev-libs/libixion/Manifest +++ b/dev-libs/libixion/Manifest @@ -1,2 +1 @@ -DIST libixion-0.16.1.tar.xz 482500 BLAKE2B 26075c819a952f48c4e136fa28b4ef5075b455dea52d51940e4fc55344e19e404d70b44222631d0b0f85280d09bb8a05955bfcbe0a228b97d72d8f00f1639248 SHA512 979c631e9536f6d2c3ae32f7892756ac8889d27c551d80eb9d519bf912bd323da4b6ecd363fe2719e74e04bc3661e5d56e03a582f68f5293ffcac59b74f4c7de DIST libixion-0.17.0.tar.xz 499836 BLAKE2B c8c31b07ad14dd49be259686af3e39e6f5d4aeeb8680030ea7bd2697c8baa72123f2659b3087f224f956612dc444c97e6a6d331fd3deff780981bab4d5b6ad25 SHA512 0acdb2eae5250236a94b1a3344ca990058ea8db7b1e741545bcb7160f9e28d21a3c2ec336621fd590df10188a4d5feadfbb3a63f57e9bfd2cc1bffc04009ffad diff --git a/dev-libs/libixion/files/libixion-0.16.1-clang.patch b/dev-libs/libixion/files/libixion-0.16.1-clang.patch deleted file mode 100644 index 802d43e71592.. --- a/dev-libs/libixion/files/libixion-0.16.1-clang.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://gitlab.com/ixion/ixion/-/commit/1992b8ab9c7765b8da06b6054bb3c0ab990c62f7 -https://bugs.gentoo.org/793917 - -From: Jory Pratt -Date: Wed, 2 Jun 2021 10:19:01 -0500 -Subject: [PATCH] Fix nullptr_t for clang/musl users - a/src/libixion/model_context.cpp -+++ b/src/libixion/model_context.cpp -@@ -17,7 +17,7 @@ - - namespace ixion { - --model_context::input_cell::input_cell(nullptr_t) : type(celltype_t::empty) {} -+model_context::input_cell::input_cell(std::nullptr_t) : type(celltype_t::empty) {} - model_context::input_cell::input_cell(bool b) : type(celltype_t::boolean) - { - value.boolean = b; diff --git a/dev-libs/libixion/libixion-0.16.1.ebuild b/dev-libs/libixion/libixion-0.16.1.ebuild deleted file mode 100644 index 0f397c8828ef.. --- a/dev-libs/libixion/libixion-0.16.1.ebuild +++ /dev/null @@ -1,63 +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 python-single-r1 - -DESCRIPTION="General purpose formula parser & interpreter" -HOMEPAGE="https://gitlab.com/ixion/ixion; - -if [[ ${PV} == * ]]; then - MDDS_SLOT="1/" - EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git; - inherit git-r3 autotools -else - MDDS_SLOT="1/1.5" - SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz; - KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86" -fi - -LICENSE="MIT" -SLOT="0/0.16" # based on SONAME of libixion.so -IUSE="debug python +threads" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - dev-libs/boost:= - dev-util/mdds:${MDDS_SLOT} - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-clang.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - [[ ${PV} == * ]] && eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-static - $(use_enable debug) - $(use_enable debug debug-utils) - $(use_enable debug log-debug) - $(use_enable python) - $(use_enable threads) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -type f -delete || die -}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/, dev-libs/libixion/files/
commit: 69f45f358a48821fdfa0294b602163dbfe68c691 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 28 16:59:00 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 28 17:09:02 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69f45f35 dev-libs/libixion: Fix bashisms in configure.ac, --disable-static Reported-by: Matt Whitlock mattwhitlock.name> Thanks-to: Lars Wendler gentoo.org> Closes: https://bugs.gentoo.org/723128 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../libixion/files/libixion-0.15.0-bashism.patch | 32 ++ dev-libs/libixion/libixion-0.15.0.ebuild | 15 ++ dev-libs/libixion/libixion-.ebuild | 4 +-- 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/dev-libs/libixion/files/libixion-0.15.0-bashism.patch b/dev-libs/libixion/files/libixion-0.15.0-bashism.patch new file mode 100644 index 000..9df7b04a865 --- /dev/null +++ b/dev-libs/libixion/files/libixion-0.15.0-bashism.patch @@ -0,0 +1,32 @@ +From 076f6576e7398842457d34fd68140512795c7e00 Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Fri, 15 May 2020 12:42:20 +0200 +Subject: [PATCH] configure.ac: avoid bashisms + +or else we end up with unpredictable results if shell != /bin/bash: + + ./configure: 19427: test: xno: unexpected operator + +Reported-by: Matt Whitlock +Gentoo-bug: https://bugs.gentoo.org/723128 +Signed-off-by: Lars Wendler +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 3a07dd8..505aeba 100644 +--- a/configure.ac b/configure.ac +@@ -182,7 +182,7 @@ AC_ARG_ENABLE([werror], + [enable_werror="$enableval"], + [enable_werror=no] + ) +-AS_IF([test x"$enable_werror" == "xyes"], [ ++AS_IF([test x"$enable_werror" = "xyes"], [ + CXXFLAGS="$CXXFLAGS -Werror" + ]) + +-- +2.26.2 + diff --git a/dev-libs/libixion/libixion-0.15.0.ebuild b/dev-libs/libixion/libixion-0.15.0.ebuild index d3155185dc5..b93481abbca 100644 --- a/dev-libs/libixion/libixion-0.15.0.ebuild +++ b/dev-libs/libixion/libixion-0.15.0.ebuild @@ -4,14 +4,14 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) -inherit python-single-r1 +inherit autotools python-single-r1 DESCRIPTION="General purpose formula parser & interpreter" HOMEPAGE="https://gitlab.com/ixion/ixion; if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git; - inherit git-r3 autotools + inherit git-r3 else SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz; KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86" @@ -19,7 +19,7 @@ fi LICENSE="MIT" SLOT="0/0.15" # based on SONAME of libixion.so -IUSE="debug python static-libs +threads" +IUSE="debug python +threads" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -32,7 +32,10 @@ DEPEND="${RDEPEND} dev-libs/spdlog " -PATCHES=( "${FILESDIR}/${P}-musl-clang.patch" ) # bug 714018 +PATCHES=( + "${FILESDIR}/${P}-musl-clang.patch" # bug 714018 + "${FILESDIR}/${P}-bashism.patch" # bug 723128 +) pkg_setup() { use python && python-single-r1_pkg_setup @@ -40,14 +43,14 @@ pkg_setup() { src_prepare() { default - [[ ${PV} == * ]] && eautoreconf + eautoreconf } src_configure() { local myeconfargs=( + --disable-static $(use_enable debug) $(use_enable python) - $(use_enable static-libs static) $(use_enable threads) ) econf "${myeconfargs[@]}" diff --git a/dev-libs/libixion/libixion-.ebuild b/dev-libs/libixion/libixion-.ebuild index 28084226f1e..e3b55ff9101 100644 --- a/dev-libs/libixion/libixion-.ebuild +++ b/dev-libs/libixion/libixion-.ebuild @@ -21,7 +21,7 @@ fi LICENSE="MIT" SLOT="0/0.16" # based on SONAME of libixion.so -IUSE="debug python static-libs +threads" +IUSE="debug python +threads" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -45,9 +45,9 @@ src_prepare() { src_configure() { local myeconfargs=( + --disable-static $(use_enable debug) $(use_enable python) - $(use_enable static-libs static) $(use_enable threads) ) econf "${myeconfargs[@]}"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/, dev-libs/libixion/files/
commit: 78bbce2bbe7f81596cc75e5ea83e755e9f130bbe Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jul 24 20:19:18 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jul 24 20:19:18 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78bbce2b dev-libs/libixion: Patch already upstreamed Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> .../libixion--spdlog-non-bundled-fmt.patch | 25 -- dev-libs/libixion/libixion-.ebuild | 2 -- 2 files changed, 27 deletions(-) diff --git a/dev-libs/libixion/files/libixion--spdlog-non-bundled-fmt.patch b/dev-libs/libixion/files/libixion--spdlog-non-bundled-fmt.patch deleted file mode 100644 index 2cf5cb0a184..000 --- a/dev-libs/libixion/files/libixion--spdlog-non-bundled-fmt.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 389c8def65406ae92077686a2e9095afebab28f4 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Wed, 24 Jul 2019 20:01:01 +0200 -Subject: [PATCH] Fix build when built against spdlog without bundled fmt - - src/libixion/dirty_cell_tracker.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libixion/dirty_cell_tracker.cpp b/src/libixion/dirty_cell_tracker.cpp -index 42d338b..7e6e3cc 100644 a/src/libixion/dirty_cell_tracker.cpp -+++ b/src/libixion/dirty_cell_tracker.cpp -@@ -16,7 +16,7 @@ - #include - - #include --#include -+#include - - namespace ixion { - --- -2.22.0 - diff --git a/dev-libs/libixion/libixion-.ebuild b/dev-libs/libixion/libixion-.ebuild index 92f685ee869..ff21270e742 100644 --- a/dev-libs/libixion/libixion-.ebuild +++ b/dev-libs/libixion/libixion-.ebuild @@ -32,8 +32,6 @@ DEPEND="${RDEPEND} dev-libs/spdlog " -PATCHES=( "${FILESDIR}"/${P}-spdlog-non-bundled-fmt.patch ) - pkg_setup() { use python && python-single-r1_pkg_setup }
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/, dev-libs/libixion/files/
commit: 8b1a5167748d9c6a6fb012c9c8c4e478a26bb09f Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jul 24 18:21:53 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jul 24 18:22:38 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1a5167 dev-libs/libixion: Add new DEPEND, raise mdds minimum dep to 1.5.0 Closes: https://bugs.gentoo.org/680342 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> .../libixion--spdlog-non-bundled-fmt.patch | 25 ++ dev-libs/libixion/libixion-.ebuild | 10 ++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dev-libs/libixion/files/libixion--spdlog-non-bundled-fmt.patch b/dev-libs/libixion/files/libixion--spdlog-non-bundled-fmt.patch new file mode 100644 index 000..2cf5cb0a184 --- /dev/null +++ b/dev-libs/libixion/files/libixion--spdlog-non-bundled-fmt.patch @@ -0,0 +1,25 @@ +From 389c8def65406ae92077686a2e9095afebab28f4 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 24 Jul 2019 20:01:01 +0200 +Subject: [PATCH] Fix build when built against spdlog without bundled fmt + +--- + src/libixion/dirty_cell_tracker.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libixion/dirty_cell_tracker.cpp b/src/libixion/dirty_cell_tracker.cpp +index 42d338b..7e6e3cc 100644 +--- a/src/libixion/dirty_cell_tracker.cpp b/src/libixion/dirty_cell_tracker.cpp +@@ -16,7 +16,7 @@ + #include + + #include +-#include ++#include + + namespace ixion { + +-- +2.22.0 + diff --git a/dev-libs/libixion/libixion-.ebuild b/dev-libs/libixion/libixion-.ebuild index 860c13488fc..92f685ee869 100644 --- a/dev-libs/libixion/libixion-.ebuild +++ b/dev-libs/libixion/libixion-.ebuild @@ -23,12 +23,16 @@ IUSE="debug python static-libs +threads" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DEPEND=" +RDEPEND=" dev-libs/boost:= - >=dev-util/mdds-1.4.1:1= + >=dev-util/mdds-1.5.0:1= python? ( ${PYTHON_DEPS} ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + dev-libs/spdlog +" + +PATCHES=( "${FILESDIR}"/${P}-spdlog-non-bundled-fmt.patch ) pkg_setup() { use python && python-single-r1_pkg_setup
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/, dev-libs/libixion/files/
commit: 287d369fccff7bffb877dd06ce5c8bcb30c248c6 Author: Andreas Sturmlechner gmail com> AuthorDate: Wed Feb 24 11:14:39 2016 + Commit: Andreas Hüttel gentoo org> CommitDate: Wed Feb 24 11:20:58 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=287d369f dev-libs/libixion: Fix build, EAPI=6 - ${P}-python-optional.patch was removing -DMDDS_HASH_CONTAINER_BOOST, fixed and removed any python-unrelated parts from the patch - Removed unnecessary ${P}-python-symbol.patch Package-Manager: portage-2.2.27 .../files/libixion-0.9.1-python-optional.patch | 42 +++--- .../files/libixion-0.9.1-python-symbol.patch | 13 --- ...ixion-0.9.1.ebuild => libixion-0.9.1-r1.ebuild} | 12 --- 3 files changed, 19 insertions(+), 48 deletions(-) diff --git a/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch b/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch index df945ab..632fa07 100644 --- a/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch +++ b/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch @@ -1,21 +1,21 @@ --- a/configure.ac 2016-02-06 17:08:05.505990463 +0100 +++ b/configure.ac 2016-02-06 17:08:42.316530268 +0100 -@@ -15,18 +15,13 @@ +@@ -15,18 +15,22 @@ AC_INIT([libixion], [ixion_version]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2 dist-xz]) -AM_PATH_PYTHON(2.7.0) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) --AC_ARG_WITH(hash-container-compat, --[ -- --with-hash-container-compat use std::hash_foo instead of boost::unordered_foo --], --,with_hash_container_compat=no) -- --AC_ARG_WITH(mdds-include-path, --AS_HELP_STRING([--with-mdds-include-path], [specify include path for mdds headers.]) --,) + AC_ARG_WITH(hash-container-compat, + [ + --with-hash-container-compat use std::hash_foo instead of boost::unordered_foo + ], + ,with_hash_container_compat=no) + + AC_ARG_WITH(mdds-include-path, + AS_HELP_STRING([--with-mdds-include-path], [specify include path for mdds headers.]) + ,) +AC_ARG_ENABLE([python], +[AS_HELP_STRING([--disable-python], [Disable python bindings])], +[enable_python="$enableval"], @@ -24,25 +24,7 @@ IXION_API_VERSION=ixion_api_version IXION_MAJOR_VERSION=ixion_major_version -@@ -66,23 +61,19 @@ - AC_FUNC_STRTOD - AC_CHECK_FUNCS([gettimeofday]) - --CPPFLAGS="$CPPFLAGS -D_REENTRANT -DMDDS_HASH_CONTAINER_BOOST" -+CPPFLAGS="$CPPFLAGS -D_REENTRANT" - --AC_MSG_CHECKING([whether to turn on hash container compatibility]) --if test "z$with_hash_container_compat" = "zno"; then --AC_MSG_RESULT([no]) --BOOST_REQUIRE([1.36]) --BOOST_UNORDERED --else --AC_MSG_RESULT([yes]) --DEFINES="$DEFINES -D_IXION_HASH_CONTAINER_COMPAT" --fi -+BOOST_REQUIRE([1.36]) - - # Check for mdds. +@@ -70,7 +74,11 @@ PKG_CHECK_MODULES([MDDS],[mdds >= 0.12.0]) # Check for python. @@ -55,7 +37,7 @@ CPPFLAGS="$CPPFLAGS -g -Os -fvisibility=hidden" -@@ -101,3 +92,10 @@ +@@ -101,3 +109,10 @@ src/libixion/constants.inl src/python/Makefile]) AC_OUTPUT diff --git a/dev-libs/libixion/files/libixion-0.9.1-python-symbol.patch b/dev-libs/libixion/files/libixion-0.9.1-python-symbol.patch deleted file mode 100644 index 1a62bbc..000 --- a/dev-libs/libixion/files/libixion-0.9.1-python-symbol.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/python/Makefile.am b/src/python/Makefile.am -index 0dfae54..094e0cf 100644 a/src/python/Makefile.am -+++ b/src/python/Makefile.am -@@ -10,7 +10,7 @@ ixion_la_SOURCES = \ - sheet.hpp \ - sheet.cpp - --ixion_la_LDFLAGS = -module -avoid-version -export-symbols-regex initixion -+ixion_la_LDFLAGS = -module -avoid-version -export-symbols-regex PyInit_ixion - ixion_la_CPPFLAGS = -I$(top_srcdir)/include $(PYTHON_CFLAGS) $(MDDS_CFLAGS) - ixion_la_LIBADD = \ - ../libixion/libixion-@IXION_API_VERSION@.la \ diff --git a/dev-libs/libixion/libixion-0.9.1.ebuild b/dev-libs/libixion/libixion-0.9.1-r1.ebuild similarity index 85% rename from dev-libs/libixion/libixion-0.9.1.ebuild rename to dev-libs/libixion/libixion-0.9.1-r1.ebuild index 9c993be..6dc3c0e 100644 --- a/dev-libs/libixion/libixion-0.9.1.ebuild +++ b/dev-libs/libixion/libixion-0.9.1-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git; @@ -17,7 +17,7 @@ HOMEPAGE="https://gitlab.com/ixion/ixion; [[ ${PV} == ]] || SRC_URI="http://kohei.us/files/ixion/src/${P}.tar.xz; LICENSE="MIT" -SLOT="0/0.10" +SLOT="0/0.10" # based on SONAME of libixion.so [[ ${PV} == ]] || \ KEYWORDS="~amd64 ~arm ~ppc ~x86" IUSE="python static-libs" @@ -37,9 +37,11 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}/${PN}-0.9.1-typo.patch" \ - "${FILESDIR}/${PN}-0.9.1-python-optional.patch" \ -