summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-04-26 20:45:13 +0000
committerMichał Górny <mgorny@gentoo.org>2013-04-26 20:45:13 +0000
commitda20a4e73a029ab83277e7ec84301fd4569bb964 (patch)
tree0a28c643c79950e021c68d4dcdb32eebaddfd0cd /dev-python/pygraphviz
parentTaking maint, version bumps (thanks Sławek Lis, bug 438466, thanks Jimmy.Jaz... (diff)
downloadgentoo-2-da20a4e73a029ab83277e7ec84301fd4569bb964.tar.gz
gentoo-2-da20a4e73a029ab83277e7ec84301fd4569bb964.tar.bz2
gentoo-2-da20a4e73a029ab83277e7ec84301fd4569bb964.zip
Improve the conversion. Remove incorrect USE-dep on graphviz since the package uses the C interface only. Quote paths properly. Use EXAMPLES array. Do not remove namespaced tests.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-python/pygraphviz')
-rw-r--r--dev-python/pygraphviz/ChangeLog8
-rw-r--r--dev-python/pygraphviz/pygraphviz-1.1-r2.ebuild24
2 files changed, 15 insertions, 17 deletions
diff --git a/dev-python/pygraphviz/ChangeLog b/dev-python/pygraphviz/ChangeLog
index a1752ac87988..3466a622d50a 100644
--- a/dev-python/pygraphviz/ChangeLog
+++ b/dev-python/pygraphviz/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-python/pygraphviz
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/ChangeLog,v 1.14 2013/04/26 08:40:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/ChangeLog,v 1.15 2013/04/26 20:45:13 mgorny Exp $
+
+ 26 Apr 2013; Michal Gorny <mgorny@gentoo.org> pygraphviz-1.1-r2.ebuild:
+ Improve the conversion. Remove incorrect USE-dep on graphviz since the package
+ uses the C interface only. Quote paths properly. Use EXAMPLES array. Do not
+ remove namespaced tests.
*pygraphviz-1.1-r2 (26 Apr 2013)
@@ -63,4 +68,3 @@
+files/pygraphviz-0.99.1-setup.py.patch, +metadata.xml,
+pygraphviz-0.99.1.ebuild:
Initial import, closing bug #253415, thanks Robert Morris
-
diff --git a/dev-python/pygraphviz/pygraphviz-1.1-r2.ebuild b/dev-python/pygraphviz/pygraphviz-1.1-r2.ebuild
index fcc4ac312415..eebd59143d88 100644
--- a/dev-python/pygraphviz/pygraphviz-1.1-r2.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.1-r2.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-python/pygraphviz/pygraphviz-1.1-r2.ebuild,v 1.1 2013/04/26 08:40:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/pygraphviz-1.1-r2.ebuild,v 1.2 2013/04/26 20:45:13 mgorny Exp $
EAPI=5
@@ -17,7 +17,8 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="examples"
-RDEPEND="media-gfx/graphviz[${PYTHON_USEDEP}]"
+# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
+RDEPEND="media-gfx/graphviz"
DEPEND="${RDEPEND}"
PATCHES=(
@@ -26,21 +27,14 @@ PATCHES=(
)
python_test() {
- ${PYTHON} \
- -c "import sys; sys.path.insert(0, \"${BUILD_DIR}/lib/pygraphviz\"); import pygraphviz.tests; pygraphviz.tests.run()" || die
+ PYTHONPATH=${PYTHONPATH}:${BUILD_DIR}/lib/pygraphviz \
+ "${PYTHON}" \
+ -c "import pygraphviz.tests; pygraphviz.tests.run()" \
+ || die "Tests fail with ${EPYTHON}"
}
python_install_all() {
- distutils-r1_python_install_all
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
+ use examples && local EXAMPLES=( examples/. )
-python_install() {
- distutils-r1_python_install
-
- rm -fr "${ED}$(python_get_sitedir)/${PN}/tests"
+ distutils-r1_python_install_all
}