Version bump, take ownership, cleanup. Thanks to Martin Mokrejs and Joel Berendzen (bug 246778).

(Portage version: 2.2_rc30/cvs/Linux x86_64)

4 files changed, 93 insertions, 3 deletions

diff --git a/sci-biology/seaview/ChangeLog b/sci-biology/seaview/ChangeLog
index 7e0d3dc774cd..d60721f7ef3e 100644
--- a/sci-biology/seaview/ChangeLog
+++ b/sci-biology/seaview/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sci-biology/seaview
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/ChangeLog,v 1.28 2009/09/04 09:22:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/ChangeLog,v 1.29 2009/10/07 18:36:07 weaver Exp $
+
+  07 Oct 2009; Andrey Kislyuk <weaver@gentoo.org> metadata.xml,
+  +seaview-4.1.ebuild, seaview-20071113.ebuild:
+  Drop keywords in seaview-20071113, will expedite 4.1
+
+*seaview-4.1 (07 Oct 2009)
+
+  07 Oct 2009; Andrey Kislyuk <weaver@gentoo.org> metadata.xml,
+  +seaview-4.1.ebuild:
+  Version bump, take ownership, cleanup. Thanks to Martin Mokrejs and Joel
+  Berendzen (bug 246778).
 
   04 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
   seaview-20071113.ebuild, +files/seaview-20071113-glibc-2.10.patch:
diff --git a/sci-biology/seaview/metadata.xml b/sci-biology/seaview/metadata.xml
index 4141d7ab1784..0c1ebc35d5a2 100644
--- a/sci-biology/seaview/metadata.xml
+++ b/sci-biology/seaview/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer>
+		<email>weaver@gentoo.org</email>
+		<name>Andrey Kislyuk</name>
+	</maintainer>
 	<herd>sci-biology</herd>
 	<longdescription>
 		SeaView is a graphical multiple sequence alignment editor developped by
diff --git a/sci-biology/seaview/seaview-20071113.ebuild b/sci-biology/seaview/seaview-20071113.ebuild
index a1be2dd1d340..caff0d04a736 100644
--- a/sci-biology/seaview/seaview-20071113.ebuild
+++ b/sci-biology/seaview/seaview-20071113.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-20071113.ebuild,v 1.5 2009/09/04 09:22:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-20071113.ebuild,v 1.6 2009/10/07 18:36:07 weaver Exp $
 
 EAPI=1
 inherit eutils toolchain-funcs multilib
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="public-domain"
 
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS=""
 IUSE=""
 
 DEPEND="x11-libs/fltk:1.1
diff --git a/sci-biology/seaview/seaview-4.1.ebuild b/sci-biology/seaview/seaview-4.1.ebuild
new file mode 100644
index 000000000000..e42734662268
--- /dev/null
+++ b/sci-biology/seaview/seaview-4.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-4.1.ebuild,v 1.1 2009/10/07 18:36:07 weaver Exp $
+
+EAPI="2"
+
+inherit toolchain-funcs multilib eutils
+
+DESCRIPTION="A graphical multiple sequence alignment editor"
+HOMEPAGE="http://pbil.univ-lyon1.fr/software/seaview.html"
+SRC_URI="ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/${PN}_${PV}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pdf +xft"
+
+DEPEND="x11-libs/fltk:1.1
+	pdf? ( media-libs/pdflib )
+	xft? (	x11-libs/libXft
+			x11-libs/fltk[-noxft] )"
+RDEPEND="${DEPEND}
+	sci-biology/clustalw
+	|| ( sci-libs/libmuscle sci-biology/muscle )
+	sci-biology/phyml"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	# respect CXXFLAGS (package uses them as CFLAGS)
+	sed -i \
+		-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:^#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"
+
+	if use pdf; then
+		sed -i \
+			-e "s:PDF_PS_FLAGS = -DNO_PDF:#PDF_PS_FLAGS = -DNO_PDF:" \
+			-e "s:PDF_PS = postscript:#PDF_PS = postscript:" \
+			-e "s:#PDF_INC = \$(HOME)/PDFlibLite:PDF_INC = /usr/include:" \
+			-e "s:#PDF_LIB = \$(HOME)/PDFlibLite:PDF_LIB = /usr/lib:" \
+			-e "s:#PDF_PS = pdf:PDF_PS = pdf:" \
+			-e "s:#PDF_PS_FLAGS = -I\$(PDF_INC):PDF_PS_FLAGS = -I\$(PDF_INC):" \
+			-e "s:#LPDF = -L\$(PDF_LIB) -lpdf:LPDF = -L\$(PDF_LIB) -lpdf:" \
+			Makefile || die "sed failed while editing Makefile to enable pdf output"
+	fi
+
+	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"
+	fi
+}
+
+src_install() {
+	dobin seaview || die
+
+	# /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
+
+	make_desktop_entry seaview Seaview /usr/share/pixmaps/seaview.xpm || die
+
+	doman seaview.1 || die
+}