[gentoo-commits] proj/sci:master commit in: sci-biology/OBO-Edit/files/, sci-biology/OBO-Edit/

["Martin Mokrejs" <mmokrejs@fold.natur.cuni.cz>]

commit:     cbb2b1076148dcff9f1acd272b25d7557071b21e
Author:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Mon Dec 26 17:11:02 2011 +0000
Commit:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Mon Dec 26 17:11:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cbb2b107

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)

---
 sci-biology/OBO-Edit/ChangeLog                 |    8 +++++
 sci-biology/OBO-Edit/OBO-Edit-2.1.0.ebuild     |   40 ++++++++++++++++++++++++
 sci-biology/OBO-Edit/OBO-Edit-2.1_beta8.ebuild |   32 -------------------
 sci-biology/OBO-Edit/files/response.varfile    |    1 +
 4 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/sci-biology/OBO-Edit/ChangeLog b/sci-biology/OBO-Edit/ChangeLog
index e1de6ad..77732a7 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/OBO-Edit-2.1.0.ebuild b/sci-biology/OBO-Edit/OBO-Edit-2.1.0.ebuild
new file mode 100644
index 0000000..77bd240
--- /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 8842bcd..0000000
--- 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 2fcaa29..149a4e2 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