diff options
| author |   Martin Mokrejš <mmokrejs@fold.natur.cuni.cz> | 2016-03-23 20:04:14 +0100 |
|---|---|---|
| committer | Martin Mokrejš <mmokrejs@fold.natur.cuni.cz> | 2016-03-23 20:04:14 +0100 |
| commit | 694eb11ff758972f56126f309b9ed3663eef7f0f (patch) | |
| tree | 17968a28daecad1c180cde1488c2de21056c386f | |
| parent | sci-biology/staden_doc: new package (diff) | |
| download | sci-694eb11f.tar.gz sci-694eb11f.tar.bz2 sci-694eb11f.zip | |
sci-biology/staden: version bump; remove unused USE=curl, introduce USE=doc for a separate package
Package-Manager: portage-2.2.26
| -rw-r--r-- | sci-biology/staden/Manifest | 3 | ||||
| -rw-r--r-- | sci-biology/staden/staden-2.0.0_beta10.ebuild (renamed from sci-biology/staden/staden-2.0.0_beta9.ebuild) | 17 | ||||
| -rw-r--r-- | sci-biology/staden/staden-9999.ebuild | 9 |
3 files changed, 11 insertions, 18 deletions
diff --git a/sci-biology/staden/Manifest b/sci-biology/staden/Manifest index 8198edd23..29d8b4c6e 100644 --- a/sci-biology/staden/Manifest +++ b/sci-biology/staden/Manifest @@ -1,2 +1 @@ -DIST staden-2.0.0b9-src.tar.gz 4431301 SHA256 2cad8cc9821c83539e683f2bb28bbbfccbefb5bff589f71501b5cf53de8f4a8b SHA512 0818b376b9921c07cfdd36b6a62b615a3396153bbcb8714a852148457a5cc190da32af318777f07da7012e5cb45d352e8b13884176e1e85fd1707f36adff972e WHIRLPOOL 16e4070dfea1e1de30c1d7bf0e2a6c1be27c4a5364ab4e82b4bd7aea0bd4e97cfdf4e020dd418860cb79d1906bd830de94023edf1a1dc8715bdcabfb9a03141a -DIST staden_doc-2.0.0b9-src.tar.gz 3181687 SHA256 942a560e22de0fd0da8856d2049fba1703ea042e7ea5b80e277a2d57d7fe4cd4 SHA512 9f1d1ec7f8301058574ec7da604274d1767258293c88f6cde6426ad361a8543833fa4b755e5f0109ca4dd88ea41cd7fa94f2f7e14a4d9a516ec06ae49540c15f WHIRLPOOL f5adfdd6868d565c2269b13a45ae7d19a369f61679ac918aa8e02c64667e3117fb5a4efc717d06a8bf538c75a29a24580663308ca87d4192d837c9298a5808d2 +DIST staden-2.0.0b10-src.tar.gz 4616845 SHA256 099efd84a208ec9efa3669803c0ca6f09960d760886fa3990dfa5cf9d0c112fb SHA512 6ed8316a4cd9631b1aa632dbb51c190044470898404c0cf6dadba9acd4d36f8ecc36babce00ca44d0987b9e69a457f9a333a6711d4e2cec8a9917037deda72fa WHIRLPOOL 83d896f0e7d5ee1061d8bb0463f1fbfbed6a7df650350ec825eced30883be3e3e1a447ddde2e11fd77d7044f402e015dc01df3272cae21e4538fdd0e36c3cf1f diff --git a/sci-biology/staden/staden-2.0.0_beta9.ebuild b/sci-biology/staden/staden-2.0.0_beta10.ebuild index 7f869140f..b9cfef0a5 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 ef3a75218..58e92e9c4 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 } |