app-portage/sisyphus : version bump

3 files changed, 2 insertions, 30 deletions

diff --git a/app-portage/sisyphus-qt/sisyphus-qt-6.2305.0-r1.ebuild b/app-portage/sisyphus-qt/sisyphus-qt-6.2401.0.ebuild
index dbea5b8b..d7a65fec 100644
--- a/app-portage/sisyphus-qt/sisyphus-qt-6.2305.0-r1.ebuild
+++ b/app-portage/sisyphus-qt/sisyphus-qt-6.2401.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://redcorelinux.org"
 
 EGIT_REPO_URI="https://gitlab.com/redcore/sisyphus.git"
 EGIT_BRANCH="master"
-EGIT_COMMIT="78eca7889aebbc3e7f141f23a41eb9b3b79f3a69"
+EGIT_COMMIT="5cf564d3b5109c2a9e4b5917eb7d834f8b911d3b"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-portage/sisyphus/files/sisyphus-makeopts.patch b/app-portage/sisyphus/files/sisyphus-makeopts.patch
deleted file mode 100644
index 1a44b9fa..00000000
--- a/app-portage/sisyphus/files/sisyphus-makeopts.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/helpers/set_jobs b/src/helpers/set_jobs
-index df3e080..b04c965 100755
---- a/src/helpers/set_jobs
-+++ b/src/helpers/set_jobs
-@@ -1,6 +1,6 @@
- #!/usr/bin/env bash
- 
--portageConfigDir="/opt/redcore-build/conf/intel/portage"
-+sisyphusConfigDir="/etc/sisyphus"
- 
- setjobs () {
- 	# default MAKEOPTS value is -j64, but that's overkill for lower spec machines
-@@ -8,11 +8,9 @@ setjobs () {
- 	# however since compilation is largely pointer-following, SMT won't help much
- 	# and can lead to memory starvation and stalls; DO NOT use logical cores
- 	if [[ $(cat /sys/devices/system/cpu/smt/active) -eq 1 ]]; then
--		sed -i "s/\-j\([0-9]\+\)/\-j$(expr $(getconf _NPROCESSORS_ONLN) / 2)/g" "$portageConfigDir"/make.conf/00-makeopts.conf >/dev/null 2>&1 # global makeopts (exclude kernel)
--		sed -i "s/\-j\([0-9]\+\)/\-j$(expr $(getconf _NPROCESSORS_ONLN) / 2)/g" "$portageConfigDir"/env/makenoise.conf >/dev/null 2>&1 # kernel makeopts
-+		sed -i "s/\-j\([0-9]\+\)/\-j$(expr $(getconf _NPROCESSORS_ONLN) / 2)/g" "$sisyphusConfigDir"/sisyphus.make-opts.conf >/dev/null 2>&1 # global makeopts
- 	elif [[ $(cat /sys/devices/system/cpu/smt/active) -eq 0 ]]; then
--		sed -i "s/\-j\([0-9]\+\)/\-j$(getconf _NPROCESSORS_ONLN)/g" "$portageConfigDir"/make.conf/00-makeopts.conf >/dev/null 2>&1 # global makeopts (exclude kernel)
--		sed -i "s/\-j\([0-9]\+\)/\-j$(getconf _NPROCESSORS_ONLN)/g" "$portageConfigDir"/env/makenoise.conf >/dev/null 2>&1 # kernel makeopts
-+		sed -i "s/\-j\([0-9]\+\)/\-j$(getconf _NPROCESSORS_ONLN)/g" "$sisyphusConfigDir"/sisyphus.make-opts.conf >/dev/null 2>&1 # global makeopts
- 	fi
- }
- 
diff --git a/app-portage/sisyphus/sisyphus-6.2305.0-r2.ebuild b/app-portage/sisyphus/sisyphus-6.2401.0.ebuild
index 500c64a1..a04f0de8 100644
--- a/app-portage/sisyphus/sisyphus-6.2305.0-r2.ebuild
+++ b/app-portage/sisyphus/sisyphus-6.2401.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://redcorelinux.org"
 
 EGIT_REPO_URI="https://gitlab.com/redcore/sisyphus.git"
 EGIT_BRANCH="master"
-EGIT_COMMIT="78eca7889aebbc3e7f141f23a41eb9b3b79f3a69"
+EGIT_COMMIT="5cf564d3b5109c2a9e4b5917eb7d834f8b911d3b"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -34,8 +34,6 @@ RDEPEND="${DEPEND}
 	sys-apps/gentoo-functions"
 PDEPEND="qt5? ( ~app-portage/${PN}-qt-${PV} )"
 
-PATCHES=( "${FILESDIR}"/"${PN}"-makeopts.patch )
-
 src_install() {
 	emake DESTDIR="${D}"/ install-cli