From 03ca07abffcad15007ca2e8d0cd99d4b811c738e Mon Sep 17 00:00:00 2001
From: Riku Voipio <riku.voipio@iki.fi>
Date: Sun, 13 Nov 2016 18:11:41 -0800
Subject: remove scratchbox2 support (closes: #796189)

---
 debian/changelog |  4 ++++
 debootstrap      | 12 +-----------
 debootstrap.8    |  4 +---
 scripts/aequorea |  6 ++----
 scripts/sid      |  6 ++----
 5 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b91569..610514c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 debootstrap (1.0.87) UNRELEASED; urgency=high
 
+  [ Julien Cristau ]
   * Default to split /usr again, as merged-/usr breaks dpkg-shlibdeps
     (closes: #844221).
 
+  [ Riku Voipio ]
+  * remove scratchbox2 support (closes: #796189)
+
  -- Julien Cristau <jcristau@debian.org>  Sun, 13 Nov 2016 08:05:35 -0800
 
 debootstrap (1.0.86) unstable; urgency=high
diff --git a/debootstrap b/debootstrap
index 1d6ddaa..4658e0f 100755
--- a/debootstrap
+++ b/debootstrap
@@ -100,7 +100,7 @@ usage()
                              archive
       --variant=X            use variant X of the bootstrap scripts
                              (currently supported variants: buildd, fakechroot,
-                              scratchbox, minbase)
+                              minbase)
       --merged-usr           make /{bin,sbin,lib}/ symlinks to /usr/
       --keyring=K            check Release files against keyring K
       --no-check-gpg         avoid checking Release file signatures
@@ -464,16 +464,6 @@ fi
 
 if [ "$TARGET" = "/" ]; then
 	CHROOT_CMD=""
-elif doing_variant scratchbox; then
-	for config in ~/.scratchbox2/*/sb2.config;
-	do
-		export `grep ^SBOX_TARGET_ROOT= $config`
-		if [ "x$SBOX_TARGET_ROOT" = "x$TARGET" ]; then
-			SB2_TARGET=$(basename $(dirname $config))
-		fi
-	done
-	[ "x$SB2_TARGET" != "x" ] || error 1 SBOXTARGETREQ "No scratchbox target configured for $TARGET"
-	CHROOT_CMD="sb2 -eR -t $SB2_TARGET"
 else
 	CHROOT_CMD="chroot $TARGET"
 fi
diff --git a/debootstrap.8 b/debootstrap.8
index f39709f..e802003 100644
--- a/debootstrap.8
+++ b/debootstrap.8
@@ -71,15 +71,13 @@ or apt, and that it is far better to specify the entire base system than
 rely on this option.
 With this option set, this behaviour is disabled.
 .IP
-.IP "\fB\-\-variant=minbase|buildd|fakechroot|scratchbox\fP"
+.IP "\fB\-\-variant=minbase|buildd|fakechroot\fP"
 Name of the bootstrap script variant to use.
 Currently, the variants supported are minbase, which only includes
 essential packages and apt; buildd, which installs the build-essential
 packages into
 .IR TARGET ;
 and fakechroot, which installs the packages without root privileges.
-Finally there is variant scratchbox, which is for creating targets
-for scratchbox usage.
 The default, with no \fB\-\-variant=X\fP argument, is to create a base
 Debian installation in
 .IR TARGET .
diff --git a/scripts/aequorea b/scripts/aequorea
index d55eee0..1ae17d8 100644
--- a/scripts/aequorea
+++ b/scripts/aequorea
@@ -1,7 +1,7 @@
 mirror_style release
 download_style apt
 finddebs_style from-indices
-variants - buildd fakechroot minbase scratchbox
+variants - buildd fakechroot minbase
 keyring /usr/share/keyrings/tanglu-archive-keyring.gpg
 default_mirror http://archive.tanglu.org/tanglu
 
@@ -26,7 +26,7 @@ work_out_debs () {
 
 		# we want the Tanglu minimal dependency set to be installed
 		base="$base tanglu-minimal"
-	elif doing_variant buildd || doing_variant scratchbox; then
+	elif doing_variant buildd; then
 		base="apt build-essential"
 	elif doing_variant minbase; then
 		base="apt"
@@ -91,8 +91,6 @@ second_stage_install () {
 
 	if doing_variant fakechroot; then
 		setup_proc_fakechroot
-	elif doing_variant scratchbox; then
-		true
 	else
 		setup_proc
 		in_target /sbin/ldconfig
diff --git a/scripts/sid b/scripts/sid
index 0b289f9..1d96477 100644
--- a/scripts/sid
+++ b/scripts/sid
@@ -1,7 +1,7 @@
 mirror_style release
 download_style apt
 finddebs_style from-indices
-variants - buildd fakechroot minbase scratchbox
+variants - buildd fakechroot minbase
 keyring /usr/share/keyrings/debian-archive-keyring.gpg
 
 if doing_variant fakechroot; then
@@ -22,7 +22,7 @@ work_out_debs () {
 		#required="$required $(get_debs Priority: important)"
 		#  ^^ should be getting debconf here somehow maybe
 		base="$(get_debs Priority: important)"
-	elif doing_variant buildd || doing_variant scratchbox; then
+	elif doing_variant buildd; then
 		base="apt build-essential"
 	elif doing_variant minbase; then
 		base="apt"
@@ -95,8 +95,6 @@ Status: install ok installed" >> "$TARGET/var/lib/dpkg/status"
 
 	if doing_variant fakechroot; then
 		setup_proc_fakechroot
-	elif doing_variant scratchbox; then
-		true
 	else
 		setup_proc
 		in_target /sbin/ldconfig
-- 
cgit v0.12