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

Package-Manager: portage-2.2.01.20796-prefix/cvs/Linux x86_64

6 files changed, 63 insertions, 50 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/Manifest b/sci-misc/vitables/Manifest
index 791cdc412594..7dbad1f8f9c9 100644
--- a/sci-misc/vitables/Manifest
+++ b/sci-misc/vitables/Manifest
@@ -1,25 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX vitables-2.0-doc-examples.patch 659 RMD160 cf79a59c55292373864ecc78a2a8e3038f5fe2a5 SHA1 b16a2a1b04bad6a262b4b298cf19c09209a81fed SHA256 aa89a2006e5922cd6d22b5dd9daa2594e044fb5759cf3553cd4cbbb4f7c5628b
-DIST ViTables-2.1.tar.gz 3111661 RMD160 43e02a22609158f727e80d7a39d7e8469403e447 SHA1 fbbd7ba2d6185d9875a8b8bea3ca06eae2533785 SHA256 f0413fa725617fbb3f0be03cb1f41b5b841c6946098a629f3fcb8a99fb9be14a
-EBUILD vitables-2.1.ebuild 1060 RMD160 13c637e1f5e980d89ab4f831606ae6eca4922199 SHA1 03025f5eaa35bd07cbed262916c4793452196be0 SHA256 583a693f74506b0e532ae50a3d54ad19250b62370b3c18c8d69440daf2a447a0
-MISC ChangeLog 1236 RMD160 c936661660c2b0e0514df36544aac4c542971ff0 SHA1 693a7fd3dd5acb2d869ba2cdaf2c04e434ed4dc2 SHA256 4d236c0207dc2bc918a84e9da4f8924eece1f3d9dbbe46c1479ec682add039c4
-MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
+AUX vitables-2.1-no-docs.patch 371 SHA256 74d2b635336ef87fa6be2d7f22adcb6279f9e2a35257bceea4c8057cc588756b SHA512 6670f4c2f9125b9a85a53da5eff0d0666d3b8ea1e765f77576f1b66ab69efbf2f8c0db13ae93e0272a411c0dfa6eb236cc067dc6e2478c35598097af645274cf WHIRLPOOL dd6cfa3eadd811424cc8203b5dc3d2436424b3ba6944d3f9e414667361e6d719e04e440cd8b2931ae87a9144c32ce171fb10b508f663b771b7c03c8b227e5235
+DIST ViTables-2.1.tar.gz 3111661 SHA256 f0413fa725617fbb3f0be03cb1f41b5b841c6946098a629f3fcb8a99fb9be14a SHA512 9ca48fbc8aa33dd3e1e02e2cf2055082831a95f5c24a2ab3bb294d7b09a3f09e62e500b0d69f8843a93af0db6dfc25873a57604f3fd433c0168eb335a1816bc8 WHIRLPOOL d526744105cea3ef7812db52f5e1a2ef74ca43431de167355afe0c6670a2752d3f4f5613f72f1f11e043cd6de0d4007086b4d548e78f7a3cbeaf4a5c6695babc
+EBUILD vitables-2.1.ebuild 1347 SHA256 8a06c776900dfca97bc4e6a4b631cda31ea228f0ce10f266af927701297a4a30 SHA512 0284d907dfa56b44376828e18dd37a5edb0406b2bd47d1f8551d239e77d4252dbf9f56ba267797ef079a6c73890b09ce6df4135c991bec774d11394541032ef3 WHIRLPOOL 6b9d26d6149b6b557c2a070d7c015029a23731378721f3bd2015ace95bc8c03982b4bdb71ae84e494f6a518cc2cff55743e4daada1c138d54a380ff9581876bb
+MISC ChangeLog 1496 SHA256 8a3db8ad7e0d39aed7fc046ebf82bf3c172e88a9c6a6709beb9a3627aac66484 SHA512 34a9aac7b8ee2dfbc6120af618a0295499893bbb3e15c458adfb9a48be3817fdb9a7d5943231546fbbd8625b539f9fa54ecb218c903c29dfe5bd2333a0ee5978 WHIRLPOOL 8124ebeb6781618b16a344c72b3321cf3653fa05626caf2727d16892f62556e64f51e4bdfcd926c3ff79162b0ae5b020831697035231433f11da01d1d2d5f0ad
+MISC metadata.xml 460 SHA256 72d99a873adfb75d51dcfc3f6efea5e0dd6f98fa473469af2b3de9e9e6220e9f SHA512 5ae3bc5a5f862bbc1c4ec36847e305500500c9c9695af71941c711c371affde6ce2073aca9470de37d659be0bf0d87b02ab2837e93249578f7c4a52a21890cf4 WHIRLPOOL eb4a14422d5f72ba78baad06eef73c530143d7de6cf1dd01e9addaece402257aa1bf6e0b23b9c2f37241418a1fc661c518bb2d84e51d9d3875ea22f659548923
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPk7q/AAoJEF0huFKJUZL5d1wP/R3AaKpxQrrMUDzYX2Y05Nb9
-7MqprAFZ+5dnmzTAOqhW7CdzOJqvUguTTzSMtrCzer2RI+Tm78ugItRczvFdvylt
-upkZIZdhWBj6G9opCbkD1eHhbzsvoFCp0PctiJm1hurcY0yzu1o4ZCvfwiaFrr5P
-EwUqSD+sPDtuhYHop3xsTwqBhCXWvJW9Ss9cHn9XeHpYDXDwmwjIunfxGZhcQQiR
-gH3JFgupj3DK/xqDLM8frEsb7sKvjjW2B8/GiWtUA6QtXk9a4af+8N36w9+n5GMd
-KOdoChy407A//dUA7zvxNvvUrKpCKuxXH+BwjtH6dPCbMzhwRsVwN/jJswWaNN+K
-NxUnjvyGHszl+MJHGSI8BafpxuGG3N06nd/4LUZLHQK5MRepijuFwcaFpX4ipMhg
-ai3hRHTHPFOQ/3nh1+lfu9wnGPl8mSi47WSQwXi9NPPtobz7I2KKsaC0bpOZ9sFh
-EL98d3LWXvt+dpLFhfiO67vrG6/pGHIAZ03lkwgl3qCTVdgfYuB1UEfub/OPeO6B
-Ab0159iQBO5lH3JcWmOpImCadT/LsTAz/8rz6YhboSO1Jh/l+0xJqvq3RA41Ul+Z
-x/fj85znC+sFfKA3hEOcYZYJVNWMNdfaFCzN/aCSg4tD4T9tTen9Pp660gUgdS1M
-NpdFxYiGrmxHmcIZ5uUs
-=f+69
+iEYEAREIAAYFAlAdct4ACgkQ1ycZbhPLE2B/OwCgjrtVQnLnJYULg1SEXvtgnhBm
+TRsAmwXWQgANI+Zf2YvJ80bK254+xLLb
+=hNRy
 -----END PGP SIGNATURE-----
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
 }