Straight out QA issues prior to stabilization

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

5 files changed, 61 insertions, 62 deletions

diff --git a/sci-chemistry/molmol/ChangeLog b/sci-chemistry/molmol/ChangeLog
index fe87d721cced..c4337bb126d8 100644
--- a/sci-chemistry/molmol/ChangeLog
+++ b/sci-chemistry/molmol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/molmol
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.23 2010/11/08 17:14:25 xarthisius Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.24 2011/06/26 08:21:32 jlec Exp $
+
+  26 Jun 2011; Justin Lecher <jlec@gentoo.org> molmol-2k_p2.ebuild,
+  molmol-2k_p2-r2.ebuild, metadata.xml:
+  Straight out QA issues prior to stabilization
 
   08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> molmol-2k_p2.ebuild,
   -molmol-2k_p2-r1.ebuild, molmol-2k_p2-r2.ebuild:
diff --git a/sci-chemistry/molmol/Manifest b/sci-chemistry/molmol/Manifest
index 9ae16c01979d..2e8b7f2702f9 100644
--- a/sci-chemistry/molmol/Manifest
+++ b/sci-chemistry/molmol/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX cast.patch 519 RMD160 3ce926dbda9345a380b7e9da9dd062db7b5f4b78 SHA1 2f1bfefbc5a146665cf90cf3a7147387ee3d7eb8 SHA256 25acec7df7e5739e2e4664672e979636ccd13c68b2ce5d26e555b3d619be0e77
 AUX ldflags.patch 435 RMD160 17c6cfc1539c0d774531c950d82f1fb28f366aea SHA1 e9e736664e773b32f2ae861f65fc0670d3625998 SHA256 cbae8934e2be43ceac0f541ed14e843ed76baf86219e0f669eab0af6d5714c64
@@ -7,16 +7,14 @@ AUX pjf_RH9_molmol2k2.diff 3138 RMD160 1792aa433a21c2f64880b244d11b6bbd2552c95b
 AUX prefix.patch 513 RMD160 23239041256a23c6223daab56e1aa59b5e911afa SHA1 5f3707fec532b15579020b5f21112d3fa2d41924 SHA256 efcb5d3fa7258cf88f02b63d1df3100eb0b73848c0ebabb59c84cb9ea082d8e7
 DIST molmol-2k.2.0-doc.tar.gz 1062297 RMD160 08b3e21ab6eb7c9044e59373334181ff91ca8a53 SHA1 b47551283fa19f57f4d5edcbd52f725055d80b7f SHA256 07e1c3fd04ffe7c9e9d91eaefa0bf72e6d0913a981eec3bf0879bfc65537a6be
 DIST molmol-2k.2.0-src.tar.gz 1088805 RMD160 b1de89953631dd9b11928751d7853cb511bf45f0 SHA1 09482a1dea601563ca64e773dc0ec47019e22c63 SHA256 1104dcb1b2517581c7d6b1695ff2e92f4076ad34afc48dd896eec38e5acf2287
