[gentoo-commits] repo/gentoo:master commit in: dev-scheme/ypsilon/files/, profiles/, dev-scheme/ypsilon/

[Sam James]

commit:     f36a27d75b9d3f82b98f63624202cf3624387ec6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 27 02:55:26 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 27 03:02:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f36a27d7

dev-scheme/ypsilon: fix build with GCC 11, un-last-rite

Thanks-to: Watcom <hodge <AT> dornbeast.com>
Bug: https://bugs.gentoo.org/730692
Closes: https://bugs.gentoo.org/787866
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../ypsilon/files/ypsilon-0.9.6_p3-asneeded.patch  |  4 ++--
 ...-0.9.6_p3.ebuild => ypsilon-0.9.6_p3-r1.ebuild} | 28 ++++++++++++++--------
 profiles/package.mask                              |  5 ----
 3 files changed, 20 insertions(+), 17 deletions(-)

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 4769fce6c25..9ea4256de93 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/ypsilon-0.9.6_p3.ebuild b/dev-scheme/ypsilon/ypsilon-0.9.6_p3-r1.ebuild
similarity index 63%
rename from dev-scheme/ypsilon/ypsilon-0.9.6_p3.ebuild
rename to dev-scheme/ypsilon/ypsilon-0.9.6_p3-r1.ebuild
index 3b4f21c6ca6..399bd7866af 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,21 +19,28 @@ 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
+)
 
 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" \
+		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/*

diff --git a/profiles/package.mask b/profiles/package.mask
index 5a24d358076..778e8e985a7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -156,11 +156,6 @@ app-eselect/eselect-audicle
 app-eselect/eselect-miniaudicle
 media-sound/audicle
 
-# Sam James <sam@g.o> (2021-08-04)
-# Fails to build with GCC 11. No activity upstream since 2008.
-# bug #730692, bug #787866. Removal on 2021-09-04.
-dev-scheme/ypsilon
-
 # Sam James <sam@g.o> (2021-08-04)
 # Fails to build with GCC 11. Library with no reverse-dependencies.
 # bug #731254, bug #787905. Removal on 2021-09-04.