From 806aa6310fd5da334ddb5ddf39ee1e5670480939 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 26 Nov 2018 11:04:17 +0000 Subject: app-admin/vasile : version bump --- app-admin/vasile/Manifest | 1 - .../vasile/files/nuke-gitlab-switch-to-cgit.patch | 49 --------------- app-admin/vasile/files/switch-to-pagure.patch | 71 ---------------------- app-admin/vasile/vasile-1.1806-r3.ebuild | 55 ----------------- app-admin/vasile/vasile-2.1812.ebuild | 34 +++++++++++ 5 files changed, 34 insertions(+), 176 deletions(-) delete mode 100644 app-admin/vasile/Manifest delete mode 100644 app-admin/vasile/files/nuke-gitlab-switch-to-cgit.patch delete mode 100644 app-admin/vasile/files/switch-to-pagure.patch delete mode 100644 app-admin/vasile/vasile-1.1806-r3.ebuild create mode 100644 app-admin/vasile/vasile-2.1812.ebuild (limited to 'app-admin') diff --git a/app-admin/vasile/Manifest b/app-admin/vasile/Manifest deleted file mode 100644 index 3e334295..00000000 --- a/app-admin/vasile/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST vasile-1.1806.tar.gz 13599 BLAKE2B af29f7c79b6a3f2f12247ec76832945f6b3248549d8a50331a6283fe19810b68ceb8aef2e8c3527d6d8ec25ee86360b0bbb87cb74f40616f25b81f7a2161eeea SHA512 9f9ad8ad63349f576a9a22c13fbf0af2ca6a414d43a48a1d8a45c82df5c8bc0f6e620d9cdb7bbfadd7f3f12de16b60aa123dfbf64bce71a476b128b595ec99c0 diff --git a/app-admin/vasile/files/nuke-gitlab-switch-to-cgit.patch b/app-admin/vasile/files/nuke-gitlab-switch-to-cgit.patch deleted file mode 100644 index f0699cbb..00000000 --- a/app-admin/vasile/files/nuke-gitlab-switch-to-cgit.patch +++ /dev/null @@ -1,49 +0,0 @@ -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/files/switch-to-pagure.patch b/app-admin/vasile/files/switch-to-pagure.patch deleted file mode 100644 index 88cc9fbe..00000000 --- a/app-admin/vasile/files/switch-to-pagure.patch +++ /dev/null @@ -1,71 +0,0 @@ -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-r3.ebuild b/app-admin/vasile/vasile-1.1806-r3.ebuild deleted file mode 100644 index da291438..00000000 --- a/app-admin/vasile/vasile-1.1806-r3.ebuild +++ /dev/null @@ -1,55 +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 - ${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() { - elog "" - elog "We nuked Gitlab due to service unreliability, vasile will use pagure.io from now on" - elog "" - elog "You must reset your current mode using:" - elog "" - elog "vasile --binmode (for binmode)" - elog "vasile --mixedmode (for mixedmode)" - elog "vasile --srcmode (for srcmode)" - elog "" - elog "Before reseting, you may want to backup any of your local changes (mixedmode && srcmode users only)" - elog "" -} - -pkg_postinst() { - chown portage:portage /var/cache/distfiles - chmod 775 /var/cache/distfiles - _migration_warning -} diff --git a/app-admin/vasile/vasile-2.1812.ebuild b/app-admin/vasile/vasile-2.1812.ebuild new file mode 100644 index 00000000..2d3e074e --- /dev/null +++ b/app-admin/vasile/vasile-2.1812.ebuild @@ -0,0 +1,34 @@ +# Copyright 2016-2018 Redcore Linux Project +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils git-r3 + +DESCRIPTION="Versatile Advanced Script for ISO and Latest Enchantments" +HOMEPAGE="https://redcorelinux.org" + +EGIT_REPO_URI="https://pagure.io/redcore/vasile.git" +EGIT_BRANCH="master" +EGIT_COMMIT="1927fc815df4d1373223ac29deba7eb2706a584a" + +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" + +src_install() { + default + dosym ../../usr/bin/"${PN}".sh usr/bin/"${PN}" + keepdir var/cache/packages + keepdir var/cache/distfiles +} -- cgit v1.2.3