Gentoo Archives: gentoo-commits

From: Martin Mokrejs <mmokrejs@×××××××××××××××.cz>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/ncbi-tools++/
Date: Thu, 26 Jun 2014 14:38:55
Message-Id: 1403793480.4093a5178b56aba0459005460bf7dd5f3d2beba0.mmokrejs@gentoo
1 commit: 4093a5178b56aba0459005460bf7dd5f3d2beba0
2 Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
3 AuthorDate: Thu Jun 26 14:38:00 2014 +0000
4 Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
5 CommitDate: Thu Jun 26 14:38:00 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4093a517
7
8 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
9
10 ---
11 sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild | 8 +++-----
12 sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild | 10 ++--------
13 2 files changed, 5 insertions(+), 13 deletions(-)
14
15 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
16 index 89ae176..953b011 100644
17 --- a/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild
18 +++ b/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild
19 @@ -28,7 +28,7 @@ IUSE="
20 test wxwidgets odbc
21 berkdb boost bzip2 cppunit curl expat fastcgi fltk freetype ftds gif
22 glut gnutls hdf5 icu lzo jpeg mesa mysql muparser opengl pcre png python
23 - sablotron sqlite sqlite3 ssl tiff xerces xalan xml xpm xslt X"
24 + sablotron sqlite sqlite3 tiff xerces xalan xml xpm xslt X"
25 #KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
26 KEYWORDS=""
27
28 @@ -42,7 +42,6 @@ DEPEND="
29 sqlite3? ( dev-db/sqlite:3 )
30 mysql? ( virtual/mysql )
31 gnutls? ( net-libs/gnutls )
32 - ssl? ( dev-libs/openssl )
33 fltk? ( x11-libs/fltk )
34 opengl? ( virtual/opengl )
35 mesa? ( media-libs/mesa
36 @@ -67,7 +66,7 @@ DEPEND="
37 png? ( media-libs/libpng )
38 tiff? ( media-libs/tiff )
39 xpm? ( x11-libs/libXpm )
40 - dev-libs/lzo
41 + lzo? ( dev-libs/lzo )
42 app-arch/bzip2
43 dev-libs/libpcre"
44 # USE flags which should be added somehow: wxWindows wxWidgets SP ORBacus ODBC OEChem sge
45 @@ -212,7 +211,7 @@ src_configure() {
46 # --with-3psw=std:netopt favor standard (system) builds of the above pkgs
47
48
49 -# TODO: should improve the ssl/openssl/gmutls logic like is in net-misc/vpnc
50 +# Note: only care about gnutls, nothing actually uses openssl except a forgotten configure test
51 $(use_with debug)
52 $(use_with debug max-debug)
53 $(use_with debug symbols)
54 @@ -225,7 +224,6 @@ src_configure() {
55 $(use_with lzo lzo "${EPREFIX}/usr")
56 $(use_with pcre pcre "${EPREFIX}/usr")
57 $(use_with gnutls gnutls "${EPREFIX}/usr")
58 - $(use_with ssl openssl "${EPREFIX}/usr")
59 $(use_with ftds ftds "${EPREFIX}/usr")
60 $(use_with mysql mysql "${EPREFIX}/usr")
61 $(use_with fltk fltk "${EPREFIX}/usr")
62
63 diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild
64 index 8020276..b9f8047 100644
65 --- a/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild
66 +++ b/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild
67 @@ -23,7 +23,7 @@ SRC_URI="
68
69 LICENSE="public-domain"
70 SLOT="0"
71 -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"
72 +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"
73 #KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
74 KEYWORDS=""
75
76 @@ -36,7 +36,6 @@ DEPEND="berkdb? ( sys-libs/db:4.3 )
77 sqlite3? ( dev-db/sqlite:3 )
78 mysql? ( virtual/mysql )
79 gnutls? ( net-libs/gnutls )
80 - ssl? ( dev-libs/openssl )
81 fltk? ( x11-libs/fltk )
82 opengl? ( virtual/opengl )
83 mesa? ( media-libs/mesa )
84 @@ -59,7 +58,7 @@ DEPEND="berkdb? ( sys-libs/db:4.3 )
85 png? ( media-libs/libpng )
86 tiff? ( media-libs/tiff )
87 xpm? ( x11-libs/libXpm )
88 - dev-libs/lzo
89 + lzo? ( dev-libs/lzo )
90 app-arch/bzip2
91 dev-libs/libpcre"
92 # USE flags which should be added somehow: wxWindows wxWidgets SP ORBacus ODBC OEChem sge
93 @@ -182,11 +181,6 @@ src_configure() {
94 else
95 myconf="--without-gnutls"
96 fi
97 - if use ssl; then
98 - myconf="--with-openssl"
99 - else
100 - myconf="--without-openssl"
101 - fi
102 if ! use sqlite; then
103 myconf="--without-sqlite"
104 fi