gentoo resync : 30.05.2020

4 files changed, 47 insertions, 11 deletions

diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index 9df1a99d0f7f..6b701fb9d8b1 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,7 +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.14.1.tar.xz 360568 BLAKE2B e4da21f0eff9111272618d1bad87790ed0c4b461478473654f8366b0023c0650b41d355b0737a4fd4ac943e66f919e2f0d6bf04250e597e54a290d4415f3a093 SHA512 e4ae6348833d2178c1dc76916937bcc9d7821dc6570fe13093c441ca22e0301a1ca6a4cf85d9814b83534733dba98f4c4a372791f93bc57173317657675b9ae3
 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
+EBUILD libixion-0.15.0.ebuild 1200 BLAKE2B 73b521722306f4708e1e00c13f5b3c5f1af9364885519e50b65da42e47b857c63f3a14ccdaddea814d9238ebd18ba77c8ee08b546c43b85b8b93476cd593309c SHA512 212f660e8aaf0de1624269f1e9c7d3763f688ee3fa6f6f156211550aaed6dfc1413fbe2b5f2f73bbf608153074fce92ac32d5f4fef29e12c513940006f550e5b
+EBUILD libixion-9999.ebuild 1162 BLAKE2B 44bdf04b4f1db4dbe197626d9fa95ad37795a9ceba2a4161b0982ccf0a66489cb7fb651109dc7422328bad93aff9529b990061b68239a76d88cc07d9495222a8 SHA512 cbf07ffafb0f0e679eb56a0b1f09bcfe141927f47f05cb11f6796ef46d4cf595b6f673d932d3bbe32acf838abfba57e095670c2126f7170bf47744f25fc86d82
 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
new file mode 100644
index 000000000000..9df7b04a865c
--- /dev/null
+++ b/dev-libs/libixion/files/libixion-0.15.0-bashism.patch
@@ -0,0 +1,32 @@
+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/libixion-0.15.0.ebuild b/dev-libs/libixion/libixion-0.15.0.ebuild
index 2387edbadd60..b93481abbcaf 100644
--- a/dev-libs/libixion/libixion-0.15.0.ebuild
+++ b/dev-libs/libixion/libixion-0.15.0.ebuild
@@ -4,22 +4,22 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-single-r1
+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 autotools
+	inherit git-r3
 else
 	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"
 SLOT="0/0.15" # based on SONAME of libixion.so
-IUSE="debug python static-libs +threads"
+IUSE="debug python +threads"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -32,7 +32,10 @@ DEPEND="${RDEPEND}
 	dev-libs/spdlog
 "
 
-PATCHES=( "${FILESDIR}/${P}-musl-clang.patch" ) # bug 714018
+PATCHES=(
+	"${FILESDIR}/${P}-musl-clang.patch" # bug 714018
+	"${FILESDIR}/${P}-bashism.patch" # bug 723128
+)
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -40,14 +43,14 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	[[ ${PV} == *9999 ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
+		--disable-static
 		$(use_enable debug)
 		$(use_enable python)
-		$(use_enable static-libs static)
 		$(use_enable threads)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild
index 28084226f1e7..e3b55ff91012 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-9999.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0/0.16" # based on SONAME of libixion.so
-IUSE="debug python static-libs +threads"
+IUSE="debug python +threads"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -45,9 +45,9 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		--disable-static
 		$(use_enable debug)
 		$(use_enable python)
-		$(use_enable static-libs static)
 		$(use_enable threads)
 	)
 	econf "${myeconfargs[@]}"