summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/lockdev/ChangeLog9
-rw-r--r--dev-libs/lockdev/Manifest6
-rw-r--r--dev-libs/lockdev/files/lockdev.addautotools.patch100
-rw-r--r--dev-libs/lockdev/lockdev-1.0.3.1.2.ebuild34
-rw-r--r--dev-libs/lockdev/metadata.xml5
-rw-r--r--dev-util/schroot/ChangeLog23
-rw-r--r--dev-util/schroot/Manifest7
-rw-r--r--dev-util/schroot/files/schroot.autotools.patch104
-rw-r--r--dev-util/schroot/files/schroot.pamfix.patch46
-rw-r--r--dev-util/schroot/files/schroot.tests.patch126
-rw-r--r--dev-util/schroot/metadata.xml5
-rw-r--r--dev-util/schroot/schroot-1.2.2.ebuild41
12 files changed, 0 insertions, 506 deletions
diff --git a/dev-libs/lockdev/ChangeLog b/dev-libs/lockdev/ChangeLog
deleted file mode 100644
index ec5eaca2b..000000000
--- a/dev-libs/lockdev/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for dev-libs/lockdev
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 03 Feb 2009; Nick Fortino (nfortino) <nfortino@gmail.com>
- +lockdev-1.0.3.1.2.ebuild, +files/lockdev.addautotools.patch,
- +metadata.xml:
- New ebuild for bug 257333 thanks to Christian (idl0r) and Tommy (Tommy[D])
-
diff --git a/dev-libs/lockdev/Manifest b/dev-libs/lockdev/Manifest
deleted file mode 100644
index fb2f7c7e6..000000000
--- a/dev-libs/lockdev/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX lockdev.addautotools.patch 3179 RMD160 ef7155c05162a087eda1fb0314b25d243716d7d8 SHA1 d3942723cfe19a47f8c6caac6499c63ab8ca0289 SHA256 ee20ac32eaf47f4a358de78c3cf930a43bc535bc472e263d961d02ba9bbe774c
-DIST lockdev_1.0.3-1.2.diff.gz 7642 RMD160 1c10f5ca78242898d2db5097a70ddf6008061b6a SHA1 086d7fd152da1db12ac59ef600ada494867de2cc SHA256 02d35e82805551342438804b3bfe9df153f9089407272f1cda9d76d84740ce90
-DIST lockdev_1.0.3.orig.tar.gz 29150 RMD160 54665000c135877dab7d14eb88092c9761e688d5 SHA1 21ab7b34c46e352bd09296d6175f4f4b3e22dcf1 SHA256 ccae635d7ac3fdd50897eceb250872b3d9a191d298f213e7f0c836910d869f82
-EBUILD lockdev-1.0.3.1.2.ebuild 829 RMD160 22196071d58d9686f9ddc4cf2d77f735043efd79 SHA1 064d7fbd97d8117682b7b48f52366948bd78c1eb SHA256 821fb6fd94394d741c03753f70341047042f3ac27f26ff5e58be70294ecac23b
-MISC ChangeLog 336 RMD160 64f01eb63d456450904954e458a839540a260a1d SHA1 62c567dae79bd32cbad7b1e323d65dc462aa8703 SHA256 b9d5cc0e2c0ae47a845894e279290dff2a5d12ac5dd72a84e60f0a228a3b4460
-MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/dev-libs/lockdev/files/lockdev.addautotools.patch b/dev-libs/lockdev/files/lockdev.addautotools.patch
deleted file mode 100644
index b4219dec6..000000000
--- a/dev-libs/lockdev/files/lockdev.addautotools.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Adds an autotools build system to fix the many issues with the custom build
-system (ignoring CC, CFLAGS, DESTDIR, not installing the .so file properly).
-
-Contributed by Nick Fortino (nfortino@gmail.com) 2/1/2009
-
---- lockdev-1.0.3-old/Makefile.am
-+++ lockdev-1.0.3/Makefile.am
-@@ -0,0 +1 @@
-+SUBDIRS = src docs
---- lockdev-1.0.3-old/configure.ac
-+++ lockdev-1.0.3/configure.ac
-@@ -0,0 +1,74 @@
-+# -*- Autoconf -*-
-+# Process this file with autoconf to produce a configure script.
-+pushdef([LOCKDEV_NAME], [lockdev])
-+pushdef([LOCKDEV_MAJOR_VERSION], [1])
-+pushdef([LOCKDEV_MINOR_VERSION], [0])
-+pushdef([LOCKDEV_MICRO_VERSION], [3])
-+pushdef([LOCKDEV_EXTRA_VERSION], [])
-+pushdef([LOCKDEV_CURRENT_INTERFACE], [1])
-+pushdef([LOCKDEV_INTERFACE_AGE], [0])
-+pushdef([LOCKDEV_BINARY_AGE], [0])
-+pushdef([LOCKDEV_VERSION], LOCKDEV_MAJOR_VERSION.LOCKDEV_MINOR_VERSION.LOCKDEV_MICRO_VERSION[]LOCKDEV_EXTRA_VERSION)
-+
-+AC_PREREQ([2.63])
-+AC_INIT([LOCKDEV_NAME], [LOCKDEV_VERSION], [BUG-REPORT-ADDRESS])
-+AC_CONFIG_AUX_DIR([scripts])
-+AM_INIT_AUTOMAKE
-+AC_CONFIG_SRCDIR([config.h.in])
-+AC_CONFIG_HEADERS([config.h])
-+
-+[LOCKDEV_MAJOR_VERSION]=LOCKDEV_MAJOR_VERSION
-+[LOCKDEV_MINOR_VERSION]=LOCKDEV_MINOR_VERSION
-+[LOCKDEV_MICRO_VERSION]=LOCKDEV_MICRO_VERSION
-+[LOCKDEV_EXTRA_VERSION]=LOCKDEV_EXTRA_VERSION
-+[LOCKDEV_CURRENT_INTERFACE]=LOCKDEV_CURRENT_INTERFACE
-+[LOCKDEV_INTERFACE_AGE]=LOCKDEV_INTERFACE_AGE
-+[LOCKDEV_BINARY_AGE]=LOCKDEV_BINARY_AGE
-+[LOCKDEV_VERSION]=LOCKDEV_VERSION
-+popdef([LOCKDEV_MAJOR_VERSION])
-+popdef([LOCKDEV_MINOR_VERSION])
-+popdef([LOCKDEV_MICRO_VERSION])
-+popdef([LOCKDEV_EXTRA_VERSION])
-+popdef([LOCKDEV_CURRENT_INTERFACE])
-+popdef([LOCKDEV_INTERFACE_AGE])
-+popdef([LOCKDEV_BINARY_AGE])
-+popdef([LOCKDEV_NAME])
-+popdef([LOCKDEV_VERSION])
-+
-+AC_SUBST([LOCKDEV_MAJOR_VERSION])
-+AC_SUBST([LOCKDEV_MINOR_VERSION])
-+AC_SUBST([LOCKDEV_MICRO_VERSION])
-+AC_SUBST([LOCKDEV_CURRENT_INTERFACE])
-+AC_SUBST([LOCKDEV_INTERFACE_AGE])
-+AC_SUBST([LOCKDEV_BINARY_AGE])
-+AC_SUBST([LOCKDEV_VERSION])
-+
-+# Checks for programs.
-+AC_PROG_CXX
-+AC_PROG_CC
-+AC_PROG_CPP
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_PROG_MAKE_SET
-+AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
-+
-+# Checks for libraries.
-+
-+# Checks for header files.
-+AC_CHECK_HEADERS([fcntl.h paths.h stdlib.h string.h sys/file.h sys/param.h unistd.h])
-+
-+# Checks for typedefs, structures, and compiler characteristics.
-+AC_C_INLINE
-+AC_TYPE_PID_T
-+AC_CHECK_MEMBERS([struct stat.st_rdev])
-+
-+# Checks for library functions.
-+AC_FUNC_FORK
-+AC_FUNC_MALLOC
-+AC_CHECK_FUNCS([strrchr])
-+
-+AC_CONFIG_FILES([Makefile
-+ docs/Makefile
-+ src/Makefile])
-+AC_OUTPUT
---- lockdev-1.0.3-old/docs/Makefile.am
-+++ lockdev-1.0.3/docs/Makefile.am
-@@ -0,0 +1,2 @@
-+man_MANS = lockdev.3
-+
---- lockdev-1.0.3-old/src/Makefile.am
-+++ lockdev-1.0.3/src/Makefile.am
-@@ -0,0 +1,6 @@
-+include_HEADERS = lockdev.h ttylock.h
-+
-+lib_LTLIBRARIES = liblockdev.la
-+liblockdev_la_SOURCES = lockdev.c
-+liblockdev_version = -version-info $(LOCKDEV_CURRENT_INTERFACE):$(LOCKDEV_INTERFACE_AGE):$(LOCKDEV_BINARY_AGE)
-+liblockdev_la_LDFLAGS = $(liblockdev_version)
diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2.ebuild
deleted file mode 100644
index 6bafa2448..000000000
--- a/dev-libs/lockdev/lockdev-1.0.3.1.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils autotools versionator
-
-MY_PV=$(get_version_component_range 1-3)
-DEB_PV=$(replace_version_separator 3 '-')
-
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${MY_PV}.orig.tar.gz
- mirror://debian/pool/main/l/${PN}/${PN}_${DEB_PV}.diff.gz"
-
-DESCRIPTION="A simple Debian locking library"
-HOMEPAGE="http://packages.debian.org/source/sid/lockdev"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_unpack() {
- unpack ${A}
- epatch ${PN}_${DEB_PV}.diff
- epatch "${FILESDIR}/${PN}.addautotools.patch"
- cd "${S}"
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- dodoc AUTHORS ChangeLog ChangeLog.old README.debug || die
-}
diff --git a/dev-libs/lockdev/metadata.xml b/dev-libs/lockdev/metadata.xml
deleted file mode 100644
index 7e3286984..000000000
--- a/dev-libs/lockdev/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>maintainer-wanted</herd>
-</pkgmetadata>
diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog
deleted file mode 100644
index 0457d8536..000000000
--- a/dev-util/schroot/ChangeLog
+++ /dev/null
@@ -1,23 +0,0 @@
-# ChangeLog for dev-util/schroot
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 11 Jun 2009; Christian Ruppert <idl0r@gentoo.org> schroot-1.2.2.ebuild:
- Fix epatch call, thanks to dacook.
-
- 10 May 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
- schroot-1.2.2.ebuild:
- Simplify a bit more
-
- 03 May 2009; Christian Ruppert <idl0r@gentoo.org> schroot-1.2.2.ebuild:
- Simplify.
-
- 03 May 2009; Nick Fortino (nfortino) <nfortino@gmail.com>
- -schroot-1.2.1.ebuild, +schroot-1.2.2.ebuild:
- Version bump
-
- 04 Feb 2009; Nick Fortino (nfortino) <nfortino@gmail.com>
- +schroot-1.2.1.ebuild, +files/schroot.autotools.patch,
- +files/schroot.pamfix.patch, +files/schroot.tests.patch, +metadata.xml:
- New ebuild for bug 257334 thanks to Christian (idl0r) and Tommy (Tommy[D])
-
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
deleted file mode 100644
index de2ca381a..000000000
--- a/dev-util/schroot/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX schroot.autotools.patch 4228 RMD160 24051ee9ea62aa2e9e233624a37a44dd63596dfc SHA1 30cbe3887a09f9b38f83fc85a79d16e5b14c5113 SHA256 96481f9e2b3b3b6a10f95ce8a37344d216383f8bae4597db91837c16a4a3f4d7
-AUX schroot.pamfix.patch 1977 RMD160 d1f4434554e75353f43e9df94787cdeded38b23d SHA1 a016b42b7d3acf6543cf2d26d658852912c40196 SHA256 438605a5976f151f31acdec9671d42992c19d69bf6a1ae8ab3b29f221e4899a2
-AUX schroot.tests.patch 3744 RMD160 23ddf93e0e875a6c567c7442f0b419beee69604d SHA1 34f044e9b5a6290e858d4168a7748f233286f991 SHA256 031f20c88be70e1ac1fcdd41a83c86532bcd17b6118dd0666aada483caf16695
-DIST schroot_1.2.2.orig.tar.gz 7735917 RMD160 7d4418811c05bc19eb675730109e1e77e1e54f88 SHA1 c52366eeee4830f0d65dc90fd3aad34b8252e447 SHA256 13f75570195e2f7c3e870b400eff5cf86374462c89dab7f20f9ec74c3a52b696
-EBUILD schroot-1.2.2.ebuild 940 RMD160 79fa9852e8ad188a0cc7e0ede3f2370d32d657b1 SHA1 6f44dd44d759c44bf11c863526daf5968c2b0415 SHA256 d4faf7c6d0fcc9a5546db0c57d25cd8672334b998a26b181f9263f6379d40468
-MISC ChangeLog 815 RMD160 0297aac44b56cff80cf6e95f796b177882625d0f SHA1 bb73b9674a18891acf05442a0c2b3652a6b43f88 SHA256 eb7ff08b40f952a636e2d78f309706101aabbdbded7ddf4a0a3aa4cb22ba6d1c
-MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/dev-util/schroot/files/schroot.autotools.patch b/dev-util/schroot/files/schroot.autotools.patch
deleted file mode 100644
index 3e7cc9ef6..000000000
--- a/dev-util/schroot/files/schroot.autotools.patch
+++ /dev/null
@@ -1,104 +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
-
---- schroot-1.2.1-old/configure.ac
-+++ schroot-1.2.1/configure.ac
-@@ -174,6 +174,15 @@
- 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++])
-@@ -194,7 +203,10 @@
- HAVE_UUID=true],
- [HAVE_UUID=false])
-
--AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=true])
-+if test "$enable_test" = "yes"; then
-+ AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=true])
-+fi
-+
- AM_CONDITIONAL([USE_UNIT_TESTS], [test -n "$HAVE_CPPUNIT"])
-
- SCHROOT_CFLAGS="$UUID_CFLAGS"
-@@ -239,19 +251,19 @@
- AC_SUBST([LOCKDEV_LIBS])
-
- AC_MSG_CHECKING([for boost::program_options::variables_map in -lboost_program_options])
--saved_ldflags="${LDFLAGS}"
--LDFLAGS="${LDFLAGS} -lboost_program_options"
-+saved_LIBS="${LIBS}"
-+LIBS="${LIBS} -lboost_program_options"
- 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"],
- [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])
--saved_ldflags="${LDFLAGS}"
--LDFLAGS="${LDFLAGS} -lboost_program_options"
-+saved_LIBS="${LIBS}"
-+LIBS="${LIBS} -lboost_program_options"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/program_options.hpp>],
- [boost::program_options::options_description testgrp("test group");
- bool notused = testgrp.options().empty();
-@@ -260,33 +272,33 @@
- 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])
--saved_ldflags="${LDFLAGS}"
--LDFLAGS="${LDFLAGS} -lboost_regex"
-+saved_LIBS="${LIBS}"
-+LIBS="${LIBS} -lboost_regex"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/regex.hpp>],
- [boost::regex("^foo[bar]$")])],
- [AC_MSG_RESULT([yes])
- BOOST_LIBS="${BOOST_LIBS} -lboost_regex"],
- [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])
--saved_ldflags="${LDFLAGS}"
--LDFLAGS="${LDFLAGS} -lboost_filesystem"
-+saved_LIBS="${LIBS}"
-+LIBS="${LIBS} -lboost_filesystem"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/filesystem.hpp>],
- [boost::filesystem::is_directory("/")])],
- [AC_MSG_RESULT([yes])
- BOOST_LIBS="${BOOST_LIBS} -lboost_filesystem"],
- [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.pamfix.patch b/dev-util/schroot/files/schroot.pamfix.patch
deleted file mode 100644
index 2cc6d659e..000000000
--- a/dev-util/schroot/files/schroot.pamfix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-removes the dependency on debian specific pam files. Updates the pam
-configuration to behave as it does on debian.
-
-contributed by Nick Fortino (nfortino@gmail.com) 1/15/2009
-
---- schroot-1.2.1/bin/schroot/pam/schroot.old
-+++ schroot-1.2.1/bin/schroot/pam/schroot
-@@ -23,12 +23,32 @@
- # time restrainst on schroot usage.
- # account requisite pam_time.so
-
--# The standard Unix authentication modules, used with
--# NIS (man nsswitch) as well as normal /etc/passwd and
--# /etc/shadow entries.
--@include common-auth
--@include common-account
--@include common-session
-+# here are the per-package modules (the "Primary" block)
-+auth [success=1 default=ignore] pam_unix.so nullok_secure
-+# here's the fallback if no module succeeds
-+auth requisite pam_deny.so
-+# prime the stack with a positive return value if there isn't one already;
-+# this avoids us returning an error just because nothing sets a success code
-+# since the modules above will each just jump around
-+auth required pam_permit.so
-+
-+# here are the per-package modules (the "Primary" block)
-+account [success=1 new_authtok_reqd=done default=ignore] pam_unix.so
-+# here's the fallback if no module succeeds
-+account requisite pam_deny.so
-+# prime the stack with a positive return value if there isn't one already;
-+# this avoids us returning an error just because nothing sets a success code
-+# since the modules above will each just jump around
-+account required pam_permit.so
-+
-+# here are the per-package modules (the "Primary" block)
-+session [default=1] pam_permit.so
-+# here's the fallback if no module succeeds
-+session requisite pam_deny.so
-+# prime the stack with a positive return value if there isn't one already;
-+# this avoids us returning an error just because nothing sets a success code
-+# since the modules above will each just jump around
-+session required pam_permit.so
-
- # Sets up user limits, please uncomment and read /etc/security/limits.conf
- # to enable this functionality.
diff --git a/dev-util/schroot/files/schroot.tests.patch b/dev-util/schroot/files/schroot.tests.patch
deleted file mode 100644
index bee608d4b..000000000
--- a/dev-util/schroot/files/schroot.tests.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Allows make check to be run without root permissions. When make check is
-run as root, this patch has no effect.
-
-Contributed by Nick Fortino (nfortino@gmail.com) 2/2/2009
-
---- 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
---- 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/metadata.xml b/dev-util/schroot/metadata.xml
deleted file mode 100644
index 7e3286984..000000000
--- a/dev-util/schroot/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>maintainer-wanted</herd>
-</pkgmetadata>
diff --git a/dev-util/schroot/schroot-1.2.2.ebuild b/dev-util/schroot/schroot-1.2.2.ebuild
deleted file mode 100644
index 934f31ff7..000000000
--- a/dev-util/schroot/schroot-1.2.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-inherit eutils autotools
-
-DESCRIPTION="A secure chroot implementation using PAM"
-HOMEPAGE="http://packages.debian.org/source/sid/schroot"
-
-SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug nls static test"
-
-RDEPEND=">=dev-libs/boost-1.34.0
- >=dev-libs/lockdev-1.0.2
- sys-libs/pam"
-
-DEPEND="${RDEPEND}
- test? ( >=dev-util/cppunit-1.10.0 )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${PN}".{pamfix,autotools,tests}.patch
- AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
- econf $(use_enable debug) \
- $(use_enable nls) \
- $(use_enable static) \
- $(use_enable test)
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Install failed"
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die
-}