public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-biology/OBO-Edit/
@ 2011-06-25 17:22 Justin Lecher
  0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2011-06-25 17:22 UTC (permalink / raw
  To: gentoo-commits

commit:     b2813a169c91df4b8682f1df1b734ded21559810
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 14:43:17 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 14:43:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b2813a16

Cleaned ebuild

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-biology/OBO-Edit/ChangeLog                 |    7 +++++++
 sci-biology/OBO-Edit/OBO-Edit-2.1_beta8.ebuild |   23 +++++++++++------------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/sci-biology/OBO-Edit/ChangeLog b/sci-biology/OBO-Edit/ChangeLog
new file mode 100644
index 0000000..e1de6ad
--- /dev/null
+++ b/sci-biology/OBO-Edit/ChangeLog
@@ -0,0 +1,7 @@
+# ChangeLog for sci-biology/OBO-Edit
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  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_beta8.ebuild b/sci-biology/OBO-Edit/OBO-Edit-2.1_beta8.ebuild
index debd89f..8842bcd 100644
--- a/sci-biology/OBO-Edit/OBO-Edit-2.1_beta8.ebuild
+++ b/sci-biology/OBO-Edit/OBO-Edit-2.1_beta8.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
+
+inherit rpm
 
 DESCRIPTION="Java-based editor optimized for the OBO biological ontology file format"
 HOMEPAGE="http://www.oboedit.org/"
@@ -15,19 +17,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="app-arch/rpm2targz"
-RDEPEND="${DEPEND}
-	virtual/jre"
+RDEPEND="virtual/jre"
 
-src_unpack() {
-	cd "${WORKDIR}"
-	rpm2targz "${DISTDIR}/oboedit_2_1_8_linux_install4j.rpm" || die
-	tar -xzf "${WORKDIR}/oboedit_2_1_8_linux_install4j.tar.gz" || die
-}
+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
-	mkdir -p "${D}"/opt/ || die
-	cp -rp opt/OBO-Edit2 "${D}"/opt/ || die
-	find "${D}"/opt -name firstrun | xargs rm -f # drop a world writable file
-	find "${D}"/opt -name .svn | xargs rm -rf
+	find . -name firstrun -delete
+	find . -name .svn -exec rm -rf '{}' \;
+
+	insinto /opt/
+	doins -r OBO-Edit2
+	chmod 755 "${ED}"/opt/OBO-Edit2/*
 }



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-biology/OBO-Edit/
@ 2012-02-07 23:39 Martin Mokrejs
  0 siblings, 0 replies; 9+ messages in thread
From: Martin Mokrejs @ 2012-02-07 23:39 UTC (permalink / raw
  To: gentoo-commits

commit:     4460fed762ecb06de03d210fd5f166e8a3ee8589
Author:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Tue Feb  7 13:04:52 2012 +0000
Commit:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Tue Feb  7 13:04:52 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4460fed7

sci-biology/OBO-Edit: more attempts to get rid of sandbox ACCESS VIOLATION SUMMARY errors

(Portage version: 2.1.10.45/git/Linux x86_64, unsigned Manifest commit)

---
 sci-biology/OBO-Edit/ChangeLog               |    5 +++++
 sci-biology/OBO-Edit/OBO-Edit-2.1.1.6.ebuild |    2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-biology/OBO-Edit/ChangeLog b/sci-biology/OBO-Edit/ChangeLog
index 1378d6b..cc089b2 100644
--- a/sci-biology/OBO-Edit/ChangeLog
+++ b/sci-biology/OBO-Edit/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Feb 2012; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
+  OBO-Edit-2.1.1.6.ebuild:
+  sci-biology/OBO-Edit: more attempts to get rid of sandbox ACCESS VIOLATION
+  SUMMARY errors
+
 *OBO-Edit-2.1.1.6 (07 Feb 2012)
 
   07 Feb 2012; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>

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 30d6980..0cdb743 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
@@ -27,7 +27,6 @@ RDEPEND="virtual/jre"
 S="${WORKDIR}"
 
 src_prepare(){
-	cd "${S}" || die
 	mkdir -p "${D}"/opt/OBO-Edit2/.install4j || die "Cannot pre-create "${D}"/opt/OBO-Edit2/.install4j/"
 	mkdir -p "${D}"/usr/bin
 
@@ -48,7 +47,6 @@ src_prepare(){
 }
 
 src_install(){
-	cd "${S}" || die
 	cat "${TMPDIR}"/.install4j/response.varfile
 	chmod a-w "${TMPDIR}"/.install4j/response.varfile
 	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"



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-biology/OBO-Edit/
@ 2012-02-07 23:39 Martin Mokrejs
  0 siblings, 0 replies; 9+ messages in thread
From: Martin Mokrejs @ 2012-02-07 23:39 UTC (permalink / raw
  To: gentoo-commits

commit:     8035fabe16e943270b922958ab72b0c1bd40e0a3
Author:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Tue Feb  7 13:33:03 2012 +0000
Commit:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Tue Feb  7 13:33:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8035fabe

added the addpredict() trick from tablet-bin*.ebuild to make the ACCESS DENIED messages quiet, bugs #402507 (learned from bug #387227)

(Portage version: 2.1.10.45/git/Linux x86_64, unsigned Manifest commit)

---
 sci-biology/OBO-Edit/ChangeLog               |    5 +++++
 sci-biology/OBO-Edit/OBO-Edit-2.1.1.6.ebuild |   12 +++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/sci-biology/OBO-Edit/ChangeLog b/sci-biology/OBO-Edit/ChangeLog
index 79c451d..abf523e 100644
--- a/sci-biology/OBO-Edit/ChangeLog
+++ b/sci-biology/OBO-Edit/ChangeLog
@@ -4,6 +4,11 @@
 
   07 Feb 2012; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
   OBO-Edit-2.1.1.6.ebuild:
+  added the addpredict() trick from tablet-bin*.ebuild to make the ACCESS DENIED
+  messages quiet, bugs #402507 (learned from bug #387227)
+
+  07 Feb 2012; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
+  OBO-Edit-2.1.1.6.ebuild:
   added the addpredict() trick from tablet-bin*.ebuild to make the ACCESS
   DENIED messages quiet, bugs #402507 (learned from bug #387227)
 

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 356f1bf..19c5de0 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
@@ -27,13 +27,11 @@ RDEPEND="virtual/jre"
 S="${WORKDIR}"
 
 pkg_setup() {
-        einfo "Fixing java access violations ..."
-        # learned from bug #387227
-
-		# opened a bug #402507 to get this .systemPrefs directory pre-created for everybody
-        addpredict /opt/icedtea-bin-7.2.0/jre/.systemPrefs
-		addpredict /usr/local/bin/OBO-Edit
-
+	einfo "Fixing java access violations ..."
+	# learned from bug #387227
+	# opened a bug #402507 to get this .systemPrefs directory pre-created for everybody
+	addpredict /opt/icedtea-bin-7.2.0/jre/.systemPrefs
+	addpredict /usr/local/bin/OBO-Edit
 }
 
 src_prepare(){



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-biology/OBO-Edit/
@ 2012-02-07 23:39 Martin Mokrejs
  0 siblings, 0 replies; 9+ messages in thread
From: Martin Mokrejs @ 2012-02-07 23:39 UTC (permalink / raw
  To: gentoo-commits

commit:     f187f9d3b00a6837e8a279b268e19694b3dfc714
Author:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Tue Feb  7 14:00:43 2012 +0000
Commit:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Tue Feb  7 14:00:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f187f9d3

adjust PATH to point to the installation place, few comment lines changes

(Portage version: 2.1.10.45/git/Linux x86_64, unsigned Manifest commit)

---
 sci-biology/OBO-Edit/ChangeLog               |    4 ++++
 sci-biology/OBO-Edit/OBO-Edit-2.1.1.6.ebuild |   11 ++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/sci-biology/OBO-Edit/ChangeLog b/sci-biology/OBO-Edit/ChangeLog
index abf523e..0632e05 100644
--- a/sci-biology/OBO-Edit/ChangeLog
+++ b/sci-biology/OBO-Edit/ChangeLog
@@ -4,6 +4,10 @@
 
   07 Feb 2012; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
   OBO-Edit-2.1.1.6.ebuild:
+  adjust PATH to point to the installation place, few comment lines changes
+
+  07 Feb 2012; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
+  OBO-Edit-2.1.1.6.ebuild:
   added the addpredict() trick from tablet-bin*.ebuild to make the ACCESS DENIED
   messages quiet, bugs #402507 (learned from bug #387227)
 

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 19c5de0..ec0e64f 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
@@ -53,15 +53,20 @@ src_prepare(){
 	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"
 
 	chmod u+rx "${DISTDIR}"/"${PN}"_unix_install4j-"${PV}".sh
-	grep Duser "${DISTDIR}"/"${PN}"_unix_install4j-"${PV}".sh
 }
 
 src_install(){
-	cat "${TMPDIR}"/.install4j/response.varfile
-	chmod a-w "${TMPDIR}"/.install4j/response.varfile
+	# it looks install4j removes the target installation direcotry before writing into it :((
+	#
+	# cat "${TMPDIR}"/.install4j/response.varfile
+	# chmod a-w "${TMPDIR}"/.install4j/response.varfile
+
 	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"
 	find . -name firstrun -delete
 	find . -name .svn -exec rm -rf '{}' \;
 
 	dodoc "${DISTDIR}"/"${PN}"_ReleaseNotes-"${PV}".txt
+
+	echo "PATH=/opt/OBO-Edit2" > 99OBO-Edit
+	doenvd 99OBO-Edit || die
 }



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-biology/OBO-Edit/
@ 2012-02-07 23:39 Martin Mokrejs
  0 siblings, 0 replies; 9+ messages in thread
From: Martin Mokrejs @ 2012-02-07 23:39 UTC (permalink / raw
  To: gentoo-commits

commit:     6c106f70850276424fe10db3a9d4acd3ddb2122e
Author:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Tue Feb  7 13:32:14 2012 +0000
Commit:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Tue Feb  7 13:32:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6c106f70

added the addpredict() trick from tablet-bin*.ebuild to make the ACCESS DENIED messages quiet, bugs #402507 (learned from bug #387227)

(Portage version: 2.1.10.45/git/Linux x86_64, unsigned Manifest commit)

---
 sci-biology/OBO-Edit/ChangeLog               |    5 +++++
 sci-biology/OBO-Edit/OBO-Edit-2.1.1.6.ebuild |   14 +++++++++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/sci-biology/OBO-Edit/ChangeLog b/sci-biology/OBO-Edit/ChangeLog
index cc089b2..79c451d 100644
--- a/sci-biology/OBO-Edit/ChangeLog
+++ b/sci-biology/OBO-Edit/ChangeLog
@@ -4,6 +4,11 @@
 
   07 Feb 2012; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
   OBO-Edit-2.1.1.6.ebuild:
+  added the addpredict() trick from tablet-bin*.ebuild to make the ACCESS
+  DENIED messages quiet, bugs #402507 (learned from bug #387227)
+
+  07 Feb 2012; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
+  OBO-Edit-2.1.1.6.ebuild:
   sci-biology/OBO-Edit: more attempts to get rid of sandbox ACCESS VIOLATION
   SUMMARY errors
 

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 0cdb743..356f1bf 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
@@ -26,6 +26,16 @@ RDEPEND="virtual/jre"
 
 S="${WORKDIR}"
 
+pkg_setup() {
+        einfo "Fixing java access violations ..."
+        # learned from bug #387227
+
+		# opened a bug #402507 to get this .systemPrefs directory pre-created for everybody
+        addpredict /opt/icedtea-bin-7.2.0/jre/.systemPrefs
+		addpredict /usr/local/bin/OBO-Edit
+
+}
+
 src_prepare(){
 	mkdir -p "${D}"/opt/OBO-Edit2/.install4j || die "Cannot pre-create "${D}"/opt/OBO-Edit2/.install4j/"
 	mkdir -p "${D}"/usr/bin
@@ -40,7 +50,9 @@ src_prepare(){
 	# for user root install4j writes into /opt/icedtea-bin-7.2.0/jre/.systemPrefs or whatever it
 	# found via JAVA_HOME or similar variables
 	# for other users it writes into $HOME/.java/.userPrefs/
-	sed -e "s@/bin/java\" -Dinstall4j.jvmDir=\"\$app_java_home\"@/bin/java\" -Duser.home="${TMPDIR}" -Dinstall4j.jvmDir="${TMPDIR}" -Dsys.symlinkDir="${D}"usr/bin@" -i "${DISTDIR}"/"${PN}"_unix_install4j-"${PV}".sh || die "failed to set userHome and jvmDir where JAVA .systemPrefs can be found"
+
+	# trick setting -Djava.util.prefs.systemRoot="${TMPDIR}" does not work
+	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"
 
 	chmod u+rx "${DISTDIR}"/"${PN}"_unix_install4j-"${PV}".sh
 	grep Duser "${DISTDIR}"/"${PN}"_unix_install4j-"${PV}".sh



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-biology/OBO-Edit/
@ 2015-09-23 12:48 Justin Lecher
  0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2015-09-23 12:48 UTC (permalink / raw
  To: gentoo-commits

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"


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-biology/OBO-Edit/
@ 2016-01-25  8:47 Justin Lecher
  0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2016-01-25  8:47 UTC (permalink / raw
  To: gentoo-commits

commit:     fd1926f50b2555db3d637c377223551e3415adf9
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 19:17:51 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 19:18:41 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=fd1926f5

sci-biology/OBO-Edit: Use ecvs_clean to clean workdir

* add missing die
* Fix quoting

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

 sci-biology/OBO-Edit/OBO-Edit-2.1.0.ebuild   | 35 +++++++++++++++--------
 sci-biology/OBO-Edit/OBO-Edit-2.1.1.6.ebuild | 42 +++++++++++++++++-----------
 sci-biology/OBO-Edit/metadata.xml            |  2 +-
 3 files changed, 51 insertions(+), 28 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 f5d9948..c1b900a 100644
--- a/sci-biology/OBO-Edit/OBO-Edit-2.1.0.ebuild
+++ b/sci-biology/OBO-Edit/OBO-Edit-2.1.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-inherit toolchain-funcs versionator java-pkg-2
+inherit eutils 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"
+	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"
@@ -25,17 +25,30 @@ 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"
+	dodir /opt/OBO-Edit2/.install4j
+
+	sed \
+		-e "s#\"\${D}\"#"${D}"#g" \
+		"${FILESDIR}"/response.varfile \
+		> "${D}"/opt/OBO-Edit2/.install4j/response.varfile || die "sed failed"
+
+	sed \
+		-e "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 || die
-	find . -name .svn -exec rm -rf '{}' \; || die
+
+	esvn_clean
 
 	insinto /opt/
 	doins -r OBO-Edit2
-	chmod 755 "${ED}"/opt/OBO-Edit2/*
+	chmod 755 "${ED}"/opt/OBO-Edit2/* || die
 
 	dodoc "${DISTDIR}"/ReleaseNotes-2.1.0.txt
 }

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 0a3ca5d..4aa6496 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,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-inherit toolchain-funcs versionator java-pkg-2
+inherit eutils toolchain-funcs versionator java-pkg-2
 
 # MY_PV=$(replace_all_version_separators '-')
 MY_PV="oboedit_2_1_1-b6"
@@ -14,8 +14,8 @@ 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"
+	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"
@@ -36,24 +36,26 @@ pkg_setup() {
 }
 
 src_prepare(){
-	mkdir -p "${D}"/opt/OBO-Edit2/.install4j || die "Cannot pre-create "${D}"/opt/OBO-Edit2/.install4j/"
-	mkdir -p "${D}"/usr/bin
+	dodir /opt/OBO-Edit2/.install4j /usr/bin
 
 	# /var/tmp/portage/sci-biology/OBO-Edit-2.1.1.6/image//opt/OBO-Edit2/.install4j/response.varfile
 	sed -e "s#\"\${D}\"#"${D}"#g" "${FILESDIR}"/response.varfile | \
 	sed -e "s#\"\${TMPDIR}\"#"${TMPDIR}"#g" | \
-	sed -e "s@sys.symlinkDir=/usr/local/bin@#sys.symlinkDir=/usr/local/bin@" > \
-								"${D}"/opt/OBO-Edit2/.install4j/response.varfile || die "sed failed"
-	cp -r "${D}"/opt/OBO-Edit2/.install4j "${TMPDIR}"
+	sed -e "s@sys.symlinkDir=/usr/local/bin@#sys.symlinkDir=/usr/local/bin@" \
+	> "${D}"/opt/OBO-Edit2/.install4j/response.varfile || die "sed failed"
+	cp -r "${D}"/opt/OBO-Edit2/.install4j "${TMPDIR}" || die
 
 	# for user root install4j writes into /opt/icedtea-bin-7.2.0/jre/.systemPrefs or whatever it
 	# found via JAVA_HOME or similar variables
 	# for other users it writes into $HOME/.java/.userPrefs/
 
 	# trick setting -Djava.util.prefs.systemRoot="${TMPDIR}" does not work
-	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"
+	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"
 
-	chmod u+rx "${DISTDIR}"/"${PN}"_unix_install4j-"${PV}".sh
+	chmod u+rx "${DISTDIR}"/"${PN}"_unix_install4j-"${PV}".sh || die
 }
 
 src_install(){
@@ -62,12 +64,20 @@ src_install(){
 	# cat "${TMPDIR}"/.install4j/response.varfile
 	# chmod a-w "${TMPDIR}"/.install4j/response.varfile
 
-	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"
-	find . -name firstrun -delete
-	find . -name .svn -exec rm -rf '{}' \;
+	INSTALL4J_KEEP_TEMP="yes" \
+		HOME="${TMPDIR}" \
+		sh "${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"
+
+	find . -name firstrun -delete || die
+
+	esvn_clean
 
 	dodoc "${DISTDIR}"/"${PN}"_ReleaseNotes-"${PV}".txt
 
-	echo "PATH=/opt/OBO-Edit2" > 99OBO-Edit
-	doenvd 99OBO-Edit || die
+	echo "PATH=/opt/OBO-Edit2" > 99OBO-Edit || die
+	doenvd 99OBO-Edit
 }

diff --git a/sci-biology/OBO-Edit/metadata.xml b/sci-biology/OBO-Edit/metadata.xml
index c0878bc..51e9384 100644
--- a/sci-biology/OBO-Edit/metadata.xml
+++ b/sci-biology/OBO-Edit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-biology</herd>


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-biology/OBO-Edit/
@ 2021-01-19 10:49 Andrew Ammerlaan
  0 siblings, 0 replies; 9+ messages in thread
From: Andrew Ammerlaan @ 2021-01-19 10:49 UTC (permalink / raw
  To: gentoo-commits

commit:     23642c854860b7c0ba17a2304c25c3862594dfae
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue Jan 19 10:49:35 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Jan 19 10:49:35 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=23642c85

sci-biology/OBO-Edit: add missing slash

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sci-biology/OBO-Edit/OBO-Edit-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-biology/OBO-Edit/OBO-Edit-2.3.1.ebuild b/sci-biology/OBO-Edit/OBO-Edit-2.3.1.ebuild
index 29550a0fc..d4d09a644 100644
--- a/sci-biology/OBO-Edit/OBO-Edit-2.3.1.ebuild
+++ b/sci-biology/OBO-Edit/OBO-Edit-2.3.1.ebuild
@@ -46,7 +46,7 @@ src_prepare(){
 
 	# trick setting -Djava.util.prefs.systemRoot="${TMPDIR}" does not work
 	sed \
-		-e "s@/bin/java\" -Dinstall4j.jvmDir=\"\$app_java_home\"@/bin/java\" -Duser.home="${HOME}" -Dinstall4j.jvmDir="${HOME}" -Dsys.symlinkDir="${D}"usr/bin -Djava.util.prefs.systemRoot="${HOME}"@" \
+		-e "s@/bin/java\" -Dinstall4j.jvmDir=\"\$app_java_home\"@/bin/java\" -Duser.home="${HOME}" -Dinstall4j.jvmDir="${HOME}" -Dsys.symlinkDir=${D}/usr/bin -Djava.util.prefs.systemRoot="${HOME}"@" \
 		-i "${WORKDIR}"/"${PN}"_unix_install4j-"${PV}".sh \
 		|| die "failed to set userHome and jvmDir where JAVA .systemPrefs can be found"
 


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-biology/OBO-Edit/
@ 2021-01-19 11:26 Andrew Ammerlaan
  0 siblings, 0 replies; 9+ messages in thread
From: Andrew Ammerlaan @ 2021-01-19 11:26 UTC (permalink / raw
  To: gentoo-commits

commit:     d715e025c5c353fbe8c3cb186194357198ac1ac8
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue Jan 19 11:26:17 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Jan 19 11:26:17 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d715e025

sci-biology/OBO-Edit: quote unqouted variable

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sci-biology/OBO-Edit/OBO-Edit-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-biology/OBO-Edit/OBO-Edit-2.3.1.ebuild b/sci-biology/OBO-Edit/OBO-Edit-2.3.1.ebuild
index d4d09a644..3af0ec3b3 100644
--- a/sci-biology/OBO-Edit/OBO-Edit-2.3.1.ebuild
+++ b/sci-biology/OBO-Edit/OBO-Edit-2.3.1.ebuild
@@ -46,7 +46,7 @@ src_prepare(){
 
 	# trick setting -Djava.util.prefs.systemRoot="${TMPDIR}" does not work
 	sed \
-		-e "s@/bin/java\" -Dinstall4j.jvmDir=\"\$app_java_home\"@/bin/java\" -Duser.home="${HOME}" -Dinstall4j.jvmDir="${HOME}" -Dsys.symlinkDir=${D}/usr/bin -Djava.util.prefs.systemRoot="${HOME}"@" \
+		-e "s@/bin/java\" -Dinstall4j.jvmDir=\"\$app_java_home\"@/bin/java\" -Duser.home="${HOME}" -Dinstall4j.jvmDir="${HOME}" -Dsys.symlinkDir="${D}"/usr/bin -Djava.util.prefs.systemRoot="${HOME}"@" \
 		-i "${WORKDIR}"/"${PN}"_unix_install4j-"${PV}".sh \
 		|| die "failed to set userHome and jvmDir where JAVA .systemPrefs can be found"
 


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2021-01-19 11:26 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-19 11:26 [gentoo-commits] proj/sci:master commit in: sci-biology/OBO-Edit/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2021-01-19 10:49 Andrew Ammerlaan
2016-01-25  8:47 Justin Lecher
2015-09-23 12:48 Justin Lecher
2012-02-07 23:39 Martin Mokrejs
2012-02-07 23:39 Martin Mokrejs
2012-02-07 23:39 Martin Mokrejs
2012-02-07 23:39 Martin Mokrejs
2011-06-25 17:22 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox