gentoo resync : 04.05.2021

3 files changed, 109 insertions, 0 deletions

diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index 3b010e61d68d..0e94441e2fb8 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -1,4 +1,7 @@
 AUX isl-0.19-gdb-autoload-dir.patch 809 BLAKE2B 59dce21b8f0a7226b7b266eebd6226c0821658a548d6b1f896e58f09b03f703162db287df2f2dcaaebe58bcb76ea7e24075802e6df32581cf5e96f3e43ca1e58 SHA512 396c7c00b00c19a269540abf464f6e30d4473c9413d67a436cd4294b3cb53a5c94ab34e8e5c76c863243437d8754edaf924148596e547ef551e6d72c8122ff27
+AUX isl-0.24-nobash.patch 1092 BLAKE2B 42dc0587fbb05584ff51ad490cc487159a7bb2ab5fd7db2c46bc70c572dd6ee391b077cf54767f3811b6586e8e6271a7d4d93e9a21fe968db683d349fa02103c SHA512 92ae3b054eb5cdce3e8bbc54c072e8d5cbf691a325b06269d4fe9fe6d889e1a291bb622ecf98b1c63177112914cc1836c646503b0f8f50a4cea24634f55b5445
 DIST isl-0.23.tar.xz 1729656 BLAKE2B ce026eaa1d6c814f4067c555d97a453bdf01d5fa240aa9b6ccd22c9a0e7f19b0c30cd834f976a29b10a5d57eaa747a3f45cf55717f05d98ae405ec93dd42f27b SHA512 da4e7cbd5045d074581d4e1c212acb074a8b2345a96515151b0543cbe2601db6ac2bbd93f9ad6643e98f845b68f438f3882c05b8b90969ae542802a3c78fea20
+DIST isl-0.24.tar.xz 1930956 BLAKE2B 39cbfd18ad05778e3a5a44429261b45e4abc3efe7730ee890674d968890fe5e52c73bc1f8d271c7c3bc72d5754e3f7fcb209bd139e823d19cb9ea4ce1440164d SHA512 ff6bdcff839e1cd473f2a0c1e4dd4a3612ec6fee4544ccbc62b530a7248db2cf93b4b99bf493a86ddf2aba00e768927265d5d411f92061ea85fd7929073428e8
 EBUILD isl-0.23-r1.ebuild 1946 BLAKE2B 74d448cc3408bdb9bea687ebf578effc2b16676974b156b3dda38c84d27ccb5073bc8de951c615f3e68ff8a0ea0fdd65ecbf6cf41867a50484434e6c8a446e7a SHA512 c8d379c083def1b02c4c9e50d5d520b6cdcbff3fdad85c8c954a28004174ef9e2fe6b985f79d3bd770bcb959365ab067f17a361a9ce929edda4a9dc2eb9ca30c
+EBUILD isl-0.24.ebuild 1992 BLAKE2B 94740683f4723be4a48efd694b1f6ad558b432d27a5863e5abe7d5ea5cbdb90cd4a92b285bf059a5ee5cde841f1dd5aee97d1bd858e83f5a01b6597c2f887726 SHA512 ba3424ef9c934830c6c1649ef029b984fcba67601af66cb93c6db6b77f376bc675f004693e7fd448925409239d99f8487042850da7a728d90348c5bb862d4799
 MISC metadata.xml 225 BLAKE2B 901efe1bb7f8f4397683b11d3fbf7ce4ede981f34596ac97d8c1bd77589d4732135b23b9791c2af3cae65ca152a706baaa13a17ea5c777090bab0aae0d64a310 SHA512 2997fa08fd2cfcf45753278a609cf2d75076f97848a83f09ff57b5cb71599495736a3a43f47ad24e1e3940bd937bf37592eff1d917e23f647995daf456e87d73
