dev-python/vo: removing docs, updating deps and Python style

5 files changed, 52 insertions, 46 deletions

diff --git a/dev-python/vo/ChangeLog b/dev-python/vo/ChangeLog
index e42ff3b95..260d041cf 100644
--- a/dev-python/vo/ChangeLog
+++ b/dev-python/vo/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Apr 2010; Xarthisius <xarth@gentoo.org> -files/vo-0.3.1-docs.patch,
+  vo-0.5.ebuild, +files/vo-0.5-docs.patch, +files/vo-0.5-expat.patch:
+  Removing doc USE flags, since they're no longer building, adding missing
+  test dependencies, using new style for Python.
+
 *vo-0.5 (12 Feb 2010)
 
   12 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org> -vo-0.4.ebuild,
diff --git a/dev-python/vo/Manifest b/dev-python/vo/Manifest
index 7de2b0eac..53fdac973 100644
--- a/dev-python/vo/Manifest
+++ b/dev-python/vo/Manifest
@@ -1,5 +1,6 @@
-AUX vo-0.3.1-docs.patch 1499 RMD160 5aa6f16abedfd8af700a9fc729c55a026d381551 SHA1 c79e4232b1fb2cfe19567a06b7e1750adbbd1bcf SHA256 bf551b3008332af20fdebe1f22c84835dbad11745c00db65c3eca8d15f7fb72e
+AUX vo-0.5-docs.patch 787 RMD160 981357589fae22befc08a215390bb81b94964423 SHA1 4057e7deacc726130048720b635cdd427f992f53 SHA256 0e0d32d6856193cfea4f547a04893ccac8520fe4872bbd92d6f6848a5ba71db4
+AUX vo-0.5-expat.patch 516 RMD160 96fd104bafa9fba2d4203aec9aaf9d6031752e42 SHA1 72559f15da814b84a43627a89fee8f1cabfb8df3 SHA256 8767dd8efa403f003307d9fb8d60440b850e2a2dc7d4aff43105bc7f5867b488
 DIST vo-0.5.tar.gz 4495975 RMD160 25bac3958ac8a8e8268ae94ab0dbe32b8df9a30e SHA1 7f9a9fde36df868a1ed96c29d59cee92ea1b5d4a SHA256 e3c97a7b329dadac346682c235deb7b60739055f58835536eeee8c034a9d074a
-EBUILD vo-0.5.ebuild 798 RMD160 8cbda84a81bc667117c4fde9e9ce6cc94290d57e SHA1 bfdad58db53c9ec77a98bc13794821febe2d74b5 SHA256 6f1109ac0db45520add96ee5648617e062f95f362dce5daa00807bb3cebc2640
-MISC ChangeLog 525 RMD160 3e682714a59f48ca051dfe9a99dbea37c7d8bf93 SHA1 38ef0e7d8bbecb167c458f30710d09052eecedc1 SHA256 568f9d9690ef32671130f28194c1007eb1da8733add69ed71edc01ca154f2709
+EBUILD vo-0.5.ebuild 776 RMD160 def227f9f4317e0abea6ca4a75532fdd9e29af60 SHA1 351f75eb4d8af3635ed6538d3b152eeb007c473b SHA256 214854ead28bb8f30de09010bd7aa97c5a5f08442c4875e7d8d2d9952dcb0970
+MISC ChangeLog 793 RMD160 05727299594eedbb09b21c13a76ce8f8b6280d22 SHA1 60743639e5ff8fb67bcbf593f2dc59b280f5b6b2 SHA256 2c004b06ebe011dadc1ce77f2726c6b9e9366189019bda0c5becbda951ee73e0
 MISC metadata.xml 478 RMD160 a115ae6d3b7da632887d7443ee1a85b6ae9b322a SHA1 e42c2e82e7fa028662ef7cb77691ba2ab0c1c9a4 SHA256 d68f25e4c06961ecaa6d08df19e1cf671a592c5f1de97fb1cd780f6722cf793f
