commit:     02377db0d625e97d1e9b5d1320d36527f35e3993
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 12:11:23 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 12:11:23 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=02377db0

sci-biology/OBO-Edit: Bump to EAPI=5

Package-Manager: portage-2.2.21
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-biology/OBO-Edit/OBO-Edit-2.1.0.ebuild   | 13 +++++++------
 sci-biology/OBO-Edit/OBO-Edit-2.1.1.6.ebuild |  9 +++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/sci-biology/OBO-Edit/OBO-Edit-2.1.0.ebuild 
b/sci-biology/OBO-Edit/OBO-Edit-2.1.0.ebuild
index 504b76c..f5d9948 100644
--- a/sci-biology/OBO-Edit/OBO-Edit-2.1.0.ebuild
+++ b/sci-biology/OBO-Edit/OBO-Edit-2.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
 inherit toolchain-funcs versionator java-pkg-2
 
@@ -10,8 +10,9 @@ 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";
+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"
@@ -29,8 +30,8 @@ src_install(){
        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 '{}' \;
+       find . -name firstrun -delete || die
+       find . -name .svn -exec rm -rf '{}' \; || die
 
        insinto /opt/
        doins -r OBO-Edit2

diff --git a/sci-biology/OBO-Edit/OBO-Edit-2.1.1.6.ebuild 
b/sci-biology/OBO-Edit/OBO-Edit-2.1.1.6.ebuild
index 2c0ac7b..0a3ca5d 100644
--- a/sci-biology/OBO-Edit/OBO-Edit-2.1.1.6.ebuild
+++ b/sci-biology/OBO-Edit/OBO-Edit-2.1.1.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
 inherit toolchain-funcs versionator java-pkg-2
 
@@ -13,8 +13,9 @@ 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://downloads.sourceforge.net/project/geneontology/OBO-Edit%202%20%5BLatest%20versions%5D/"${MY_VER}"/"${MY_PV}"_unix_install4j.sh
 -> "${PN}"_unix_install4j-"${PV}".sh
-               
http://sourceforge.net/projects/geneontology/files/OBO-Edit%202%20%5BLatest%20versions%5D/"${MY_PV}"/ReleaseNotes-"${MY_VER}".txt
 -> "${PN}"_ReleaseNotes-"${PV}".txt"
+SRC_URI="
+       
http://downloads.sourceforge.net/project/geneontology/OBO-Edit%202%20%5BLatest%20versions%5D/"${MY_VER}"/"${MY_PV}"_unix_install4j.sh
 -> "${PN}"_unix_install4j-"${PV}".sh
+       
http://sourceforge.net/projects/geneontology/files/OBO-Edit%202%20%5BLatest%20versions%5D/"${MY_PV}"/ReleaseNotes-"${MY_VER}".txt
 -> "${PN}"_ReleaseNotes-"${PV}".txt"
 
 LICENSE="OBO-Edit" # Artistic-like
 SLOT="0"

Reply via email to