diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2008-02-04 03:41:10 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2008-02-04 03:41:10 +0000 |
| commit | 92d5252758a28f9adbd9a3735266f292289c31a4 (patch) | |
| tree | 38ce54daa337e71729f2e2a3988f1426eb025248 /dev-java/rjava | |
| parent | Stable for HPPA (bug #208536). (diff) | |
| download | gentoo-2-92d5252758a28f9adbd9a3735266f292289c31a4.tar.gz gentoo-2-92d5252758a28f9adbd9a3735266f292289c31a4.tar.bz2 gentoo-2-92d5252758a28f9adbd9a3735266f292289c31a4.zip | |
updated string quoting and cleaned up shell syntax
(Portage version: 2.1.4.1)
Diffstat (limited to 'dev-java/rjava')
| -rw-r--r-- | dev-java/rjava/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/rjava/rjava-0.5.1.ebuild | 15 |
2 files changed, 14 insertions, 9 deletions
diff --git a/dev-java/rjava/ChangeLog b/dev-java/rjava/ChangeLog index 4858c659b20d..540815555335 100644 --- a/dev-java/rjava/ChangeLog +++ b/dev-java/rjava/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/rjava -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/rjava/ChangeLog,v 1.1 2007/10/01 04:42:43 nerdboy Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/rjava/ChangeLog,v 1.2 2008/02/04 03:41:10 nerdboy Exp $ + + 04 Feb 2008; Steve Arnold <nerdboy@gentoo.org> rjava-0.5.1.ebuild: + Updated string quoting and cleaned up shell syntax; note emake does *not* + work here... *rjava-0.5.1 (01 Oct 2007) diff --git a/dev-java/rjava/rjava-0.5.1.ebuild b/dev-java/rjava/rjava-0.5.1.ebuild index 76d5b3bbca4d..8d94660c1270 100644 --- a/dev-java/rjava/rjava-0.5.1.ebuild +++ b/dev-java/rjava/rjava-0.5.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/rjava/rjava-0.5.1.ebuild,v 1.1 2007/10/01 04:42:43 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/rjava/rjava-0.5.1.ebuild,v 1.2 2008/02/04 03:41:10 nerdboy Exp $ JAVA_PKG_IUSE="examples" @@ -50,7 +50,7 @@ src_compile() { # use R's check command to test package (really needs to come before # the src_compile section) if has test ${FEATURES}; then - cd ${WORKDIR} + cd "${WORKDIR}" R CMD check ${MY_PN} fi @@ -58,16 +58,17 @@ src_compile() { local my_conf="--enable-jri" econf ${my_conf} || die "econf failed" cd src/ + # emake bombs here make -f Makevars all || die "make failed" } src_install() { export R_LIBS_SITE="${R_HOME}/site-library" keepdir ${R_LIBS_SITE} - cd ${WORKDIR} + cd "${WORKDIR}" R CMD INSTALL --no-configure -l "${D}${R_LIBS_SITE}" ${MY_PN} \ || die "install failed" - cd ${S} + cd "${S}" local jri_dir="/usr/$(get_libdir)/jri" java-pkg_jarinto ${jri_dir} @@ -75,7 +76,7 @@ src_install() { insinto ${jri_dir} insopts -m0755 - doins inst/jri/libjri.so + doins inst/jri/libjri.so || die "libjri install failed" java-pkg_regso "${D}${jri_dir}/libjri.so" echo "R_HOME=${R_HOME}">25rjava @@ -97,7 +98,7 @@ setup-jvm-opts() { # stolen from eclipse-sdk ebuild local bp="$(java-config --jdk-home)/jre/lib" local bootclasspath=$(java-config --runtime) - if [[ ! -z "`java-config --java-version | grep IBM`" ]] ; then + if java-config --java-version | grep -q IBM ; then # IBM JDK JAVA_LIB_DIR="$(java-config --jdk-home)/jre/bin" else |