commit: 694eb11ff758972f56126f309b9ed3663eef7f0f Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz> AuthorDate: Wed Mar 23 19:04:14 2016 +0000 Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz> CommitDate: Wed Mar 23 19:04:14 2016 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=694eb11f
sci-biology/staden: version bump; remove unused USE=curl, introduce USE=doc for a separate package Package-Manager: portage-2.2.26 ...en-2.0.0_beta9.ebuild => staden-2.0.0_beta10.ebuild} | 17 ++++++----------- sci-biology/staden/staden-9999.ebuild | 9 ++++----- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/sci-biology/staden/staden-2.0.0_beta9.ebuild b/sci-biology/staden/staden-2.0.0_beta10.ebuild similarity index 76% rename from sci-biology/staden/staden-2.0.0_beta9.ebuild rename to sci-biology/staden/staden-2.0.0_beta10.ebuild index 7f86914..b9cfef0 100644 --- a/sci-biology/staden/staden-2.0.0_beta9.ebuild +++ b/sci-biology/staden/staden-2.0.0_beta10.ebuild @@ -9,15 +9,13 @@ AUTOTOOLS_AUTORECONF=yes inherit autotools-utils eutils flag-o-matic fortran-2 multilib DESCRIPTION="DNA sequence assembly (gap4, gap5), editing and analysis tools (Spin)" -HOMEPAGE="http://sourceforge.net/projects/staden/"; -SRC_URI=" - http://downloads.sourceforge.net/staden/staden-${PV/_beta/b}-src.tar.gz - http://sourceforge.net/projects/staden/files/staden/${PV/_beta/b}/staden_doc-${PV/_beta/b}-src.tar.gz"; +HOMEPAGE="http://sourceforge.net/projects/staden"; +SRC_URI="http://downloads.sourceforge.net/staden/staden-${PV/_beta/b}-src.tar.gz"; LICENSE="staden" SLOT="0" KEYWORDS="~x86 ~amd64" -IUSE="curl debug fortran png tcl tk X zlib" +IUSE="debug doc fortran png tcl tk X zlib" # either g77 or gfortran must be available # edit src/mk/linux.mk accordingly @@ -37,7 +35,9 @@ DEPEND=" RDEPEND="${DEPEND} >=dev-tcltk/iwidgets-4.0 tcl? ( >=dev-tcltk/itcl-3.2 ) - tk? ( >=dev-tcltk/itk-3.2 )" + tk? ( >=dev-tcltk/itk-3.2 ) + net-misc/curl + doc? ( sci-biology/staden_doc )" S="${WORKDIR}"/staden-${PV/_beta/b}-src @@ -69,10 +69,6 @@ src_configure(){ src_install() { autotools-utils_src_install - # TODO: dodoc /usr/share/doc/staden/manual/gap4.index ? - #cd "${WORKDIR}"/staden_doc-${PV/_beta/b}-src || die "failed to cd "${WORKDIR}"/staden_doc-${PV/_beta/b}-src" - #make install prefix="${D}"/usr || die "failed to install pre-created docs from upstream" - # install the LDPATH so that it appears in /etc/ld.so.conf after env-update # subsequently, apps linked against /usr/lib/staden can be run because # loader can find the library (I failed to use '-Wl,-rpath,/usr/lib/staden' @@ -81,6 +77,5 @@ src_install() { 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 ef3a752..58e92e9 100644 --- a/sci-biology/staden/staden-9999.ebuild +++ b/sci-biology/staden/staden-9999.ebuild @@ -16,7 +16,7 @@ ESVN_REPO_URI="https://staden.svn.sourceforge.net/svnroot/staden/staden/trunk/sr LICENSE="staden" SLOT="0" KEYWORDS="" -IUSE="curl debug fortran png tcl tk X zlib" +IUSE="debug doc fortran png tcl tk X zlib" # either g77 or gfortran must be available # edit src/mk/linux.mk accordingly @@ -36,7 +36,9 @@ DEPEND=" RDEPEND="${DEPEND} >=dev-tcltk/iwidgets-4.0 tcl? ( >=dev-tcltk/itcl-3.2 ) - tk? ( >=dev-tcltk/itk-3.2 )" + tk? ( >=dev-tcltk/itk-3.2 ) + net-misc/curl + doc? ( sci-biology/staden_doc )" AUTOTOOLS_IN_SOURCE_BUILD=1 @@ -62,13 +64,10 @@ src_configure() { } src_install() { - # TODO: dodoc /usr/share/doc/staden/manual/gap4.index ? autotools-utils_src_install SVN_VERSION="${ESVN_REVISION}" - cat >> "${T}"/99staden <<- EOF STADENROOT="${EPREFIX}"/usr/share/staden LDPATH="${EPREFIX}/usr/$(get_libdir)/staden" EOF - doenvd "${T}"/99staden }