-EBUILD molmol-2k_p2-r2.ebuild 2098 RMD160 71824a62b8d144648fa518aaac549a50aac79ec2 SHA1 3849fd603f91391002e358bffd3df8980ed2b909 SHA256 8f97d22968153f92badd936f53ef10b5ff5e07a6850d996e6d2261a79f8c8e77
-EBUILD molmol-2k_p2.ebuild 1871 RMD160 0d605ba7802ae5f6a580769bfa6f78d5649d53ff SHA1 9301aa1e06784b903f17a7b85b6b0c4e8b8d41bb SHA256 5fb2aa85fe32c8982879edcf1db1185725853dd8e9c50c521ba98923fa953480
-MISC ChangeLog 3294 RMD160 82598bd57a7b1d9beb4f28556875f3e925fb86c4 SHA1 8df6092b26eadbf025767d2bb4dbce1ba2cdf60c SHA256 bef151355efca71466b2bb3cb40cc6ac284e253f9cd7862cd2c1e756312dc924
-MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
+EBUILD molmol-2k_p2-r2.ebuild 1693 RMD160 8a46e7bd173995afc4f9957a57a032ebb470b3f9 SHA1 ea0eaf65906b67802491e5ccc86a2748efc9c2d3 SHA256 43cdef9a4888dd33537bdd0eeb47a12038354c87d9830713845ed468680b113f
+EBUILD molmol-2k_p2.ebuild 1785 RMD160 361413e938f036cdf086089868baf99f7cda049b SHA1 315909e6d899e283e1459cf0b481e1ce53c7ab5b SHA256 8bf7de3885cb1ca21895acda65de02b330576bbf799ee535047582c0bbd61986
+MISC ChangeLog 3445 RMD160 b92c9b7deb86859f5fa08d461f126ce7953b6c72 SHA1 bcaa85464431f8aabf491986a6215352f8b973c6 SHA256 33c076e6bd9a731bd43e6a208f99310e832919d811293c0d2c77f2c7f1cef6d9
+MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAkzYL/sACgkQIiMqcbOVdxRy7wP9FhJvLdQIbIA29D9iPWJDfxAk
-junPIPL0wp7aXh+d7BeN7b3/CbThPxS1Dz28SkiHuM27ithpPVAF80jYDi/ntlZC
-4//pZraPXXGdHtuhveZLhdZ69IVrSzB1Y/H9/Ivr+1m8SWbOt5cqKK2zkOj9/9aJ
-xRk6tcH9lma+y073XdI=
-=YEUx
+iEYEAREIAAYFAk4G7BEACgkQgAnW8HDreRaIOACgyIbmTAoYgsRgq9EYD3OysO1A
+mPoAnih71pvVN2uSRwF2XnEGBFw21s+9
+=4AqV
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/molmol/metadata.xml b/sci-chemistry/molmol/metadata.xml
index 9ac9ffdb3a41..e42d0af60f42 100644
--- a/sci-chemistry/molmol/metadata.xml
+++ b/sci-chemistry/molmol/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/molmol/molmol-2k_p2-r2.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild
index 033b8fc00d15..6b33fb05a078 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild
@@ -1,38 +1,42 @@
-# 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/molmol/molmol-2k_p2-r2.ebuild,v 1.4 2010/11/08 17:14:25 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild,v 1.5 2011/06/26 08:21:32 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit eutils toolchain-funcs multilib prefix
+inherit eutils multilib prefix toolchain-funcs
 
 MY_PV="${PV/_p/.}.0"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Publication-quality molecular visualization package"
 HOMEPAGE="http://hugin.ethz.ch/wuthrich/software/molmol/index.html"
-SRC_URI="ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-src.tar.gz
+SRC_URI="
+	ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-src.tar.gz
 	ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-doc.tar.gz"
+
 LICENSE="molmol"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
+
 DEPEND="
 	media-libs/mesa[motif]
-	virtual/jpeg
-	media-libs/tiff
 	media-libs/libpng
+	media-libs/tiff
 	sys-libs/zlib
-	x11-apps/xdpyinfo
+	virtual/jpeg
+	x11-libs/libXpm
 	>=x11-libs/openmotif-2.3:0
-	x11-libs/libXpm"
-# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-#RDEPEND=""
-# Yeah, the gz's aren't in a subdir.
+	x11-apps/xdpyinfo"
+RDEPEND="${DEPEND}"
+
 S="${WORKDIR}"
 
 MMDIR="/usr/$(get_libdir)/molmol"
 
