Bumped to EAPI=4, dropped old

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

4 files changed, 16 insertions, 57 deletions

diff --git a/sci-chemistry/mustang/ChangeLog b/sci-chemistry/mustang/ChangeLog
index 5af71c4ef4d4..46c50c0f624e 100644
--- a/sci-chemistry/mustang/ChangeLog
+++ b/sci-chemistry/mustang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/mustang
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mustang/ChangeLog,v 1.9 2010/07/07 09:04:29 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mustang/ChangeLog,v 1.10 2012/01/11 15:13:19 jlec Exp $
+
+  11 Jan 2012; Justin Lecher <jlec@gentoo.org> -mustang-3.ebuild,
+  mustang-3.2.1.ebuild, metadata.xml:
+  Bumped to EAPI=4, dropped old
 
   07 Jul 2010; Justin Lecher <jlec@gentoo.org> mustang-3.2.1.ebuild:
   Fixing SRC_URI, #327251
diff --git a/sci-chemistry/mustang/metadata.xml b/sci-chemistry/mustang/metadata.xml
index 9ac9ffdb3a41..e42d0af60f42 100644
--- a/sci-chemistry/mustang/metadata.xml
+++ b/sci-chemistry/mustang/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
+	<herd>sci-chemistry</herd>
 </pkgmetadata>
diff --git a/sci-chemistry/mustang/mustang-3.2.1.ebuild b/sci-chemistry/mustang/mustang-3.2.1.ebuild
index 4e30c5eecfb5..89995aa56775 100644
--- a/sci-chemistry/mustang/mustang-3.2.1.ebuild
+++ b/sci-chemistry/mustang/mustang-3.2.1.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-chemistry/mustang/mustang-3.2.1.ebuild,v 1.5 2010/07/07 09:04:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mustang/mustang-3.2.1.ebuild,v 1.6 2012/01/11 15:13:19 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit base toolchain-funcs
 
@@ -11,8 +11,8 @@ SRC_P="${PN}_v${PV}"
 MY_P="${MY_PN}_v${PV}"
 
 DESCRIPTION="MUltiple STructural AligNment AlGorithm."
-HOMEPAGE="http://www.cs.mu.oz.au/~arun/mustang/"
-SRC_URI="http://ww2.csse.unimelb.edu.au/~arun/mustang/mustang_v3.2.1.tgz"
+HOMEPAGE="http://www.csse.monash.edu.au/~karun/Site/mustang.html"
+SRC_URI="http://www.csse.unimelb.edu.au/~arun/${PN}/${SRC_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -25,8 +25,7 @@ src_compile() {
 	emake \
 		CPP=$(tc-getCXX) \
 		CPPFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		|| die "emake failed"
+		LDFLAGS="${LDFLAGS}"
 }
 
 src_test() {
@@ -34,9 +33,9 @@ src_test() {
 }
 
 src_install() {
-	newbin bin/${P} mustang || die
-	doman man/${PN}.1 || die
-	dodoc README || die
+	newbin bin/${P} mustang
+	doman man/${PN}.1
+	dodoc README
 }
 
 pkg_postinst() {
diff --git a/sci-chemistry/mustang/mustang-3.ebuild b/sci-chemistry/mustang/mustang-3.ebuild
deleted file mode 100644
index 3cc52e09817a..000000000000
--- a/sci-chemistry/mustang/mustang-3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mustang/mustang-3.ebuild,v 1.4 2008/12/19 20:22:42 loki_val Exp $
-
-inherit base toolchain-funcs
-
-MY_PN="MUSTANG"
-SRC_P="${PN}_v.${PV}"
-MY_P="${MY_PN}_v.${PV}"
-DESCRIPTION="MUltiple STructural AligNment AlGorithm."
-HOMEPAGE="http://www.cs.mu.oz.au/~arun/mustang/"
-SRC_URI="${HOMEPAGE}${SRC_P}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE=""
-RDEPEND=""
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
-
-src_compile() {
-	emake \
-		CPP=$(tc-getCXX) \
-		CPPFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		|| die "emake failed"
-}
-
-src_test() {
-	./bin/MUSTANG_v.${PV} -f ./data/test/test_zf-CCHH
-}
-
-src_install() {
-	newbin bin/MUSTANG_v.3 mustang
-	mv mustang mustang.1
-}
-
-pkg_postinst() {
-	elog "If you use this program for an academic paper, please cite:"
-	elog "Arun S. Konagurthu, James C. Whisstock, Peter J. Stuckey, and Arthur M. Lesk"
-	elog "Proteins: Structure, Function, and Bioinformatics. 64(3):559-574, Aug. 2006"
-}