sci-biology/amos: Bump to EAPI=4, remove unnecessary bits

(Portage version: 2.2.0_alpha107/git/Linux x86_64, unsigned Manifest commit)

2 files changed, 19 insertions, 16 deletions

diff --git a/sci-biology/amos/ChangeLog b/sci-biology/amos/ChangeLog
new file mode 100644
index 000000000..7009cae88
--- /dev/null
+++ b/sci-biology/amos/ChangeLog
@@ -0,0 +1,7 @@
+# ChangeLog for sci-biology/amos
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  22 May 2012; Justin Lecher <jlec@gentoo.org> amos-9999.ebuild:
+  Bump to EAPI=4, remove unnecessary bits
+
diff --git a/sci-biology/amos/amos-9999.ebuild b/sci-biology/amos/amos-9999.ebuild
index bcbf49dd3..ed45785d1 100644
--- a/sci-biology/amos/amos-9999.ebuild
+++ b/sci-biology/amos/amos-9999.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
-[ "$PV" == "9999" ] && inherit cvs
+EAPI=4
 
-inherit eutils
+[ "$PV" == "9999" ] && CVS=cvs
 
-DESCRIPTION="AMOS genome assembly package live cvs sources"
+inherit eutils ${CVS}
+
+DESCRIPTION="Genome assembly package live cvs sources"
 HOMEPAGE="http://sourceforge.net/projects/amos"
 ECVS_SERVER="amos.cvs.sourceforge.net:/cvsroot/amos"
 ECVS_AUTH="pserver"
@@ -21,10 +22,9 @@ SLOT="0"
 IUSE=""
 KEYWORDS=""
 
-#DEPEND=">=x11-libs/qt-3.3:3"
-DEPEND="dev-vcs/cvs
-		dev-libs/boost
-		x11-libs/qt-qt3support"
+DEPEND="
+	dev-libs/boost
+	x11-libs/qt-qt3support"
 RDEPEND="${DEPEND}
 		dev-perl/DBI
 		sci-biology/mummer"
@@ -37,21 +37,17 @@ src_unpack() {
 }
 
 src_prepare(){
-	epatch "${FILESDIR}"/amos.m4.patch || die
+	epatch "${FILESDIR}"/amos.m4.patch
 }
 
 src_configure() {
 	./bootstrap || die
 	#CFLAGS=$CFLAGS' -I/usr/include/qt4/Qt' CXXFLAGS=$CXXFLAGS' -I/usr/include/qt4/Qt' econf --enable-all --with-Qt-include-dir=/usr/include/qt4 --with-Qt-lib-dir=/usr/lib/qt4 --with-Qt-bin-dir=/usr/bin --with-Qt-lib=Qt3Support
-	econf --enable-all || die
+	econf --enable-all
 	einfo "No hawkeye and other Qt3-based apps installed, sorry, no qt3 anynore on Gentoo"
 }
 
 src_compile() {
 	# TODO: force MAKEOPTS=-j1 because it seems -j6 is exploting some dependency issue in Makefiles
-	MAKEOPTS=-j1 emake DESTDIR="${D}" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	MAKEOPTS=-j1 emake DESTDIR="${D}"
 }