gentoo auto-resync : 14:05:2024 - 00:01:24

6 files changed, 301 insertions, 7 deletions

diff --git a/app-misc/hyfetch/Manifest b/app-misc/hyfetch/Manifest
index 44abdcdfd967..d8a44019f017 100644
--- a/app-misc/hyfetch/Manifest
+++ b/app-misc/hyfetch/Manifest
@@ -1,7 +1,10 @@
 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
+AUX hyfetch-9999-pyproject.patch 3771 BLAKE2B a145966577baf237206c0079c1c49c9523aa26e2833e9f0e9c0aa4a0f5d46102734a9d854d44131576e226ff2459c58b0f02eb4242b125b4ddd03b95fcaa175d SHA512 d061b111b63c3e47c8e81e9b2f99d839af63591e71c100abb375abcf9fb38271cdef636f3c216a542b468ce7ee67616541a41f166bbc3136cb3a7e73c3ac6647
 DIST hyfetch-1.4.10.tar.gz 266471 BLAKE2B 294002c2cd986055f6392aa61bb8de1d3d558712cd327243e7c2e756aa6e00ff23372fd0ffcc60db8f978110a3d8d1d78c6f683e304fc65b19d2f076e10347f2 SHA512 3f44bd9c0b030b435949db0c0cbd4913e7ec15e857df0dcf2fc3b7d10dca0a4c8ecb9862157f60eebd15b7a1c233c51a74f341b440892e0925871e42215c80e0
 DIST hyfetch-1.4.11.tar.gz 275741 BLAKE2B 0739dc7bc2a90989dcd4dbdd6d14ce8ba62def2a9e069ae16a3a1435118e3639edcc112fc3fa0b8dd54684744e500672c7397315b78d965b68da2f9b9f702b13 SHA512 13c757fed68c9aa1caa503553d6d29c0b68284029090b970b863dec3240dabb28a852ef0ec0f2742c6c268e30a15c48018a651e74ba0e6782b5aa14f2b1d1312
 EBUILD hyfetch-1.4.10.ebuild 1238 BLAKE2B b520677f1a2c28ed0631900823562533f68e929156618e4c237af9315ef9924f88ab48699bc5960de2f87727b8128ce48ced6f0102922f701195bff4993be6aa SHA512 14d47e35909e381cc446a36d125b7e9e015f840df57766dc392c3dcdfe5fca88503c247f2a734e1169b58f3675f1eacf0a24ac7e5e198ae92680b8fc51ec7644
-EBUILD hyfetch-1.4.11.ebuild 1179 BLAKE2B 5ab4c5bad0bdc3d55bd7cbbf5f0f937f60be8413c635a52d7f6e6f536a568da5651a797ef9b2251f1ed6595dc4ccdb9d258e057c3ffd8d1d563241ad50413800 SHA512 9b6811eb50c6280b3a71fdca719331465a906ec89d872a26bd4c97d0d9f25059ce3d0578429035b91029316c6ab70ac67a066648254dab147a49da9c03078c36
-EBUILD hyfetch-9999.ebuild 1175 BLAKE2B 1e1370acffe9c133310f82719f79f2d70067d48d4cda62b979393d8bc6337dbeab07a0149e31e06ee6b64a7e6318054f57797fa935c3a392eb698588d08188db SHA512 58845700bb290fae0558defdcadb5264a9e7a42a1c4a2ca94f04bc233722c23fed6123ea0bd2580c366fd12849d6f950ac4b2a6167b39d9d5cfdabcb0dc6b94a
+EBUILD hyfetch-1.4.11-r1.ebuild 1589 BLAKE2B c9614de74267eb4c6e15eddf5073f345e96d2bce4eeed169083e6b8ecd82bb202a1aa6fd6dc0b46f532abfbac8fb67a1e8808bc01b9e55ec0e93217ce92c63aa SHA512 f6778e5a5f554b06d58c86b471c5a4f6dbcdab4e2463e3da2677b1e8507f6a2f07a168f8dad2e973c1b8cb4a355627e883bde82303fd6b2b31ff70e73f61ba82
+EBUILD hyfetch-9999.ebuild 1583 BLAKE2B 7c1856cdb3b4dc0a952fa061d0834b52b62e9a4d63991508cf257f3ed80e35c077e717d2a5c6f24faf2bbca562aabc828194a7548a0615fb293c2d8858df2c61 SHA512 47800414a595d7d0f7a9abde4fe96a31007dcad72c015597da862b6b611018049a0a047d4894581a75adcb0834a76a3d30d1f107448e1625a513a7d1b3dd84e2
 MISC metadata.xml 789 BLAKE2B ef77de73030b9f76fe7d11cf6aca05d795ae116881ee0d6d9ebc0cae7859e38736beca8e37067b32df0a3b063536dfe52d234e8af0005766cfa824d635cde771 SHA512 d40d3e0dc8be25f27b076b3b6a17a957a4307e9d585c1776717b1aceabaf83533bae0e2a4d7d8f8d904beadc4d4e634429bb87ce23445eae15ebe727d728cfa2
