games-util/grapejuice: remove patch in favor of sed, sort depends

11 files changed, 33 insertions, 40 deletions

diff --git a/games-util/grapejuice/Manifest b/games-util/grapejuice/Manifest
index d6b3059..4808d59 100644
--- a/games-util/grapejuice/Manifest
+++ b/games-util/grapejuice/Manifest
@@ -1,4 +1,3 @@
-AUX no-build-isolation.patch 595 BLAKE2B d39fe3e9c03631825df81b1939f901ea6ea72b728f523e18e72f866acfceb688d844b254f5e94add692f662d9de47350bda17f3196a940bf2d7d9667d514b77e SHA512 0012b75f90a90fcf2957a7c2243e84a0124741068bffc927a6cacd964549a9f6c6c214af936c1fc1c4381384665a7dff388b051aa4236a0eface2e25e2c8f929
 DIST grapejuice-v7.8.3.tar.bz2 326242 BLAKE2B 88da8ee3063b0eb50496b44f57b087ee16f793338ad797309e46412a4e5831fd10710c74815836d9ec4f4b4c4f51dc8068caf445905bc30d4c6b534722ab3a86 SHA512 c99372ef177d3891b1ad12649191fbd1b39408bdcfefda5d457415cf1b65b64b819f39de6fbfc652e05529e2910a42c4df09f6b4e6193483c4fbda9f2ee49df8
-EBUILD grapejuice-7.8.3.ebuild 1614 BLAKE2B 9df2d9fe6658e9940cc3e8b2dc3cd68c6270079e0c977977c123a8ac3b275d4e38ce851373b3e7dccf746f06516442750f638380b948566de3f20864a334a580 SHA512 03c9d9f08b0f9b162dedca2799440fa6fe07de33074dfd51fbfbaf4b86c1c4fb0c7713ad980a00f6234460d7cf52853179e2b912bcd6bc695d4efe9944103c29
+EBUILD grapejuice-7.8.3.ebuild 1736 BLAKE2B b9e7326024107fa6695cee599e7b05e60ea75f59bd2621b845cdef06274c2f8b94f6d125f625b2c9ab480653a30d584a6ddbf565d7c9405aa8e865dfd2d030f8 SHA512 ac6be4daf68d7e1c51e446063cacdf44f93f97ac21dd22895cac098ddd5c1b23f409695c8a3ee50f57030a51df4d2d4462180ccaa4b53e864c8d58888f53c587
 MISC metadata.xml 361 BLAKE2B a6155a8bee6ab7fbd3802e9a9bd103ec77f5758f14a4ef29e5f1cb42e558a848999b22acdbcd60a2ec42dd4f6eda7ad0c427e585d2d7a0d4e4d803a66e6631b7 SHA512 92d1a97a20f88ed119aae7fda45537bc5321b860b8372626d63b354bdb56f223ab11c700933c525aef68e185454f266eae6364501b8840d41bebebc6a5d407ce
diff --git a/games-util/grapejuice/files/no-build-isolation.patch b/games-util/grapejuice/files/no-build-isolation.patch
deleted file mode 100644
index 35e7292..0000000
--- a/games-util/grapejuice/files/no-build-isolation.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/grapejuice_packaging/builders/linux_package_builder.py b/src/grapejuice_packaging/builders/linux_package_builder.py
-index ca3cf89..e3ca667 100644
---- a/src/grapejuice_packaging/builders/linux_package_builder.py
-+++ b/src/grapejuice_packaging/builders/linux_package_builder.py
-@@ -58,6 +58,7 @@ def _build_package(configuration: LinuxPackageConfiguration):
-                 sys.executable, "-m", "pip",
-                 "install", ".",
-                 "--no-dependencies",
-+                "--no-build-isolation",
-                 "--target", str(python_site)
-             ])
- 
diff --git a/games-util/grapejuice/grapejuice-7.8.3.ebuild b/games-util/grapejuice/grapejuice-7.8.3.ebuild
index c1aafc0..5ca1f4c 100644
--- a/games-util/grapejuice/grapejuice-7.8.3.ebuild
+++ b/games-util/grapejuice/grapejuice-7.8.3.ebuild
@@ -14,39 +14,45 @@ SLOT="0"
 KEYWORDS="-* ~amd64"
 RESTRICT="mirror"
 
