Version Bump, #322929

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 166 insertions, 56 deletions

diff --git a/sci-chemistry/tinker/ChangeLog b/sci-chemistry/tinker/ChangeLog
index 3550beb5ee97..e62b2bf095fe 100644
--- a/sci-chemistry/tinker/ChangeLog
+++ b/sci-chemistry/tinker/ChangeLog
@@ -1,6 +1,13 @@
 # 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.21 2010/04/09 13:33:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/ChangeLog,v 1.22 2010/06/16 11:52:09 jlec Exp $
+
+*tinker-6.0 (16 Jun 2010)
+*tinker-5.1.08 (16 Jun 2010)
+
+  16 Jun 2010; Justin Lecher <jlec@gentoo.org> -tinker-5.1.05.ebuild,
+  +tinker-5.1.08.ebuild, +tinker-6.0.ebuild:
+  Version Bump, #322929
 
   09 Apr 2010; Justin Lecher <jlec@gentoo.org> tinker-5.1.05.ebuild:
   Blocking dev-util/diffuse per 314129 & 279018
diff --git a/sci-chemistry/tinker/tinker-5.1.05.ebuild b/sci-chemistry/tinker/tinker-5.1.05.ebuild
deleted file mode 100644
index cc841219aaa1..000000000000
--- a/sci-chemistry/tinker/tinker-5.1.05.ebuild
+++ /dev/null
@@ -1,55 +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.05.ebuild,v 1.3 2010/04/10 12:10:02 arfrever Exp $
-
-EAPI="2"
-FORTRAN="gfortran ifc"
-
-inherit fortran
-
-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/tinker/downloads/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Tinker"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE=""
-
-# RDEPEND="dev-java/j3d-core"
-RDEPEND="!dev-util/diffuse"
-RESTRICT="mirror"
-
-S="${WORKDIR}"/tinker/source
-
-src_compile() {
-	emake \
-		-f ../make/Makefile \
-		F77="${FORTRANC}" \
-		F77FLAGS=-c \
-		OPTFLAGS="${FFLAGS}" \
-		LINKFLAGS="${LDFLAGS}" \
-		|| die
-}
-
-src_install() {
-	dodoc \
-		"${WORKDIR}"/tinker/doc/{*.txt,announce/release-*,*.pdf,0README} || die
-
-	dolib.a libtinker.a || die
-
-	for EXE in *.x; do
-		newbin ${EXE} ${EXE%.x} || die
-	done
-
-	docinto example
-	dodoc "${WORKDIR}"/tinker/example/* || die
-
-	docinto test
-	dodoc "${WORKDIR}"/tinker/test/* || die
-
-	dobin "${WORKDIR}"/tinker/perl/mdavg || die
-
-	insinto /usr/share/tinker/params
-	doins "${WORKDIR}"/tinker/params/* || die
-}
diff --git a/sci-chemistry/tinker/tinker-5.1.08.ebuild b/sci-chemistry/tinker/tinker-5.1.08.ebuild
new file mode 100644
index 000000000000..b93bc4dcab6d
--- /dev/null
+++ b/sci-chemistry/tinker/tinker-5.1.08.ebuild
@@ -0,0 +1,76 @@
+# 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.1 2010/06/16 11:52:09 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"
+
+# RDEPEND="dev-java/j3d-core"
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND="
+	!dev-util/diffuse
+	>=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-6.0.ebuild b/sci-chemistry/tinker/tinker-6.0.ebuild
new file mode 100644
index 000000000000..ecd132154d1d
--- /dev/null
+++ b/sci-chemistry/tinker/tinker-6.0.ebuild
@@ -0,0 +1,82 @@
+# 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-6.0.ebuild,v 1.1 2010/06/16 11:52:09 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"
+
+# RDEPEND="dev-java/j3d-core"
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND="
+	!dev-util/diffuse
+	>=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
+
+}