sci-biology/tablet-bin: Version BUmp; BUmp to EAPI5 and python-r1.eclass

Package-Manager: portage-2.2.0_alpha179

5 files changed, 51 insertions, 87 deletions

diff --git a/sci-biology/tablet-bin/ChangeLog b/sci-biology/tablet-bin/ChangeLog
index 3205cfc85..52a442dfa 100644
--- a/sci-biology/tablet-bin/ChangeLog
+++ b/sci-biology/tablet-bin/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-biology/tablet-bin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Jun 2013; Justin Lecher <jlec@gentoo.org> -tablet-bin-1.11.05.03.ebuild,
+  -tablet-bin-1.11.11.01.ebuild, +tablet-bin-1.13.05.17.ebuild, metadata.xml:
+  Version BUmp; BUmp to EAPI5 and python-r1.eclass
+
   07 Feb 2012; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
   tablet-bin-1.11.11.01.ebuild:
   adjust PATH to point to the installation place
diff --git a/sci-biology/tablet-bin/Manifest b/sci-biology/tablet-bin/Manifest
index ae6afbe26..18833160e 100644
--- a/sci-biology/tablet-bin/Manifest
+++ b/sci-biology/tablet-bin/Manifest
@@ -1,3 +1,2 @@
 DIST coveragestats.py 4800 SHA256 358b686d00fd75d2cc9af490b0e7d635f74cbb1c0b153df22d8ff879884d47bc SHA512 d5688832c13dc9c2e2e015df0b5c50113f72e2eeae076d479c43b65a4b028f8dcfa5f0fb833b4341d76d3956ea27707c55a51389b73a2efed6abd2b96ccdc3cd WHIRLPOOL 0b1eb20189b343d6014097748c053f35f8ad162400312cfbde16bac7fee52f24ac8b0055e991c823dcb64d7a20df3fbb88d8cd6119f838d4e9a5f26e82604664
-DIST tablet_linux_x86_1_11_05_03.sh 24035425 SHA256 3c7de5f0e5d37019485612723dfd3b17fd34e24df8986eb535fcb0335f8b2e99
-DIST tablet_linux_x86_1_11_11_01.sh 23481558 SHA256 9dbbd9ecf1c20e39b978a4be88707593c37073407af951cbf7a9b3d16e6daf23 SHA512 95da451959304aafe36c70895cd9f0a89c1749a403e47a4f32b7605e6cbdb5b2f69b03b4177fd6db45cbdba76e2f054742179000d29b0574a1f4541f335aeaa2 WHIRLPOOL cae67ca8338aa23781f91cd235ecc1bd082b04ada80a158d827acf33c04d8bd63e89883790dd3945938e1405c2b6a0903d4e10ffe40c3fe7e0e042390ba1cabe
+DIST tablet-bin-1.13.05.17.sh 35467547 SHA256 6da2cbb8d15433cdf022c93f466d355515a9c1c8f89dcdab4c2e9543bee415e4 SHA512 532900242ef3b3a46a6e6379c29b627c9f337198cf230273eb1da4c269b6f09a49bc7c5ea28a1ee4caa4f7d7a76ba0e0f18330a538428e49b8f1d36c3bfecb78 WHIRLPOOL 299f23da5f6192a7802f86e61e2c5655711d0d672e28cdd257fdd179d76e15e1b951fa42ec2b28e4568063197b14e1884d61992b7ff2e864fa86c3dad2141c14
diff --git a/sci-biology/tablet-bin/metadata.xml b/sci-biology/tablet-bin/metadata.xml
index 07b525505..2bc893037 100644
--- a/sci-biology/tablet-bin/metadata.xml
+++ b/sci-biology/tablet-bin/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
-	<maintainer>
-		<email>mmokrejs@fold.natur.cuni.cz</email>
-		<name>Martin Mokrejs</name>
-	</maintainer>
+  <herd>sci-biology</herd>
+  <maintainer>
+    <email>mmokrejs@fold.natur.cuni.cz</email>
+    <name>Martin Mokrejs</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-biology/tablet-bin/tablet-bin-1.11.05.03.ebuild b/sci-biology/tablet-bin/tablet-bin-1.11.05.03.ebuild
deleted file mode 100644
index 32cc463ee..000000000
--- a/sci-biology/tablet-bin/tablet-bin-1.11.05.03.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit java-pkg-2 python
-
-DESCRIPTION="Viewer of 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_05_03.sh
-		http://bioinf.scri.ac.uk/tablet/additional/coveragestats.py"
-
-# Upstream says regarding source code unavailability:
-# 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.
-
-# The licence file itself is 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 via install4j is not ideal but works.
-	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 therefore
-	# 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:
-	#
-	# /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_05_03.sh || die "failed to set userHome value"
-	sh "${DISTDIR}"/tablet_linux_x86_1_11_05_03.sh -q -overwrite -varfile="${DISTDIR}"/response.varfile --destination="${D}"/opt/Tablet -dir "${D}"/opt/Tablet || die "Failed to run the self-extracting exe file"
-	dobin "${DISTDIR}"/coveragestats.py
-}
diff --git a/sci-biology/tablet-bin/tablet-bin-1.11.11.01.ebuild b/sci-biology/tablet-bin/tablet-bin-1.13.05.17.ebuild
index 3e6d6e64f..e3be7e5c6 100644
--- a/sci-biology/tablet-bin/tablet-bin-1.11.11.01.ebuild
+++ b/sci-biology/tablet-bin/tablet-bin-1.13.05.17.ebuild
@@ -1,15 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=5
 
