diff options
Diffstat (limited to 'sys-apps/syscriptor')
4 files changed, 75 insertions, 6 deletions
diff --git a/sys-apps/syscriptor/Manifest b/sys-apps/syscriptor/Manifest index 95be397c81d0..9af87d6de80e 100644 --- a/sys-apps/syscriptor/Manifest +++ b/sys-apps/syscriptor/Manifest @@ -1,3 +1,5 @@ +AUX syscriptor-1.5.15-dont-inject-additional-flags.patch 833 BLAKE2B 2f74b72db138e2390bf618f475f76b6ce6e197207c4a435eba38de25a891f875876f3946c50ee8a36073f65c4138576efc7913c95c2f648028a61aa0e7348643 SHA512 36fcb16e3704020e46455ba5750291fd8972d1c5be3da7dc56bad2993c8f4c9efc2340429927581ba37afb04bb4361832412bfdcc17c9cdec7ae1ee74464fb40 +AUX syscriptor-1.5.15-respect-CC-environment-variable.patch 538 BLAKE2B 9908fe8241c64cbc9de1f0c325463f3ead230babd104726cb0f96b17c6fd33a75a5146ad8a6288a93fd8e18c6cc9eeefac62baef9c423cb8718d149330551a55 SHA512 ee3d8e2715ae5e5b365e6b9ebf6eaae1edabb8e743581ebd433ed6b00d28a3bfeabf81ec5e36a73dde76cd56b4d7c9a400a1781ff0b58f3f23020357a8d9cec3 DIST syscriptor-1.5.15.tar.bz2 58732 BLAKE2B 1527d9baf18d51543f2be07e55fe5e3557fcbf616a0770a1d17920361af41e45c7a0191246c6e833674c073bb06dd5b05eb54fbe882f9700fd928284277a232d SHA512 12fadc8bee58b8001f805383f0bab5ca4999f5d463eb69ec15486aeb2eb407671d2a4007f017e35df450f3616c4e1096bc86b34413485bae4ca6a9460e9056bd -EBUILD syscriptor-1.5.15.ebuild 357 BLAKE2B bdad021921fcd14442a1f5fe5e649e554c6c6855dc0b96aa418bb0b959a4cf529c749379ad8699894a0b61a8b0c93c42d29279c7622c5c425024f33e1e86df55 SHA512 f2efe1a57c7a50b00b35e97f0b3c0920ba05282eb46c6d1a6c63cd4bd582402519e5f170cbc3250ef3033a4a33c9ae3e05a5b30b0a8a47d15ae35942b0f657f9 +EBUILD syscriptor-1.5.15.ebuild 579 BLAKE2B 4c0e976ddfb05788a2e8a55f95b1ac95fa6879ccdc96166daa070bf1934c9084906c5149f63c840b1555efdaf2ad74052678fcab9319b24c20d1b051b6bfcbd2 SHA512 dd82a6b648fc75e39d28d77348e3de910c4b219a014e8cb79f8ff6f49e1876fc1d76a95d226511500333ca68d6a5b3c574fe7d77331cce42cf4526620e3a8f23 MISC metadata.xml 330 BLAKE2B 76b31db3b847c70f18388d67b3ed93acba1a8fa2571459ba917b92afcc8f3288185dd4133af7b35539d8a5b29069ed8536844fb1190a98ebde82b9134648d56d SHA512 746cc86310142135f45c241de444d7fe4c47e0d36d08c52bbe7bd6c60d391c28b3f299cbd58f0fc65751aff6bdb3077d7d2880e9e2380b7cf2142a2ba91abbe6 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 000000000000..c80d9fc9dce6 --- /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 000000000000..1f4851dbd1b4 --- /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 adef11296006..fcbf56ae2e25 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 +} |