sci-biology/seaview: Version Bump; Drop overlinking, #431074

(Portage version: 2.2.0_alpha122/cvs/Linux x86_64)

4 files changed, 62 insertions, 33 deletions

diff --git a/sci-biology/seaview/ChangeLog b/sci-biology/seaview/ChangeLog
index 1e36f6455bb6..dfd41c6070fb 100644
--- a/sci-biology/seaview/ChangeLog
+++ b/sci-biology/seaview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/seaview
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/ChangeLog,v 1.41 2012/07/04 10:09:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/ChangeLog,v 1.42 2012/08/26 13:41:51 jlec Exp $
+
+*seaview-4.3.5 (26 Aug 2012)
+
+  26 Aug 2012; Justin Lecher <jlec@gentoo.org> seaview-4.2.5.ebuild,
+  -seaview-4.2.12.ebuild, seaview-4.3.3.ebuild, +seaview-4.3.5.ebuild:
+  Version Bump; Drop overlinking, #431074
 
 *seaview-4.3.3 (04 Jul 2012)
 
diff --git a/sci-biology/seaview/seaview-4.2.5.ebuild b/sci-biology/seaview/seaview-4.2.5.ebuild
index 0dad00b0e575..55a280c3e400 100644
--- a/sci-biology/seaview/seaview-4.2.5.ebuild
+++ b/sci-biology/seaview/seaview-4.2.5.ebuild
@@ -1,10 +1,10 @@
-# 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/seaview/seaview-4.2.5.ebuild,v 1.5 2011/03/20 20:02:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-4.2.5.ebuild,v 1.6 2012/08/26 13:41:51 jlec Exp $
 
-EAPI="2"
+EAPI=4
 
-inherit toolchain-funcs multilib eutils base
+inherit base eutils multilib toolchain-funcs
 
 DESCRIPTION="A graphical multiple sequence alignment editor"
 HOMEPAGE="http://pbil.univ-lyon1.fr/software/seaview.html"
@@ -15,9 +15,11 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+xft"
 
-DEPEND="x11-libs/fltk:1
-	xft? (	x11-libs/libXft
-			x11-libs/fltk:1[xft] )"
+DEPEND="
+	x11-libs/fltk:1
+	xft? (
+		x11-libs/libXft
+		x11-libs/fltk:1[xft] )"
 RDEPEND="${DEPEND}
 	sci-biology/clustalw
 	|| ( sci-libs/libmuscle sci-biology/muscle )
@@ -27,39 +29,46 @@ S="${WORKDIR}/${PN}"
 
 src_prepare() {
 	# respect CXXFLAGS (package uses them as CFLAGS)
-	sed -i \
+	sed \
 		-e "s:^CXX.*:CXX = $(tc-getCXX):" \
 		-e "s:\$(OPT):${CXXFLAGS}:" \
 		-e "s:^OPT:#OPT:" \
+		-e "s:^FLTK = /usr/include:FLTK = /usr/include/fltk-1:" \
 		-e "s:^#IFLTK .*:IFLTK = $(fltk-config --use-images --cxxflags):" \
 		-e "s:^#LFLTK .*:LFLTK = $(fltk-config --use-images --ldflags):" \
 		-e "s:^USE_XFT:#USE_XFT:" \
 		-e "s:^#HELPFILE:HELPFILE:" \
 		-e "s:^#PHYMLNAME:PHYMLNAME:" \
-		Makefile || die "sed failed while editing Makefile"
+		-e 's:-lXinerama::g' \
+		-e 's:-lpng::g' \
+		-e 's:-ljpeg::g' \
+		-e 's:-lfontconfig::g' \
+		-i Makefile || die "sed failed while editing Makefile"
 
 	if use xft; then
-		sed -i \
-			-e "s:^#USE_XFT .*:USE_XFT = -DUSE_XFT $(xft-config --cflags):" \
-			-e "s:-lXft:$(xft-config --libs):" \
-			Makefile || die "sed failed while editing Makefile to enable xft"
+		sed \
+			-e "s:^#USE_XFT .*:USE_XFT = -DUSE_XFT $(pkg-config --cflags xft):" \
+			-e "s:-lXft:$(pkg-config --libs xft):" \
+			-i Makefile || die "sed failed while editing Makefile to enable xft"
 	else
 		sed -i -e "s:-lXft::" Makefile || die
 	fi
+	cd FL || die
+	ln -sf . FL
 	base_src_prepare
 }
 
 src_install() {
-	dobin seaview || die
+	dobin seaview
 
 	# /usr/share/seaview/seaview.html is hardcoded in the binary, see Makefile
 	insinto /usr/share/seaview
 	doins example.nxs seaview.html
 
 	insinto /usr/share/seaview/images
-	doins seaview.xpm || die
+	doins seaview.xpm
 
 	make_desktop_entry seaview Seaview
 
-	doman seaview.1 || die
+	doman seaview.1
 }
