12 files changed, 57 insertions, 9 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 3be5ebccf3b4..1022f7bc3a71 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index d8b39527043c..7882c684ffbf 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,5 +1,5 @@
 DIST gnote-42.0.tar.xz 3330504 BLAKE2B 847c1c66b86902c13a7e9cd349e0b1e565f046ba81809dca002bfdc07d1e3dc4e12797da90e7689d8fde886ced580da9b744ca736697d1fd933a93cc344304bd SHA512 fcdd653a29ae957faf177bacbe1bbdced186416c04a8f45f194a055914544b0679019935f482834e515a20865f358dfdfc32aa846c0fd24596cf5e569e21b997
 DIST gnote-43.0.tar.xz 3325232 BLAKE2B 9e56aa164262b710aab872be48fded2a6c70a062ddfe7c95ae633c38269390a6b3c3143c788f0ee43fb37d0229443a600d71e5edfbab1aa387a20e135210a0dc SHA512 34133ba1cef12c02a6518017f6b5b07b6781f05af787034ceb3dd8bc4d59fff2a7cdc17615511e7008c39bebf52e6b78a973840bdd5b6b1e5199226fdd12d91c
 EBUILD gnote-42.0.ebuild 1529 BLAKE2B 25b2bbbc16b22e051f3bf98dbded4ae9151b64330003b84b8b529c428fcb076d4c40f493f66a02d9138f415d7819a1dd64701785e80e3e3b961f8d501461a234 SHA512 c0e89681d3b0acb65c66d0050cedc52cdaa63c094721d57589abab87f8c7de1095d91cbfdbb0d92867d8f45eecc68e6d8f3a903001267a92d1d6caca5a0ca54f
-EBUILD gnote-43.0.ebuild 1530 BLAKE2B f9f534bd928fbaa5ffdd2fb4b6ce89ef77f4560a2ed40f5384df66602a18a92814eae05872cd978d5bafe50fce5bf37412499446a2c6d1becd4c15854a5221d7 SHA512 b386718be47e43c1d122f7c782527053f5d3861b39714b4d92e33cbb08cfa7a865f0b1e3933fcd0b670b8c712578deb29b04375eec7c665d76c94cda49ed96cd
+EBUILD gnote-43.0.ebuild 1529 BLAKE2B 25b2bbbc16b22e051f3bf98dbded4ae9151b64330003b84b8b529c428fcb076d4c40f493f66a02d9138f415d7819a1dd64701785e80e3e3b961f8d501461a234 SHA512 c0e89681d3b0acb65c66d0050cedc52cdaa63c094721d57589abab87f8c7de1095d91cbfdbb0d92867d8f45eecc68e6d8f3a903001267a92d1d6caca5a0ca54f
 MISC metadata.xml 346 BLAKE2B dd5d67f5f5f2bd3205f8087ee8abab196289213b451493bcb0e059f902482449329bf03e9cd44e13cb72a347b4ee97f6b1cdf771c0723bcb93b06dcda9a3cb00 SHA512 0f177f3c20fb7215c21a2df360abfdab37bac8cc8b1405d31cd76d552d65661762a929972b0bed0a4c46b7f9c4b053b9a544209282db688699208b5ba0ccec64
