diff options
| author |   Jonathan Callen <jcallen@gentoo.org> | 2009-09-14 08:35:25 +0000 |
|---|---|---|
| committer | Jonathan Callen <jcallen@gentoo.org> | 2009-09-14 08:35:25 +0000 |
| commit | a96c367af947396a27f5ec6a99a8341505af1f0b (patch) | |
| tree | d16c89d2ba5cbda3da5b75c2aac3f4940acea8ea /dev-util | |
| parent | Bug #283983: pvcreate hangs on 2.6.30/.31 presently, waiting for a new releas... (diff) | |
| download | historical-a96c367af947396a27f5ec6a99a8341505af1f0b.tar.gz historical-a96c367af947396a27f5ec6a99a8341505af1f0b.tar.bz2 historical-a96c367af947396a27f5ec6a99a8341505af1f0b.zip | |
Fix build error with FEATURES=-test (bug 284773). Also add RDEPEND on debianutils.
Package-Manager: portage--svn/cvs/Linux i686
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/schroot/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/schroot/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/schroot/schroot-1.2.3-r1.ebuild | 7 |
3 files changed, 11 insertions, 6 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/Manifest b/dev-util/schroot/Manifest index d99e4bf2e826..09e1019d5e5f 100644 --- a/dev-util/schroot/Manifest +++ b/dev-util/schroot/Manifest @@ -4,6 +4,6 @@ AUX schroot-1.2.3-tests.patch 3731 RMD160 0cb5ccf9f4cc526c7c80fe2fc3b0faa2d3e2dd AUX schroot.confd 371 RMD160 d7efa36975f549304a1e8a942f6389720d1bff88 SHA1 3eaf672a13c6dd4fadd01b7c1c54bc82f71d5b93 SHA256 68efa89cd4b358c6de050ebb5b973c87ee514fe5e5d888f63aa0af85aa4736c8 AUX schroot.initd 844 RMD160 11eca8fd477b215d5b4964b582573ce14f116d25 SHA1 fe687d49e7d80342d46767f5e5fe63eed94a805d SHA256 f0f44c9fed06438f72f58825f67316c5069d58a6dfe3e1a33d0092b4fac1fb9f DIST schroot_1.2.3.orig.tar.gz 25486414 RMD160 2c8c4bb92c870a6c0514df528d13f73b8f1b6d05 SHA1 1775aa19e3cb3237d8aa3cc36e3382d7e2c2919b SHA256 c3bca449abdf28b66f6aede8892ce61967b5c1d758ba567e8648ccfb0cf914ec -EBUILD schroot-1.2.3-r1.ebuild 2009 RMD160 20c432817a252b87b08e5c3cddf9360e01526c38 SHA1 93a373074a477356f45268fc2f21950532cd0c72 SHA256 191818449fa879127cde75e3fceacd218f4a13aa723835ae007e2e899339f3a9 -MISC ChangeLog 840 RMD160 dff5285d795648906328edcbc567e39b8bcf947d SHA1 ce5642b72ffd586f88cf932eb74b040986fe84b4 SHA256 0cf5863f46bb893d0c3729780fa772e22cbf443e8357c9c97058e3d97489f347 +EBUILD schroot-1.2.3-r1.ebuild 2038 RMD160 3dec367766dcc83cbfe529ce5ce938e5de5ba832 SHA1 6daf14c0bbd58f6b67a64acfe830f38a928071a8 SHA256 b5a8c76381dd2fca54c353d1037b6c1df5e939434c31896baffc504bbd00d214 +MISC ChangeLog 1042 RMD160 5bb6acdf015045c3e8560d7031dbf00c29f6742f SHA1 2724996809dfcebf14c75f256c362082a2cd29e6 SHA256 a8c2a54119ae20e59402b60036159facec91511e6fd1e5063e67095f83914218 MISC metadata.xml 384 RMD160 083cf5152883690484a973130318aef0d2c4f349 SHA1 d464ac6af08d92976517ae5715e1936c408c168d SHA256 58018798cc44ed856afd8c3c0e957aae8aabf548cc716e675604acc456fc20ef 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 } |