From f4136e7e545b69ea693b7df971c715b47f747f03 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
Date: Sat, 27 Feb 2021 23:15:28 +0100
Subject: [PATCH 1/2] isl: update to 0.23 (with cloog and soname)

---
 common/shlibs          |  2 +-
 srcpkgs/cloog/template |  8 ++++----
 srcpkgs/isl/template   | 14 ++++++++------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b016d28f788..da7a65ca56b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1078,7 +1078,7 @@ libfltk_images.so.1.3 fltk-1.3.0_1
 libspectre.so.1 libspectre-0.2.6_1
 libsratom-0.so.0 sratom-0.4.0_1
 libpwquality.so.1 libpwquality-1.1.1_1
-libisl.so.10 isl-0.10_1
+libisl.so.23 isl-0.23_1
 libisl.so.19 isl15-0.19_1
 libcloog-isl.so.4 cloog-0.18.1_1
 librtmp.so.1 librtmp-2.4.20161210_1
diff --git a/srcpkgs/cloog/template b/srcpkgs/cloog/template
index 13aa6cad577..18a84032fdd 100644
--- a/srcpkgs/cloog/template
+++ b/srcpkgs/cloog/template
@@ -1,7 +1,7 @@
 # Template file for 'cloog'
 pkgname=cloog
-version=0.18.4
-revision=2
+version=0.20.0
+revision=1
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--with-isl=system --with-gmp=system --with-gmp-exec-prefix=${XBPS_CROSS_BASE}"
@@ -10,8 +10,8 @@ short_desc="Library that generates loops for scanning polyhedra"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.bastoul.net/cloog/"
-distfiles="http://www.bastoul.net/cloog/pages/download/cloog-$version.tar.gz"
-checksum=325adf3710ce2229b7eeb9e84d3b539556d093ae860027185e7af8a8b00a750e
+distfiles="https://github.com/periscop/cloog/releases/download/cloog-${version}/cloog-${version}.tar.gz"
+checksum=835c49951ff57be71dcceb6234d19d2cc22a3a5df84aea0a9d9760d92166fc72
 
 cloog-devel_package() {
 	depends="${makedepends} cloog>=${version}_${revision}"
diff --git a/srcpkgs/isl/template b/srcpkgs/isl/template
index 9a79dc216a1..d38776ffc66 100644
--- a/srcpkgs/isl/template
+++ b/srcpkgs/isl/template
@@ -1,16 +1,17 @@
 # Template file for 'isl'
 pkgname=isl
-version=0.12.2
-revision=2
+version=0.23
+revision=1
+wrksrc="isl-${version}"
 bootstrap=yes
 build_style=gnu-configure
 makedepends="gmp-devel"
 short_desc="Integer Set Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://freecode.com/projects/isl"
-license="LGPL-2.1"
+license="MIT"
+homepage="http://isl.gforge.inria.fr"
 distfiles="http://isl.gforge.inria.fr/isl-${version}.tar.bz2"
-checksum=f4b3dbee9712850006e44f0db2103441ab3d13b406f77996d1df19ee89d11fb4
+checksum=c58922c14ae7d0791a77932f377840890f19bc486b653fa64eba7f1026fb214d
 
 if [ -z "$CHROOT_READY" ]; then
 	CFLAGS="-I${XBPS_MASTERDIR}/usr/include"
@@ -23,8 +24,9 @@ post_install() {
 }
 
 isl-devel_package() {
-	depends="gmp-devel isl>=${version}_${revision}"
+ 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
+ 	conflicts="isl-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig

From 556d2aec4153981ebccc2d18b16f47a53ec5c387 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
Date: Sun, 28 Feb 2021 10:03:41 +0100
Subject: [PATCH 2/2] isl: fix conflicts and vlicense

---
 srcpkgs/isl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/isl/template b/srcpkgs/isl/template
index d38776ffc66..e7bf749839d 100644
--- a/srcpkgs/isl/template
+++ b/srcpkgs/isl/template
@@ -19,6 +19,7 @@ if [ -z "$CHROOT_READY" ]; then
 fi
 
 post_install() {
+	vlicense LICENSE
 	# Remove gdb python files.
 	rm -f ${DESTDIR}/usr/lib/*.py
 }
@@ -26,7 +27,6 @@ post_install() {
 isl-devel_package() {
  	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
- 	conflicts="isl-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig