gentoo resync : 20.10.2021

5 files changed, 139 insertions, 5 deletions

diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index b0e498d25041..fbb3eb09b379 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -1,5 +1,8 @@
 AUX isl-0.19-gdb-autoload-dir.patch 809 BLAKE2B 59dce21b8f0a7226b7b266eebd6226c0821658a548d6b1f896e58f09b03f703162db287df2f2dcaaebe58bcb76ea7e24075802e6df32581cf5e96f3e43ca1e58 SHA512 396c7c00b00c19a269540abf464f6e30d4473c9413d67a436cd4294b3cb53a5c94ab34e8e5c76c863243437d8754edaf924148596e547ef551e6d72c8122ff27
+AUX isl-0.24-gdb-autoload-dir.patch 1577 BLAKE2B e7d7fad85d194f2e55a319ee7cd803813332780a75b904897f2141d6e4797a6be3e467e28bfa007b2a14568c9f56c0efa10bdef185547179345689032cde9e57 SHA512 168e3875248af7abf432d8a82af1b9e9232fdb251425fc9d35ee3930d307f1543444d83fc46cea9bc295ec15f855c736889388a6c06062c78f06f8f39df0aa1f
 AUX isl-0.24-nobash.patch 1092 BLAKE2B 42dc0587fbb05584ff51ad490cc487159a7bb2ab5fd7db2c46bc70c572dd6ee391b077cf54767f3811b6586e8e6271a7d4d93e9a21fe968db683d349fa02103c SHA512 92ae3b054eb5cdce3e8bbc54c072e8d5cbf691a325b06269d4fe9fe6d889e1a291bb622ecf98b1c63177112914cc1836c646503b0f8f50a4cea24634f55b5445
+AUX isl-0.24-respect-flags.patch 204 BLAKE2B 34d028a22ad608fbddf7a3909000351f7cf9b7e75cf3b0f687fafc35554163a123467053433c96c32764b155c02f01a336e92e67e25726bfd3e109ba18de42b7 SHA512 0d72d99266d181cef9fac1388c254f1e85c64aa394a672245013be17f2f4117c3f23252bca42746fce91fb2b266688245c1747cf21a69afe82de058cdcb600b6
 DIST isl-0.24.tar.xz 1930956 BLAKE2B 39cbfd18ad05778e3a5a44429261b45e4abc3efe7730ee890674d968890fe5e52c73bc1f8d271c7c3bc72d5754e3f7fcb209bd139e823d19cb9ea4ce1440164d SHA512 ff6bdcff839e1cd473f2a0c1e4dd4a3612ec6fee4544ccbc62b530a7248db2cf93b4b99bf493a86ddf2aba00e768927265d5d411f92061ea85fd7929073428e8
-EBUILD isl-0.24.ebuild 1985 BLAKE2B e0a65b6a516eb5a69ccc4f82af31b51912561c371005f01552f0441d5d1dab906cd64ac0d6796e33548a4684b3f4cca39c471051b9d467b655923d18a5ee811d SHA512 b18e57fcc4ddb1aa00a9e849d2741dc5a91120e7bf0a1d5fb67ba2af2b88a2ac998e592e31865629dc57516723fbf08c17878d30803d621a356f19e0eca769af
+EBUILD isl-0.24-r1.ebuild 2179 BLAKE2B 9da3c3903e80c0727ba2c3bfda463b57ec95cc07c48899663e616a0ef64163831bc3af76443ef69eb538f89b047e8bb5ae83de29bf0d905a1cd6b79db9377c96 SHA512 7c25d27f7b95bc669dcf30b14916190d415c17bab7c2ac8a7f6c9d39681f407489bd856e04713735c5458550918298a5f6fd9ddbd182b1012e34218b3a17481a
+EBUILD isl-0.24.ebuild 2065 BLAKE2B 3e9a9474be627c9832a3347f9a6fc96371eda37f017be6770b4a60061185afac16d5479e8bb0d3cd0dbf56bf3d042a86aabaf9685541ee4571466a16843a6ae9 SHA512 226512b08c6d26de9d624ed0fefd38613e2cf1675f55b7bee31b666c4c17b1d54843808724825c9c42f31d8b146c49d2195eac49439501dd7c476a66184c1b75
 MISC metadata.xml 226 BLAKE2B 99dd52557be714400c2d45f1621a6ed5e95b38fee6c6812b4681e5363c84bac0e5a55026b609b0ec9196348fc1ea5f55b4763220ca16cf45c3b61a20dc0fb745 SHA512 df6b46a0133ce8106a367f43e477f044f06a8411b9164ed4cc8543289ec78c5e3f8d4dd3fc36100f39f5c9928d1100c0f5a25cf457dc7048dd37ccc3fec24f57
