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

["Sebastien Fabbro" <bicatali@gentoo.org>]

commit:     2e71cb937a91cc455578661c5a4bcb154b310324
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 17:28:02 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 17:28:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2e71cb93

dev-python/pysolar: Fixed syntax, removed old, keyword for prefix

Package-Manager: portage-2.2.01.22124-prefix

---
 dev-python/pysolar/ChangeLog            |  5 +++-
 dev-python/pysolar/metadata.xml         |  7 +++--
 dev-python/pysolar/pysolar-0.4.4.ebuild | 52 ---------------------------------
 dev-python/pysolar/pysolar-0.5.ebuild   | 14 ++++-----
 4 files changed, 15 insertions(+), 63 deletions(-)

diff --git a/dev-python/pysolar/ChangeLog b/dev-python/pysolar/ChangeLog
index 7930f01..a103d4a 100644
--- a/dev-python/pysolar/ChangeLog
+++ b/dev-python/pysolar/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Jul 2013; Sébastien Fabbro <bicatali@gentoo.org> -pysolar-0.4.4.ebuild,
+  metadata.xml, pysolar-0.5.ebuild:
+  dev-python/pysolar: Fixed syntax, removed old, keyword for prefix
+
 *pysolar-0.5 (10 Jun 2013)
 
   10 Jun 2013; Justin Lecher <jlec@gentoo.org> -pysolar-0.4.3.ebuild,
@@ -25,4 +29,3 @@
   24 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org> +pysolar-0.4.2.ebuild,
   +metadata.xml:
   Initial import
-

diff --git a/dev-python/pysolar/metadata.xml b/dev-python/pysolar/metadata.xml
index fee0a39..96827aa 100644
--- a/dev-python/pysolar/metadata.xml
+++ b/dev-python/pysolar/metadata.xml
@@ -1,12 +1,15 @@
 <?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
  calculate the location of the sun or the shading percentage as a
  function of time for a row of 2-axis tracked panels.
 </longdescription>
+<upstream>
+  <remote-id type="pypi">Pysolar</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/dev-python/pysolar/pysolar-0.4.4.ebuild b/dev-python/pysolar/pysolar-0.4.4.ebuild
deleted file mode 100644
index fd9b6dc..0000000
--- a/dev-python/pysolar/pysolar-0.4.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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} testsolar.py || die
-}
-
-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
index 7923704..61a5398 100644
--- a/dev-python/pysolar/pysolar-0.5.ebuild
+++ b/dev-python/pysolar/pysolar-0.5.ebuild
@@ -10,13 +10,13 @@ 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/"
+DESCRIPTION="Collection of Python libraries for simulating the irradiation by the sun"
+HOMEPAGE="http://pysolar.org/"
 SRC_URI="https://github.com/${AUTHOR}/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="doc? ( dev-python/numpydoc )"
@@ -37,16 +37,14 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-	if use doc; then
-		PYTHONPATH=".." emake -C doc html
-	fi
+	use doc && PYTHONPATH=".." emake -C doc html
 }
 
 python_test() {
-	${PYTHON} Pysolar/testsolar.py || die
+	${EPYTHON} Pysolar/testsolar.py || die
 }
 
 python_install_all() {
-	use doc && HTML_DOSC=( doc/.build/html/. )
+	use doc && HTML_DOCS=( doc/.build/html/. )
 	distutils-r1_python_install_all
 }