Version bump, fixes 335197 & 337074

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

4 files changed, 40 insertions, 11 deletions

diff --git a/sci-chemistry/tinker/ChangeLog b/sci-chemistry/tinker/ChangeLog
index 53be824fad40..cfc2350b9fe3 100644
--- a/sci-chemistry/tinker/ChangeLog
+++ b/sci-chemistry/tinker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/tinker
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/ChangeLog,v 1.24 2010/10/03 08:31:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/ChangeLog,v 1.25 2010/10/03 10:49:15 jlec Exp $
+
+*tinker-5.1.09 (03 Oct 2010)
+
+  03 Oct 2010; Justin Lecher <jlec@gentoo.org> +files/5.1.09-Makefile.patch,
+  -tinker-5.1.08.ebuild, +tinker-5.1.09.ebuild:
+  Version bump, fixes 335197 & 337074
 
   03 Oct 2010; Justin Lecher <jlec@gentoo.org> tinker-5.1.08.ebuild,
   tinker-6.0.ebuild:
diff --git a/sci-chemistry/tinker/Manifest b/sci-chemistry/tinker/Manifest
index 1d849dce33c7..c01a4a92dacb 100644
--- a/sci-chemistry/tinker/Manifest
+++ b/sci-chemistry/tinker/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST tinker-5.1.08.tar.gz 13008711 RMD160 0bb5837ad50ee35c7b23f7061d51295d53a83a86 SHA1 e94852663c7f0896d3c7aa58d3de7b760d61ff4d SHA256 8f75ac400a720ae718841143240fddc12a8d0f7e10839d6d6df2ab9ea9de5655
+AUX 5.1.09-Makefile.patch 319 RMD160 67b2e42fabfea415ba0933f074f99b69804ab451 SHA1 4e86541e3b5b6544ea7be48bf4453013b8f29b7e SHA256 8273ad63e02dec2b286f29289d41a86b1cc750b3d705ac69eeaf0dd890b887de
+DIST tinker-5.1.09.tar.gz 14071638 RMD160 9f20036d9e483c89fe516db8bf4a0195d15b79bf SHA1 71f4b1c0d1f6ef5bcb47de2145fab9885f6f3641 SHA256 61765adfe260e3f3083243542dac49d38141191d5d6580e9a66a29c31d5a3183
 DIST tinker-6.0.tar.gz 18171344 RMD160 45143abcd9e94846027d74b5c2a1dde25e4143ad SHA1 c1209e2076bea75a9201168f57b6b53710a5397b SHA256 33269db000dd25fe8a059bfd9bd2bc8e51e4b34ae568bd4da7ee8c355e042029
-EBUILD tinker-5.1.08.ebuild 1895 RMD160 82daf1494731477b8dda98637b672c9d2f5e47e1 SHA1 74b4b56d38c8a169e86321fe29040197c74323d0 SHA256 b68696dbf2387b445634f076425928a069b48b80d7ee3958bdc2533f7f178b3f
+EBUILD tinker-5.1.09.ebuild 1982 RMD160 5b1aa16e60e9a214a35ef118b439ccb531963d5a SHA1 02af437df8c8409ff6934a789d836f8952194111 SHA256 ee203737bbd184b6786931e0e5dbcf48983f9f5df08e990ab27f73f8eb82725f
 EBUILD tinker-6.0.ebuild 1900 RMD160 cbf1f2e6b1c723e3e5d45d87ae5d8ed7541d4d23 SHA1 6dddded98bd4d2a6be03f38982893df0b3a286fe SHA256 75f4eb72d9b080d6a8ec64d33908b5b94bc0dd4ed07053cacf420aa06abae7d0