-DEPEND="sys-devel/gettext
-		dev-vcs/git
+DEPEND="dev-libs/gobject-introspection
 		dev-python/pip
-		x11-libs/cairo
-		x11-libs/gtk+
-		dev-libs/gobject-introspection
 		dev-util/desktop-file-utils
-		x11-misc/xdg-utils
-		x11-misc/xdg-user-dirs
 		dev-util/gtk-update-icon-cache
-		x11-misc/shared-mime-info
+		dev-vcs/git
+		sys-devel/gettext
 		x11-apps/mesa-progs
+		x11-libs/cairo
+		x11-libs/gtk+
+		x11-misc/shared-mime-info
+		x11-misc/xdg-user-dirs
+		x11-misc/xdg-utils
 
+		dev-python/click
+		dev-python/packaging
 		dev-python/psutil
+		dev-python/pydantic
 		dev-python/pygobject
-		dev-python/packaging
-		dev-python/wheel
-		dev-python/setuptools
 		dev-python/requests
+		dev-python/setuptools
 		dev-python/unidecode
-		dev-python/click
-		dev-python/pydantic"
+		dev-python/wheel"
+
 RDEPEND="
 		${DEPEND}
 		virtual/wine"
 
-PATCHES="${FILESDIR}/no-build-isolation.patch"
-
 src_unpack() {
 	default
 	mv "${WORKDIR}/grapejuice-v${PV}" "${S}" || die
 }
 
