From c5b048341b8c29e525648ceb1488f2a4c6c34940 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 21 Jul 2018 20:20:04 +0100 Subject: app-admin/vasile : revision bump (use pagure.io for now, our cgit instance won't play nice with shallow clones) --- app-admin/vasile/files/switch-to-pagure.patch | 71 +++++++++++++++++++++++++++ app-admin/vasile/vasile-1.1806-r1.ebuild | 54 -------------------- app-admin/vasile/vasile-1.1806-r2.ebuild | 55 +++++++++++++++++++++ 3 files changed, 126 insertions(+), 54 deletions(-) create mode 100644 app-admin/vasile/files/switch-to-pagure.patch delete mode 100644 app-admin/vasile/vasile-1.1806-r1.ebuild create mode 100644 app-admin/vasile/vasile-1.1806-r2.ebuild (limited to 'app-admin') diff --git a/app-admin/vasile/files/switch-to-pagure.patch b/app-admin/vasile/files/switch-to-pagure.patch new file mode 100644 index 00000000..88cc9fbe --- /dev/null +++ b/app-admin/vasile/files/switch-to-pagure.patch @@ -0,0 +1,71 @@ +From 9caaa7afc334e87fc46a038ae01516fed0ad0406 Mon Sep 17 00:00:00 2001 +From: V3n3RiX +Date: Jul 21 2018 19:15:53 +0000 +Subject: sadly our cgit doesn't play nice with shallow clones, so switch to pagure.io + + +--- + +diff --git a/src/backend/f_makeiso.sh b/src/backend/f_makeiso.sh +index 936a780..87e6261 100644 +--- a/src/backend/f_makeiso.sh ++++ b/src/backend/f_makeiso.sh +@@ -137,7 +137,7 @@ mkliveimg () { + + cfgbootldr () { + # fetch and install GRUB2 config files +- git clone https://gitlab.com/"$distname"/boot-core.git "$jailbootldrdlpath" ++ git clone https://pagure.io/redcore/boot-core.git "$jailbootldrdlpath" + cp -avx "$jailbootldrcfgpath" "$jailrootpath" + sync + } +diff --git a/src/backend/f_modeswitch.sh b/src/backend/f_modeswitch.sh +index d85f36f..8a40938 100644 +--- a/src/backend/f_modeswitch.sh ++++ b/src/backend/f_modeswitch.sh +@@ -33,7 +33,7 @@ dlmainportfulltree () { + if [ ! -d ""$jailmainportpath"/.git" ] ; then + einfo "I am injecting Gentoo ebuild tree" + cd "$jailmainportpath" && git init > /dev/null 2>&1 +- git remote add origin http://redcorelinux.org/cgit/portage/ ++ git remote add origin https://pagure.io/redcore/portage.git + git pull --depth=1 origin master + git branch -u origin/master master + rm -rf ""$jailmainportpath"/profiles/updates" +@@ -44,7 +44,7 @@ dlmainportmintree () { + if [ ! -d ""$jailmainportpath"/.git" ] ; then + einfo "I am injecting Gentoo ebuild tree" + cd "$jailmainportpath" && git init > /dev/null 2>&1 +- git remote add origin http://redcorelinux.org/cgit/portage/ ++ git remote add origin https://pagure.io/redcore/portage.git + git config core.sparsecheckout true + echo "profiles/*" >> .git/info/sparse-checkout + echo "metadata/*" >> .git/info/sparse-checkout +@@ -59,7 +59,7 @@ dladdonportfulltree () { + if [ ! -d ""$jailaddonportpath"/.git" ] ; then + einfo "I am injecting Redcore ebuild tree" + cd "$jailaddonportpath" && git init > /dev/null 2>&1 +- git remote add origin http://redcorelinux.org/cgit/redcore-desktop/ ++ git remote add origin https://pagure.io/redcore/redcore-desktop.git + git pull --depth=1 origin master + git branch -u origin/master master + fi +@@ -69,7 +69,7 @@ dladdonportmintree () { + if [ ! -d ""$jailaddonportpath"/.git" ] ; then + einfo "I am injecting Redcore ebuild tree" + cd "$jailaddonportpath" && git init > /dev/null 2>&1 +- git remote add origin http://redcorelinux.org/cgit/redcore-desktop/ ++ git remote add origin https://pagure.io/redcore/redcore-desktop.git + git config core.sparsecheckout true + echo "profiles/*" >> .git/info/sparse-checkout + echo "metadata/*" >> .git/info/sparse-checkout +@@ -82,7 +82,7 @@ dladdonportmintree () { + dlportcfgtree () { + pushd /opt > /dev/null 2>&1 + einfo "I am injecting portage configuration" +- git clone http://redcorelinux.org/cgit/redcore-build/ ++ git clone https://pagure.io/redcore/redcore-build.git + popd > /dev/null 2>&1 + } + + diff --git a/app-admin/vasile/vasile-1.1806-r1.ebuild b/app-admin/vasile/vasile-1.1806-r1.ebuild deleted file mode 100644 index 76ecc9d9..00000000 --- a/app-admin/vasile/vasile-1.1806-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 2016-2018 Redcore Linux Project -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils - -DESCRIPTION="Versatile Advanced Script for ISO and Latest Enchantments" -HOMEPAGE="https://redcorelinux.org" -SRC_URI="https://gitlab.com/redcore/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -DEPEND="sys-apps/gentoo-functions" -RDEPEND="${DEPEND} - dev-libs/libisoburn - dev-vcs/git - sys-boot/grub:2 - sys-kernel/dkms - sys-fs/mtools - sys-fs/squashfs-tools" - -PATCHES=( ${FILESDIR}/nuke-gitlab-switch-to-cgit.patch ) - -S=${WORKDIR}/${PN}-v${PV} - -src_install() { - default - dosym ../../usr/bin/"${PN}".sh usr/bin/"${PN}" - dodir var/cache/packages - dodir var/cache/distfiles -} - -_cgit_migration_warning() { - einfo "" - einfo "We nuked Gitlab due to service unreliability, so from now on vasile will use our own git instance" - einfo "" - einfo "You must reset your current mode using:" - einfo "" - einfo "vasile --binmode (for binmode)" - einfo "vasile --mixedmode (for mixedmode)" - einfo "vasile --srcmode (for srcmode)" - einfo "" - einfo "Before reseting, you may want to backup any of your local changes (mixedmode && srcmode users only)" - einfo "" -} - -pkg_postinst() { - chown portage:portage /var/cache/distfiles - chmod 775 /var/cache/distfiles - _cgit_migration_warning -} diff --git a/app-admin/vasile/vasile-1.1806-r2.ebuild b/app-admin/vasile/vasile-1.1806-r2.ebuild new file mode 100644 index 00000000..59f7991c --- /dev/null +++ b/app-admin/vasile/vasile-1.1806-r2.ebuild @@ -0,0 +1,55 @@ +# Copyright 2016-2018 Redcore Linux Project +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils + +DESCRIPTION="Versatile Advanced Script for ISO and Latest Enchantments" +HOMEPAGE="https://redcorelinux.org" +SRC_URI="https://gitlab.com/redcore/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64" +IUSE="" + +DEPEND="sys-apps/gentoo-functions" +RDEPEND="${DEPEND} + dev-libs/libisoburn + dev-vcs/git + sys-boot/grub:2 + sys-kernel/dkms + sys-fs/mtools + sys-fs/squashfs-tools" + +PATCHES=( ${FILESDIR}/nuke-gitlab-switch-to-cgit.patch + ${FILESDIR}/switch-to-pagure.patch ) + +S=${WORKDIR}/${PN}-v${PV} + +src_install() { + default + dosym ../../usr/bin/"${PN}".sh usr/bin/"${PN}" + dodir var/cache/packages + dodir var/cache/distfiles +} + +_migration_warning() { + einfo "" + einfo "We nuked Gitlab due to service unreliability, vasile will use pagure.io from now on" + einfo "" + einfo "You must reset your current mode using:" + einfo "" + einfo "vasile --binmode (for binmode)" + einfo "vasile --mixedmode (for mixedmode)" + einfo "vasile --srcmode (for srcmode)" + einfo "" + einfo "Before reseting, you may want to backup any of your local changes (mixedmode && srcmode users only)" + einfo "" +} + +pkg_postinst() { + chown portage:portage /var/cache/distfiles + chmod 775 /var/cache/distfiles + _migration_warning +} -- cgit v1.2.3