New upstream version. Remove old.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 45 insertions, 67 deletions

diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog
index 7bd0c2133fad..86ecf76b0dc6 100644
--- a/dev-util/schroot/ChangeLog
+++ b/dev-util/schroot/ChangeLog
@@ -1,6 +1,12 @@
 # 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.32 2011/12/22 22:02:37 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.33 2012/03/03 21:20:28 abcd Exp $
+
+*schroot-1.4.25 (03 Mar 2012)
+
+  03 Mar 2012; Jonathan Callen <abcd@gentoo.org> +schroot-1.4.25.ebuild,
+  -files/schroot-1.4.14-debug.patch, -schroot-1.4.14.ebuild:
+  New upstream version. Remove old.
 
   22 Dec 2011; Markus Meier <maekke@gentoo.org> schroot-1.4.23.ebuild:
   x86 stable, bug #391787
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index ab51f8168394..45997dfc3b31 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,21 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-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.4.14.orig.tar.gz 1109550 RMD160 b50b71c6642148785ef63c428f412ec98baf323d SHA1 1268cdd0985c67cfe7fd88537fe2fbfe11853290 SHA256 f7e05924f12b10f4bf4d19b08b7eca21411a8b66fa18c9793c18de853525b76c
 DIST schroot_1.4.23.orig.tar.bz2 824291 RMD160 61d9a5e74a9fe9ae6260cdedc1edf6929d77cffc SHA1 896ff4c027e30bf22c3fe64fc39398c20c45c200 SHA256 84931c04a789211a87fa31e3b1a6f6d62b9354d3116ae99e2b6bfa0816349d16
-EBUILD schroot-1.4.14.ebuild 5048 RMD160 e241d09fe44f2bc5ddc65688a4be3c1591a7761f SHA1 f52e22ebe23cd3d08fa96b9b65f1c217fe7f3c81 SHA256 eb7a45b4295bb8bee643baa9740575f620a77dd007884a54956f889f9e20deac
+DIST schroot_1.4.25.orig.tar.bz2 828142 RMD160 7231ac5ffd2ffbc43b7f6930d7db437c6cec392e SHA1 9901b78a1b2ec55e4eb09e299f5224502df3d261 SHA256 664d56065d30a5ba8bfe116243f1ef075767d9d379d064f0a5298cbc7778a30c
 EBUILD schroot-1.4.23-r1.ebuild 4510 RMD160 44ad5c94298b0469aff15f2f1b03947eb03264ff SHA1 a527d0c3e7315bacca3c89f7d745345037af020a SHA256 6b0fd39dfac3e3757c8042d07001b0d74519c846fa592de2c85cec92905fd392
 EBUILD schroot-1.4.23.ebuild 4582 RMD160 d32112b7476f9186ce0fef46057668a8096d4b11 SHA1 a847a1d3a62d33f978469df629f2f946cf2f2b80 SHA256 71692f6d4a2b06ae42afa6ab0c2462aa245d27a913031af2a686707e8bd7d42a
-MISC ChangeLog 5776 RMD160 ee1f7ba58cf169bce289aac9910026a75b27e60b SHA1 278d7da792bdd63608e3e466154ad2e470f95073 SHA256 6b06c5dd1caa98f75855cc9c4835355a8b77a76a7148fcab04a065e807082071
+EBUILD schroot-1.4.25.ebuild 4523 RMD160 b056f6dd9f533bce9288e7048b256c758c81c985 SHA1 de2b2d6ee309744ed6f7337ab260df86c3cf0452 SHA256 10d82711b555f2c318ba56b6dda6aefbbd9a70f8f7259ed241dc38142ceb852d
+MISC ChangeLog 5976 RMD160 1f3e8243ba5ecd3fbe5b6d18742a8b49268dd7c3 SHA1 c9f6c09e3a7272d8ac6dd2e95358fee484878756 SHA256 f9ba9e017a1a121d368daa002475bb5c7102cc8dcbee5d51b22061c3dd5a6b2f
 MISC metadata.xml 515 RMD160 503109571ab38b803facd58ffb77de4c99abee8b SHA1 e6be1d578aae7a1cc418ba886a12598d89510599 SHA256 f2da069d2bb008f7a2187b5a2c2770657eae391a08d987d9a9bf5174266193a8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7zqW0ACgkQkKaRLQcq0GKFzQCeJiTPUzfOKz6KEJrs2Zs7Cu0H