diff --git a/app-misc/hyfetch/files/hyfetch-1.4.11-neofetch.patch b/app-misc/hyfetch/files/hyfetch-1.4.11-neofetch.patch
new file mode 100644
index 000000000000..02c22614cfb2
--- /dev/null
+++ b/app-misc/hyfetch/files/hyfetch-1.4.11-neofetch.patch
@@ -0,0 +1,22 @@
+From: Bailey Kasin <baileykasin@gmail.com>
+Date: Mon, 02 Oct 2023 23:02:10 -0700
+Subject: [PATCH] use system neowofetch
+
+Signed-off-by: Bailey Kasin <baileykasin@gmail.com>
+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
+@@ -285,7 +285,7 @@ def run_neofetch_cmd(args: str, pipe: bool = False) -> str | None:
+     Run neofetch command
+     """
+     if platform.system() != 'Windows':
+-        full_cmd = ['/usr/bin/env', '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/files/hyfetch-1.4.11-pyproject.patch b/app-misc/hyfetch/files/hyfetch-1.4.11-pyproject.patch
new file mode 100644
index 000000000000..c82503c45b35
--- /dev/null
+++ b/app-misc/hyfetch/files/hyfetch-1.4.11-pyproject.patch
@@ -0,0 +1,116 @@
+From 4b926d90e8f2a5eebfdd68105facff1f99694f5a Mon Sep 17 00:00:00 2001
+From: Bailey Kasin <baileykasin@gmail.com>
+Date: Thu, 28 Sep 2023 13:05:22 -0700
+Subject: [PATCH] [+] Start switch to pyproject.toml
+
+Signed-off-by: Bailey Kasin <baileykasin@gmail.com>
+---
+ pyproject.toml | 37 +++++++++++++++++++++++++++++++++++
+ setup.py       | 52 ++------------------------------------------------
+ 2 files changed, 39 insertions(+), 50 deletions(-)
+ create mode 100644 pyproject.toml
+ mode change 100755 => 100644 setup.py
+
+diff --git a/pyproject.toml b/pyproject.toml
+new file mode 100644
+index 000000000..d30f10c0b
+--- /dev/null
++++ b/pyproject.toml
+@@ -0,0 +1,38 @@
++[build-system]
++requires = ["setuptools", "typing_extensions"]
++build-backend = "setuptools.build_meta"
++
++[project]
++name = "HyFetch"
++authors = [{ name = "Azalea Gui", email = "me@hydev.org" }]
++description = "neofetch with flags <3"
++readme = "README.md"
++requires-python = ">=3.7"
++license = { text = "MIT License" }
++classifiers = [
++    "License :: OSI Approved :: MIT License",
++    "Programming Language :: Python :: 3",
++    "Programming Language :: Python :: 3.7",
++    "Programming Language :: Python :: 3.8",
++    "Programming Language :: Python :: 3.9",
++    "Programming Language :: Python :: 3.10",
++    "Programming Language :: Python :: 3.11",
++    "Programming Language :: Python :: 3.12",
++]
++dependencies = [
++    "typing_extensions",
++    'psutil ; platform_system=="Windows"',
++    'colorama>=0.4.6 ; platform_system=="Windows"'
++]
++dynamic = ["version"]
++
++[tool.setuptools]
++packages = ["hyfetch", "hyfetch.distros"]
++license-files = ["LICENSE.md"]
++script-files = ["hyfetch/scripts/neowofetch"]
++
++[tool.setuptools.dynamic]
++version = {attr = "hyfetch.__version__"}
++
++[project.scripts]
++hyfetch = "hyfetch.main:run"
+diff --git a/setup.py b/setup.py
+index 95260a40..60684932 100755
+--- a/setup.py	2023-12-02 00:22:33.000000000 -0000
++++ b/setup.py	2024-05-03 08:58:46.479797868 -0000
+@@ -1,52 +1,3 @@
+-#!/usr/bin/env python3
+-from pathlib import Path
+-from setuptools import setup, find_namespace_packages
++from setuptools import setup
+ 
+-# The directory containing this file
+-HERE = Path(__file__).parent
+-
+-# Load version without importing it (see issue #192 if you are confused)
+-for l in (HERE / 'hyfetch' / '__version__.py').read_text().strip().splitlines():
+-    exec(l)
+-
+-# The text of the README file
+-README = (HERE / "README.md").read_text('utf-8')
+-
+-# This call to setup() does all the work
+-setup(
+-    name="HyFetch",
+-    version=VERSION,
+-    description="neofetch with flags <3",
+-    long_description=README,
+-    long_description_content_type="text/markdown",
+-    url="https://github.com/hykilpikonna/HyFetch",
+-    author="Azalea Gui",
+-    author_email="me@hydev.org",
+-    license="MIT",
+-    classifiers=[
+-        "License :: OSI Approved :: MIT License",
+-        "Programming Language :: Python :: 3",
+-        "Programming Language :: Python :: 3.7",
+-        "Programming Language :: Python :: 3.8",
+-        "Programming Language :: Python :: 3.9",
+-        "Programming Language :: Python :: 3.10",
+-        "Programming Language :: Python :: 3.11",
+-    ],
+-    packages=find_namespace_packages(),
+-    package_data={'hyfetch': ['hyfetch/*']},
+-    include_package_data=True,
+-    install_requires=[
+-        # Universal dependencies
+-        'setuptools', 'typing_extensions',
+-        
+-        # Windows dependencies
+-        'psutil ; platform_system=="Windows"',
+-        'colorama>=0.4.6 ; platform_system=="Windows"',
+-    ],
+-    entry_points={
+-        "console_scripts": [
+-            "hyfetch=hyfetch.main:run",
+-        ]
+-    },
+-    scripts=['hyfetch/scripts/neowofetch']
+-)
++setup()
diff --git a/app-misc/hyfetch/files/hyfetch-9999-pyproject.patch b/app-misc/hyfetch/files/hyfetch-9999-pyproject.patch
new file mode 100644
index 000000000000..ae0a3131d228
--- /dev/null
+++ b/app-misc/hyfetch/files/hyfetch-9999-pyproject.patch
@@ -0,0 +1,117 @@
+From 4b926d90e8f2a5eebfdd68105facff1f99694f5a Mon Sep 17 00:00:00 2001
+From: Bailey Kasin <baileykasin@gmail.com>
+Date: Thu, 28 Sep 2023 13:05:22 -0700
+Subject: [PATCH] [+] Start switch to pyproject.toml
+
+Signed-off-by: Bailey Kasin <baileykasin@gmail.com>
+---
+ pyproject.toml | 37 +++++++++++++++++++++++++++++++++++
+ setup.py       | 52 ++------------------------------------------------
+ 2 files changed, 39 insertions(+), 50 deletions(-)
+ create mode 100644 pyproject.toml
+ mode change 100755 => 100644 setup.py
+
+diff --git a/pyproject.toml b/pyproject.toml
+new file mode 100644
+index 000000000..d30f10c0b
+--- /dev/null
++++ b/pyproject.toml
+@@ -0,0 +1,38 @@
++[build-system]
++requires = ["setuptools", "typing_extensions"]
++build-backend = "setuptools.build_meta"
++
++[project]
++name = "HyFetch"
++authors = [{ name = "Azalea Gui", email = "me@hydev.org" }]
++description = "neofetch with flags <3"
++readme = "README.md"
++requires-python = ">=3.7"
++license = { text = "MIT License" }
++classifiers = [
++    "License :: OSI Approved :: MIT License",
++    "Programming Language :: Python :: 3",
++    "Programming Language :: Python :: 3.7",
++    "Programming Language :: Python :: 3.8",
++    "Programming Language :: Python :: 3.9",
++    "Programming Language :: Python :: 3.10",
++    "Programming Language :: Python :: 3.11",
++    "Programming Language :: Python :: 3.12",
++]
++dependencies = [
++    "typing_extensions",
++    'psutil ; platform_system=="Windows"',
++    'colorama>=0.4.6 ; platform_system=="Windows"'
++]
++dynamic = ["version"]
++
++[tool.setuptools]
++packages = ["hyfetch", "hyfetch.distros"]
++license-files = ["LICENSE.md"]
++script-files = ["hyfetch/scripts/neowofetch"]
++
++[tool.setuptools.dynamic]
++version = {attr = "hyfetch.__version__"}
++
++[project.scripts]
++hyfetch = "hyfetch.main:run"
+diff --git a/setup.py b/setup.py
+index 95260a40..60684932 100755
+--- a/setup.py	2023-12-02 00:22:33.000000000 -0000
++++ b/setup.py	2024-05-03 08:58:46.479797868 -0000
+@@ -1,53 +1,3 @@
+-#!/usr/bin/env python3
+-from pathlib import Path
+-from setuptools import setup, find_namespace_packages
++from setuptools import setup
+ 
+-# The directory containing this file
+-HERE = Path(__file__).parent
+-
+-# Load version without importing it (see issue #192 if you are confused)
+-for l in (HERE / 'hyfetch' / '__version__.py').read_text().strip().splitlines():
+-    exec(l)
+-
+-# The text of the README file
+-README = (HERE / "README.md").read_text('utf-8')
+-
+-# This call to setup() does all the work
+-setup(
+-    name="HyFetch",
+-    version=VERSION,
+-    description="neofetch with flags <3",
+-    long_description=README,
+-    long_description_content_type="text/markdown",
+-    url="https://github.com/hykilpikonna/HyFetch",
+-    author="Azalea Gui",
+-    author_email="me@hydev.org",
+-    license="MIT",
+-    classifiers=[
+-        "License :: OSI Approved :: MIT License",
+-        "Programming Language :: Python :: 3",
+-        "Programming Language :: Python :: 3.7",
+-        "Programming Language :: Python :: 3.8",
+-        "Programming Language :: Python :: 3.9",
+-        "Programming Language :: Python :: 3.10",
+-        "Programming Language :: Python :: 3.11",
+-        "Programming Language :: Python :: 3.12",
+-    ],
+-    packages=find_namespace_packages(),
+-    package_data={'hyfetch': ['hyfetch/*']},
+-    include_package_data=True,
+-    install_requires=[
+-        # Universal dependencies
+-        'setuptools', 'typing_extensions',
+-        
+-        # Windows dependencies
+-        'psutil ; platform_system=="Windows"',
+-        'colorama>=0.4.6 ; platform_system=="Windows"',
+-    ],
+-    entry_points={
+-        "console_scripts": [
+-            "hyfetch=hyfetch.main:run",
+-        ]
+-    },
+-    scripts=['hyfetch/scripts/neowofetch']
+-)
++setup()
diff --git a/app-misc/hyfetch/hyfetch-1.4.11.ebuild b/app-misc/hyfetch/hyfetch-1.4.11-r1.ebuild
index 2be7a98f9acf..a05998fb5353 100644
--- a/app-misc/hyfetch/hyfetch-1.4.11.ebuild
+++ b/app-misc/hyfetch/hyfetch-1.4.11-r1.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..12} )
-inherit optfeature distutils-r1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit optfeature distutils-r1 shell-completion
 
 DESCRIPTION="Neofetch with LGBTQ+ pride flags!"
 HOMEPAGE="https://github.com/hykilpikonna/hyfetch"
@@ -20,10 +21,27 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.11-pyproject.patch
+	"${FILESDIR}"/${PN}-1.4.11-neofetch.patch
+)
+
 RDEPEND="
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
 
+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/hyfetch-9999.ebuild b/app-misc/hyfetch/hyfetch-9999.ebuild
index 448b872ef1ad..796c87637890 100644
--- a/app-misc/hyfetch/hyfetch-9999.ebuild
+++ b/app-misc/hyfetch/hyfetch-9999.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
 
-DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..12} )
-inherit optfeature distutils-r1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit optfeature distutils-r1 shell-completion
 
 DESCRIPTION="Neofetch with LGBTQ+ pride flags!"
 HOMEPAGE="https://github.com/hykilpikonna/hyfetch"
@@ -20,10 +21,27 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-pyproject.patch
+	"${FILESDIR}"/${PN}-1.4.11-neofetch.patch
+)
+
 RDEPEND="
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
 
+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