From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CF6681381F3 for ; Sat, 14 Sep 2013 08:45:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45C0EE0D0D; Sat, 14 Sep 2013 08:45:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BAEA7E0D0D for ; Sat, 14 Sep 2013 08:45:01 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3BA4A33DA53 for ; Sat, 14 Sep 2013 08:45:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E0B73E468F for ; Sat, 14 Sep 2013 08:44:57 +0000 (UTC) From: "Martin Mokrejs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Martin Mokrejs" Message-ID: <1379148389.5c30b638891d5120f4a6757229945f6103dffa43.mmokrejs@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/ncbi-tools++/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/ncbi-tools++/ChangeLog sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild X-VCS-Directories: sci-biology/ncbi-tools++/ X-VCS-Committer: mmokrejs X-VCS-Committer-Name: Martin Mokrejs X-VCS-Revision: 5c30b638891d5120f4a6757229945f6103dffa43 X-VCS-Branch: master Date: Sat, 14 Sep 2013 08:44:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 684ab9f7-ea78-4880-ae81-fa6cdb75c712 X-Archives-Hash: 351aa5ee472d2c8ae9b939dbba77b2c7 commit: 5c30b638891d5120f4a6757229945f6103dffa43 Author: Martin Mokrejš fold natur cuni cz> AuthorDate: Sat Sep 14 08:46:29 2013 +0000 Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Sat Sep 14 08:46:29 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5c30b638 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. --- sci-biology/ncbi-tools++/ChangeLog | 6 ++++++ sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sci-biology/ncbi-tools++/ChangeLog b/sci-biology/ncbi-tools++/ChangeLog index 7f94502..3da37d9 100644 --- a/sci-biology/ncbi-tools++/ChangeLog +++ b/sci-biology/ncbi-tools++/ChangeLog @@ -3,6 +3,12 @@ # $Header: $ 14 Sep 2013; Martin Mokrejs + 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 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 1a34f35..4e1ee2e 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")