sci-biology/artemis-bin: install docs, cleanup ebuild and bring it in sync with sci-biology/act-bin and sci-biology/artemis-9999

Package-Manager: portage-2.2.28

2 files changed, 25 insertions, 6 deletions

diff --git a/sci-biology/artemis-bin/Manifest b/sci-biology/artemis-bin/Manifest
index 3bd261d96..5ea64c9bf 100644
--- a/sci-biology/artemis-bin/Manifest
+++ b/sci-biology/artemis-bin/Manifest
@@ -1,4 +1,6 @@
-DIST artemis.pdf 1149449 SHA256 ab573b4ea7b895cb7d2a97e4d42a71938f1feda44e2da22fe5b079583ad87ba6 SHA512 1c3056dab7239c3a68b2e76491d77612f22ac8f83eaf32e0ab0a3901e03d3c65d5ac02f5758d2d7728d94dd44c29517a498fa94a947d5d319ded43ddec4ba5fb WHIRLPOOL a75266ae72075ea7547560a9046c1e0f813956b94a5c3d9af3cd08a579ed60af842c6ece94e6b1dfa5db1820094069edb7d88b4ee6256410ebced4310739d79f
+DIST artemis-bin-16.0.11.html_build.zip 2284822 SHA256 d78ecbf8906395ca27bb3d45ebeae05a792923c98866632468dd2cd26c9bbddf SHA512 80c952fe20f98b647f38a08a469cb351bb44aa1b0a7d1a9b997fabbd37107d5d934a6d52fa2abfde243f90f4e752c99d418c4ad6b634d82de9744d089eb1cf8a WHIRLPOOL ea67f08ebf8284a186690880d7185e8991e1616f782fbde640021f44085dd6247d065e3bdae557aa10af0b2584a7f40421b9ae6199328f677f17082fa7716759
+DIST artemis-bin-16.0.11.manual.pdf 1149449 SHA256 ab573b4ea7b895cb7d2a97e4d42a71938f1feda44e2da22fe5b079583ad87ba6 SHA512 1c3056dab7239c3a68b2e76491d77612f22ac8f83eaf32e0ab0a3901e03d3c65d5ac02f5758d2d7728d94dd44c29517a498fa94a947d5d319ded43ddec4ba5fb WHIRLPOOL a75266ae72075ea7547560a9046c1e0f813956b94a5c3d9af3cd08a579ed60af842c6ece94e6b1dfa5db1820094069edb7d88b4ee6256410ebced4310739d79f
+DIST artemis-bin-16.0.11.release_notes.txt 2727 SHA256 f1facd291ffbe21758516eec421297ed8d4ddfa0f9d8ba5c201045e0aa56e648 SHA512 a9fadad47ee50a54b4036193afa6fa74e404c6b6cfd61e97885c8824f885d162c4b826910223ce1930ee55b74fe40e365c7d66019746d2fb2d70ecd3c1ceacb6 WHIRLPOOL c9fafe943b6c1e833effff8c004031d6e1156b312878aa099de57ecac6f3e2461f5675a8cf49830db7e0c8b0107516844e9c64d81d6ba8dcaf48faea912dc6d1
 DIST artemis_compiled_v16.0.11.tar.gz 10722613 SHA256 0413c3f0deab4d813bc4f3af7aef8cca09ad2111b3497a0696c18a31857ffd4b SHA512 a0fb9f64b0fb869bde9fe2d1788ed938a16ea0bd75315abd93e65af89772fe9d4589b7e7813286c9b1d90f1f3133c16d9bc35ce78d1740c5631ca0e32633e421 WHIRLPOOL 0682bdfead9f95a17180816ed445226c128a804f8db3549c78627b510330694b60fd7ab0e419766bf08295f3a266eefd0dfd85c0d1244c80009b5aba0c29052a
 DIST artemis_v16.0.11.jar 11292419 SHA256 f368714105646cfc31460cfcfb72b8b33490c7684ee5323d7dd181060039c80f SHA512 2fbd7c5ab12c2ca710906324eb5ee861d4821eaf923f630a800ce2b2de4e43c3971cf6c470140aa2654741ab79440a2039e8b9a17502ca955432d9ef311e9f84 WHIRLPOOL fc605625b536853ee7657b09bca93f04b9f1da67a093875bcfac0d4948f7daf020c26f0624b551aba36f21e87a7ee8b933e0e26c45a715ea2fe6cb9211d0f78f
 DIST sartemis_v16.0.11.jar 11832144 SHA256 834ad0464405843904b173f38220f47867ec8eb779cb2c37d6de7ba585ef133c SHA512 6fd63ac81eed727816fe633cde3e9fab9eaf71a61c74aef4f82c8c4dc24efe93ce86494ebdf3fcb3d82e50aed5c277f383f67c1b7b68ae81cf872f2982bc1850 WHIRLPOOL 874ab57f11b011a222efd4b91278614941b096756faf0259b844453dfb082d99bae503faa2ffaeb6c4d56b4317b3bcc00a49f8b5b16d6c7cc02968b4911c503a
