[gentoo-commits] repo/proj/guru:dev commit in: app-misc/cpufetch/files/, app-misc/cpufetch/

["Alessandro Barbieri" <lssndrbarbieri@gmail.com>]

commit:     2a973a043afbbb9c420ef1ab0d8b7548b77ed485
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Apr 11 02:17:56 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun Apr 11 02:18:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2a973a04

app-misc/cpufetch: bump and respect LDFLAGS

Closes: https://bugs.gentoo.org/781023
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 app-misc/cpufetch/Manifest                         |  2 +-
 ...10406.ebuild => cpufetch-0.94_p20210409.ebuild} |  4 +-
 .../cpufetch/files/makefile-0.94_p20210409.patch   | 26 +++++++++++
 app-misc/cpufetch/files/makefile.patch             | 50 ----------------------
 4 files changed, 29 insertions(+), 53 deletions(-)

diff --git a/app-misc/cpufetch/Manifest b/app-misc/cpufetch/Manifest
index 31e76acc3..3f81ed860 100644
--- a/app-misc/cpufetch/Manifest
+++ b/app-misc/cpufetch/Manifest
@@ -1 +1 @@
-DIST cpufetch-0.94_p20210406.tar.gz 302546 BLAKE2B 799ba717ad799b9762623d668d842af793f375f04625dd3ec12e262eb0b0e6ab15b70f1f9dc59e26cd4cca75558fd9a2923c4c8e19aca77102a86a2847d62258 SHA512 1bdae50bb07e2d090b5f30f0b83a86a1d3e7755f284abd454be908626f1625712ab4a6129a9fadd17596a1248f03dd4c0131abe1e3df12ff06825793d19f678e
+DIST cpufetch-0.94_p20210409.tar.gz 303151 BLAKE2B 0ad4d19e1cf07cf9692af4c81183ce7727eaf3638907e812b288070e325a9b8b2f39af611db5eb19a069935ac60238b234173ee20138d8744e919c7c53e68609 SHA512 2f914f37a84e8a43b80770ad4e1b4e7d3679a17a50330198e1d8bb0faff3485a0e667735b5bdf01317d99851530f01165fe80b789059b8668d42d595386e44fd

