3 files changed, 14 insertions, 47 deletions
diff --git a/sci-biology/trf/ChangeLog b/sci-biology/trf/ChangeLog
index ec3cee8c9f1f..ae3255d9fe59 100644
--- a/sci-biology/trf/ChangeLog
+++ b/sci-biology/trf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/trf
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/trf/ChangeLog,v 1.5 2010/04/05 12:11:36 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/trf/ChangeLog,v 1.6 2012/10/06 16:57:02 jlec Exp $
+
+  06 Oct 2012; Justin Lecher <jlec@gentoo.org> -trf-4.0.ebuild,
+  trf-4.04.ebuild:
+  Drop old; move to EAPI=4; use QA_PREBUILT, #436718
 
   05 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> trf-4.04.ebuild:
   x86 stable wrt bug #311833
diff --git a/sci-biology/trf/trf-4.0.ebuild b/sci-biology/trf/trf-4.0.ebuild
deleted file mode 100644
index 88191a56dd55..000000000000
--- a/sci-biology/trf/trf-4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/trf/trf-4.0.ebuild,v 1.2 2009/04/23 19:04:13 maekke Exp $
-
-inherit eutils
-
-DESCRIPTION="Tandem Repeats Finder"
-HOMEPAGE="http://tandem.bu.edu/trf/trf.html"
-SRC_URI="http://tandem.bu.edu/trf/downloads/trf400.linux.exe"
-
-LICENSE="as-is"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-DEPEND=""
-RDEPEND=""
-# gtk? ( x11-libs/gtk+ ) x11-libs/pango[X]
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/trf400.linux.exe" "${S}"
-}
-
-src_install() {
-	exeinto /opt/${PN}
-	doexe trf400.linux.exe || die
-	dosym /opt/${PN}/trf400.linux.exe /usr/bin/trf || die
-	# GTK version (http://tandem.bu.edu/trf/downloads/trf400.linuxgtk.exe) has broken linking
-	#if use gtk; then
-	#	doexe trf400.linuxgtk.exe || die
-	#	make_desktop_entry /opt/${PN}/trf400.linuxgtk.exe "Tandem Repeats Finder" || die
-	#fi
-}
diff --git a/sci-biology/trf/trf-4.04.ebuild b/sci-biology/trf/trf-4.04.ebuild
index d50074e0c0b4..459c05a78e9b 100644
--- a/sci-biology/trf/trf-4.04.ebuild
+++ b/sci-biology/trf/trf-4.04.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/trf/trf-4.04.ebuild,v 1.3 2010/04/05 12:11:35 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/trf/trf-4.04.ebuild,v 1.4 2012/10/06 16:57:02 jlec Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils
 
@@ -17,20 +17,18 @@ SLOT="0"
 IUSE=""
 KEYWORDS="amd64 x86"
 
-DEPEND=""
-RDEPEND=""
-# gtk? ( x11-libs/gtk+ ) x11-libs/pango[X]
-
 S="${WORKDIR}"
 
+QA_PREBUILT="opt/${PN}/.*"
+
 src_unpack() {
-	cp "${DISTDIR}/${MY_P}.linux.exe" "${S}"
+	cp "${DISTDIR}/${MY_P}.linux.exe" "${S}" || die
 }
 
 src_install() {
 	exeinto /opt/${PN}
-	doexe trf404.linux.exe || die
-	dosym /opt/${PN}/${MY_P}.linux.exe /usr/bin/trf || die
+	doexe trf404.linux.exe
+	dosym /opt/${PN}/${MY_P}.linux.exe /usr/bin/trf
 	# GTK version (http://tandem.bu.edu/trf/downloads/trf400.linuxgtk.exe) has broken linking
 	#if use gtk; then
 	#	doexe trf400.linuxgtk.exe || die