sci-biology/tablet-bin-1.11.02.18: fixed ebuild for the package and version bump

(Portage version: 2.1.9.43/git/Linux i686, unsigned Manifest commit)

4 files changed, 66 insertions, 33 deletions

diff --git a/sci-biology/tablet-bin/Manifest b/sci-biology/tablet-bin/Manifest
index 64c0acb74..209d4b4e7 100644
--- a/sci-biology/tablet-bin/Manifest
+++ b/sci-biology/tablet-bin/Manifest
@@ -1,5 +1,5 @@
-AUX response.varfile 235 RMD160 d91f8fbcc4da051b5ea5f77888a3468c30fc9e70 SHA1 8f1b332e7fe21797071b473435b91ce3df37470a SHA256 0e6d7df08f4f1dc7c46ff9f213476f6525599831f1bed5e131f1eaf6a72d38e2
+AUX response.varfile 645 RMD160 4662694266ac6104b5829923e5b6099ff68552f3 SHA1 971f052ae515bb630d166651adbf06005762b0a0 SHA256 29c9e65e81636b977ec0439f650d83b3cbfc3d23aef600339e4c8949fcd5369f
 DIST coveragestats.py 4800 RMD160 a45ef0ef293d08c62f79d4921c810554cea5cc44 SHA1 87b2e3432919c8cd2eb673bd8cf4a59f34d4a58e SHA256 358b686d00fd75d2cc9af490b0e7d635f74cbb1c0b153df22d8ff879884d47bc
-DIST tablet_linux_x86_1_11_01_25.sh 23576405 RMD160 b0fe2732a2ccef536fb7b8efe004f82ca5517940 SHA1 0a00dfe602d8c4de5d9aa57cefd4b63a5c658aa4 SHA256 b91bd6b132d4f7052e24e7a79d50e9494f046dfde915bfac33fcb5097f1ba3f8
-EBUILD tablet-bin-1.11.01.25.ebuild 1571 RMD160 c67d9dcf7ea9d70f5aafc698a05915494e223f95 SHA1 b41489e045568be5fe33a37b4a77e998d7d3d196 SHA256 3230914946959c8ef575dafa1b8cd21afb4d90886102175d781f77df0b62a598
+DIST tablet_linux_x86_1_11_02_18.sh 23948799 RMD160 f049d6e553d167e858951a9b20b2d9b088c4e3b7 SHA1 8605bb512be1df529f8c4225723d669802236e36 SHA256 9a2d33e7664b27ec0596acda3f9c1a3f43a4358cbe1664aabf6def7c1100c0a2
+EBUILD tablet-bin-1.11.02.18.ebuild 3159 RMD160 b70186a2f5062f5a2087601f0a9630c3efef0adc SHA1 7c9c1fba246a09da395edf74ad1507baa82c6537 SHA256 a934a17684ff35d18c86afb55f8e19c4ca8c1dd0ca235f623bd6e7f77d061378
 MISC metadata.xml 269 RMD160 53c242e331b0a82669ca7913da16dac854ab8dca SHA1 bc75ba3b0f5607ac5f396d3e8a99daf5ded5a7de SHA256 13472fd0615d2b381dbe36666fe1bbf3b1c34770aa409c6101b38741b4586f85
diff --git a/sci-biology/tablet-bin/files/response.varfile b/sci-biology/tablet-bin/files/response.varfile
index 2ce1c2404..cfa2e6808 100644
--- a/sci-biology/tablet-bin/files/response.varfile
+++ b/sci-biology/tablet-bin/files/response.varfile
@@ -2,6 +2,10 @@
 #Mon Jan 24 11:35:29 GMT 2011
 executeLauncherAction$Boolean=false
 sys.programGroupDisabled$Boolean=true
+# somehow, this happens: ln -s /scratch/var/tmp/portage/sci-biology/tablet-bin-1.11.02.18/image/opt/Tablet/tablet /usr/local/bin/tablet
+# # that happens because /scratch/var/tmp/portage/sci-biology/tablet-bin-1.11.02.18/image/opt/Tablet/.install4j/response.varfile does not reflect our values
 sys.symlinkDir="${D}"usr/bin
+#sys.symlinkDir=/scratch/var/tmp/portage/sci-biology/tablet-bin-1.11.02.18/image/usr/bin
 sys.languageId=en
+sys.userHome="${D}"/../temp
 sys.installationDir="${D}"opt/Tablet
