gentoo resync : 15.06.2021

5 files changed, 2 insertions, 124 deletions

diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index 548bf924c77a..32c3f066a6bb 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,8 +1,4 @@
-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-0.16.1.ebuild 1210 BLAKE2B cc83586b6659d27d5c7113a7cd9af8c5f1670292596a013b8b8fcc880f3b54d2a9b6794f8e2697aab4fc5e10de1d3d009b125e3901157b195b17658538ed93c4 SHA512 7c6d6f088790607f6a1fc9582f7b94f9cdc09360e9666556db87cdd650285bb3e13ca1de4d9d6543a8eae6aefd1c7988fcff2974b338689337b0460008ad08d8
+EBUILD libixion-0.16.1.ebuild 1207 BLAKE2B 0edbb68de39c1cdacb6d863001713d5a282b3a81aaed817f92569dd47e0ebaf6c1c0124a186d97745b006ad4c54357b353b2f1b459a3c7ca6f3a33a322a8b9ed SHA512 a5a114d0b1d087aacd304414284656993db49ad11e877b42162781791ec54ce754f677e3db56ea42d378a4b1103e5c1dcc79bd56d36e533d375191039ae2d92c
 EBUILD libixion-9999.ebuild 1210 BLAKE2B cc83586b6659d27d5c7113a7cd9af8c5f1670292596a013b8b8fcc880f3b54d2a9b6794f8e2697aab4fc5e10de1d3d009b125e3901157b195b17658538ed93c4 SHA512 7c6d6f088790607f6a1fc9582f7b94f9cdc09360e9666556db87cdd650285bb3e13ca1de4d9d6543a8eae6aefd1c7988fcff2974b338689337b0460008ad08d8
 MISC metadata.xml 397 BLAKE2B f586541f39dbba914dbeac46a03879649b394183dc117093dd1cac33d506dfb5cd0193a322761c3aebe5801a9851cfebc674e2487c86f03a5f6a53fdac059876 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312
diff --git a/dev-libs/libixion/files/libixion-0.15.0-bashism.patch b/dev-libs/libixion/files/libixion-0.15.0-bashism.patch
deleted file mode 100644
index 9df7b04a865c..000000000000
--- a/dev-libs/libixion/files/libixion-0.15.0-bashism.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 076f6576e7398842457d34fd68140512795c7e00 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-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@mattwhitlock.name>
-Gentoo-bug: https://bugs.gentoo.org/723128
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- 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/files/libixion-0.15.0-musl-clang.patch b/dev-libs/libixion/files/libixion-0.15.0-musl-clang.patch
deleted file mode 100644
index be5d2e6ecaeb..000000000000
--- a/dev-libs/libixion/files/libixion-0.15.0-musl-clang.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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.15.0.ebuild b/dev-libs/libixion/libixion-0.15.0.ebuild
deleted file mode 100644
index 9d8cd6a883d7..000000000000
--- a/dev-libs/libixion/libixion-0.15.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit autotools 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
-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 +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
-	"${FILESDIR}/${P}-bashism.patch" # bug 723128
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable 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-0.16.1.ebuild b/dev-libs/libixion/libixion-0.16.1.ebuild
index 96e5b7ce6f18..398d697373af 100644
--- a/dev-libs/libixion/libixion-0.16.1.ebuild
+++ b/dev-libs/libixion/libixion-0.16.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MDDS_SLOT="1/1.5"
 	SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="MIT"