diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-03-01 14:52:31 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-03-01 14:52:31 +0000 |
| commit | ea8c10d371db3acf05199c63be807b8a5894b8e4 (patch) | |
| tree | 9e742042e10205adac2f0eed5106436b9ccbaa07 /sci-biology/ncbi-tools | |
| parent | Remove old. (diff) | |
| download | gentoo-2-ea8c10d371db3acf05199c63be807b8a5894b8e4.tar.gz gentoo-2-ea8c10d371db3acf05199c63be807b8a5894b8e4.tar.bz2 gentoo-2-ea8c10d371db3acf05199c63be807b8a5894b8e4.zip | |
sci-biology/ncbi-tools: Fix all config files, #459720, #459726, #459878
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'sci-biology/ncbi-tools')
| -rw-r--r-- | sci-biology/ncbi-tools/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-biology/ncbi-tools/ncbi-tools-2.2.26-r2.ebuild (renamed from sci-biology/ncbi-tools/ncbi-tools-2.2.26-r1.ebuild) | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/sci-biology/ncbi-tools/ChangeLog b/sci-biology/ncbi-tools/ChangeLog index 559f9a2b0024..c5df21be9444 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-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ChangeLog,v 1.88 2013/03/01 09:14:24 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ChangeLog,v 1.89 2013/03/01 14:52:31 jlec Exp $ + +*ncbi-tools-2.2.26-r2 (01 Mar 2013) + + 01 Mar 2013; Justin Lecher <jlec@gentoo.org> -ncbi-tools-2.2.26-r1.ebuild, + +ncbi-tools-2.2.26-r2.ebuild: + Fix all config files, #459720, #459726, #459878 *ncbi-tools-2.2.26-r1 (01 Mar 2013) diff --git a/sci-biology/ncbi-tools/ncbi-tools-2.2.26-r1.ebuild b/sci-biology/ncbi-tools/ncbi-tools-2.2.26-r2.ebuild index a9f6b23ec9df..346b38415cbf 100644 --- a/sci-biology/ncbi-tools/ncbi-tools-2.2.26-r1.ebuild +++ b/sci-biology/ncbi-tools/ncbi-tools-2.2.26-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ncbi-tools-2.2.26-r1.ebuild,v 1.1 2013/03/01 09:14:24 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ncbi-tools-2.2.26-r2.ebuild,v 1.1 2013/03/01 14:52:31 jlec Exp $ EAPI=5 @@ -56,11 +56,11 @@ src_prepare() { # Apply user C flags... cd "${S}"/platform sed \ - -e 's:-O[23]\?::g' \ + -e "s:-O[s0-9]\?:asd:g" \ -e 's:-m\(cpu\|arch\)=[a-zA-Z0-9]*::g' \ -e 's:-x[A-Z]*::g' \ -e 's:-pipe::g' \ - -e "/NCBI_MAKE_SHELL *=/s:=.*:= \"${EPREFIX}\"/bin/sh:g" \ + -e "/NCBI_MAKE_SHELL *=/s:=.*:= \"${EPREFIX}/bin/sh\":g" \ -e "/NCBI_AR *=/s:ar:$(tc-getAR):g" \ -e "/NCBI_RANLIB *=/s:ranlib:$(tc-getRANLIB):g" \ -e "/NCBI_CC *=/s:= [a-zA-Z0-9]* := $(tc-getCC) :g" \ @@ -69,8 +69,7 @@ src_prepare() { -e "/NCBI_OGLLIBS *=/s:=.*:= $($(tc-getPKG_CONFIG) --cflags gl glu 2>/dev/null):g" \ -e "/OPENGL_LIBS *=/s:=.*:= $($(tc-getPKG_CONFIG) --libs gl glu 2>/dev/null):g" \ -e "/NCBI_OGLLIBS *=/s:=.*:= $($(tc-getPKG_CONFIG) --libs gl glu 2>/dev/null):g" \ - -i linux-x86.ncbi.mk linux-alpha.ncbi.mk hppalinux.ncbi.mk \ - ppclinux.ncbi.mk linux64.ncbi.mk linux.ncbi.mk || die + -i * || die # We use dynamic libraries sed -i -e "s/-Wl,-Bstatic//" *linux*.ncbi.mk || die |