Version bump

Package-Manager: portage-2.2.01.22124-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

5 files changed, 64 insertions, 106 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/Manifest b/dev-python/pandas/Manifest
index af16a5182adc..4c78e9ea4bfe 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST pandas-0.10.0.tar.gz 2842342 SHA256 670f89055a7683cffeae7f8f3ad57290798542fceb3c0ee435e4b42bb76a44b5 SHA512 8426545ee4f3df91f68ef379fc38e25a45853744033f84096710a4edeedcfadc1530aaff996a6246453a786a082e91e15fd1ee9f44dde413d97d72abae3e8e38 WHIRLPOOL 271e920cc8d89e1a357a94e4116a9d1faf4047fc1c2b6ebe19b8725fcb9aadd252fcb6b6dc2e27d595714543ed47e2b1d7328d6e07aac600f849d4d7546c86f8
-DIST pandas-0.10.1.tar.gz 2499500 SHA256 c7ca2a66013ec7f196f0e425a08aa0417de0da4147c551fbb8c3afce9ec97aaf SHA512 98396c0601a9c13186add6d91bdb12fc778ae57bf5333de005c0e19050002544d8b8782450404f150caeac84f8031b8e7ef83213b71eaa175c70a396a5a99ba6 WHIRLPOOL 5afea4942be218ff19666b5ddbccd1acd8a09970826e5276a6a5bec825b15affb99a023be8cbf1735d7ff7d8dafc0bd82ce4e763a96f272465da054facc7672f
 DIST pandas-0.11.0.tar.gz 2783590 SHA256 4d74d4d408494ccc690f6e61d11cb266bb55b142d22bf9b8a7063206073a90d7 SHA512 3dd0ac4fb9e301197eeb9b1e4dfdad9e09d54b8c25f93dc163d3f9b7f7bba076d510f759eace4037776f3821ef820f8f18f38b18617a7e250ac479bb83e68009 WHIRLPOOL 68ee54b57cdfed2f4198a38ba16bed8d3bea17a2e75c6811e46fa00b7f9fbf19de1ace73e3abf0f88e2e58feb6300b6cd6458eceae7e5a9f9df52d3903b45421
-EBUILD pandas-0.10.0.ebuild 1428 SHA256 9a89c4113274b2c0a16d22a5f926f180a84448e641e06a892ead2c254e292baf SHA512 d42deb9d7cdeb5a371921d5f1c76c72845a25416b4c609ae26ff2c9226dbde7de5d38714987313dec52404c824474c774c98d9886552fe6869120404c33027b9 WHIRLPOOL da686aa5212e6b84a984548dcded20324b92901d756b4d2f43faf094da5e3827219fd97c7f0dadbf7d1a4eb6efcbdd42cdec2008ee696527cad0ccbc61613a1c
-EBUILD pandas-0.10.1.ebuild 2507 SHA256 907140e8980083750952b93b014dcf65cf2bf3b06c70c88f71aec413ce5cd79b SHA512 4368825eda8b86ef8f819687ce6c6fa7e3644d083c47a18c3179f04f33dc15aa1b3e73e9d06c5653e9b25cde5ad6b795e74a596eb30025acd993b5f3b4fc5315 WHIRLPOOL a656fadfa3c15f81716cd56e510f3648d537ac087a5f3cc6acc73d9981de92cbd93dd36777776f9f7f938ec049472c2cef0ac3daec04d45fcdb4aabedad4a336
+DIST pandas-0.12.0.tar.gz 3155059 SHA256 be9b4c3611801b366873531bc87a87dd16b19e7d78fa84c21898cd007931c86d SHA512 da5dbd6109f7c96b762fcdf695ed50da8059ca78f645b0dec9a741ed89638ba43f8b336d339d3d4c250585ddfddff240b40bb25e99ab642eed825c649f2fd59e WHIRLPOOL 19cb14eff3b397d80d2c33d55c980b1db1793c087048be9cc13718e50f6034aa3f15fe27866cc13f778fa71cf3c91147449865b9597087622fa9cf24e71d527d
 EBUILD pandas-0.11.0.ebuild 3137 SHA256 9ef279086d81442d9ca7b4139ea5403628e8854033411dbb32884afb115c0957 SHA512 5db0000645270ac2cf2a01cf3b3d3fbbab47503f6d95deaef9dbc4d99519fc19446d0b03fbb8aef2b74231880d64597a6da52f01f6e00a33e82de8879ec965d2 WHIRLPOOL 85a168f15d3292d81a8af0452497b3742ffda9a35fe370e875d8e4fdf66100931dbe210f765784b54870bbbf9064bec2dd10f5ecbdfeb8e6afbb1e343b1b7c4b
