From a3e73595b5c1d9149c2f9a661101f83a649ea299 Mon Sep 17 00:00:00 2001
From: Akinori Hattori <hattya@gentoo.org>
Date: Thu, 28 Oct 2021 22:40:09 +0900
Subject: [PATCH] dev-scheme/ypsilon: tidy

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya@gentoo.org>
---
 dev-scheme/ypsilon/ypsilon-0.9.6_p3-r1.ebuild | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/dev-scheme/ypsilon/ypsilon-0.9.6_p3-r1.ebuild b/dev-scheme/ypsilon/ypsilon-0.9.6_p3-r1.ebuild
index 2d202116658bb..8c87df471929c 100644
--- a/dev-scheme/ypsilon/ypsilon-0.9.6_p3-r1.ebuild
+++ b/dev-scheme/ypsilon/ypsilon-0.9.6_p3-r1.ebuild
@@ -6,31 +6,34 @@ EAPI=7
 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"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples threads"
 
-DEPEND="app-arch/cpio"
-RDEPEND="${DEPEND}"
+RDEPEND="app-arch/cpio"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-asneeded.patch
 	"${FILESDIR}"/${P}-clang-cflags.patch
 )
 
-src_compile() {
-	use threads && append-flags "-pthread"
+src_prepare() {
+	default
 
-	# Fix build failure with GCC 11
-	# bug #787866
+	use threads && append-flags -pthread
+	# fix build with >=sys-devel/gcc-11, bug #787866
 	append-cppflags -DNO_TLS
+}
 
+src_compile() {
 	emake \
 		PREFIX="${EPREFIX}/usr" \
 		AS="$(tc-getAS)" \
@@ -41,7 +44,10 @@ src_compile() {
 }
 
 src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		DESTDIR="${D}" \
+		install
 
 	if use examples; then
 		docinto examples