Bump to latest upstream, remove old

Package-Manager: portage-2.2.0_alpha27_p2/cvs/Linux i686

9 files changed, 43 insertions, 778 deletions

diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog
index 94cabeaa600d..eb51c69679b1 100644
--- a/dev-util/schroot/ChangeLog
+++ b/dev-util/schroot/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/schroot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.25 2011/01/25 15:15:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.26 2011/03/22 06:56:01 abcd Exp $
+
+*schroot-1.4.21 (22 Mar 2011)
+
+  22 Mar 2011; Jonathan Callen <abcd@gentoo.org> -schroot-1.2.3-r4.ebuild,
+  -files/schroot-1.2.3-autotools.patch, -files/schroot-1.2.3-tests.patch,
+  -files/schroot-1.4.0-tests.patch, -schroot-1.4.3.ebuild,
+  -schroot-1.4.7.ebuild, -schroot-1.4.13.ebuild, +schroot-1.4.21.ebuild:
+  Bump to latest upstream, remove old
 
   25 Jan 2011; Markos Chandras <hwoarang@gentoo.org> schroot-1.4.14.ebuild:
   Stable on amd64 wrt bug #344615
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 271f0524e3e0..9a2168e18359 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,41 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX schroot-1.2.3-autotools.patch 4432 RMD160 1ecd6ff54c4a24ff311ed44fbecd231b0aa3c8bf SHA1 931533d5451c974fc961b5d57c06d082bb46e9d2 SHA256 5aa0984dd93441c28ba790d7dcad762f77ebc35ea05238f47ad73adc9de79c19
-AUX schroot-1.2.3-tests.patch 3731 RMD160 0cb5ccf9f4cc526c7c80fe2fc3b0faa2d3e2ddbb SHA1 78d28c87f42f292434c2ec99029c98ec4ad26b26 SHA256 901c9d33b492c7a6d3cd75cebcc898985bf32563a5dde6fdafcd8df7168200e6
-AUX schroot-1.4.0-tests.patch 2429 RMD160 521c205666cea13d3f8947a4e7acbbbb3cbb4a8d SHA1 5dda3514d0aca878e54017458ecf90b6a2565df3 SHA256 f33d497b38c6c4a4583bf4bca79cce7045ecce6d8dad5dde98a5b8f01dd8b9b5
 AUX schroot-1.4.14-debug.patch 971 RMD160 a40febfbbdfd234f67d2dae0d8557706de8b17b1 SHA1 457efbfbe3ec22176856c47cfff2948fd255c03b SHA256 4fcdf2e236e136f8aafe6bafd4270bfda98789bb0d21f815ead1a7164ea1d643
 AUX schroot-1.4.7-tests.patch 2427 RMD160 0e10f31a46d4d828b1a1a52159f88db26afe939b SHA1 084c9a470f816086ace6345bdd13bc4d1e8ea2c5 SHA256 32e6aaea6a3646515040892d6e942ec7509219d5f7a87572f75a76caf89d0146
 AUX schroot.confd 371 RMD160 d7efa36975f549304a1e8a942f6389720d1bff88 SHA1 3eaf672a13c6dd4fadd01b7c1c54bc82f71d5b93 SHA256 68efa89cd4b358c6de050ebb5b973c87ee514fe5e5d888f63aa0af85aa4736c8
 AUX schroot.initd 705 RMD160 efdb102d21137a72b20fef8882e2b15ba7dabfc6 SHA1 d585fba4d92dc6d94275e079046e4ce821183b6b SHA256 8f8537c0c6c93d1169c8a333ddd78c4471d95956cfb187e3bd6612a4ad9f78f5
-DIST schroot_1.2.3.orig.tar.gz 25486414 RMD160 2c8c4bb92c870a6c0514df528d13f73b8f1b6d05 SHA1 1775aa19e3cb3237d8aa3cc36e3382d7e2c2919b SHA256 c3bca449abdf28b66f6aede8892ce61967b5c1d758ba567e8648ccfb0cf914ec
-DIST schroot_1.4.13.orig.tar.gz 1102800 RMD160 fc066c5f22d654926e17bfd5919616936ba3b5f1 SHA1 3401b4c93836f0fdd6714c3011f68731bcbf4379 SHA256 b8761d5433d18e00b99560a1012961388209eae0c26851e35fda15ec6ba7357b
 DIST schroot_1.4.14.orig.tar.gz 1109550 RMD160 b50b71c6642148785ef63c428f412ec98baf323d SHA1 1268cdd0985c67cfe7fd88537fe2fbfe11853290 SHA256 f7e05924f12b10f4bf4d19b08b7eca21411a8b66fa18c9793c18de853525b76c
 DIST schroot_1.4.17.orig.tar.bz2 773664 RMD160 f414762447e388cdd37a76a3211cd40a9c2c1576 SHA1 f52d126d6d284a6a5af3111293b7350a50a08e9b SHA256 d924cadcb0b7b20ca14a5edb0e3f0a841a4386d59e39417824b6fd139d70f167
