jlec 15/01/16 10:41:45
Modified: ChangeLog git-cola-2.0.7.ebuild
git-cola-2.1.0.ebuild
Log:
dev-vcs/git-cola: Fix tests and docs
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.38 dev-vcs/git-cola/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/ChangeLog?rev=1.38&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/ChangeLog?rev=1.38&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/ChangeLog?r1=1.37&r2=1.38
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ChangeLog 16 Jan 2015 09:38:51 -0000 1.37
+++ ChangeLog 16 Jan 2015 10:41:45 -0000 1.38
@@ -1,6 +1,10 @@
# ChangeLog for dev-vcs/git-cola
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.37
2015/01/16 09:38:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.38
2015/01/16 10:41:45 jlec Exp $
+
+ 16 Jan 2015; Justin Lecher <[email protected]> git-cola-2.0.7.ebuild,
+ git-cola-2.1.0.ebuild:
+ Fix tests and docs
*git-cola-2.1.0 (16 Jan 2015)
1.3 dev-vcs/git-cola/git-cola-2.0.7.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/git-cola-2.0.7.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/git-cola-2.0.7.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/git-cola-2.0.7.ebuild?r1=1.2&r2=1.3
Index: git-cola-2.0.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-2.0.7.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- git-cola-2.0.7.ebuild 16 Jan 2015 09:38:51 -0000 1.2
+++ git-cola-2.0.7.ebuild 16 Jan 2015 10:41:45 -0000 1.3
@@ -1,10 +1,10 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-2.0.7.ebuild,v
1.2 2015/01/16 09:38:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-2.0.7.ebuild,v
1.3 2015/01/16 10:41:45 jlec Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
DISTUTILS_SINGLE_IMPL=true
inherit distutils-r1 readme.gentoo virtualx
@@ -18,6 +18,8 @@
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
+REQUIRED_USE="doc? ( python_targets_python2_7 )"
+
RDEPEND="
dev-python/jsonpickle[${PYTHON_USEDEP}]
dev-python/pyinotify[${PYTHON_USEDEP}]
@@ -27,7 +29,10 @@
app-text/asciidoc
app-text/xmlto
sys-devel/gettext
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')]
+ )
test? (
dev-python/nose[${PYTHON_USEDEP}]
sys-apps/net-tools
@@ -76,8 +81,8 @@
python_test() {
PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
- VIRTUALX_COMMAND="nosetests --verbose --with-doctest \
- --with-id --exclude=jsonpickle --exclude=json" \
+ VIRTUALX_COMMAND="nosetests --verbose \
+ --with-id --with-doctest --exclude=sphinxtogithub" \
virtualmake
}
1.2 dev-vcs/git-cola/git-cola-2.1.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/git-cola-2.1.0.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/git-cola-2.1.0.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/git-cola-2.1.0.ebuild?r1=1.1&r2=1.2
Index: git-cola-2.1.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-2.1.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git-cola-2.1.0.ebuild 16 Jan 2015 09:38:51 -0000 1.1
+++ git-cola-2.1.0.ebuild 16 Jan 2015 10:41:45 -0000 1.2
@@ -1,11 +1,10 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-2.1.0.ebuild,v
1.1 2015/01/16 09:38:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-2.1.0.ebuild,v
1.2 2015/01/16 10:41:45 jlec Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 python3_{3,4} )
-PYTHON_COMPAT=( python2_7 )
DISTUTILS_SINGLE_IMPL=true
inherit distutils-r1 readme.gentoo virtualx
@@ -19,6 +18,8 @@
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
+REQUIRED_USE="doc? ( python_targets_python2_7 )"
+
RDEPEND="
dev-python/jsonpickle[${PYTHON_USEDEP}]
dev-python/pyinotify[${PYTHON_USEDEP}]
@@ -30,11 +31,10 @@
sys-devel/gettext
doc? (
dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinxtogithub[${PYTHON_USEDEP}]
+ dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')]
)
test? (
dev-python/nose[${PYTHON_USEDEP}]
- dev-python/sphinxtogithub[${PYTHON_USEDEP}]
sys-apps/net-tools
)"
@@ -81,8 +81,8 @@
python_test() {
PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
- VIRTUALX_COMMAND="nosetests --verbose --with-doctest \
- --with-id --exclude=jsonpickle --exclude=json" \
+ VIRTUALX_COMMAND="nosetests --verbose \
+ --with-id --with-doctest --exclude=sphinxtogithub" \
virtualmake
}
