From 098174e77d2640872404beb286d5e2c44077f7f5 Mon Sep 17 00:00:00 2001
From: Arthur Zamarin <arthurzam@gentoo.org>
Date: Fri, 7 Jul 2023 22:05:26 +0300
Subject: sys-process/iotop-c: fix extra _FORTIFY_SOURCE

Closes: https://bugs.gentoo.org/898166
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
---
 sys-process/iotop-c/iotop-c-1.23-r1.ebuild | 41 ++++++++++++++++++++++++++++++
 sys-process/iotop-c/iotop-c-1.23.ebuild    | 36 --------------------------
 sys-process/iotop-c/iotop-c-9999.ebuild    |  7 ++++-
 3 files changed, 47 insertions(+), 37 deletions(-)
 create mode 100644 sys-process/iotop-c/iotop-c-1.23-r1.ebuild
 delete mode 100644 sys-process/iotop-c/iotop-c-1.23.ebuild

(limited to 'sys-process/iotop-c')

diff --git a/sys-process/iotop-c/iotop-c-1.23-r1.ebuild b/sys-process/iotop-c/iotop-c-1.23-r1.ebuild
new file mode 100644
index 000000000000..c401c231d083
--- /dev/null
+++ b/sys-process/iotop-c/iotop-c-1.23-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps linux-info toolchain-funcs
+
+DESCRIPTION="top utility for IO (C port)"
+HOMEPAGE="https://github.com/Tomas-M/iotop"
+SRC_URI="https://github.com/Tomas-M/iotop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/iotop-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~loong x86"
+
+RDEPEND="sys-libs/ncurses:=
+	!sys-process/iotop"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS ~VM_EVENT_COUNTERS"
+
+FILECAPS=(
+	cap_net_admin=eip usr/bin/iotop
+)
+
+src_prepare() {
+	sed -e 's/-D_FORTIFY_SOURCE=2//' -i Makefile || die
+	default
+}
+
+src_compile() {
+	emake V=1 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" NO_FLTO=1
+}
+
+src_install() {
+	dobin iotop
+	dodoc README.md
+	doman iotop.8
+}
diff --git a/sys-process/iotop-c/iotop-c-1.23.ebuild b/sys-process/iotop-c/iotop-c-1.23.ebuild
deleted file mode 100644
index 01595c683cbc..000000000000
--- a/sys-process/iotop-c/iotop-c-1.23.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps linux-info toolchain-funcs
-
-DESCRIPTION="top utility for IO (C port)"
-HOMEPAGE="https://github.com/Tomas-M/iotop"
-SRC_URI="https://github.com/Tomas-M/iotop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/iotop-${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong x86"
-
-RDEPEND="sys-libs/ncurses:=
-	!sys-process/iotop"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS ~VM_EVENT_COUNTERS"
-
-FILECAPS=(
-	cap_net_admin=eip usr/bin/iotop
-)
-
-src_compile() {
-	emake V=1 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" NO_FLTO=1
-}
-
-src_install() {
-	dobin iotop
-	dodoc README.md
-	doman iotop.8
-}
diff --git a/sys-process/iotop-c/iotop-c-9999.ebuild b/sys-process/iotop-c/iotop-c-9999.ebuild
index b05952298d1d..47a5c48a0a0e 100644
--- a/sys-process/iotop-c/iotop-c-9999.ebuild
+++ b/sys-process/iotop-c/iotop-c-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,6 +23,11 @@ FILECAPS=(
 	cap_net_admin=eip usr/bin/iotop
 )
 
+src_prepare() {
+	sed -e 's/-D_FORTIFY_SOURCE=2//' -i Makefile || die
+	default
+}
+
 src_compile() {
 	emake V=1 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" NO_FLTO=1
 }
-- 
cgit v1.2.3-65-gdbad