[gentoo-commits] proj/sci:master commit in: dev-python/pysolar/

["Justin Lecher" <jlec@gentoo.org>]

commit:     3787e36b733f9a24bf86f8a42eca2cf22a94a432
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 08:54:25 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 08:54:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3787e36b

dev-python/pysolar: Fix for new py eclasses, use vcs-snappshot.eclass, fix for new PIL

Package-Manager: portage-2.2.0_alpha179

---
 dev-python/pysolar/ChangeLog            |  8 +++-
 dev-python/pysolar/metadata.xml         |  4 +-
 dev-python/pysolar/pysolar-0.4.3.ebuild | 66 ---------------------------------
 dev-python/pysolar/pysolar-0.4.4.ebuild | 52 ++++++++++----------------
 dev-python/pysolar/pysolar-0.5.ebuild   | 52 ++++++++++++++++++++++++++
 5 files changed, 80 insertions(+), 102 deletions(-)

diff --git a/dev-python/pysolar/ChangeLog b/dev-python/pysolar/ChangeLog
index 77b3ee2..7930f01 100644
--- a/dev-python/pysolar/ChangeLog
+++ b/dev-python/pysolar/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-python/pysolar
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*pysolar-0.5 (10 Jun 2013)
+
+  10 Jun 2013; Justin Lecher <jlec@gentoo.org> -pysolar-0.4.3.ebuild,
+  pysolar-0.4.4.ebuild, +pysolar-0.5.ebuild, metadata.xml:
+  Fix for new py eclasses, use vcs-snappshot.eclass, fix for new PIL
+
   04 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
   Switched herd to sci-astronomy
 

diff --git a/dev-python/pysolar/metadata.xml b/dev-python/pysolar/metadata.xml
index 40069ec..fee0a39 100644
--- a/dev-python/pysolar/metadata.xml
+++ b/dev-python/pysolar/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
-<longdescription lang="en">
+  <herd>sci-astronomy</herd>
+  <longdescription lang="en">
  Pysolar is a collection of Python libraries for simulating the
  irradiation of any point on earth by the sun. It includes code for
  extremely precise ephemeris calculations, and more. Pysolar can

diff --git a/dev-python/pysolar/pysolar-0.4.3.ebuild b/dev-python/pysolar/pysolar-0.4.3.ebuild
deleted file mode 100644
index 5cc5158..0000000
--- a/dev-python/pysolar/pysolar-0.4.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils python
-
-DESCRIPTION="A collection of Python libraries for simulating the Sun's irradiation"
-HOMEPAGE="http://pysolar.org/ http://pypi.python.org/pypi/Pysolar/"
-SRC_URI="https://github.com/pingswept/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-DEPEND="doc? ( dev-python/numpydoc )"
-RDEPEND="
-	dev-python/imaging
-	dev-python/matplotlib
-	dev-python/numpy
-	dev-python/pygtk:2
-	dev-python/pytz
-	sci-libs/scipy"
-
-S="${WORKDIR}"/pingswept-${PN}-a110543
-
-PYTHON_MODNAME="constants.py horizon.py julian.py \
-	poly.py query_usno.py radiation.py shade.py \
-	simulate.py solar.py util.py"
-
-src_prepare() {
-	mv *${PN}* "${S}" && cd "${S}"
-	sed \
-		-e "s:'testsolar', ::" \
-		-e "s:'shade_test', ::" \
-		-i setup.py || die
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		cd doc
-		PYTHONPATH=".." emake html || die
-	fi
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/abi" "$(PYTHON)" testsolar.py
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-	if use doc; then
-		dohtml -r doc/.build/html/* || die
-	fi
-}

diff --git a/dev-python/pysolar/pysolar-0.4.4.ebuild b/dev-python/pysolar/pysolar-0.4.4.ebuild
index ae36803..fd9b6dc 100644
--- a/dev-python/pysolar/pysolar-0.4.4.ebuild
+++ b/dev-python/pysolar/pysolar-0.4.4.ebuild
@@ -1,17 +1,14 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 AUTHOR=pingswept
-GIT_HASH=42d1abd
 
-inherit distutils python
+inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="A collection of Python libraries for simulating the Sun's irradiation"
 HOMEPAGE="http://pysolar.org/ http://pypi.python.org/pypi/Pysolar/"
@@ -24,43 +21,32 @@ IUSE="doc"
 
 DEPEND="doc? ( dev-python/numpydoc )"
 RDEPEND="
-	dev-python/imaging
-	dev-python/matplotlib
-	dev-python/numpy
-	dev-python/pygtk:2
-	dev-python/pytz
-	sci-libs/scipy"
-
-S=${WORKDIR}/${AUTHOR}-${PN}-${GIT_HASH}
-
-PYTHON_MODNAME="constants.py horizon.py julian.py \
-	poly.py query_usno.py radiation.py shade.py \
-	simulate.py solar.py util.py"
-
-src_prepare() {
+	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
 	sed \
 		-e "s:'testsolar', ::" \
 		-e "s:'shade_test', ::" \
 		-i setup.py || die # don't install tests
-	distutils_src_prepare
+	distutils-r1_python_prepare_all
 }
 
-src_compile() {
-	distutils_src_compile
-
+python_compile_all() {
 	if use doc; then
 		PYTHONPATH=".." emake -C doc html
 	fi
 }
 
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/abi" "$(PYTHON)" testsolar.py
-	}
-	python_execute_function testing
+python_test() {
+	${PYTHON} testsolar.py || die
 }
 
-src_install() {
-	distutils_src_install
-	use doc && dohtml -r doc/.build/html/*
+python_install_all() {
+	use doc && HTML_DOSC=( doc/.build/html/. )
+	distutils-r1_python_install_all
 }

diff --git a/dev-python/pysolar/pysolar-0.5.ebuild b/dev-python/pysolar/pysolar-0.5.ebuild
new file mode 100644
index 0000000..7923704
--- /dev/null
+++ b/dev-python/pysolar/pysolar-0.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+AUTHOR=pingswept
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="A collection of Python libraries for simulating the Sun's irradiation"
+HOMEPAGE="http://pysolar.org/ http://pypi.python.org/pypi/Pysolar/"
+SRC_URI="https://github.com/${AUTHOR}/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+DEPEND="doc? ( dev-python/numpydoc )"
+RDEPEND="
+	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed \
+		-e "s:'testsolar', ::" \
+		-e "s:'shade_test', ::" \
+		-i setup.py || die # don't install tests
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		PYTHONPATH=".." emake -C doc html
+	fi
+}
+
+python_test() {
+	${PYTHON} Pysolar/testsolar.py || die
+}
+
+python_install_all() {
+	use doc && HTML_DOSC=( doc/.build/html/. )
+	distutils-r1_python_install_all
+}