sci-biology/staden: Punt base.eclass; transfer changes to live ebuild

Package-Manager: portage-2.2.8

4 files changed, 44 insertions, 46 deletions

diff --git a/sci-biology/staden/ChangeLog b/sci-biology/staden/ChangeLog
index 0a9092b5d..84aac83d4 100644
--- a/sci-biology/staden/ChangeLog
+++ b/sci-biology/staden/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-biology/staden
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> staden-2.0.0_beta9.ebuild,
+  staden-9999.ebuild, metadata.xml:
+  Punt base.eclass; transfer changes to live ebuild
+
 *staden-2.0.0_beta9 (26 Nov 2012)
 
   26 Nov 2012; Justin Lecher <jlec@gentoo.org> -staden-2.0.0_beta8.ebuild,
diff --git a/sci-biology/staden/metadata.xml b/sci-biology/staden/metadata.xml
index 07b525505..2bc893037 100644
--- a/sci-biology/staden/metadata.xml
+++ b/sci-biology/staden/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
-	<maintainer>
-		<email>mmokrejs@fold.natur.cuni.cz</email>
-		<name>Martin Mokrejs</name>
-	</maintainer>
+  <herd>sci-biology</herd>
+  <maintainer>
+    <email>mmokrejs@fold.natur.cuni.cz</email>
+    <name>Martin Mokrejs</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/staden/staden-2.0.0_beta9.ebuild b/sci-biology/staden/staden-2.0.0_beta9.ebuild
index b1d51c1d2..90dd7ef90 100644
--- a/sci-biology/staden/staden-2.0.0_beta9.ebuild
+++ b/sci-biology/staden/staden-2.0.0_beta9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -78,7 +78,9 @@ src_install() {
 	# loader can find the library (I failed to use '-Wl,-rpath,/usr/lib/staden'
 	# somehow for gap2caf, for example
 	cat >> "${T}"/99staden <<- EOF
+	STADENROOT="${EPREFIX}"/usr/share/staden
 	LDPATH="${EPREFIX}/usr/$(get_libdir)/staden"
 	EOF
+
 	doenvd "${T}"/99staden
 }
diff --git a/sci-biology/staden/staden-9999.ebuild b/sci-biology/staden/staden-9999.ebuild
index 175996982..af6725a5a 100644
--- a/sci-biology/staden/staden-9999.ebuild
+++ b/sci-biology/staden/staden-9999.ebuild
@@ -1,23 +1,17 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=5
 
-inherit base eutils flag-o-matic fortran-2 multilib subversion
+AUTOTOOLS_AUTORECONF=yes
 
-if [ "$PV" == "9999" ]; then
-	inherit autotools
-fi
+inherit autotools-utils flag-o-matic fortran-2 multilib subversion
 
 DESCRIPTION="DNA sequence assembly (gap4, gap5), editing and analysis tools (Spin)"
 HOMEPAGE="http://sourceforge.net/projects/staden/"
-# https://staden.svn.sourceforge.net/svnroot/staden staden
-if [ "$PV" == "9999" ]; then
-	ESVN_REPO_URI="https://staden.svn.sourceforge.net/svnroot/staden/staden/trunk"
-else
-	SRC_URI="http://downloads.sourceforge.net/staden/staden-2.0.0b7-src.tar.gz"
-fi
+SRC_URI=""
+ESVN_REPO_URI="https://staden.svn.sourceforge.net/svnroot/staden/staden/trunk"
 
 LICENSE="staden"
 SLOT="0"
@@ -26,59 +20,57 @@ IUSE="curl debug fortran png tcl tk X zlib"
 
 # either g77 or gfortran must be available
 # edit src/mk/linux.mk accordingly
-
 #
 # this is a glibc-2.9 issue, see https://sourceforge.net/tracker/index.php?func=detail&aid=2629155&group_id=100316&atid=627058
 #
 #
+#
 DEPEND="
 	app-arch/xz-utils
 	dev-lang/tk
 	dev-tcltk/tklib
-	>=media-libs/libpng-1.2
+	media-libs/libpng:0
 	sci-biology/samtools
 	>=sci-libs/io_lib-1.12.2
-	>=sys-libs/zlib-1.2
-	virtual/fortran"
+	sys-libs/zlib"
 RDEPEND="${DEPEND}
 	>=dev-tcltk/iwidgets-4.0
 	tcl? ( >=dev-tcltk/itcl-3.2 )
 	tk? ( >=dev-tcltk/itk-3.2 )"
 
-src_unpack() {
-	if [ "$PV" == "9999" ]; then
-		subversion_src_unpack
-		S="${WORKDIR}"/"${P}"/src/ || die
-		cd "${S}" || die
-		./bootstrap || die "bootstrap failed"
-	else
-		unpack ${A} || die
-		S="${WORKDIR}"/staden-2.0.0b7-src || die "Cannot cd ${WORKDIR}/staden-2.0.0b7-src"
-		cd "${S}" || die "Cannot cd ${S}"
-		./bootstrap || die "bootstrap failed"
-	fi
+S="${WORKDIR}"/"${P}"/src/
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	sed \
+		-e 's:svnversion:false:' \
+		-i configure.in || die
+
+	AT_M4DIR=ac_stubs autotools-utils_src_prepare
 }
 
 src_configure() {
-	local myconf
-	use X && myconf=" --with-x"
-	myconf=" --with-tklib=/usr/lib/tklib0.5" # HACK, see http://bugs.gentoo.org/show_bug.cgi?id=311847#c10
-	use amd64 && myconf="${myconf} --enable-64bit"
+	local myeconfargs=()
+	use X && myeconfargs+=( --with-x )
+	myeconfargs+=(
+		--with-tklib=/usr/$(get_libdir)/tklib
+		)
+	use amd64 && myeconfargs+=( --enable-64bit )
 	use debug && append-cflags "-DCACHE_REF_DEBUG"
-	use debug && append-cxxflags "-DCACHE_REF_DEBUG"
-	econf ${myconf}
+		autotools-utils_src_configure
 	# edit system.mk to place there proper version number of the svn-controlled checkout
-	SVNVERSION=`svnversion ${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}`
-	sed -e "s/^SVNVERS.*/SVNVERS = "${SVNVERSION}"/" -i system.mk
+	sed -e "s/^SVNVERS.*/SVNVERS = "${ESVN_REVISION}"/" -i system.mk || die
 }
 
 src_install() {
 	# TODO: dodoc /usr/share/doc/staden/manual/gap4.index ?
-	emake install DESTDIR="${D}" SVN_VERSION="${SVNVERSION}" || die "make install failed"
+	autotools-utils_src_install SVN_VERSION="${ESVN_REVISION}"
 
-	cat >> "${S}"/99staden <<- EOF
+	cat >> "${T}"/99staden <<- EOF
 	STADENROOT="${EPREFIX}"/usr/share/staden
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/staden"
 	EOF
 
-	doenvd "${S}"/99staden || die
+	doenvd "${T}"/99staden
 }