From 8d30af0e3afd031e00f5d69fce3683233a23b487 Mon Sep 17 00:00:00 2001
From: Martin Mokrejš <mmokrejs@fold.natur.cuni.cz>
Date: Mon, 23 Jun 2014 18:10:25 +0200
Subject: add patches for 12.0.0 to support autoconf-2.60 (so far 2.59 was
 needed)

---
 sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild')

diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
index 3b19a9391..64e8c234e 100644
--- a/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
@@ -26,12 +26,14 @@ 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 hdf5 icu jpeg lzo mesa mysql muparser opengl pcre png python
 	sablotron sqlite sqlite3 ssl tiff xerces xalan xml xpm xslt X"
+# removed IUSE=gnutls due to Gentoo bug #421777
 #KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 KEYWORDS=""
 
 # sys-libs/db should be compiled with USE=cxx
+# dropped 'gnutls? ( net-libs/gnutls[lzo] )' from DEPEND due to Gentoo bug #421777
 DEPEND="
 	berkdb? ( sys-libs/db:4.3[cxx] )
 	ftds? ( dev-db/freetds )
@@ -40,7 +42,6 @@ DEPEND="
 	sqlite? ( dev-db/sqlite )
 	sqlite3? ( dev-db/sqlite:3 )
 	mysql? ( virtual/mysql )
-	gnutls? ( net-libs/gnutls[lzo] )
 	ssl? ( dev-libs/openssl )
 	fltk? ( x11-libs/fltk )
 	opengl? ( virtual/opengl )
@@ -112,6 +113,7 @@ src_prepare() {
 		"${FILESDIR}"/${P}-fix-creaders-linking.patch
 		"${FILESDIR}"/${P}-fix-svn-URL-upstream.patch
 		"${FILESDIR}"/${P}-fix-FreeTDS-upstream.patch
+		"${FILESDIR}"/${P}-support-autoconf-2.60.patch
 		)
 	epatch ${PATCHES[@]}
 
@@ -120,8 +122,10 @@ src_prepare() {
 	cd src/build-system || die
 #	eautoreconf
 	eautoconf
+	# beware 12.0.0. and previous required autoconf-2.59, a patch for 12.0.0 brings autoconf-2.60 support
 }
 
+# possibly place modified contents of ${W}/src/build-system/config.site.ncbi and {W}/src/build-system/config.site.ex into ${W}/src/build-system/config.site
 src_configure() {
 	local myconf=()
 	#--without-optimization  turn off optimization flags in non-debug mode
@@ -214,7 +218,7 @@ src_configure() {
 	$(use_with pch)
 	$(use_with lzo lzo "${EPREFIX}/usr")
 	$(use_with pcre pcre "${EPREFIX}/usr")
-	$(use_with gnutls gnutls "${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")
-- 
cgit v1.2.3-18-g5258