diff --git a/sci-biology/artemis-bin/artemis-bin-16.0.11.ebuild b/sci-biology/artemis-bin/artemis-bin-16.0.11.ebuild
index e0c9fe997..7f5a97bab 100644
--- a/sci-biology/artemis-bin/artemis-bin-16.0.11.ebuild
+++ b/sci-biology/artemis-bin/artemis-bin-16.0.11.ebuild
@@ -2,24 +2,26 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit java-pkg-2
 
 MY_V="16"
 
-DESCRIPTION="DNA sequence viewer, annotation (Artemis) and comparison (ACT) tool"
+DESCRIPTION="DNA sequence viewer, annotation (Artemis) without comparison (ACT) tool"
 HOMEPAGE="http://www.sanger.ac.uk/resources/software/artemis"
 SRC_URI="ftp://ftp.sanger.ac.uk/pub/resources/software/artemis/v"${MY_V}"/v"${PV}"/artemis_compiled_v"${PV}".tar.gz
 	ftp://ftp.sanger.ac.uk/pub/resources/software/artemis/v"${MY_V}"/v"${PV}"/artemis_v"${PV}".jar
 	ftp://ftp.sanger.ac.uk/pub/resources/software/artemis/v"${MY_V}"/v"${PV}"/sartemis_v"${PV}".jar
-	ftp://ftp.sanger.ac.uk/pub/resources/software/artemis/artemis.pdf"
+	ftp://ftp.sanger.ac.uk/pub/resources/software/artemis/v"${MY_V}"/artemis_manual_complete.pdf -> ${P}.manual.pdf
+	ftp://ftp.sanger.ac.uk/pub/resources/software/artemis/v"${MY_V}"/release_notes.txt -> ${P}.release_notes.txt
+	ftp://ftp.sanger.ac.uk/pub/resources/software/artemis/v"${MY_V}"/art_html_build.zip -> ${P}.html_build.zip"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-S="${WORKDIR}"/artemis
+S="${WORKDIR}"
 
 DEPEND="
 	!sci-biology/artemis
@@ -27,12 +29,24 @@ DEPEND="
 RDEPEND="${DEPEND}
 		>=virtual/jre-1.6"
 
+src_unpack(){
+	unzip "${DISTDIR}"/${P}.html_build.zip || die
+}
+
+src_prepare(){
+	default
+	cd art_html_build || die
+	rm -f .DS_Store HTML.index HTML.manifest || die
+}
+
 src_install(){
 	cp -p "${DISTDIR}"/artemis_v"${PV}".jar artemis.jar || die
 	java-pkg_dojar artemis.jar
 	cp -p "${DISTDIR}"/sartemis_v"${PV}".jar sartemis.jar || die
 	java-pkg_dojar sartemis.jar
-	dodoc "${DISTDIR}"/artemis.pdf README
+	dodoc "${DISTDIR}"/${P}.manual.pdf "${DISTDIR}"/${P}.release_notes.txt
+	insinto /usr/share/doc/"${PN}"/html
+	doins art_html_build/*
 }
 
 # artemis_compiled_v16.0.11.tar.gz contains compiled binaries but also java *.class files
@@ -41,4 +55,7 @@ src_install(){
 
 pkg_postinst(){
 	einfo "For BAM file support please install sci-biology/BamView"
+	einfo "You may find interesting the additional web resources:"
+	einfo "http://www.webact.org/WebACT"
+	einfo "http://www.hpa-bioinfotools.org.uk/pise/double_act.html"
 }