diff options
| author |   Danny van Dyk <kugelfang@gentoo.org> | 2007-03-25 02:58:30 +0000 |
|---|---|---|
| committer | Danny van Dyk <kugelfang@gentoo.org> | 2007-03-25 02:58:30 +0000 |
| commit | 3e9aa2f6861936ce6679afb157a825e159d1e55c (patch) | |
| tree | b536952c51e18a7f75071e0c6c1161d7f90be48f /sci-biology | |
| parent | QA: Cleaned up whitespaces. Removed redundant src_compile(). (diff) | |
| download | gentoo-2-3e9aa2f6861936ce6679afb157a825e159d1e55c.tar.gz gentoo-2-3e9aa2f6861936ce6679afb157a825e159d1e55c.tar.bz2 gentoo-2-3e9aa2f6861936ce6679afb157a825e159d1e55c.zip | |
QA: Fixed assignment of CFLAGS. Makefile respects CXXFLAGS now. Fixed include and library paths.
(Portage version: 2.1.2.1-r1)
Diffstat (limited to 'sci-biology')
| -rw-r--r-- | sci-biology/seaview/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-biology/seaview/seaview-20041220.ebuild | 31 | ||||
| -rw-r--r-- | sci-biology/seaview/seaview-20060213.ebuild | 31 |
3 files changed, 52 insertions, 17 deletions
diff --git a/sci-biology/seaview/ChangeLog b/sci-biology/seaview/ChangeLog index fc6069d8d379..07f83385f0d9 100644 --- a/sci-biology/seaview/ChangeLog +++ b/sci-biology/seaview/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-biology/seaview # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/ChangeLog,v 1.9 2007/02/22 01:30:19 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/ChangeLog,v 1.10 2007/03/25 02:58:30 kugelfang Exp $ + + 25 Mar 2007; Danny van Dyk <kugelfang@gentoo.org> seaview-20041220.ebuild, + seaview-20060213.ebuild: + QA: Fixed assignment of CFLAGS. Makefile respects CXXFLAGS now. Fixed + include and library paths. 22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog: Redigest for Manifest2 diff --git a/sci-biology/seaview/seaview-20041220.ebuild b/sci-biology/seaview/seaview-20041220.ebuild index bfd328d12000..5ca779cbce64 100644 --- a/sci-biology/seaview/seaview-20041220.ebuild +++ b/sci-biology/seaview/seaview-20041220.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-20041220.ebuild,v 1.3 2005/04/24 13:17:54 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-20041220.ebuild,v 1.4 2007/03/25 02:58:30 kugelfang Exp $ + +inherit toolchain-funcs multilib DESCRIPTION="A graphical multiple sequence alignment editor" HOMEPAGE="http://pbil.univ-lyon1.fr/software/seaview.html" @@ -14,13 +16,26 @@ IUSE="" DEPEND="x11-libs/fltk sci-biology/clustalw" -src_compile() { - # Corrects location of libfltk. - CFLAGS="${CFLAGS} -c -I/usr/include/fltk-1.1" - sed -i -e "s%\"seaview.help\", %\"/usr/share/${PN}/seaview.help\", %" seaview.cxx || die - sed -i -e 's:-L$(FLTK)/lib:-L/usr/lib/fltk-1.1:' Makefile || die +src_unpack() { + unpack ${A} + cd ${S} + + sed -i \ + -e "s%\"seaview.help\", %\"/usr/share/${PN}/seaview.help\", %" seaview.cxx || die - emake -e || die + # Respect CXXFLAGS. Package uses CFLAGS as CXXFLAGS. + # Fix invocation of C++ compiler. + # Fix include and library paths. + sed -i \ + -e '/^FLTK/d' \ + -e '/^X11/d' \ + -e "s:^CXX.*:CXX = $(tc-getCXX):" \ + -e 's:-I$(FLTK):-I/usr/include/fltk-1.1:' \ + -e 's:-I$(X11)/include:-I/usr/include/X11R6:' \ + -e "s:\(^CFLAGS .*\):\1 ${CXXFLAGS}:" \ + -e "s:-L\$(FLTK)/lib:-L/usr/$(get_libdir)/fltk-1.1:" \ + -e "s:-L\$(X11)/lib:-L/usr/$(get_libdir)/X11:" \ + Makefile || die } src_install() { diff --git a/sci-biology/seaview/seaview-20060213.ebuild b/sci-biology/seaview/seaview-20060213.ebuild index 2d9708b03041..b2563b0178fa 100644 --- a/sci-biology/seaview/seaview-20060213.ebuild +++ b/sci-biology/seaview/seaview-20060213.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-20060213.ebuild,v 1.1 2006/03/08 00:11:54 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-20060213.ebuild,v 1.2 2007/03/25 02:58:30 kugelfang Exp $ + +inherit toolchain-funcs multilib DESCRIPTION="A graphical multiple sequence alignment editor" HOMEPAGE="http://pbil.univ-lyon1.fr/software/seaview.html" @@ -15,13 +17,26 @@ DEPEND="x11-libs/fltk =media-libs/pdflib-6.0* sci-biology/clustalw" -src_compile() { - # Corrects location of libfltk. - CFLAGS="${CFLAGS} -c -I/usr/include/fltk-1.1" - sed -i -e "s%\"seaview.help\", %\"/usr/share/${PN}/seaview.help\", %" seaview.cxx || die - sed -i -e 's:-L$(FLTK)/lib:-L/usr/lib/fltk-1.1:' Makefile || die +src_unpack() { + unpack ${A} + cd ${S} + + sed -i \ + -e "s%\"seaview.help\", %\"/usr/share/${PN}/seaview.help\", %" seaview.cxx || die - emake -e || die + # Respect CXXFLAGS. Package uses CFLAGS as CXXFLAGS. + # Fix invocation of C++ compiler. + # Fix include and library paths. + sed -i \ + -e '/^FLTK/d' \ + -e '/^X11/d' \ + -e "s:^CXX.*:CXX = $(tc-getCXX):" \ + -e 's:-I$(FLTK):-I/usr/include/fltk-1.1:' \ + -e 's:-I$(X11)/include:-I/usr/include/X11R6:' \ + -e "s:\(^CFLAGS .*\):\1 ${CXXFLAGS}:" \ + -e "s:-L\$(FLTK)/lib:-L/usr/$(get_libdir)/fltk-1.1:" \ + -e "s:-L\$(X11)/lib:-L/usr/$(get_libdir)/X11:" \ + Makefile || die } src_install() { |