gentoo resync : 15.01.2020

3 files changed, 88 insertions, 0 deletions

diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index c067cda45f6c..cb77ab53e8a9 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -1,9 +1,11 @@
 AUX isl-0.07-gdb-autoload-dir.patch 871 BLAKE2B c3bbc1db60cbf0c844839f07190e81265e606d7796438be1e7d370f559316f4a0096ce12fc93b583c0663de83592e6f4c50bef838eb42273059ac2cea16e17b5 SHA512 ffe4db1e1bc2199718667d7e3835d5d3fcabfa82402d39ec540fb86641ced3a46d43cd60682188883927c796925679142b4481b231d218bd776cb3c08ef8117e
 AUX isl-0.19-gdb-autoload-dir.patch 809 BLAKE2B 59dce21b8f0a7226b7b266eebd6226c0821658a548d6b1f896e58f09b03f703162db287df2f2dcaaebe58bcb76ea7e24075802e6df32581cf5e96f3e43ca1e58 SHA512 396c7c00b00c19a269540abf464f6e30d4473c9413d67a436cd4294b3cb53a5c94ab34e8e5c76c863243437d8754edaf924148596e547ef551e6d72c8122ff27
+AUX isl-0.22-bmap-nullderef.patch 1223 BLAKE2B 21af9877b9a6ea9645ad1b86f40dfd6d4a0bf8f68e905c34deb5aff376791de7f363c4086a7fab63fa0aaface5488c58fce25e583558c055502d6437d9230687 SHA512 56cb1c77b16b03e2c6a50a6cc2e6e8480027b4874ebc56660d931c03468c6c8c5f21fbab5f5d27b7b93bbf6d7680b52e52349bcf433456a8cd2ec4a7bb8a0ff7
 DIST isl-0.12.2.tar.bz2 1319434 BLAKE2B 53f009dc8093fb3d7d2db40db8f6fd9d7de630777e0308ac3c5918c2c106eda0edd7451df18c954ed6c9fc3ed7d18c73708d7b1f94c8c5c55aa94f8845f5b219 SHA512 b5dea4d6b504fac22f2d8cd9c47d6896994d3966635a514d45010243db44cfbc009574b808f3587f35d91de629110bc11b52941d4075e21f8646c59656e62aea
 DIST isl-0.21.tar.xz 1621680 BLAKE2B ffd0c8aa7d489283ac958c280c05fe0c9ad621a10bd157d0522ac209a58e9bb6a8aad76c7a49b42d5e1c0f3605d0fb05a41ed6f2bb9aabb4f06060a5bbb65de5 SHA512 87ebc2fd6d4325cdfa82295a659ed6dbd70760a776b733e5503bbf8baa8fe80d905879728e9c7f23d2f3bcd7e78c00a66ab166c013ae97b603f7c460c69668ec
 DIST isl-0.22.tar.xz 1676992 BLAKE2B 1cb2125761adec02d9f337e8730faa5bc3a4e63cb7d968f7f4de3a3360b1f9be6caf6a27031f02df1ebe149fb70b6a32bdddbe8ae03032b8ff366f4eac274483 SHA512 7c3c9502ea07e4d47a823841837c3aa0b9d7ba0fe58deaf180734e44c18e53735ec783645da0bdc56b617c9e639b226cc03b40a947f852e1e787166a64f59424
 EBUILD isl-0.12.2.ebuild 1026 BLAKE2B 8757a140cee7104d9907c54bd72836aef56ad58c3b2972f9b130831ca0b2eda1eeee45a896eca8b28b08a22cfc2d11d053ee73d677127fea4450bbde7e6a5390 SHA512 9e40b23cef96116fd7709e8b4e0fe74cf7f54b410bb8676ba95a7d8c87d76e4be5339a68cf7ac036ef3dcbd88a1c711649b0497c015003f78c43fcd9d1e808d8
 EBUILD isl-0.21.ebuild 1237 BLAKE2B 579f3ed0505f6f65bea2de1f430bbd176483601ed209123b1c2f2ea42bc12757fae3f87100b9cc8ad6ffaa52b6bc1e6b3c2e9b2cfc676409c12f95e16238f79b SHA512 875116ea7e07024e08908610c2dcb0bdc8e74c8d55b213c2bd92e897741f72d216e64e5ba0ec5d1dacc6cdb44a47d9594716f9b90f12d6c4677267ae8698a6c4
