Fixed when sphinx not installed, build docs, keyword amd64-linux, x86-linux, removed old

(Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64)

5 files changed, 55 insertions, 32 deletions

diff --git a/sci-misc/vitables/ChangeLog b/sci-misc/vitables/ChangeLog
index be1648c95bd4..8411e2d58d89 100644
--- a/sci-misc/vitables/ChangeLog
+++ b/sci-misc/vitables/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-misc/vitables
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/vitables/ChangeLog,v 1.8 2012/04/22 08:00:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/vitables/ChangeLog,v 1.9 2012/08/04 19:07:00 bicatali Exp $
+
+  04 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/vitables-2.1-no-docs.patch, -files/vitables-2.0-doc-examples.patch,
+  metadata.xml, vitables-2.1.ebuild:
+  Fixed when sphinx not installed, build docs, keyword amd64-linux, x86-linux,
+  removed old
 
   22 Apr 2012; Kacper Kowalik <xarthisius@gentoo.org> -vitables-2.0.ebuild,
   vitables-2.1.ebuild:
@@ -30,4 +36,3 @@
   11 Jun 2009; Michał Januszewski <spock@gentoo.org> +vitables-2.0.ebuild,
   +files/vitables-2.0-doc-examples.patch, +metadata.xml:
   Initial commit (bug #268149).
-
diff --git a/sci-misc/vitables/files/vitables-2.0-doc-examples.patch b/sci-misc/vitables/files/vitables-2.0-doc-examples.patch
deleted file mode 100644
index 5c6562a8dbc0..000000000000
--- a/sci-misc/vitables/files/vitables-2.0-doc-examples.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naurp ViTables-2.0-orig/setup.py ViTables-2.0/setup.py
---- ViTables-2.0-orig/setup.py	2009-06-11 22:32:02.000000000 +0200
-+++ ViTables-2.0/setup.py	2009-06-11 22:32:38.000000000 +0200
-@@ -278,14 +278,6 @@ setup(name = 'ViTables', # The name of t
-     'vitables.vtTables', 'vitables.vtWidgets'],
-     scripts = ['scripts/vitables'],
-     cmdclass = {"install_data":smart_install_data},
--    data_files = [
--    ('examples', glob.glob('examples/*.h5')),
--    ('examples/scripts', glob.glob('examples/scripts/*.py')),
--    ('doc', glob.glob('doc/*.pdf')),
--    ('', ['LICENSE.txt', 'LICENSE.html']),
--    ('', ['VERSION'])
--    ],
--
-     **setup_args
- )
- 
diff --git a/sci-misc/vitables/files/vitables-2.1-no-docs.patch b/sci-misc/vitables/files/vitables-2.1-no-docs.patch
new file mode 100644
index 000000000000..307fb65b043c
--- /dev/null
+++ b/sci-misc/vitables/files/vitables-2.1-no-docs.patch
@@ -0,0 +1,19 @@
+--- setup.py.orig	2011-02-15 11:05:17.000000000 -0800
++++ setup.py	2012-08-04 12:00:40.704723726 -0700
+@@ -34,13 +34,14 @@
+ from distutils.dir_util import copy_tree
+ from distutils.file_util import copy_file
+ 
++sphinx_found = True
+ try:
+     from sphinx.setup_command import BuildDoc
+ except ImportError:
+-    pass
++	sphinx_found = False
++
+ 
+ 
+-sphinx_found = True
+ 
+ 
+ 
diff --git a/sci-misc/vitables/metadata.xml b/sci-misc/vitables/metadata.xml
index b229aec85b8f..12cad61721d7 100644
--- a/sci-misc/vitables/metadata.xml
+++ b/sci-misc/vitables/metadata.xml
@@ -2,4 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
+<longdescription>
+  ViTables is a component of the PyTables family. It is a GUI for
+  browsing and editing files in both PyTables and HDF5 formats. It is
+  developed using Python and PyQt (the Python bindings to the Qt), so
+  it can run on any platform that supports these components.
+</longdescription>
 </pkgmetadata>
diff --git a/sci-misc/vitables/vitables-2.1.ebuild b/sci-misc/vitables/vitables-2.1.ebuild
index 5764864e3c06..c57ff4f51cbc 100644
--- a/sci-misc/vitables/vitables-2.1.ebuild
+++ b/sci-misc/vitables/vitables-2.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/vitables/vitables-2.1.ebuild,v 1.2 2012/04/22 08:00:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/vitables/vitables-2.1.ebuild,v 1.3 2012/08/04 19:07:00 bicatali Exp $
 
-EAPI="2"
+EAPI=4
 
 PYTHON_DEPEND="2:2.5"
 SUPPORT_PYTHON_ABIS="1"
@@ -19,27 +19,38 @@ SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
-DEPEND="
+RDEPEND="
 	dev-python/pytables
 	dev-python/PyQt4[X]"  # FIXME: check if any other useflags are needed
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )"
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-docs.patch
+}
+
+src_compile() {
+	distutils_src_compile
+	if use doc; then
+		# fixme: multiple python (anyone cares?)
+	   python setup.py build_sphinx || die
+	fi
+}
+
 src_install() {
 	dodir /usr/share/icons/hicolor/scalable/apps
 	dodir /usr/share/applications
-	XDG_DATA_DIRS="${D}/usr/share" distutils_src_install
+	XDG_DATA_DIRS="${ED}/usr/share" distutils_src_install
 
 	if use examples; then
-		insinto /usr/share/doc/${P}/examples
-		doins -r examples/* || die
-	fi
-
-	if use doc; then
-		dodoc doc/* || die
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*
 	fi
+	use doc && dohtml -r build/sphinx/html/* && \
+		dodoc build/sphinx/latex/*.pdf
 }