Bump to latest upstream version

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

3 files changed, 199 insertions, 16 deletions

diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog
index 5dc89f4a0fc0..532a9ec7be5b 100644
--- a/dev-util/schroot/ChangeLog
+++ b/dev-util/schroot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/schroot
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.21 2010/10/19 02:32:52 abcd Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.22 2011/01/06 23:41:17 abcd Exp $
+
+*schroot-1.4.17 (06 Jan 2011)
+
+  06 Jan 2011; Jonathan Callen <abcd@gentoo.org> +schroot-1.4.17.ebuild:
+  Bump to latest upstream version
 
   19 Oct 2010; Jonathan Callen <abcd@gentoo.org> schroot-1.4.14.ebuild:
   Fix build with USE=doc (bug 340078)
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 3f3c3d02c711..3f3a42e736a7 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -10,29 +10,31 @@ AUX schroot.initd 705 RMD160 efdb102d21137a72b20fef8882e2b15ba7dabfc6 SHA1 d585f
 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
 EBUILD schroot-1.4.14.ebuild 4876 RMD160 7c1fdf3a36f033857452b25820dbea2a4a3b19a7 SHA1 1398a359b823c3ff4337df0a31e2a773ec4eb081 SHA256 27199d85efcc8772a413ca41f6f81d214c106ab9688f6cb53ded066c7ba565fa
+EBUILD schroot-1.4.17.ebuild 4877 RMD160 2574f88d830a92e30cd0304f1a5d4b91117dfa04 SHA1 b8b2a28c76bb49eba2aeac428ebc00b639a48891 SHA256 cc7d8c337ce6443a0a39a147e0c40c26b91baad066d2b5ca4698ea240bc7ce64
 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 3889 RMD160 02cfc521d0197197731a3a6b46b9fa044fae14ff SHA1 cc7098804c18c34f54941e3196c902bece507d92 SHA256 9a40673700fd06972c477f127ecf3eeea7da47b192a5e41d7e652b4347f8e976
+MISC ChangeLog 4028 RMD160 671d11ce2625a90aba0e2a1a6daed62a866550ff SHA1 0a0072a3192985a1e71939db75c8b0293856e97f SHA256 a949b83c7ff2adf1b9a1f7d3cc4b18fa8c2fed2b82aa0d221a2e4bda03f95de3
 MISC metadata.xml 536 RMD160 216dabacb867bfb76a5de001768c8fd6dd0e4401 SHA1 7bd2448091a7764c4d3f9958b51535d7208e9d7c SHA256 f849ea1dea313c749313505363350d321435336c5ae2c3952dbcd1d7e0fc29ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBCAAGBQJMvQNgAAoJELHSF2kinlg4Oa0QAJ8e17xEtlMEaxwIIRQESshp
-TzvBKllxgHuSVMwjlXEVO10lSfuv5o4G+n2mytva+r7QcJrGcH+oCOEhpTVwBB65
-6Kn8zHWgX2AbYuRCtro027Z/cIYGAQUwf5lip/W5ethkpHkzHlwgjt+gn2O2L2m5
-jgJOAkiJCAPh6r0lb/620nBnSiBLUQu22m8ZZZqA1t8Vtrpr1ctpOPggi2rOMJSo
-SLqY/NVZimKW1d/ESFRAqmzcRwlvaXMi685f2guTxSHiMRiX21+WgTtLQ59XDGR0
-4Zi4IAewpOMcAG4qGblgDa7apSm/c+dm+1VnLJTo0zWrfXpL5PMWUwHEPbSr7Mxf
-Rc7/sTvtQhIuio0/KpPw6g2XIBXss3aaXQclU+TQfSsJR5wI1kmcWg1fGjmqIhpu
-WDhdcCbAnH2RcRHbq34OIUnPesDVIcG0UzXZCLHw0YfY3vwU8lE1Tm4kzm69HQVi
-kMhnKGyDtN9AUskBPP7K1lULUZaQtPFvl1bL8fKc8rVEMAs4zYLWvJwoNlBP37fl
-BKlm1+XKdAPSELSDr2hXwvZ7cL6bh8qMEjuk0+uOjsmPDKZCxs+T8axcAkeO2xru
-qVoy0bq9pElUbCpBWp1ZzOiCJlSUEOgIsE0O3N1SDXA93q7ZeNlOT64P+tYcKNpB
-TZasH3s0tPSf3Ve5w3vU
-=zhXi
+iQIcBAEBCAAGBQJNJlMnAAoJELHSF2kinlg4RPYP/At4MiGws8W2N0Ean5Qh3Voo
+Bs0Xqfw4tDa6JRfMigQNo8y7VXCNoA6XLaAbOqly2DlHZooxfPJ9umwQoSDBPloF
+1DVVkFQwAooBp0wO5od5wYJum2XrWGRpUtn8D7rNAw6Cp8HJAHarNwhznIT4j3ZM
+2b50oeUlser6BBReDmaV/TjQpHZIW4wOSOUPA3pcR9/pj7WDMjT1OkUkWSjn/Gco
+WsuK4luvdPIFztXjAaugwrTqwJQpOoYtUdqlozFvjPS2ZG4raG95Vf1fERE6m3T3
+L/3tfMZbkGObMFBs8dmgRayQ99/FUN1eET8WW8HZ9/VQjHK5IoLXDHlW1EStXRbk
+idCz3IprUr6YE0tPmGiAoeAMFQ7GZvonOIxMWO0NPiTB2qJX93LNuZ8UE4CbD/iH
+/zrOJWPvWNhE0h64SQmRW9XhDuZ5D4rH0n6RX5dkmE/xJr2j5gK/WnMr2pVOble5
+Qp8vtkHwRxQ7Q48hG+r2x8/7KGnVuwpe13F7x5+M523TJzoAUyA+lBYnjQWTvlRs
+NugnLTZ923cfPbFmOHPrQaZpA2+Dv+4ioPk1sVfYtCXvuL6nDN116OUDcZhkgp9x
+Db/yeAgZnSk2hCtZZ6I/TCnd+VGdIFbODxB/WEuwGNm78sqk5DyLNkmpWrbOFF9G
+uhAZcm0xB+oQUtLw16Am
+=5ZZM
 -----END PGP SIGNATURE-----
diff --git a/dev-util/schroot/schroot-1.4.17.ebuild b/dev-util/schroot/schroot-1.4.17.ebuild
new file mode 100644
index 000000000000..5e77b7c8f3f1
--- /dev/null
+++ b/dev-util/schroot/schroot-1.4.17.ebuild
@@ -0,0 +1,176 @@
+# 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.17.ebuild,v 1.1 2011/01/06 23:41:17 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.bz2"
+
+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}/${PN}-1.4.7-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_compile() {
+	emake all $(usev doc) || die "emake failed"
+}
+
+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
+}