Fixed doc building dependencies, removed old, fixed upstream pypi id

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

4 files changed, 31 insertions, 75 deletions

diff --git a/sci-libs/scikits_statsmodels/ChangeLog b/sci-libs/scikits_statsmodels/ChangeLog
index 1965e24677ea..089d0a6b88dc 100644
--- a/sci-libs/scikits_statsmodels/ChangeLog
+++ b/sci-libs/scikits_statsmodels/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/scikits_statsmodels
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_statsmodels/ChangeLog,v 1.8 2012/07/09 16:52:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_statsmodels/ChangeLog,v 1.9 2012/12/10 19:29:07 bicatali Exp $
+
+  10 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  -scikits_statsmodels-0.4.0.ebuild, metadata.xml,
+  scikits_statsmodels-0.4.3.ebuild:
+  Fixed doc building dependencies, removed old, fixed upstream pypi id
 
 *scikits_statsmodels-0.4.3 (09 Jul 2012)
 
diff --git a/sci-libs/scikits_statsmodels/metadata.xml b/sci-libs/scikits_statsmodels/metadata.xml
index f36eccebd66e..f683fcc717b4 100644
--- a/sci-libs/scikits_statsmodels/metadata.xml
+++ b/sci-libs/scikits_statsmodels/metadata.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<longdescription lang="en">Statsmodels is a python package that provides a complement to scipy
+<herd>sci</herd>
+<longdescription lang="en">
+  Statsmodels is a python package that provides a complement to scipy
   for statistical computations including descriptive statistics and
   estimation of statistical models.
   scikits.statsmodels provides classes and functions for the estimation
   of several categories of statistical models. These currently include
   linear regression models, OLS, GLS, WLS and GLS with AR(p) errors,
-  generalized linear models for six distribution families, M-estimators for robust
-  linear models, and regression with discrete dependent variables,
-  Logit, Probit, MNLogit, Poisson, based on maximum likelihood estimators.
-  An extensive list of result statistics are avalable for each  estimation
-  problem.</longdescription>
-	<upstream>
-		<remote-id type="pypi">scikits.statsmodels</remote-id>
-	</upstream>
+  generalized linear models for six distribution families,
+  M-estimators for robust linear models, and regression with discrete
+  dependent variables, Logit, Probit, MNLogit, Poisson, based on
+  maximum likelihood estimators. An extensive list of result
+  statistics are avalable for each  estimation problem.
+</longdescription>
+<upstream>
+  <remote-id type="pypi">statsmodels</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sci-libs/scikits_statsmodels/scikits_statsmodels-0.4.0.ebuild b/sci-libs/scikits_statsmodels/scikits_statsmodels-0.4.0.ebuild
deleted file mode 100644
index c7267f142834..000000000000
--- a/sci-libs/scikits_statsmodels/scikits_statsmodels-0.4.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_statsmodels/scikits_statsmodels-0.4.0.ebuild,v 1.3 2012/06/21 18:57:34 bicatali Exp $
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-VIRTUALX_REQUIRED=test
-RESTRICT_PYTHON_ABIS="2.4 2.7-pypy-*"
-inherit distutils virtualx
-
-MYPN="${PN/scikits_/}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Statistical computations and models for use with SciPy"
-HOMEPAGE="http://statsmodels.sourceforge.net/"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND="dev-python/pandas
-	sci-libs/scikits
-	sci-libs/scipy
-	examples? ( dev-python/matplotlib )"
-DEPEND=">=dev-python/cython-0.15.1
-	dev-python/pandas
-	sci-libs/scipy
-	dev-python/setuptools
-	doc? ( dev-python/sphinx >=dev-python/ipython-0.12 )
-	test? ( dev-python/nose )"
-
-S="${WORKDIR}/${MYP}"
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		"$(PYTHON -f)" setup.py build_sphinx || die
-	fi
-}
-
-src_install() {
-	find "${S}" -name \*LICENSE.txt -delete
-	distutils_src_install
-	remove_scikits() {
-		rm -f "${ED}"$(python_get_sitedir)/scikits/__init__.py || die
-	}
-	python_execute_function -q remove_scikits
-	use doc && dohtml -r build/sphinx/html
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/scikits_statsmodels/scikits_statsmodels-0.4.3.ebuild b/sci-libs/scikits_statsmodels/scikits_statsmodels-0.4.3.ebuild
index 8fa3e0ae0e33..3223fef485d9 100644
--- a/sci-libs/scikits_statsmodels/scikits_statsmodels-0.4.3.ebuild
+++ b/sci-libs/scikits_statsmodels/scikits_statsmodels-0.4.3.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_statsmodels/scikits_statsmodels-0.4.3.ebuild,v 1.1 2012/07/09 16:52:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_statsmodels/scikits_statsmodels-0.4.3.ebuild,v 1.2 2012/12/10 19:29:07 bicatali Exp $
 
 EAPI=4
 
 SUPPORT_PYTHON_ABIS="1"
 DISTUTILS_SRC_TEST="nosetests"
 VIRTUALX_REQUIRED=test
-RESTRICT_PYTHON_ABIS="2.4 2.7-pypy-*"
+RESTRICT_PYTHON_ABIS="2.4 3.3 2.7-pypy-*"
+PYTHON_MODNAME="statsmodels"
+
 inherit distutils virtualx
 
 MYPN="${PN/scikits_/}"
@@ -22,15 +24,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
-RDEPEND="dev-python/pandas
+RDEPEND="
+	dev-python/pandas
 	sci-libs/scikits
 	sci-libs/scipy
 	examples? ( dev-python/matplotlib )"
-DEPEND=">=dev-python/cython-0.15.1
+DEPEND="
+	>=dev-python/cython-0.15.1
 	dev-python/pandas
-	sci-libs/scipy
 	dev-python/setuptools
-	doc? ( dev-python/sphinx >=dev-python/ipython-0.12 )
+	sci-libs/scipy
+	doc? ( dev-python/matplotlib
+		   dev-python/sphinx
+		   >=dev-python/ipython-0.12 )
 	test? ( dev-python/nose )"
 
 S="${WORKDIR}/${MYP}"
@@ -46,7 +52,7 @@ src_install() {
 	find "${S}" -name \*LICENSE.txt -delete
 	distutils_src_install
 	remove_scikits() {
-		rm -f "${ED}"$(python_get_sitedir)/scikits/__init__.py || die
+		rm "${ED}"$(python_get_sitedir)/scikits/__init__.py || die
 	}
 	python_execute_function -q remove_scikits
 	use doc && dohtml -r build/sphinx/html/*