5 files changed, 10 insertions, 72 deletions
diff --git a/sci-astronomy/casapy-bin/ChangeLog b/sci-astronomy/casapy-bin/ChangeLog
index 83c44b158..8a563a78d 100644
--- a/sci-astronomy/casapy-bin/ChangeLog
+++ b/sci-astronomy/casapy-bin/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*casapy-bin-4.2.2.30986_p1 (09 Sep 2014)
+
+  09 Sep 2014; Joseph Jon Booker <joe@neoturbine.net>
+  +casapy-bin-4.2.2.30986_p1.ebuild, -casapy-bin-4.2.0.28322.021_p1.ebuild,
+  -casapy-bin-4.2.0_pre10_p1.ebuild, casapy-bin-4.2.1.29047.001_p1.ebuild:
+  sci-astronomy/casapy-bin: version bump to 4.2.2, remove old ebuilds
+
 *casapy-bin-4.2.1.29047.001_p1 (13 May 2014)
 
   13 May 2014; Joseph Jon Booker <joe@neoturbine.net>
diff --git a/sci-astronomy/casapy-bin/Manifest b/sci-astronomy/casapy-bin/Manifest
index b45731488..c70a0dda5 100644
--- a/sci-astronomy/casapy-bin/Manifest
+++ b/sci-astronomy/casapy-bin/Manifest
@@ -1,3 +1,2 @@
-DIST casapy-42.0.28322-021-1-64b.tar.gz 985267525 SHA256 b5c0a8007fba09671a82fafcaa88a728fcf0a69160da073bb0ae1583ac649906 SHA512 33725f4d367b86bbd493b9a04e57980171d8f8870e59f123c9548ab3fc7d3f8b333a201a704e0a603de743de08a95485ec32f0fe8f57dd26d26c282c8ab340cc WHIRLPOOL c379b741ef2e4a938bdecd8a28af3610d2df89b4641e9d58c230298da43a8515f80c272fec3b91c025df15a0172a735fda64578ecf2022f84d87a2bab41378d0
-DIST casapy-42.0.prerelease-10-1-64b.tar.gz 985352461 SHA256 3919e177d06c2df86861245ebd972eff543f0b67d3288e885915766239073f48 SHA512 16cefe680580f652c71fe32b729c37960f5075aeaf3b6efce6d73e85525d3808c505092196ddfb36fe23ff8994d49a43470cc039f8210e23336b5ad69040481c WHIRLPOOL 7605d8e5c59cc1686b0a8d8548d69cf662bbf0409d2ab5c0d64a695ba85905748fdf25b7476000a06471bfc6e88bc543f795e88468afb41f263d95ba51b7b297
 DIST casapy-42.1.29047-001-1-64b.tar.gz 985311640 SHA256 966b86af4a09fc962b5eebd6b8679d686b5e811c17364e1350ea6c332f525ff0 SHA512 506a7d173a4196106d437ba234a48b186d036b82d524d89fbe476045de979992c438db12bcaa4eb42b551f1f9c65fd83fce3c7469a8c8ef60a4692d71bab40dc WHIRLPOOL 2e8b62f036fd4b822966954187f15ff5d247ac90a5e550bc94fb4102aade623526d14fc2edc843ca4a821bc26d5adfc89054f9190351e17d2ef10ba69b00454c
