[gentoo-commits] proj/sci:master commit in: sci-biology/ncbi-tools++/

["Martin Mokrejs" <mmokrejs@fold.natur.cuni.cz>]

commit:     4093a5178b56aba0459005460bf7dd5f3d2beba0
Author:     Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Thu Jun 26 14:38:00 2014 +0000
Commit:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Thu Jun 26 14:38:00 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4093a517

sci-biology/ncbi-tools++-9.0.0*: dropped altogether openssl-related USE flags and configure arguments (per upstream info nothing in the public code uses openssl and the configure test is there for their internal reasonings); dropped gnutls[lzo] requirement which was only need for unpatched 9.0.0 version; however, --with-lzo is still advantageous for http://www.ncbi.nlm.nih.gov/IEB/ToolBox/CPP_DOC/doxyhtml/group__Compression.htmlhttp://www.ncbi.nlm.nih.gov/IEB/ToolBox/CPP_DOC/doxyhtml/group__CompressionStreams.html

---
 sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild |  8 +++-----
 sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild    | 10 ++--------
 2 files changed, 5 insertions(+), 13 deletions(-)

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 89ae176..953b011 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
@@ -28,7 +28,7 @@ IUSE="
 	test wxwidgets odbc
 	berkdb boost bzip2 cppunit curl expat fastcgi fltk freetype ftds gif
 	glut gnutls hdf5 icu lzo jpeg mesa mysql muparser opengl pcre png python
-	sablotron sqlite sqlite3 ssl tiff xerces xalan xml xpm xslt X"
+	sablotron sqlite sqlite3 tiff xerces xalan xml xpm xslt X"
 #KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 KEYWORDS=""
 
@@ -42,7 +42,6 @@ DEPEND="
 	sqlite3? ( dev-db/sqlite:3 )
 	mysql? ( virtual/mysql )
 	gnutls? ( net-libs/gnutls )
-	ssl? ( dev-libs/openssl )
 	fltk? ( x11-libs/fltk )
 	opengl? ( virtual/opengl )
 	mesa? ( media-libs/mesa
@@ -67,7 +66,7 @@ DEPEND="
 	png? ( media-libs/libpng )
 	tiff? ( media-libs/tiff )
 	xpm? ( x11-libs/libXpm )
-	dev-libs/lzo
+	lzo? ( dev-libs/lzo )
 	app-arch/bzip2
 	dev-libs/libpcre"
 # USE flags which should be added somehow: wxWindows wxWidgets SP ORBacus ODBC OEChem sge
@@ -212,7 +211,7 @@ src_configure() {
 #	--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
+# Note: only care about gnutls, nothing actually uses openssl except a forgotten configure test
 	$(use_with debug)
 	$(use_with debug max-debug)
 	$(use_with debug symbols)
@@ -225,7 +224,6 @@ src_configure() {
 	$(use_with lzo lzo "${EPREFIX}/usr")
 	$(use_with pcre pcre "${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")
 	$(use_with fltk fltk "${EPREFIX}/usr")

diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild
index 8020276..b9f8047 100644
--- a/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="berkdb boost bzip2 cppunit curl expat fastcgi fltk freetype ftds gif glut gnutls hdf5 icu jpeg lzo mesa mysql muparser opengl pcre png python sablotron sqlite sqlite3 ssl tiff xerces xalan xml xpm xslt X"
+IUSE="berkdb boost bzip2 cppunit curl expat fastcgi fltk freetype ftds gif glut gnutls hdf5 icu jpeg lzo mesa mysql muparser opengl pcre png python sablotron sqlite sqlite3 tiff xerces xalan xml xpm xslt X"
 #KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 KEYWORDS=""
 
@@ -36,7 +36,6 @@ DEPEND="berkdb? ( sys-libs/db:4.3 )
 	sqlite3? ( dev-db/sqlite:3 )
 	mysql? ( virtual/mysql )
 	gnutls? ( net-libs/gnutls )
-	ssl? ( dev-libs/openssl )
 	fltk? ( x11-libs/fltk )
 	opengl? ( virtual/opengl )
 	mesa? ( media-libs/mesa )
@@ -59,7 +58,7 @@ DEPEND="berkdb? ( sys-libs/db:4.3 )
 	png? ( media-libs/libpng )
 	tiff? ( media-libs/tiff )
 	xpm? ( x11-libs/libXpm )
-	dev-libs/lzo
+	lzo? ( dev-libs/lzo )
 	app-arch/bzip2
 	dev-libs/libpcre"
 # USE flags which should be added somehow: wxWindows wxWidgets SP ORBacus ODBC OEChem sge
@@ -182,11 +181,6 @@ src_configure() {
 	else
 		myconf="--without-gnutls"
 	fi
-	if use ssl; then
-		myconf="--with-openssl"
-	else
-		myconf="--without-openssl"
-	fi
 	if ! use sqlite; then
 		myconf="--without-sqlite"
 	fi