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

Package-Manager: portage-2.2.01.22124-prefix

5 files changed, 15 insertions, 64 deletions

diff --git a/dev-python/pysolar/ChangeLog b/dev-python/pysolar/ChangeLog
index 7930f01c7..a103d4a14 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/Manifest b/dev-python/pysolar/Manifest
index b926389d0..fdb452daf 100644
--- a/dev-python/pysolar/Manifest
+++ b/dev-python/pysolar/Manifest
@@ -1,2 +1 @@
-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 fee0a3912..96827aac9 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 fd9b6dc5d..000000000
--- 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 7923704fa..61a53987c 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
 }