app-portage/sisyphus : revision bump

13 files changed, 42 insertions, 10 deletions

diff --git a/app-portage/sisyphus/files/sisyphus-makeopts.patch b/app-portage/sisyphus/files/sisyphus-makeopts.patch
new file mode 100644
index 00000000..1a44b9fa
--- /dev/null
+++ b/app-portage/sisyphus/files/sisyphus-makeopts.patch
@@ -0,0 +1,26 @@
+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/files/sisyphus.env.conf b/app-portage/sisyphus/files/sisyphus.build-env.conf
index e69de29b..e69de29b 100644
--- a/app-portage/sisyphus/files/sisyphus.env.conf
+++ b/app-portage/sisyphus/files/sisyphus.build-env.conf
diff --git a/app-portage/sisyphus/files/sisyphus.make.conf b/app-portage/sisyphus/files/sisyphus.make-conf.conf
index e69de29b..e69de29b 100644
--- a/app-portage/sisyphus/files/sisyphus.make.conf
+++ b/app-portage/sisyphus/files/sisyphus.make-conf.conf
diff --git a/app-portage/sisyphus/files/sisyphus.make-opts.conf b/app-portage/sisyphus/files/sisyphus.make-opts.conf
new file mode 100644
index 00000000..79d3bc18
--- /dev/null
+++ b/app-portage/sisyphus/files/sisyphus.make-opts.conf
@@ -0,0 +1,3 @@
+# This file has been automatically generated, do not edit.
+
+MAKEOPTS="-j64"
diff --git a/app-portage/sisyphus/files/sisyphus.package.env b/app-portage/sisyphus/files/sisyphus.package-env.conf
index e69de29b..e69de29b 100644
--- a/app-portage/sisyphus/files/sisyphus.package.env
+++ b/app-portage/sisyphus/files/sisyphus.package-env.conf
diff --git a/app-portage/sisyphus/files/sisyphus.package.keywords b/app-portage/sisyphus/files/sisyphus.package-keywords.conf
index e69de29b..e69de29b 100644
--- a/app-portage/sisyphus/files/sisyphus.package.keywords
+++ b/app-portage/sisyphus/files/sisyphus.package-keywords.conf
diff --git a/app-portage/sisyphus/files/sisyphus.package.license b/app-portage/sisyphus/files/sisyphus.package-license.conf
index e69de29b..e69de29b 100644
--- a/app-portage/sisyphus/files/sisyphus.package.license
+++ b/app-portage/sisyphus/files/sisyphus.package-license.conf
diff --git a/app-portage/sisyphus/files/sisyphus.package.mask b/app-portage/sisyphus/files/sisyphus.package-mask.conf
index e69de29b..e69de29b 100644
--- a/app-portage/sisyphus/files/sisyphus.package.mask
+++ b/app-portage/sisyphus/files/sisyphus.package-mask.conf
diff --git a/app-portage/sisyphus/files/sisyphus.package.unmask b/app-portage/sisyphus/files/sisyphus.package-unmask.conf
index e69de29b..e69de29b 100644
--- a/app-portage/sisyphus/files/sisyphus.package.unmask
+++ b/app-portage/sisyphus/files/sisyphus.package-unmask.conf
diff --git a/app-portage/sisyphus/files/sisyphus.package.use b/app-portage/sisyphus/files/sisyphus.package-use.conf
index e69de29b..e69de29b 100644
--- a/app-portage/sisyphus/files/sisyphus.package.use
+++ b/app-portage/sisyphus/files/sisyphus.package-use.conf
diff --git a/app-portage/sisyphus/sisyphus-6.2305.0.ebuild b/app-portage/sisyphus/sisyphus-6.2305.0-r1.ebuild
index 1ec80bb1..ce80d9f6 100644
--- a/app-portage/sisyphus/sisyphus-6.2305.0.ebuild
+++ b/app-portage/sisyphus/sisyphus-6.2305.0-r1.ebuild
@@ -34,6 +34,8 @@ 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
 
