[gentoo-commits] proj/sci:master commit in: sci-biology/jellyfish/

["Martin Mokrejs" <mmokrejs@fold.natur.cuni.cz>]

commit:     d5bb19eb26c17d1639a37265acd3ea31d65a79b3
Author:     Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Thu Apr 30 21:27:46 2015 +0000
Commit:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Thu Apr 30 21:27:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d5bb19eb

sci-biology/jellyfish: added older version, added HalfLICENSE to all ebuilds

Package-Manager: portage-2.2.18

 sci-biology/jellyfish/ChangeLog                                    | 6 ++++++
 .../jellyfish/{jellyfish-2.1.3.ebuild => jellyfish-1.1.11.ebuild}  | 7 ++++---
 sci-biology/jellyfish/jellyfish-2.1.3.ebuild                       | 2 +-
 sci-biology/jellyfish/jellyfish-2.1.4.ebuild                       | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/sci-biology/jellyfish/ChangeLog b/sci-biology/jellyfish/ChangeLog
index ddaab96..fe0d9c4 100644
--- a/sci-biology/jellyfish/ChangeLog
+++ b/sci-biology/jellyfish/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*jellyfish-1.1.11 (30 Apr 2015)
+
+  30 Apr 2015; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
+  +jellyfish-1.1.11.ebuild, jellyfish-2.1.3.ebuild, jellyfish-2.1.4.ebuild:
+  sci-biology/jellyfish: added older version, added HalfLICENSE to all ebuilds
+
   30 Apr 2015; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
   jellyfish-2.1.3.ebuild, jellyfish-2.1.4.ebuild:
   sci-biology/jellyfish: added missing DEPEND on virtual/pkgconfig so that the

diff --git a/sci-biology/jellyfish/jellyfish-2.1.3.ebuild b/sci-biology/jellyfish/jellyfish-1.1.11.ebuild
similarity index 76%
copy from sci-biology/jellyfish/jellyfish-2.1.3.ebuild
copy to sci-biology/jellyfish/jellyfish-1.1.11.ebuild
index 243cd46..082ef0c 100644
--- a/sci-biology/jellyfish/jellyfish-2.1.3.ebuild
+++ b/sci-biology/jellyfish/jellyfish-1.1.11.ebuild
@@ -6,12 +6,13 @@ EAPI=5
 
 DESCRIPTION="k-mer counter within reads for assemblies"
 HOMEPAGE="http://www.genome.umd.edu/jellyfish.html"
-SRC_URI="ftp://ftp.genome.umd.edu/pub/${PN}/${P}.tar.gz
-	ftp://ftp.genome.umd.edu/pub/jellyfish/JellyfishUserGuide.pdf"
+SRC_URI="http://www.cbcb.umd.edu/software/jellyfish/jellyfish-1.1.11.tar.gz
+	http://www.cbcb.umd.edu/software/jellyfish/jellyfish-manual-1.1.pdf"
 
 # older version is hidden in trinityrnaseq_r20140413p1/trinity-plugins/jellyfish-1.1.11
+# also was bundled in quorum-0.2.1 and MaSuRca-2.1.0
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+ HalfLICENSE"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

diff --git a/sci-biology/jellyfish/jellyfish-2.1.3.ebuild b/sci-biology/jellyfish/jellyfish-2.1.3.ebuild
index 243cd46..1cc3010 100644
--- a/sci-biology/jellyfish/jellyfish-2.1.3.ebuild
+++ b/sci-biology/jellyfish/jellyfish-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.genome.umd.edu/pub/${PN}/${P}.tar.gz
 
 # older version is hidden in trinityrnaseq_r20140413p1/trinity-plugins/jellyfish-1.1.11
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+ HalfLICENSE"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

diff --git a/sci-biology/jellyfish/jellyfish-2.1.4.ebuild b/sci-biology/jellyfish/jellyfish-2.1.4.ebuild
index 243cd46..1cc3010 100644
--- a/sci-biology/jellyfish/jellyfish-2.1.4.ebuild
+++ b/sci-biology/jellyfish/jellyfish-2.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.genome.umd.edu/pub/${PN}/${P}.tar.gz
 
 # older version is hidden in trinityrnaseq_r20140413p1/trinity-plugins/jellyfish-1.1.11
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+ HalfLICENSE"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""