open3dqsar: bump to 1.304.

4 files changed, 61 insertions, 26 deletions

diff --git a/sci-chemistry/open3dqsar/Manifest b/sci-chemistry/open3dqsar/Manifest
index 081501b..2bb30ae 100644
--- a/sci-chemistry/open3dqsar/Manifest
+++ b/sci-chemistry/open3dqsar/Manifest
@@ -1,3 +1,5 @@
+AUX 1.304-fix-configure-AS_IF-syntax.patch 505 RMD160 030fed8bd70299c632a1836c6e1e3e7a9697ad61 SHA1 dc5d71234f6ae9f8f767d0b8f33c5acf83350a77 SHA256 df2bcb1a358d8259b96d1734df41d0557779d5d325a7a2073a4ef3425c145d38
 DIST open3dqsar-1.2.tar.gz 6423763 RMD160 5235b871873b45a01c9fe53c31bad99d163e4d08 SHA1 808c2130c82f0651771649f0407ee8758e80b948 SHA256 71a57e87a7e636d38033fc1e586341ea4f0bb63a65b7a5ad3c2a7ae530aa0e08
+DIST open3dqsar-1.304.tar.gz 2364923 RMD160 aef1d3150873eb942570bb1343d427fab724c94b SHA1 fe2d091cb9700be237077ce8b852fda6ae507647 SHA256 cdc46a3300095eb442736a9858d9e3732eba1157e48620da01cbccae1e82fb1f
 EBUILD open3dqsar-1.2.ebuild 827 RMD160 f669a8810b55f0470b3e03509df46adfde6843f5 SHA1 e1f63996db4b62246ef56cc113d7c369a3334f9b SHA256 c6d2dbed063dedad414bceb9380bcd3bfe742d449e4881c6ef77acaad93c5323
-MISC open3dqsar-1.2.ebuild~ 470 RMD160 6cbbdd58c29cc83a54832122b68d33c9cc5c4abe SHA1 f3cb30507d088ade8b98b54afb03f742cfac6087 SHA256 942bf9073b84c873d59686251bcef69ddf2066df98350243415657429de4f2bf
+EBUILD open3dqsar-1.304.ebuild 970 RMD160 f2653162b914bbfb649ab1afde160cc6130fe6d2 SHA1 78324ebd77ac683a896e22c78a0eaa317bf067f4 SHA256 746f927b72806777f0ffc9222a8e746ec7806c7c95c38635334973b35ec1e2c1
diff --git a/sci-chemistry/open3dqsar/files/1.304-fix-configure-AS_IF-syntax.patch b/sci-chemistry/open3dqsar/files/1.304-fix-configure-AS_IF-syntax.patch
new file mode 100644
index 0000000..b18bdc6
--- /dev/null
+++ b/sci-chemistry/open3dqsar/files/1.304-fix-configure-AS_IF-syntax.patch
@@ -0,0 +1,16 @@
+--- configure.ac.orig	2010-09-15 14:46:28.335004889 -0500
++++ configure.ac	2010-09-15 14:46:44.145004889 -0500
+@@ -210,11 +210,11 @@
+ AS_IF([test "x$with_atlas" != xno && test -z "$LIBATLAS"],
+ 	[AC_MSG_FAILURE(
+ 	[--with-atlas was given, but test for ATLAS failed])],
+-	[], [])
++	[])
+ AS_IF([test "x$with_atlas" != xno && test -z "$LIBLAPACK"],
+ 	[AC_MSG_FAILURE(
+ 	[--with-atlas was given, but test for LAPACK failed])],
+-	[], [])
++	[])
+ 
+ AC_ARG_WITH([intel-mkl],
+ 	[AC_HELP_STRING([--with-intel-mkl],
diff --git a/sci-chemistry/open3dqsar/open3dqsar-1.2.ebuild~ b/sci-chemistry/open3dqsar/open3dqsar-1.2.ebuild~
deleted file mode 100644
index b88ce8f..0000000
--- a/sci-chemistry/open3dqsar/open3dqsar-1.2.ebuild~
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION=""
-HOMEPAGE=""
-SRC_URI="${P}.tar.gz"
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="fetch"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-pkg_nofetch() {
-	elog "Register at ${HOMEPAGE}, then download ${SRC_URI} and place it in ${DISTDIR}."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README || die
-}
diff --git a/sci-chemistry/open3dqsar/open3dqsar-1.304.ebuild b/sci-chemistry/open3dqsar/open3dqsar-1.304.ebuild
new file mode 100644
index 0000000..121f632
--- /dev/null
+++ b/sci-chemistry/open3dqsar/open3dqsar-1.304.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit autotools eutils
+
+DESCRIPTION="Pharmacophore exploration by high-throughput chemometric analysis of molecular interaction fields (MIFs)"
+HOMEPAGE="http://www.open3dqsar.org/"
+SRC_URI="${P}.tar.gz"
+LICENSE="${PN}"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="fetch"
+RDEPEND="virtual/blas
+	virtual/lapack
+	virtual/cblas
+	|| ( sci-libs/lapack-atlas sci-libs/clapack sci-libs/mkl )"
+DEPEND="${RDEPEND}"
+
+pkg_nofetch() {
+	elog "Register at ${HOMEPAGE}, then download ${SRC_URI} and place it in ${DISTDIR}."
+}
+
+src_prepare () {
+	epatch "${FILESDIR}"/${PV}-fix-configure-AS_IF-syntax.patch
+	eautoreconf || die
+}
+
+src_configure() {
+	# --with-atlas just makes it look for a generic blas/cblas/lapack interface
+	econf \
+		--with-atlas \
+		|| die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README || die
+}