From c474edbd6a286b87aa0fd824c9b7379587cb7ac6 Mon Sep 17 00:00:00 2001
From: turret <turret@duck.com>
Date: Mon, 19 Jun 2023 23:07:00 -0500
Subject: games-util/grapejuice: remove patch in favor of sed, sort depends

---
 games-util/grapejuice/Manifest                     |  3 +-
 .../grapejuice/files/no-build-isolation.patch      | 12 --------
 games-util/grapejuice/grapejuice-7.8.3.ebuild      | 36 +++++++++++++---------
 3 files changed, 22 insertions(+), 29 deletions(-)
 delete mode 100644 games-util/grapejuice/files/no-build-isolation.patch

(limited to 'games-util')

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"
-- 
cgit v1.2.3