-SRgAoI1e3KGwwleFBy3s7jVTv6btYWeI
-=a7z4
+iQIcBAEBCgAGBQJPUosvAAoJELHSF2kinlg4RxkP/0mjfm6cB1KebI/1LUEK9G2k
+uNg14XlnY7FzdAABbvSxPWweLua9h0H7P3cGo6TLqBU3VruViBnLAkY1zDi69JsK
+bJp6ii4z6Nnra+xkYDNxISy03xq99R56PkPcX4/mb1OxLll/I3TAUacnZQq2P/iG
+ju7NRV6Eb04rMHYGIOVERPrm/DAbbFtKI550CD6TcxU+hQwphHcmA9V9yYQzbw6u
+xDhV7jJpIc9GYBch060eYAoaWJDHvzI/U7CKglVBUTuBO9UsDT9snGRzUGnpCIWC
+eAFjeBer+Kx59oxcGI9HidumXsurbr8HnOikmh1/R/s6EEor7xt1BAC9xPtcWacK
+va95VTmFyHMXN0GIDyJhyjhP/5W7oJ4Bku/vijPqnX0GQHwiBe2ByRavfL4Ni4NM
+mrnPC5djvcwIoMrRMgvjesOYG45qFLwTjnGlCIdgCJ9cOYIxIkQlSF6rasIrGH27
++XIfrVNccwcQkpw2wlGopcC5RB97KlkWUJs7dS7CTWsximg8TeMeTctl7vH8c0vp
+xotVn/1KAOjYzwra8TGOqOZxUGnW5R7+2kTPB2qb2+IBYKmUJZlQudS3xu705V0z
+zEtldl96MMzyZ+OqF30KE2y6Jo5dIUHc5zQ4d5IOUl3xrke7MBYOBVwiwtL91giJ
+Cfg36LK+Hjp5lmsGwdWl
+=oOz3
 -----END PGP SIGNATURE-----
diff --git a/dev-util/schroot/files/schroot-1.4.14-debug.patch b/dev-util/schroot/files/schroot-1.4.14-debug.patch
deleted file mode 100644
index 4b5b954e1bc0..000000000000
--- a/dev-util/schroot/files/schroot-1.4.14-debug.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 741833bdcba4b9aa7e389d389f42e4fa504d7cc7 Mon Sep 17 00:00:00 2001
-From: Jonathan Callen <abcd@gentoo.org>
-Date: Wed, 5 Jan 2011 01:26:26 -0500
-Subject: [PATCH] schroot-base: fix build with --enable-debug
-
-Rename last instance of the variable sbuild::debug_level to
-sbuild::debug_log_level.  This appears to have been missed in commit
-04c19bb6c28295a387e60066c48db7f443e5b925.
----
- bin/schroot-base/schroot-base-main.cc |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/bin/schroot-base/schroot-base-main.cc b/bin/schroot-base/schroot-base-main.cc
-index ac86018..d6cd0b0 100644
---- a/bin/schroot-base/schroot-base-main.cc
-+++ b/bin/schroot-base/schroot-base-main.cc
-@@ -106,7 +106,7 @@ main::run (int   argc,
-       this->program_options->parse(argc, argv);
- 
- #ifdef SBUILD_DEBUG
--      sbuild::debug_level = sbuild::DEBUG_CRITICAL;
-+      sbuild::debug_log_level = sbuild::DEBUG_CRITICAL;
- #endif
- 
-       if (this->use_syslog)
--- 
-1.7.3.3
-
diff --git a/dev-util/schroot/schroot-1.4.14.ebuild b/dev-util/schroot/schroot-1.4.25.ebuild
index 2b9f7bdadc4a..ba56c14f4c53 100644
--- a/dev-util/schroot/schroot-1.4.14.ebuild
+++ b/dev-util/schroot/schroot-1.4.25.ebuild
@@ -1,34 +1,33 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.14.ebuild,v 1.7 2011/12/13 22:24:32 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.25.ebuild,v 1.1 2012/03/03 21:20:28 abcd Exp $
 
-EAPI="3"
-WANT_AUTOMAKE="1.11"
+EAPI="4"
 
-inherit autotools base flag-o-matic 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"
-KEYWORDS="amd64 x86"
-#IUSE="btrfs +dchroot debug doc lvm nls pam test"
-IUSE="+dchroot debug doc lvm nls pam test"
+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-0.19-r2 )
 	lvm? ( sys-fs/lvm2 )
 	pam? ( sys-libs/pam )
 "
-#	btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
 
 DEPEND="${COMMON_DEPEND}
+	sys-apps/groff
 	doc? (
 		app-doc/doxygen
 		media-gfx/graphviz
@@ -44,14 +43,11 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.4.7-tests.patch"
-	"${FILESDIR}/${P}-debug.patch"
 )
 
 src_prepare() {
 	base_src_prepare
 
-	append-flags -DBOOST_FILESYSTEM_VERSION=2
-
 	# Don't depend on cppunit unless we are testing
 	use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac
 
@@ -62,7 +58,7 @@ src_configure() {
 	root_tests=no
 	use test && (( EUID == 0 )) && root_tests=yes
 	econf \
-		--disable-btrfs-snapshot \
+		$(use_enable btrfs btrfs-snapshot) \
 		$(use_enable doc doxygen) \
 		$(use_enable dchroot) \
 		$(use_enable dchroot dchroot-dsa) \
@@ -78,11 +74,10 @@ src_configure() {
 		--disable-static \
 		--localstatedir="${EPREFIX}"/var \
 		--with-bash-completion-dir="${EPREFIX}"/usr/share/bash-completion
-#		$(use_enable btrfs btrfs-snapshot) \
 }
 
 src_compile() {
-	emake all $(usev doc) || die "emake failed"
+	emake all $(usev doc)
 }
 
 src_test() {
@@ -94,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
@@ -121,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
@@ -166,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"