Bump to latest upstream

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

3 files changed, 194 insertions, 8 deletions

diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog
index de783d17d3a5..187081d9e95e 100644
--- a/dev-util/schroot/ChangeLog
+++ b/dev-util/schroot/ChangeLog
@@ -1,6 +1,11 @@
 # 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.27 2011/08/05 14:28:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.28 2011/10/23 01:10:22 abcd Exp $
+
+*schroot-1.4.23 (23 Oct 2011)
+
+  23 Oct 2011; Jonathan Callen <abcd@gentoo.org> +schroot-1.4.23.ebuild:
+  Bump to latest upstream
 
   05 Aug 2011; Markos Chandras <hwoarang@gentoo.org> schroot-1.4.14.ebuild:
   Append -DBOOST_FILESYSTEM_VERSION=2 to C{XX}FLAGS to compile with new boost
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 3c8b8b451bd2..03d949e7f97d 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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
@@ -8,17 +8,27 @@ AUX schroot.initd 705 RMD160 efdb102d21137a72b20fef8882e2b15ba7dabfc6 SHA1 d585f
 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.21.orig.tar.bz2 791504 RMD160 759c4881a8502d9b4b513c2e6cd668d4bd486178 SHA1 a17da5776af1bf96f427185fd80db1b66b94774a SHA256 a9fd91ce60b239368b91817254c8819e8c1f8730853016627967cb29307b8d88
+DIST schroot_1.4.23.orig.tar.bz2 824291 RMD160 61d9a5e74a9fe9ae6260cdedc1edf6929d77cffc SHA1 896ff4c027e30bf22c3fe64fc39398c20c45c200 SHA256 84931c04a789211a87fa31e3b1a6f6d62b9354d3116ae99e2b6bfa0816349d16
 EBUILD schroot-1.4.14.ebuild 4967 RMD160 ead45c839722a754339494cd94d95ce20fd4e534 SHA1 3f864742c09ed1b5d5c718903baebc1daf4b9b95 SHA256 f6c465795381fef1c2a70808e21f8f79d41672e292904655c958be06b80624fe
 EBUILD schroot-1.4.17.ebuild 4917 RMD160 86e866ac32ed6372e7b5ffa2a6916e0a1cb5047c SHA1 6cf38860d81a834ecd77e663d324f4ffa127a2fa SHA256 9aa054539c549c06d500119d17a080614420e05e166665e7d3f46525dc11d6b6
 EBUILD schroot-1.4.21.ebuild 4518 RMD160 8a0644d577df0cc8c17d10149b85107dd8bfb692 SHA1 4736da3a7a9625e28b74a566b75939a86cc2a5b7 SHA256 85486920c43099a262734dba3fdbc86caf2ef839ca801bb02dc9b2926dc661a0
-MISC ChangeLog 4990 RMD160 8b5d6c8a8d6712e1e2ecdd33cef858ec9bb9cf95 SHA1 d32ea2e32bd15fa0779a79851c5811bf60fa7a20 SHA256 a633e054d2bdfb6cd563554cb494391fb7dd437477c6d44eb91dc1e9a4416f39
+EBUILD schroot-1.4.23.ebuild 4497 RMD160 030df5d7a4dbeb6ba5534907ea0edf2d0fa4d7e0 SHA1 08673f2611e17d5ee02f37dc7264bfcf78aa8761 SHA256 15efb74a7537350ec038c876517b1d1df942e8db59fde673e3abde5dbb7836a9
+MISC ChangeLog 5117 RMD160 df6b6b622b1359b49f3837666278bf44bc7e328e SHA1 14964a05ebce9463e737e8b77e07bea7af16a7a8 SHA256 abac4a7b22a93dce4f4a62d1aa1d808b21b231fe8bd101453529dc32347f11b4
 MISC metadata.xml 515 RMD160 503109571ab38b803facd58ffb77de4c99abee8b SHA1 e6be1d578aae7a1cc418ba886a12598d89510599 SHA256 f2da069d2bb008f7a2187b5a2c2770657eae391a08d987d9a9bf5174266193a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59m4cACgkQfXuS5UK5QB0aBgP/aBy0ZbWmw1+De+ANnmuPuwWQ
-ikQRBTkM9LxDA7zLitjkgM0TXH9jUkXEKtFXz8SRXMEXmpw9m88A6YYRpDso5Cuh
-0MHIRvAjEuYczJSFgt2G6st2a2NN3WBQSc07/qkxjVvXw9ZNGaNWREJZ1O+tl2ox
-gjVS7ZneCCqVXphXjqU=
-=JZP1
+iQIcBAEBCgAGBQJOo2mOAAoJELHSF2kinlg4FmAQAKIlqp1XB5dsoVe+RhFUfdPA
+yEtuteqZ1zw3/c4on6GYMEgsiNTwaAiOsGmOt1GsU4FPTnItJzXEcc3Ms/JBGvvG
+WNPguZThDm+8t/fJG9xmJNVq1xp8ewJsx6kv/BATYf+8R0+NeNLjILeaaNEkSB2b
+rx8T+QCn9uPZnoDj+T5BxTtdbDezTWLxuaX+iq/bf4GOOTzAcZesgehcRGQXjx6w
+pUUGcQgtTAS8bZLQ8D8EB0/m/NIXUUSfU3NDC6a6yvgNWpTnuw+noBDWCD9ow/XE
+hzr9BPcBj0WYQBwHHgjYV2VJhYniP7xrsz3FRKLcw2Y18RCWEsG5kz/gH/78/Byq
+hQ9Jegp0tUyrTKWbLVRWVnG75Ubhfs0lmyS4x+vLs5fTQAzJeRaqLEjOydgW7jXZ
+cpY3vUQS4ktwO5XHfcyWTBtlPrM2/L2iIiDwG1bwQUB8CX1hKrn/DLVm7fPGjDzt
+q0b2rD+KObP3dMcxmXp9hR18Ezoljn1xmMS8/6GZbPyUpyUmNrp/YW7r/E0hhd7D
+MlTLSwcEAJ8C8zPlPHKgphIo0YKKM3p4jUZ996Bg+mqNJSFYcs2RcH5QUKR4YObJ
+R0kAoPAXm9RFO23CZGQHPAHmw1jD7soUjMT7TxZBA2iXHkjh6R5O3T1ILyJukjx/
+FQ+loRegNrR1M3IpJu2W
+=Iz3X
 -----END PGP SIGNATURE-----
diff --git a/dev-util/schroot/schroot-1.4.23.ebuild b/dev-util/schroot/schroot-1.4.23.ebuild
new file mode 100644
index 000000000000..1e140ae6a8d0
--- /dev/null
+++ b/dev-util/schroot/schroot-1.4.23.ebuild
@@ -0,0 +1,171 @@
+# 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.23.ebuild,v 1.1 2011/10/23 01:10:22 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.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)
+}
+
+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() {
+	default
+
+	insinto /usr/share/doc/${PF}/contrib/setup.d
+	doins contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
+
+	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_preinst() {
+	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
+		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 [[ ${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"
+				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
+}