-DIST schroot_1.4.3.orig.tar.gz 1054282 RMD160 3c1f997c3abe67f5339e6afd2dda29975759b9ff SHA1 966b66c83379b38fb589cb6be3ad40bd0a2f0c85 SHA256 890317530a1f8e2de2f1cce335f520dd4e35472ad520fddf809013fb6cc5e9a5
-DIST schroot_1.4.7.orig.tar.gz 1076220 RMD160 74b3a5f495ece0943d1c313c29e8b47d7d715a03 SHA1 86acc99789b4da85762eb478e55e8a5266eedc42 SHA256 d0c7292ef12800cdec39cc0ddf1520c5d115571b95fa193c354018a0da369f67
-EBUILD schroot-1.2.3-r4.ebuild 2151 RMD160 01379f16274370ede81a36db68a295564ddfeb3d SHA1 c3c6e1679ae91f6cdac3a76407db8eda36e16a87 SHA256 74426b94619c43dd935d39b284b123527ba2037b6f676276e14c54534800ba00
-EBUILD schroot-1.4.13.ebuild 4812 RMD160 c23f29a074aadf04f9f8c6b33b00aa356271bca7 SHA1 ac225400aa410a3f2f77010d77413dd1f42758ca SHA256 b5a0e919d96ea5b1fe50d95c40e3fa205828f258b16ffb4032ec85626237ea64
+DIST schroot_1.4.21.orig.tar.bz2 791504 RMD160 759c4881a8502d9b4b513c2e6cd668d4bd486178 SHA1 a17da5776af1bf96f427185fd80db1b66b94774a SHA256 a9fd91ce60b239368b91817254c8819e8c1f8730853016627967cb29307b8d88
 EBUILD schroot-1.4.14.ebuild 4910 RMD160 7284ccb6dc886830f26370067ea3fdff8f8e5901 SHA1 c76956451ed5470b30f9aa1eeca6f12d975916f7 SHA256 ab6b07f0d368a8e2c1a9ef6b53cc8405facce17b1f81e55e1ee578eccbb49758
 EBUILD schroot-1.4.17.ebuild 4917 RMD160 86e866ac32ed6372e7b5ffa2a6916e0a1cb5047c SHA1 6cf38860d81a834ecd77e663d324f4ffa127a2fa SHA256 9aa054539c549c06d500119d17a080614420e05e166665e7d3f46525dc11d6b6
-EBUILD schroot-1.4.3.ebuild 4607 RMD160 c8c950ee3171e4f88dfa6e5c77c8b547342b5877 SHA1 b01bcb6e8a9d0f94a344dbbb049a0591b93fc570 SHA256 2622bc4b1ad6827226fcc849095bb39a72070b1806c123012a4dea5acbd045e0
-EBUILD schroot-1.4.7.ebuild 4804 RMD160 de2f6ff5b6e78bb3e348f381af81762e7a0fdd35 SHA1 bee890eee1b815ad2927ad99f3bdab98a7e259cd SHA256 52008e82b50f732cb5b3270034612abdd1149a03df4ecfeac4008a69547a738a
-MISC ChangeLog 4460 RMD160 e113126aa24ad8dba75144faa83f87023873c9dc SHA1 a7dd25b2db73136feed79cfc9a2a1b97affe2ee9 SHA256 11e8e50f1c390ac6c607ac4cc36e9b0f26aaf045cae54b255f2b6449feee329a
+EBUILD schroot-1.4.21.ebuild 4518 RMD160 8a0644d577df0cc8c17d10149b85107dd8bfb692 SHA1 4736da3a7a9625e28b74a566b75939a86cc2a5b7 SHA256 85486920c43099a262734dba3fdbc86caf2ef839ca801bb02dc9b2926dc661a0
+MISC ChangeLog 4807 RMD160 6c2a49a396bb23d1a2bda5e34a8d5c47161beb0a SHA1 d253616be674502943be7fef081a8062e4f80109 SHA256 206d5910db04df7b49d5775254626e154e1935ca9bff19064e226059fd004eb2
 MISC metadata.xml 536 RMD160 216dabacb867bfb76a5de001768c8fd6dd0e4401 SHA1 7bd2448091a7764c4d3f9958b51535d7208e9d7c SHA256 f849ea1dea313c749313505363350d321435336c5ae2c3952dbcd1d7e0fc29ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNPujcAAoJEPqDWhW0r/LC/JMP/18K4UFAtTzrSiBJ6CpIwYRR
