Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libixion/files/, dev-libs/libixion/
Date: Thu, 10 Jun 2021 15:34:59
Message-Id: 1623339138.11f43e479d6732a4a54e2d342a0945a55e8ced8e.asturm@gentoo
1 commit: 11f43e479d6732a4a54e2d342a0945a55e8ced8e
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 6 17:00:31 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 10 15:32:18 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11f43e47
7
8 dev-libs/libixion: Drop 0.15.0
9
10 Package-Manager: Portage-3.0.19, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 dev-libs/libixion/Manifest | 1 -
14 .../libixion/files/libixion-0.15.0-bashism.patch | 32 -----------
15 .../files/libixion-0.15.0-musl-clang.patch | 24 ---------
16 dev-libs/libixion/libixion-0.15.0.ebuild | 62 ----------------------
17 4 files changed, 119 deletions(-)
18
19 diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
20 index e4e60e0c3e7..55952aeb461 100644
21 --- a/dev-libs/libixion/Manifest
22 +++ b/dev-libs/libixion/Manifest
23 @@ -1,2 +1 @@
24 -DIST libixion-0.15.0.tar.xz 447388 BLAKE2B 55df3417783f1653b0aa4b80a5f0107a3794fcb403c1c1263ce9829b31ee5263a104fa210be151535c1ff091d5dc2519f694ef3cdb16074f86dab4d48a127afd SHA512 feecaa4a8e6191649a7ecbc6c0f4d7db6dba3a5e4a031c1f55236907bf94e2ece9ee05d18ed345e3503cffb4a380b04f6c4941ef4214ddf92687998a070b7543
25 DIST libixion-0.16.1.tar.xz 482500 BLAKE2B 26075c819a952f48c4e136fa28b4ef5075b455dea52d51940e4fc55344e19e404d70b44222631d0b0f85280d09bb8a05955bfcbe0a228b97d72d8f00f1639248 SHA512 979c631e9536f6d2c3ae32f7892756ac8889d27c551d80eb9d519bf912bd323da4b6ecd363fe2719e74e04bc3661e5d56e03a582f68f5293ffcac59b74f4c7de
26
27 diff --git a/dev-libs/libixion/files/libixion-0.15.0-bashism.patch b/dev-libs/libixion/files/libixion-0.15.0-bashism.patch
28 deleted file mode 100644
29 index 9df7b04a865..00000000000
30 --- a/dev-libs/libixion/files/libixion-0.15.0-bashism.patch
31 +++ /dev/null
32 @@ -1,32 +0,0 @@
33 -From 076f6576e7398842457d34fd68140512795c7e00 Mon Sep 17 00:00:00 2001
34 -From: Lars Wendler <polynomial-c@g.o>
35 -Date: Fri, 15 May 2020 12:42:20 +0200
36 -Subject: [PATCH] configure.ac: avoid bashisms
37 -
38 -or else we end up with unpredictable results if shell != /bin/bash:
39 -
40 - ./configure: 19427: test: xno: unexpected operator
41 -
42 -Reported-by: Matt Whitlock <gentoo@××××××××××××.name>
43 -Gentoo-bug: https://bugs.gentoo.org/723128
44 -Signed-off-by: Lars Wendler <polynomial-c@g.o>
45 ----
46 - configure.ac | 2 +-
47 - 1 file changed, 1 insertion(+), 1 deletion(-)
48 -
49 -diff --git a/configure.ac b/configure.ac
50 -index 3a07dd8..505aeba 100644
51 ---- a/configure.ac
52 -+++ b/configure.ac
53 -@@ -182,7 +182,7 @@ AC_ARG_ENABLE([werror],
54 - [enable_werror="$enableval"],
55 - [enable_werror=no]
56 - )
57 --AS_IF([test x"$enable_werror" == "xyes"], [
58 -+AS_IF([test x"$enable_werror" = "xyes"], [
59 - CXXFLAGS="$CXXFLAGS -Werror"
60 - ])
61 -
62 ---
63 -2.26.2
64 -
65
66 diff --git a/dev-libs/libixion/files/libixion-0.15.0-musl-clang.patch b/dev-libs/libixion/files/libixion-0.15.0-musl-clang.patch
67 deleted file mode 100644
68 index be5d2e6ecae..00000000000
69 --- a/dev-libs/libixion/files/libixion-0.15.0-musl-clang.patch
70 +++ /dev/null
71 @@ -1,24 +0,0 @@
72 -From a8fe2c542b16ee30723ab3d7f3b643ee479e9723 Mon Sep 17 00:00:00 2001
73 -From: orbea <orbea@××××××.net>
74 -Date: Fri, 23 Aug 2019 08:50:28 -0700
75 -Subject: [PATCH] Fix build with clang.
76 -
77 ----
78 - include/ixion/model_context.hpp | 2 +-
79 - 1 file changed, 1 insertion(+), 1 deletion(-)
80 -
81 -diff --git a/include/ixion/model_context.hpp b/include/ixion/model_context.hpp
82 -index 6ff5b67..dc27ed0 100644
83 ---- a/include/ixion/model_context.hpp
84 -+++ b/include/ixion/model_context.hpp
85 -@@ -61,7 +61,7 @@ public:
86 - } value;
87 -
88 - /** Initializes the cell to be empty. */
89 -- input_cell(nullptr_t);
90 -+ input_cell(std::nullptr_t);
91 - /** Boolean cell value. */
92 - input_cell(bool b);
93 - /** The char array must be null-terminated. */
94 ---
95 -2.24.1
96
97 diff --git a/dev-libs/libixion/libixion-0.15.0.ebuild b/dev-libs/libixion/libixion-0.15.0.ebuild
98 deleted file mode 100644
99 index 9d8cd6a883d..00000000000
100 --- a/dev-libs/libixion/libixion-0.15.0.ebuild
101 +++ /dev/null
102 @@ -1,62 +0,0 @@
103 -# Copyright 1999-2020 Gentoo Authors
104 -# Distributed under the terms of the GNU General Public License v2
105 -
106 -EAPI=7
107 -
108 -PYTHON_COMPAT=( python3_{7,8} )
109 -inherit autotools python-single-r1
110 -
111 -DESCRIPTION="General purpose formula parser & interpreter"
112 -HOMEPAGE="https://gitlab.com/ixion/ixion"
113 -
114 -if [[ ${PV} == *9999 ]]; then
115 - EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
116 - inherit git-r3
117 -else
118 - SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
119 - KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
120 -fi
121 -
122 -LICENSE="MIT"
123 -SLOT="0/0.15" # based on SONAME of libixion.so
124 -IUSE="debug python +threads"
125 -
126 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
127 -
128 -RDEPEND="
129 - dev-libs/boost:=
130 - dev-util/mdds:1/1.5
131 - python? ( ${PYTHON_DEPS} )
132 -"
133 -DEPEND="${RDEPEND}
134 - dev-libs/spdlog
135 -"
136 -
137 -PATCHES=(
138 - "${FILESDIR}/${P}-musl-clang.patch" # bug 714018
139 - "${FILESDIR}/${P}-bashism.patch" # bug 723128
140 -)
141 -
142 -pkg_setup() {
143 - use python && python-single-r1_pkg_setup
144 -}
145 -
146 -src_prepare() {
147 - default
148 - eautoreconf
149 -}
150 -
151 -src_configure() {
152 - local myeconfargs=(
153 - --disable-static
154 - $(use_enable debug)
155 - $(use_enable python)
156 - $(use_enable threads)
157 - )
158 - econf "${myeconfargs[@]}"
159 -}
160 -
161 -src_install() {
162 - default
163 - find "${D}" -name '*.la' -type f -delete || die
164 -}