From d69272a7a6c2e1c6b94e4f592ca2fc1762eb1d19 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 3 Oct 2010 10:49:16 +0000 Subject: Version bump, fixes 335197 & 337074 (Portage version: 2.2_rc88/cvs/Linux x86_64) --- sci-chemistry/tinker/ChangeLog | 8 ++- sci-chemistry/tinker/files/5.1.09-Makefile.patch | 13 ++++ sci-chemistry/tinker/tinker-5.1.08.ebuild | 77 --------------------- sci-chemistry/tinker/tinker-5.1.09.ebuild | 86 ++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 78 deletions(-) create mode 100644 sci-chemistry/tinker/files/5.1.09-Makefile.patch delete mode 100644 sci-chemistry/tinker/tinker-5.1.08.ebuild create mode 100644 sci-chemistry/tinker/tinker-5.1.09.ebuild 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 +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 tinker-5.1.08.ebuild, tinker-6.0.ebuild: 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.08.ebuild deleted file mode 100644 index 14fd42a76b65..000000000000 --- a/sci-chemistry/tinker/tinker-5.1.08.ebuild +++ /dev/null @@ -1,77 +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/tinker/tinker-5.1.08.ebuild,v 1.3 2010/10/03 08:31:34 jlec Exp $ - -EAPI="2" -FORTRAN="gfortran ifc" - -inherit 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/" -SRC_URI="http://dasher.wustl.edu/${PN}/downloads/${P}.tar.gz" - -SLOT="0" -LICENSE="Tinker" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="examples" - -DEPEND=">=virtual/jdk-1.6" -RDEPEND=" - dev-libs/maloc - !dev-util/diffuse - >=sci-chemistry/apbs-1.2.1b-r4[tinker] - >=virtual/jre-1.6" -RESTRICT="mirror" - -S="${WORKDIR}"/tinker/source - -pkg_setup() { - fortran_pkg_setup - java-pkg-opt-2_pkg_setup -} -src_compile() { - local javalib= - for i in $(java-config -g LDPATH | sed 's|:| |g'); do - [[ -f ${i}/libjvm.so ]] && javalib=${i} - done - emake \ - -f ../make/Makefile \ - F77="${FORTRANC}" \ - CC="$(tc-getCC) -c" \ - F77FLAGS=-c \ - OPTFLAGS="${FFLAGS}" \ - 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 - mkdir "${S}"/../bin || die - emake \ - -f ../make/Makefile \ - BINDIR="${S}"/../bin \ - rename || die -} -src_test() { - cd "${WORKDIR}"/tinker/test/ - for test in *.run; do - einfo "Testing ${test} ..." - bash ${test} || die - done -} - -src_install() { - dobin "${WORKDIR}"/${PN}/perl/mdavg "${WORKDIR}"/${PN}/bin/* || die - - insinto /usr/share/${PN}/ - doins -r "${WORKDIR}"/${PN}/params || die - - dodoc \ - "${WORKDIR}"/${PN}/doc/{*.txt,announce/release-*,*.pdf,0README} || die - if use examples; then - insinto /usr/share/${P} - doins -r "${WORKDIR}"/${PN}/example || die - - doins -r "${WORKDIR}"/${PN}/test || die - fi - -} diff --git a/sci-chemistry/tinker/tinker-5.1.09.ebuild b/sci-chemistry/tinker/tinker-5.1.09.ebuild new file mode 100644 index 000000000000..f3796752ac48 --- /dev/null +++ b/sci-chemistry/tinker/tinker-5.1.09.ebuild @@ -0,0 +1,86 @@ +# 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.09.ebuild,v 1.1 2010/10/03 10:49:16 jlec Exp $ + +EAPI="2" +FORTRAN="gfortran ifc" + +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/" +SRC_URI="http://dasher.wustl.edu/${PN}/downloads/${P}.tar.gz" + +SLOT="0" +LICENSE="Tinker" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="examples" + +DEPEND=">=virtual/jdk-1.6" +RDEPEND=" + dev-libs/maloc + !dev-util/diffuse + >=sci-chemistry/apbs-1.2.1b-r4[tinker] + >=virtual/jre-1.6" +RESTRICT="mirror" + +S="${WORKDIR}"/tinker/source + +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 -e \ + -f ../make/Makefile \ + F77="${FORTRANC}" \ + CC="$(tc-getCC) -c" \ + F77FLAGS=-c \ + OPTFLAGS="${FFLAGS}" \ + LINKFLAGS="${LDFLAGS} -Wl,-rpath ${javalib}" \ + INCLUDEDIR="$(java-pkg_get-jni-cflags) -I${EPREFIX}/usr/include" \ + LIBS="$(pkg-config --libs apbs) -lmaloc -L${javalib} -ljvm" \ + 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 + einfo "Testing ${test} ..." + bash ${test} || die + done +} + +src_install() { + dobin "${WORKDIR}"/${PN}/perl/mdavg "${WORKDIR}"/${PN}/bin/* || die + + insinto /usr/share/${PN}/ + doins -r "${WORKDIR}"/${PN}/params || die + + dodoc \ + "${WORKDIR}"/${PN}/doc/{*.txt,announce/release-*,*.pdf,0README} || die + + if use examples; then + insinto /usr/share/${P} + doins -r "${WORKDIR}"/${PN}/example || die + + doins -r "${WORKDIR}"/${PN}/test || die + fi + +} -- cgit v1.2.3-65-gdbad