gentoo auto-resync : 26:10:2024 - 04:04:26

5 files changed, 46 insertions, 30 deletions

diff --git a/app-misc/hyfetch/Manifest b/app-misc/hyfetch/Manifest
index 05a961c4da0b..3d433ea1abce 100644
--- a/app-misc/hyfetch/Manifest
+++ b/app-misc/hyfetch/Manifest
@@ -1,9 +1,9 @@
-AUX hyfetch-1.4.10-config_fix.patch 458 BLAKE2B af8e1dc998f2353a3883d7f6482e60cd7b5571cdaa1cd5022c1ea159b7b6e10a8fee8b98dbeebc83ccadf1c8ad1d4be6830dcc54609bbdfc9c813f0582b91b52 SHA512 76b6049795bf90c0e6a6d9e9b207d97abf994bcf8ed806dd10b56017bb0c396ff0055de47670b1b9580000f880bd0925e42e5cf5a00dc5dae030c17ea986cef6
 AUX hyfetch-1.4.11-neofetch.patch 757 BLAKE2B 76191ff1e69315294bc87ffb0e7652f286411ecd9455d6c2f7501cf1538665bc0ee0ecd4a2b46a4f9429ddb87278fb6e2ba8a66ff2bbe66263b2a2b58815db22 SHA512 7672d81a5700c17d80411dffd8785651a2860fbea55abbffa074c041d59d196c78e0de3fd95fee5506703afab9c7c955a47d751a7e1d4e74c5cc5c27c56ebec7
 AUX hyfetch-1.4.11-pyproject.patch 3720 BLAKE2B 782a79e425230e8233cffdc80bd3b67d24591b9a1cf78d06571dc3cf6b106d365fcd9e9acaeb605db76b4e7fd7d9a6e7ce3e7ba2535251db96dc74e5bac6f9b0 SHA512 6503c9e3b8f2570e9d2a0483100fec81f820c9a1465460dc4baa55c1c83af89150932a87b2c6cba64cbb4c8c8ad50b11cb96c1f15a071498162372f1c8039c66
-DIST hyfetch-1.4.10.tar.gz 266471 BLAKE2B 294002c2cd986055f6392aa61bb8de1d3d558712cd327243e7c2e756aa6e00ff23372fd0ffcc60db8f978110a3d8d1d78c6f683e304fc65b19d2f076e10347f2 SHA512 3f44bd9c0b030b435949db0c0cbd4913e7ec15e857df0dcf2fc3b7d10dca0a4c8ecb9862157f60eebd15b7a1c233c51a74f341b440892e0925871e42215c80e0
+AUX hyfetch-1.99.0-neofetch.patch 757 BLAKE2B 496647f592fb7630569dbf27bfc5b918441ce687e7ee1f9cdd85885111ba5c0f6bf2415f12a0a0f56128f3c267a60cbc0bc97713fa8dbfbe3353d405e27e45b0 SHA512 39e051f8971af71408b484c1aa1efd6c80b51a04d03304ba1d135bf31521284c30b0296aea326c49e54a5b68e66a6c4bf9ddbbaa1c0a9a87623de09d6cd968ec
 DIST hyfetch-1.4.11.tar.gz 275741 BLAKE2B 0739dc7bc2a90989dcd4dbdd6d14ce8ba62def2a9e069ae16a3a1435118e3639edcc112fc3fa0b8dd54684744e500672c7397315b78d965b68da2f9b9f702b13 SHA512 13c757fed68c9aa1caa503553d6d29c0b68284029090b970b863dec3240dabb28a852ef0ec0f2742c6c268e30a15c48018a651e74ba0e6782b5aa14f2b1d1312
-EBUILD hyfetch-1.4.10.ebuild 1238 BLAKE2B b520677f1a2c28ed0631900823562533f68e929156618e4c237af9315ef9924f88ab48699bc5960de2f87727b8128ce48ced6f0102922f701195bff4993be6aa SHA512 14d47e35909e381cc446a36d125b7e9e015f840df57766dc392c3dcdfe5fca88503c247f2a734e1169b58f3675f1eacf0a24ac7e5e198ae92680b8fc51ec7644
+DIST hyfetch-1.99.0.tar.gz 315607 BLAKE2B 73e44d936124c993251b0d5f7261a1707136aee8fad8b1c660c0932223636db6cfbd1c6747bd16ee94370d6578e0220a96fb58c608ca26791957e855bc70deca SHA512 e6d662ab028cd159e69b09d2929fb7b28d7ce470d2d6c7a5ef9af688ee7ce973d893d4bb13e70be0846a5d0d5808560d92608014d877113166a5e8af11ed8275
 EBUILD hyfetch-1.4.11-r1.ebuild 1589 BLAKE2B c9614de74267eb4c6e15eddf5073f345e96d2bce4eeed169083e6b8ecd82bb202a1aa6fd6dc0b46f532abfbac8fb67a1e8808bc01b9e55ec0e93217ce92c63aa SHA512 f6778e5a5f554b06d58c86b471c5a4f6dbcdab4e2463e3da2677b1e8507f6a2f07a168f8dad2e973c1b8cb4a355627e883bde82303fd6b2b31ff70e73f61ba82
+EBUILD hyfetch-1.99.0.ebuild 1485 BLAKE2B 2edbca1c32dd59ea03169a2d44a363671c9d8da79a471976f5246d16faab8268c93e39237b0802a3c3a222c9c5ffeacf222b51f2f982f7544c3d5237d3cf6913 SHA512 1dfd777380579df4b1aadac2ba4a5bae33b54c49d92bf096c18a7769af8c04ede9f62711e20040318644463b9e53dd29c4ddaf5cca4093cdf39bea1aac813022
 EBUILD hyfetch-9999.ebuild 1690 BLAKE2B 0de1fea52d1d5cc86d54fa005851f7cbfc01047114abbb0be3f3e83cd861e50b022eb411c48a7b9e32fde47c04ed3d35cdec9468168495256162df52c6e73551 SHA512 de22e49b2216ee4e8a871ff180963b3c60d5f2a2ce68a4c4c2b4ddd5b96821abec8bee229909bdfddf8a32ee410039a3cb8945d3227f4c91b9f54f95a06b14ad