diff --git a/app-misc/gnote/gnote-43.0.ebuild b/app-misc/gnote/gnote-43.0.ebuild
index 75a848900f68..a448ad104dbf 100644
--- a/app-misc/gnote/gnote-43.0.ebuild
+++ b/app-misc/gnote/gnote-43.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
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
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index ef32eb925597..65f52cff2ea3 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -3,6 +3,6 @@ DIST tracker-miners-3.4.0.tar.xz 7250524 BLAKE2B 9112c078899a7ab1aaab06d1c3ca024
 DIST tracker-miners-3.4.1.tar.xz 7244576 BLAKE2B a9f00a0f57b1af1a53b2552d4a1570a4c5576537c48eee9ebe2428e06170ff099e8876ec933bfe9f47adc69e7c61552e886aa2c3149bd3e02f37be8df844083d SHA512 2bd0b8450e1df40b4fa35b17f4209eba4f0d91a603b2d2f7b5bd6da07bcb60755b36d72b3b567ae6bf2d97c3a4294c8f14b1115825886c3f61528a092aa268bb
 EBUILD tracker-miners-3.3.1.ebuild 4674 BLAKE2B 31a7fc6f2b343740e48421a64f559ebd5b2ec97145a911f3fd8b65ebc6a8d697c2cd586a8c2410cc52b370c7a43110bf6d46d5cb1714521df5b0c250f9f83ffe SHA512 364bb3d7f1511617b6a5843277423db42fe9ed5922beadaa649a247a59cdfdd623b4706739850bd3068aa4a2928b808c23e15c75537107bad7b50883f8f03820
 EBUILD tracker-miners-3.4.0-r1.ebuild 4679 BLAKE2B 760b4259af5fe25b077dcc5939007093faa0def24bdfaf8839a3948ab27ee8727608c5d14fdf4b825ed50b1a0378b4c50de819498e4be396cfe1137cef55b54a SHA512 fd723f08aaab86ae3328fc11ab9306b3e102e8ae3b9a7691ec0aeeb073d01cd326affdc3ce9f754e1cce05521093512739c011b47da88012caf94efde618f412
-EBUILD tracker-miners-3.4.0.ebuild 4675 BLAKE2B 09b5c52481cd33e5024fffeb9a348d010251f780c484bd7d0fb86b79832b67e37d3f694afaeabac61723b9653a7dc475792e1360821c9f439ed8dfeb448159ae SHA512 60d57e667b68fd92883ec22ce0927a3551809f392dcce39a44bb4ff85fb834236396a91f5e0dab02feedbd7b840a1b981e1572322644c0087f09f579bf8580c7
+EBUILD tracker-miners-3.4.0.ebuild 4674 BLAKE2B 8cfffead2c5b6ce99b39715408558c3f884a5844970d19ea5f8f0cf72226b907fbd2b9a22421b3ceb058e07b2a2ce8770414343b356f72e1c6f45e2a1b41d283 SHA512 646d1bdc52973d14968f7f7bbba285e6c43524ea67527041bc98309e0c5ca68b85b4dde118bb48e4dd0691a690824dd5c059cd1c5c7533e32f7695b2cf7db15f
 EBUILD tracker-miners-3.4.1.ebuild 4679 BLAKE2B 760b4259af5fe25b077dcc5939007093faa0def24bdfaf8839a3948ab27ee8727608c5d14fdf4b825ed50b1a0378b4c50de819498e4be396cfe1137cef55b54a SHA512 fd723f08aaab86ae3328fc11ab9306b3e102e8ae3b9a7691ec0aeeb073d01cd326affdc3ce9f754e1cce05521093512739c011b47da88012caf94efde618f412
 MISC metadata.xml 835 BLAKE2B a7f0c667be6eaaebcd62fd782c72831f8f95f778d2ff1ee36c278fc3a902761ca10d73fd7e6b15afa83d36a960d5f20dc765b62dc6f85022db01d9d0d356bcbd SHA512 9d348dbec07ab8e344dab0d6f3acdc48e91d80171e411353b233f8b49989f4152817c8ed522c234d5dd9a3849cdab3d46f41256702a5d50bbf1e591f112cddd5
