gentoo resync : 05.12.2021

5 files changed, 91 insertions, 5 deletions

diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index f368886c15b9..5e5985b3d5f8 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,4 +1,7 @@
+AUX libixion-0.16.1-clang.patch 621 BLAKE2B 2ab9add51942858edfa7fb6ee65747a0723c1a7160f4b68a0fec3e6a4712d21c157ed22e06651984cd60f2c2f7028a48dd47686c7df1bcdfabe0a0e3690c5e58 SHA512 1ee44c798dc04cb4e5ae91f37d9cd432e8b84128245232a4bf30797d0a5d19a812d208c4e4b322f65d15a7aafca81effae9519f1599856c510a300cbe08d76a4
 DIST libixion-0.16.1.tar.xz 482500 BLAKE2B 26075c819a952f48c4e136fa28b4ef5075b455dea52d51940e4fc55344e19e404d70b44222631d0b0f85280d09bb8a05955bfcbe0a228b97d72d8f00f1639248 SHA512 979c631e9536f6d2c3ae32f7892756ac8889d27c551d80eb9d519bf912bd323da4b6ecd363fe2719e74e04bc3661e5d56e03a582f68f5293ffcac59b74f4c7de
-EBUILD libixion-0.16.1.ebuild 1207 BLAKE2B 7f7b1794bfe4c3f796039e49b8c52bc6e08175121bd77e43fa5718e3d8ae5dd3a10c6b005d4983bdf442bd076e4be01213f621e24b1c02b978e170a70de17cd9 SHA512 ef8bf36a8c91f5b4f6411c078c4059531430ae7dcc85d5981fdf0b41fcc0a7f03de9a9abdc869c9f8558935335fe1456e84d03ac0c11868ca4b956691b5f6f43
-EBUILD libixion-9999.ebuild 1210 BLAKE2B 2195ceb94bbe5019e39baa624390cb60b43960082cffc8be5a24e660c3c675259167fca3fc23dd53429c38989b60417b904ced2f3389e8896aa972f2813be56b SHA512 56df6b0157b4f0221def40fc87621c43d604b6d7e306eb9905844d6ff7058c248eb5a2e1888798b454a2cedf8d05d4e176327e0ab191591e8dbbdaeb5dad4c80
+DIST libixion-0.17.0.tar.xz 499836 BLAKE2B c8c31b07ad14dd49be259686af3e39e6f5d4aeeb8680030ea7bd2697c8baa72123f2659b3087f224f956612dc444c97e6a6d331fd3deff780981bab4d5b6ad25 SHA512 0acdb2eae5250236a94b1a3344ca990058ea8db7b1e741545bcb7160f9e28d21a3c2ec336621fd590df10188a4d5feadfbb3a63f57e9bfd2cc1bffc04009ffad
+EBUILD libixion-0.16.1.ebuild 1252 BLAKE2B 75b64af1f6eea1a0d4dd256cfa579137555e9c0476e485ea70b3ec5dd4c65a39a78080bdce38ac49575219e03c7e37595e0647cd7efff43fa664d7a35d7c7de5 SHA512 c13486e9162c1b0e81ad859f65fee8cba74128ac8a5cbddabea96ae7787f248468fc7d10b797e600c2ea8e10b1a4e6dbdbd4de472c84005801e41f06137b4030
+EBUILD libixion-0.17.0.ebuild 1282 BLAKE2B 549a1c593004915a7aa169c4efbf544b8db36052ec7ff25e8f27127d8db9aec8890bbf031f9338e234c83cedd9ab873583f8092d766a150ca609732ada2cf802 SHA512 ac7472d5af05f8d58581fc657ca83dc96583401eff67cdf6edbbd22219a33108e4823012540041854a10563ba181de1de933e9312f847e8bd79a4fd4cab18235
+EBUILD libixion-9999.ebuild 1211 BLAKE2B 73f2b1c8cea767b32ea24537851021cafda7c6578f1eb1be92861bcdb3feecbc992f5af523a5082b7ec26d67d2986c449df9156bf4376819ab6c8f442b9f0ddb SHA512 88c4ad412ac0361dae2a157a553a14d6505cb4f8ec46e46380007c5bda5fc19cc9c871c99d83f25f35c5670dee408ce63d6a8d34bc8f04e5bc1f7365f469ce9f
 MISC metadata.xml 398 BLAKE2B 0c2320063cc47c8a993ed456ac3a68466ce443b910d43739552d0f365dd178ed59ff76b2e23bab38b1962b9ce8cc973c03125096074a8bc33b09c8789ef236a5 SHA512 6599412f7feebc12c72eba06522563ff16d700e953d6ebc54f88544e49ad5e48e265b939a4fcfd788776abfb03110a8a27800dee71f031ae27eb207a8f924451
diff --git a/dev-libs/libixion/files/libixion-0.16.1-clang.patch b/dev-libs/libixion/files/libixion-0.16.1-clang.patch
new file mode 100644
index 000000000000..802d43e71592
--- /dev/null
+++ b/dev-libs/libixion/files/libixion-0.16.1-clang.patch
@@ -0,0 +1,18 @@
+https://gitlab.com/ixion/ixion/-/commit/1992b8ab9c7765b8da06b6054bb3c0ab990c62f7
+https://bugs.gentoo.org/793917
+
+From: Jory Pratt <anarchy@gentoo.org>
+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
index 8d3350a54854..0f397c8828ef 100644
--- a/dev-libs/libixion/libixion-0.16.1.ebuild
+++ b/dev-libs/libixion/libixion-0.16.1.ebuild
@@ -32,6 +32,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-clang.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
diff --git a/dev-libs/libixion/libixion-0.17.0.ebuild b/dev-libs/libixion/libixion-0.17.0.ebuild
new file mode 100644
index 000000000000..806058a7ae4f
--- /dev/null
+++ b/dev-libs/libixion/libixion-0.17.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9} )
+inherit python-single-r1
+
+DESCRIPTION="General purpose formula parser & interpreter"
+HOMEPAGE="https://gitlab.com/ixion/ixion"
+
+if [[ ${PV} == *9999 ]]; then
+	MDDS_SLOT="1/9999"
+	EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
+	inherit git-r3 autotools
+else
+	MDDS_SLOT="1/2.0"
+	SRC_URI="https://kohei.us/files/ixion/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 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}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && 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
+}
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild
index d9195a2f1d42..c9e0cbbd5438 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-9999.ebuild
@@ -1,9 +1,10 @@
 # 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
 
 DESCRIPTION="General purpose formula parser & interpreter"
@@ -14,13 +15,13 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
 	inherit git-r3 autotools
 else
-	MDDS_SLOT="1/1.5"
+	MDDS_SLOT="1/2.0"
 	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
+SLOT="0/0.17" # based on SONAME of libixion.so
 IUSE="debug python +threads"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"