diff options
Diffstat (limited to 'dev-util/schroot')
| -rw-r--r-- | dev-util/schroot/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-util/schroot/files/schroot-1.4.14-debug.patch | 28 | ||||
| -rw-r--r-- | dev-util/schroot/schroot-1.4.25.ebuild (renamed from dev-util/schroot/schroot-1.4.14.ebuild) | 47 |
3 files changed, 27 insertions, 58 deletions
diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog index 7bd0c2133fad..86ecf76b0dc6 100644 --- a/dev-util/schroot/ChangeLog +++ b/dev-util/schroot/ChangeLog @@ -1,6 +1,12 @@ # 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.32 2011/12/22 22:02:37 maekke Exp $ +# 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 $ + +*schroot-1.4.25 (03 Mar 2012) + + 03 Mar 2012; Jonathan Callen <abcd@gentoo.org> +schroot-1.4.25.ebuild, + -files/schroot-1.4.14-debug.patch, -schroot-1.4.14.ebuild: + New upstream version. Remove old. 22 Dec 2011; Markus Meier <maekke@gentoo.org> schroot-1.4.23.ebuild: x86 stable, bug #391787 diff --git a/dev-util/schroot/files/schroot-1.4.14-debug.patch b/dev-util/schroot/files/schroot-1.4.14-debug.patch deleted file mode 100644 index 4b5b954e1bc0..000000000000 --- a/dev-util/schroot/files/schroot-1.4.14-debug.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 741833bdcba4b9aa7e389d389f42e4fa504d7cc7 Mon Sep 17 00:00:00 2001 -From: Jonathan Callen <abcd@gentoo.org> -Date: Wed, 5 Jan 2011 01:26:26 -0500 -Subject: [PATCH] schroot-base: fix build with --enable-debug - -Rename last instance of the variable sbuild::debug_level to -sbuild::debug_log_level. This appears to have been missed in commit -04c19bb6c28295a387e60066c48db7f443e5b925. ---- - bin/schroot-base/schroot-base-main.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/bin/schroot-base/schroot-base-main.cc b/bin/schroot-base/schroot-base-main.cc -index ac86018..d6cd0b0 100644 ---- a/bin/schroot-base/schroot-base-main.cc -+++ b/bin/schroot-base/schroot-base-main.cc -@@ -106,7 +106,7 @@ main::run (int argc, - this->program_options->parse(argc, argv); - - #ifdef SBUILD_DEBUG -- sbuild::debug_level = sbuild::DEBUG_CRITICAL; -+ sbuild::debug_log_level = sbuild::DEBUG_CRITICAL; - #endif - - if (this->use_syslog) --- -1.7.3.3 - diff --git a/dev-util/schroot/schroot-1.4.14.ebuild b/dev-util/schroot/schroot-1.4.25.ebuild index 2b9f7bdadc4a..ba56c14f4c53 100644 --- a/dev-util/schroot/schroot-1.4.14.ebuild +++ b/dev-util/schroot/schroot-1.4.25.ebuild @@ -1,34 +1,33 @@ -# 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.14.ebuild,v 1.7 2011/12/13 22:24:32 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.25.ebuild,v 1.1 2012/03/03 21:20:28 abcd Exp $ -EAPI="3" -WANT_AUTOMAKE="1.11" +EAPI="4" -inherit autotools base flag-o-matic pam +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.gz" +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" -IUSE="+dchroot debug doc lvm nls pam test" +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 ) " -# btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) DEPEND="${COMMON_DEPEND} + sys-apps/groff doc? ( app-doc/doxygen media-gfx/graphviz @@ -44,14 +43,11 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-1.4.7-tests.patch" - "${FILESDIR}/${P}-debug.patch" ) src_prepare() { base_src_prepare - append-flags -DBOOST_FILESYSTEM_VERSION=2 - # Don't depend on cppunit unless we are testing use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac @@ -62,7 +58,7 @@ src_configure() { root_tests=no use test && (( EUID == 0 )) && root_tests=yes econf \ - --disable-btrfs-snapshot \ + $(use_enable btrfs btrfs-snapshot) \ $(use_enable doc doxygen) \ $(use_enable dchroot) \ $(use_enable dchroot dchroot-dsa) \ @@ -78,11 +74,10 @@ src_configure() { --disable-static \ --localstatedir="${EPREFIX}"/var \ --with-bash-completion-dir="${EPREFIX}"/usr/share/bash-completion -# $(use_enable btrfs btrfs-snapshot) \ } src_compile() { - emake all $(usev doc) || die "emake failed" + emake all $(usev doc) } src_test() { @@ -94,21 +89,19 @@ src_test() { } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + default 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" + doins contrib/setup.d/09fsck contrib/setup.d/10mount-ssh - dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "installation of docs failed" + newinitd "${FILESDIR}"/schroot.initd schroot + newconfd "${FILESDIR}"/schroot.confd schroot if use doc; then docinto html/sbuild - dohtml doc/sbuild/html/* || die "installation of html docs failed" + dohtml doc/sbuild/html/* docinto html/schroot - dohtml doc/schroot/html/* || die "installation of html docs failed" + dohtml doc/schroot/html/* fi if use pam; then @@ -121,9 +114,7 @@ src_install() { } 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 + 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 @@ -166,7 +157,7 @@ mv_conffile() { pkg_postinst() { local x - if ${had_older_1_4_1}; then + 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" |