Bump to new upstream version

Package-Manager: portage-2.2_rc86_p7/cvs/Linux i686

3 files changed, 194 insertions, 15 deletions

diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog
index d5b41ca42c0d..9a07bdd8b294 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.18 2010/08/13 09:04:04 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.19 2010/09/30 02:50:46 abcd Exp $
+
+*schroot-1.4.13 (30 Sep 2010)
+
+  30 Sep 2010; Jonathan Callen <abcd@gentoo.org> +schroot-1.4.13.ebuild:
+  Bump to new upstream version
 
 *schroot-1.4.7 (13 Aug 2010)
 
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 098c798c492a..dde07a5e87fa 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -8,27 +8,29 @@ AUX schroot-1.4.7-tests.patch 2427 RMD160 0e10f31a46d4d828b1a1a52159f88db26afe93
 AUX schroot.confd 371 RMD160 d7efa36975f549304a1e8a942f6389720d1bff88 SHA1 3eaf672a13c6dd4fadd01b7c1c54bc82f71d5b93 SHA256 68efa89cd4b358c6de050ebb5b973c87ee514fe5e5d888f63aa0af85aa4736c8
 AUX schroot.initd 705 RMD160 efdb102d21137a72b20fef8882e2b15ba7dabfc6 SHA1 d585fba4d92dc6d94275e079046e4ce821183b6b SHA256 8f8537c0c6c93d1169c8a333ddd78c4471d95956cfb187e3bd6612a4ad9f78f5
 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.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.3.ebuild 4607 RMD160 c8c950ee3171e4f88dfa6e5c77c8b547342b5877 SHA1 b01bcb6e8a9d0f94a344dbbb049a0591b93fc570 SHA256 2622bc4b1ad6827226fcc849095bb39a72070b1806c123012a4dea5acbd045e0
 EBUILD schroot-1.4.7.ebuild 4804 RMD160 de2f6ff5b6e78bb3e348f381af81762e7a0fdd35 SHA1 bee890eee1b815ad2927ad99f3bdab98a7e259cd SHA256 52008e82b50f732cb5b3270034612abdd1149a03df4ecfeac4008a69547a738a
-MISC ChangeLog 3460 RMD160 82521c6fbd6d40ddf7d7ea33ba167a131b8a2856 SHA1 dbc6a9785609aaace0e3d8394f45cb844f98131e SHA256 8681b24b9570e39c1b5e61b130866b5209cd0e619373d171c509c310101d0135
+MISC ChangeLog 3596 RMD160 419fe77d9557145c1d26c5a85aa76bff9c0ad2a2 SHA1 cec10c7ea846e439d6144106a3ccd414b4cfad9b SHA256 315096cfdb6f0e8cb298c2a7aea43a0e2becf34dcf4534293b9a91e1487990dd
 MISC metadata.xml 536 RMD160 216dabacb867bfb76a5de001768c8fd6dd0e4401 SHA1 7bd2448091a7764c4d3f9958b51535d7208e9d7c SHA256 f849ea1dea313c749313505363350d321435336c5ae2c3952dbcd1d7e0fc29ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBCAAGBQJMZQqPAAoJELHSF2kinlg4nRcP/1ZbPopC4INMiQIjcbjx3p/E
-AgiaPrnnUytjNqVJIOb2VCZHywnAYhzSdPQIXPvAkFS0b9TzRU/WWkySIlY7PheA
-WframfgdXuKS69gKfXa7gwltK8pTodKwU91RWJJ3Q0HXGVsc29z6zP1v6vl3OwTk
-9ULN+8z5jlcmWsr+bZLTLpgiBy0Z8fGQmiXP+8r7zangTJ3TaTt8Zhb8NcL45HPn
-4nLW6YwtRv9wwN+3BTxYCPjen4qOCHIkfm5TIZKSFf/aEDVMF2h2vj+tHPqYI93e
-ol2FUny8lGNbaSFiZVNfK2S0Qrz+ayBGYLBzqlYksOEtLNqoBU8up5p0QlOz+Fmz
-VJB6u7G6nJgk+8HrysjtBuzpnazLX4IU7cH9X8M0WX9MkcMcoNlm/eKa9DoRNQU7
-/qS1rVVDxwbilOTvj99QlmzykTcNijHbSh9V9yRPjDD87LRKSsdhtbdcWWduSwxg
-B4iBIUxTELEwhxBCJG6TWSrQVJrdkkWaZdhydc1ZUtOpkazQ+gYQCCIBUHhBmPQX
-a6hzlbRxI4Uj/enGuUcrJJmXxKZQOZnAfByxwxsLJ/GvHfUVb4GSFHk98jlMSxoO
-HOw88Oqsz9dcYXzyd6IAMjjG5gCXJ3HNeSV5vXiohUl6NEbblaNUK7F83nJPwYa6
-YbrMjSLQhhTqf1oUsOXg
-=gqo+
+iQIcBAEBCAAGBQJMo/sRAAoJELHSF2kinlg4lj0P/R2e5X2aw4T6bfXxTrGsDr3M
+O9nbRkBE8ncFMOKQwfpxF8f1PnwLwViFJ187Lr8FtQJw0NKJ664pOY5QeAzfMGlH
+2KJHzB2BTD6mhnbzd0mc/+XlM3lAyo8z3ixfkbtP04NxrPXmtYJJSDVEhkrXmbx9
+7SJ2lInW35mw4EscWorV8JWNp3340dMrqqT0JpVVtgRDEM38pJw/YwqOMbx8FLbS
+SebMY7zPMQeSMfSgO/HJbTsGWCpKawu7gnZhzd8XRPenYlUZdMP8e0N+m6/wiqld
+FgcHR9IYcx+41l3BTenSZLrLgu3FPHRGJH3Nud5ZYw7xPnWCRRsexvZduEns6oK/
+vZMqDWT61Z3G8KvCISoBAZiTKCC5TpP3KkpTNz94ihSI/OBKdwzVlxsVFbs+3n9G
+qTRxnTWIFQ8Gtj+HVxYEfjBLN4i3gqZzn49aehY0KJkDTjZ2EMgdmcCxlx+zNV57
+yLdUbvUO6QZDjE3c857s5hNeSuJI9Aj5wwurKptySs28J0v9IP4AuxnbnyK3UTGN
+5bhiCHwGc58ErAykC+0Mf7GXufK/4eeAjVmgdbrMv4QKmfdDqIAplZIu65W/3j8i
+eiilKi929aRamXLpLYwvBiodD4E5Z+Oo+1GT69ETxZsCMI0RhOdbNvXM7SgjYnbD
+Z4nAbTiae3umSvN8QE8d
+=mOHA
 -----END PGP SIGNATURE-----
diff --git a/dev-util/schroot/schroot-1.4.13.ebuild b/dev-util/schroot/schroot-1.4.13.ebuild
new file mode 100644
index 000000000000..5ee9321e588a
--- /dev/null
+++ b/dev-util/schroot/schroot-1.4.13.ebuild
@@ -0,0 +1,172 @@
+# 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.13.ebuild,v 1.1 2010/09/30 02:50:46 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}/${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_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
+}