From ac1890de8ff264caacf0c94de141b8dbad586f5c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 21 Jul 2018 19:41:17 +0100 Subject: app-admin/vasile : revision bump (switch to cgit) --- .../vasile/files/nuke-gitlab-switch-to-cgit.patch | 49 ++++++++++++++++++++ app-admin/vasile/vasile-1.1806-r1.ebuild | 53 ++++++++++++++++++++++ app-admin/vasile/vasile-1.1806.ebuild | 37 --------------- 3 files changed, 102 insertions(+), 37 deletions(-) create mode 100644 app-admin/vasile/files/nuke-gitlab-switch-to-cgit.patch create mode 100644 app-admin/vasile/vasile-1.1806-r1.ebuild delete mode 100644 app-admin/vasile/vasile-1.1806.ebuild diff --git a/app-admin/vasile/files/nuke-gitlab-switch-to-cgit.patch b/app-admin/vasile/files/nuke-gitlab-switch-to-cgit.patch new file mode 100644 index 00000000..f0699cbb --- /dev/null +++ b/app-admin/vasile/files/nuke-gitlab-switch-to-cgit.patch @@ -0,0 +1,49 @@ +diff --git a/src/backend/f_modeswitch.sh b/src/backend/f_modeswitch.sh +index 90d62660fad1afd5e454055d5b4be79ed49d80c1..d85f36fba356caf04d7f985571f60ea8f0503509 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 https://gitlab.com/redcore/portage.git ++ git remote add origin http://redcorelinux.org/cgit/portage/ + 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 https://gitlab.com/redcore/portage.git ++ git remote add origin http://redcorelinux.org/cgit/portage/ + 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 https://gitlab.com/redcore/redcore-desktop.git ++ git remote add origin http://redcorelinux.org/cgit/redcore-desktop/ + 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 https://gitlab.com/redcore/redcore-desktop.git ++ git remote add origin http://redcorelinux.org/cgit/redcore-desktop/ + 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 https://gitlab.com/redcore/redcore-build.git ++ git clone http://redcorelinux.org/cgit/redcore-build/ + 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 new file mode 100644 index 00000000..0f3979ec --- /dev/null +++ b/app-admin/vasile/vasile-1.1806-r1.ebuild @@ -0,0 +1,53 @@ +# 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.ebuild b/app-admin/vasile/vasile-1.1806.ebuild deleted file mode 100644 index de8d14cf..00000000 --- a/app-admin/vasile/vasile-1.1806.ebuild +++ /dev/null @@ -1,37 +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" - -S=${WORKDIR}/${PN}-v${PV} - -src_install() { - default - dosym ../../usr/bin/"${PN}".sh usr/bin/"${PN}" - dodir var/cache/packages - dodir var/cache/distfiles -} - -pkg_postinst() { - chown portage:portage /var/cache/distfiles - chmod 775 /var/cache/distfiles -} -- cgit v1.2.3