+MAKEOPTS="${MAKEOPTS} -j1"
+
 src_prepare() {
 	rm -rf tiff*
 	# Patch from http://pjf.net/science/molmol.html, where src.rpm is provided
@@ -45,35 +49,25 @@ src_prepare() {
 
 	ln -s makedef.lnx "${S}"/makedef
 
-	# 1) The Korn shell is only taken by default because the Bourne shell
-	# on DEC systems cannot handle the script.
-	# We don't want this needless dependency.
-	# 2) Fix up MOLMOLHOME, which determines the directory the binary's in.
-	sed -i \
+	sed \
 		-e "s:/bin/ksh:${EPREFIX}/bin/sh:" \
 		-e "s:^MOLMOLHOME.*:MOLMOLHOME=${EPREFIX}/${MMDIR}:" \
-		"${S}"/molmol
-	# 1) Set CFLAGS.
-	# 2) Set compiler.
-	sed -i \
+		-i "${S}"/molmol || die
+	sed \
 		-e "s:^MCFLAGS.*:MCFLAGS = ${CFLAGS}:" \
 		-e "s:^CC.*:CC = $(tc-getCC):" \
-		"${S}"/makedef
+		-i "${S}"/makedef || die
 
 	epatch "${FILESDIR}"/cast.patch
 }
 
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
 src_install() {
-	dobin molmol || die
+	dobin molmol
 
 	exeinto ${MMDIR}
-	newexe src/main/molmol molmol.lnx || die
+	newexe src/main/molmol molmol.lnx
 	insinto ${MMDIR}
-	doins -r auxil help macros man setup tips || die
+	doins -r auxil help macros man setup tips
 
-	dodoc HISTORY README || die
+	dodoc HISTORY README
 }
diff --git a/sci-chemistry/molmol/molmol-2k_p2.ebuild b/sci-chemistry/molmol/molmol-2k_p2.ebuild
index 04c810b36ccc..e5d5a45f5636 100644
--- a/sci-chemistry/molmol/molmol-2k_p2.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2.ebuild
@@ -1,41 +1,44 @@
-# 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/molmol/molmol-2k_p2.ebuild,v 1.15 2010/11/08 17:14:25 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2.ebuild,v 1.16 2011/06/26 08:21:31 jlec Exp $
 
-EAPI="2"
+EAPI=2
 
-inherit eutils toolchain-funcs multilib
+inherit eutils multilib toolchain-funcs
 
 MY_PV="${PV/_p/.}.0"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Publication-quality molecular visualization package"
 HOMEPAGE="http://hugin.ethz.ch/wuthrich/software/molmol/index.html"
-SRC_URI="ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-src.tar.gz
+SRC_URI="
+	ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-src.tar.gz
 	ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-doc.tar.gz"
+
 LICENSE="molmol"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
-DEPEND=">=x11-libs/openmotif-2.3:0
-	x11-libs/libXpm
+
+DEPEND="
 	media-libs/mesa[motif]
-	virtual/jpeg
-	media-libs/tiff
 	media-libs/libpng
-	sys-libs/zlib"
-# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-#RDEPEND=""
-# Yeah, the gz's aren't in a subdir.
-S=${WORKDIR}
+	media-libs/tiff
+	sys-libs/zlib
+	virtual/jpeg
+	x11-libs/libXpm
+	>=x11-libs/openmotif-2.3:0"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
 
 MMDIR="/usr/$(get_libdir)/molmol"
 
 src_prepare() {
 	# Patch from http://pjf.net/science/molmol.html, where src.rpm is provided
-	epatch ${FILESDIR}/pjf_RH9_molmol2k2.diff
+	epatch "${FILESDIR}"/pjf_RH9_molmol2k2.diff
 
-	ln -s makedef.lnx ${S}/makedef
+	ln -s makedef.lnx "${S}"/makedef
 
 	# 1) The Korn shell is only taken by default because the Bourne shell
 	# on DEC systems cannot handle the script.
@@ -44,13 +47,13 @@ src_prepare() {
 	sed -i \
 		-e "s:/bin/ksh:/bin/sh:" \
 		-e "s:^MOLMOLHOME.*:MOLMOLHOME=${MMDIR}:" \
-		${S}/molmol
+		"${S}"/molmol
 	# 1) Set CFLAGS.
 	# 2) Set compiler.
 	sed -i \
 		-e "s:^MCFLAGS.*:MCFLAGS = ${CFLAGS}:" \
 		-e "s:^CC.*:CC = $(tc-getCC):" \
-		${S}/makedef
+		"${S}"/makedef
 }
 
 src_compile() {