diff options
-rw-r--r-- | app-portage/sisyphus-qt/sisyphus-qt-6.2401.0.ebuild (renamed from app-portage/sisyphus-qt/sisyphus-qt-6.2305.0-r1.ebuild) | 2 | ||||
-rw-r--r-- | app-portage/sisyphus/files/sisyphus-makeopts.patch | 26 | ||||
-rw-r--r-- | app-portage/sisyphus/sisyphus-6.2401.0.ebuild (renamed from app-portage/sisyphus/sisyphus-6.2305.0-r2.ebuild) | 4 | ||||
-rw-r--r-- | metadata/md5-cache/app-portage/sisyphus-6.2401.0 (renamed from metadata/md5-cache/app-portage/sisyphus-6.2305.0-r2) | 4 | ||||
-rw-r--r-- | metadata/md5-cache/app-portage/sisyphus-qt-6.2401.0 (renamed from metadata/md5-cache/app-portage/sisyphus-qt-6.2305.0-r1) | 6 | ||||
-rw-r--r-- | metadata/pkg_desc_index | 4 |
6 files changed, 9 insertions, 37 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 diff --git a/metadata/md5-cache/app-portage/sisyphus-6.2305.0-r2 b/metadata/md5-cache/app-portage/sisyphus-6.2401.0 index 2946029a..956854a3 100644 --- a/metadata/md5-cache/app-portage/sisyphus-6.2305.0-r2 +++ b/metadata/md5-cache/app-portage/sisyphus-6.2401.0 @@ -8,9 +8,9 @@ INHERIT=python-single-r1 git-r3 IUSE=qt5 python_single_target_python3_10 python_single_target_python3_11 KEYWORDS=amd64 arm64 LICENSE=GPL-2 -PDEPEND=qt5? ( ~app-portage/sisyphus-qt-6.2305.0 ) +PDEPEND=qt5? ( ~app-portage/sisyphus-qt-6.2401.0 ) 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 git-r3 86fa1f157b70b9d2ff340c4633b1cf4b multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe python-single-r1 75118e916668a74c660a13b0ecb22562 python-utils-r1 042f4cc53680245bf99a84669b94155a toolchain-funcs e56c7649b804f051623c8bc1a1c44084 -_md5_=80320a31878f45ae08fd1707af617d43 +_md5_=a203fef751c9483e262805ec593c0ac2 diff --git a/metadata/md5-cache/app-portage/sisyphus-qt-6.2305.0-r1 b/metadata/md5-cache/app-portage/sisyphus-qt-6.2401.0 index aefcb8cd..9138858d 100644 --- a/metadata/md5-cache/app-portage/sisyphus-qt-6.2305.0-r1 +++ b/metadata/md5-cache/app-portage/sisyphus-qt-6.2401.0 @@ -1,6 +1,6 @@ BDEPEND=>=dev-vcs/git-1.8.2.1[curl] DEFINED_PHASES=install setup unpack -DEPEND=dev-lang/python[sqlite] ~app-portage/sisyphus-6.2305.0 +DEPEND=dev-lang/python[sqlite] ~app-portage/sisyphus-6.2401.0 DESCRIPTION=A simple portage python wrapper which works like other package managers(apt-get/yum/dnf) EAPI=7 HOMEPAGE=http://redcorelinux.org @@ -9,7 +9,7 @@ IUSE=python_single_target_python3_10 python_single_target_python3_11 KEYWORDS=amd64 arm64 LICENSE=GPL-2 PROPERTIES=live -RDEPEND=dev-lang/python[sqlite] ~app-portage/sisyphus-6.2305.0 app-misc/tmux python_single_target_python3_10? ( dev-python/PyQt5[designer,gui,widgets,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[designer,gui,widgets,python_targets_python3_11(-)] ) +RDEPEND=dev-lang/python[sqlite] ~app-portage/sisyphus-6.2401.0 app-misc/tmux python_single_target_python3_10? ( dev-python/PyQt5[designer,gui,widgets,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[designer,gui,widgets,python_targets_python3_11(-)] ) SLOT=0 _eclasses_=eapi8-dosym 5ac4857ad078256d939c44f7c64197a9 git-r3 86fa1f157b70b9d2ff340c4633b1cf4b multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe python-single-r1 75118e916668a74c660a13b0ecb22562 python-utils-r1 042f4cc53680245bf99a84669b94155a toolchain-funcs e56c7649b804f051623c8bc1a1c44084 -_md5_=d97e1c05351e2286c095227f8e72ed40 +_md5_=00aa4a18fa4dbb78d872e9abf00e5ca3 diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 185dc86a..0d5c70ff 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -12,8 +12,8 @@ app-misc/geoclue 2.7.1-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/flaggie 0.99.8-r1: A smart CLI mangler for package.* files -app-portage/sisyphus 6.2305.0-r2: A simple portage python wrapper which works like other package managers(apt-get/yum/dnf) -app-portage/sisyphus-qt 6.2305.0-r1: A simple portage python wrapper which works like other package managers(apt-get/yum/dnf) +app-portage/sisyphus 6.2401.0: A simple portage python wrapper which works like other package managers(apt-get/yum/dnf) +app-portage/sisyphus-qt 6.2401.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 dev-go/protoc-gen-go-grpc 1.2.0: This tool generates Go language bindings of services in protobuf definition files for gRPC |