aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2014-01-25 14:39:33 +0100
committerJustin Lecher <jlec@gentoo.org>2014-01-25 17:25:36 +0100
commit77dbaf65a12dfd3b782f4c6e18c31acb308a16ee (patch)
tree5028eb72d5ecb37445b35f2adb4ca0a892621d81 /sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
parentalternatives-2.eclass: Use saved exit status (diff)
downloadsci-77dbaf65a12dfd3b782f4c6e18c31acb308a16ee.tar.gz
sci-77dbaf65a12dfd3b782f4c6e18c31acb308a16ee.tar.bz2
sci-77dbaf65a12dfd3b782f4c6e18c31acb308a16ee.zip
Start to work on it again
Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild')
-rw-r--r--sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild14
1 files changed, 7 insertions, 7 deletions
diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
index f217ab346..a839d6b81 100644
--- a/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
+inherit autotools eutils flag-o-matic multilib toolchain-funcs
MY_TAG="Jun_15_2010"
MY_Y="${MY_TAG/*_/}"
@@ -105,8 +105,8 @@ src_prepare() {
# The conf-opts.patch and as-needed.patch need to be adjusted for 12.0.0 line numbers
local PATCHES=(
- #"${FILESDIR}"/${P}-conf-opts.patch
- #"${FILESDIR}"/${P}-as-needed.patch
+ "${FILESDIR}"/${P}-conf-opts.patch
+ "${FILESDIR}"/${P}-as-needed.patch
"${FILESDIR}"/${P}-fix-creaders-linking.patch
"${FILESDIR}"/${P}-fix-svn-URL-upstream.patch
"${FILESDIR}"/${P}-fix-FreeTDS-upstream.patch
@@ -115,7 +115,8 @@ src_prepare() {
tc-export CXX CC
-# cd src/build-system || die
+ cd src/build-system || die
+ eautoreconf
# eaclocal -I.
# eautoconf
}
@@ -216,7 +217,7 @@ src_configure() {
$(use_with ssl openssl "${EPREFIX}/usr")
$(use_with ftds ftds "${EPREFIX}/usr")
$(use_with mysql mysql "${EPREFIX}/usr")
- $(use_with fltk fltk "${EPREFIX}/usr")
+ $(usex fltk --with-fltk="${EPREFIX}/usr" "")
$(use_with opengl opengl "${EPREFIX}/usr")
$(use_with mesa mesa "${EPREFIX}/usr")
$(use_with opengl glut "${EPREFIX}/usr")
@@ -227,7 +228,7 @@ src_configure() {
$(use_with freetype freetype "${EPREFIX}/usr")
$(use_with fastcgi fastcgi "${EPREFIX}/usr")
$(use_with berkdb bdb "${EPREFIX}/usr")
- $(use_with odbc odbc "${EPREFIX}/usr")
+ $(usex odbc --with-odbc="${EPREFIX}/usr" "")
$(use_with python python "${EPREFIX}/usr")
$(use_with boost boost "${EPREFIX}/usr")
$(use_with sqlite sqlite3 "${EPREFIX}/usr")
@@ -259,7 +260,6 @@ src_configure() {
# bash \
# ./src/build-system/configure \
-# cd src/build-system || die
econf \
--srcdir="${S}" \
--prefix="${EPREFIX}/usr" \