| 1 |
commit: fd1926f50b2555db3d637c377223551e3415adf9 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 22 19:17:51 2016 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 22 19:18:41 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=fd1926f5 |
| 7 |
|
| 8 |
sci-biology/OBO-Edit: Use ecvs_clean to clean workdir |
| 9 |
|
| 10 |
* add missing die |
| 11 |
* Fix quoting |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.27 |
| 14 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 15 |
|
| 16 |
sci-biology/OBO-Edit/OBO-Edit-2.1.0.ebuild | 35 +++++++++++++++-------- |
| 17 |
sci-biology/OBO-Edit/OBO-Edit-2.1.1.6.ebuild | 42 +++++++++++++++++----------- |
| 18 |
sci-biology/OBO-Edit/metadata.xml | 2 +- |
| 19 |
3 files changed, 51 insertions(+), 28 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sci-biology/OBO-Edit/OBO-Edit-2.1.0.ebuild b/sci-biology/OBO-Edit/OBO-Edit-2.1.0.ebuild |
| 22 |
index f5d9948..c1b900a 100644 |
| 23 |
--- a/sci-biology/OBO-Edit/OBO-Edit-2.1.0.ebuild |
| 24 |
+++ b/sci-biology/OBO-Edit/OBO-Edit-2.1.0.ebuild |
| 25 |
@@ -1,18 +1,18 @@ |
| 26 |
-# Copyright 1999-2015 Gentoo Foundation |
| 27 |
+# Copyright 1999-2016 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
# $Id$ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
|
| 33 |
-inherit toolchain-funcs versionator java-pkg-2 |
| 34 |
+inherit eutils toolchain-funcs versionator java-pkg-2 |
| 35 |
|
| 36 |
MY_PV=$(replace_all_version_separators '-') |
| 37 |
|
| 38 |
DESCRIPTION="Java-based editor optimized for the OBO biological ontology file format" |
| 39 |
HOMEPAGE="http://www.oboedit.org/" |
| 40 |
SRC_URI=" |
| 41 |
- 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 |
| 42 |
- http://sourceforge.net/projects/geneontology/files/OBO-Edit%202%20%5BLatest%20versions%5D/OBO-Edit%20"${PV}"/ReleaseNotes-"${PV}".txt" |
| 43 |
+ 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 |
| 44 |
+ http://sourceforge.net/projects/geneontology/files/OBO-Edit%202%20%5BLatest%20versions%5D/OBO-Edit%20${PV}/ReleaseNotes-${PV}.txt" |
| 45 |
|
| 46 |
LICENSE="OBO-Edit" # Artistic-like |
| 47 |
SLOT="0" |
| 48 |
@@ -25,17 +25,30 @@ RDEPEND="virtual/jre" |
| 49 |
S="${WORKDIR}" |
| 50 |
|
| 51 |
src_install(){ |
| 52 |
- mkdir -p "${D}"/opt/OBO-Edit2/.install4j || die "Cannot pre-create "${D}"/opt/OBO-Edit2/.install4j/" |
| 53 |
- sed "s#\"\${D}\"#"${D}"#g" "${FILESDIR}"/response.varfile > "${D}"/opt/OBO-Edit2/.install4j/response.varfile || die "sed failed" |
| 54 |
- 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" |
| 55 |
- |
| 56 |
- 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" |
| 57 |
+ dodir /opt/OBO-Edit2/.install4j |
| 58 |
+ |
| 59 |
+ sed \ |
| 60 |
+ -e "s#\"\${D}\"#"${D}"#g" \ |
| 61 |
+ "${FILESDIR}"/response.varfile \ |
| 62 |
+ > "${D}"/opt/OBO-Edit2/.install4j/response.varfile || die "sed failed" |
| 63 |
+ |
| 64 |
+ sed \ |
| 65 |
+ -e "s#/bin/java\" -Dinstall4j.jvmDir#/bin/java\" -Duser.home="${D}"/../temp -Dinstall4j.jvmDir#" \ |
| 66 |
+ -i "${DISTDIR}"/OBO-Edit_unix_install4j-"${PV}".sh || die "failed to set userHome value" |
| 67 |
+ |
| 68 |
+ sh "${DISTDIR}"/OBO-Edit_unix_install4j-"${PV}".sh \ |
| 69 |
+ -q -overwrite \ |
| 70 |
+ --varfile="${D}"/opt/OBO-Edit2/.install4j/response.varfile \ |
| 71 |
+ --destination="${D}"/opt/OBO-Edit2 \ |
| 72 |
+ -dir "${D}"/opt/OBO-Edit2 \ |
| 73 |
+ || die "Failed to run the self-extracting ${DISTDIR}/OBO-Edit_unix_install4j-"${PV}".sh file" |
| 74 |
find . -name firstrun -delete || die |
| 75 |
- find . -name .svn -exec rm -rf '{}' \; || die |
| 76 |
+ |
| 77 |
+ esvn_clean |
| 78 |
|
| 79 |
insinto /opt/ |
| 80 |
doins -r OBO-Edit2 |
| 81 |
- chmod 755 "${ED}"/opt/OBO-Edit2/* |
| 82 |
+ chmod 755 "${ED}"/opt/OBO-Edit2/* || die |
| 83 |
|
| 84 |
dodoc "${DISTDIR}"/ReleaseNotes-2.1.0.txt |
| 85 |
} |
| 86 |
|
| 87 |
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 |
| 88 |
index 0a3ca5d..4aa6496 100644 |
| 89 |
--- a/sci-biology/OBO-Edit/OBO-Edit-2.1.1.6.ebuild |
| 90 |
+++ b/sci-biology/OBO-Edit/OBO-Edit-2.1.1.6.ebuild |
| 91 |
@@ -1,10 +1,10 @@ |
| 92 |
-# Copyright 1999-2015 Gentoo Foundation |
| 93 |
+# Copyright 1999-2016 Gentoo Foundation |
| 94 |
# Distributed under the terms of the GNU General Public License v2 |
| 95 |
# $Id$ |
| 96 |
|
| 97 |
EAPI=5 |
| 98 |
|
| 99 |
-inherit toolchain-funcs versionator java-pkg-2 |
| 100 |
+inherit eutils toolchain-funcs versionator java-pkg-2 |
| 101 |
|
| 102 |
# MY_PV=$(replace_all_version_separators '-') |
| 103 |
MY_PV="oboedit_2_1_1-b6" |
| 104 |
@@ -14,8 +14,8 @@ MY_PV=$(replace_all_version_separators '-') |
| 105 |
DESCRIPTION="Java-based editor optimized for the OBO biological ontology file format" |
| 106 |
HOMEPAGE="http://www.oboedit.org/" |
| 107 |
SRC_URI=" |
| 108 |
- 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 |
| 109 |
- http://sourceforge.net/projects/geneontology/files/OBO-Edit%202%20%5BLatest%20versions%5D/"${MY_PV}"/ReleaseNotes-"${MY_VER}".txt -> "${PN}"_ReleaseNotes-"${PV}".txt" |
| 110 |
+ 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 |
| 111 |
+ http://sourceforge.net/projects/geneontology/files/OBO-Edit%202%20%5BLatest%20versions%5D/${MY_PV}/ReleaseNotes-${MY_VER}.txt -> ${PN}_ReleaseNotes-${PV}.txt" |
| 112 |
|
| 113 |
LICENSE="OBO-Edit" # Artistic-like |
| 114 |
SLOT="0" |
| 115 |
@@ -36,24 +36,26 @@ pkg_setup() { |
| 116 |
} |
| 117 |
|
| 118 |
src_prepare(){ |
| 119 |
- mkdir -p "${D}"/opt/OBO-Edit2/.install4j || die "Cannot pre-create "${D}"/opt/OBO-Edit2/.install4j/" |
| 120 |
- mkdir -p "${D}"/usr/bin |
| 121 |
+ dodir /opt/OBO-Edit2/.install4j /usr/bin |
| 122 |
|
| 123 |
# /var/tmp/portage/sci-biology/OBO-Edit-2.1.1.6/image//opt/OBO-Edit2/.install4j/response.varfile |
| 124 |
sed -e "s#\"\${D}\"#"${D}"#g" "${FILESDIR}"/response.varfile | \ |
| 125 |
sed -e "s#\"\${TMPDIR}\"#"${TMPDIR}"#g" | \ |
| 126 |
- sed -e "s@×××.symlinkDir=/usr/local/bin@#sys.symlinkDir=/usr/local/bin@" > \ |
| 127 |
- "${D}"/opt/OBO-Edit2/.install4j/response.varfile || die "sed failed" |
| 128 |
- cp -r "${D}"/opt/OBO-Edit2/.install4j "${TMPDIR}" |
| 129 |
+ sed -e "s@×××.symlinkDir=/usr/local/bin@#sys.symlinkDir=/usr/local/bin@" \ |
| 130 |
+ > "${D}"/opt/OBO-Edit2/.install4j/response.varfile || die "sed failed" |
| 131 |
+ cp -r "${D}"/opt/OBO-Edit2/.install4j "${TMPDIR}" || die |
| 132 |
|
| 133 |
# for user root install4j writes into /opt/icedtea-bin-7.2.0/jre/.systemPrefs or whatever it |
| 134 |
# found via JAVA_HOME or similar variables |
| 135 |
# for other users it writes into $HOME/.java/.userPrefs/ |
| 136 |
|
| 137 |
# trick setting -Djava.util.prefs.systemRoot="${TMPDIR}" does not work |
| 138 |
- sed -e "s@/bin/java\" -Dinstall4j.jvmDir=\"\$app_java_home\"@/bin/java\" -Duser.home="${TMPDIR}" -Dinstall4j.jvmDir="${TMPDIR}" -Dsys.symlinkDir="${D}"usr/bin -Djava.util.prefs.systemRoot="${TMPDIR}"@" -i "${DISTDIR}"/"${PN}"_unix_install4j-"${PV}".sh || die "failed to set userHome and jvmDir where JAVA .systemPrefs can be found" |
| 139 |
+ sed \ |
| 140 |
+ -e "s@/bin/java\" -Dinstall4j.jvmDir=\"\$app_java_home\"@/bin/java\" -Duser.home="${TMPDIR}" -Dinstall4j.jvmDir="${TMPDIR}" -Dsys.symlinkDir="${D}"usr/bin -Djava.util.prefs.systemRoot="${TMPDIR}"@" \ |
| 141 |
+ -i "${DISTDIR}"/"${PN}"_unix_install4j-"${PV}".sh \ |
| 142 |
+ || die "failed to set userHome and jvmDir where JAVA .systemPrefs can be found" |
| 143 |
|
| 144 |
- chmod u+rx "${DISTDIR}"/"${PN}"_unix_install4j-"${PV}".sh |
| 145 |
+ chmod u+rx "${DISTDIR}"/"${PN}"_unix_install4j-"${PV}".sh || die |
| 146 |
} |
| 147 |
|
| 148 |
src_install(){ |
| 149 |
@@ -62,12 +64,20 @@ src_install(){ |
| 150 |
# cat "${TMPDIR}"/.install4j/response.varfile |
| 151 |
# chmod a-w "${TMPDIR}"/.install4j/response.varfile |
| 152 |
|
| 153 |
- INSTALL4J_KEEP_TEMP="yes" HOME="${TMPDIR}" "${DISTDIR}"/"${PN}"_unix_install4j-"${PV}".sh -q --varfile="${TMPDIR}"/.install4j/response.varfile --destination="${D}"/opt/OBO-Edit2 -dir "${D}"/opt/OBO-Edit2 || die "Failed to run the self-extracting "${DISTDIR}"/"${PN}"_unix_install4j-"${PV}".sh file" |
| 154 |
- find . -name firstrun -delete |
| 155 |
- find . -name .svn -exec rm -rf '{}' \; |
| 156 |
+ INSTALL4J_KEEP_TEMP="yes" \ |
| 157 |
+ HOME="${TMPDIR}" \ |
| 158 |
+ sh "${DISTDIR}"/"${PN}"_unix_install4j-"${PV}".sh -q \ |
| 159 |
+ --varfile="${TMPDIR}"/.install4j/response.varfile \ |
| 160 |
+ --destination="${D}"/opt/OBO-Edit2 \ |
| 161 |
+ -dir "${D}"/opt/OBO-Edit2 \ |
| 162 |
+ || die "Failed to run the self-extracting ${DISTDIR}/${PN}_unix_install4j-${PV}.sh file" |
| 163 |
+ |
| 164 |
+ find . -name firstrun -delete || die |
| 165 |
+ |
| 166 |
+ esvn_clean |
| 167 |
|
| 168 |
dodoc "${DISTDIR}"/"${PN}"_ReleaseNotes-"${PV}".txt |
| 169 |
|
| 170 |
- echo "PATH=/opt/OBO-Edit2" > 99OBO-Edit |
| 171 |
- doenvd 99OBO-Edit || die |
| 172 |
+ echo "PATH=/opt/OBO-Edit2" > 99OBO-Edit || die |
| 173 |
+ doenvd 99OBO-Edit |
| 174 |
} |
| 175 |
|
| 176 |
diff --git a/sci-biology/OBO-Edit/metadata.xml b/sci-biology/OBO-Edit/metadata.xml |
| 177 |
index c0878bc..51e9384 100644 |
| 178 |
--- a/sci-biology/OBO-Edit/metadata.xml |
| 179 |
+++ b/sci-biology/OBO-Edit/metadata.xml |
| 180 |
@@ -1,4 +1,4 @@ |
| 181 |
-<?xml version='1.0' encoding='UTF-8'?> |
| 182 |
+<?xml version="1.0" encoding="UTF-8"?> |
| 183 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 184 |
<pkgmetadata> |
| 185 |
<herd>sci-biology</herd> |
Archives