From baa1aa3a0d41f1c64f654c7002711f686f26a5e2 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flow@gentoo.org>
Date: Wed, 21 Feb 2024 10:15:17 +0100
Subject: sys-block/mmc-utils: undefine _FORIFY_SOURCE, inject version

Closes: https://bugs.gentoo.org/925158
Signed-off-by: Florian Schmaus <flow@gentoo.org>
---
 .../mmc-utils/mmc-utils-0_p20231010-r1.ebuild      | 37 -------------------
 .../mmc-utils/mmc-utils-0_p20231010-r2.ebuild      | 41 ++++++++++++++++++++++
 2 files changed, 41 insertions(+), 37 deletions(-)
 delete mode 100644 sys-block/mmc-utils/mmc-utils-0_p20231010-r1.ebuild
 create mode 100644 sys-block/mmc-utils/mmc-utils-0_p20231010-r2.ebuild

diff --git a/sys-block/mmc-utils/mmc-utils-0_p20231010-r1.ebuild b/sys-block/mmc-utils/mmc-utils-0_p20231010-r1.ebuild
deleted file mode 100644
index a1d531833438..000000000000
--- a/sys-block/mmc-utils/mmc-utils-0_p20231010-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Userspace tools for MMC/SD devices"
-HOMEPAGE="https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/"
-
-MY_COMMIT="b5ca140312d279ad2f22068fd72a6230eea13436"
-
-SRC_URI="https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-RDEPEND="!dev-lang/mercury"
-
-src_prepare() {
-	default
-	sed -i 's/-Werror //' Makefile || die
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dosbin mmc
-	dodoc README
-	doman man/mmc.1
-}
diff --git a/sys-block/mmc-utils/mmc-utils-0_p20231010-r2.ebuild b/sys-block/mmc-utils/mmc-utils-0_p20231010-r2.ebuild
new file mode 100644
index 000000000000..e1bd4575073b
--- /dev/null
+++ b/sys-block/mmc-utils/mmc-utils-0_p20231010-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Userspace tools for MMC/SD devices"
+HOMEPAGE="https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/"
+
+MY_COMMIT="b5ca140312d279ad2f22068fd72a6230eea13436"
+
+SRC_URI="https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+RDEPEND="!dev-lang/mercury"
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's/-Werror //' \
+		-e 's/-D_FORTIFY_SOURCE=2 //' \
+		-e "s/-DVERSION=.*/-DVERSION=\\\\\"gentoo-${PVR}\\\\\"/" \
+		Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dosbin mmc
+	dodoc README
+	doman man/mmc.1
+}
-- 
cgit v1.2.3-65-gdbad