-RoJjAEQJuA6ZN1i2Q5xPApW589w5epedROGjLUZ7iiI7s+QZHPd/PMSCJgx8QzPG
-J6oBDOppVD2zrHVMiHqApdmE6iqWw6HgQzcVy4lHg8P+OODLCHNYhUetfNl3vTs3
-56meWCAMsYU6hx4Nqm8MhpQkXuz/0gJueryyjGTWYUTerbu4KQJYwm0E3l/cOYQL
-fBmrBWuqnIoC4h4L9oo1Ykq0JhgdCPLnNkt0rO5NZ3qECxZcCxlh3lKSMxXgtTTd
-jSE4y9SjTDXKcb01nthPEm1ouWBCc7+1MXaQDex077icYdMe9eV5MddfLc0A3PkH
-3cbMK4J4NRQG3zjnijwrJajYAMbcwTCi2cKzWRnAZZD73M50WnfB9sQ4C+UB0hP3
-XYvrNsNsdJkdRj5m/KZdYTVQYlKC3zI6OvkxYZB5GhRpR1T6tXvhcHwLFgxeMkDy
-JF1lR9Yg8vYFLD8qfZ4kNSXjjXsS+p0djnzmr5olcGPRJZG617bfPGk4aXfATfds
-99sfjZLGoClx+ZoFTa+sYL5tfWiL70owVu2ndWW8CxGIYsodvHMdF5jmC61yMC6i
-pfbIp2CeG9j9alIKR3POlRSs5QXywQ/PEam2OUXtDqRZt76UMnLDqHm+lqSM9pSX
-uqoh2UF5SxZQ+KRDf/av
-=+GCm
+iQIcBAEBCAAGBQJNiEgOAAoJELHSF2kinlg4KHsP/3uAkFFi8mKu7r23317knsOG
+46nUWmcll9GNFDctjiQRjttEvAUHo/UwU0kPN9vkbU4nHLbW+zlSx+39fzuZjLBf
+cYVd/5jacj0TzqPXBwM3sdbUnBz2avKYy3kUvrMUXZ0S9Feml4CPe0NfxD5fAvJs
+DwzHxRif7Y1N36xcd7wvfGaWitKsogscnZW5YqFslzXdRmVDx5rLrtdYmcnntTdr
+qj0W0i85g7AmWZfO0lOKFfkpZ/arCeXfOBuvQuuqMOMJwIEt4aMP7WuEBzlKBe80
+4+gYc8nudot0/k0F5g2ETvSBmE1SfK68yeua475DbD/0Is14LbDT3pPghLVvzB/E
+j7Ms3QxGAt/tvWTqGIA9TErxQ5uKLzBC3WauzyiTCKytBaNfiwWdNgNACCTc16YV
+BJ/DeES1Jw+G2OJ9hexotHENOgx3bQgWHmd2fkJgs3lQiJEqkOhsDLenPjI+akkM
+6d4k/wChpI9/MSw2ZDW2+74nt6CWzBor+S6hjXlCbhANdJjzH3BHrkSg5zYwGLFl
+wbRvaAer7/guxfBrbiByWcgMOJetEqaPOhGwdByN6sthhEmqtHyP0FuteTzwmZkG
+NFc/AWRYwPlQrXeD2N6EcdyKoRn4RLpFtCxZCo3SdE0bMVRP3l/QC9QN9qvAwKoZ
+md3As1SSt1/9YbWQUP0i
+=8ySF
 -----END PGP SIGNATURE-----
