gentoo resync : 20.03.2021

3 files changed, 67 insertions, 6 deletions

diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index 24382b462d47..d4c83b6089b9 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,6 +1,8 @@
 AUX libixion-0.15.0-bashism.patch 895 BLAKE2B 6da1172978c76732c2e7127a6c85e1bb6bac7912fabe96e0ad91f07f1ff89a97fed2e3bf7d348c58f79fcedfb17d2f5e33dd6738769fb208c3c28a4521b7a9d7 SHA512 aa93ad7dcd20b703b9bab4fbd880ae13cc532345a007e28fca010215bbdeab411fffc1ce5cff5e7b602ffec2db4193d212e2b5a956b33cbaa05207b04921205b
 AUX libixion-0.15.0-musl-clang.patch 754 BLAKE2B 7764c55758669b39ee8ad38b976653e805840a5831ce38f2458c3e2b008dfca94b5bd68cdbadeda81a6b4bbd647fa3883d3c47dfa76761a31f8f9ff699c0ad8d SHA512 1b6a62c9219705472046d9da5fa8a92672a7055160c66f16a31fd003fe88ceceedaac4d67774bf55103a98d7434c030e1a020e15dd818aec23267b47bcb9561d
 DIST libixion-0.15.0.tar.xz 447388 BLAKE2B 55df3417783f1653b0aa4b80a5f0107a3794fcb403c1c1263ce9829b31ee5263a104fa210be151535c1ff091d5dc2519f694ef3cdb16074f86dab4d48a127afd SHA512 feecaa4a8e6191649a7ecbc6c0f4d7db6dba3a5e4a031c1f55236907bf94e2ece9ee05d18ed345e3503cffb4a380b04f6c4941ef4214ddf92687998a070b7543
+DIST libixion-0.16.1.tar.xz 482500 BLAKE2B 26075c819a952f48c4e136fa28b4ef5075b455dea52d51940e4fc55344e19e404d70b44222631d0b0f85280d09bb8a05955bfcbe0a228b97d72d8f00f1639248 SHA512 979c631e9536f6d2c3ae32f7892756ac8889d27c551d80eb9d519bf912bd323da4b6ecd363fe2719e74e04bc3661e5d56e03a582f68f5293ffcac59b74f4c7de
 EBUILD libixion-0.15.0.ebuild 1197 BLAKE2B 4e29a88f44a9d75b451213de6cd404675aa105cb3b838f06a604d4aae7cb935cfb464fd07e8f8c602d5224731274db509ea0fde95dbb0b51c9e6aaa39fe196e4 SHA512 7dffca8b8d82fc84b6888ffce3d3ef43c8307fe7148fd15b2ecceb1b661cd927fade9daf97fccedecdac15089b527ab6b3e2e6a6c5f645e3e4b2363c4dc32d91
-EBUILD libixion-9999.ebuild 1160 BLAKE2B 38603b78e3d356387921f61d1a03057be8a3db2ea1819723c22e6e824386c5fa3b104362485a57a1ffa9ff64e85c80f63533f7310262f990b6c3c6285395db5a SHA512 7e1e40c3ce6b5a2d8e3a257220ecf5b9d7e73ce07c12f69cd2ef2a50167ef549a748f2ddcacd71581aa074c72b30568fdbc0a3f3100e95f31fbc3743ffa438ca
+EBUILD libixion-0.16.1.ebuild 1211 BLAKE2B ebc09a973772c773f53c637ba0afe242797e8c4282c9270fd230115957fe1685641d1db560d95d8f698478dab6311fc84ce7f5a000dbb93f0422f5267bf32e61 SHA512 7eff99faae43a0b55a066e89177300eb647d490818ab9d7d016e3ce0966b4dc966850ae90de40da42caad3af098de8d093aaf458d206e945073c817875c50379
+EBUILD libixion-9999.ebuild 1210 BLAKE2B cc83586b6659d27d5c7113a7cd9af8c5f1670292596a013b8b8fcc880f3b54d2a9b6794f8e2697aab4fc5e10de1d3d009b125e3901157b195b17658538ed93c4 SHA512 7c6d6f088790607f6a1fc9582f7b94f9cdc09360e9666556db87cdd650285bb3e13ca1de4d9d6543a8eae6aefd1c7988fcff2974b338689337b0460008ad08d8
 MISC metadata.xml 397 BLAKE2B f586541f39dbba914dbeac46a03879649b394183dc117093dd1cac33d506dfb5cd0193a322761c3aebe5801a9851cfebc674e2487c86f03a5f6a53fdac059876 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312
diff --git a/dev-libs/libixion/libixion-0.16.1.ebuild b/dev-libs/libixion/libixion-0.16.1.ebuild
new file mode 100644
index 000000000000..52f2afa3ce6f
--- /dev/null
+++ b/dev-libs/libixion/libixion-0.16.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,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/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}"
+
+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 c1793b33a8dc..96e5b7ce6f18 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit python-single-r1
 
 DESCRIPTION="General purpose formula parser & interpreter"
@@ -30,9 +30,7 @@ RDEPEND="
 	dev-util/mdds:${MDDS_SLOT}
 	python? ( ${PYTHON_DEPS} )
 "
-DEPEND="${RDEPEND}
-	dev-libs/spdlog
-"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -47,6 +45,8 @@ 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)
 	)