From 416237c761687996bdf28a3e7ab55453d1a2ba5d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 28 Feb 2012 18:16:32 +0100
Subject: [PATCH] BOOTSTRAP_PKG_REBUILD is no more.

---
 srcpkgs/base-chroot/template         | 55 +++++++++++++---------------
 srcpkgs/busybox/template             |  6 +--
 srcpkgs/gmp/template                 |  5 ---
 srcpkgs/kernel-libc-headers/template |  2 +-
 srcpkgs/mpfr/template                |  4 --
 srcpkgs/ppl/template                 |  5 ---
 srcpkgs/zlib/template                |  4 --
 7 files changed, 28 insertions(+), 53 deletions(-)

diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index ec614514044..dc4c5bcb310 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -1,44 +1,41 @@
-# Template file for 'ase-chroot'
+# Template file for 'base-chroot'
 pkgname=base-chroot
-version=0.26
+version=0.27
 build_style=meta-template
+homepage="http://code.google.com/p/xbps"
 short_desc="Bootstrap packages for xbps-src"
 maintainer="Juan RP <xtraeme@gmail.com>"
+license="Public domain"
 long_desc="
  This package installs all necessary packages to be able to build packages
- inside of a chroot with xbps-src and continue installing them."
+ inside of a chroot with xbps-src."
 
-replaces="xbps-base-chroot>=0"
 noarch=yes
 bootstrap=yes
 
 Add_dependency full xbps-triggers
 Add_dependency full base-files
-Add_dependency full ncurses-devel
-Add_dependency full bash
-Add_dependency full patch
-Add_dependency full diffutils
-Add_dependency full make
-Add_dependency full zlib-devel
-Add_dependency full gzip
-Add_dependency full bzip2-devel
-Add_dependency full file		">=0"
-Add_dependency full tar
-Add_dependency full texinfo
+Add_dependency full chroot-patch
+Add_dependency full chroot-bash
 Add_dependency full chroot-grep
 Add_dependency full chroot-coreutils
-Add_dependency full ccache
-Add_dependency full gmp-devel
-Add_dependency full mpfr-devel
-Add_dependency full mpc-devel
-Add_dependency full ppl-devel
-Add_dependency full cloog-ppl-devel
-Add_dependency full libelf-devel
-Add_dependency full m4
-Add_dependency full gcc-c++		">=0"
+Add_dependency full chroot-diffutils
+Add_dependency full chroot-gettext
+Add_dependency full chroot-texinfo
+Add_dependency full chroot-sed
+Add_dependency full chroot-gawk
+Add_dependency full chroot-findutils
+Add_dependency full chroot-make
+Add_dependency full chroot-gzip
+Add_dependency full chroot-bzip2
+Add_dependency full chroot-file
+Add_dependency full chroot-tar
+Add_dependency full chroot-m4
+Add_dependency full chroot-xz
+Add_dependency full chroot-fakeroot
 Add_dependency full kernel-libc-headers
-Add_dependency full glibc-devel		">=0"
-Add_dependency full liblzma-devel
-Add_dependency full xz			">=0"
-Add_dependency full busybox
-Add_dependency full fakeroot
+Add_dependency full chroot-binutils
+Add_dependency full mpfr
+Add_dependency full chroot-gcc
+Add_dependency full chroot-glibc
+Add_dependency full ccache
diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template
index b02410283ad..589f403af68 100644
--- a/srcpkgs/busybox/template
+++ b/srcpkgs/busybox/template
@@ -17,11 +17,7 @@ long_desc="
  very much like their GNU counterparts. BusyBox provides a fairly complete
  environment for any small or embedded system."
 
-bootstrap=yes
-
-if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
-	Add_dependency build perl ">=0"
-fi
+Add_dependency build perl ">=0"
 
 do_build() {
 	cp -f ${FILESDIR}/dotconfig .config
diff --git a/srcpkgs/gmp/template b/srcpkgs/gmp/template
index 635f2eb8390..37b98346111 100644
--- a/srcpkgs/gmp/template
+++ b/srcpkgs/gmp/template
@@ -32,11 +32,6 @@ long_desc="
 
 bootstrap=yes
 subpackages="gmp-devel"
-Add_dependency build m4
-
-if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
-	Add_dependency build gettext
-fi
 
 post_install() {
 	# Required for multilib build.
diff --git a/srcpkgs/kernel-libc-headers/template b/srcpkgs/kernel-libc-headers/template
index f6af11a2afd..f6545881e22 100644
--- a/srcpkgs/kernel-libc-headers/template
+++ b/srcpkgs/kernel-libc-headers/template
@@ -15,7 +15,7 @@ bootstrap=yes
 nostrip=yes
 noverifyrdeps=yes
 
-if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
+if [ -n "$IN_CHROOT" ]; then
 	Add_dependency build perl ">=0"
 fi
 
diff --git a/srcpkgs/mpfr/template b/srcpkgs/mpfr/template
index a5762a8bc8a..24d8ef03910 100644
--- a/srcpkgs/mpfr/template
+++ b/srcpkgs/mpfr/template
@@ -21,7 +21,3 @@ long_desc="
 bootstrap=yes
 subpackages="$pkgname-devel"
 Add_dependency build gmp-devel
-
-if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
-	Add_dependency build gettext
-fi
diff --git a/srcpkgs/ppl/template b/srcpkgs/ppl/template
index 045762f19e3..87d52bbccfb 100644
--- a/srcpkgs/ppl/template
+++ b/srcpkgs/ppl/template
@@ -23,15 +23,10 @@ long_desc="
  exact-arithmetic version of the simplex algorithm."
 
 disable_parallel_build=yes
-bootstrap=yes
 subpackages="ppl-devel"
 
 Add_dependency build gmp-devel
 
-if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
-	Add_dependency build m4
-fi
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/share/doc
 }
diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index 15621ce3355..3d644d6f279 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -21,7 +21,3 @@ long_desc="
 
 bootstrap=yes
 subpackages="zlib-devel"
-
-if [ "$BOOTSTRAP_PKG_REBUILD" ]; then
-	Add_dependency build coreutils
-fi