From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1237946-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id BC6A91382C5
	for <garchives@archives.gentoo.org>; Tue,  5 Jan 2021 18:22:19 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id ED183E07F1;
	Tue,  5 Jan 2021 18:22:18 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id B7BD9E07F1
	for <gentoo-commits@lists.gentoo.org>; Tue,  5 Jan 2021 18:22:18 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 3F8A1340FCC
	for <gentoo-commits@lists.gentoo.org>; Tue,  5 Jan 2021 18:22:17 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id B882D48D
	for <gentoo-commits@lists.gentoo.org>; Tue,  5 Jan 2021 18:22:15 +0000 (UTC)
From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" <andrewammerlaan@riseup.net>
Message-ID: <1609870914.704db64ed869a89a3b0df65fb1e183816604b075.andrewammerlaan@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++/ncbi-tools++-12.0.0.ebuild sci-biology/ncbi-tools++/ncbi-tools++-18.0.0.ebuild sci-biology/ncbi-tools++/ncbi-tools++-22.0.0.ebuild
X-VCS-Directories: sci-biology/ncbi-tools++/
X-VCS-Committer: andrewammerlaan
X-VCS-Committer-Name: Andrew Ammerlaan
X-VCS-Revision: 704db64ed869a89a3b0df65fb1e183816604b075
X-VCS-Branch: master
Date: Tue,  5 Jan 2021 18:22:15 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: ac50f876-19d2-4b4c-8a02-137d7c04627c
X-Archives-Hash: 05c2f70833e2a70692aa6279196ce373

commit:     704db64ed869a89a3b0df65fb1e183816604b075
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue Jan  5 10:05:05 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Jan  5 18:21:54 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=704db64e

sci-biology/ncbi-tools++: depend on gcc<10, bump py targets

Closes: https://github.com/gentoo/sci/pull/1014
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 .../ncbi-tools++/ncbi-tools++-12.0.0.ebuild        | 32 ++++++------
 .../ncbi-tools++/ncbi-tools++-18.0.0.ebuild        | 60 +++++++++++-----------
 .../ncbi-tools++/ncbi-tools++-22.0.0.ebuild        | 12 +++--
 3 files changed, 55 insertions(+), 49 deletions(-)

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 68341a338..0aa05e878 100644
--- a/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -38,6 +38,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # sys-libs/db should be compiled with USE=cxx
 # dev-libs/boost must have Boost.Test suite, probably dev-libs/boost[test] then?
 DEPEND="
+	<sys-devel/gcc-10:=
 	!sci-biology/sra_sdk
 	app-arch/cpio
 	berkdb? ( sys-libs/db:4.3[cxx] )