-MISC metadata.xml 789 BLAKE2B ef77de73030b9f76fe7d11cf6aca05d795ae116881ee0d6d9ebc0cae7859e38736beca8e37067b32df0a3b063536dfe52d234e8af0005766cfa824d635cde771 SHA512 d40d3e0dc8be25f27b076b3b6a17a957a4307e9d585c1776717b1aceabaf83533bae0e2a4d7d8f8d904beadc4d4e634429bb87ce23445eae15ebe727d728cfa2
+MISC metadata.xml 780 BLAKE2B 63938d07f534bfe39391dcc8bdd0106a4c86e2cd203544823030ad48a68122c2dfa81e09c344a5782c41ab56c0660721fe5669bc7e2a467c860aecfa11d1bc0c SHA512 0d4b6351c8c0853ef7963e5c80f0400b417b4ecfea41108e235e484b542c6a197c0a50a9efdf9cc395fe2ff3aea0c08ac517ff04cf50a547b16a36d5f52ba109
diff --git a/app-misc/hyfetch/files/hyfetch-1.4.10-config_fix.patch b/app-misc/hyfetch/files/hyfetch-1.4.10-config_fix.patch
deleted file mode 100644
index 955eaf60ca30..000000000000
--- a/app-misc/hyfetch/files/hyfetch-1.4.10-config_fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-check_config uses the global constant CONFIG_PATH instead
-of the path that gets passed to it.
-
---- a/hyfetch/main.py
-+++ b/hyfetch/main.py
-@@ -27,7 +27,7 @@ def check_config(path) -> Config:
-     """
-     if path.is_file():
-         try:
--            return Config.from_dict(json.loads(CONFIG_PATH.read_text('utf-8')))
-+            return Config.from_dict(json.loads(path.read_text('utf-8')))
-         except KeyError:
-             return create_config()
- 
-
diff --git a/app-misc/hyfetch/files/hyfetch-1.99.0-neofetch.patch b/app-misc/hyfetch/files/hyfetch-1.99.0-neofetch.patch
new file mode 100644
index 000000000000..4f1a1f6a3b5c
--- /dev/null
+++ b/app-misc/hyfetch/files/hyfetch-1.99.0-neofetch.patch
@@ -0,0 +1,22 @@
+From: Cat Kasin <cat@aulucya.gay>
+Date: Thu, 23 Oct 2024 19:31:10 -0700
+Subject: [PATCH] use system neowofetch
+
+Signed-off-by: Cat Kasin <cat@aulucya.gay>
+Forwarded: not-needed
+
+---
+diff --git a/hyfetch/neofetch_util.py b/hyfetch/neofetch_util.py
+index 17829ac..1fcfcfc 100644
+--- a/hyfetch/neofetch_util.py
++++ b/hyfetch/neofetch_util.py
+@@ -254,8 +254,7 @@
+     Run neofetch command
+     """
+     if platform.system() != 'Windows':
+-        bash = ['/usr/bin/env', 'bash'] if Path('/usr/bin/env').is_file() else [shutil.which('bash')]
+-        full_cmd = [*bash, get_command_path(), *shlex.split(args)]
++        full_cmd = ['/usr/bin/neowofetch', *shlex.split(args)]
+ 
+     else:
+         cmd = get_command_path().replace("\\", "/").replace("C:/", "/c/")
diff --git a/app-misc/hyfetch/hyfetch-1.4.10.ebuild b/app-misc/hyfetch/hyfetch-1.99.0.ebuild
index 5584d2553d7b..5361fd610c69 100644
--- a/app-misc/hyfetch/hyfetch-1.4.10.ebuild
+++ b/app-misc/hyfetch/hyfetch-1.99.0.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+PYTHON_COMPAT=( python3_{10..13} )
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-inherit optfeature distutils-r1
+
+inherit optfeature distutils-r1 shell-completion
 
 DESCRIPTION="Neofetch with LGBTQ+ pride flags!"
 HOMEPAGE="https://github.com/hykilpikonna/hyfetch"
@@ -14,20 +15,28 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/hykilpikonna/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.10-config_fix.patch
+	"${FILESDIR}"/${PN}-1.99.0-neofetch.patch
 )
 
+python_install() {
+	newbashcomp hyfetch/scripts/autocomplete.bash ${PN}
+	newzshcomp hyfetch/scripts/autocomplete.zsh _${PN}
+
+	distutils-r1_python_install
+
+	dodir /usr/bin/
+	cp neofetch "${D}/usr/bin/neowofetch" || die
+
+	rm -r "${D}/usr/lib/${EPYTHON}/site-packages/hyfetch/scripts" || die
+}
+
 pkg_postinst() {
 	optfeature "displaying images" "media-libs/imlib2 www-client/w3m[imlib]"
 	optfeature "gpu detection" sys-apps/pciutils
diff --git a/app-misc/hyfetch/metadata.xml b/app-misc/hyfetch/metadata.xml
index 3a8c9e49c124..b066103e3431 100644
--- a/app-misc/hyfetch/metadata.xml
+++ b/app-misc/hyfetch/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>baileykasin@gmail.com</email>
-		<name>Bailey Kasin</name>
+		<email>cat@aulucya.gay</email>
+		<name>Cat Kasin</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>