+src_prepare() {
+	default
+	sed -i \
+		-e 's/"--target"/"--no-build-isolation",\n\t\t"--target"/' \
+		src/grapejuice_packaging/builders/linux_package_builder.py || die
+}
+
 src_compile() {
 	cd "${S}"
 	export PYTHONPATH="${S}/src"
diff --git a/metadata/md5-cache/app-misc/glow-1.4.1 b/metadata/md5-cache/app-misc/glow-1.4.1
index 1241e43..2702fc7 100644
--- a/metadata/md5-cache/app-misc/glow-1.4.1
+++ b/metadata/md5-cache/app-misc/glow-1.4.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD-2 BSD MIT MPL-2.0
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=https://github.com/charmbracelet/glow/archive/refs/tags/v1.4.1.tar.gz -> glow-1.4.1.tar.gz https://github.com/telans/distfiles/raw/main/app-misc/glow/glow-1.4.1-deps.tar.xz
-_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	go-module	9c75e51a48520b2f01471c1f91762882
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	go-module	8624eede24936fd7666e5298e5332f22
 _md5_=9c42fe00eee0c973b0286ad6a5c0e433
diff --git a/metadata/md5-cache/games-util/grapejuice-7.8.3 b/metadata/md5-cache/games-util/grapejuice-7.8.3
index 66e9d5e..91300e5 100644
--- a/metadata/md5-cache/games-util/grapejuice-7.8.3
+++ b/metadata/md5-cache/games-util/grapejuice-7.8.3
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=sys-devel/gettext dev-vcs/git dev-python/pip x11-libs/cairo x11-libs/gtk+ dev-libs/gobject-introspection dev-util/desktop-file-utils x11-misc/xdg-utils x11-misc/xdg-user-dirs dev-util/gtk-update-icon-cache x11-misc/shared-mime-info x11-apps/mesa-progs dev-python/psutil dev-python/pygobject dev-python/packaging dev-python/wheel dev-python/setuptools dev-python/requests dev-python/unidecode dev-python/click dev-python/pydantic
+DEFINED_PHASES=compile install postinst postrm preinst prepare unpack
+DEPEND=dev-libs/gobject-introspection dev-python/pip dev-util/desktop-file-utils dev-util/gtk-update-icon-cache dev-vcs/git sys-devel/gettext x11-apps/mesa-progs x11-libs/cairo x11-libs/gtk+ x11-misc/shared-mime-info x11-misc/xdg-user-dirs x11-misc/xdg-utils dev-python/click dev-python/packaging dev-python/psutil dev-python/pydantic dev-python/pygobject dev-python/requests dev-python/setuptools dev-python/unidecode dev-python/wheel
 DESCRIPTION=A Wine+Roblox management application
 EAPI=8
 HOMEPAGE=https://gitlab.com/brinkervii/grapejuice.git
@@ -7,9 +7,9 @@ IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=xdg optfeature
 KEYWORDS=-* ~amd64
 LICENSE=GPL-3
-RDEPEND=sys-devel/gettext dev-vcs/git dev-python/pip x11-libs/cairo x11-libs/gtk+ dev-libs/gobject-introspection dev-util/desktop-file-utils x11-misc/xdg-utils x11-misc/xdg-user-dirs dev-util/gtk-update-icon-cache x11-misc/shared-mime-info x11-apps/mesa-progs dev-python/psutil dev-python/pygobject dev-python/packaging dev-python/wheel dev-python/setuptools dev-python/requests dev-python/unidecode dev-python/click dev-python/pydantic virtual/wine
+RDEPEND=dev-libs/gobject-introspection dev-python/pip dev-util/desktop-file-utils dev-util/gtk-update-icon-cache dev-vcs/git sys-devel/gettext x11-apps/mesa-progs x11-libs/cairo x11-libs/gtk+ x11-misc/shared-mime-info x11-misc/xdg-user-dirs x11-misc/xdg-utils dev-python/click dev-python/packaging dev-python/psutil dev-python/pydantic dev-python/pygobject dev-python/requests dev-python/setuptools dev-python/unidecode dev-python/wheel virtual/wine
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://gitlab.com/brinkervii/grapejuice/-/archive/v7.8.3/grapejuice-v7.8.3.tar.bz2
 _eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3	xdg	4a14c5c24f121e7da66e5aab4a168c6e	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54
-_md5_=b71f40119c122c15d9d29cebcf163233
+_md5_=787fa4eef0dfde874938cf69a2c755c8
diff --git a/metadata/md5-cache/gui-wm/cage-0.1.4 b/metadata/md5-cache/gui-wm/cage-0.1.4
index 6087f32..6129d50 100644
--- a/metadata/md5-cache/gui-wm/cage-0.1.4
+++ b/metadata/md5-cache/gui-wm/cage-0.1.4
@@ -12,5 +12,5 @@ RDEPEND=>=gui-libs/wlroots-0.14[X?] x11-libs/libxkbcommon[X?]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/cage-kiosk/cage/archive/v0.1.4.tar.gz -> cage-0.1.4.tar.gz
-_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	meson	915ec7c25e08d7886558215e6809ca1e
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	meson	18d046bdb14e1bdb22cce6e5d953e364
 _md5_=c43d3d4aab1580ca55fc5751b011ba2b
diff --git a/metadata/md5-cache/gui-wm/cage-9999 b/metadata/md5-cache/gui-wm/cage-9999
index d625ede..d4bb4f3 100644
--- a/metadata/md5-cache/gui-wm/cage-9999
+++ b/metadata/md5-cache/gui-wm/cage-9999
@@ -10,5 +10,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=gui-libs/wlroots-0.14[X?] x11-libs/libxkbcommon[X?]
 SLOT=0
-_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	meson	915ec7c25e08d7886558215e6809ca1e	git-r3	27e13c09a4c7e4c78ac812f74727e676
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	meson	18d046bdb14e1bdb22cce6e5d953e364	git-r3	27e13c09a4c7e4c78ac812f74727e676
 _md5_=d0a4134e9f1ba289abac7190eeb35b06
diff --git a/metadata/md5-cache/gui-wm/dwl-0.4-r1 b/metadata/md5-cache/gui-wm/dwl-0.4-r1
index 20b0a5d..8a67d44 100644
--- a/metadata/md5-cache/gui-wm/dwl-0.4-r1
+++ b/metadata/md5-cache/gui-wm/dwl-0.4-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/libinput:= dev-libs/wayland gui-libs/wlroots:0/16[X(-)?] x11-li
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/djpohly/dwl/archive/v0.4.tar.gz -> dwl-0.4.tar.gz
-_eclasses_=toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	portability	a74d533f258f1f435be71312558c12f9	savedconfig	8b5f9d995a970e49cd427c55d5840285
+_eclasses_=toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	portability	a74d533f258f1f435be71312558c12f9	savedconfig	8b5f9d995a970e49cd427c55d5840285
 _md5_=0b84adb8f4d9419d4b62c8c924bc1757
diff --git a/metadata/md5-cache/gui-wm/dwl-9999 b/metadata/md5-cache/gui-wm/dwl-9999
index 32cb1ba..43f8115 100644
--- a/metadata/md5-cache/gui-wm/dwl-9999
+++ b/metadata/md5-cache/gui-wm/dwl-9999
@@ -10,5 +10,5 @@ LICENSE=CC0-1.0 GPL-3 MIT
 PROPERTIES=live
 RDEPEND=dev-libs/libinput:= dev-libs/wayland gui-libs/wlroots:0/16[X(-)?] x11-libs/libxkbcommon X? ( x11-libs/libxcb:= x11-libs/xcb-util-wm )
 SLOT=0
-_eclasses_=toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	portability	a74d533f258f1f435be71312558c12f9	savedconfig	8b5f9d995a970e49cd427c55d5840285	git-r3	27e13c09a4c7e4c78ac812f74727e676
+_eclasses_=toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	portability	a74d533f258f1f435be71312558c12f9	savedconfig	8b5f9d995a970e49cd427c55d5840285	git-r3	27e13c09a4c7e4c78ac812f74727e676
 _md5_=47fa185fcd7d3c4b4fec0c5e0a00659c
diff --git a/metadata/md5-cache/gui-wm/dwl-9999-r1 b/metadata/md5-cache/gui-wm/dwl-9999-r1
index 1eff291..c0462e3 100644
--- a/metadata/md5-cache/gui-wm/dwl-9999-r1
+++ b/metadata/md5-cache/gui-wm/dwl-9999-r1
@@ -10,5 +10,5 @@ LICENSE=CC0-1.0 GPL-3 MIT
 PROPERTIES=live
 RDEPEND=dev-libs/libinput:= dev-libs/wayland gui-libs/wlroots:0/9999[X(-)?] x11-libs/libxkbcommon X? ( x11-libs/libxcb:= x11-libs/xcb-util-wm )
 SLOT=0
-_eclasses_=toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	portability	a74d533f258f1f435be71312558c12f9	savedconfig	8b5f9d995a970e49cd427c55d5840285	git-r3	27e13c09a4c7e4c78ac812f74727e676
+_eclasses_=toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	portability	a74d533f258f1f435be71312558c12f9	savedconfig	8b5f9d995a970e49cd427c55d5840285	git-r3	27e13c09a4c7e4c78ac812f74727e676
 _md5_=47fa185fcd7d3c4b4fec0c5e0a00659c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.19 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.19
index 992ae73..d385ebd 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.19
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.19
@@ -10,5 +10,5 @@ RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-d
 RESTRICT=binchecks strip
 SLOT=6.1.19
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-23.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-23.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-23.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-23.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-23.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-23.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe
 _md5_=b14344cfd875774a83e1d3ff938d33a1