+DIST casapy-42.2.30986-1-64b.tar.gz 1000907646 SHA256 e178b8005efeb9eee60f809f1eef6d55a5cd29b9b62b1a5a3103277635188f0c SHA512 2410b0e802752a1992a0add4cd23bd0f0dc9a0ca21895f1cd88ffb81ab5566b8bd1ff2c6c64759760105e65d0f844efa453b6ab52b2f86bc4017f5337fa66f5e WHIRLPOOL 340e99f95892a49b40ca1fb3da11110a99fda36f882b01de2cb9fee4c4f0b8609c07c46271d299146bbaeb1661aad18e409f2143f21be90f605e9e7a82e3d2cb
diff --git a/sci-astronomy/casapy-bin/casapy-bin-4.2.0_pre10_p1.ebuild b/sci-astronomy/casapy-bin/casapy-bin-4.2.0_pre10_p1.ebuild
deleted file mode 100644
index 6c0d85226..000000000
--- a/sci-astronomy/casapy-bin/casapy-bin-4.2.0_pre10_p1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit versionator
-
-DESCRIPTION="Software package to calibrate, image, and analyze radioastronomical data"
-HOMEPAGE="http://casa.nrao.edu/"
-MY_P=$(version_format_string '${PN%-bin}-$1$2.$3.prerelease-${4#pre}-${5#p}-64b')
-SRC_URI="https://svn.cv.nrao.edu/casa/linux_distro/prerelease/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-crypt/mit-krb5
-	dev-db/sqlite
-	dev-libs/glib
-	dev-libs/icu
-	dev-libs/libxslt
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/gst-plugins-base
-	media-libs/libjpeg-turbo
-	media-libs/mesa
-	media-libs/tiff
-	sci-libs/gsl
-	sci-libs/pgplot
-	sys-apps/keyutils
-	sys-apps/util-linux
-	sys-devel/gcc[fortran]
-	virtual/libffi
-	x11-libs/libdrm
-	x11-libs/libSM
-	x11-libs/libXau
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-"
-
-S="${WORKDIR}/${MY_P}"
-QA_PREBUILT="/opt/casapy/* /opt/casapy/sbin/* /opt/casapy/lib64/*"
-
-src_compile() { :; }
-
-src_install() {
-	dodir /opt/
-	cp -R "${S}" "${D}/opt/casapy" || die "Could not copy casapy into ${D}/opt"
-
-	dodir /opt/bin
-	cd "${D}/opt/casapy/bin"
-	for binary in `ls`
-	do
-		dosym ../casapy/$binary /opt/bin/$binary
-	done
-}
-
-pkg_postinst() {
-	einfo "CASA will use media-gfx/graphviz if this package is installed."
-	ewarn "Upstream warns that SElinux must be disabled, set to permissive, or configured to allow execheap."
-}
diff --git a/sci-astronomy/casapy-bin/casapy-bin-4.2.1.29047.001_p1.ebuild b/sci-astronomy/casapy-bin/casapy-bin-4.2.1.29047.001_p1.ebuild
index 6bcc74f0b..296cc70e8 100644
--- a/sci-astronomy/casapy-bin/casapy-bin-4.2.1.29047.001_p1.ebuild
+++ b/sci-astronomy/casapy-bin/casapy-bin-4.2.1.29047.001_p1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Software package to calibrate, image, and analyze radioastronomical
 HOMEPAGE="http://casa.nrao.edu/"
 
 MY_P=$(version_format_string '${PN%-bin}-$1$2.$3.$4-$5-${6#p}-64b')
-SRC_URI="https://svn.cv.nrao.edu/casa/linux_distro/${MY_P}.tar.gz"
+SRC_URI="https://svn.cv.nrao.edu/casa/linux_distro/old/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
diff --git a/sci-astronomy/casapy-bin/casapy-bin-4.2.0.28322.021_p1.ebuild b/sci-astronomy/casapy-bin/casapy-bin-4.2.2.30986_p1.ebuild
index 6bcc74f0b..3578d4635 100644
--- a/sci-astronomy/casapy-bin/casapy-bin-4.2.0.28322.021_p1.ebuild
+++ b/sci-astronomy/casapy-bin/casapy-bin-4.2.2.30986_p1.ebuild
@@ -8,7 +8,7 @@ inherit versionator
 DESCRIPTION="Software package to calibrate, image, and analyze radioastronomical data"
 HOMEPAGE="http://casa.nrao.edu/"
 
-MY_P=$(version_format_string '${PN%-bin}-$1$2.$3.$4-$5-${6#p}-64b')
+MY_P=$(version_format_string '${PN%-bin}-$1$2.$3.$4-${5#p}-64b')
 SRC_URI="https://svn.cv.nrao.edu/casa/linux_distro/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"