-MISC ChangeLog 2737 SHA256 42277001a3d07657f85ec6571048722ae4c986c0e12931f9a28f92cdec4d75af SHA512 f174690217988742bfc8b7fa648c8eff5a89655a0fdea64ca57c59a11c2330d30067881a8ac9dd97e9f77b0fc38c929176d7ddf2f5a47bebd2cc25fc0561e5cf WHIRLPOOL 04a2ce31e232de666a16a3b0e944aa0fcb69013e28e15c80ee255be9f0dddf05a8216cccb53b9f3e53c8644cada02f21b3e0644821e7042d59096fe7e52119ce
-MISC metadata.xml 676 SHA256 6daa7ad5a29da814ca000ef9d1a4a499c59d2ceec7293be7a750e5d38161dba5 SHA512 0428afcb2f246d54787e50f40bf44908725f2732112be0cd58b2c79904f3b902951e3fd79bf6c659f4822c4bb03f3a70b46de31ea044d322606a8d39758d6094 WHIRLPOOL c47c56416b74e36b669657d1499bb42b170cb4ebe3f6d0bb28d3140f0fe0e4241bf36ea9e438b0ca5db32c8f17d171ed8cc4ff82d03bfdec35ad0e6db0f39932
+EBUILD pandas-0.12.0.ebuild 3286 SHA256 10c95f150ff5d75c930cd1184d6cdfbaa22058a6905b3c5e9b8715c77633ee7c SHA512 c9b6dc7b932715a14b4f20d8a436911deae213faeeb3932de0e659376cf8ff37c27b9a3a0085563b31d23a518df2265cdaa6380a903fd8b6e5aec9eeb256009c WHIRLPOOL acfbf02811a9aa8353d6e876c932ebe4168cdd7e8f3137c3650765d1849948bc8564d245d84ed36650d1ab92bf42d40f025432c306c039750243a6ab9ab8a486
+MISC ChangeLog 2927 SHA256 80bbe564c500cefcc0aba597760fe18284f2aac4ae6f2626e8d6814afebafb42 SHA512 147f83ebe3ae36ec91ac9aeba5b63fab502ff03beeb1753c085c1b32f540045a4c477d45af8172a27cfd0cf564021fa07fe5274231cd0a7d66926772c9ce03f6 WHIRLPOOL aea4560f5c1dab78f2d80c406e25520dee6876bf5fc9419c389493a95567c8f77e272f050bba9c874e478749beb310ab0ef021bdf1e386f65f7ae9a4dcdb729e
+MISC metadata.xml 747 SHA256 15e7e8d9d4454fc8ab901571f19f25a1d3da0cae5feb6df370cbb7a8df51b8f6 SHA512 166165a9ef4af866624a04b276804111171f8f2a3c5e4d7145ff814818dc17cc53989b543b04f17e669f80fdf02f8839a08b564dbd2dac38a9b812fae4def1ef WHIRLPOOL eaa57e5cedfa3b563a37201f1729fbde649af5e7665cab45bbb5161205e4f1a22c7e41b9eba499e45a11d8f07d25cb701450d3d3293ad2b5bb3c4c93b6d72e35
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAlGE+98ACgkQgAnW8HDreRba/wCdGnPyXGprD4h8TgLaRyqMmp11
-TGsAoJ1aac6PRl0oEwyILfC1v4XtwljB
-=cjHH
+iEYEAREIAAYFAlID3rIACgkQ1ycZbhPLE2AhLgCfXov8wC4LtVySYbb2WrLKaKI9
+kvwAoLRjjqktZ7zF+V3lA4o8E1c+xPYz
+=qeI3
 -----END PGP SIGNATURE-----
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
 }