diff --git a/app-misc/cpufetch/cpufetch-0.94_p20210406.ebuild b/app-misc/cpufetch/cpufetch-0.94_p20210409.ebuild
similarity index 83%
rename from app-misc/cpufetch/cpufetch-0.94_p20210406.ebuild
rename to app-misc/cpufetch/cpufetch-0.94_p20210409.ebuild
index 305f33ba4..a51f7908d 100644
--- a/app-misc/cpufetch/cpufetch-0.94_p20210406.ebuild
+++ b/app-misc/cpufetch/cpufetch-0.94_p20210409.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-COMMIT="ec2ad4fef60b0e26f40b818a3968de7e83fb466c"
+COMMIT="8f2f3d3a1652b87162f763a88a5070cf25c2e6d7"
 DESCRIPTION="Simplistic yet fancy CPU architecture fetching tool"
 HOMEPAGE="https://github.com/Dr-Noob/cpufetch"
 SRC_URI="https://github.com/Dr-Noob/cpufetch/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Dr-Noob/cpufetch/archive/${COMMIT}.tar.gz -> ${P}.ta
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-PATCHES=( "${FILESDIR}/makefile.patch" )
+PATCHES=( "${FILESDIR}/makefile-${PV}.patch" )
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 src_install() {

diff --git a/app-misc/cpufetch/files/makefile-0.94_p20210409.patch b/app-misc/cpufetch/files/makefile-0.94_p20210409.patch
new file mode 100644
index 000000000..175ea34ce
--- /dev/null
+++ b/app-misc/cpufetch/files/makefile-0.94_p20210409.patch
@@ -0,0 +1,26 @@
+--- a/Makefile	2021-04-11 04:01:08.508885689 +0200
++++ b/Makefile	2021-04-11 04:02:33.680269181 +0200
+@@ -1,6 +1,4 @@
+-CC=gcc
+-
+-CFLAGS=-Wall -Wextra -Werror -pedantic -fstack-protector-all -pedantic -std=c99
++CFLAGS+=-Wall -Wextra -pedantic -std=c99
+ SANITY_FLAGS=-Wfloat-equal -Wshadow -Wpointer-arith
+ 
+ PREFIX ?= /usr
+@@ -37,14 +35,12 @@
+ 
+ all: $(OUTPUT)
+ 
+-debug: CFLAGS += -g -O0
+ debug: $(OUTPUT)
+ 
+-release: CFLAGS += -static -O3
+ release: $(OUTPUT)
+ 
+ $(OUTPUT): Makefile $(SOURCE) $(HEADERS)
+-	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
+ 
+ run: $(OUTPUT)
+ 	./$(OUTPUT)

diff --git a/app-misc/cpufetch/files/makefile.patch b/app-misc/cpufetch/files/makefile.patch
deleted file mode 100644
index 579726579..000000000
--- a/app-misc/cpufetch/files/makefile.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/Makefile	2021-04-06 13:22:22.028931508 +0200
-+++ b/Makefile	2021-04-06 19:43:34.577370616 +0200
-@@ -1,6 +1,4 @@
--CXX=gcc
--
--CXXFLAGS=-Wall -Wextra -Werror -pedantic -fstack-protector-all -pedantic -std=c99
-+CFLAGS += -Wall -Wextra -pedantic -std=c99
- SANITY_FLAGS=-Wfloat-equal -Wshadow -Wpointer-arith
- 
- SRC_COMMON=src/common/
-@@ -14,12 +12,12 @@
- 		SRC_DIR=src/x86/
- 		SOURCE += $(COMMON_SRC) $(SRC_DIR)cpuid.c $(SRC_DIR)apic.c $(SRC_DIR)cpuid_asm.c $(SRC_DIR)uarch.c
- 		HEADERS += $(COMMON_HDR) $(SRC_DIR)cpuid.h $(SRC_DIR)apic.h $(SRC_DIR)cpuid_asm.h $(SRC_DIR)uarch.h 
--		CXXFLAGS += -DARCH_X86
-+		CFLAGS += -DARCH_X86
- 	else
- 		SRC_DIR=src/arm/
- 		SOURCE += $(COMMON_SRC) $(SRC_DIR)midr.c $(SRC_DIR)uarch.c $(SRC_DIR)soc.c $(SRC_DIR)udev.c
- 		HEADERS += $(COMMON_HDR) $(SRC_DIR)midr.h $(SRC_DIR)uarch.h  $(SRC_DIR)soc.h $(SRC_DIR)udev.c $(SRC_DIR)socs.h
--		CXXFLAGS += -DARCH_ARM -Wno-unused-parameter
-+		CFLAGS += -DARCH_ARM -Wno-unused-parameter
- 	endif
- 
- 	OUTPUT=cpufetch
-@@ -28,21 +26,20 @@
- 	SRC_DIR=src/x86/
- 	SOURCE += $(COMMON_SRC) $(SRC_DIR)cpuid.c $(SRC_DIR)apic.c $(SRC_DIR)cpuid_asm.c $(SRC_DIR)uarch.c
- 	HEADERS += $(COMMON_HDR) $(SRC_DIR)cpuid.h $(SRC_DIR)apic.h $(SRC_DIR)cpuid_asm.h $(SRC_DIR)uarch.h 
--	CXXFLAGS += -DARCH_X86
-+	CFLAGS += -DARCH_X86
- 	SANITY_FLAGS += -Wno-pedantic-ms-format
- 	OUTPUT=cpufetch.exe
- endif
- 
- all: $(OUTPUT)
- 
--debug: CXXFLAGS += -g -O0
-+debug: CFLAGS += -g -O0
- debug: $(OUTPUT)
- 
--release: CXXFLAGS += -static -O3
- release: $(OUTPUT)
- 
- $(OUTPUT): Makefile $(SOURCE) $(HEADERS)
--	$(CXX) $(CXXFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
-+	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
- 
- run: $(OUTPUT)
- 	./$(OUTPUT)