diff --git a/dev-python/vo/files/vo-0.3.1-docs.patch b/dev-python/vo/files/vo-0.5-docs.patch
index 5e8061793..0bb09121c 100644
--- a/dev-python/vo/files/vo-0.3.1-docs.patch
+++ b/dev-python/vo/files/vo-0.5-docs.patch
@@ -1,14 +1,5 @@
---- doc/Makefile.orig	2009-07-21 21:23:57.000000000 +0100
-+++ doc/Makefile	2009-07-21 21:37:35.000000000 +0100
-@@ -2,7 +2,7 @@
- #
- 
- # You can set these variables from the command line.
--SPHINXOPTS    =
-+SPHINXOPTS    =  
- SPHINXBUILD   = sphinx-build
- PAPER         =
- 
+--- doc/Makefile
++++ doc/Makefile
 @@ -20,6 +20,7 @@
  	@echo "  json      to make JSON files"
  	@echo "  htmlhelp  to make HTML files and a HTML help project"
@@ -28,14 +19,3 @@
  changes:
  	mkdir -p build/changes build/doctrees
  	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) build/changes
---- doc/source/sphinxext/inheritance_diagram.py.orig	2009-07-21 21:23:12.000000000 +0100
-+++ doc/source/sphinxext/inheritance_diagram.py	2009-07-21 21:23:33.000000000 +0100
-@@ -41,7 +41,7 @@
- 
- from docutils.nodes import Body, Element
- from docutils.writers.html4css1 import HTMLTranslator
--from sphinx.latexwriter import LaTeXTranslator
-+from sphinx.writers.latex import LaTeXTranslator
- from docutils.parsers.rst import directives
- from sphinx.roles import xfileref_role
- 
diff --git a/dev-python/vo/files/vo-0.5-expat.patch b/dev-python/vo/files/vo-0.5-expat.patch
new file mode 100644
index 000000000..7bbd7a84a
--- /dev/null
+++ b/dev-python/vo/files/vo-0.5-expat.patch
@@ -0,0 +1,23 @@
+Using system expat
+
+Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
+
+--- setup.py
++++ setup.py
+@@ -13,14 +13,9 @@
+ 
+ iterparse_ext = Extension(
+     "vo.iterparser",
+-    ["src/iterparse.c",
+-     "src/expat/xmlparse.c",
+-     "src/expat/xmlrole.c",
+-     "src/expat/xmltok.c",
+-     "src/expat/xmltok_impl.c",
+-     "src/expat/xmltok_ns.c"],
++    ["src/iterparse.c",],
+     define_macros=defines,
+-    include_dirs=["src", "src/expat"])
++    libraries=["expat"])
+ 
+ setup(name="vo",
+       version="0.5",
diff --git a/dev-python/vo/vo-0.5.ebuild b/dev-python/vo/vo-0.5.ebuild
index 1c319922b..72fde7795 100644
--- a/dev-python/vo/vo-0.5.ebuild
+++ b/dev-python/vo/vo-0.5.ebuild
@@ -3,38 +3,35 @@
 # $Header: $
 
 EAPI=2
-inherit distutils
+PYTHON_DEPEND="2:2.6"
+
+inherit distutils eutils
 
 DESCRIPTION="Python module to read VOTABLE into a Numpy recarray"
 HOMEPAGE="https://www.stsci.edu/trac/ssb/astrolib/"
 SRC_URI="http://stsdas.stsci.edu/astrolib/${P}.tar.gz"
 
-DEPEND="doc? ( >=dev-python/sphinx-0.6 )"
-RDEPEND=""
-
-IUSE="doc"
+IUSE="test"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 LICENSE="AURA"
 
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		cd doc
-		PYTHONPATH=$(dir -d ../build/lib*) emake html pdf || die
-	fi
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose )"
+RDEPEND="dev-libs/expat"
+
+pkg_setup() {
+	python_set_active_version 2
 }
 
-src_test() {
-	cd test
-	PYTHONPATH=$(dir -d ../build/lib*) "${python}" test.py || die
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-docs.patch
+	epatch "${FILESDIR}"/${P}-expat.patch
 }
 
-src_install() {
-	distutils_src_install
-	if use doc; then
-		cd doc/build
-		insinto /usr/share/doc/${PF}
-		doins -r html latex/*.pdf || die
-	fi
+#FIX ME: docs are no longer built (missing stsci_sphinxext )
+
+src_test() {
+	cd test
+	PYTHONPATH=$(dir -d ../build/lib.*) "$(PYTHON)" test.py || die
 }