-inherit java-pkg-2 python
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit java-pkg-2 python-r1
 
 DESCRIPTION="Viewer of 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_11_01.sh
-		http://bioinf.scri.ac.uk/tablet/additional/coveragestats.py"
+SRC_URI="
+	http://bioinf.scri.ac.uk/tablet/installers/tablet_linux_x86_$(replace_all_version_separators _).sh -> ${P}.sh
+	http://bioinf.scri.ac.uk/tablet/additional/coveragestats.py"
 
 # Upstream says regarding source code unavailability:
 # Tablet uses a modified version of the BSD License which has been edited to
@@ -28,12 +31,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
-		virtual/jre
-		dev-lang/python"
+		virtual/jre"
 
-MYPV="$(replace_all_version_separators '_')"
+S="${WORKDIR}"
+
+src_unpack() {
+	local file
+	for file in ${A}; do
+		cp "${DISTDIR}"/${file} ${WORKDIR} || die
+	done
+}
 
 pkg_setup() {
 	einfo "Fixing java access violations ..."
@@ -45,7 +56,7 @@ 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 via install4j is not ideal but works.
-	sed "s#\"\${D}\"#"${D}"#g" "${FILESDIR}"/response.varfile > "${DISTDIR}"/response.varfile || die "sed failed"
+	sed "s#\"\${D}\"#"${D}"#g" "${FILESDIR}"/response.varfile > "${WORKDIR}"/response.varfile || die "sed failed"
 
 	# the intallation script somehow does not pickup
 	# -varfile="${DISTDIR}"/response.varfile from the commandline and therefore
@@ -55,19 +66,31 @@ src_install() {
 	# 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:
 	#
-	# /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]
+	# /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"
+	dodir /opt/Tablet/.install4j
+	cat "${WORKDIR}"/response.varfile > "${ED}"/opt/Tablet/.install4j/response.varfile || die
 
 	# 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="${TMPDIR}" -Dinstall4j.jvmDir#" -i "${DISTDIR}"/tablet_linux_x86_"${MYPV}".sh || die "failed to set userHome value"
-	sh "${DISTDIR}"/tablet_linux_x86_"${MYPV}".sh -q -overwrite -varfile="${DISTDIR}"/response.varfile --destination="${D}"/opt/Tablet -dir "${D}"/opt/Tablet || die "Failed to run the self-extracting exe file"
-	dobin "${DISTDIR}"/coveragestats.py
+	sed \
+		-e "s#/bin/java\" -Dinstall4j.jvmDir#/bin/java\" -Duser.home="${TMPDIR}" -Dinstall4j.jvmDir#" \
+		-i "${WORKDIR}"/${P}.sh || die
+	sh \
+		"${WORKDIR}"/${P}.sh \
+		-q -overwrite \
+		-varfile="${DISTDIR}"/response.varfile \
+		--destination="${ED}"/opt/Tablet \
+		-dir "${ED}"/opt/Tablet || die
+
+	rm -rvf "${ED}"/opt/Tablet/jre || die
+
+
+	python_foreach_impl python_doscript "${WORKDIR}"/coveragestats.py
 
-	echo "PATH=/opt/Tablet" > 99Tablet
+	echo "PATH=${EPREFIX}/opt/Tablet" > 99Tablet
 	doenvd 99Tablet || die
 }