Straight out QA issues

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

5 files changed, 24 insertions, 73 deletions

diff --git a/sci-chemistry/moldy/ChangeLog b/sci-chemistry/moldy/ChangeLog
index 9502d5eac6a8..332810115c41 100644
--- a/sci-chemistry/moldy/ChangeLog
+++ b/sci-chemistry/moldy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/moldy
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/moldy/ChangeLog,v 1.18 2010/04/15 14:46:26 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/moldy/ChangeLog,v 1.19 2011/06/26 08:39:46 jlec Exp $
+
+  26 Jun 2011; Justin Lecher <jlec@gentoo.org> moldy-2.16e.ebuild,
+  -moldy-2.16e-r1.ebuild, moldy-2.16e-r2.ebuild, metadata.xml:
+  Straight out QA issues
 
 *moldy-2.16e-r2 (15 Apr 2010)
 
diff --git a/sci-chemistry/moldy/metadata.xml b/sci-chemistry/moldy/metadata.xml
index 9ac9ffdb3a41..e42d0af60f42 100644
--- a/sci-chemistry/moldy/metadata.xml
+++ b/sci-chemistry/moldy/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/moldy/moldy-2.16e-r1.ebuild b/sci-chemistry/moldy/moldy-2.16e-r1.ebuild
deleted file mode 100644
index 8f1b0ed072e2..000000000000
--- a/sci-chemistry/moldy/moldy-2.16e-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/moldy/moldy-2.16e-r1.ebuild,v 1.1 2010/02/17 21:22:21 jlec Exp $
-
-EAPI="3"
-
-IUSE=""
-
-S=${WORKDIR}
-DESCRIPTION="Program for performing molecular dynamics simulations."
-SRC_URI="ftp://ftp.earth.ox.ac.uk/pub/keith/${P}.tar.gz"
-#For lack of a better homepage
-HOMEPAGE="http://www.earth.ox.ac.uk/~keithr/moldy.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~x86-linux ~ppc-macos"
-
-DEPEND="virtual/latex-base"
-
-src_configure() {
-#Individuals may want to edit the OPT* variables below.
-#From the READ.ME:
-#You may need to  "hand-tune" compiler or optimization options,
-#which may be specified by setting the OPT and OPT2 environment
-#variables.  OPT2 is used to compile only the most performance-critical
-#modules and usually will select a very high level of optimization.
-#It should be safe to select an optimization which means "treat all
-#function arguments as restricted pointers which are not aliased to
-#any other object".  OPT is used for less preformance-critical modules
-#and may be set to a lower level of optimization than OPT2.
-
-	OPT=${CFLAGS} OPT2=${CFLAGS} \
-	./configure --prefix="${EPREFIX}"/usr \
-		--host=${CHOST} \
-		|| die
-}
-
-src_compile() {
-	emake || die
-	# To prevent sandbox violations by metafont
-	VARTEXFONTS="${T}"/fonts make moldy.pdf || die
-}
-
-src_install() {
-	dodir /usr/bin
-	make prefix="${ED}"/usr install || die
-	rm Makefile.in configure.in config.h.in
-	insinto /usr/share/${PN}/examples/
-	doins *.in *.out control.*
-	dodoc BENCHMARK READ.ME RELNOTES
-	insinto /usr/share/doc/${P}/pdf
-	newins moldy.pdf moldy-manual.pdf
-}
diff --git a/sci-chemistry/moldy/moldy-2.16e-r2.ebuild b/sci-chemistry/moldy/moldy-2.16e-r2.ebuild
index 4dec449079b4..a583f1b7153d 100644
--- a/sci-chemistry/moldy/moldy-2.16e-r2.ebuild
+++ b/sci-chemistry/moldy/moldy-2.16e-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/moldy/moldy-2.16e-r2.ebuild,v 1.1 2010/04/15 14:46:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/moldy/moldy-2.16e-r2.ebuild,v 1.2 2011/06/26 08:39:46 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="Program for performing molecular dynamics simulations."
+DESCRIPTION="Molecular dynamics simulations platform"
 HOMEPAGE="http://www.ccp5.ac.uk/moldy/moldy.html"
 SRC_URI="ftp://ftp.earth.ox.ac.uk/pub/keith/${P}.tar.gz"
 
@@ -16,6 +16,7 @@ KEYWORDS="~x86 ~amd64 ~x86-linux ~ppc-macos"
 IUSE="doc examples"
 
 DEPEND="doc? ( virtual/latex-base )"
+RDEPEND=""
 
 S="${WORKDIR}"
 
@@ -42,17 +43,17 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die
+	emake
 	# To prevent sandbox violations by metafont
 	if use doc; then
-		VARTEXFONTS="${T}"/fonts emake moldy.pdf || die
+		VARTEXFONTS="${T}"/fonts emake moldy.pdf
 	fi
 }
 
 src_install() {
 	dodir /usr/bin
-	emake prefix="${ED}"/usr install || die
-	dodoc BENCHMARK READ.ME RELNOTES || die
+	emake prefix="${ED}"/usr install
+	dodoc BENCHMARK READ.ME RELNOTES
 
 	if use examples; then
 		rm Makefile.in configure.in config.h.in
diff --git a/sci-chemistry/moldy/moldy-2.16e.ebuild b/sci-chemistry/moldy/moldy-2.16e.ebuild
index 411691100710..01117a0cf624 100644
--- a/sci-chemistry/moldy/moldy-2.16e.ebuild
+++ b/sci-chemistry/moldy/moldy-2.16e.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/moldy/moldy-2.16e.ebuild,v 1.12 2010/02/17 21:22:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/moldy/moldy-2.16e.ebuild,v 1.13 2011/06/26 08:39:46 jlec Exp $
 
-IUSE=""
-
-S=${WORKDIR}
-DESCRIPTION="Program for performing molecular dynamics simulations."
+DESCRIPTION="Molecular dynamics simulations platform"
+HOMEPAGE="http://www.ccp5.ac.uk/moldy/moldy.html"
 SRC_URI="ftp://ftp.earth.ox.ac.uk/pub/keith/${P}.tar.gz"
-#For lack of a better homepage
-HOMEPAGE="http://www.earth.ox.ac.uk/~keithr/moldy.html"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~amd64"
+IUSE=""
 
 DEPEND="virtual/latex-base"
+RDEPEND=""
+
+S="${WORKDIR}"
 
 src_compile() {
 #Individuals may want to edit the OPT* variables below.