From 6ad2709c83395de1dc2760d58fa6174526645bbf Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azahi@teknik.io>
Date: Thu, 26 Nov 2020 01:10:23 +0300
Subject: x11-wm/custard: Fix build

Only builds with MAKEOPTS="-j1"

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Azat Bahawi <azahi@teknik.io>
---
 x11-wm/custard/custard-9999-r1.ebuild | 56 +++++++++++++++++++++++++++++++++++
 x11-wm/custard/custard-9999.ebuild    | 37 -----------------------
 2 files changed, 56 insertions(+), 37 deletions(-)
 create mode 100644 x11-wm/custard/custard-9999-r1.ebuild
 delete mode 100644 x11-wm/custard/custard-9999.ebuild

diff --git a/x11-wm/custard/custard-9999-r1.ebuild b/x11-wm/custard/custard-9999-r1.ebuild
new file mode 100644
index 0000000..f6b7496
--- /dev/null
+++ b/x11-wm/custard/custard-9999-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/comfies/custard.git"
+fi
+
+inherit toolchain-funcs "${SCM}"
+
+DESCRIPTION="Manual tiling window manager"
+HOMEPAGE="https://github.com/comfies/custard"
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/comfies/custard/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-libs/libpcre
+	x11-libs/xcb-util
+	x11-libs/xcb-util-wm
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	default
+
+	sed -e 's/^CFLAGS.*=/CFLAGS +=/' \
+		-e 's/ -O2//' \
+		-e 's/^CPPFLAGS.*=/CPPFLAGS +=/' \
+		-e 's/^LDFLAGS.*=/LDFLAGS +=/' \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr"
+	newman man/${PN}.man ${PN}.1
+}
diff --git a/x11-wm/custard/custard-9999.ebuild b/x11-wm/custard/custard-9999.ebuild
deleted file mode 100644
index a835d0b..0000000
--- a/x11-wm/custard/custard-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/comfies/custard.git"
-fi
-
-DESCRIPTION="Manual tiling window manager"
-HOMEPAGE="https://github.com/comfies/custard"
-
-if [[ ${PV} == *9999 ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/comfies/custard/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/libpcre
-	x11-libs/xcb-util
-	x11-libs/xcb-util-wm
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_install() {
-	emake install DESTDIR="${D}" PREFIX="/usr"
-	newman man/custard.man ${PN}.1
-}
-- 
cgit 1.4.1