-MISC ChangeLog 3763 RMD160 4ebbcdbe8e1d638ccd1202d6d16ec5f63b9d04b2 SHA1 b0fc8f93f090b32f4a05ae9bd906878c0e9714c3 SHA256 9c1b1917a8cac3ad3d300c17445e6b6d12c0be9e4182e61c4a83d7bbd71b5c58
+MISC ChangeLog 3957 RMD160 18664e7d076e7911a572fb934cbfc3d9aa587a33 SHA1 ec3e0f247a9f548b87cb717ee57508c9e7198b90 SHA256 22c832e9b61fc79fe569b5f37b3405853512163d4d1993a9f5a2c3b883073729
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyoP20ACgkQgAnW8HDreRY16ACeNY+8cvvImYm4OAIDLobLvS95
-QugAnR7gmnIdmwDxplzr3e3Dh0RuWFKD
-=y2ad
+iEYEARECAAYFAkyoX7EACgkQgAnW8HDreRY0lgCgj0YT/zDj3h4pfQWpTYRd204p
+oJ8AniT0Deu7Z7QYToXfT6Li58n1Bltk
+=b9uD
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/tinker/files/5.1.09-Makefile.patch b/sci-chemistry/tinker/files/5.1.09-Makefile.patch
new file mode 100644
index 000000000000..68a095add706
--- /dev/null
+++ b/sci-chemistry/tinker/files/5.1.09-Makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/make/Makefile b/make/Makefile
+index 221ab45..7634474 100644
+--- a/make/Makefile
++++ b/make/Makefile
+@@ -607,7 +607,7 @@ clean:
+ listing:
+ 	cat *.i *.f > tinker.txt
+ 
+-rename:
++rename: ${EXEFILES}
+ 	mv  alchemy.x    $(BINDIR)/alchemy
+ 	mv  analyze.x    $(BINDIR)/analyze
+ 	mv  anneal.x     $(BINDIR)/anneal
diff --git a/sci-chemistry/tinker/tinker-5.1.08.ebuild b/sci-chemistry/tinker/tinker-5.1.09.ebuild
index 14fd42a76b65..f3796752ac48 100644
--- a/sci-chemistry/tinker/tinker-5.1.08.ebuild
+++ b/sci-chemistry/tinker/tinker-5.1.09.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-5.1.08.ebuild,v 1.3 2010/10/03 08:31:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-5.1.09.ebuild,v 1.1 2010/10/03 10:49:16 jlec Exp $
 
 EAPI="2"
 FORTRAN="gfortran ifc"
 
-inherit fortran java-pkg-opt-2 toolchain-funcs
+inherit eutils fortran java-pkg-opt-2 toolchain-funcs
 
 DESCRIPTION="Molecular modeling package that includes force fields, such as AMBER and CHARMM"
 HOMEPAGE="http://dasher.wustl.edu/tinker/"
@@ -30,12 +30,18 @@ pkg_setup() {
 	fortran_pkg_setup
 	java-pkg-opt-2_pkg_setup
 }
+
+src_prepare() {
+	cd ..
+	epatch "${FILESDIR}"/${PV}-Makefile.patch
+}
+
 src_compile() {
 	local javalib=
 	for i in $(java-config -g LDPATH | sed 's|:| |g'); do
 		[[ -f ${i}/libjvm.so ]] && javalib=${i}
 	done
-	emake \
+	emake -e \
 		-f ../make/Makefile \
 		F77="${FORTRANC}" \
 		CC="$(tc-getCC) -c" \
@@ -44,13 +50,15 @@ src_compile() {
 		LINKFLAGS="${LDFLAGS} -Wl,-rpath ${javalib}" \
 		INCLUDEDIR="$(java-pkg_get-jni-cflags) -I${EPREFIX}/usr/include" \
 		LIBS="$(pkg-config --libs apbs) -lmaloc -L${javalib} -ljvm" \
-		|| die
+		all || die
 	mkdir "${S}"/../bin || die
+
 	emake \
 		-f ../make/Makefile \
 		BINDIR="${S}"/../bin \
 		rename || die
 }
+
 src_test() {
 	cd "${WORKDIR}"/tinker/test/
 	for test in *.run; do
@@ -67,6 +75,7 @@ src_install() {
 
 	dodoc \
 		"${WORKDIR}"/${PN}/doc/{*.txt,announce/release-*,*.pdf,0README} || die
+
 	if use examples; then
 		insinto /usr/share/${P}
 		doins -r "${WORKDIR}"/${PN}/example || die