diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2009-09-14 08:35:25 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2009-09-14 08:35:25 +0000 |
| commit | 1625b675fb871f951a0b6f75e5b297a7e7f58dbd (patch) | |
| tree | ad9746d4318eebaf31b75893274de2b5c90f43a5 /dev-util/schroot | |
| parent | Bug #283983: pvcreate hangs on 2.6.30/.31 presently, waiting for a new releas... (diff) | |
| download | gentoo-2-1625b675fb871f951a0b6f75e5b297a7e7f58dbd.tar.gz gentoo-2-1625b675fb871f951a0b6f75e5b297a7e7f58dbd.tar.bz2 gentoo-2-1625b675fb871f951a0b6f75e5b297a7e7f58dbd.zip | |
Fix build error with FEATURES=-test (bug 284773). Also add RDEPEND on debianutils.
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'dev-util/schroot')
| -rw-r--r-- | dev-util/schroot/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/schroot/schroot-1.2.3-r1.ebuild | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog index 504402d6c92b..201333d20cb7 100644 --- a/dev-util/schroot/ChangeLog +++ b/dev-util/schroot/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/schroot # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.3 2009/09/14 04:58:10 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.4 2009/09/14 08:35:25 abcd Exp $ + + 14 Sep 2009; Jonathan Callen <abcd@gentoo.org> schroot-1.2.3-r1.ebuild: + Fix build error with FEATURES=-test (bug 284773). Thanks to Andy Kittner + <andkit@gmx.de>. Also add RDEPEND on debianutils. *schroot-1.2.3-r1 (14 Sep 2009) diff --git a/dev-util/schroot/schroot-1.2.3-r1.ebuild b/dev-util/schroot/schroot-1.2.3-r1.ebuild index 0b6670102bdc..ded251254bde 100644 --- a/dev-util/schroot/schroot-1.2.3-r1.ebuild +++ b/dev-util/schroot/schroot-1.2.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.2.3-r1.ebuild,v 1.1 2009/09/14 04:58:10 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.2.3-r1.ebuild,v 1.2 2009/09/14 08:35:25 abcd Exp $ EAPI="2" @@ -26,6 +26,7 @@ DEPEND="${COMMON_DEPEND} test? ( >=dev-util/cppunit-1.10.0 ) " RDEPEND="${COMMON_DEPEND} + sys-apps/debianutils dchroot? ( !dev-util/dchroot ) nls? ( virtual/libintl ) " @@ -42,12 +43,12 @@ src_prepare() { if use test; then # Fix bug where aclocal doesn't find cppunit.m4 from the system... ln -s /usr/share/aclocal/cppunit.m4 m4/ - export AT_M4DIR=m4 else # Don't depend on cppunit unless we are testing - sed -i '/AM_PATH_CPPUNIT/d' configure.ac + sed -i '/AM_PATH_CPPUNIT/s/^.*$/:/' configure.ac fi + export AT_M4DIR=m4 eautoreconf } |