gentoo auto-resync : 23:11:2022 - 19:09:11

5 files changed, 51 insertions, 3 deletions

diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index 43c30d6a693a..093ee1c6e95d 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,5 +1,6 @@
+AUX neofetch-7.1.0-fix-arm-riscv-loongarch-cpu-model-detection.patch 1517 BLAKE2B e51c0fb3fc9ccc014adf58d83ad3ca9d422e9476d0bf23cb65c23928f532c83cac4a867c858191b7e987f1f71b8b0fc11738401c63bee1902caa05216d553581 SHA512 4d2d54e2fdf87b6091ee4933cba3ebc851c6f457ae435a12484654e19694f5f5b71b324c432dcae06bd9aeea36b6ab25493a80b721b8aeeda89eea462484362e
 DIST neofetch-7.1.0.tar.gz 95400 BLAKE2B 32368d461835d95ba8203c560b2f6733594966cbaf809d877a46c08675284288565e3a21b14d94900dd66b778dc975339196f182732e2cd8bc1ccc9e6da6253e SHA512 fe1013fb54585c15ba556054478a2c8c503120387e81bd16bfdfbb6f3a188ed4124585540abf43da9209cbbe0d7fb90d50914cd6620137d00f013cfb6954a042
-EBUILD neofetch-7.1.0-r1.ebuild 1174 BLAKE2B 6208e3e91d2275dc1df92aaf789c22afed3735817544468b0c6f6aa0c4d2e561fc88dab95d57570b3338efc8c3f221691d056ad4e8e4d5bc8b232b8f89cb13f6 SHA512 0291210e55924327ca0eea97749538dff6bfce47e10aa08aef52ad2d61c825c6783c34bff80081c67666d32aa466daf16da7edc9480035bf1861204b43b9307c
-EBUILD neofetch-7.1.0.ebuild 931 BLAKE2B 18529203cb10f998aac1bc1cc77bdd04f8b448a1300ea66cddebde7dc4b3aab39475510c8620394ce24468064829c203e3e5423662a0309c15a8d8d8456ad56b SHA512 0dfefe008ee20208971268cc8b3bb871e33af9572b5675ac03e16ff4cda9b1df1f64b57d7ef920f28c811010b8599ea94fc7c6ae61c77245d74004b6fec975e6
-EBUILD neofetch-9999.ebuild 1148 BLAKE2B e394cb2022126384a48e8bae54347953c9334775f211655be310db220864b0e4231a11c9444886c1fbbab6f1b66a45e404eb34372c43562aa51eb0156e8a034a SHA512 914cc993b854fd0a1605046dbec42ea0bfec8f841b16a7b264f629370182be518993fe4d0837580cbd6bd1759da6105f7dc09562f71f90374f63a6fc2801e239
+EBUILD neofetch-7.1.0-r1.ebuild 1257 BLAKE2B 2fcaf56f6bf26e2d93e320af527f90bdbde58427f7190e2e3e3c1f34788464d51ffc24e7e5962bddab9e8b6d0026c3f3547adee2aaa31770969c5fabfd68cb13 SHA512 68ce221bb022e0fbcfcaf46d64042ba96f8d5ceb3e1520071cb9c394f8a359dd57f6e715b9ecd584e0602ac49517e871547cd8d3411c898ee8d68bcdb3925252
+EBUILD neofetch-7.1.0.ebuild 1014 BLAKE2B b675aef4809b501b3d66b6022f1f6408a96798e02f71aaa269f61b2c2f933f087607aee9f0ba7cea6fd44e59245f0f5b3f34f73090523f871e4a13cd50108820 SHA512 139d56d0f7ce8d5d8496f965dfc85cb64d2965fdaf85eb707c86c20d96cb7cb29ae8e111ea8960afd76cdc405f93c6d1f6f806b63a45bb73bb98de199b046653
+EBUILD neofetch-9999.ebuild 1241 BLAKE2B 8d6e4f340e912ab5794c856cc254dab17aa557ed85c5446b4b937c07875c163ef51038349c78a3f374719c6d7de9a2076411701c0d8488751252f2d4d7047ba4 SHA512 c219a94b2a7e27b2461c949e3e644c4d21a3962d40a80a1440268eb898f4efaea9161906dc26e5778d83b786a35341972b41e2ba6877a24faee88f1619477df2
 MISC metadata.xml 863 BLAKE2B 3a4dbfbeea790e95fafbe9b47169bd43c127be69f21ffb2c0752ad2003304ef7628f0c95388288cf00b5d567b83626ac15cb015a8fd9c4c6cacc1137410a7887 SHA512 593a76d4beb607cf64a5dfeec978d7c6be6ad2a1dc36aefa44c2e18724d09c76133d3bab0fc5692f2bd997c86156337142b5115e7d34d4da59f91e69f44d4f30
