gentoo Easter resync : 12.04.2020

5 files changed, 101 insertions, 11 deletions

diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index f4a595521517..9df1a99d0f7f 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,4 +1,7 @@
+AUX libixion-0.15.0-musl-clang.patch 754 BLAKE2B 7764c55758669b39ee8ad38b976653e805840a5831ce38f2458c3e2b008dfca94b5bd68cdbadeda81a6b4bbd647fa3883d3c47dfa76761a31f8f9ff699c0ad8d SHA512 1b6a62c9219705472046d9da5fa8a92672a7055160c66f16a31fd003fe88ceceedaac4d67774bf55103a98d7434c030e1a020e15dd818aec23267b47bcb9561d
 DIST libixion-0.14.1.tar.xz 360568 BLAKE2B e4da21f0eff9111272618d1bad87790ed0c4b461478473654f8366b0023c0650b41d355b0737a4fd4ac943e66f919e2f0d6bf04250e597e54a290d4415f3a093 SHA512 e4ae6348833d2178c1dc76916937bcc9d7821dc6570fe13093c441ca22e0301a1ca6a4cf85d9814b83534733dba98f4c4a372791f93bc57173317657675b9ae3
-EBUILD libixion-0.14.1.ebuild 1089 BLAKE2B 54a683f664b55796eb402f4c401e252828efce096da98db70d601f334627969b807ac32d5b64d77f3e4145418c39d778aac1ca28ecf93a46e3a69cf94f12d027 SHA512 0120ffb55e59fccde2354c0d49ea322701df51ed5c60cfe9187c3c3152513cededc25448a010cf7cac604e8670d97ad7ca39b78186670b5b58769e1c2c4a7806
-EBUILD libixion-9999.ebuild 1111 BLAKE2B e308382cc9294ca5a24772cd93dc3e937ee96949d89d9a46bbddc8e61659030c1de537b89ee644585bb0dbfee6bf9b3fb9d9e50559acb9b33039a491797c96c5 SHA512 1290f989d2950630c9569908275da364ae4c030b5f4541b300fb33a95000965926ef5f30431ecb89a01686bf2d891aebfb19a1b4b7cff860f26a64d47c177bc7
+DIST libixion-0.15.0.tar.xz 447388 BLAKE2B 55df3417783f1653b0aa4b80a5f0107a3794fcb403c1c1263ce9829b31ee5263a104fa210be151535c1ff091d5dc2519f694ef3cdb16074f86dab4d48a127afd SHA512 feecaa4a8e6191649a7ecbc6c0f4d7db6dba3a5e4a031c1f55236907bf94e2ece9ee05d18ed345e3503cffb4a380b04f6c4941ef4214ddf92687998a070b7543
+EBUILD libixion-0.14.1.ebuild 1086 BLAKE2B be7d43f7bf671299ccc139795972b51675d8331c48c13a99fdaec84457d528fd5e7f00ede6fdc5fd3950def9474f3edecd0523e660c4996ff51de5c2e283d9c6 SHA512 ad84f5be51fef4f66dcfd79dcecc294fd10095e535ad596990d3f2a3b115a22a4fa7204066a6df8727cf5bedfe71604753b2dd6a04330dd5be23c9f7c54bbf2f
+EBUILD libixion-0.15.0.ebuild 1206 BLAKE2B 0fde2611bc7513b15de9572186d42e00ca5ed463b919ea70658081eea1ec14fc7983acb08018ff25e970bfb22b083a713456826f7de19f94ba0eb26e53810523 SHA512 9dd464c9906f5c2e93764f211c9e3a0035b75ab57a9d77d1a9a7e1be10f46114dd0f78182113764189fd477b4ab8c29dc215026613987a02d00a9fd6379efc03
+EBUILD libixion-9999.ebuild 1190 BLAKE2B ae0379d0d47a50787dfdcba5ed739a67288e90e0f8865d0446c026179f9ed29fdb27cb7444af3416c7adbfa9becd3edf32385fa924b0770a9189f4e8ad79df3f SHA512 1b06ae898271b7b07b257b436fe8839a252c98400e75132cab36ef39ad578e803817004d0ccc372b1163e80f6e943ab9114ed868be87dda26c0746e2a2d31556
 MISC metadata.xml 397 BLAKE2B f586541f39dbba914dbeac46a03879649b394183dc117093dd1cac33d506dfb5cd0193a322761c3aebe5801a9851cfebc674e2487c86f03a5f6a53fdac059876 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312
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
new file mode 100644
index 000000000000..be5d2e6ecaeb
--- /dev/null
+++ b/dev-libs/libixion/files/libixion-0.15.0-musl-clang.patch
@@ -0,0 +1,24 @@
+From a8fe2c542b16ee30723ab3d7f3b643ee479e9723 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 23 Aug 2019 08:50:28 -0700
+Subject: [PATCH] Fix build with clang.
+
+---
+ include/ixion/model_context.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/ixion/model_context.hpp b/include/ixion/model_context.hpp
+index 6ff5b67..dc27ed0 100644
+--- a/include/ixion/model_context.hpp
++++ b/include/ixion/model_context.hpp
+@@ -61,7 +61,7 @@ public:
+         } value;
+ 
+         /** Initializes the cell to be empty. */
+-        input_cell(nullptr_t);
++        input_cell(std::nullptr_t);
+         /** Boolean cell value. */
+         input_cell(bool b);
+         /** The char array must be null-terminated. */
+-- 
+2.24.1
diff --git a/dev-libs/libixion/libixion-0.14.1.ebuild b/dev-libs/libixion/libixion-0.14.1.ebuild
index b939aad23939..808b0ec95666 100644
--- a/dev-libs/libixion/libixion-0.14.1.ebuild
+++ b/dev-libs/libixion/libixion-0.14.1.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="
 	dev-libs/boost:=
-	>=dev-util/mdds-1.4.1:1=
+	=dev-util/mdds-1.4*:1
 	python? ( ${PYTHON_DEPS} )
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/libixion/libixion-0.15.0.ebuild b/dev-libs/libixion/libixion-0.15.0.ebuild
new file mode 100644
index 000000000000..2387edbadd60
--- /dev/null
+++ b/dev-libs/libixion/libixion-0.15.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit python-single-r1
+
+DESCRIPTION="General purpose formula parser & interpreter"
+HOMEPAGE="https://gitlab.com/ixion/ixion"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/0.15" # based on SONAME of libixion.so
+IUSE="debug python static-libs +threads"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-util/mdds:1/1.5
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	dev-libs/spdlog
+"
+
+PATCHES=( "${FILESDIR}/${P}-musl-clang.patch" ) # bug 714018
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable python)
+		$(use_enable static-libs static)
+		$(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 f52b1d4a22b5..28084226f1e7 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-9999.ebuild
@@ -9,23 +9,25 @@ inherit python-single-r1
 DESCRIPTION="General purpose formula parser & interpreter"
 HOMEPAGE="https://gitlab.com/ixion/ixion"
 
-if [[ ${PV} == 9999 ]]; then
+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/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.15" # based on SONAME of libixion.so
+SLOT="0/0.16" # based on SONAME of libixion.so
 IUSE="debug python static-libs +threads"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	dev-libs/boost:=
-	>=dev-util/mdds-1.5.0:1=
+	dev-util/mdds:${MDDS_SLOT}
 	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}
@@ -38,15 +40,17 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	[[ ${PV} == 9999 ]] && eautoreconf
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable python) \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable python)
+		$(use_enable static-libs static)
 		$(use_enable threads)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {