From 238b6d6c20fe99938af667db240270a01bdad4fa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 3 Aug 2023 20:18:47 +0100 Subject: app-portage/sisyphus : revision bump --- app-portage/sisyphus/files/sisyphus-makeopts.patch | 26 +++++++ app-portage/sisyphus/files/sisyphus.build-env.conf | 0 app-portage/sisyphus/files/sisyphus.env.conf | 0 app-portage/sisyphus/files/sisyphus.make-conf.conf | 0 app-portage/sisyphus/files/sisyphus.make-opts.conf | 3 + app-portage/sisyphus/files/sisyphus.make.conf | 0 .../sisyphus/files/sisyphus.package-env.conf | 0 .../sisyphus/files/sisyphus.package-keywords.conf | 0 .../sisyphus/files/sisyphus.package-license.conf | 0 .../sisyphus/files/sisyphus.package-mask.conf | 0 .../sisyphus/files/sisyphus.package-unmask.conf | 0 .../sisyphus/files/sisyphus.package-use.conf | 0 app-portage/sisyphus/files/sisyphus.package.env | 0 .../sisyphus/files/sisyphus.package.keywords | 0 .../sisyphus/files/sisyphus.package.license | 0 app-portage/sisyphus/files/sisyphus.package.mask | 0 app-portage/sisyphus/files/sisyphus.package.unmask | 0 app-portage/sisyphus/files/sisyphus.package.use | 0 app-portage/sisyphus/sisyphus-6.2305.0-r1.ebuild | 80 ++++++++++++++++++++++ app-portage/sisyphus/sisyphus-6.2305.0.ebuild | 77 --------------------- metadata/md5-cache/app-portage/sisyphus-6.2305.0 | 16 ----- .../md5-cache/app-portage/sisyphus-6.2305.0-r1 | 16 +++++ metadata/pkg_desc_index | 2 +- 23 files changed, 126 insertions(+), 94 deletions(-) create mode 100644 app-portage/sisyphus/files/sisyphus-makeopts.patch create mode 100644 app-portage/sisyphus/files/sisyphus.build-env.conf delete mode 100644 app-portage/sisyphus/files/sisyphus.env.conf create mode 100644 app-portage/sisyphus/files/sisyphus.make-conf.conf create mode 100644 app-portage/sisyphus/files/sisyphus.make-opts.conf delete mode 100644 app-portage/sisyphus/files/sisyphus.make.conf create mode 100644 app-portage/sisyphus/files/sisyphus.package-env.conf create mode 100644 app-portage/sisyphus/files/sisyphus.package-keywords.conf create mode 100644 app-portage/sisyphus/files/sisyphus.package-license.conf create mode 100644 app-portage/sisyphus/files/sisyphus.package-mask.conf create mode 100644 app-portage/sisyphus/files/sisyphus.package-unmask.conf create mode 100644 app-portage/sisyphus/files/sisyphus.package-use.conf delete mode 100644 app-portage/sisyphus/files/sisyphus.package.env delete mode 100644 app-portage/sisyphus/files/sisyphus.package.keywords delete mode 100644 app-portage/sisyphus/files/sisyphus.package.license delete mode 100644 app-portage/sisyphus/files/sisyphus.package.mask delete mode 100644 app-portage/sisyphus/files/sisyphus.package.unmask delete mode 100644 app-portage/sisyphus/files/sisyphus.package.use create mode 100644 app-portage/sisyphus/sisyphus-6.2305.0-r1.ebuild delete mode 100644 app-portage/sisyphus/sisyphus-6.2305.0.ebuild delete mode 100644 metadata/md5-cache/app-portage/sisyphus-6.2305.0 create mode 100644 metadata/md5-cache/app-portage/sisyphus-6.2305.0-r1 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.build-env.conf b/app-portage/sisyphus/files/sisyphus.build-env.conf new file mode 100644 index 00000000..e69de29b diff --git a/app-portage/sisyphus/files/sisyphus.env.conf b/app-portage/sisyphus/files/sisyphus.env.conf deleted file mode 100644 index e69de29b..00000000 diff --git a/app-portage/sisyphus/files/sisyphus.make-conf.conf b/app-portage/sisyphus/files/sisyphus.make-conf.conf new file mode 100644 index 00000000..e69de29b 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.make.conf b/app-portage/sisyphus/files/sisyphus.make.conf deleted file mode 100644 index e69de29b..00000000 diff --git a/app-portage/sisyphus/files/sisyphus.package-env.conf b/app-portage/sisyphus/files/sisyphus.package-env.conf new file mode 100644 index 00000000..e69de29b diff --git a/app-portage/sisyphus/files/sisyphus.package-keywords.conf b/app-portage/sisyphus/files/sisyphus.package-keywords.conf new file mode 100644 index 00000000..e69de29b diff --git a/app-portage/sisyphus/files/sisyphus.package-license.conf b/app-portage/sisyphus/files/sisyphus.package-license.conf new file mode 100644 index 00000000..e69de29b diff --git a/app-portage/sisyphus/files/sisyphus.package-mask.conf b/app-portage/sisyphus/files/sisyphus.package-mask.conf new file mode 100644 index 00000000..e69de29b diff --git a/app-portage/sisyphus/files/sisyphus.package-unmask.conf b/app-portage/sisyphus/files/sisyphus.package-unmask.conf new file mode 100644 index 00000000..e69de29b diff --git a/app-portage/sisyphus/files/sisyphus.package-use.conf b/app-portage/sisyphus/files/sisyphus.package-use.conf new file mode 100644 index 00000000..e69de29b diff --git a/app-portage/sisyphus/files/sisyphus.package.env b/app-portage/sisyphus/files/sisyphus.package.env deleted file mode 100644 index e69de29b..00000000 diff --git a/app-portage/sisyphus/files/sisyphus.package.keywords b/app-portage/sisyphus/files/sisyphus.package.keywords deleted file mode 100644 index e69de29b..00000000 diff --git a/app-portage/sisyphus/files/sisyphus.package.license b/app-portage/sisyphus/files/sisyphus.package.license deleted file mode 100644 index e69de29b..00000000 diff --git a/app-portage/sisyphus/files/sisyphus.package.mask b/app-portage/sisyphus/files/sisyphus.package.mask deleted file mode 100644 index e69de29b..00000000 diff --git a/app-portage/sisyphus/files/sisyphus.package.unmask b/app-portage/sisyphus/files/sisyphus.package.unmask deleted file mode 100644 index e69de29b..00000000 diff --git a/app-portage/sisyphus/files/sisyphus.package.use b/app-portage/sisyphus/files/sisyphus.package.use deleted file mode 100644 index e69de29b..00000000 diff --git a/app-portage/sisyphus/sisyphus-6.2305.0-r1.ebuild b/app-portage/sisyphus/sisyphus-6.2305.0-r1.ebuild new file mode 100644 index 00000000..ce80d9f6 --- /dev/null +++ b/app-portage/sisyphus/sisyphus-6.2305.0-r1.ebuild @@ -0,0 +1,80 @@ +# Copyright 2016-2020 Redcore Linux Project +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit eutils python-single-r1 git-r3 + +DESCRIPTION="A simple portage python wrapper which works like other package managers(apt-get/yum/dnf)" +HOMEPAGE="http://redcorelinux.org" + +EGIT_REPO_URI="https://gitlab.com/redcore/sisyphus.git" +EGIT_BRANCH="master" +EGIT_COMMIT="78eca7889aebbc3e7f141f23a41eb9b3b79f3a69" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm64" +IUSE="qt5" + +DEPEND="dev-lang/python[sqlite]" +RDEPEND="${DEPEND} + app-portage/portage-utils + $(python_gen_cond_dep ' + app-portage/gentoolkit[${PYTHON_USEDEP}] + dev-python/animation[${PYTHON_USEDEP}] + dev-python/GitPython[${PYTHON_USEDEP}] + dev-python/typer[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] + dev-python/urllib3[${PYTHON_USEDEP}] + sys-apps/portage[${PYTHON_USEDEP}] + ') + sys-apps/gentoo-functions" +PDEPEND="qt5? ( ~app-portage/${PN}-qt-${PV} )" + +PATCHES=( "${FILESDIR}"/"${PN}"-makeopts.patch ) + +src_install() { + emake DESTDIR="${D}"/ install-cli + + python_moduleinto "$(python_get_sitedir)"/"${PN}" + python_domodule src/backend/*.py + + dosym /usr/share/"${PN}"/"${PN}"-cli.py /usr/bin/"${PN}" + keepdir var/lib/"${PN}"/{csv,db} + + dodir etc/"${PN}" + insinto etc/"${PN}" + doins "${FILESDIR}"/"${PN}"-mirrors-amd64.conf + doins "${FILESDIR}"/"${PN}"-mirrors-arm64.conf + + 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 + python_fix_shebang "${ED}"/usr/share/"${PN}"/"${PN}"-cli.py +} + +pkg_postinst() { + # Take care of the etc-update for the user + rm -rf "${EROOT}"/etc/"${PN}"/._cfg* + + # Make sure portage sees the new mirror configuration file + rm -rf "{EROOT}"/etc/"${PN}"/mirrors.conf + + if [[ $(uname -m) == "x86_64" ]] ; then + ln -sf "${EROOT}"/etc/"${PN}"/"${PN}"-mirrors-amd64.conf "${EROOT}"/etc/"${PN}"/mirrors.conf + elif [[ $(uname -m) == "aarch64" ]] ; then + ln -sf "${EROOT}"/etc/"${PN}"/"${PN}"-mirrors-arm64.conf "${EROOT}"/etc/"${PN}"/mirrors.conf + fi +} diff --git a/app-portage/sisyphus/sisyphus-6.2305.0.ebuild b/app-portage/sisyphus/sisyphus-6.2305.0.ebuild deleted file mode 100644 index 1ec80bb1..00000000 --- a/app-portage/sisyphus/sisyphus-6.2305.0.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 2016-2020 Redcore Linux Project -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit eutils python-single-r1 git-r3 - -DESCRIPTION="A simple portage python wrapper which works like other package managers(apt-get/yum/dnf)" -HOMEPAGE="http://redcorelinux.org" - -EGIT_REPO_URI="https://gitlab.com/redcore/sisyphus.git" -EGIT_BRANCH="master" -EGIT_COMMIT="78eca7889aebbc3e7f141f23a41eb9b3b79f3a69" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm64" -IUSE="qt5" - -DEPEND="dev-lang/python[sqlite]" -RDEPEND="${DEPEND} - app-portage/portage-utils - $(python_gen_cond_dep ' - app-portage/gentoolkit[${PYTHON_USEDEP}] - dev-python/animation[${PYTHON_USEDEP}] - dev-python/GitPython[${PYTHON_USEDEP}] - dev-python/typer[${PYTHON_USEDEP}] - dev-python/typing-extensions[${PYTHON_USEDEP}] - dev-python/urllib3[${PYTHON_USEDEP}] - sys-apps/portage[${PYTHON_USEDEP}] - ') - sys-apps/gentoo-functions" -PDEPEND="qt5? ( ~app-portage/${PN}-qt-${PV} )" - -src_install() { - emake DESTDIR="${D}"/ install-cli - - python_moduleinto "$(python_get_sitedir)"/"${PN}" - python_domodule src/backend/*.py - - dosym /usr/share/"${PN}"/"${PN}"-cli.py /usr/bin/"${PN}" - keepdir var/lib/"${PN}"/{csv,db} - - dodir etc/"${PN}" - insinto etc/"${PN}" - 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 - - # enforce the best available python implementation (CLI) - python_setup - python_fix_shebang "${ED}"/usr/share/"${PN}"/"${PN}"-cli.py -} - -pkg_postinst() { - # Take care of the etc-update for the user - rm -rf "${EROOT}"/etc/"${PN}"/._cfg* - - # Make sure portage sees the new mirror configuration file - rm -rf "{EROOT}"/etc/"${PN}"/mirrors.conf - - if [[ $(uname -m) == "x86_64" ]] ; then - ln -sf "${EROOT}"/etc/"${PN}"/"${PN}"-mirrors-amd64.conf "${EROOT}"/etc/"${PN}"/mirrors.conf - elif [[ $(uname -m) == "aarch64" ]] ; then - ln -sf "${EROOT}"/etc/"${PN}"/"${PN}"-mirrors-arm64.conf "${EROOT}"/etc/"${PN}"/mirrors.conf - fi -} diff --git a/metadata/md5-cache/app-portage/sisyphus-6.2305.0 b/metadata/md5-cache/app-portage/sisyphus-6.2305.0 deleted file mode 100644 index c309a1d7..00000000 --- a/metadata/md5-cache/app-portage/sisyphus-6.2305.0 +++ /dev/null @@ -1,16 +0,0 @@ -BDEPEND=>=dev-vcs/git-1.8.2.1[curl] -DEFINED_PHASES=install postinst setup unpack -DEPEND=dev-lang/python[sqlite] -DESCRIPTION=A simple portage python wrapper which works like other package managers(apt-get/yum/dnf) -EAPI=7 -HOMEPAGE=http://redcorelinux.org -INHERIT=eutils 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 ) -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 diff --git a/metadata/md5-cache/app-portage/sisyphus-6.2305.0-r1 b/metadata/md5-cache/app-portage/sisyphus-6.2305.0-r1 new file mode 100644 index 00000000..f5f5563a --- /dev/null +++ b/metadata/md5-cache/app-portage/sisyphus-6.2305.0-r1 @@ -0,0 +1,16 @@ +BDEPEND=>=dev-vcs/git-1.8.2.1[curl] +DEFINED_PHASES=install postinst setup unpack +DEPEND=dev-lang/python[sqlite] +DESCRIPTION=A simple portage python wrapper which works like other package managers(apt-get/yum/dnf) +EAPI=7 +HOMEPAGE=http://redcorelinux.org +INHERIT=eutils 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 ) +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_=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 -- cgit v1.2.3