@@ -48,14 +50,15 @@ src_install() {
 	doins "${FILESDIR}"/"${PN}"-mirrors-amd64.conf
 	doins "${FILESDIR}"/"${PN}"-mirrors-arm64.conf
 
-	doins "${FILESDIR}"/"${PN}".env.conf
-	doins "${FILESDIR}"/"${PN}".make.conf
-	doins "${FILESDIR}"/"${PN}".package.keywords
-	doins "${FILESDIR}"/"${PN}".package.env
-	doins "${FILESDIR}"/"${PN}".package.license
-	doins "${FILESDIR}"/"${PN}".package.mask
-	doins "${FILESDIR}"/"${PN}".package.unmask
-	doins "${FILESDIR}"/"${PN}".package.use
+	doins "${FILESDIR}"/"${PN}".build-env.conf
+	doins "${FILESDIR}"/"${PN}".make-conf.conf
+	doins "${FILESDIR}"/"${PN}".make-opts.conf
+	doins "${FILESDIR}"/"${PN}".package-keywords.conf
+	doins "${FILESDIR}"/"${PN}".package-env.conf
+	doins "${FILESDIR}"/"${PN}".package-license.conf
+	doins "${FILESDIR}"/"${PN}".package-mask.conf
+	doins "${FILESDIR}"/"${PN}".package-unmask.conf
+	doins "${FILESDIR}"/"${PN}".package-use.conf
 
 	# enforce the best available python implementation (CLI)
 	python_setup
diff --git a/metadata/md5-cache/app-portage/sisyphus-6.2305.0 b/metadata/md5-cache/app-portage/sisyphus-6.2305.0-r1
index c309a1d7..f5f5563a 100644
--- a/metadata/md5-cache/app-portage/sisyphus-6.2305.0
+++ b/metadata/md5-cache/app-portage/sisyphus-6.2305.0-r1
@@ -13,4 +13,4 @@ PROPERTIES=live
 RDEPEND=dev-lang/python[sqlite] app-portage/portage-utils python_single_target_python3_10? ( app-portage/gentoolkit[python_targets_python3_10(-)] dev-python/animation[python_targets_python3_10(-)] dev-python/GitPython[python_targets_python3_10(-)] dev-python/typer[python_targets_python3_10(-)] dev-python/typing-extensions[python_targets_python3_10(-)] dev-python/urllib3[python_targets_python3_10(-)] sys-apps/portage[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-portage/gentoolkit[python_targets_python3_11(-)] dev-python/animation[python_targets_python3_11(-)] dev-python/GitPython[python_targets_python3_11(-)] dev-python/typer[python_targets_python3_11(-)] dev-python/typing-extensions[python_targets_python3_11(-)] dev-python/urllib3[python_targets_python3_11(-)] sys-apps/portage[python_targets_python3_11(-)] ) sys-apps/gentoo-functions
 SLOT=0
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	7f2c0a7465411e0f3a6db30e966155d6	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b58350c862190136548d1cabce4c442b
+_md5_=8827ecd12a7b9c8dd73f9855745dfb9f
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index a82c023e..84d5df8c 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -10,7 +10,7 @@ app-misc/calamares-config-redcore 1.314.1337-r3: Redcore Linux Calamares modules
 app-misc/geoclue 2.7.0-r5: A location information D-Bus service
 app-misc/redcore-live 1.314.1337: Redcore Linux live scripts
 app-misc/redcore-skel 1.314.1337-r2: Redcore Linux skel tree
-app-portage/sisyphus 6.2305.0: A simple portage python wrapper which works like other package managers(apt-get/yum/dnf)
+app-portage/sisyphus 6.2305.0-r1: A simple portage python wrapper which works like other package managers(apt-get/yum/dnf)
 app-portage/sisyphus-qt 6.2305.0: A simple portage python wrapper which works like other package managers(apt-get/yum/dnf)
 app-text/simplenote 2.6.0: The simplest way to keep notes
 dev-go/go-protobuf 1.5.2: Go support for Google's protocol buffers