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 012551381F3 for ; Sat, 14 Sep 2013 08:17:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4807E0A9E; Sat, 14 Sep 2013 08:17:31 +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 513D1E0A9E for ; Sat, 14 Sep 2013 08:17:30 +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 F30CB33EC7F for ; Sat, 14 Sep 2013 08:17:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8F814E468F for ; Sat, 14 Sep 2013 08:17:28 +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: <1379146738.2159e8e3583f47d97226803cd59fa3e715979c01.mmokrejs@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/ncbi-tools++/files/, sci-biology/ncbi-tools++/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/ncbi-tools++/ChangeLog sci-biology/ncbi-tools++/files/ncbi-tools++-9.0.0-remove-LZO-definition-upstream.patch sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild X-VCS-Directories: sci-biology/ncbi-tools++/files/ sci-biology/ncbi-tools++/ X-VCS-Committer: mmokrejs X-VCS-Committer-Name: Martin Mokrejs X-VCS-Revision: 2159e8e3583f47d97226803cd59fa3e715979c01 X-VCS-Branch: master Date: Sat, 14 Sep 2013 08:17:28 +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: 3c05823a-009c-4eb0-8fdd-e0fa16ab43b5 X-Archives-Hash: f8f7731813fef5de038277a55f72c824 commit: 2159e8e3583f47d97226803cd59fa3e715979c01 Author: Martin Mokrejš fold natur cuni cz> AuthorDate: Sat Sep 14 08:18:58 2013 +0000 Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Sat Sep 14 08:18:58 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2159e8e3 Add upstream ncbi-tools++-9.0.0-remove-LZO-definition-upstream.patch with line offset changes. --- sci-biology/ncbi-tools++/ChangeLog | 7 +++++++ .../ncbi-tools++-9.0.0-remove-LZO-definition-upstream.patch | 10 ++++++++++ sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild | 7 +++---- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/sci-biology/ncbi-tools++/ChangeLog b/sci-biology/ncbi-tools++/ChangeLog index 6b670ef..7f94502 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 + 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 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 0000000..95d3f74 --- /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 24f92be..1a34f35 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")