@@ -83,7 +84,21 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+		"${FILESDIR}"/${P}-conf-opts.patch
+		"${FILESDIR}"/${P}-fix-svn-URL-upstream.patch
+		"${FILESDIR}"/${P}-linkage-tuneups.patch
+		"${FILESDIR}"/${P}-more-patches.patch
+		"${FILESDIR}"/${P}-linkage-tuneups-addons.patch
+		"${FILESDIR}"/${P}-configure.patch
+		"${FILESDIR}"/${P}-drop-STATIC-from-LIB.patch
+		"${FILESDIR}"/${P}-fix-install.patch
+		"${FILESDIR}"/${P}-bdb6.patch
+		"${FILESDIR}"/${P}-never_build_test_boost.patch # bug #579248
+		)
+
 src_prepare() {
+	default
 #	filter-ldflags -Wl,--as-needed
 #	append-ldflags -Wl,--no-undefined
 #	sed -i -e 's/-print-file-name=libstdc++.a//' \
@@ -110,24 +125,11 @@ src_prepare() {
 #	use prefix && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/${PN}"
 
 # The conf-opts.patch and as-needed.patch need to be adjusted for 12.0.0 line numbers
-	local PATCHES=(
-		"${FILESDIR}"/${P}-conf-opts.patch
-		"${FILESDIR}"/${P}-fix-svn-URL-upstream.patch
-		"${FILESDIR}"/${P}-linkage-tuneups.patch
-		"${FILESDIR}"/${P}-more-patches.patch
-		"${FILESDIR}"/${P}-linkage-tuneups-addons.patch
-		"${FILESDIR}"/${P}-configure.patch
-		"${FILESDIR}"/${P}-drop-STATIC-from-LIB.patch
-		"${FILESDIR}"/${P}-fix-install.patch
-		"${FILESDIR}"/${P}-bdb6.patch
-		"${FILESDIR}"/${P}-never_build_test_boost.patch # bug #579248
-		)
 #       "${FILESDIR}"/${P}-as-needed.patch
 #       "${FILESDIR}"/${P}-fix-creaders-linking.patch
 #       "${FILESDIR}"/${P}-fix-FreeTDS-upstream.patch
 #		)
 		# "${FILESDIR}"/${P}-support-autoconf-2.60.patch
-	epatch ${PATCHES[@]}
 	# make sure this one is the last one and contains the actual patches applied unless we can have autoconf-2.59 or 2.60
 	# https://bugs.gentoo.org/show_bug.cgi?id=514706
 

diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-18.0.0.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-18.0.0.ebuild
index c737392fd..c3014adca 100644
--- a/sci-biology/ncbi-tools++/ncbi-tools++-18.0.0.ebuild
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-18.0.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -30,13 +30,14 @@ IUSE="
 	berkdb boost bzip2 cppunit curl expat fastcgi fltk freetype gif
 	glut gnutls hdf5 icu jpeg lzo mesa mysql muparser opengl pcre png python
 	sablotron sqlite tiff xerces xalan xml xpm xslt X"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # sys-libs/db should be compiled with USE=cxx
 # dev-libs/boost must have Boost.Test suite, probably dev-libs/boost[test] then?
 DEPEND="
+	<sys-devel/gcc-10:=
 	!sci-biology/sra_sdk
 	app-arch/cpio
 	berkdb? ( sys-libs/db:4.3[cxx] )
@@ -82,7 +83,34 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+		"${FILESDIR}"/${P}-configure.patch
+		"${FILESDIR}"/${P}-fix-install.patch
+		"${FILESDIR}"/${P}-never_build_test_boost.patch # bug #579248
+		"${FILESDIR}"/${P}-fix-annotwriter-linking.patch
+		"${FILESDIR}"/${P}-fix-undefined-xobjread.patch
+		"${FILESDIR}"/${P}-fix-apps-blast-linking.patch
+		"${FILESDIR}"/${P}-fix-sample-app-cgi-linking.patch
+		"${FILESDIR}"/${P}-fix-app-compartp-linking.patch
+		"${FILESDIR}"/${P}-fix-app-convert_seq-linking.patch
+		"${FILESDIR}"/${P}-fix-app-hfilter-linking.patch
+		"${FILESDIR}"/${P}-fix-app-igblast-linking.patch
+		"${FILESDIR}"/${P}-fix-ncfetch-linking.patch
+		"${FILESDIR}"/${P}-fix-netcache_cgi_sample-linking.patch
+		"${FILESDIR}"/${P}-fix-netstorage_gc-linking.patch
+		"${FILESDIR}"/${P}-fix-speedtest-linking.patch
+		"${FILESDIR}"/${P}-fix-splign-linking.patch
+		"${FILESDIR}"/${P}-fix-srcchk-linking.patch
+		"${FILESDIR}"/${P}-fix-app-rmblastn-linking.patch
+		"${FILESDIR}"/${P}-remove-old-symlinks.patch
+		"${FILESDIR}"/${P}-fix-app-table2asn-linking.patch
+		"${FILESDIR}"/${P}-fix-app-tls-linking.patch
+		"${FILESDIR}"/${P}-fix-app-vecscreen-linking.patch
+		"${FILESDIR}"/${P}-fix-app-blast_sample-linking.patch
+		)
+
 src_prepare() {
+	default
 #	filter-ldflags -Wl,--as-needed
 #	append-ldflags -Wl,--no-undefined
 #	sed -i -e 's/-print-file-name=libstdc++.a//' \
@@ -109,33 +137,7 @@ src_prepare() {
 #	use prefix && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/${PN}"
 
 # The conf-opts.patch and as-needed.patch need to be adjusted for 12.0.0 line numbers
-	local PATCHES=(
-		"${FILESDIR}"/${P}-configure.patch
-		"${FILESDIR}"/${P}-fix-install.patch
-		"${FILESDIR}"/${P}-never_build_test_boost.patch # bug #579248
-		"${FILESDIR}"/${P}-fix-annotwriter-linking.patch
-		"${FILESDIR}"/${P}-fix-undefined-xobjread.patch
-		"${FILESDIR}"/${P}-fix-apps-blast-linking.patch
-		"${FILESDIR}"/${P}-fix-sample-app-cgi-linking.patch
-		"${FILESDIR}"/${P}-fix-app-compartp-linking.patch
-		"${FILESDIR}"/${P}-fix-app-convert_seq-linking.patch
-		"${FILESDIR}"/${P}-fix-app-hfilter-linking.patch
-		"${FILESDIR}"/${P}-fix-app-igblast-linking.patch
-		"${FILESDIR}"/${P}-fix-ncfetch-linking.patch
-		"${FILESDIR}"/${P}-fix-netcache_cgi_sample-linking.patch
-		"${FILESDIR}"/${P}-fix-netstorage_gc-linking.patch
-		"${FILESDIR}"/${P}-fix-speedtest-linking.patch
-		"${FILESDIR}"/${P}-fix-splign-linking.patch
-		"${FILESDIR}"/${P}-fix-srcchk-linking.patch
-		"${FILESDIR}"/${P}-fix-app-rmblastn-linking.patch
-		"${FILESDIR}"/${P}-remove-old-symlinks.patch
-		"${FILESDIR}"/${P}-fix-app-table2asn-linking.patch
-		"${FILESDIR}"/${P}-fix-app-tls-linking.patch
-		"${FILESDIR}"/${P}-fix-app-vecscreen-linking.patch
-		"${FILESDIR}"/${P}-fix-app-blast_sample-linking.patch
-		)
 	#ncbi-tools++-18.0.0-fix-undefined-lxncbi.patch
-	epatch ${PATCHES[@]}
 	# make sure this one is the last one and contains the actual patches applied unless we can have autoconf-2.59 or 2.60
 	# https://bugs.gentoo.org/show_bug.cgi?id=514706
 

diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-22.0.0.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-22.0.0.ebuild
index 0c0e1b24c..ffa36ad4d 100644
--- a/sci-biology/ncbi-tools++/ncbi-tools++-22.0.0.ebuild
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-22.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
 
@@ -30,13 +30,14 @@ IUSE="
 	berkdb boost bzip2 cppunit curl expat fastcgi fltk freetype gif
 	glut gnutls hdf5 icu jpeg lzo mesa mysql muparser opengl pcre png python
 	sablotron sqlite tiff xerces xalan xml xpm xslt X"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # sys-libs/db should be compiled with USE=cxx
 # dev-libs/boost must have Boost.Test suite, probably dev-libs/boost[test] then?
 DEPEND="
+	<sys-devel/gcc-10:=
 	!sci-biology/sra_sdk
 	app-arch/cpio
 	berkdb? ( sys-libs/db:4.3[cxx] )
@@ -83,6 +84,7 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	default
 #	filter-ldflags -Wl,--as-needed
 #	append-ldflags -Wl,--no-undefined
 #	sed -i -e 's/-print-file-name=libstdc++.a//' \
@@ -254,7 +256,7 @@ src_configure() {
 	$(use_with mesa mesa "${EPREFIX}/usr")
 	$(use_with opengl glut "${EPREFIX}/usr")
 	$(use_with opengl glew "${EPREFIX}/usr")
-	$(use_with opengl glew-mx)
+#	$(use_with opengl glew-mx) can't find this with any version of media-libs/glew installed: explicitly specified, but no usable version found.
 	$(use_with wxwidgets wxwidgets "${EPREFIX}/usr")
 	$(use_with wxwidgets wxwidgets-ucs)
 	$(use_with freetype freetype "${EPREFIX}/usr")