commit: 9edf23ce547ba5dc58d1d5d87dfb5895bee40bef
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 18 13:44:44 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Feb 18 13:44:44 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9edf23ce
sci-biology/tablet: fix SLOT operators and dependencies
Package-Manager: portage-2.2.17
---
sci-biology/tablet/ChangeLog | 4 +++
sci-biology/tablet/tablet-1.13.12.17.ebuild | 51 -----------------------------
sci-biology/tablet/tablet-9999.ebuild | 28 +++++++---------
3 files changed, 16 insertions(+), 67 deletions(-)
diff --git a/sci-biology/tablet/ChangeLog b/sci-biology/tablet/ChangeLog
index 7bd423c..c27c747 100644
--- a/sci-biology/tablet/ChangeLog
+++ b/sci-biology/tablet/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 18 Feb 2015; Justin Lecher <j...@gentoo.org> -tablet-1.13.12.17.ebuild,
+ tablet-9999.ebuild:
+ sci-biology/tablet: fix SLOT operators and dependencies
+
09 Jan 2015; Martin Mokrejs <mmokr...@fold.natur.cuni.cz> tablet-9999.ebuild:
sci-biology/tablet: note the compilation from source is not coded into ebuild
yet
diff --git a/sci-biology/tablet/tablet-1.13.12.17.ebuild
b/sci-biology/tablet/tablet-1.13.12.17.ebuild
deleted file mode 100644
index 1940cb9..0000000
--- a/sci-biology/tablet/tablet-1.13.12.17.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit java-pkg-2 java-ant-2 python-r1
-
-# [ "$PV" == "9999" ] && inherit subversion
-inherit subversion
-
-DESCRIPTION="Viewer of next generation sequence assemblies and alignments."
-HOMEPAGE="http://bioinf.scri.ac.uk/tablet/";
-if [ "$PV" == "9999" ]; then
- ESVN_REPO_URI="http://ics.hutton.ac.uk/svn/tablet/trunk/";
- KEYWORDS=""
-else
- ESVN_REPO_URI="http://ics.hutton.ac.uk/svn/tablet/tags/${PV}";
- KEYWORDS=""
-fi
-
-LICENSE="Tablet"
-SLOT="0"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
- >=virtual/jdk-1.7"
-RDEPEND="${DEPEND}
- >=virtual/jre-1.7
- sci-biology/samtools
- sci-biology/picard
- dev-db/sqlite"
-
-S="${WORKDIR}"
-
-src_install() {
- java-pkg_dojar lib/tablet-resources.jar || die
- java-pkg_dojar lib/tablet.jar || die
- java-pkg_dojar lib/flamingo.jar || die
- java-pkg_dojar lib/scri-commons.jar || die
- java-pkg_dojar lib/samtools*.jar || die
-
- dobin www/additional/coveragestats.py
-
- echo "PATH=${EPREFIX}/opt/Tablet" > 99Tablet
- doenvd 99Tablet || die
-}
diff --git a/sci-biology/tablet/tablet-9999.ebuild
b/sci-biology/tablet/tablet-9999.ebuild
index 7923105..5d8f545 100644
--- a/sci-biology/tablet/tablet-9999.ebuild
+++ b/sci-biology/tablet/tablet-9999.ebuild
@@ -4,14 +4,14 @@
EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
inherit java-pkg-2 java-ant-2 python-r1
# [ "$PV" == "9999" ] && inherit subversion
inherit subversion
-DESCRIPTION="Viewer of next generation sequence assemblies and alignments."
+DESCRIPTION="Viewer of next generation sequence assemblies and alignments"
HOMEPAGE="http://bioinf.scri.ac.uk/tablet/";
if [ "$PV" == "9999" ]; then
ESVN_REPO_URI="http://ics.hutton.ac.uk/svn/tablet/trunk/";
@@ -28,26 +28,22 @@ IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="${PYTHON_DEPS}
- >=virtual/jdk-1.7"
-RDEPEND="${DEPEND}
- >=virtual/jre-1.7
+ >=virtual/jdk-1.7:*"
+RDEPEND="${PYTHON_DEPS}
+ >=virtual/jre-1.7:*
sci-biology/samtools
sci-biology/picard
- dev-db/sqlite"
+ dev-db/sqlite:3"
S="${WORKDIR}"
-# TODO: do actually compile tablet from sources
-
src_install() {
- java-pkg_dojar lib/tablet-resources.jar || die
- java-pkg_dojar lib/tablet.jar || die
- java-pkg_dojar lib/flamingo.jar || die
- java-pkg_dojar lib/scri-commons.jar || die
- java-pkg_dojar lib/samtools*.jar || die
-
- dobin www/additional/coveragestats.py
+ java-pkg_dojar lib/tablet-resources.jar
+ java-pkg_dojar lib/tablet.jar
+ java-pkg_dojar lib/flamingo.jar
+ java-pkg_dojar lib/scri-commons.jar
+ java-pkg_dojar lib/samtools*.jar
echo "PATH=${EPREFIX}/opt/Tablet" > 99Tablet
- doenvd 99Tablet || die
+ doenvd 99Tablet
}