diff --git a/sci-biology/tablet-bin/tablet-bin-1.11.01.25.ebuild b/sci-biology/tablet-bin/tablet-bin-1.11.01.25.ebuild
deleted file mode 100644
index 2cf7b278f..000000000
--- a/sci-biology/tablet-bin/tablet-bin-1.11.01.25.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-DESCRIPTION="Graphical viewer for next generation sequence assemblies and alignments."
-HOMEPAGE="http://bioinf.scri.ac.uk/tablet/"
-SRC_URI="http://bioinf.scri.ac.uk/tablet/installers/tablet_linux_x86_1_11_01_25.sh
-		http://bioinf.scri.ac.uk/tablet/additional/coveragestats.py"
-
-# Tablet uses a modified version of the BSD License which has been edited to remove references to distribution and use in source forms. This means that we are happy for you to distribute and use Tablet however you please, but we do not (yet) want to make the source code publicly available.
-LICENSE="Tablet" # It's in the installer, and ends up on disk after installation at /opt/Tablet/docs/tablet.html
-				# The original BSD licence was modified to remove references to distribution and use in
-				#source forms, because we cannot make the source code available for Tablet.
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		virtual/jre
-		dev-lang/python"
-
-src_install() {
-	# In theory it seems this binary package could be installed through ant instead of the install4j package which is not easy to be forced non-interactive. The below approach is not ideal.
-	sed "s#\"\${D}\"#"${D}"#g" "${FILESDIR}"/response.varfile > "${DISTDIR}"/response.varfile || die "sed failed"
-	sh "${DISTDIR}"/tablet_linux_x86_1_11_01_25.sh -q -overwrite --var-file="${DISTDIR}"/response.varfile --destination="${D}"/opt/Tablet
-	dobin "${DISTDIR}"/coveragestats.py || die
-}
diff --git a/sci-biology/tablet-bin/tablet-bin-1.11.02.18.ebuild b/sci-biology/tablet-bin/tablet-bin-1.11.02.18.ebuild
new file mode 100644
index 000000000..d4b19252c
--- /dev/null
+++ b/sci-biology/tablet-bin/tablet-bin-1.11.02.18.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit python java-pkg-2
+
+DESCRIPTION="Graphical viewer for next generation sequence assemblies and alignments."
+HOMEPAGE="http://bioinf.scri.ac.uk/tablet/"
+SRC_URI="http://bioinf.scri.ac.uk/tablet/installers/tablet_linux_x86_1_11_02_18.sh
+		http://bioinf.scri.ac.uk/tablet/additional/coveragestats.py"
+
+# Tablet uses a modified version of the BSD License which has been edited to remove
+# references to distribution and use in source forms. This means that we are happy
+# for you to distribute and use Tablet however you please, but we do not (yet) want
+# to make the source code publicly available.
+
+# It's in the installer, and ends up on disk after installation at /opt/Tablet/docs/tablet.html
+# The original BSD licence was modified to remove references to distribution and use in
+# source forms, because we cannot make the source code available for Tablet.
+
+LICENSE="Tablet"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+		virtual/jre
+		dev-lang/python"
+
+src_install() {
+	# In theory it seems this binary package could be installed through ant instead
+	# of the install4j package which is not easy to be forced non-interactive.
+	# The below approach is not ideal.
+	sed "s#\"\${D}\"#"${D}"#g" "${FILESDIR}"/response.varfile > "${DISTDIR}"/response.varfile || die "sed failed"
+
+	# the intallation script somehow does not pickup
+	# -varfile="${DISTDIR}"/response.varfile from the commandline and tehrefore
+	# we place the file rather directly into the place where it should reside.
+	# In the file you can read details how the variables were mangled. For
+	# example, the trick with sys.symlinkDir in the response.varfile is to
+	# disable the installation process to symlink from /usr/local/bin/table to
+	# /opt/Tablet/tablet. That was logged in that file with the following line:
+	#
+	# /scratch/var/tmp/portage/sci-biology/tablet-bin-1.11.02.18/image/opt/Tablet/.install4j/installation.log: Variable changed: sys.symlinkDir=/usr/local/bin[class java.lang.String]
+	#
+	# The file is then left on the installed system in "${D}"/opt/Tablet/.install4j/response.varfile
+	mkdir -p "${D}"/opt/Tablet/.install4j || die "Cannot pre-create	"${D}"/opt/Tablet/.install4j/"
+	cat "${DISTDIR}"/response.varfile >	"${D}"/opt/Tablet/.install4j/response.varfile || die "Cannot write	"${D}"/opt/Tablet/.install4j/response.varfile"
+
+	# make sure we force java to point a to $HOME which is inside our sanbox
+	# directory area. We force -Duser.home . It seems also -Dinstall4j.userHome
+	# could be done based on the figure shown at http://resources.ej-technologies.com/install4j/help/doc/
+	sed "s#/bin/java\" -Dinstall4j.jvmDir#/bin/java\" -Duser.home="${D}"/../temp -Dinstall4j.jvmDir#" -i "${DISTDIR}"/tablet_linux_x86_1_11_02_18.sh || die "failed to set userHome value"
+	sh "${DISTDIR}"/tablet_linux_x86_1_11_02_18.sh -q -overwrite -varfile="${DISTDIR}"/response.varfile --destination="${D}"/opt/Tablet -dir /scratch/var/tmp/portage/sci-biology/tablet-bin-1.11.02.18/image/opt/Tablet
+	dobin "${DISTDIR}"/coveragestats.py
+}