summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2010-01-04 20:20:27 +0000
committerSebastian Pipping <sping@gentoo.org>2010-01-04 20:20:27 +0000
commitea6ce8d8d34ca2979d8de5f509cf8668203e4658 (patch)
tree6be38d2b0eb7e50c290527018fc854abb31cd039 /app-portage
parentMissing dev-util/intltool DEPEND wrt #299259, thanks to Chris Hall for report... (diff)
downloadgentoo-2-ea6ce8d8d34ca2979d8de5f509cf8668203e4658.tar.gz
gentoo-2-ea6ce8d8d34ca2979d8de5f509cf8668203e4658.tar.bz2
gentoo-2-ea6ce8d8d34ca2979d8de5f509cf8668203e4658.zip
app-portage/layman: Propagate upstream changes to live ebuild
(Portage version: 2.2_rc61/cvs/Linux i686)
Diffstat (limited to 'app-portage')
-rw-r--r--app-portage/layman/ChangeLog5
-rw-r--r--app-portage/layman/layman-9999.ebuild13
2 files changed, 11 insertions, 7 deletions
diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index 68cf1a725f14..3e1ff98d3bc2 100644
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-portage/layman
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.85 2010/01/03 23:59:18 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.86 2010/01/04 20:20:27 sping Exp $
+
+ 04 Jan 2010; Sebastian Pipping <sping@gentoo.org> layman-9999.ebuild:
+ Propagate upstream changes to live ebuild
*layman-1.2.4-r3 (03 Jan 2010)
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index bdc7f6127009..7b5ab82a02ff 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.2 2009/12/30 22:23:44 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.3 2010/01/04 20:20:27 sping Exp $
EAPI="2"
NEED_PYTHON=2.5
@@ -18,9 +18,7 @@ SLOT="0"
KEYWORDS=""
IUSE="git subversion test"
-COMMON_DEPS="|| (
- dev-lang/python[xml]
- ( dev-lang/python dev-python/pyxml ) )"
+COMMON_DEPS="dev-lang/python[xml]"
DEPEND="${COMMON_DEPS}
test? ( dev-util/subversion )
app-text/xmlto"
@@ -48,7 +46,10 @@ pkg_setup() {
src_test() {
testing() {
- PYTHONPATH="." "$(PYTHON)" layman/tests/dtest.py
+ for suite in layman/tests/{dtest,external}.py ; do
+ PYTHONPATH="." "$(PYTHON)" ${suite} \
+ || die "test suite '${suite}' failed"
+ done
}
python_execute_function testing
}