sys-apps/calculate-toolkit: migrate to scratch

sys-apps/calculate-toolkit/calculate-toolkit-0.3.1-r2.ebuild

@@ -22,4 +22,5 @@ RDEPEND=">=sys-apps/calculate-utils-3.6
 
 PATCHES=(
 	"${FILESDIR}"/${P}-rmdir.patch
+	"${FILESDIR}"/${P}-scratch.patch
 )

sys-apps/calculate-toolkit/calculate-toolkit-0.3.1.ebuild

@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{9..10} )
-
-SRC_URI="https://git.calculate-linux.org/calculate/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-DESCRIPTION="Collection of administration scripts for Calculate"
-HOMEPAGE="https://www.calculate-linux.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-S=${WORKDIR}/${PN}
-
-RDEPEND=">=sys-apps/calculate-utils-3.6
-	app-arch/zstd
-	app-arch/xz-utils"

sys-apps/calculate-toolkit/files/calculate-toolkit-0.3.1-scratch.patch

@@ -0,0 +1,41 @@
+diff --git a/cl-lxc b/cl-lxc
+index 5dc5f1a..cd411c0 100755
+--- a/cl-lxc
++++ b/cl-lxc
+@@ -37,7 +37,6 @@ print_help(){
+ ${0##*/} installation, configuration and update of an LXC container with Calculate Linux on board
+ 
+ Parameters:
+-  -D, --distro		select distribution flavour ('list' to view all that applies)
+   -c, --create		create new container
+   --path		path to container
+   -p, --prepare		get rootfs ready for update
+@@ -47,6 +46,7 @@ Parameters:
+   -m, --mirror		mirror address
+   -h, --help		show this help page
+ "
++#  -D, --distro		select distribution flavour ('list' to view all that applies)
+ 	else
+ 		echo $usage
+ 	fi
+@@ -255,7 +255,7 @@ set_vars(){
+ 			lxc_distro=$(file $path_work/$lxc_/rootfs$num_cur/etc/portage/make.profile | \
+ 				awk -F '/profiles/' '{ print $2 }' | awk -F '/' '{ print $1 }')
+ 		else
+-			lxc_distro=CCS
++			lxc_distro=scratch
+ 		fi
+ 		;;
+ 	*)
+@@ -368,8 +368,10 @@ create_base() {
+ 			mkdir $path_cache
+ 		fi
+ 	fi
++
+ 	lxc-create -n $lxc_distro -t download -- --server $mirror_ \
+-			--arch x86_64 --dist $lxc_distro --release $lxc_release &>/dev/null || {
++			--arch x86_64 --dist $lxc_distro --release live \
++			2>>/var/log/calculate/cl-lxc-error.log >/dev/null || {
+ 		eend $? || true
+ 		eerror $"Failed to run lxc-create" >&2
+ 		rm -rf $path_cache