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

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

commit:     bd410ca1c1ab984a18166ebfe63b52885a6340b3
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Apr 24 21:43:40 2022 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun Apr 24 22:16:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bd410ca1

app-misc/cpufetch: add 1.02, drop 1.00

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 app-misc/cpufetch/Manifest                         |  2 +-
 .../{cpufetch-1.00.ebuild => cpufetch-1.02.ebuild} |  6 +--
 ...makefile.patch => cpufetch-1.02-makefile.patch} | 44 +++++++++++-----------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/app-misc/cpufetch/Manifest b/app-misc/cpufetch/Manifest
index cadda1cda..2cd52201d 100644
--- a/app-misc/cpufetch/Manifest
+++ b/app-misc/cpufetch/Manifest
@@ -1,2 +1,2 @@
-DIST cpufetch-1.00.tar.gz 317439 BLAKE2B 8fdf21bebfd6d2ef760cc388b6da2d5c0665964ebcad2537e06c1bede40fffb151a5e37665ab52f2ec31f48a25c3aeb895e820b03ab7ec37d50a85e1bdce3a2b SHA512 94be5c5aacf9e5cde4fd4e4b14e433db523821fc27466c599e34c062ca32145edb0c8f84168e07c8a64f591fee1f5ab704d569bb70c53b7523d52f4882b573a1
 DIST cpufetch-1.01.tar.gz 2759620 BLAKE2B 4d16cc0b1be94706b3e5d9481a2846d8c90807b792212389e7159739952d8df3f3cc02f6e828e53fe17a51ecba4370a273c5152c0af237fa0cededac88c76e3f SHA512 069580b6dd548af394c28b74af72b2979be16a69879c51c42e2f26611ea8bf78412bedb6bbc6ddbfd2f98f8b26f930cc2d8afcc81e4d6494c382cfec9de771c1
+DIST cpufetch-1.02.tar.gz 2767499 BLAKE2B 041ac6ac304faa6fb2cc71fb4841d8e9a263d57ae6b79e0d6cdcf5149fd6bf0e89135f9f7eeaf25681d4a4ad73861d2eb45883cee1626b0cfa1bc21957110e44 SHA512 b548af4dccd632c2899a3b0fd70e67f7abdc4bd66371927876c851168d0df47e23bd8f798d82509b83b268c50b0e9a6697a56f6fcf7772711108e2538cd1c09a

diff --git a/app-misc/cpufetch/cpufetch-1.00.ebuild b/app-misc/cpufetch/cpufetch-1.02.ebuild
similarity index 87%
rename from app-misc/cpufetch/cpufetch-1.00.ebuild
rename to app-misc/cpufetch/cpufetch-1.02.ebuild
index 4da777c47..1a73eda56 100644
--- a/app-misc/cpufetch/cpufetch-1.00.ebuild
+++ b/app-misc/cpufetch/cpufetch-1.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/Dr-Noob/cpufetch"
 SRC_URI="https://github.com/Dr-Noob/cpufetch/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${PV}"
 
-LICENSE="MIT"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64"
 
@@ -18,7 +18,7 @@ PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
 
 src_prepare() {
 	default
-	export CC=$(tc-getCC)
+	tc-export CC
 }
 
 src_install() {

diff --git a/app-misc/cpufetch/files/cpufetch-1.00-makefile.patch b/app-misc/cpufetch/files/cpufetch-1.02-makefile.patch
similarity index 60%
rename from app-misc/cpufetch/files/cpufetch-1.00-makefile.patch
rename to app-misc/cpufetch/files/cpufetch-1.02-makefile.patch
index a34ed4026..6bca12f1a 100644
--- a/app-misc/cpufetch/files/cpufetch-1.00-makefile.patch
+++ b/app-misc/cpufetch/files/cpufetch-1.02-makefile.patch
@@ -1,14 +1,9 @@
---- a/Makefile	2021-08-23 09:31:46.000000000 +0200
-+++ b/Makefile	2021-10-16 23:40:53.698941777 +0200
-@@ -1,4 +1,3 @@
--CC ?= gcc
- 
- CFLAGS+=-Wall -Wextra -pedantic
- SANITY_FLAGS=-Wfloat-equal -Wshadow -Wpointer-arith
-@@ -16,17 +15,17 @@
- 		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
+--- a/Makefile
++++ b/Makefile
+@@ -23,17 +23,17 @@
+ 			HEADERS += $(SRC_DIR)freq/freq.h
+ 			CFLAGS += -pthread
+                 endif
 -		CFLAGS += -DARCH_X86 -std=c99 -fstack-protector-all
 +		CFLAGS += -DARCH_X86 -std=c99
  	else ifeq ($(arch), $(filter $(arch), ppc64le ppc64 ppcle ppc))
@@ -26,26 +21,31 @@
  
  		os := $(shell uname -s)
  		ifeq ($(os), Darwin)
-@@ -51,20 +50,17 @@
+@@ -58,18 +58,8 @@
  	OUTPUT=cpufetch.exe
  endif
  
--all: CFLAGS += -O3
+-all: CFLAGS += -O2
  all: $(OUTPUT)
  
 -debug: CFLAGS += -g -O0
- debug: $(OUTPUT)
- 
--static: CFLAGS += -static -O3
-+static: CFLAGS += -static
- static: $(OUTPUT)
- 
--strict: CFLAGS += -O3 -Werror -fsanitize=undefined -D_FORTIFY_SOURCE=2
- strict: $(OUTPUT)
+-debug: $(OUTPUT)
+-
+-static: CFLAGS += -static -O2
+-static: $(OUTPUT)
+-
+-strict: CFLAGS += -O2 -Werror -fsanitize=undefined -D_FORTIFY_SOURCE=2
+-strict: $(OUTPUT)
+-
+ freq_nov.o: Makefile $(SRC_DIR)freq/freq_nov.c $(SRC_DIR)freq/freq_nov.h $(SRC_DIR)freq/freq.h
+ 	$(CC) $(CFLAGS) $(SANITY_FLAGS) -c -pthread $(SRC_DIR)freq/freq_nov.c -o $@
+ 
+@@ -80,7 +70,7 @@
+ 	$(CC) $(CFLAGS) $(SANITY_FLAGS) -c -mavx512f -pthread $(SRC_DIR)freq/freq_avx512.c -o $@
  
  $(OUTPUT): Makefile $(SOURCE) $(HEADERS)
 -	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
++	$(CC) $(CFLAGS) -fPIE $(LDFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
  
  run: $(OUTPUT)
  	./$(OUTPUT)