diff --git a/dev-libs/isl/files/isl-0.24-nobash.patch b/dev-libs/isl/files/isl-0.24-nobash.patch
new file mode 100644
index 000000000000..226daa551c70
--- /dev/null
+++ b/dev-libs/isl/files/isl-0.24-nobash.patch
@@ -0,0 +1,35 @@
+Fix-by: Matt Whitlock
+Bug: https://bugs.gentoo.org/786564
+--- a/configure.ac	2020-11-01 13:53:47.000000000 +0000
++++ b/configure.ac	2021-04-28 19:34:28.615119537 +0000
+@@ -83,8 +83,8 @@
+ AM_CONDITIONAL(GMP_FOR_MP, test x$with_int = xgmp)
+ 
+ AM_CONDITIONAL(HAVE_CXX11, test "x$HAVE_CXX11" = "x1")
+-AM_CONDITIONAL(SMALL_INT_OPT, test "x$with_int" == "ximath-32")
+-AS_IF([test "x$with_int" == "ximath-32"], [
++AM_CONDITIONAL(SMALL_INT_OPT, test "x$with_int" = "ximath-32")
++AS_IF([test "x$with_int" = "ximath-32"], [
+ 	AC_DEFINE([USE_SMALL_INT_OPT], [], [Use small integer optimization])
+ ])
+ 
+--- a/configure	2020-11-01 13:53:55.000000000 +0000
++++ b/configure	2021-04-28 19:34:29.246125644 +0000
+@@ -20654,7 +20654,7 @@
+   HAVE_CXX11_FALSE=
+ fi
+ 
+- if test "x$with_int" == "ximath-32"; then
++ if test "x$with_int" = "ximath-32"; then
+   SMALL_INT_OPT_TRUE=
+   SMALL_INT_OPT_FALSE='#'
+ else
+@@ -20662,7 +20662,7 @@
+   SMALL_INT_OPT_FALSE=
+ fi
+ 
+-if test "x$with_int" == "ximath-32"; then :
++if test "x$with_int" = "ximath-32"; then :
+ 
+ 
+ $as_echo "#define USE_SMALL_INT_OPT /**/" >>confdefs.h
diff --git a/dev-libs/isl/isl-0.24.ebuild b/dev-libs/isl/isl-0.24.ebuild
new file mode 100644
index 000000000000..5793b07aae36
--- /dev/null
+++ b/dev-libs/isl/isl-0.24.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal preserve-libs toolchain-funcs
+
+DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
+HOMEPAGE="http://isl.gforge.inria.fr/"
+SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/23"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS doc/manual.pdf )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.19-gdb-autoload-dir.patch
+	"${FILESDIR}"/${PN}-0.24-nobash.patch
+)
+
+multilib_src_configure() {
+	local econf_opts=(
+		$(use_enable static-libs static)
+
+		# AX_PROG_CC_FOR_BUILD deficiency:
+		# https://wiki.gentoo.org/wiki/Project:Toolchain/use_native_symlinks
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+	)
+	if ! tc-is-cross-compiler; then
+		# Incorrect CFLAGS handling as CFLAGS_FOR_BUILD
+		# even for native builds. As a result -O3 is being used
+		# regardless of user's CFLAGS.
+		econf_opts+=(
+			CFLAGS_FOR_BUILD="${CFLAGS}"
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${econf_opts[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete
+}
+
+pkg_preinst() {
+	preserve_old_lib \
+		/usr/$(get_libdir)/libisl$(get_libname 14) \
+		/usr/$(get_libdir)/libisl$(get_libname 15) \
+		/usr/$(get_libdir)/libisl$(get_libname 19) \
+		/usr/$(get_libdir)/libisl$(get_libname 21) \
+		/usr/$(get_libdir)/libisl$(get_libname 22)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify \
+		/usr/$(get_libdir)/libisl$(get_libname 14) \
+		/usr/$(get_libdir)/libisl$(get_libname 15) \
+		/usr/$(get_libdir)/libisl$(get_libname 19) \
+		/usr/$(get_libdir)/libisl$(get_libname 21) \
+		/usr/$(get_libdir)/libisl$(get_libname 22)
+}