Cleaned of older version and ebuild

(Portage version: 2.2_rc38/cvs/Linux x86_64)

4 files changed, 15 insertions, 47 deletions

diff --git a/sci-astronomy/xfitsview/ChangeLog b/sci-astronomy/xfitsview/ChangeLog
index 72a16678c77f..804b032af727 100644
--- a/sci-astronomy/xfitsview/ChangeLog
+++ b/sci-astronomy/xfitsview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-astronomy/xfitsview
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xfitsview/ChangeLog,v 1.3 2008/06/27 10:22:20 ulm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xfitsview/ChangeLog,v 1.4 2009/08/17 17:09:00 bicatali Exp $
+
+  17 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -xfitsview-2.1.ebuild, xfitsview-2.2.ebuild, metadata.xml:
+  Cleaned of older version and ebuild
 
   27 Jun 2008; Ulrich Mueller <ulm@gentoo.org> xfitsview-2.1.ebuild,
   xfitsview-2.2.ebuild:
diff --git a/sci-astronomy/xfitsview/metadata.xml b/sci-astronomy/xfitsview/metadata.xml
index b90969d0dd0e..eb2ac8ea45be 100644
--- a/sci-astronomy/xfitsview/metadata.xml
+++ b/sci-astronomy/xfitsview/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>sci</herd>
 <longdescription lang="en">
-XFITSview is a Graphical User Interface based on the Motif library to
-visualize astronomical images in the FITS format. It's a fairly simple
-program useful for doing simple astrometry.
+  XFITSview is a Graphical User Interface based on the Motif library to
+  visualize astronomical images in the FITS format. It's a fairly simple
+  program useful for doing simple astrometry.
 </longdescription>
 </pkgmetadata>
diff --git a/sci-astronomy/xfitsview/xfitsview-2.1.ebuild b/sci-astronomy/xfitsview/xfitsview-2.1.ebuild
deleted file mode 100644
index bcbed7c81f65..000000000000
--- a/sci-astronomy/xfitsview/xfitsview-2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xfitsview/xfitsview-2.1.ebuild,v 1.2 2008/06/27 10:22:20 ulm Exp $
-
-inherit eutils
-
-MY_PN=XFITSview
-MY_P=${MY_PN}${PV}
-
-DESCRIPTION="Viewer for astronomical images in FITS format"
-HOMEPAGE="http://www.nrao.edu/software/fitsview/"
-SRC_URI="ftp://ftp.cv.nrao.edu/fits/os-support/unix/xfitsview/${PN}${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="x11-libs/openmotif"
-
-S=${WORKDIR}/${MY_PN}
-
-src_compile() {
-	econf || die "econf failed"
-	# trick to make parallel building work
-	for d in fitssubs src; do
-	   pushd ${d}
-	   emake || die "emake ${d} failed"
-	   popd
-	done
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	dodoc README changes notes.text
-	dobin XFITSview
-}
diff --git a/sci-astronomy/xfitsview/xfitsview-2.2.ebuild b/sci-astronomy/xfitsview/xfitsview-2.2.ebuild
index ff5afd81f830..28f37797d6d4 100644
--- a/sci-astronomy/xfitsview/xfitsview-2.2.ebuild
+++ b/sci-astronomy/xfitsview/xfitsview-2.2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xfitsview/xfitsview-2.2.ebuild,v 1.2 2008/06/27 10:22:20 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xfitsview/xfitsview-2.2.ebuild,v 1.3 2009/08/17 17:09:00 bicatali Exp $
 
+EAPI=2
 inherit eutils
 
 MY_PN=XFITSview
@@ -15,13 +16,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-RESTRICT="test"
+
 DEPEND="x11-libs/openmotif"
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_PN}
+S="${WORKDIR}/${MY_PN}"
 
 src_compile() {
-	econf || die "econf failed"
 	# trick to make parallel building work
 	for d in fitssubs src; do
 	   pushd ${d}