Add new upstream version

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

4 files changed, 200 insertions, 19 deletions

diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog
index 86ecf76b0dc6..0df502210a13 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.33 2012/03/03 21:20:28 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.34 2012/05/26 06:25:17 abcd Exp $
+
+*schroot-1.4.26 (26 May 2012)
+
+  26 May 2012; Jonathan Callen <abcd@gentoo.org> +schroot-1.4.26.ebuild,
+  schroot-1.4.23.ebuild:
+  Add new upstream version
 
 *schroot-1.4.25 (03 Mar 2012)
 
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 45997dfc3b31..17d09bf4cc9c 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -6,25 +6,27 @@ AUX schroot.confd 371 RMD160 d7efa36975f549304a1e8a942f6389720d1bff88 SHA1 3eaf6
 AUX schroot.initd 705 RMD160 efdb102d21137a72b20fef8882e2b15ba7dabfc6 SHA1 d585fba4d92dc6d94275e079046e4ce821183b6b SHA256 8f8537c0c6c93d1169c8a333ddd78c4471d95956cfb187e3bd6612a4ad9f78f5
 DIST schroot_1.4.23.orig.tar.bz2 824291 RMD160 61d9a5e74a9fe9ae6260cdedc1edf6929d77cffc SHA1 896ff4c027e30bf22c3fe64fc39398c20c45c200 SHA256 84931c04a789211a87fa31e3b1a6f6d62b9354d3116ae99e2b6bfa0816349d16
 DIST schroot_1.4.25.orig.tar.bz2 828142 RMD160 7231ac5ffd2ffbc43b7f6930d7db437c6cec392e SHA1 9901b78a1b2ec55e4eb09e299f5224502df3d261 SHA256 664d56065d30a5ba8bfe116243f1ef075767d9d379d064f0a5298cbc7778a30c
+DIST schroot_1.4.26.orig.tar.xz 659816 RMD160 7c640bfcbbc35890b3143cac4174551134be1bcd SHA1 27fecbb05646d3f88f625c4e9cffbc0d2b6841a3 SHA256 7caa8dc8d5db95972e8459ef603afc6e0f146a139130fca7555f31217d2d469f
 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
+EBUILD schroot-1.4.23.ebuild 4580 RMD160 372f28029532a284ffb2da3d3a6789e55b4b7f2d SHA1 64b3ee5d029c3a0dd0aa6384a42d53c203b740cd SHA256 a78d13c93302cad222d10d77b9c4063c86c9964a9677560c6ca5fefff3c42195
 EBUILD schroot-1.4.25.ebuild 4523 RMD160 b056f6dd9f533bce9288e7048b256c758c81c985 SHA1 de2b2d6ee309744ed6f7337ab260df86c3cf0452 SHA256 10d82711b555f2c318ba56b6dda6aefbbd9a70f8f7259ed241dc38142ceb852d
-MISC ChangeLog 5976 RMD160 1f3e8243ba5ecd3fbe5b6d18742a8b49268dd7c3 SHA1 c9f6c09e3a7272d8ac6dd2e95358fee484878756 SHA256 f9ba9e017a1a121d368daa002475bb5c7102cc8dcbee5d51b22061c3dd5a6b2f
+EBUILD schroot-1.4.26.ebuild 4541 RMD160 71836261314fcf73d8f7eaa55164845f6f242e87 SHA1 0d2e70eaa3c60952a311d9270febdd902e18cfe9 SHA256 c30a5dccaace658ebf3d92186216e32a95d6af3f5da9778a0870d23fd9256bdd
+MISC ChangeLog 6133 RMD160 becccb822632a658c0d7028ab880647468606e69 SHA1 7a654600a6d0b2a9195ee39b47bddfbb54fbde83 SHA256 7354d542dc5221abf8cd003e791214363b7eb827fda345a471448a7c9cfee070
 MISC metadata.xml 515 RMD160 503109571ab38b803facd58ffb77de4c99abee8b SHA1 e6be1d578aae7a1cc418ba886a12598d89510599 SHA256 f2da069d2bb008f7a2187b5a2c2770657eae391a08d987d9a9bf5174266193a8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-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
+iQIcBAEBCgAGBQJPwHdnAAoJELHSF2kinlg4FDwP/iL9gZiM+ctcl9aKr0QHTm3p
+Ir9Y/r+aKeYYpO/oPjv9hU/op1NFpYggoRQA06Cn/yq8hW7EKyG4MAoCYEDafGxM
+bcYeeN26cr3KZYckI2Mp3DK9s53Nqb6PvevtvTx+9+/ClcVyl+bSEw72zC7na19P
+zP9q+NXu/lz7L4ngv35cmb8+xnFB0pDElb80V/aJ4pi+ha6iLM90mPB9XUn/rpY7
+NXxZaw0A7A17Ii+ufu4HC/b2/mZIvvOEhTGesbJIX/JkuN/YGDvDxnnD1SABuE3s
+T3zFbSgCeo0/Kq+YVlB/YCbsyOS3LOthc0ArZo9dyEZ/kEb/r2JjGvosNiTnY+gL
+ObFOPKfbW7ctvK/aHiznHK0q8ibBgKpJKkcCqjtoTAHXGkPFY67C/C5CcXCdHBSS
+98s/wK2N+raZrtHlh4Rm091/YE5AarMGPmTaD8VlZoE2NOViFtBkaVAeVRH7FNa/
+4CpyBV2BRmolY6qKIAuYpcxPsvyhLSvDYIh9Zkcdr0Cm3X3exNIlyRjMgbj4CGId
+BYA3kurfSnX+HCtZoH53YKQi+9aatj/PEWucTlLTWqMjfVgeLRh1LLLyxvCvuFTm
+BjDmZ8w01UtmAH6Oewh8pQlfcvhRlpZAPH1swLY1s1BJL/WdzIUekUeL9P9YJpt0
+hDYaHsWPoVZnnUY7bPuE
+=C5Vf
 -----END PGP SIGNATURE-----
diff --git a/dev-util/schroot/schroot-1.4.23.ebuild b/dev-util/schroot/schroot-1.4.23.ebuild
index d83fc6da36b6..567079ee6e70 100644
--- a/dev-util/schroot/schroot-1.4.23.ebuild
+++ b/dev-util/schroot/schroot-1.4.23.ebuild
@@ -1,6 +1,6 @@
-# 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.23.ebuild,v 1.4 2011/12/22 22:02:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.23.ebuild,v 1.5 2012/05/26 06:25:17 abcd Exp $
 
 EAPI="4"
 
diff --git a/dev-util/schroot/schroot-1.4.26.ebuild b/dev-util/schroot/schroot-1.4.26.ebuild
new file mode 100644
index 000000000000..55f036b84a3b
--- /dev/null
+++ b/dev-util/schroot/schroot-1.4.26.ebuild
@@ -0,0 +1,173 @@
+# 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.26.ebuild,v 1.1 2012/05/26 06:25:17 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? ( 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
+}