aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-biology/ncbi-tools++')
-rw-r--r--sci-biology/ncbi-tools++/ChangeLog6
-rw-r--r--sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild7
2 files changed, 12 insertions, 1 deletions
diff --git a/sci-biology/ncbi-tools++/ChangeLog b/sci-biology/ncbi-tools++/ChangeLog
index 7f9450200..3da37d966 100644
--- a/sci-biology/ncbi-tools++/ChangeLog
+++ b/sci-biology/ncbi-tools++/ChangeLog
@@ -3,6 +3,12 @@
# $Header: $
14 Sep 2013; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
+ ncbi-tools++-9.0.0-r1.ebuild:
+ Support at least when user passes USE="gnutls -ssl -openssl" but what we
+ really want is to prefer gnutls over openssl if both are available on the
+ system.
+
+ 14 Sep 2013; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
ncbi-tools++-9.0.0-r1.ebuild,
+files/ncbi-tools++-9.0.0-remove-LZO-definition-upstream.patch:
Add upstream ncbi-tools++-9.0.0-remove-LZO-definition-upstream.patch with
diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild
index 1a34f3554..4e1ee2e3e 100644
--- a/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild
@@ -24,7 +24,7 @@ IUSE="
debug static-libs static threads pch
test wxwidgets odbc
berkdb boost bzip2 cppunit curl expat fastcgi fltk freetype ftds gif
- glut gnutls hdf5 icu jpeg mesa mysql muparser opengl pcre png python
+ glut gnutls hdf5 icu lzo jpeg mesa mysql muparser opengl pcre png python
sablotron sqlite sqlite3 ssl tiff xerces xalan xml xpm xslt X"
#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
KEYWORDS=""
@@ -64,6 +64,7 @@ DEPEND="
png? ( media-libs/libpng )
tiff? ( media-libs/tiff )
xpm? ( x11-libs/libXpm )
+ dev-libs/lzo
app-arch/bzip2
dev-libs/libpcre"
# USE flags which should be added somehow: wxWindows wxWidgets SP ORBacus ODBC OEChem sge
@@ -206,6 +207,9 @@ src_configure() {
#
--with-flat-makefile
# --with-3psw=std:netopt favor standard (system) builds of the above pkgs
+
+
+# TODO: should improve the ssl/openssl/gmutls logic like is in net-misc/vpnc
$(use_with debug)
$(use_with debug max-debug)
$(use_with debug symbols)
@@ -215,6 +219,7 @@ src_configure() {
$(use_with prefix runpath "${EPREFIX}/usr/$(get_libdir)/ncbi_cxx")
$(use_with test check)
$(use_with pch)
+ $(use_with lzo lzo "${EPREFIX}/usr")
$(use_with pcre pcre "${EPREFIX}/usr")
$(use_with gnutls gnutls "${EPREFIX}/usr")
$(use_with ssl openssl "${EPREFIX}/usr")