diff options
author | Justin Lecher <jlec@gentoo.org> | 2012-11-02 19:00:59 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2012-11-02 19:00:59 +0000 |
commit | 21df756e4470822b48e4f955696bf89e36550037 (patch) | |
tree | ed7d57876309b0ca1d047ea78ba430e59dff8c71 /sci-biology | |
parent | Make USE=static the default to reflect what we have always been doing (buildi... (diff) | |
download | gentoo-2-21df756e4470822b48e4f955696bf89e36550037.tar.gz gentoo-2-21df756e4470822b48e4f955696bf89e36550037.tar.bz2 gentoo-2-21df756e4470822b48e4f955696bf89e36550037.zip |
sci-biology/ncbi-tools++: Drop old, duplicate with lower version number for new versioning schema
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
Diffstat (limited to 'sci-biology')
-rw-r--r-- | sci-biology/ncbi-tools++/ChangeLog | 8 | ||||
-rw-r--r-- | sci-biology/ncbi-tools++/ncbi-tools++-0.2010.06.15-r1.ebuild (renamed from sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15.ebuild) | 22 |
2 files changed, 23 insertions, 7 deletions
diff --git a/sci-biology/ncbi-tools++/ChangeLog b/sci-biology/ncbi-tools++/ChangeLog index 050b47a5695c..ade5f192e48c 100644 --- a/sci-biology/ncbi-tools++/ChangeLog +++ b/sci-biology/ncbi-tools++/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-biology/ncbi-tools++ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ChangeLog,v 1.23 2012/06/03 12:53:18 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ChangeLog,v 1.24 2012/11/02 19:00:59 jlec Exp $ + +*ncbi-tools++-0.2010.06.15-r1 (02 Nov 2012) + + 02 Nov 2012; Justin Lecher <jlec@gentoo.org> + +ncbi-tools++-0.2010.06.15-r1.ebuild, -ncbi-tools++-2010.06.15.ebuild: + Drop old, duplicate with lower version number for new versioning schema 03 Jun 2012; Justin Lecher <jlec@gentoo.org> ncbi-tools++-2010.06.15-r1.ebuild, diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-0.2010.06.15-r1.ebuild index a5b6690cd46b..5fc76935b330 100644 --- a/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15.ebuild +++ b/sci-biology/ncbi-tools++/ncbi-tools++-0.2010.06.15-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15.ebuild,v 1.3 2011/05/04 19:06:17 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ncbi-tools++-0.2010.06.15-r1.ebuild,v 1.1 2012/11/02 19:00:59 jlec Exp $ EAPI="3" @@ -12,7 +12,9 @@ MY_P="ncbi_cxx--${MY_TAG}" DESCRIPTION="NCBI C++ Toolkit, including NCBI BLAST+" HOMEPAGE="http://www.ncbi.nlm.nih.gov/books/bv.fcgi?rid=toolkit" -SRC_URI="ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/${MY_Y}/${MY_TAG}/${MY_P}.tar.gz" +SRC_URI=" + ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/${MY_Y}/${MY_TAG}/${MY_P}.tar.gz + http://dev.gentoo.org/~jlec/distfiles/${P}-asneeded.patch.xz" LICENSE="public-domain" SLOT="0" @@ -27,16 +29,24 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}" src_prepare() { - filter-ldflags -Wl,--as-needed +# filter-ldflags -Wl,--as-needed +# append-ldflags -Wl,--no-undefined sed -i -e 's/-print-file-name=libstdc++.a//' \ -e '/sed/ s/\([gO]\[0-9\]\)\*/\1\\+/' \ src/build-system/configure || die - epatch "${FILESDIR}"/${P}-gcc46.patch + epatch \ + "${FILESDIR}"/${P}-gcc46.patch \ + "${FILESDIR}"/${P}-gcc47.patch \ + "${WORKDIR}"/${P}-asneeded.patch \ + "${FILESDIR}"/${P}-libpng15.patch \ + "${FILESDIR}"/${P}-glibc-214.patch + + use prefix && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/${PN}" } src_configure() { tc-export CXX CC - +# conf check for sqlite and mysql "${S}"/configure --without-debug \ --with-bin-release \ --with-bincopy \ |