diff --git a/dev-libs/isl/files/isl-0.24-gdb-autoload-dir.patch b/dev-libs/isl/files/isl-0.24-gdb-autoload-dir.patch
new file mode 100644
index 000000000000..6751d5755fbe
--- /dev/null
+++ b/dev-libs/isl/files/isl-0.24-gdb-autoload-dir.patch
@@ -0,0 +1,35 @@
+diff -Naur isl-0.19.orig/Makefile.in isl-0.19/Makefile.in
+--- isl-0.19.orig/Makefile.in	2018-03-03 11:32:15.000000000 -0500
++++ isl-0.19/Makefile.in	2018-03-10 17:29:30.039182728 -0500
+@@ -2269,10 +2269,10 @@
+ 	case $$libisl in \
+ 	'') echo Cannot find isl library name. GDB bindings not installed.;; \
+ 	*) echo $(INSTALL_DATA) $(srcdir)/libisl-gdb.py \
+-		$(DESTDIR)$(libdir)/$$libisl-gdb.py; \
+-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"; \
++		$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)"; \
+ 	$(INSTALL_DATA) $(srcdir)/libisl-gdb.py \
+-	    $(DESTDIR)$(libdir)/$$libisl-gdb.py; \
++	    $(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
+ 	esac
+ 
+ uninstall-local:
+diff --git a/Makefile.am b/Makefile.am
+index 96cac65..8bb6aa2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -639,10 +639,10 @@ install-data-local: $(srcdir)/libisl-gdb.py
+ 	case $$libisl in \
+ 	'') echo Cannot find isl library name. GDB bindings not installed.;; \
+ 	*) echo $(INSTALL_DATA) $(srcdir)/libisl-gdb.py \
+-		$(DESTDIR)$(libdir)/$$libisl-gdb.py; \
+-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"; \
++		$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)"; \
+ 	$(INSTALL_DATA) $(srcdir)/libisl-gdb.py \
+-	    $(DESTDIR)$(libdir)/$$libisl-gdb.py; \
++		$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
+ 	esac
+ 
+ uninstall-local:
diff --git a/dev-libs/isl/files/isl-0.24-respect-flags.patch b/dev-libs/isl/files/isl-0.24-respect-flags.patch
new file mode 100644
index 000000000000..e00748b24330
--- /dev/null
+++ b/dev-libs/isl/files/isl-0.24-respect-flags.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/815700
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,6 @@ AC_PROG_CC
+ AC_PROG_CXX
+ AX_PROG_CC_FOR_BUILD
+ 
+-AX_CC_MAXOPT
+ AX_GCC_WARN_UNUSED_RESULT
+ AX_C___ATTRIBUTE__
+ 
+-- 
+
diff --git a/dev-libs/isl/isl-0.24-r1.ebuild b/dev-libs/isl/isl-0.24-r1.ebuild
new file mode 100644
index 000000000000..71aaf3b34155
--- /dev/null
+++ b/dev-libs/isl/isl-0.24-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib multilib-minimal preserve-libs toolchain-funcs
+
+DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
+HOMEPAGE="http://isl.gforge.inria.fr/ https://libisl.sourceforge.io/"
+SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz https://libisl.sourceforge.io/${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.24-gdb-autoload-dir.patch
+	"${FILESDIR}"/${PN}-0.24-nobash.patch
+	"${FILESDIR}"/${PN}-0.24-respect-flags.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+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 || die
+}
+
+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)
+}
diff --git a/dev-libs/isl/isl-0.24.ebuild b/dev-libs/isl/isl-0.24.ebuild
index 9b5ae94248d8..3c45913215e2 100644
--- a/dev-libs/isl/isl-0.24.ebuild
+++ b/dev-libs/isl/isl-0.24.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+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"
+HOMEPAGE="http://isl.gforge.inria.fr/ https://libisl.sourceforge.io/"
+SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz https://libisl.sourceforge.io/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/23"
@@ -35,6 +35,7 @@ multilib_src_configure() {
 		# 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
@@ -49,7 +50,8 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete
+
+	find "${ED}" -type f -name '*.la' -delete || die
 }
 
 pkg_preinst() {