aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Mokrejš <mmokrejs@fold.natur.cuni.cz>2013-09-14 10:18:58 +0200
committerMartin Mokrejš <mmokrejs@fold.natur.cuni.cz>2013-09-14 10:18:58 +0200
commit2159e8e3583f47d97226803cd59fa3e715979c01 (patch)
tree7b1369a3b70ed07a819774411e07424f94cc9944
parentFix URL to point to a public SVN repository (diff)
downloadsci-2159e8e3583f47d97226803cd59fa3e715979c01.tar.gz
sci-2159e8e3583f47d97226803cd59fa3e715979c01.tar.bz2
sci-2159e8e3583f47d97226803cd59fa3e715979c01.zip
Add upstream ncbi-tools++-9.0.0-remove-LZO-definition-upstream.patch with line offset changes.
-rw-r--r--sci-biology/ncbi-tools++/ChangeLog7
-rw-r--r--sci-biology/ncbi-tools++/files/ncbi-tools++-9.0.0-remove-LZO-definition-upstream.patch10
-rw-r--r--sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild7
3 files changed, 20 insertions, 4 deletions
diff --git a/sci-biology/ncbi-tools++/ChangeLog b/sci-biology/ncbi-tools++/ChangeLog
index 6b670ef3e..7f9450200 100644
--- a/sci-biology/ncbi-tools++/ChangeLog
+++ b/sci-biology/ncbi-tools++/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 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
+ line
+ offset changes.
+
13 Sep 2013; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
ncbi-tools++-9.0.0-r1.ebuild, ncbi-tools++-12.0.0.ebuild,
+files/ncbi-tools++-9.0.0-fix-svn-URL-upstream.patch,
diff --git a/sci-biology/ncbi-tools++/files/ncbi-tools++-9.0.0-remove-LZO-definition-upstream.patch b/sci-biology/ncbi-tools++/files/ncbi-tools++-9.0.0-remove-LZO-definition-upstream.patch
new file mode 100644
index 000000000..95d3f7461
--- /dev/null
+++ b/sci-biology/ncbi-tools++/files/ncbi-tools++-9.0.0-remove-LZO-definition-upstream.patch
@@ -0,0 +1,10 @@
+--- src/connect/ncbi_gnutls.c 2013-09-14 09:49:41.260005353 +0200
++++ src/connect/ncbi_gnutls.c 2013-09-14 09:49:46.950005368 +0200
+@@ -112,7 +112,6 @@
+ 0
+ };
+ static const int kGnuTlsCompPrio[] = {
+- GNUTLS_COMP_LZO,
+ GNUTLS_COMP_ZLIB,
+ GNUTLS_COMP_NULL,
+ 0
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 24f92be32..1a34f3554 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 lzo mesa mysql muparser opengl pcre png python
+ glut gnutls hdf5 icu 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=""
@@ -38,7 +38,7 @@ DEPEND="
sqlite? ( dev-db/sqlite )
sqlite3? ( dev-db/sqlite:3 )
mysql? ( virtual/mysql )
- gnutls? ( net-libs/gnutls[lzo] )
+ gnutls? ( net-libs/gnutls )
ssl? ( dev-libs/openssl )
fltk? ( x11-libs/fltk )
opengl? ( virtual/opengl )
@@ -64,7 +64,6 @@ 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
@@ -108,6 +107,7 @@ src_prepare() {
"${FILESDIR}"/${P}-fix-creaders-linking.patch
"${FILESDIR}"/${P}-fix-svn-URL-upstream.patch
"${FILESDIR}"/${P}-fix-undef-reference-to-GenBankReaders_Register_Id1.patch
+ "${FILESDIR}"/${P}-remove-LZO-definition-upstream.patch
)
epatch ${PATCHES[@]}
@@ -215,7 +215,6 @@ 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")