Bump to latest upstream, remove old

(Portage version: 2.2.0_alpha27_p2/cvs/Linux i686)

8 files changed, 26 insertions, 752 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/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
-}