+EBUILD isl-0.22-r1.ebuild 1391 BLAKE2B b2397fc0584d2e7a45e106ccb2781243ac678c68450c3e0c79681189da90ba911392f41c52128f1f9b2330374e6b80549144c65c1403b8102f6667417bd7d526 SHA512 f6c99d205e9c07b11e3dcaecff783eb017baa4679fece494975dd5c6005280d3bb9bb75e8e3383b838c012013e3c756faf5a54241d05377b0bef6395363f9f5c
 EBUILD isl-0.22.ebuild 1344 BLAKE2B d2cada2dcaa6f46c38ecb0d199d71e0c5456736a17d9acd757aa8fe8c7d9297cfaf0a187d67b2bb0d508ef503020bf164d2b60563dae57a550fb03833d895532 SHA512 16f6e4f0219eeed1108814c6921a4bee91ced76782ecb9dae34423c23b82c3a68246e5955bee6714bb47d8a8b559d940366d427b28da452ebe2f461a09cd2d4f
 MISC metadata.xml 225 BLAKE2B 901efe1bb7f8f4397683b11d3fbf7ce4ede981f34596ac97d8c1bd77589d4732135b23b9791c2af3cae65ca152a706baaa13a17ea5c777090bab0aae0d64a310 SHA512 2997fa08fd2cfcf45753278a609cf2d75076f97848a83f09ff57b5cb71599495736a3a43f47ad24e1e3940bd937bf37592eff1d917e23f647995daf456e87d73
diff --git a/dev-libs/isl/files/isl-0.22-bmap-nullderef.patch b/dev-libs/isl/files/isl-0.22-bmap-nullderef.patch
new file mode 100644
index 000000000000..00104f1f4321
--- /dev/null
+++ b/dev-libs/isl/files/isl-0.22-bmap-nullderef.patch
@@ -0,0 +1,34 @@
+https://groups.google.com/forum/#!original/isl-development/Otz1QKZDpzA/71GkTvqkCAAJ
+https://bugs.gentoo.org/702968
+
+Subject: [MAINT PATCH] isl_basic_map_underlying_set: fix error handling
+Date: Tue,  7 Jan 2020 23:02:42 +0100
+Message-Id: <20200107220242...@kotnet.org>
+X-Mailer: git-send-email 2.24.1.591.g12029dc57d
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+From: Sven Verdoolaege <sven.ve...@gmail.com>
+
+The check for a valid bmap before accessing its n_div field
+was inadvertently removed in isl-0.21-230-g6a4c4bbf31 (isl_map.c:
+extract out shared isl_basic_map_{take,restore}_space,
+Thu Aug 11 10:27:49 2016 +0200).
+
+Reported-by: Richard Biener <rgue...@suse.de>
+Signed-off-by: Sven Verdoolaege <sven.ve...@gmail.com>
+---
+ isl_map.c | 2 ++
+ 1 file changed, 2 insertions(+)
+--- a/isl_map.c
++++ b/isl_map.c
+@@ -5511,6 +5511,8 @@ __isl_give isl_basic_set *isl_basic_map_underlying_set(
+ 	    !isl_space_is_named_or_nested(bmap->dim, isl_dim_out))
+ 		return bset_from_bmap(bmap);
+ 	bmap = isl_basic_map_cow(bmap);
++	if (!bmap)
++		return NULL;
+ 	space = isl_basic_map_take_space(bmap);
+ 	space = isl_space_underlying(space, bmap->n_div);
+ 	bmap = isl_basic_map_restore_space(bmap, space);
+-- 
+2.24.1.591.g12029dc57d
diff --git a/dev-libs/isl/isl-0.22-r1.ebuild b/dev-libs/isl/isl-0.22-r1.ebuild
new file mode 100644
index 000000000000..807d8300e4a9
--- /dev/null
+++ b/dev-libs/isl/isl-0.22-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit eutils multilib-minimal preserve-libs
+
+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/22"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS doc/manual.pdf )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.19-gdb-autoload-dir.patch
+	"${FILESDIR}"/${PN}-0.22-bmap-nullderef.patch
+)
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+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)
+}
+
+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)
+}