diff --git a/sci-biology/seaview/seaview-4.3.3.ebuild b/sci-biology/seaview/seaview-4.3.3.ebuild
index 5f3ab43a269e..d39b1abf99d5 100644
--- a/sci-biology/seaview/seaview-4.3.3.ebuild
+++ b/sci-biology/seaview/seaview-4.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-4.3.3.ebuild,v 1.1 2012/07/04 10:09:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-4.3.3.ebuild,v 1.2 2012/08/26 13:41:51 jlec Exp $
 
 EAPI=4
 
@@ -40,6 +40,10 @@ src_prepare() {
 		-e "s:^#HELPFILE:HELPFILE:" \
 		-e "s:/usr/share/doc/seaview/seaview.htm:/usr/share/seaview/seaview.htm:" \
 		-e "s:^#PHYMLNAME:PHYMLNAME:" \
+		-e 's:-lXinerama::g' \
+		-e 's:-lpng::g' \
+		-e 's:-ljpeg::g' \
+		-e 's:-lfontconfig::g' \
 		-i Makefile || die "sed failed while editing Makefile"
 
 	if use xft; then
diff --git a/sci-biology/seaview/seaview-4.2.12.ebuild b/sci-biology/seaview/seaview-4.3.5.ebuild
index 2ceab4957cbc..ecc2e33b5c26 100644
--- a/sci-biology/seaview/seaview-4.2.12.ebuild
+++ b/sci-biology/seaview/seaview-4.3.5.ebuild
@@ -1,10 +1,10 @@
-# 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/seaview/seaview-4.2.12.ebuild,v 1.4 2011/03/20 20:02:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-4.3.5.ebuild,v 1.1 2012/08/26 13:41:51 jlec Exp $
 
-EAPI="2"
+EAPI=4
 
-inherit toolchain-funcs multilib eutils base
+inherit base eutils multilib toolchain-funcs
 
 DESCRIPTION="A graphical multiple sequence alignment editor"
 HOMEPAGE="http://pbil.univ-lyon1.fr/software/seaview.html"
@@ -15,9 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+xft"
 
-DEPEND="x11-libs/fltk:1
-	xft? (	x11-libs/libXft
-			x11-libs/fltk:1[xft] )"
+DEPEND="
+	x11-libs/fltk:1
+	xft? (
+		x11-libs/libXft
+		x11-libs/fltk:1[xft] )"
 RDEPEND="${DEPEND}
 	sci-biology/clustalw
 	|| ( sci-libs/libmuscle sci-biology/muscle )
@@ -27,39 +29,47 @@ S="${WORKDIR}/${PN}"
 
 src_prepare() {
 	# respect CXXFLAGS (package uses them as CFLAGS)
-	sed -i \
+	sed \
+		-e "s:^CC.*:CC = $(tc-getCC):" \
 		-e "s:^CXX.*:CXX = $(tc-getCXX):" \
 		-e "s:\$(OPT):${CXXFLAGS}:" \
 		-e "s:^OPT:#OPT:" \
-		-e "s:^#IFLTK .*:IFLTK = $(fltk-config --use-images --cxxflags):" \
+		-e "s:^FLTK = .*$:FLTK = /usr/include/fltk-1:" \
+		-e "s:^#IFLTK .*:IFLTK = $(fltk-config --use-images --cflags):" \
 		-e "s:^#LFLTK .*:LFLTK = $(fltk-config --use-images --ldflags):" \
 		-e "s:^USE_XFT:#USE_XFT:" \
 		-e "s:^#HELPFILE:HELPFILE:" \
+		-e "s:/usr/share/doc/seaview/seaview.htm:/usr/share/seaview/seaview.htm:" \
 		-e "s:^#PHYMLNAME:PHYMLNAME:" \
-		Makefile || die "sed failed while editing Makefile"
+		-e 's:-lXinerama::g' \
+		-e 's:-lpng::g' \
+		-e 's:-ljpeg::g' \
+		-e 's:-lfontconfig::g' \
+		-i Makefile || die "sed failed while editing Makefile"
 
 	if use xft; then
-		sed -i \
+		sed \
 			-e "s:^#USE_XFT .*:USE_XFT = -DUSE_XFT $(pkg-config --cflags xft):" \
 			-e "s:-lXft:$(pkg-config --libs xft):" \
-			Makefile || die "sed failed while editing Makefile to enable xft"
+			-i Makefile || die "sed failed while editing Makefile to enable xft"
 	else
 		sed -i -e "s:-lXft::" Makefile || die
 	fi
+
 	base_src_prepare
 }
 
 src_install() {
-	dobin seaview || die
+	dobin seaview
 
 	# /usr/share/seaview/seaview.html is hardcoded in the binary, see Makefile
 	insinto /usr/share/seaview
 	doins example.nxs seaview.html
 
 	insinto /usr/share/seaview/images
-	doins seaview.xpm || die
+	doins seaview.xpm
 
 	make_desktop_entry seaview Seaview
 
-	doman seaview.1 || die
+	doman seaview.1
 }