Sync ebuild to use install4j as in sci-biology/tablet-bin. Awaiting a fix from upstream so that the installer really respects --destination or -dir options.

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

5 files changed, 54 insertions, 46 deletions

diff --git a/sci-biology/OBO-Edit/ChangeLog b/sci-biology/OBO-Edit/ChangeLog
index e1de6ad37..77732a70e 100644
--- a/sci-biology/OBO-Edit/ChangeLog
+++ b/sci-biology/OBO-Edit/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*OBO-Edit-2.1.0 (26 Dec 2011)
+
+  26 Dec 2011; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
+  -OBO-Edit-2.1_beta8.ebuild, +OBO-Edit-2.1.0.ebuild, files/response.varfile:
+  Sync ebuild to use install4j as in sci-biology/tablet-bin. Awaiting a fix
+  from upstream so that the installer really respects --destination or -dir
+  options.
+
   25 Jun 2011; Justin Lecher <jlec@gentoo.org> OBO-Edit-2.1_beta8.ebuild:
   Cleaned ebuild
 
diff --git a/sci-biology/OBO-Edit/Manifest b/sci-biology/OBO-Edit/Manifest
index 7d3684c16..8f285a6a3 100644
--- a/sci-biology/OBO-Edit/Manifest
+++ b/sci-biology/OBO-Edit/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX response.varfile 161 RMD160 3fbf3bb5a79dafecefdd64314f4fcfbb05ecc8d0 SHA1 46c6214c7072221455e74a9aa502c85b8edca0be SHA256 4a5793bb5bf94fcb10732cf9f821eacfa41b8a36d1a5fc4bae76408f19d85c02
-DIST oboedit_2_1_8_linux_install4j.rpm 51962024 RMD160 b1ce3c7704c2fbe5185e36c6ad6c63f7fcf065fb SHA1 6a8a1605b9d6f16b6dc34469442a520029135eaa SHA256 e29edfe6531be9f64235e2891426b3ecf9f5a12f0f0f09a0b461f440dbcacfdd
-EBUILD OBO-Edit-2.1_beta8.ebuild 1011 RMD160 9214f2ed58107aceb10259e9960380a2e42a508d SHA1 52ccbf82bb26a9764c73f43edd5749297c43bd0f SHA256 efbeebf397b2176e07fc80aaf020cd9d9e4d2b4523315a820939761d3902a8c7
-MISC ChangeLog 213 RMD160 b8548e6d5f3b28a81e670bea1bad94cf72b68541 SHA1 aed23b323ab6ec8f1ba26a4e0583e139d9b4c50e SHA256 60ac52b6c2696252417f779b77704412a18162fa69c7923c53722072ac6deb90
+AUX response.varfile 189 RMD160 58d713beba6fac0f4aa40495019967b870ac6f15 SHA1 176c9915f11472fcf07700aafe082d23dbd7349f SHA256 815245bd4841cdaebc6b33ad6d969c01ce15845f8fd70150ebf9c108d739b60d
+DIST OBO-Edit_unix_install4j-2.1.0.sh 44395414 RMD160 5d834dd3dd1b9c6376ab43bdbdebb4be42a97e48 SHA1 83ecba4dd1f6493e9ba7753c47c3ea2e8d58c81a SHA256 22fa3801c5ddbb7d1f5a8445574850263a3d2ddf676311f6f21bfebffd6d894f
+DIST ReleaseNotes-2.1.0.txt 33593 RMD160 1db31d771079834943421935e3f2be6f2ed47df7 SHA1 993e5c15c96768f94f1303278cb921d3254c31d6 SHA256 e906e9a53148f7d21d0f820d878342a989773f4549303b2dc49007d9c23fe564
+EBUILD OBO-Edit-2.1.0.ebuild 1724 RMD160 ef0463b1c559ac4c4231953355184099c400fb1d SHA1 41523a290f375b0a741262dd1e90503165c2a35a SHA256 5e17e56dd01d3fbf8667ba77d530b00b58a727f44fe0e601884ef26d35467215
+MISC ChangeLog 546 RMD160 10acc8dfc87d92779a72e6be00362212b04c3b61 SHA1 86a482a14b4d38e725d64ff92e48625181353568 SHA256 90afbffed84541b31995a3697e1ecf54bc8e5f84af65da5ac9937538946078f7
 MISC metadata.xml 269 RMD160 53c242e331b0a82669ca7913da16dac854ab8dca SHA1 bc75ba3b0f5607ac5f396d3e8a99daf5ded5a7de SHA256 13472fd0615d2b381dbe36666fe1bbf3b1c34770aa409c6101b38741b4586f85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREIAAYFAk4F9AUACgkQgAnW8HDreRaa7QCghXG6JSHPKGLWYGFRHT83RWD3
