Add missing dependencies and drop old

Package-Manager: portage-2.2.0_alpha96/cvs/Linux x86_64

4 files changed, 24 insertions, 49 deletions

diff --git a/sci-astronomy/kapteyn/ChangeLog b/sci-astronomy/kapteyn/ChangeLog
index ebdd1e80cc13..c05afa645e69 100644
--- a/sci-astronomy/kapteyn/ChangeLog
+++ b/sci-astronomy/kapteyn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-astronomy/kapteyn
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/kapteyn/ChangeLog,v 1.9 2012/04/20 14:38:57 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/kapteyn/ChangeLog,v 1.10 2012/04/20 14:45:52 xarthisius Exp $
+
+  20 Apr 2012; Kacper Kowalik <xarthisius@gentoo.org> -kapteyn-2.1.ebuild,
+  kapteyn-2.2.ebuild:
+  Add missing dependencies and drop old
 
 *kapteyn-2.2 (20 Apr 2012)
 
diff --git a/sci-astronomy/kapteyn/Manifest b/sci-astronomy/kapteyn/Manifest
index 497d421b8486..d2b8052b4ba7 100644
--- a/sci-astronomy/kapteyn/Manifest
+++ b/sci-astronomy/kapteyn/Manifest
@@ -2,26 +2,24 @@
 Hash: SHA256
 
 AUX kapteyn-2.2-debundle_wcs.patch 2378 RMD160 49131fc4ab443813cf6a91147d41b3b77e7911b9 SHA1 59b612e3f8e9894a3403e979b630b916a575f40e SHA256 60ed3ff0b4195d83753a2e9027993180061ee774527f4092ed312bbabd74e239
-DIST kapteyn-2.1.tar.gz 10265902 RMD160 7f058385439d52e484fbfab18ddbc31b22c45f12 SHA1 c041f6858a1e712abd31480eb62100513007639c SHA256 277ac944a56f8e01dcc8133e08895ecf98289e79a6f955284cbc541de7e57dd5
 DIST kapteyn-2.2.tar.gz 11818056 RMD160 b5b6340f24d60953ddc5f22d9ea743171282707f SHA1 56caaa6ab47cea9405617debe51c4bf2b33e8f72 SHA256 7826a8eeab42e0167f3c9d8ad3444a213b24a34095ff1dd68f0f3254d9fce0ac
-EBUILD kapteyn-2.1.ebuild 713 RMD160 c4a8994a3c8c5217a549ae9b4f47217c7bc50a7b SHA1 c2e07b03e5b3dea63dc66ecebf6a965486b13550 SHA256 534453705452dd5f39b3c8d7ea77cafc5a6e08281cf3ea9fe8e7b85a85d313ed
-EBUILD kapteyn-2.2.ebuild 913 RMD160 06dcbd7638f065385a763441e1acfad07e3cc463 SHA1 ae27a9d55d6374d0a9a1e28015ea8e7a42170ac4 SHA256 bd3835f70a72f5c1c4061e863f4fa41e55892310aaed1753580e8049424ea13b
-MISC ChangeLog 1359 RMD160 9d1f8102636033949a635fbd4d2a0f7818443f0e SHA1 a76c1cbd500bf5fca946499a7613a9d834de5e23 SHA256 566f2f77294d5f90d2dabc1a5c9f8b5f44752d13c25e30e74b1edc377840dbca
+EBUILD kapteyn-2.2.ebuild 955 RMD160 f26333a2e948bf3f79ed5b1ac32e3706f1cf30f1 SHA1 c0072fb012f547815aa2df81772a491add58487e SHA256 f95903560c5ef0c7d5ffcaefca94c510321f319e8c790f06afe1381191bac9f4
+MISC ChangeLog 1498 RMD160 e35e36ae76e2c1be0efed5e4b24b5b15851bd1d5 SHA1 957da91c1bcbb8107ccb567c9160dd9ec69c3633 SHA256 4d0ed44deeabf52a263d27c5ecf7d2dafe6e9c021bcf26d6203da3c868f1f552
 MISC metadata.xml 511 RMD160 dd82416504ad85efdd65ec9a9ee0694995398b7d SHA1 e13d8e650282eec7862ec2c75d0fee265e34f984 SHA256 ff0f605ad17e795b93349c49dcd6fa7f69e6bd668b1175492f921a14eb5a36f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPkXUKAAoJEF0huFKJUZL50WkQAIysZfqb+5h9WdM3JOf3cKN3
