summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-08-13 21:04:55 +0100
committerSam James <sam@gentoo.org>2021-08-13 22:28:34 +0100
commit7532cf87f3325361d2850ac2bf83d18da895e416 (patch)
tree7dc1f1267b3ceb43b222c1fae8c559447e4112fe /sys-apps/syscriptor
parentwww-client/chromium: security cleanup (diff)
downloadgentoo-7532cf87f3325361d2850ac2bf83d18da895e416.tar.gz
gentoo-7532cf87f3325361d2850ac2bf83d18da895e416.tar.bz2
gentoo-7532cf87f3325361d2850ac2bf83d18da895e416.zip
sys-apps/syscriptor: update EAPI 6 -> 7, respect CC
Closes: https://bugs.gentoo.org/725804 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps/syscriptor')
-rw-r--r--sys-apps/syscriptor/files/syscriptor-1.5.15-dont-inject-additional-flags.patch30
-rw-r--r--sys-apps/syscriptor/files/syscriptor-1.5.15-respect-CC-environment-variable.patch25
-rw-r--r--sys-apps/syscriptor/syscriptor-1.5.15.ebuild22
3 files changed, 72 insertions, 5 deletions
diff --git a/sys-apps/syscriptor/files/syscriptor-1.5.15-dont-inject-additional-flags.patch b/sys-apps/syscriptor/files/syscriptor-1.5.15-dont-inject-additional-flags.patch
new file mode 100644
index 00000000000..c80d9fc9dce
--- /dev/null
+++ b/sys-apps/syscriptor/files/syscriptor-1.5.15-dont-inject-additional-flags.patch
@@ -0,0 +1,30 @@
+From 613abd8a0b82f5f6e01e728e31bd90f01f6be441 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 13 Aug 2021 20:57:48 +0100
+Subject: [PATCH 2/2] Don't inject additional flags
+
+---
+ Makefile.am | 1 -
+ src/Makefile.am | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 070e568..d139570 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,3 +1,2 @@
+ SUBDIRS=src man
+ CFLAGS=@CFLAGS@ $(EXTRA_FLAGS)
+-CPPFLAGS = -W -Wall -g
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b917ba4..f35923e 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,3 @@
+ bin_PROGRAMS=syscriptor
+ syscriptor_SOURCES=main.c cpu.c help.c ide.c memory.c network.c os.c partitions.c scsi.c sound.c uptime.c version.c video.c
+ AM_CFLAGS=@CFLAGS@ $(EXTRA_FLAGS)
+-AM_CPPFLAGS = -W -Wall -g
+--
+2.32.0
+
diff --git a/sys-apps/syscriptor/files/syscriptor-1.5.15-respect-CC-environment-variable.patch b/sys-apps/syscriptor/files/syscriptor-1.5.15-respect-CC-environment-variable.patch
new file mode 100644
index 00000000000..1f4851dbd1b
--- /dev/null
+++ b/sys-apps/syscriptor/files/syscriptor-1.5.15-respect-CC-environment-variable.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/725804
+
+From 7796e3f63254c42017a373349e3da3e789acb9d9 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 13 Aug 2021 20:57:19 +0100
+Subject: [PATCH 1/2] Respect CC environment variable
+
+---
+ configure.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index a29e9cd..5c30b3d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1,6 +1,5 @@
+ AC_INIT(src/main.c)
+ AC_PROG_CC
+-CC=gcc
+ AC_SUBST(PACKAGE)
+ AC_SUBST(VERSION)
+ AM_INIT_AUTOMAKE(syscriptor, 1.5.15)
+--
+2.32.0
+
diff --git a/sys-apps/syscriptor/syscriptor-1.5.15.ebuild b/sys-apps/syscriptor/syscriptor-1.5.15.ebuild
index adef1129600..fcbf56ae2e2 100644
--- a/sys-apps/syscriptor/syscriptor-1.5.15.ebuild
+++ b/sys-apps/syscriptor/syscriptor-1.5.15.ebuild
@@ -1,15 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-DESCRIPTION="display misc information about your hardware"
+inherit autotools
+
+DESCRIPTION="Display misc information about your hardware"
HOMEPAGE="http://syscriptor.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+S="${WORKDIR}"/${PN}
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ppc x86"
-IUSE=""
-S=${WORKDIR}/${PN}
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.15-dont-inject-additional-flags.patch
+ "${FILESDIR}"/${PN}-1.5.15-respect-CC-environment-variable.patch
+)
+
+src_prepare() {
+ default
+
+ mv configure.{in,ac} || die
+ eautoreconf
+}