-oscAoJucwotuTlZpVfq0ImuGVTIQcThj
-=RaKC
------END PGP SIGNATURE-----
diff --git a/sci-biology/OBO-Edit/OBO-Edit-2.1.0.ebuild b/sci-biology/OBO-Edit/OBO-Edit-2.1.0.ebuild
new file mode 100644
index 000000000..77bd2409f
--- /dev/null
+++ b/sci-biology/OBO-Edit/OBO-Edit-2.1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit toolchain-funcs versionator java-pkg-2
+
+MY_PV=$(replace_all_version_separators '-')
+
+DESCRIPTION="Java-based editor optimized for the OBO biological ontology file format"
+HOMEPAGE="http://www.oboedit.org/"
+SRC_URI="http://sourceforge.net/projects/geneontology/files/OBO-Edit%202%20%5BLatest%20versions%5D/OBO-Edit%20"${PV}"/"${MY_PV}"_unix_install4j.sh/download -> OBO-Edit_unix_install4j-"${PV}".sh
+		http://sourceforge.net/projects/geneontology/files/OBO-Edit%202%20%5BLatest%20versions%5D/OBO-Edit%20"${PV}"/ReleaseNotes-"${PV}".txt"
+
+LICENSE="OBO-Edit" # Artistic-like
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/rpm2targz"
+RDEPEND="virtual/jre"
+
+S="${WORKDIR}"
+
+src_install(){
+	mkdir -p "${D}"/opt/OBO-Edit2/.install4j || die "Cannot pre-create "${D}"/opt/OBO-Edit2/.install4j/"
+	sed "s#\"\${D}\"#"${D}"#g" "${FILESDIR}"/response.varfile > "${D}"/opt/OBO-Edit2/.install4j/response.varfile || die "sed failed"
+	sed "s#/bin/java\" -Dinstall4j.jvmDir#/bin/java\" -Duser.home="${D}"/../temp -Dinstall4j.jvmDir#" -i "${DISTDIR}"/OBO-Edit_unix_install4j-"${PV}".sh || die "failed to set userHome value"
+
+	sh "${DISTDIR}"/OBO-Edit_unix_install4j-"${PV}".sh -q -overwrite --varfile="${D}"/opt/OBO-Edit2/.install4j/response.varfile --destination="${D}"/opt/OBO-Edit2 -dir "${D}"/opt/OBO-Edit2 || die "Failed to run the self-extracting "${DISTDIR}"/OBO-Edit_unix_install4j-"${PV}".sh file"
+	find . -name firstrun -delete
+	find . -name .svn -exec rm -rf '{}' \;
+
+	insinto /opt/
+	doins -r OBO-Edit2
+	chmod 755 "${ED}"/opt/OBO-Edit2/*
+
+	dodoc "${DISTDIR}"/ReleaseNotes-2.1.0.txt
+}
diff --git a/sci-biology/OBO-Edit/OBO-Edit-2.1_beta8.ebuild b/sci-biology/OBO-Edit/OBO-Edit-2.1_beta8.ebuild
deleted file mode 100644
index 8842bcdb3..000000000
--- a/sci-biology/OBO-Edit/OBO-Edit-2.1_beta8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit rpm
-
-DESCRIPTION="Java-based editor optimized for the OBO biological ontology file format"
-HOMEPAGE="http://www.oboedit.org/"
-#SRC_URI="http://sourceforge.net/projects/geneontology/files/OBO-Edit%202%20%5BLatest%20versions%5D/oboedit2.1beta8/oboedit_2_1_8_unix_install4j.sh"
-SRC_URI="http://sourceforge.net/projects/geneontology/files/OBO-Edit%202%20%5BLatest%20versions%5D/oboedit2.1beta8/oboedit_2_1_8_linux_install4j.rpm"
-
-LICENSE="OBO-Edit" # Artistic-like
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/rpm2targz"
-RDEPEND="virtual/jre"
-
-S="${WORKDIR}"/opt
-
-src_install(){
-	# sh "${DISTDIR}"/oboedit_2_1_8_unix_install4j.sh -q -overwrite --var-file="${FILESDIR}"/response.varfile --destination="${D}"/opt/OBO-Edit2
-	find . -name firstrun -delete
-	find . -name .svn -exec rm -rf '{}' \;
-
-	insinto /opt/
-	doins -r OBO-Edit2
-	chmod 755 "${ED}"/opt/OBO-Edit2/*
-}
diff --git a/sci-biology/OBO-Edit/files/response.varfile b/sci-biology/OBO-Edit/files/response.varfile
index 2fcaa2946..149a4e2ee 100644
--- a/sci-biology/OBO-Edit/files/response.varfile
+++ b/sci-biology/OBO-Edit/files/response.varfile
@@ -2,4 +2,5 @@ executeLauncherAction$Boolean=false
 sys.programGroupDisabled$Boolean=true
 sys.symlinkDir="${D}"usr/bin
 sys.languageId=en
+sys.userHome="${D}"/../temp
 sys.installationDir="${D}"opt/OBO-Edit2