aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Mokrejš <mmokrejs@fold.natur.cuni.cz>2014-06-23 22:34:11 +0200
committerMartin Mokrejš <mmokrejs@fold.natur.cuni.cz>2014-06-23 22:34:11 +0200
commit8e4a566fecc849dd4e007fc85b6ebfd423d637ae (patch)
tree7373c616a2552deaed288c8a33bcad8c162d48a7 /sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
parentupdating the ChangeLog to note where the ncbi-tools++-12.0.0-support-autoconf... (diff)
downloadsci-8e4a566fecc849dd4e007fc85b6ebfd423d637ae.tar.gz
sci-8e4a566fecc849dd4e007fc85b6ebfd423d637ae.tar.bz2
sci-8e4a566fecc849dd4e007fc85b6ebfd423d637ae.zip
add an extra patch for configure until we find a way to ensure user has autoconf-2.59 or for ncbi-tools++-12.0.0 may have autoconf-2.60
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.ebuild16
1 files changed, 10 insertions, 6 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 64e8c234e..2a77c11d2 100644
--- a/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
@@ -26,14 +26,12 @@ IUSE="
debug static-libs static threads pch
test wxwidgets odbc
berkdb boost bzip2 cppunit curl expat fastcgi fltk freetype ftds gif
- glut hdf5 icu jpeg lzo mesa mysql muparser opengl pcre png python
+ glut gnutls hdf5 icu jpeg lzo mesa mysql muparser opengl pcre png python
sablotron sqlite sqlite3 ssl tiff xerces xalan xml xpm xslt X"
-# removed IUSE=gnutls due to Gentoo bug #421777
#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
KEYWORDS=""
# sys-libs/db should be compiled with USE=cxx
-# dropped 'gnutls? ( net-libs/gnutls[lzo] )' from DEPEND due to Gentoo bug #421777
DEPEND="
berkdb? ( sys-libs/db:4.3[cxx] )
ftds? ( dev-db/freetds )
@@ -51,6 +49,7 @@ DEPEND="
glut? ( media-libs/freeglut )
freetype? ( media-libs/freetype )
fastcgi? ( www-apache/mod_fastcgi )
+ gnutls? ( net-libs/gnutls[lzo] )
python? ( dev-lang/python )
cppunit? ( dev-util/cppunit )
icu? ( dev-libs/icu )
@@ -114,14 +113,19 @@ src_prepare() {
"${FILESDIR}"/${P}-fix-svn-URL-upstream.patch
"${FILESDIR}"/${P}-fix-FreeTDS-upstream.patch
"${FILESDIR}"/${P}-support-autoconf-2.60.patch
+ "${FILESDIR}"/${P}-configure.patch
)
epatch ${PATCHES[@]}
+ # make sure this one is the last one and contains the actual patches applied unless we can have autoconf-2.59 or 2.60
+ # https://bugs.gentoo.org/show_bug.cgi?id=514706
tc-export CXX CC
cd src/build-system || die
# eautoreconf
- eautoconf
+
+ # Temporarily disabling eautoconf because we patch configure via ${P}-support-autoconf-2.60.patch
+ #eautoconf
# beware 12.0.0. and previous required autoconf-2.59, a patch for 12.0.0 brings autoconf-2.60 support
}
@@ -218,7 +222,7 @@ src_configure() {
$(use_with pch)
$(use_with lzo lzo "${EPREFIX}/usr")
$(use_with pcre pcre "${EPREFIX}/usr")
-# $(use_with gnutls gnutls "${EPREFIX}/usr")
+ $(use_with gnutls gnutls "${EPREFIX}/usr")
$(use_with ssl openssl "${EPREFIX}/usr")
$(use_with ftds ftds "${EPREFIX}/usr")
$(use_with mysql mysql "${EPREFIX}/usr")
@@ -251,7 +255,7 @@ src_configure() {
$(use_with xpm xpm "${EPREFIX}/usr")
$(use_with curl curl "${EPREFIX}/usr")
# $(use_with X x "${EPREFIX}/usr")
- $(use_with X x)
+# $(use_with X x) # there is no --with-x option
)
# http://www.ncbi.nlm.nih.gov/books/NBK7167/