summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-portage/sisyphus-qt/sisyphus-qt-4.2107.0.ebuild (renamed from app-portage/sisyphus-qt/sisyphus-qt-4.2103.0-r2.ebuild)2
-rw-r--r--app-portage/sisyphus/files/sisyphus-mirrors-amd64.conf (renamed from app-portage/sisyphus/files/mirrors.conf)16
-rw-r--r--app-portage/sisyphus/files/sisyphus-mirrors-arm64.conf33
-rw-r--r--app-portage/sisyphus/sisyphus-4.2107.0.ebuild (renamed from app-portage/sisyphus/sisyphus-4.2103.0-r2.ebuild)40
4 files changed, 62 insertions, 29 deletions
diff --git a/app-portage/sisyphus-qt/sisyphus-qt-4.2103.0-r2.ebuild b/app-portage/sisyphus-qt/sisyphus-qt-4.2107.0.ebuild
index ab51ba85..3cacd132 100644
--- a/app-portage/sisyphus-qt/sisyphus-qt-4.2103.0-r2.ebuild
+++ b/app-portage/sisyphus-qt/sisyphus-qt-4.2107.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://redcorelinux.org"
EGIT_REPO_URI="https://gitlab.com/redcore/sisyphus.git"
EGIT_BRANCH="master"
-EGIT_COMMIT="5ef298d50edc3c2d7f90150afd3a711a8c3cae68"
+EGIT_COMMIT="687968f9375def610d8730610dc48291346061a6"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-portage/sisyphus/files/mirrors.conf b/app-portage/sisyphus/files/sisyphus-mirrors-amd64.conf
index 4b4e9539..61802137 100644
--- a/app-portage/sisyphus/files/mirrors.conf
+++ b/app-portage/sisyphus/files/sisyphus-mirrors-amd64.conf
@@ -9,25 +9,25 @@
#######################################################
# Main repository - stable
-# PORTAGE_BINHOST="http://mirrors.redcorelinux.org/redcorelinux/packages/"
+# PORTAGE_BINHOST="http://mirrors.redcorelinux.org/redcorelinux/amd64/packages/"
# Main repository - testing
-# PORTAGE_BINHOST="http://mirrors.redcorelinux.org/redcorelinux/packages-next/"
+# PORTAGE_BINHOST="http://mirrors.redcorelinux.org/redcorelinux/amd64/packages-next/"
# Princeton University (USA) mirror - stable
-PORTAGE_BINHOST="http://mirror.math.princeton.edu/pub/redcorelinux/packages/"
+PORTAGE_BINHOST="http://mirror.math.princeton.edu/pub/redcorelinux/amd64/packages/"
# Princeton University (USA) mirror - testing
-# PORTAGE_BINHOST="http://mirror.math.princeton.edu/pub/redcorelinux/packages-next/"
+# PORTAGE_BINHOST="http://mirror.math.princeton.edu/pub/redcorelinux/amd64/packages-next/"
# Alpix.eu (Germany) mirror - stable
-# PORTAGE_BINHOST="http://mirror.alpix.eu/redcorelinux/packages/"
+# PORTAGE_BINHOST="http://mirror.alpix.eu/redcorelinux/amd64/packages/"
# Alpix.eu (Germany) mirror - testing
-# PORTAGE_BINHOST="http://mirror.alpix.eu/redcorelinux/packages-next/"
+# PORTAGE_BINHOST="http://mirror.alpix.eu/redcorelinux/amd64/packages-next/"
# Yandex.ru (Russia) mirror - stable
-# PORTAGE_BINHOST="http://mirror.yandex.ru/mirrors/redcorelinux/packages/"
+# PORTAGE_BINHOST="http://mirror.yandex.ru/mirrors/redcorelinux/amd64/packages/"
# Yandex.ru (Russia) mirror - testing
-# PORTAGE_BINHOST="http://mirror.yandex.ru/mirrors/redcorelinux/packages-next/"
+# PORTAGE_BINHOST="http://mirror.yandex.ru/mirrors/redcorelinux/amd64/packages-next/"
diff --git a/app-portage/sisyphus/files/sisyphus-mirrors-arm64.conf b/app-portage/sisyphus/files/sisyphus-mirrors-arm64.conf
new file mode 100644
index 00000000..d5010070
--- /dev/null
+++ b/app-portage/sisyphus/files/sisyphus-mirrors-arm64.conf
@@ -0,0 +1,33 @@
+#######################################################
+# Support for multiple mirrors is somewhat incomplete #
+#######################################################
+# Please avoid using the Main Repository #
+# http://mirrors.redcorelinux.org/redcorelinux #
+# as the bandwidth is limited, use mirrors instead #
+#######################################################
+# Uncomment only one mirror from the list bellow #
+#######################################################
+
+# Main repository - stable
+# PORTAGE_BINHOST="http://mirrors.redcorelinux.org/redcorelinux/arm64/packages/"
+
+# Main repository - testing
+# PORTAGE_BINHOST="http://mirrors.redcorelinux.org/redcorelinux/arm64/packages-next/"
+
+# Princeton University (USA) mirror - stable
+PORTAGE_BINHOST="http://mirror.math.princeton.edu/pub/redcorelinux/arm64/packages/"
+
+# Princeton University (USA) mirror - testing
+# PORTAGE_BINHOST="http://mirror.math.princeton.edu/pub/redcorelinux/arm64/packages-next/"
+
+# Alpix.eu (Germany) mirror - stable
+# PORTAGE_BINHOST="http://mirror.alpix.eu/redcorelinux/arm64/packages/"
+
+# Alpix.eu (Germany) mirror - testing
+# PORTAGE_BINHOST="http://mirror.alpix.eu/redcorelinux/arm64/packages-next/"
+
+# Yandex.ru (Russia) mirror - stable
+# PORTAGE_BINHOST="http://mirror.yandex.ru/mirrors/redcorelinux/arm64/packages/"
+
+# Yandex.ru (Russia) mirror - testing
+# PORTAGE_BINHOST="http://mirror.yandex.ru/mirrors/redcorelinux/arm64/packages-next/"
diff --git a/app-portage/sisyphus/sisyphus-4.2103.0-r2.ebuild b/app-portage/sisyphus/sisyphus-4.2107.0.ebuild
index 59655534..2026ad87 100644
--- a/app-portage/sisyphus/sisyphus-4.2103.0-r2.ebuild
+++ b/app-portage/sisyphus/sisyphus-4.2107.0.ebuild
@@ -12,11 +12,11 @@ HOMEPAGE="http://redcorelinux.org"
EGIT_REPO_URI="https://gitlab.com/redcore/sisyphus.git"
EGIT_BRANCH="master"
-EGIT_COMMIT="5ef298d50edc3c2d7f90150afd3a711a8c3cae68"
+EGIT_COMMIT="687968f9375def610d8730610dc48291346061a6"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 arm64"
IUSE="qt5"
DEPEND="dev-lang/python[sqlite]"
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}
sys-apps/portage[${PYTHON_MULTI_USEDEP}]
')
sys-apps/gentoo-functions"
-PDEPEND="qt5? ( ~app-portage/sisyphus-qt-${PV} )"
+PDEPEND="qt5? ( ~app-portage/${PN}-qt-${PV} )"
src_install() {
emake DESTDIR="${D}" install-cli
@@ -45,16 +45,17 @@ src_install() {
dodir etc/"${PN}"
insinto etc/"${PN}"
- doins "${FILESDIR}"/mirrors.conf
+ doins "${FILESDIR}"/"${PN}"-mirrors-amd64.conf
+ doins "${FILESDIR}"/"${PN}"-mirrors-arm64.conf
- doins "${FILESDIR}"/sisyphus-custom.env.conf
- doins "${FILESDIR}"/sisyphus-custom.make.conf
- doins "${FILESDIR}"/sisyphus-custom.package.accept_keywords
- doins "${FILESDIR}"/sisyphus-custom.package.env
- doins "${FILESDIR}"/sisyphus-custom.package.license
- doins "${FILESDIR}"/sisyphus-custom.package.mask
- doins "${FILESDIR}"/sisyphus-custom.package.unmask
- doins "${FILESDIR}"/sisyphus-custom.package.use
+ doins "${FILESDIR}"/"${PN}"-custom.env.conf
+ doins "${FILESDIR}"/"${PN}"-custom.make.conf
+ doins "${FILESDIR}"/"${PN}"-custom.package.accept_keywords
+ doins "${FILESDIR}"/"${PN}"-custom.package.env
+ doins "${FILESDIR}"/"${PN}"-custom.package.license
+ doins "${FILESDIR}"/"${PN}"-custom.package.mask
+ doins "${FILESDIR}"/"${PN}"-custom.package.unmask
+ doins "${FILESDIR}"/"${PN}"-custom.package.use
# enforce the best available python implementation (CLI)
python_setup
@@ -63,13 +64,12 @@ src_install() {
pkg_postinst() {
# Take care of the etc-update for the user
- if [ -e "${EROOT}"etc/"${PN}"/._cfg0000_mirrors.conf ] ; then
- rm -rf "${EROOT}"etc/._cfg0000_mirros.conf
- fi
+ rm -rf "${EROOT}"etc/"${PN}"/._cfg*
+
+ # Maintain backward compat with old mirrors file
+ rm -rf "{EROOT}"etc/"${PN}"/mirrors.conf
- for i in sisyphus-custom.{env.conf,make.conf,package.{accept_keywords,env,license,mask,unmask,use}}; do
- if [ -e "${EROOT}"etc/"${PN}"/._cfg000_"$i" ] ; then
- rm -rf "${EROOT}"etc/"${PN}"/._cfg000_"$i"
- fi
- done
+ if ARCH='amd64'; then
+ ln -sf "${EROOT}"etc/"${PN}"/"${PN}"-mirrors-amd64.conf "${EROOT}"etc/"${PN}"/mirrors.conf
+ fi
}