diff --git a/app-misc/tracker-miners/tracker-miners-3.4.0.ebuild b/app-misc/tracker-miners/tracker-miners-3.4.0.ebuild
index de1a347ba3e2..c3549c0a1056 100644
--- a/app-misc/tracker-miners/tracker-miners-3.4.0.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-3.4.0.ebuild
@@ -16,7 +16,7 @@ IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +pl
 REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 # tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
 RDEPEND="
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 0847245be72e..07a866b23fff 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -3,6 +3,6 @@ DIST tracker-3.4.0.tar.xz 1876476 BLAKE2B 9745a496df30ebcd2f7e4a525bcd047d48ec4f
 DIST tracker-3.4.1.tar.xz 1865584 BLAKE2B 78a1c461e628095ca134241d7f8580806f8de018608c991644422503a3af6bab2c317859624cb811dd2907f2965af3ab2cfb1a58fa35017ed6a71b24e68f3c97 SHA512 102d61abd98feb6e39575c3df25cd4604e89106ed928b8edb1a3adc1bccd41f4ab92fc8bfd33d96b48c3b2cf5a3d901130ac6bf6f657faebe7339fffb95eed26
 EBUILD tracker-3.3.3.ebuild 2738 BLAKE2B 0905188614de0fc0fe90b33ed9dbdf0f4737efbdea78bfc3216c582bf672357bcdba311f19a8a5b4517f10674f809cf71190e38fe2275f5cfd9d946aac6a8289 SHA512 cf7ed294fb2b662995fb6cb4bca2bdcef3f4f6a8507e2584f24bb1553677d80eb32303721a07d1bfd81e405719393559244140387a9cf610ae1b57503bce56c3
 EBUILD tracker-3.4.0-r1.ebuild 2715 BLAKE2B daebd42de05e1141cbd4960d691609cb2d8492d3cf23dd05b0e681cf9c32308442c406303398dbbfbc754dea2b599198b8b6ec1d71d94026a7d45a728e040412 SHA512 d3a180bb54a0c96b2bf696676fcdf057598eaadf503d296098985c89ad0138fbde03e9d59aa51f52cc7b6c5b2332e39e37798565119055214e09c86686ce8d0d
-EBUILD tracker-3.4.0.ebuild 2713 BLAKE2B 332c9261ff64635145e577a098227fa89b01a6120ed27fc5d61e4c19c13ac7ae497b1a50093687846b8069dbafe93ae2560bc94a960b046234e4702b80ff0532 SHA512 1e74e3232b500303c14dd3011d5821fc5082c66d1c5d7758d187075d152ebbd3053a0277da7971e8b4333fc37a7b8b62e222cd23a1de5417aa98af12a19de8f6
+EBUILD tracker-3.4.0.ebuild 2712 BLAKE2B a670dc4329a3b3c405de6de8364f5320517bd4d71f40e3fe431686da348960bcfe21d1b5e1c94374b46086c103ddad7b20f6b5b1c1c44fafcf244adc345143bb SHA512 ad46724e1bc79f9020fda1dc6a2522b1776e52589750ee1a73fb8ed257901256279995628dd42be07e6ca7e8400df480e59a4adcd8ed71d298ef2399369a92d5
 EBUILD tracker-3.4.1.ebuild 2715 BLAKE2B daebd42de05e1141cbd4960d691609cb2d8492d3cf23dd05b0e681cf9c32308442c406303398dbbfbc754dea2b599198b8b6ec1d71d94026a7d45a728e040412 SHA512 d3a180bb54a0c96b2bf696676fcdf057598eaadf503d296098985c89ad0138fbde03e9d59aa51f52cc7b6c5b2332e39e37798565119055214e09c86686ce8d0d
 MISC metadata.xml 586 BLAKE2B 8244e6f8d9491a0c224ed84f17ee6ad64b22e0c373243a319e7911739a7db6223ce47693ed5b31053b4465f35d20108db1469d74afcebb36b4516a53cbd7f98a SHA512 0a60b0e4b077bb03d02b7990511041695c5dff7a8a0972fa80abe9968b643ad5c2ba65182c079e8d5f3d1ef72a2c4dcc659d6ec283bf80813135c94cab2dddef
diff --git a/app-misc/tracker/tracker-3.4.0.ebuild b/app-misc/tracker/tracker-3.4.0.ebuild
index 6bab8ad82f56..ddcbb79ded23 100644
--- a/app-misc/tracker/tracker-3.4.0.ebuild
+++ b/app-misc/tracker/tracker-3.4.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker https://gitlab.gnome.org/GNOME
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3/0" # libtracker-sparql-3.0 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc +miners stemmer test"
 RESTRICT="!test? ( test )"