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

Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

5 files changed, 98 insertions, 6 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/Manifest b/sci-biology/seaview/Manifest
index 94d10edcfe46..4af5c2a96225 100644
--- a/sci-biology/seaview/Manifest
+++ b/sci-biology/seaview/Manifest
@@ -1,6 +1,8 @@
 AUX seaview-20071113-glibc-2.10.patch 545 RMD160 c8e5f91d20b08a902fc88706a52e6664340f7d1d SHA1 ca1026d79a56ce687bb62237a23a70a9022996ef SHA256 97d670caea6584417851b3da260353043ec73d60349b4a12a2b9fbcbf597f509
 AUX seaview.desktop 207 RMD160 d5b4e57a1866d5f2d384ab1f6acf21292061570f SHA1 38b4a0b0055da291020690e9ac1974d7aed94871 SHA256 314a791477d6059888bce45de2627d58d1b8998a25200d6a9eb8f13c759c7b32
 DIST seaview-20071113.tar.gz 155890 RMD160 1a0b82137e1546eed7e69392a241e7af0e5c3068 SHA1 0928a9729142ebe0fcc32b612150a09ee663eddf SHA256 93335e7e95255a189a5f89cd8fd40a22e3e096727ab30f31b6383c85854c709f
-EBUILD seaview-20071113.ebuild 1521 RMD160 c52fc4988bb5ce21cb4b9baed43d214f718b22c9 SHA1 8eba29091fc976d98535368f55db531027ad1334 SHA256 363abe6c74557f3f31f5fba6d336bee045acfa0c8480f48043e592c38f54f76b
-MISC ChangeLog 4865 RMD160 992a6f00cf6bf99fcfee06c38dfa14176685e968 SHA1 b5907c477fd3d429fa019e48fb95f44f4c95260a SHA256 f1679b98c8ee3197e61d105f8b0b12af928925062ff097c0faf26e5cb0fbc202
-MISC metadata.xml 525 RMD160 a11301291e3b009e5f2abd4cc5c301dfd43a2d64 SHA1 6afb760a8ca9a0d94a444e0afd6cfd412b92657c SHA256 da10bbdcd67ab3cae3b3963a664efb7e2cdbc689fc049d5fd8a24d06e2a4e04d
+DIST seaview_4.1.tar.gz 315678 RMD160 de3a7f3e684d73508cf6d9ab0d004549d9abdbf9 SHA1 d8227d0e91dff3221b09ea415e1201d833ead5c5 SHA256 902c6cd8e0f7fb17a4d2849bec3312d9cde94fceb1d7fd02c4242b986f693468
+EBUILD seaview-20071113.ebuild 1505 RMD160 d36b5c3a7941dafdaa9be9219aebe04b31c04578 SHA1 79c84456ff1db956d88b011999264941b4839455 SHA256 0649c61169c8d623461bb8697ce7b2d8f7a9821d23c7eb79afd6882962879068
+EBUILD seaview-4.1.ebuild 2338 RMD160 d2b326d632df2ba6e59f94891a158b0815a73932 SHA1 419a7ef3bcf42c781fff75c7d2a850d8a81a8d94 SHA256 f4880536ce09f67b5686f30f9caacb29e8b0e3a46edd5048a3c9497538ea7deb
+MISC ChangeLog 5247 RMD160 68126a13509ac5b8af0c36da4eeefe8eb8e587cf SHA1 a4070de6a3f38f23bede426dd20ce44df0f3dd5d SHA256 14ac970640e645405972ab9632893a3316d1f114f72788225ce79fa0466254b7
+MISC metadata.xml 619 RMD160 f7bd8491d8c59372963d3f53e322e52d509c0c81 SHA1 d35f32cd0b1171a837f6c9d0dbeb3e396a44fb90 SHA256 ee63d33ca527ca555056c6bc3a7d89fa9b5f32e5f82b7eae27b1c030c80ced9e
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
+}