diff --git a/app-misc/neofetch/files/neofetch-7.1.0-fix-arm-riscv-loongarch-cpu-model-detection.patch b/app-misc/neofetch/files/neofetch-7.1.0-fix-arm-riscv-loongarch-cpu-model-detection.patch
new file mode 100644
index 000000000000..43442dc7689f
--- /dev/null
+++ b/app-misc/neofetch/files/neofetch-7.1.0-fix-arm-riscv-loongarch-cpu-model-detection.patch
@@ -0,0 +1,35 @@
+https://github.com/dylanaraps/neofetch/pull/2139
+
+diff --git a/neofetch b/neofetch
+index 1e4b5646..78babd0b 100755
+--- a/neofetch
++++ b/neofetch
+@@ -2086,9 +2086,18 @@ get_cpu() {
+                     [[ -z "$cpu" ]] && cpu="$(awk -F':' '/family/ {printf $2; exit}' "$cpu_file")"
+                 ;;
+ 
++                "arm"* | "aarch64")
++                    if [[ $(trim "$distro") == Android* ]]; then
++                    # Android roms have modified cpuinfo that shows CPU model as a string
++                        cpu="$(awk -F':' '/Hardware/ {print $2; exit}' "$cpu_file")"
++                    else
++                        cpu="$(lscpu | awk -F': ' '/Vendor ID/ {print $2; exit}' ) $(lscpu | awk -F': ' '/Model name/ {print $2; exit}')"
++                    fi
++                ;;
++
+                 *)
+                     cpu="$(awk -F '\\s*: | @' \
+-                            '/model name|Hardware|Processor|^cpu model|chip type|^cpu type/ {
++                            '/model name|Model|uarch|Hardware|Processor|^cpu model|chip type|^cpu type/ {
+                             cpu=$2; if ($1 == "Hardware") exit } END { print cpu }' "$cpu_file")"
+                 ;;
+             esac
+@@ -2286,7 +2295,7 @@ get_cpu() {
+     cpu="${cpu//, * Compute Cores}"
+     cpu="${cpu//Core / }"
+     cpu="${cpu//(\"AuthenticAMD\"*)}"
+-    cpu="${cpu//with Radeon * Graphics}"
++    cpu="${cpu//with Radeon*Graphics}"
+     cpu="${cpu//, altivec supported}"
+     cpu="${cpu//FPU*}"
+     cpu="${cpu//Chip Revision*}"
diff --git a/app-misc/neofetch/neofetch-7.1.0-r1.ebuild b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
index a95947200ffa..9a06d763e8b9 100644
--- a/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
+++ b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
@@ -18,6 +18,10 @@ HOMEPAGE="https://github.com/dylanaraps/neofetch"
 LICENSE="MIT-with-advertising"
 SLOT="0"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-arm-riscv-loongarch-cpu-model-detection.patch
+)
+
 src_prepare() {
 	if use prefix; then
 		# bug #693526
diff --git a/app-misc/neofetch/neofetch-7.1.0.ebuild b/app-misc/neofetch/neofetch-7.1.0.ebuild
index 864cc9203b4c..aa21d63f1a9a 100644
--- a/app-misc/neofetch/neofetch-7.1.0.ebuild
+++ b/app-misc/neofetch/neofetch-7.1.0.ebuild
@@ -29,6 +29,10 @@ RDEPEND="sys-apps/pciutils
 		x11-apps/xwininfo
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-arm-riscv-loongarch-cpu-model-detection.patch
+)
+
 src_prepare() {
 	if use prefix; then
 		# bug #693526
diff --git a/app-misc/neofetch/neofetch-9999.ebuild b/app-misc/neofetch/neofetch-9999.ebuild
index cc85a3afcd91..7f7fde51975a 100644
--- a/app-misc/neofetch/neofetch-9999.ebuild
+++ b/app-misc/neofetch/neofetch-9999.ebuild
@@ -18,6 +18,10 @@ HOMEPAGE="https://github.com/dylanaraps/neofetch"
 LICENSE="MIT-with-advertising"
 SLOT="0"
 
+PATCHES=(
+	"${FILESDIR}"/neofetch-7.1.0-fix-arm-riscv-loongarch-cpu-model-detection.patch
+)
+
 src_prepare() {
 	if use prefix; then
 		# bug #693526