summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-vcs/bzrtools/ChangeLog5
-rw-r--r--dev-vcs/bzrtools/bzrtools-2.5.ebuild26
2 files changed, 6 insertions, 25 deletions
diff --git a/dev-vcs/bzrtools/ChangeLog b/dev-vcs/bzrtools/ChangeLog
index 583cf75802b7..20f396d2bad8 100644
--- a/dev-vcs/bzrtools/ChangeLog
+++ b/dev-vcs/bzrtools/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-vcs/bzrtools
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzrtools/ChangeLog,v 1.38 2013/08/06 19:36:01 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzrtools/ChangeLog,v 1.39 2013/08/07 00:47:15 floppym Exp $
+
+ 07 Aug 2013; Mike Gilbert <floppym@gentoo.org> bzrtools-2.5.ebuild:
+ Fix DOCS variable (must be an array) and drop broken src_test function.
06 Aug 2013; Christian Faulhammer <fauli@gentoo.org> bzrtools-2.5.ebuild:
adjust dependency on Bazaar version, migrate to distutils-r1
diff --git a/dev-vcs/bzrtools/bzrtools-2.5.ebuild b/dev-vcs/bzrtools/bzrtools-2.5.ebuild
index 0e9155074d19..9e9fb93dd8da 100644
--- a/dev-vcs/bzrtools/bzrtools-2.5.ebuild
+++ b/dev-vcs/bzrtools/bzrtools-2.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzrtools/bzrtools-2.5.ebuild,v 1.8 2013/08/06 19:36:01 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzrtools/bzrtools-2.5.ebuild,v 1.9 2013/08/07 00:47:15 floppym Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -25,26 +25,4 @@ RESTRICT="test"
S="${WORKDIR}/${PN}"
-DOCS="AUTHORS CREDITS NEWS NEWS.Shelf README README.Shelf TODO TODO.heads TODO.Shelf"
-PYTHON_MODNAME="bzrlib/plugins/bzrtools"
-
-src_test() {
- testing() {
- local return_status="0"
-
- # put a linked copy of the bzr core into the build directory to properly
- # test the "built" version of bzrtools
- find "$(python_get_libdir)/site-packages/bzrlib/" \
- -mindepth 1 -maxdepth 1 \
- \( \( -type d -and -not -name "plugins" \) -or -name "*.py" \) \
- -exec ln -s '{}' "${S}/build-${PYTHON_ABI}/lib/bzrlib/" \;
- touch "${S}/build-${PYTHON_ABI}/lib/bzrlib/plugins/__init__.py"
- "${S}/test.py" "${S}/build-${PYTHON_ABI}/lib" || return_status="1"
- # remove the "shadow" copy so it doesn't get installed
- rm "${S}/build-${PYTHON_ABI}/lib/bzrlib/plugins/__init__.py"
- find "${S}/build-${PYTHON_ABI}/lib/bzrlib/" -mindepth 1 -maxdepth 1 -type l -exec rm '{}' \;
-
- return "${return_status}"
- }
- python_execute_function testing
-}
+DOCS=( AUTHORS CREDITS NEWS NEWS.Shelf README README.Shelf TODO TODO.heads TODO.Shelf )