# 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.30 2011/11/25 23:39:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.31 2011/12/13 22:24:32 abcd Exp $
+
+*schroot-1.4.23-r1 (13 Dec 2011)
+
+ 13 Dec 2011; Jonathan Callen <abcd@gentoo.org> +schroot-1.4.23-r1.ebuild,
+ schroot-1.4.14.ebuild, schroot-1.4.23.ebuild:
+ Remove btrfs support from stable version (requires unstable btrfs-progs), bump
+ new unstable version that depends on the correct version of btrfs-progs (fixes
+ bug 394529)
25 Nov 2011; Markos Chandras <hwoarang@gentoo.org> schroot-1.4.23.ebuild:
Stable on amd64 wrt bug #391787
AUX schroot.initd 705 RMD160 efdb102d21137a72b20fef8882e2b15ba7dabfc6 SHA1 d585fba4d92dc6d94275e079046e4ce821183b6b SHA256 8f8537c0c6c93d1169c8a333ddd78c4471d95956cfb187e3bd6612a4ad9f78f5
DIST schroot_1.4.14.orig.tar.gz 1109550 RMD160 b50b71c6642148785ef63c428f412ec98baf323d SHA1 1268cdd0985c67cfe7fd88537fe2fbfe11853290 SHA256 f7e05924f12b10f4bf4d19b08b7eca21411a8b66fa18c9793c18de853525b76c
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.23.ebuild 4500 RMD160 637d4f6439d06e15360945774ab207ac53d2da6c SHA1 f6073f08efa84ab27b1bf09d6cc913179149729d SHA256 e56a781e6e75d3815a22168ea55b49a1cfdcc524a2331977015a0d70e8c75f19
-MISC ChangeLog 5345 RMD160 0080fad341c2087fe95432ac514ac451f61d7a9a SHA1 b723496a166dd859d79061af80ef03712f59a0a6 SHA256 04cb51eab1ab6991031cde7fb594b3ec3fd21232c4d1d0c581974a720b4b7a91
+EBUILD schroot-1.4.14.ebuild 5048 RMD160 e241d09fe44f2bc5ddc65688a4be3c1591a7761f SHA1 f52e22ebe23cd3d08fa96b9b65f1c217fe7f3c81 SHA256 eb7a45b4295bb8bee643baa9740575f620a77dd007884a54956f889f9e20deac
+EBUILD schroot-1.4.23-r1.ebuild 4510 RMD160 44ad5c94298b0469aff15f2f1b03947eb03264ff SHA1 a527d0c3e7315bacca3c89f7d745345037af020a SHA256 6b0fd39dfac3e3757c8042d07001b0d74519c846fa592de2c85cec92905fd392
+EBUILD schroot-1.4.23.ebuild 4581 RMD160 b628f3b6470ce35b64d95e16cf3703cd06c55471 SHA1 e38c5b707cc52881dbdb11f4466301915df3b86b SHA256 6521dca19897eddaedf5492ef75ed33c3e89166fc510c7fc05de884728a8595e
+MISC ChangeLog 5676 RMD160 fa4ec4485f442efdc38bf74f6dfb04d3dc946cd1 SHA1 bdfd269b92feddc39fe8bef3cae6b9c151a22572 SHA256 719c29966f65a095cb47a6fea12dc1dcc3d2e552d5bbb16db1382a7485cd8463
MISC metadata.xml 515 RMD160 503109571ab38b803facd58ffb77de4c99abee8b SHA1 e6be1d578aae7a1cc418ba886a12598d89510599 SHA256 f2da069d2bb008f7a2187b5a2c2770657eae391a08d987d9a9bf5174266193a8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBCgAGBQJO0CdQAAoJEPqDWhW0r/LCLnsP/iz1bdatWN3p6Ij7rdv/7Inp
-gR5VfFUx7VrJh4hgUNptKeF2pw+o7al68Mo8eHiB0dCTnOFEH/Yawl9mKypPfC5Q
-Wg3j0/YJzSQhF+y+ePwq59Xp1AFl8wwZLEskza5MrkyWnDJO9kUFMn4GjSlkoLb/
-NXpSk2zT18ED1neeRWLfg4Ug23kyjUnKItVpkWNmYFt5t7zuYui6s34YVxkvm+EA
-uxFWJllZ5QsXquQ+Fv/dkw3hZCBpumJ1tS+WqiqtFWoEKFR8aNwc3bnNqsHKWIrM
-DDWxH0YaEI9XBz7NiNuWznCUvQLej8TvlYQXtJ1tNEIqKGWJ18/s49sss9BPPHGO
-U/h0VC9oVi6yY7MDKF7ZrNeBN7dq1ZN4Ol+4+AI/mMgklXAIYPMiirGTE3KY6pd5
-iTiFVOZ9g36xrufTKBfVYhMKAE/i+9B2EMSvfN6KfJDzHnnZrPNsMddKYa6iQi4w
-GyygkkwmfjJG8+8wYhZObY8UMEhp3R7eHISKq7o4YB5neGzz6E8v9e/pPnA5oYZl
-p78bGVYzHHlP0SKTPlM7XEPNhrR9aGbH/HXLJ47hxsvrYf+uLVr1ehDbj1/C7b0l
-DM3SM048jvn+wB2mm13yrLpUhIx8CErjZpkKl+r5GFREX4Y3LQrxCYUDQ2SCD5zc
-Rl4iLVJuV6Kpqw1W/Zzt
-=WkSd
+iQIcBAEBCgAGBQJO59CtAAoJELHSF2kinlg4ZI0P/3PLLhI23JbZHdGgG3DtfvAC
+aQiTIKyTrlZvn83Sh9sX9fgTep4YZ80Lpgo8kUXD9YmUvezA7uZE5SYnLvY64vx6
+Xs56ipKqrrr6n1KrPXdTvsceIcS+gBFddQx6KlQJlcxhpWzp1l1WJUALSCXcwrcW
+CXi8dWa/+AhnswmHVrxdiVMerqdYqoVTFEkWlCO9wFkihvDW84NwTJF+AoEC0w9s
+3YYdmInlGzYGBWzq4H1VtJQImXyKeWmVHqwvbROuRrYx8a0g8ItBqGcO08kdqOLn
+v0/lB/0o55qJBnrkFp3tY1FOHP8l9yLWulXplGwlrQ6g239khaq1Nkg8NRHs4sIY
+6XZCbaFsA2N881iMqv2h/iw+JY9lQojbZo9rb1ME5VQcMdRmMjW4nOIEnY0Dlcs9
+Q8h9sG5pEza7aXYRUEqD7THNKphwqxQx6iU8BrfEGk7xcYKGVobeP9unc1BbJbKv
+LUuLLASxd3Qpd+vkp2kkOmKlVKmxIkbZN3xK09t43usDNZqbvUALghdUYhpnLqs+
+8iC5LNw5h9G+VhDTST3YuKlgUS4pJRy3po0koPNOthnYuYpD2wa5KRy0pLRM2O0r
+QbF/9JVbXeaOAhWGknh9IXM5VTTd1LKwZJ0HbEL8YJJ8OEdws2NbgK6+t0i5NkqQ
+eh0YuM9lPm3ekeOU06Oq
+=LmI7
-----END PGP SIGNATURE-----
# 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.14.ebuild,v 1.6 2011/08/05 14:28:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.14.ebuild,v 1.7 2011/12/13 22:24:32 abcd Exp $
EAPI="3"
WANT_AUTOMAKE="1.11"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="btrfs +dchroot debug doc lvm nls pam test"
+#IUSE="btrfs +dchroot debug doc lvm nls pam test"
+IUSE="+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 )
"
+# btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
DEPEND="${COMMON_DEPEND}
doc? (
root_tests=no
use test && (( EUID == 0 )) && root_tests=yes
econf \
- $(use_enable btrfs btrfs-snapshot) \
+ --disable-btrfs-snapshot \
$(use_enable doc doxygen) \
$(use_enable dchroot) \
$(use_enable dchroot dchroot-dsa) \
--disable-static \
--localstatedir="${EPREFIX}"/var \
--with-bash-completion-dir="${EPREFIX}"/usr/share/bash-completion
+# $(use_enable btrfs btrfs-snapshot) \
}
src_compile() {
--- /dev/null
+# 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-r1.ebuild,v 1.1 2011/12/13 22:24:32 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-0.19-r2 )
+ 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
+}
# 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.2 2011/11/25 23:39:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.23.ebuild,v 1.3 2011/12/13 22:24:32 abcd Exp $
EAPI="4"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 ~x86"
-IUSE="btrfs +dchroot debug doc lvm nls pam test"
+#IUSE="btrfs +dchroot debug doc lvm nls pam test"
+IUSE="+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 )
"
+# btrfs? ( >=sys-fs/btrfs-progs-0.19-r1 )
DEPEND="${COMMON_DEPEND}
doc? (
root_tests=no
use test && (( EUID == 0 )) && root_tests=yes
econf \
- $(use_enable btrfs btrfs-snapshot) \
+ --disable-btrfs-snapshot \
$(use_enable doc doxygen) \
$(use_enable dchroot) \
$(use_enable dchroot dchroot-dsa) \
--disable-static \
--localstatedir="${EPREFIX}"/var \
--with-bash-completion-dir="${EPREFIX}"/usr/share/bash-completion
+# $(use_enable btrfs btrfs-snapshot) \
}
src_compile() {
projects / gentoo.git / commitdiff