gentoo resync : 31.08.2021

5 files changed, 50 insertions, 16 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 4ed60bf5b533..27aa1f4f5a7a 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/ypsilon/Manifest b/dev-scheme/ypsilon/Manifest
index 50580fa8f378..82f2312b2f00 100644
--- a/dev-scheme/ypsilon/Manifest
+++ b/dev-scheme/ypsilon/Manifest
@@ -1,4 +1,5 @@
-AUX ypsilon-0.9.6_p3-asneeded.patch 353 BLAKE2B ea32b5ffd6ed20a54ea28e799e9cb38a3df5f0fa251c7d47ed097949b80b7af0118b4f96634e4d6888a001bc031c239530047200e24e408f31b94233c252e083 SHA512 12709409fc4663bc945a8bb182c0c0155d37c85b739adb99c9ca7ff31fdebbbe8e67b8fa3e0a98e93b01d9d5aa2f47db1630b0c57d3b1a0e462bddb92fa604e2
+AUX ypsilon-0.9.6_p3-asneeded.patch 236 BLAKE2B 55a9fb7887a8c1785af6599d579a7e5964fba774efe5e817c284918687684bda2e72515a02b0325fcefa8e6aedac7fedfe72402ec6e45db77962f72680c108e4 SHA512 d5fa179e2cd673bb16b1c05554e51e8d50b73730da47d4c0ce3e615c68d10f0a9f66716fd00e6393ddc21df111f35b9e7c6c4c2e5877793a9c0e843f49082bcc
+AUX ypsilon-0.9.6_p3-clang-cflags.patch 738 BLAKE2B a7243502d14e952b3593373655163f54f502bd5f2a7218e2e4b68e1631284397be6847a446a84ef5749f9a0662dd2e15e0b63e90812d48b42f352a8436a01c05 SHA512 80db68abc7f7b281b9f9d2dbf47f465a5c657eabbf119f0e0097fc37d6728d3207ff34f1603f34cbd6b3127859e610ba771d8d7c98022c4999b14765efe7ed9e
 DIST ypsilon-0.9.6.update3.tar.gz 4555843 BLAKE2B 65cdf9d154dbe201967a0eea9b21b90f86eb7a88975bb9f4013f801ed28e6da09eb29a793287f0870f6b27f3e63594a79e7894a6a6780342223a728c229babb0 SHA512 9ea5e3e70481c538bcaf671feb7f764015fb44702bcec4e2873007e065bf48d7d9b0cfc8f9dcc51e0083b0bf5296fd8ac40a1f851d76019a18b21fa7e292ee89
-EBUILD ypsilon-0.9.6_p3.ebuild 861 BLAKE2B 66af82997a60a00aed532af93ac16f7028102eae1c6dc509c79f9f2bbd9fdeb7b5550687635197c652c40922724fa4995e1d991e1ba8a465458c1ca4c40ec56d SHA512 e34568cd000bf7e1a12fe1c41ea2b9dd3fd89e1c50fa6c3d167458d7b960ae90017a7459b66d47296320c02d93e68edefcef3a8417b1e5e162d0804330ffb3f5
+EBUILD ypsilon-0.9.6_p3-r1.ebuild 1016 BLAKE2B 853c61e96c08653c0c97eda5d625742cd02b3cf764f7cfcdf9c284ffb2636ea22e5d9443c4366ac01de3152f35dfd2386b5633bc767fafa2870afcff695d6e1d SHA512 30da4f8a90e90040139a7ab38941931ad2b5f744c5c7620ba36685286fffc4c4df33eea24d9db70d4b2c47e659c26a158df17dbc4450da62c5fc69550cd5e696
 MISC metadata.xml 486 BLAKE2B d562278ad0676d151db2d3bf07a11749bcf43483c28d783d6831a42ab70b070c993e97fadbcf5854ca9232a9325efc180171ee16414db0dad1e2b42abc9b2e45 SHA512 5ad24cb19a09eba414c8099f9300eb81b254797641e6234e2819e10d8fc52066d6bf75e639f71a5bf8bd9e10178cf56342a129401ceec31689bea4b82bc28eb9
diff --git a/dev-scheme/ypsilon/files/ypsilon-0.9.6_p3-asneeded.patch b/dev-scheme/ypsilon/files/ypsilon-0.9.6_p3-asneeded.patch
index 4769fce6c25c..9ea4256de937 100644
--- a/dev-scheme/ypsilon/files/ypsilon-0.9.6_p3-asneeded.patch
+++ b/dev-scheme/ypsilon/files/ypsilon-0.9.6_p3-asneeded.patch
@@ -1,5 +1,5 @@
---- ypsilon-0.9.6.update3.orig/Makefile	2008-12-23 09:56:02.000000000 +0100
-+++ ypsilon-0.9.6.update3/Makefile	2009-10-21 18:14:37.613881129 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -126,7 +126,7 @@
  	@mkdir -p -m755 $(HOME)/.ypsilon
  
diff --git a/dev-scheme/ypsilon/files/ypsilon-0.9.6_p3-clang-cflags.patch b/dev-scheme/ypsilon/files/ypsilon-0.9.6_p3-clang-cflags.patch
new file mode 100644
index 000000000000..8d2ce6ea796a
--- /dev/null
+++ b/dev-scheme/ypsilon/files/ypsilon-0.9.6_p3-clang-cflags.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/730692
+
+From 8d5318ea079f53149ab87974a4ad9ed9c5c7fcf5 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 27 Aug 2021 03:58:34 +0100
+Subject: [PATCH] Drop flags Clang doesn't support
+
+In particular, -fno-crossjumping but the rest seem rather unnecessary.
+--- a/Makefile
++++ b/Makefile
+@@ -130,12 +130,10 @@ $(PROG): $(OBJS)
+ 
+ vm1.s: vm1.cpp
+ 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) \
+-	-fno-reorder-blocks -fno-crossjumping -fno-align-labels -fno-align-loops -fno-align-jumps \
+ 	-fverbose-asm -S src/vm1.cpp
+ 
+ vm1.o: vm1.cpp
+ 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) \
+-	-fno-reorder-blocks -fno-crossjumping -fno-align-labels -fno-align-loops -fno-align-jumps \
+ 	-c src/vm1.cpp
+ 
+ install: all stdlib sitelib
diff --git a/dev-scheme/ypsilon/ypsilon-0.9.6_p3.ebuild b/dev-scheme/ypsilon/ypsilon-0.9.6_p3-r1.ebuild
index 3b4f21c6ca6b..2d202116658b 100644
--- a/dev-scheme/ypsilon/ypsilon-0.9.6_p3.ebuild
+++ b/dev-scheme/ypsilon/ypsilon-0.9.6_p3-r1.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit epatch flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 MY_P="${P/_p/.update}"
 DESCRIPTION="R6RS-compliant Scheme implementation for real-time applications"
 HOMEPAGE="https://code.google.com/p/ypsilon/"
 SRC_URI="https://ypsilon.googlecode.com/files/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -18,23 +19,32 @@ IUSE="examples threads"
 DEPEND="app-arch/cpio"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-asneeded.patch
+	"${FILESDIR}"/${P}-clang-cflags.patch
+)
 
 src_compile() {
 	use threads && append-flags "-pthread"
 
-	emake PREFIX="/usr" CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}" LDFLAGS="$LDFLAGS"
+	# Fix build failure with GCC 11
+	# bug #787866
+	append-cppflags -DNO_TLS
+
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		AS="$(tc-getAS)" \
+		CXX="$(tc-getCXX)" \
+		CPPFLAGS="${CPPFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins example/*
+		docinto examples
+		dodoc example/*
 	fi
 }