New upstream version

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

4 files changed, 248 insertions, 3 deletions

diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog
index 0df502210a13..b742517311c5 100644
--- a/dev-util/schroot/ChangeLog
+++ b/dev-util/schroot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/schroot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.34 2012/05/26 06:25:17 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.35 2012/09/20 08:46:20 abcd Exp $
+
+*schroot-1.6.3 (20 Sep 2012)
+
+  20 Sep 2012; Jonathan Callen <abcd@gentoo.org>
+  +files/schroot-1.6.3-tests.patch, +schroot-1.6.3.ebuild:
+  New upstream version
 
 *schroot-1.4.26 (26 May 2012)
 
@@ -169,4 +175,3 @@
   +files/schroot.initd, +metadata.xml:
   New ebuild. Thanks to Nick Fortino <nfortino@gmail.com> for initial ebuild
   and patches (bug #257334).
-
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 5127d6c0daf3..0e2abb8e2bd6 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,12 +1,35 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX schroot-1.4.7-tests.patch 2427 SHA256 32e6aaea6a3646515040892d6e942ec7509219d5f7a87572f75a76caf89d0146 SHA512 c071533618744710c581e2f744971620ab95fa1db4242e5d885e9ee0d107da5ce9d008ed7cee4cec8c5bbcacab00ca73f29e59086b637607505616bb86143af6 WHIRLPOOL fbbc2c30d5cf781757ea6d075946bbc627472f81a1f3bf33c75ed8520982c99b2985663a917dc3aaf975f74aa87089c059256944ae1fedf11991b2442a7a6517
+AUX schroot-1.6.3-tests.patch 2947 SHA256 6bf27ee40dab7f9dfb730296bfec842813b5572989f4d95b1762d206dfb1e191 SHA512 170203e6a2449ea0c0d8232cd0bac908e626eb4998f366e64e6e07dbcd3c9608155b88a25585c226fa62c224b18e4d35cd863b082b2665b01960edc47d873c24 WHIRLPOOL 424f3bd46b64d3eaaf7b0ca49e412305c26fd45b86e8b322b98f760b9e26511d46f1fa453b08a1677aba621a32591971a9f7d2f6d7a0b62f5194c667f69a68f7
 AUX schroot.confd 371 SHA256 68efa89cd4b358c6de050ebb5b973c87ee514fe5e5d888f63aa0af85aa4736c8 SHA512 b86944ee7fb2622ef0bd9c9252a51724916427c6bffa1dc0623a40190e4866ffda48f8999790365f4a589ea647e3695077b6cd7ec8a1d1ab6bd026a5c7480c98 WHIRLPOOL 921b6677f8400e94d8f5714e24d8c8cf1375fa4b79dac1fe4f67ef338f7c8ad3d8ee072ef64d70473f86c27f93e4b413d4fd3c69968be88f46a6ca87a9fbbc58
 AUX schroot.initd 705 SHA256 8f8537c0c6c93d1169c8a333ddd78c4471d95956cfb187e3bd6612a4ad9f78f5 SHA512 263c4a69d0249884db635906d6b8a86ec1bfbf605868e75cf961ac4e357069ac37bb696e93c5a17dd87b86e1e6c1b1720bdd0b0ee98a61702ebe7dfb9650f409 WHIRLPOOL 23d5caba09d633e26d7ffe94996d95b25eda8a9b516ec0c15f1e997471d21d5ae7648731e867f92606f55ecf4d37632ed55d1088298bce25ce4bc0b1f07d2dd2
 DIST schroot_1.4.23.orig.tar.bz2 824291 SHA256 84931c04a789211a87fa31e3b1a6f6d62b9354d3116ae99e2b6bfa0816349d16 SHA512 f15fa6b365fa4885238af9f29abf0f701cae8e44098e8dbdc0df3a22442bdb2bf47919c0a8d7b0eea741f0042bd008b5797894765b52acdce113071ea4acb573 WHIRLPOOL efa9ada10cf48b3d0eee148ac40abc62812ea27f79cb6e848527275b479324657bbb2947218334c431e02e6cb5a0f508897763b75b3b7361d050a01ea52b22c1
 DIST schroot_1.4.25.orig.tar.bz2 828142 SHA256 664d56065d30a5ba8bfe116243f1ef075767d9d379d064f0a5298cbc7778a30c SHA512 fdc56801bce1fe69d9dfbf77e42e9a80ec8655d3d0ec9e6712c8bc91a2ee0d728adf0598ba4564563a47d3d123fe345e86be3c978bf675e6b636a4f04723f0a5 WHIRLPOOL 3def003ce149941aea50d42fdcb4306ca42f90305c936bc2c3fad466ace2a405bb44cf90ad52eca8e3d09fb60562f9a523d5dd0e1c2a1a8426d29c9d1c7d7ba3
 DIST schroot_1.4.26.orig.tar.xz 659816 SHA256 7caa8dc8d5db95972e8459ef603afc6e0f146a139130fca7555f31217d2d469f SHA512 b62771526cf61d6bdab2659c040ea26951a8b0d43e5f7bbb5a5ead6af39bd582d5c912f2dea6a16feb97e3d828c4576225e2925acf56515af9c6b1b02ec8e08d WHIRLPOOL 430fbcb2dfa070cdf956363eb98f25ea5eaf06ebe98602fdec743112f03dc101b6fdde77d6cc80ee604973b9ad174c3e2dc5907fd52679c6a4416edd54cead32
+DIST schroot_1.6.3.orig.tar.xz 730756 SHA256 0b914a0ae1eef0288e5bf016c14031d3433d1b3f18820bebc5480647594ebc82 SHA512 e435715091eed17e1f073218b2cc2355ad529bb702b9f8cfeb58ed3be38b78fa61280713801ce29e5b21c93939f5898e6f6e4f493d3f7d2550a873289a6c22be WHIRLPOOL 065142aa34a225d0cda44ca3d3703131fe2a0ab46ad914bf386a58dd0480650ca03a5b6d00216eca41edff5a534083874d121623002aec57e933a95a4d2cc60f
 EBUILD schroot-1.4.23-r1.ebuild 4510 SHA256 6b0fd39dfac3e3757c8042d07001b0d74519c846fa592de2c85cec92905fd392 SHA512 4aebb1274d22248b9f9b943b54a8333e863fc9b160b15c463c0f8516dfab97e26750a4dedcaddaab617851de86194d062d7b9832bb5b0fbdb117b61e4a354a32 WHIRLPOOL 3c5cf65ad861f7d514ee376db3938537fa2a599269d031e51c992b3b28f45acfbdbae093635834a10a103c4c6dd07a4f99b06e2a7b4173253a114662056b46be
 EBUILD schroot-1.4.23.ebuild 4580 SHA256 a78d13c93302cad222d10d77b9c4063c86c9964a9677560c6ca5fefff3c42195 SHA512 4b3358c5e39be3047c5bd858c59241e8aa73f73bb5fd5a45ec8ecdde0e423c981f38362cf1e886b7f949253d4270b74dbae42a8607683a4c62c3a04591e93283 WHIRLPOOL ae5576ff45771d5f34a9440f893c40913fd9b485a934ced6620c2f1b5aa464e137e254a46531b2e8a085978a5f0e38a4a7b145fd0b4734fdc3188c06e2a3f670
 EBUILD schroot-1.4.25.ebuild 4523 SHA256 10d82711b555f2c318ba56b6dda6aefbbd9a70f8f7259ed241dc38142ceb852d SHA512 a7e766e4cf5a643633879135f395a046e921b6b905149ca8807090b62df9b75fc970bdfd2feebbff83507901921a388830b77eee231082615cc87f7f5ada52f2 WHIRLPOOL 17611a287db2728c2347c266984e3ee38eaca850b479a5b9d7b338bb67c1f8731ca2f5abb2233e0cfc45118071e69c8c5340bcc7b987ddc39f74f50c0c91ec5d
 EBUILD schroot-1.4.26.ebuild 4541 SHA256 c30a5dccaace658ebf3d92186216e32a95d6af3f5da9778a0870d23fd9256bdd SHA512 a669086bf2b0de086a07ed18b0c81a9c373a47d9721fa02e5fa7951e26870d61826bd81e807f8e689f078c2438c70acd68a6422af90cbf37218da35ced7db585 WHIRLPOOL dbec740691da142bf9dadc0c20d2f5755376b61d926329541e8f1da96cc1c824743d5a2fef48e4d55ff9f7646f7984a1a8a51db808496fb3f76b7c6a355af3ea
-MISC ChangeLog 6133 SHA256 7354d542dc5221abf8cd003e791214363b7eb827fda345a471448a7c9cfee070 SHA512 642873519ab0649f1f577a6210e4247c74cee4fd44c8affb14ccd6247ea818e592c9665709c3f0a04bf29818162363e25dbf566b69d05734474f4b623075adab WHIRLPOOL 1efafbb1078537e6d4945478dbc650f7ae7ade35d694722e410eda9cc0ff307e39ba797119c6704e6f31b012ceef0bd9632ac9687dd0e6800f2b69dd8e71d3db
+EBUILD schroot-1.6.3.ebuild 2958 SHA256 fc74f7093a169f3a700b9ebffd302c912df6c3e93217c4374e0d9682451319d7 SHA512 a247bbf493f6742f4f679c73cebc45490eedc50d228289bf4174f5188a31db8813dcf8eeb0005afbaa75cc417d69f216e7f058f4561be869a1ab3d1e1011fd06 WHIRLPOOL 1983e1ff272e725f95f16947f29f961e9a616ffb77fe041c177f90d4330197613a22d93990d34705b8334cadcdf3733fd0f261a285728bbdf92e31412b421c32
+MISC ChangeLog 6294 SHA256 6ac86258dfb7ea71781cfba4d70e25a4e2a4b2311d9c8087060f063e14c468bf SHA512 d0a7d3c8efce9084d05f501dfe82bf9270684e0ebc6a0c4e3f5650f7c181ebfcb210394100347b5c03c1841c92f848657bdd07a70ea710e4fcaaeed68deef51a WHIRLPOOL 61322c2cecd5024f6f125736aa8ea007166f1deb1f94b0c59d13d277df34f6190e7d4c2af93d743d542fd050c4217e464148449b0551e5942571dadf74dc122a
 MISC metadata.xml 515 SHA256 f2da069d2bb008f7a2187b5a2c2770657eae391a08d987d9a9bf5174266193a8 SHA512 07e4f0f1746854988c608aa64d3214fda967d923fa46ec8e2a58cf02327589c3af898c7884ab88ee4d5dc4d35b827618e807a04a4614d75c3b7258b08509bc11 WHIRLPOOL 9414667d5cdc2acebf6169d9264a2efb9876bae3e554050f31b26ce4bc61c55e11e847ac334336abcac181412816754078b5157052f0b03a3a16be5932dcf96e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQWtfmAAoJELHSF2kinlg4yDUQAK4qTee3hnUfy6U0TCVKyYaJ
+1dc+ygt8mcnPsOcs+JxUe5e3kroFPpAPwHJzAX34dQTTRQOqpjjKQZrEUd9pFKiJ
+lDALk1TY9ZBbCyh1G1hFVsdHhOjEu+98o35fG0rcRclG4Zsqa0rVc0LNpPcW35mB
+F4hBfVGQekoXURnb7Xbwuf8BEUw6WIgcGT1ZPAKVIl3saf1Pd46qj0WlObyqfl9I
+SRzIzdqpUW78iAmI/w5+FSfYzgQypRbmQeaiWtDNRJRhsGYWQZRGqdKLfiMMUWS7
+4r3T7ULKn89S4IiAGn3bvDAcn38XAlLJBmOGpMhVH+WJRM4z2HMNDGr/jLI+X7dR
+xV876pIm6jkaSek/iwaB0dMKlekl9cqi9LklEidlhujcmOskRj9P/keXLHHEKcW6
+pxwH6oxYb5XziolynPWukBZsXLC0gSHzN78MWfLlfSTIoi25b33bxkpk18/POJaU
+YO51pFJSzqmAuDFTQlIPsq+3m6XflcgiYOUtEYaPFOKVBuh3sHMmtMoJfLJLcFZE
+8ITukO7R3MM7/OTUxw+ebS8X/es0lFB8ka6wFISqdg40Ph61CENBd/IsfYHFPEbG
+9cg6ZQLPxqbTGFoRSSxAJt7dLE60VIKA16plGmSAorQ5E0txYL8QaI/dKlZEwBGz
+ri69NRSfGclz8vXLy4bA
+=M2Oo
+-----END PGP SIGNATURE-----
diff --git a/dev-util/schroot/files/schroot-1.6.3-tests.patch b/dev-util/schroot/files/schroot-1.6.3-tests.patch
new file mode 100644
index 000000000000..e58b6bae32ba
--- /dev/null
+++ b/dev-util/schroot/files/schroot-1.6.3-tests.patch
@@ -0,0 +1,86 @@
+diff -purN schroot-1.6.3.orig/configure.ac schroot-1.6.3/configure.ac
+--- schroot-1.6.3.orig/configure.ac	2012-07-23 17:54:07.000000000 -0400
++++ schroot-1.6.3/configure.ac	2012-09-20 03:43:20.451738906 -0400
+@@ -264,6 +264,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++])
+diff -purN schroot-1.6.3.orig/test/Makefile.am schroot-1.6.3/test/Makefile.am
+--- schroot-1.6.3.orig/test/Makefile.am	2012-07-23 17:54:07.000000000 -0400
++++ schroot-1.6.3/test/Makefile.am	2012-09-20 03:45:31.400235841 -0400
+@@ -24,10 +24,12 @@ 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-custom		\
+ 	sbuild-chroot-file		\
+@@ -37,7 +39,12 @@ noinst_PROGRAMS = 			\
+ 	sbuild-chroot-lvm-snapshot	\
+ 	sbuild-chroot-btrfs-snapshot	\
+ 	sbuild-chroot-config		\
+-	sbuild-chroot-facet-userdata	\
++	sbuild-chroot-facet-userdata
++endif
++
++check_PROGRAMS = \
++	sbuild-chroot 			\
++	$(ROOT_TESTS)			\
+ 	sbuild-environment		\
+ 	sbuild-keyfile			\
+ 	sbuild-lock			\
+@@ -54,16 +61,7 @@ noinst_PROGRAMS = 			\
+ # randomly on slow or heavily-loaded systems.
+ TESTS = setup-test-data			\
+ 	sbuild-chroot			\
+-	sbuild-chroot-plain		\
+-	sbuild-chroot-custom		\
+-	sbuild-chroot-file		\
+-	sbuild-chroot-directory		\
+-	sbuild-chroot-block-device	\
+-	sbuild-chroot-loopback		\
+-	sbuild-chroot-lvm-snapshot	\
+-	sbuild-chroot-btrfs-snapshot	\
+-	sbuild-chroot-config		\
+-	sbuild-chroot-facet-userdata	\
++	$(ROOT_TESTS)			\
+ 	sbuild-environment		\
+ 	sbuild-keyfile			\
+ 	sbuild-log			\
+diff -purN schroot-1.6.3.orig/test/setup-test-data schroot-1.6.3/test/setup-test-data
+--- schroot-1.6.3.orig/test/setup-test-data	2012-07-23 17:54:07.000000000 -0400
++++ schroot-1.6.3/test/setup-test-data	2012-09-20 03:43:20.451738906 -0400
+@@ -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.6.3.ebuild b/dev-util/schroot/schroot-1.6.3.ebuild
new file mode 100644
index 000000000000..568e1ec6547c
--- /dev/null
+++ b/dev-util/schroot/schroot-1.6.3.ebuild
@@ -0,0 +1,131 @@
+# 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.6.3.ebuild,v 1.1 2012/09/20 08:46:20 abcd Exp $
+
+EAPI="4"
+
+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.xz"
+
+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-0.19-r2 )
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	sys-apps/groff
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? (
+		>=app-text/po4a-0.40
+		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.6.3-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
+	use nls || export ac_cv_path_PO4A=
+	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_compile() {
+	emake all $(usev doc)
+}
+
+src_test() {
+	if [[ $root_tests == yes && $EUID -ne 0 ]]; then
+		ewarn "Disabling tests because you are no longer root"
+		return 0
+	fi
+
+	# Fix a bug in the tarball -- an empty directory was omitted
+	mkdir test/run-parts.ex2
+	default
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/doc/${PF}/contrib/setup.d
+	doins contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
+
+	newdoc debian/schroot.NEWS NEWS.debian
+
+	newinitd "${FILESDIR}"/schroot.initd schroot
+	newconfd "${FILESDIR}"/schroot.confd schroot
+
+	if use doc; then
+		docinto html/sbuild
+		dohtml doc/sbuild/html/*
+		docinto html/schroot
+		dohtml doc/schroot/html/*
+	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_postinst() {
+	if [[ ${REPLACING_VERSIONS} == 1.[24]* ]]; then
+		elog "Please read /usr/share/doc/${PF}/NEWS.debian* for important"
+		elog "upgrade information."
+	fi
+}