sci-biology/cluster: Version Bump, Move to EAPI=4

(Portage version: 2.2.0_alpha107/git/Linux x86_64, unsigned Manifest commit)

5 files changed, 62 insertions, 65 deletions

diff --git a/sci-biology/cluster/ChangeLog b/sci-biology/cluster/ChangeLog
index 1367a0a2d..df0333630 100644
--- a/sci-biology/cluster/ChangeLog
+++ b/sci-biology/cluster/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-biology/cluster
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cluster-1.50 (24 May 2012)
+
+  24 May 2012; Justin Lecher <jlec@gentoo.org> -cluster-1.38.ebuild,
+  +cluster-1.50.ebuild, metadata.xml:
+  Version Bump, Move to EAPI=4
+
   23 Jun 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
   cluster-1.38.ebuild:
   QA fixes
diff --git a/sci-biology/cluster/Manifest b/sci-biology/cluster/Manifest
index 380a631c3..a166aa046 100644
--- a/sci-biology/cluster/Manifest
+++ b/sci-biology/cluster/Manifest
@@ -1 +1 @@
-DIST cluster-1.38.tar.gz 1025607 RMD160 417fd26c1fc19efcad709674fa5b151db4746c6e SHA1 79b550dbd700e7da8a05f60ac7b7fd37a869c598 SHA256 ddada105dee50428f4700410ba6fef62a89adc7a2eb0baedc0fcd6fc4570da6e
+DIST cluster-1.50.tar.gz 859841 SHA256 07c659bc0d39a3e326af05eea098afa26060eba915693774d0bfaded42d5228a SHA512 d7903bd484d27424968c30458f7f9e75b6b9ac778aec9a0fac96c073f795d0606e05a31b33c416074f34be0bcec01fa7e5c21dfa2e08423fe26ee5fd0b03e978 WHIRLPOOL 5a39b28804589095c51d9b893d7214b1270479561ec0cde14eda006b934e3d9f3fd631dbb5b5248ed71c97e2c77a7059109d7d9950aaf4fa29097c512216d87c
diff --git a/sci-biology/cluster/cluster-1.38.ebuild b/sci-biology/cluster/cluster-1.38.ebuild
deleted file mode 100644
index 9ca0788b1..000000000
--- a/sci-biology/cluster/cluster-1.38.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# needs bump badly
-
-SRC_URI="${P}.tar.gz"
-
-DESCRIPTION="Clustering software for microarray analysis"
-HOMEPAGE="http://bonsai.ims.u-tokyo.ac.jp/~mdehoon/software/cluster/software.htm#ctv"
-LICENSE="Eisen"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="X? ( x11-libs/openmotif )"
-RDEPEND="X? ( x11-misc/xdg-utils app-text/xpdf )"
-
-RESTRICT="fetch"
-
-pkg_nofetch() {
-	einfo "Please obtain ${P}.tar.gz from ${HOMEPAGE} and place it in ${DISTDIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e 's:^docdir = $(prefix)/cluster/doc:docdir = @docdir@:' \
-		-e 's:^htmldir = $(prefix)/cluster/html:htmldir = @htmldir@:' \
-		-e 's:^imagedir = $(prefix)/cluster/html/images:imagedir = @htmldir@/images:' \
-		-e 's:^fileformatdir = $(prefix)/cluster:fileformatdir = @docdir@:' \
-		X11/Makefile.in || die "sed failed"
-
-#	epatch "${FILESDIR}/${P}-helpmenu-fix.patch" || die "failed to patch helpmenu"
-
-}
-
-src_compile() {
-	econf $(use_with X x) \
-		--docdir="/usr/share/doc/${P}" \
-		--htmldir="/usr/share/doc/${P}/html" \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	dodoc README AUTHORS ChangeLog NEWS TODO || die "failed to install docs"
-	insinto /usr/share/doc/${P}/examples
-	doins example/example.c example/README || die "failed to install docs"
-	insinto /usr/share/doc/${P}
-	doins doc/cluster.pdf || die "failed to install docs"
-}
diff --git a/sci-biology/cluster/cluster-1.50.ebuild b/sci-biology/cluster/cluster-1.50.ebuild
new file mode 100644
index 000000000..614ff43cc
--- /dev/null
+++ b/sci-biology/cluster/cluster-1.50.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+DESCRIPTION="Clustering software for microarray analysis"
+HOMEPAGE="http://bonsai.ims.u-tokyo.ac.jp/~mdehoon/software/cluster/software.htm#ctv"
+SRC_URI="${P}.tar.gz"
+
+LICENSE="Eisen"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="X? ( x11-libs/openmotif )"
+RDEPEND="X? ( x11-misc/xdg-utils app-text/mupdf )"
+
+RESTRICT="fetch"
+
+pkg_nofetch() {
+	einfo "Please obtain ${P}.tar.gz from ${HOMEPAGE} and place it in ${DISTDIR}"
+}
+
+src_prepare() {
+	sed -i \
+		-e 's:^docdir = .*$:docdir = @docdir@:' \
+		-e 's:^htmldir = .*$:htmldir = @htmldir@:' \
+		-e 's:^imagedir = .*$:imagedir = @htmldir@/images:' \
+		-e 's:^fileformatdir = .*$:fileformatdir = @docdir@:' \
+		X11/Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	econf \
+		$(use_with X x) \
+		--docdir="/usr/share/doc/${P}" \
+		--htmldir="/usr/share/doc/${P}/html"
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/doc/${P}/examples
+	doins example/example.c example/README
+	insinto /usr/share/doc/${PR}
+	doins doc/cluster.pdf
+}
diff --git a/sci-biology/cluster/metadata.xml b/sci-biology/cluster/metadata.xml
index 2971c5ba0..94729cbd6 100644
--- a/sci-biology/cluster/metadata.xml
+++ b/sci-biology/cluster/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-biology</herd>
-<maintainer>
-<email>je_fro@gentoo.org</email>
-<name>Jeff Gardner</name>
-</maintainer>
-<longdescription lang="en">
+	<herd>sci-biology</herd>
+	<maintainer>
+		<email>je_fro@gentoo.org</email>
+		<name>Jeff Gardner</name>
+	</maintainer>
+	<longdescription lang="en">
 Cluster provides an interface to access methods of gene expression data
 analysis.
 </longdescription>
 </pkgmetadata>
-