-KfwT2wQCjRYpKlQ72H8H0itFrGlwmcpq5Da5A3hy1o2MQlkFnkvatPefIJZ0MEjb
-tIgCjmNYQ1vxTLRNKSUZR1lI65mr70jMDHjGF/m9iL/o8Ssra4dnSBVNfTpbsTNb
-HvcYA5N4hn90jWK0c2kT+d/2qSNNmWAyz8Kwi4snEjcYcJyVPKl872hPvM2VDCZn
-wQUDbFMpfRaVCA8kaqd/ib5z+3r8k/koAM9UsoZVECHNpb1aEyaXbttu6WLAZ0Vo
-iAPa1eiqtnb9W7GzV0ViLFZrI8EWQej1PndOdNGw6CVDfAAymYApkgUzoChTavP+
-/QZbUZ85lh+m4zeWPI/zKeXRqteCgB1QQKbGWEIdkMbzMxTO8xi5NwHWfQqlJyJs
-fwVG+61313alrKA8ndfJtvFiuOf9xYJzZWPc/yKSn/Iw7sr2HSTJ/hjfwRmyrplp
-7PmZsfaHDX+eLGKPjr9SqhwRjtt3ICoHQFTpTdYkNWG2ExiVIVMOedwwMcryPWVV
-Es8ifOKjqrUaBSCR5UX/6DuqtiUVyHCGdASHPeL8lqCtw+z1GIqWI5Vpo7mu1KS/
-9Fk3SLZDTP/Gy8fD1beMvWDXAowJWejVT4EvFzPlv/LTz8tgNqXCnkYlDNe6GPJ4
-NfVLn05zYJ5NbzVrlcE/
-=mlrg
+iQIcBAEBCAAGBQJPkXanAAoJEF0huFKJUZL5oHUP/jiQdWKeyUYg8ahappM+yGJL
+hYXJ2kgzNcGbCecYuxQnPXA8XU02+fR6hTWqcWwQQK5rJCCve70wDLmpTgz57EX/
+cIr/6zhlxgnu4+vcsBXsymcu0nSEjBSbrOOs5jUvyL0fv6dymLu6SOl1ZwY19ePT
+4cadzgoAbsuD+gSC3cM9+Tj+ap8mUKp5YujJDmHJQuQMY1smmAQSqC6MkfgIEnEo
+3iJfbydJNk5EBRxnXe+2649HrvXWNaRljVtP6OhkbkT9rZrSGIJNgaDQU1lgd6ic
+5Acvl7+u/5ltVaFn82MQAcfJjzNW/ovph+zOK4ibtIDbdLDiXxonYuTl8oQi6Ig0
++DBxJ4eVsW6Gx0PYss22AuB2HjsFks5/77tiL67qq2qeTsHyfmFnOAl0bOTc5QDH
+q6ljcYdY42wM808C7vEEw6Yr2BRvgozIQsw8wlm4W7xtKehrQmzCJQi7U5r8NFEu
+y1UYycaynM5PhPSRJUkI93UHiKhXWPiJd6T5YRJGW+Af0b5ruqvaBvHUY3a132JM
+OGCBuXelQQg9ScmPGlu+FehwRS4Gum6L3xK2bqsdX4XamqLHSvnlnd/QNBBZp5i4
+SlSGlbxJs9oislOGtwxFp8f4MQpDyDLTv/ZstqBUWnNndEfIVwRJkIsi7fYx/Spo
+KLwWaMIebFHj6EyGyGH3
+=O7xN
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/kapteyn/kapteyn-2.1.ebuild b/sci-astronomy/kapteyn/kapteyn-2.1.ebuild
deleted file mode 100644
index ba2194219941..000000000000
--- a/sci-astronomy/kapteyn/kapteyn-2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/kapteyn/kapteyn-2.1.ebuild,v 1.2 2012/02/28 00:44:06 patrick Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit distutils
-
-DESCRIPTION="Collection of python tools for astronomy"
-HOMEPAGE="http://www.astro.rug.nl/software/kapteyn"
-SRC_URI="http://www.astro.rug.nl/software/kapteyn/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=sci-astronomy/wcslib-4.7
-	dev-python/numpy"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	distutils_src_install
-	dodoc doc/${PN}.pdf || die
-}
diff --git a/sci-astronomy/kapteyn/kapteyn-2.2.ebuild b/sci-astronomy/kapteyn/kapteyn-2.2.ebuild
index 78b3bb0515d3..8e378a69fe38 100644
--- a/sci-astronomy/kapteyn/kapteyn-2.2.ebuild
+++ b/sci-astronomy/kapteyn/kapteyn-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/kapteyn/kapteyn-2.2.ebuild,v 1.1 2012/04/20 14:38:56 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/kapteyn/kapteyn-2.2.ebuild,v 1.2 2012/04/20 14:45:52 xarthisius Exp $
 
 EAPI="3"
 
@@ -21,7 +21,9 @@ IUSE=""
 
 DEPEND=">=sci-astronomy/wcslib-4.13.4
 	dev-python/numpy"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	dev-python/pyfits
+	dev-python/matplotlib"
 
 PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
 DOCS="CHANGES.txt README.txt"