Version bump

(Portage version: 2.2.01.22124-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

4 files changed, 55 insertions, 95 deletions

diff --git a/dev-python/pandas/ChangeLog b/dev-python/pandas/ChangeLog
index b497a45e3485..ffcdeca44a32 100644
--- a/dev-python/pandas/ChangeLog
+++ b/dev-python/pandas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pandas
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/ChangeLog,v 1.15 2013/05/04 12:14:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/ChangeLog,v 1.16 2013/08/08 18:08:49 bicatali Exp $
+
+*pandas-0.12.0 (08 Aug 2013)
+
+  08 Aug 2013; Sébastien Fabbro <bicatali@gentoo.org> +pandas-0.12.0.ebuild,
+  -pandas-0.10.0.ebuild, -pandas-0.10.1.ebuild, metadata.xml:
+  Version bump
 
   04 May 2013; Justin Lecher <jlec@gentoo.org> pandas-0.11.0.ebuild:
   Add correct python USEDEP strings, thanks mgorny for helping
diff --git a/dev-python/pandas/metadata.xml b/dev-python/pandas/metadata.xml
index a3d750265ffd..4e4c66c9b6c0 100644
--- a/dev-python/pandas/metadata.xml
+++ b/dev-python/pandas/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <longdescription lang="en">
+<herd>sci</herd>
+<longdescription lang="en">
   Pandas is a Python package providing fast, flexible, and expressive
   data structures designed to make working with "relational" or
   "labeled" data both easy and intuitive. It aims to be the
   fundamental high-level building block for doing practical, real
   world data analysis in Python. 
 </longdescription>
-  <use>
-    <flag name="excel">Pull a few Python packages for Microsoft Excel i/o</flag>
-    <flag name="R">Enable support for R via <pkg>dev-python/rpy</pkg></flag>
-  </use>
+<use>
+  <flag name="excel">Pull a few Python packages for Microsoft Excel i/o</flag>
+  <flag name="html">Enable HTML i/o via <pkg>dev-python/beautifulsoup</pkg></flag>
+  <flag name="R">Enable support for R via <pkg>dev-python/rpy</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/dev-python/pandas/pandas-0.10.0.ebuild b/dev-python/pandas/pandas-0.10.0.ebuild
deleted file mode 100644
index 7cc3efc4bd07..000000000000
--- a/dev-python/pandas/pandas-0.10.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.10.0.ebuild,v 1.3 2013/01/31 13:46:39 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="http://pandas.sourceforge.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples excel test R"
-
-CDEPEND="
-	dev-python/numpy
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	doc? (
-		dev-python/ipython
-		dev-python/rpy
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		sci-libs/scikits_statsmodels
-		)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND="${CDEPEND}
-	dev-python/matplotlib
-	dev-python/pytables
-	dev-python/pytz[${PYTHON_USEDEP}]
-	sci-libs/scipy
-	excel? (
-		dev-python/openpyxl
-		dev-python/xlrd
-		dev-python/xlwt
-	)
-	R? ( dev-python/rpy )"
-
-python_compile_all() {
-	python_export_best
-	if use doc; then
-		cd doc
-		"${PYTHON}" make.py html || die
-	fi
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib* || die
-	PYTHONPATH=. MPLCONFIGDIR=. HOME=. nosetests-"${EPYTHON}" pandas || die
-}
-
-python_install_all() {
-	distutils-r1_python_install
-	use doc && dohtml -r doc/build/html
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/pandas/pandas-0.10.1.ebuild b/dev-python/pandas/pandas-0.12.0.ebuild
index 67327bac5029..fa127e66abef 100644
--- a/dev-python/pandas/pandas-0.10.1.ebuild
+++ b/dev-python/pandas/pandas-0.12.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.10.1.ebuild,v 1.3 2013/05/04 11:13:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.12.0.ebuild,v 1.1 2013/08/08 18:08:49 bicatali Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
-inherit distutils-r1
+inherit distutils-r1 virtualx
 
 DESCRIPTION="Powerful data structures for data analysis and statistics"
 HOMEPAGE="http://pandas.sourceforge.net/"
@@ -15,34 +15,48 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples excel test R"
+IUSE="doc examples excel html test R"
+
+REQUIRED_USE="
+	excel? ( !python_targets_python3_2 )
+	doc? ( !python_targets_python3_2 )
+	R? ( !python_targets_python3_2 )
+"
 
 CDEPEND="
-	dev-python/numpy
+	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]"
 DEPEND="${CDEPEND}
 	doc? (
-		dev-python/ipython
-		dev-python/rpy
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/rpy[$(python_gen_usedep 'python2_7')]
 		dev-python/sphinx[${PYTHON_USEDEP}]
-		sci-libs/scikits_timeseries
-		dev-python/matplotlib
+		sci-libs/scikits_timeseries[$(python_gen_usedep 'python2*')]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
 		)
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-# sci-libs/scikits_statsmodels invokes a circular dep, hence rm from doc? ( ), again
+# sci-libs/scikits_statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
 RDEPEND="${CDEPEND}
-	dev-python/matplotlib
-	dev-python/pytables
+	dev-python/numexpr[${PYTHON_USEDEP}]
+	dev-python/bottleneck[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pytables[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
-	sci-libs/scipy
+	sci-libs/scipy[${PYTHON_USEDEP}]
 	excel? (
-		dev-python/openpyxl
-		dev-python/xlrd
-		dev-python/xlwt
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		dev-python/xlrd[$(python_gen_usedep 'python2*')]
+		dev-python/xlwt[$(python_gen_usedep 'python2*')]
+	)
+	html? (
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		|| ( dev-python/lxml[${PYTHON_USEDEP}]
+			 dev-python/html5lib[${PYTHON_USEDEP}] )
 	)
-	R? ( dev-python/rpy )"
+	R? ( dev-python/rpy[$(python_gen_usedep 'python2_7')] )"
 
-src_prepare() {
+python_prepare_all() {
 	if use doc; then
 		# Prevent un-needed download during build
 		sed -e 's:^intersphinx_mapping:#intersphinx_mapping:' \
@@ -51,8 +65,7 @@ src_prepare() {
 			-e "s:^}:#}:" \
 			-i doc/source/conf.py || die
 	fi
-
-	distutils-r1_src_prepare
+	distutils-r1_python_prepare_all
 }
 
 python_compile_all() {
@@ -62,24 +75,26 @@ python_compile_all() {
 	if use doc; then
 		cd "${BUILD_DIR}"/lib/ || die
 		cp -ar "${S}"/doc . && cd doc || die
-		PYTHONPATH=. "${PYTHON}" make.py html
+		PYTHONPATH=. "${EPYTHON}" make.py html || die
 	fi
 }
 
 python_test() {
 	# test can't survive py2.6, alternately patch to skip under unittest2
 	if [[ ${EPYTHON} == "python2.6" ]]; then
-		rm -f $(find "${BUILD_DIR}" -name test_array.py) || die
+		rm $(find "${BUILD_DIR}" -name test_array.py) || die
 	fi
 	cd "${BUILD_DIR}"/lib/ || die
-	PYTHONPATH=. MPLCONFIGDIR=. HOME=. nosetests -v pandas || die
+	PYTHONPATH=. MPLCONFIGDIR=. HOME=. \
+		VIRTUALX_COMMAND="nosetests --verbosity=3 pandas" \
+		virtualmake || die
 }
 
 python_install_all() {
 	if use doc; then
 		cd  "${BUILD_DIR}"/lib/ || die
-		dohtml -r doc/build/html/
-		einfo "An initial build of docs are absent of references to scikits_statsmodels"
+		dohtml -r doc/build/html/*
+		einfo "An initial build of docs is absent of references to scikits_statsmodels"
 		einfo "due to circular dependency. To have them included, emerge"
 		einfo "scikits_statsmodels next and re-emerge pandas with USE doc"
 	fi
@@ -90,4 +105,5 @@ python_install_all() {
 		insinto /usr/share/doc/${PF}
 		doins -r examples
 	fi
+	distutils-r1_python_install_all
 }