diff --git a/dev-util/schroot/files/schroot-1.2.3-autotools.patch b/dev-util/schroot/files/schroot-1.2.3-autotools.patch
deleted file mode 100644
index f672864e574e..000000000000
--- a/dev-util/schroot/files/schroot-1.2.3-autotools.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Fixes QA issues in configure.ac
-  Removes automagic dependency on cppunit, and instead only builds tests
-  when --enable-test is passed in.
-  uses LIBS instead of LDFLAGS for linking libraries. Needed for building
-  with --as-needed
-
-Contributed by Nick Fortino (nfortino@gmail.com) 2/2/2009
-
-Updated by Jonathan Callen <abcd@gentoo.org> 2009-09-11
-
---- schroot-1.2.3.orig/configure.ac
-+++ schroot-1.2.3/configure.ac
-@@ -174,6 +174,15 @@ if test "$enable_debug" = "yes"; then
-   AC_DEFINE_UNQUOTED([SBUILD_DEBUG], [1], [Enable debugging])
- fi
- 
-+AC_ARG_ENABLE([test], [AS_HELP_STRING([--enable-test], [Build unit tests])],
-+              [ case "${enableval}" in
-+                yes) enable_test="yes" ;;
-+                no)  enable_test="no" ;;
-+                unset)  enable_test="no" ;;
-+                *) AC_MSG_RESULT([unknown])
-+                   AC_MSG_ERROR([bad value ${enableval} for --enable-test]) ;;
-+                esac])
-+
- # Checks for programs.
- AC_PROG_CXX
- AC_LANG([C++])
-@@ -195,7 +204,10 @@ PKG_CHECK_MODULES([UUID], [uuid],
- 		   HAVE_UUID=true],
-                   [HAVE_UUID=false])
- 
-+AS_IF([test "$enable_test" = "yes"], [
- AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=true])
-+])
-+
- AM_CONDITIONAL([USE_UNIT_TESTS], [test -n "$HAVE_CPPUNIT"])
- 
- SCHROOT_CFLAGS="$UUID_CFLAGS"
-@@ -240,19 +252,19 @@ AC_CHECK_LIB([lockdev], [dev_lock],
- AC_SUBST([LOCKDEV_LIBS])
- 
- AC_MSG_CHECKING([for boost::program_options::variables_map in -lboost_program_options-mt])
--saved_ldflags="${LDFLAGS}"
--LDFLAGS="${LDFLAGS} -lboost_program_options-mt"
-+saved_LIBS="${LIBS}"
-+LIBS="${LIBS} -lboost_program_options-mt"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/program_options.hpp>],
-                                [boost::program_options::variables_map::variables_map dummy()])],
-                [AC_MSG_RESULT([yes])
- 	        BOOST_LIBS="${BOOST_LIBS} -lboost_program_options-mt"],
-                [AC_MSG_RESULT([no])
- 	        AC_MSG_FAILURE([libboost_program_options (Boost C++ Libraries) is not installed, but is required by schroot])])
--LDFLAGS="${saved_ldflags}"
-+LIBS="${saved_LIBS}"
- 
- AC_MSG_CHECKING([for boost::program_options::options_description::options() in -lboost_program_options-mt])
--saved_ldflags="${LDFLAGS}"
--LDFLAGS="${LDFLAGS} -lboost_program_options-mt"
-+saved_LIBS="${LIBS}"
-+LIBS="${LIBS} -lboost_program_options-mt"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/program_options.hpp>],
-                                [boost::program_options::options_description testgrp("test group");
-                                 bool notused = testgrp.options().empty();
-@@ -261,33 +273,33 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([#includ
-                 BOOST_PROGRAM_OPTIONS_DESCRIPTION_METHODS="current"],
-                [AC_MSG_RESULT([no])
-                 BOOST_PROGRAM_OPTIONS_DESCRIPTION_METHODS="old"])
--LDFLAGS="${saved_ldflags}"
-+LIBS="${saved_LIBS}"
- AH_TEMPLATE(BOOST_PROGRAM_OPTIONS_DESCRIPTION_OLD, [Set if boost::program_options::options_description::options() is not available])
- if test "$BOOST_PROGRAM_OPTIONS_DESCRIPTION_METHODS" = "old"; then
-   AC_DEFINE(BOOST_PROGRAM_OPTIONS_DESCRIPTION_OLD, 1)
- fi
- 
- AC_MSG_CHECKING([for boost::regex in -lboost_regex-mt])
--saved_ldflags="${LDFLAGS}"
--LDFLAGS="${LDFLAGS} -lboost_regex-mt"
-+saved_LIBS="${LIBS}"
-+LIBS="${LIBS} -lboost_regex-mt"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/regex.hpp>],
-                                [boost::regex("^foo[bar]$")])],
-                [AC_MSG_RESULT([yes])
- 	        BOOST_LIBS="${BOOST_LIBS} -lboost_regex-mt"],
-                [AC_MSG_RESULT([no])
- 	        AC_MSG_FAILURE([libboost_regex (Boost C++ Libraries) is not installed, but is required by schroot])])
--LDFLAGS="${saved_ldflags}"
-+LIBS="${saved_LIBS}"
- 
- AC_MSG_CHECKING([for boost::filesystem in -lboost_filesystem-mt])
--saved_ldflags="${LDFLAGS}"
--LDFLAGS="${LDFLAGS} -lboost_filesystem-mt"
-+saved_LIBS="${LIBS}"
-+LIBS="${LIBS} -lboost_filesystem-mt"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/filesystem.hpp>],
-                                [boost::filesystem::is_directory("/")])],
-                [AC_MSG_RESULT([yes])
- 	        BOOST_LIBS="${BOOST_LIBS} -lboost_filesystem-mt"],
-                [AC_MSG_RESULT([no])
- 	        AC_MSG_FAILURE([libboost_filesystem (Boost C++ Libraries) is not installed, but is required by schroot])])
--LDFLAGS="${saved_ldflags}"
-+LIBS="${saved_LIBS}"
- 
- AC_SUBST([BOOST_LIBS])
- 
diff --git a/dev-util/schroot/files/schroot-1.2.3-tests.patch b/dev-util/schroot/files/schroot-1.2.3-tests.patch
deleted file mode 100644
index 6c9dff970d62..000000000000
--- a/dev-util/schroot/files/schroot-1.2.3-tests.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-diff -ruN schroot-1.2.1-old/test/Makefile.am schroot-1.2.1/test/Makefile.am
---- schroot-1.2.1-old/test/Makefile.am
-+++ schroot-1.2.1/test/Makefile.am
-@@ -59,6 +59,22 @@
- 	sbuild-util			\
- 	schroot-base-option-action	\
- 	cleanup-test-data
-+
-+ROOT_TESTS = $(TESTS)
-+NONROOT_TESTS = setup-test-data                 \
-+        sbuild-chroot                   \
-+        sbuild-dirstream                \
-+        sbuild-environment              \
-+        sbuild-keyfile                  \
-+        sbuild-log                      \
-+        sbuild-nostream                 \
-+        sbuild-parse-value              \
-+        sbuild-personality              \
-+        sbuild-run-parts                \
-+        sbuild-regex                    \
-+        sbuild-util                     \
-+        schroot-base-option-action      \
-+        cleanup-test-data
- endif
- 
- libtest_la_SOURCES = 	\
-@@ -132,5 +148,82 @@
- 	setup-test-data		\
- 	cleanup-test-data
- 
-+check-TESTS: $(TESTS)
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	srcdir=$(srcdir); export srcdir; \
-+	if [[ $EUID -ne 0 ]]; then \
-+	  list=' $(NONROOT_TESTS) '; \
-+	else \
-+	  list=' $(ROOT_TESTS) '; \
-+	fi; \
-+	if test -n "$$list"; then \
-+	  for tst in $$list; do \
-+	    if test -f ./$$tst; then dir=./; \
-+	    elif test -f $$tst; then dir=; \
-+	    else dir="$(srcdir)/"; fi; \
-+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-+	      all=`expr $$all + 1`; \
-+	      case " $(XFAIL_TESTS) " in \
-+	      *$$ws$$tst$$ws*) \
-+		xpass=`expr $$xpass + 1`; \
-+		failed=`expr $$failed + 1`; \
-+		echo "XPASS: $$tst"; \
-+	      ;; \
-+	      *) \
-+		echo "PASS: $$tst"; \
-+	      ;; \
-+	      esac; \
-+	    elif test $$? -ne 77; then \
-+	      all=`expr $$all + 1`; \
-+	      case " $(XFAIL_TESTS) " in \
-+	      *$$ws$$tst$$ws*) \
-+		xfail=`expr $$xfail + 1`; \
-+		echo "XFAIL: $$tst"; \
-+	      ;; \
-+	      *) \
-+		failed=`expr $$failed + 1`; \
-+		echo "FAIL: $$tst"; \
-+	      ;; \
-+	      esac; \
-+	    else \
-+	      skip=`expr $$skip + 1`; \
-+	      echo "SKIP: $$tst"; \
-+	    fi; \
-+	  done; \
-+	  if test "$$failed" -eq 0; then \
-+	    if test "$$xfail" -eq 0; then \
-+	      banner="All $$all tests passed"; \
-+	    else \
-+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-+	    fi; \
-+	  else \
-+	    if test "$$xpass" -eq 0; then \
-+	      banner="$$failed of $$all tests failed"; \
-+	    else \
-+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
-+	    fi; \
-+	  fi; \
-+	  dashes="$$banner"; \
-+	  skipped=""; \
-+	  if test "$$skip" -ne 0; then \
-+	    skipped="($$skip tests were not run)"; \
-+	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-+	      dashes="$$skipped"; \
-+	  fi; \
-+	  report=""; \
-+	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-+	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-+	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-+	      dashes="$$report"; \
-+	  fi; \
-+	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-+	  echo "$$dashes"; \
-+	  echo "$$banner"; \
-+	  test -z "$$skipped" || echo "$$skipped"; \
-+	  test -z "$$report" || echo "$$report"; \
-+	  echo "$$dashes"; \
-+	  test "$$failed" -eq 0; \
-+	else :; fi
-+
- clean-local:
- 	$(srcdir)/cleanup-test-data
-diff -ruN schroot-1.2.1-old/test/setup-test-data schroot-1.2.1/test/setup-test-data
---- schroot-1.2.1-old/test/setup-test-data
-+++ schroot-1.2.1/test/setup-test-data
-@@ -4,4 +4,9 @@
- rm -rf testdata
- mkdir testdata
- cp -r ${srcdir}/*.ex* testdata
--chown -R root:root testdata
-+if [[ $EUID -ne 0 ]]; then
-+  echo "You are not root, only performing partial setup"
-+else
-+  chown -R root:root testdata
-+fi
-+
diff --git a/dev-util/schroot/files/schroot-1.4.0-tests.patch b/dev-util/schroot/files/schroot-1.4.0-tests.patch
deleted file mode 100644
index 57885a88ed68..000000000000
--- a/dev-util/schroot/files/schroot-1.4.0-tests.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Split out the root-only tests from the tests that can run as a non-root user.
-
---- schroot-1.4.0.orig/configure.ac
-+++ schroot-1.4.0/configure.ac
-@@ -254,6 +254,19 @@ AC_ARG_WITH([bash-completion-dir], [AS_H
- AC_MSG_RESULT([$bashcompletiondir])
- AC_SUBST([bashcompletiondir])
- 
-+AC_MSG_CHECKING([whether to enable root-only unit tests])
-+AC_ARG_ENABLE([root-tests], [AS_HELP_STRING([--with-root-tests], [Enable root-only tests])],
-+              [ case "${enableval}" in
-+                yes) enable_root_tests="yes" ;;
-+                no)  enable_root_tests="no" ;;
-+                *) AC_MSG_RESULT([unknown])
-+                   AC_MSG_ERROR([bad value ${enableval} for --enable-root-tests]) ;;
-+                esac],
-+              [ enable_root_tests="yes" ])
-+AC_MSG_RESULT([$enable_root_tests])
-+AM_CONDITIONAL([USE_ROOT_TESTS], [test "$enable_root_tests" = "yes"])
-+AC_SUBST([enable_root_tests])
-+
- # Checks for programs.
- AC_PROG_CXX
- AC_LANG([C++])
---- schroot-1.4.0.orig/test/Makefile.am
-+++ schroot-1.4.0/test/Makefile.am
-@@ -24,17 +24,24 @@ include $(top_srcdir)/scripts/global.mk
- LOCAL_CXXFLAGS = $(SCHROOT_CFLAGS) $(CPPUNIT_CFLAGS) -DTESTDATADIR='"./testdata"' -I$(top_srcdir)/bin
- 
- if USE_UNIT_TESTS
--noinst_LTLIBRARIES = libtest.la
-+check_LTLIBRARIES = libtest.la
- 
--noinst_PROGRAMS = 			\
--	sbuild-chroot			\
-+ROOT_TESTS =
-+
-+if USE_ROOT_TESTS
-+ROOT_TESTS += \
- 	sbuild-chroot-plain		\
- 	sbuild-chroot-file		\
- 	sbuild-chroot-directory		\
- 	sbuild-chroot-block-device	\
- 	sbuild-chroot-loopback		\
- 	sbuild-chroot-lvm-snapshot	\
--	sbuild-chroot-config		\
-+	sbuild-chroot-config
-+endif
-+
-+check_PROGRAMS = \
-+	sbuild-chroot			\
-+	$(ROOT_TESTS)			\
- 	sbuild-environment		\
- 	sbuild-keyfile			\
- 	sbuild-lock			\
-@@ -51,13 +58,7 @@ noinst_PROGRAMS = 			\
- # randomly on slow or heavily-loaded systems.
- TESTS = setup-test-data			\
- 	sbuild-chroot			\
--	sbuild-chroot-plain		\
--	sbuild-chroot-file		\
--	sbuild-chroot-directory		\
--	sbuild-chroot-block-device	\
--	sbuild-chroot-loopback		\
--	sbuild-chroot-lvm-snapshot	\
--	sbuild-chroot-config		\
-+	$(ROOT_TESTS)			\
- 	sbuild-environment		\
- 	sbuild-keyfile			\
- 	sbuild-log			\
---- schroot-1.4.0.orig/test/setup-test-data
-+++ schroot-1.4.0/test/setup-test-data
-@@ -4,4 +4,8 @@
- rm -rf testdata
- mkdir testdata
- cp -r ${srcdir}/*.ex* testdata
-+if test `id -u` -ne 0; then
-+echo "You are not root, only doing partial setup"
-+else
- chown -R root:root testdata
-+fi
diff --git a/dev-util/schroot/schroot-1.2.3-r4.ebuild b/dev-util/schroot/schroot-1.2.3-r4.ebuild
deleted file mode 100644
index a9dbe180aaa5..000000000000
--- a/dev-util/schroot/schroot-1.2.3-r4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.2.3-r4.ebuild,v 1.4 2009/12/29 21:39:32 abcd Exp $
-
-EAPI="2"
-
-inherit autotools base pam
-
-DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="http://packages.debian.org/source/sid/schroot"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+dchroot debug doc nls test"
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.34.0
-	dev-libs/lockdev
-	sys-libs/pam
-"
-
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.10.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/debianutils
-	dchroot? ( !sys-apps/dchroot )
-	nls? ( virtual/libintl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-autotools.patch"
-	"${FILESDIR}/${P}-tests.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-
-	if use test; then
-		# Fix bug where aclocal doesn't find cppunit.m4 from the system...
-		ln -s /usr/share/aclocal/cppunit.m4 m4/
-	else
-		# Don't depend on cppunit unless we are testing
-		sed -i '/AM_PATH_CPPUNIT/s/^.*$/:/' configure.ac
-	fi
-
-	export AT_M4DIR=m4
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable dchroot) \
-		$(use_enable dchroot dchroot-dsa) \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		--enable-shared \
-		--disable-static \
-		--localstatedir=/var
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/schroot.initd schroot || die "installation of init.d script failed"
-	newconfd "${FILESDIR}"/schroot.confd schroot || die "installation of conf.d file failed"
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "installation of docs failed"
-	if use doc; then
-		docinto html/sbuild
-		dohtml doc/sbuild/html/* || die "installation of html docs failed"
-		docinto html/schroot
-		dohtml doc/schroot/html/* || die "installation of html docs failed"
-	fi
-
-	rm -f "${D}"/etc/pam.d/schroot
-	pamd_mimic_system schroot auth account session
-
-	# Remove *.la files
-	find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed"
-}
diff --git a/dev-util/schroot/schroot-1.4.13.ebuild b/dev-util/schroot/schroot-1.4.21.ebuild
index 5ee9321e588a..8ceaae46ba97 100644
--- a/dev-util/schroot/schroot-1.4.13.ebuild
+++ b/dev-util/schroot/schroot-1.4.21.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.13.ebuild,v 1.1 2010/09/30 02:50:46 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.21.ebuild,v 1.1 2011/03/22 06:56:01 abcd Exp $
 
-EAPI="3"
+EAPI="4"
 WANT_AUTOMAKE="1.11"
 
-inherit autotools base pam
+inherit autotools base pam versionator
 
 MY_P=${PN}_${PV}
 
 DESCRIPTION="Utility to execute commands in a chroot environment"
 HOMEPAGE="http://packages.debian.org/source/sid/schroot"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.gz"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -76,6 +76,10 @@ src_configure() {
 		--with-bash-completion-dir="${EPREFIX}"/usr/share/bash-completion
 }
 
+src_compile() {
+	emake all $(usev doc)
+}
+
 src_test() {
 	if [[ $root_tests == yes && $EUID -ne 0 ]]; then
 		ewarn "Disabling tests because you are no longer root"
@@ -85,21 +89,19 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 
 	insinto /usr/share/doc/${PF}/contrib/setup.d
-	doins contrib/setup.d/09fsck contrib/setup.d/10mount-ssh || die "installation of contrib scripts failed"
-
-	newinitd "${FILESDIR}"/schroot.initd schroot || die "installation of init.d script failed"
-	newconfd "${FILESDIR}"/schroot.confd schroot || die "installation of conf.d file failed"
+	doins contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
 
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "installation of docs failed"
+	newinitd "${FILESDIR}"/schroot.initd schroot
+	newconfd "${FILESDIR}"/schroot.confd schroot
 
 	if use doc; then
 		docinto html/sbuild
-		dohtml doc/sbuild/html/* || die "installation of html docs failed"
+		dohtml doc/sbuild/html/*
 		docinto html/schroot
-		dohtml doc/schroot/html/* || die "installation of html docs failed"
+		dohtml doc/schroot/html/*
 	fi
 
 	if use pam; then
@@ -112,9 +114,7 @@ src_install() {
 }
 
 pkg_preinst() {
-	export had_older_1_4_1=false
-	has_version "<dev-util/schroot-1.4.1" && had_older_1_4_1=true
-	if ${had_older_1_4_1}; then
+	if [[ ${REPLACING_VERSIONS} == 1.2* || ${REPLACING_VERSIONS} == 1.4.0* ]]; then
 		einfo "Moving config files to new location..."
 		mkdir "${EROOT}etc/schroot/default"
 		mv_conffile etc/schroot/script-defaults etc/schroot/default/config
@@ -157,7 +157,7 @@ mv_conffile() {
 
 pkg_postinst() {
 	local x
-	if ${had_older_1_4_1}; then
+	if [[ ${REPLACING_VERSIONS} == 1.2* || ${REPLACING_VERSIONS} == 1.4.0* ]]; then
 		for x in script:config mount:fstab copyfiles nssdatabases; do
 			if [[ ! -e ${EROOT}etc/schroot/${x%:*}-defaults && -f ${EROOT}etc/schroot/default/${x#*:} ]]; then
 				einfo "Creating compatibility symlink for ${x%:*}-defaults"
diff --git a/dev-util/schroot/schroot-1.4.3.ebuild b/dev-util/schroot/schroot-1.4.3.ebuild
deleted file mode 100644
index 367268c18dbe..000000000000
--- a/dev-util/schroot/schroot-1.4.3.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.3.ebuild,v 1.1 2010/06/13 00:29:09 abcd Exp $
-
-EAPI="2"
-WANT_AUTOMAKE="1.11"
-
-inherit autotools base pam
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="http://packages.debian.org/source/sid/schroot"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+dchroot debug doc lvm nls pam test"
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.42.0
-	dev-libs/lockdev
-	>=sys-apps/util-linux-2.16
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.10.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/debianutils
-	dchroot? ( !sys-apps/dchroot )
-	nls? ( virtual/libintl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.0-tests.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-
-	# Don't depend on cppunit unless we are testing
-	use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac
-
-	printf "Package: ${PN}\nVersion: ${PV}\n" > VERSION
-
-	eautoreconf
-}
-
-src_configure() {
-	root_tests=no
-	use test && (( EUID == 0 )) && root_tests=yes
-	econf \
-		$(use_enable doc doxygen) \
-		$(use_enable dchroot) \
-		$(use_enable dchroot dchroot-dsa) \
-		$(use_enable debug) \
-		$(use_enable lvm lvm-snapshot) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		--enable-block-device \
-		--enable-loopback \
-		--enable-uuid \
-		--enable-root-tests=$root_tests \
-		--enable-shared \
-		--disable-static \
-		--localstatedir=/var \
-		--with-bash-completion-dir=/usr/share/bash-completion
-}
-
-src_test() {
-	if [[ $root_tests == yes && $EUID -ne 0 ]]; then
-		ewarn "Disabling tests because you are no longer root"
-		return 0
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/schroot.initd schroot || die "installation of init.d script failed"
-	newconfd "${FILESDIR}"/schroot.confd schroot || die "installation of conf.d file failed"
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "installation of docs failed"
-
-	if use doc; then
-		docinto html/sbuild
-		dohtml doc/sbuild/html/* || die "installation of html docs failed"
-		docinto html/schroot
-		dohtml doc/schroot/html/* || die "installation of html docs failed"
-	fi
-
-	if use pam; then
-		rm -f "${D}"/etc/pam.d/schroot
-		pamd_mimic_system schroot auth account session
-	fi
-
-	# Remove *.la files
-	find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed"
-}
-
-pkg_preinst() {
-	export had_older_1_4_1=false
-	has_version "<dev-util/schroot-1.4.1" && had_older_1_4_1=true
-	if ${had_older_1_4_1}; then
-		einfo "Moving config files to new location..."
-		mkdir "${ROOT}etc/schroot/default"
-		mv_conffile etc/schroot/script-defaults etc/schroot/default/config
-		mv_conffile etc/schroot/mount-defaults etc/schroot/default/fstab
-		mv_conffile etc/schroot/copyfiles-defaults etc/schroot/default/copyfiles
-		mv_conffile etc/schroot/nssdatabases-defaults etc/schroot/default/nssdatabases
-	fi
-}
-
-mv_conffile() {
-	local OLDFILE=${ROOT}$1
-	local NEWFILE=${ROOT}$2
-
-	# if the old file doesn't exist, or is a symlink, stop
-	[[ -f ${OLDFILE} ]] || return 0
-	[[ -L ${OLDFILE} ]] && return 0
-
-	# if the new file already exists, then we have a problem...
-	if [[ -e ${NEWFILE} ]]; then
-		# but if they are the same, then don't worry about it
-		if cmp -s "${OLDFILE}" "${NEWFILE}"; then
-			rm -f "${OLDFILE}"
-		else
-			ewarn "${NEWFILE} already exists, not moving ${OLDFILE}"
-		fi
-	else
-		mv "${OLDFILE}" "${NEWFILE}"
-	fi
-
-	local x y
-	# now move all the unmerged config files as well
-	for x in "${OLDFILE%/*}"/._cfg????_"${OLDFILE##*/}"; do
-		[[ -f ${x} ]] || continue
-		# /etc/schroot/._cfg0000_script-defaults -> /etc/schroot/default/._cfg0000_config
-		y=${x##*/}
-		y=${NEWFILE%*/}${y%${OLDFILE##*/}}${NEWFILE##*/}
-		mv "${x}" "${y}"
-	done
-}
-
-pkg_postinst() {
-	local x
-	if ${had_older_1_4_1}; then
-		for x in script:config mount:fstab copyfiles nssdatabases; do
-			if [[ ! -e ${ROOT}etc/schroot/${x%:*}-defaults && -f ${ROOT}etc/schroot/default/${x#*:} ]]; then
-				einfo "Creating compatibility symlink for ${x%:*}-defaults"
-				ln -sf "default/${x#*:}" "${ROOT}etc/schroot/${x%:*}-defaults"
-			fi
-		done
-
-		ewarn "Your config files have been moved to the new location in"
-		ewarn "/etc/schroot/default. Compatibility symlinks have been installed in"
-		ewarn "/etc/schroot, and may be removed if no running chroot refers to them."
-	fi
-}
diff --git a/dev-util/schroot/schroot-1.4.7.ebuild b/dev-util/schroot/schroot-1.4.7.ebuild
deleted file mode 100644
index 759fe7c54cd4..000000000000
--- a/dev-util/schroot/schroot-1.4.7.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.7.ebuild,v 1.1 2010/08/13 09:04:04 abcd Exp $
-
-EAPI="3"
-WANT_AUTOMAKE="1.11"
-
-inherit autotools base pam
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="http://packages.debian.org/source/sid/schroot"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="btrfs +dchroot debug doc lvm nls pam test"
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.42.0
-	dev-libs/lockdev
-	>=sys-apps/util-linux-2.16
-	btrfs? ( sys-fs/btrfs-progs )
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.10.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/debianutils
-	dchroot? ( !sys-apps/dchroot )
-	nls? ( virtual/libintl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-tests.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-
-	# Don't depend on cppunit unless we are testing
-	use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac
-
-	eautoreconf
-}
-
-src_configure() {
-	root_tests=no
-	use test && (( EUID == 0 )) && root_tests=yes
-	econf \
-		$(use_enable btrfs btrfs-snapshot) \
-		$(use_enable doc doxygen) \
-		$(use_enable dchroot) \
-		$(use_enable dchroot dchroot-dsa) \
-		$(use_enable debug) \
-		$(use_enable lvm lvm-snapshot) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		--enable-block-device \
-		--enable-loopback \
-		--enable-uuid \
-		--enable-root-tests=$root_tests \
-		--enable-shared \
-		--disable-static \
-		--localstatedir="${EPREFIX}"/var \
-		--with-bash-completion-dir="${EPREFIX}"/usr/share/bash-completion
-}
-
-src_test() {
-	if [[ $root_tests == yes && $EUID -ne 0 ]]; then
-		ewarn "Disabling tests because you are no longer root"
-		return 0
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	insinto /usr/share/doc/${PF}/contrib/setup.d
-	doins contrib/setup.d/09fsck contrib/setup.d/10mount-ssh || die "installation of contrib scripts failed"
-
-	newinitd "${FILESDIR}"/schroot.initd schroot || die "installation of init.d script failed"
-	newconfd "${FILESDIR}"/schroot.confd schroot || die "installation of conf.d file failed"
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "installation of docs failed"
-
-	if use doc; then
-		docinto html/sbuild
-		dohtml doc/sbuild/html/* || die "installation of html docs failed"
-		docinto html/schroot
-		dohtml doc/schroot/html/* || die "installation of html docs failed"
-	fi
-
-	if use pam; then
-		rm -f "${ED}"etc/pam.d/schroot
-		pamd_mimic_system schroot auth account session
-	fi
-
-	# Remove *.la files
-	find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed"
-}
-
-pkg_preinst() {
-	export had_older_1_4_1=false
-	has_version "<dev-util/schroot-1.4.1" && had_older_1_4_1=true
-	if ${had_older_1_4_1}; then
-		einfo "Moving config files to new location..."
-		mkdir "${EROOT}etc/schroot/default"
-		mv_conffile etc/schroot/script-defaults etc/schroot/default/config
-		mv_conffile etc/schroot/mount-defaults etc/schroot/default/fstab
-		mv_conffile etc/schroot/copyfiles-defaults etc/schroot/default/copyfiles
-		mv_conffile etc/schroot/nssdatabases-defaults etc/schroot/default/nssdatabases
-	fi
-}
-
-mv_conffile() {
-	local OLDFILE=${EROOT}$1
-	local NEWFILE=${EROOT}$2
-
-	# if the old file doesn't exist, or is a symlink, stop
-	[[ -f ${OLDFILE} ]] || return 0
-	[[ -L ${OLDFILE} ]] && return 0
-
-	# if the new file already exists, then we have a problem...
-	if [[ -e ${NEWFILE} ]]; then
-		# but if they are the same, then don't worry about it
-		if cmp -s "${OLDFILE}" "${NEWFILE}"; then
-			rm -f "${OLDFILE}"
-		else
-			ewarn "${NEWFILE} already exists, not moving ${OLDFILE}"
-		fi
-	else
-		mv "${OLDFILE}" "${NEWFILE}"
-	fi
-
-	local x y
-	# now move all the unmerged config files as well
-	for x in "${OLDFILE%/*}"/._cfg????_"${OLDFILE##*/}"; do
-		[[ -f ${x} ]] || continue
-		# /etc/schroot/._cfg0000_script-defaults -> /etc/schroot/default/._cfg0000_config
-		y=${x##*/}
-		y=${NEWFILE%*/}${y%${OLDFILE##*/}}${NEWFILE##*/}
-		mv "${x}" "${y}"
-	done
-}
-
-pkg_postinst() {
-	local x
-	if ${had_older_1_4_1}; then
-		for x in script:config mount:fstab copyfiles nssdatabases; do
-			if [[ ! -e ${EROOT}etc/schroot/${x%:*}-defaults && -f ${EROOT}etc/schroot/default/${x#*:} ]]; then
-				einfo "Creating compatibility symlink for ${x%:*}-defaults"
-				ln -sf "default/${x#*:}" "${ROOT}etc/schroot/${x%:*}-defaults"
-			fi
-		done
-
-		ewarn "Your config files have been moved to the new location in"
-		ewarn "/etc/schroot/default. Compatibility symlinks have been installed in"
-		ewarn "/etc/schroot, and may be removed if no running chroot refers to them."
-	fi
-}