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

Package-Manager: portage-2.2.0_alpha179

6 files changed, 81 insertions, 103 deletions

diff --git a/dev-python/pysolar/ChangeLog b/dev-python/pysolar/ChangeLog
index 77b3ee2d0..7930f01c7 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/Manifest b/dev-python/pysolar/Manifest
index 6c208f58d..b926389d0 100644
--- a/dev-python/pysolar/Manifest
+++ b/dev-python/pysolar/Manifest
@@ -1,2 +1,2 @@
-DIST pysolar-0.4.3.tar.gz 1862462 RMD160 13e478c5b6df110f1dc7dc15166b5873a8875c65 SHA1 3b8f88f61772ba4fdd06c2d3ec94d185fd11441e SHA256 894a00559ec9840caa5763df6f8ba7cf3a8ad4d3bed96cca96dbd4113898160e
 DIST pysolar-0.4.4.tar.gz 1862179 SHA256 8fe4c40e66fb8fa16a868f92526c5caa673e6452b9572fd7a4786f4bfbee3649 SHA512 3a88f838eb5790b931dbd1d50620a884589020c842b6ab159fc121867086530a06d56c33cae0fc852a7693b2977158be989bbc449d2711e1bf259c6207b38369 WHIRLPOOL a8d857b8255e34e26d887a048721e89168da338cfdb02fde7382b49e83fa70e51bc5a77604069de9cdd899b99354aad32fbd06794bed40f6e5e31071c7111f3b
+DIST pysolar-0.5.tar.gz 1858367 SHA256 95ec5f85effe129d8ffff576946dc88ec34a5a95b9c4e9fccc41b025699bf825 SHA512 0fc34de7ccf2afd02a05042e4d8dd2ecd165a0b968a2bb1f854e187e6bd00991256c4671a12db76249dfd579e4f9dae7e2ac9a11ccb7fc912a73b8305158ff71 WHIRLPOOL f0562522640d75420c0acdc76471390222504130566427e1168d2a61d2891f2578fbb974513df266d3463b40e8d45bc829c1930f33a2511b12185dfeb4ca33f9
diff --git a/dev-python/pysolar/metadata.xml b/dev-python/pysolar/metadata.xml
index 40069ec01..fee0a3912 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 5cc51584f..000000000
--- 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 ae3680359..fd9b6dc5d 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 000000000..7923704fa
--- /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
+}