commit: 7c9d1fc1ef91728d38504e7c07a363d4b397ca3d
Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Sun Feb 19 00:54:34 2017 +0000
Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Sun Feb 19 00:54:34 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=7c9d1fc1
sci-biology/tablet: version bump
Fix required java version to 1.8
Seems 1.16.09.06 is under upstream's SVN commit #876.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
...-1.14.04.10.ebuild => tablet-1.15.09.01.ebuild} | 24 ++++++++++++----------
...-1.14.04.10.ebuild => tablet-1.16.09.06.ebuild} | 6 +++---
sci-biology/tablet/tablet-9999.ebuild | 8 ++++----
3 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/sci-biology/tablet/tablet-1.14.04.10.ebuild
b/sci-biology/tablet/tablet-1.15.09.01.ebuild
similarity index 67%
copy from sci-biology/tablet/tablet-1.14.04.10.ebuild
copy to sci-biology/tablet/tablet-1.15.09.01.ebuild
index d8aa02c19..2d30b71bb 100644
--- a/sci-biology/tablet/tablet-1.14.04.10.ebuild
+++ b/sci-biology/tablet/tablet-1.15.09.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,7 +18,7 @@ if [ "$PV" == "9999" ]; then
KEYWORDS=""
else
ESVN_REPO_URI="http://ics.hutton.ac.uk/svn/tablet/tags/${PV}";
- KEYWORDS=""
+ KEYWORDS="~amd64 ~x86"
fi
LICENSE="Tablet"
@@ -28,9 +28,9 @@ IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="${PYTHON_DEPS}
- >=virtual/jdk-1.7:*"
+ >=virtual/jdk-1.8:*"
RDEPEND="${PYTHON_DEPS}
- >=virtual/jre-1.7:*
+ >=virtual/jre-1.8:*
sci-biology/samtools
sci-biology/picard
dev-db/sqlite:3"
@@ -38,12 +38,14 @@ RDEPEND="${PYTHON_DEPS}
S="${WORKDIR}"
src_install() {
- 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
+ cd lib || die
+ java-pkg_dojar tablet.jar
+ java-pkg_dolauncher ${PN}
+ java-pkg_dojar tablet-resources.jar
+ java-pkg_dojar flamingo.jar
+ java-pkg_dojar scri-commons.jar
+ java-pkg_dojar samtools*.jar
+
+ echo "PATH=${EPREFIX}/usr/share/${PN}/" > 99Tablet
doenvd 99Tablet
}
diff --git a/sci-biology/tablet/tablet-1.14.04.10.ebuild
b/sci-biology/tablet/tablet-1.16.09.06.ebuild
similarity index 92%
rename from sci-biology/tablet/tablet-1.14.04.10.ebuild
rename to sci-biology/tablet/tablet-1.16.09.06.ebuild
index d8aa02c19..c4be1406f 100644
--- a/sci-biology/tablet/tablet-1.14.04.10.ebuild
+++ b/sci-biology/tablet/tablet-1.16.09.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -28,9 +28,9 @@ IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="${PYTHON_DEPS}
- >=virtual/jdk-1.7:*"
+ >=virtual/jdk-1.8:*"
RDEPEND="${PYTHON_DEPS}
- >=virtual/jre-1.7:*
+ >=virtual/jre-1.8:*
sci-biology/samtools
sci-biology/picard
dev-db/sqlite:3"
diff --git a/sci-biology/tablet/tablet-9999.ebuild
b/sci-biology/tablet/tablet-9999.ebuild
index d8aa02c19..f5846c8ef 100644
--- a/sci-biology/tablet/tablet-9999.ebuild
+++ b/sci-biology/tablet/tablet-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -28,9 +28,9 @@ IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="${PYTHON_DEPS}
- >=virtual/jdk-1.7:*"
+ >=virtual/jdk-1.8:*"
RDEPEND="${PYTHON_DEPS}
- >=virtual/jre-1.7:*
+ >=virtual/jre-1.8:*
sci-biology/samtools
sci-biology/picard
dev-db/sqlite:3"
@@ -44,6 +44,6 @@ src_install() {
java-pkg_dojar lib/scri-commons.jar
java-pkg_dojar lib/samtools*.jar
- echo "PATH=${EPREFIX}/opt/Tablet" > 99Tablet
+ echo "PATH=${EPREFIX}/usr/share/${PN}" > 99Tablet
doenvd 99Tablet
}
