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 | 8813e3dafd4c5d47a13caf35b22f6d4be96089d6 (patch) | |
| tree | c1de0f2eebf7a7454e13ce7f1c572c10894716ac /dev-java | |
| parent | Stable for HPPA (bug #208536). (diff) | |
| download | historical-8813e3dafd4c5d47a13caf35b22f6d4be96089d6.tar.gz historical-8813e3dafd4c5d47a13caf35b22f6d4be96089d6.tar.bz2 historical-8813e3dafd4c5d47a13caf35b22f6d4be96089d6.zip | |
updated string quoting and cleaned up shell syntax
Package-Manager: portage-2.1.4.1
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/rjava/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/rjava/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/rjava/rjava-0.5.1.ebuild | 15 |
3 files changed, 16 insertions, 11 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/Manifest b/dev-java/rjava/Manifest index 467d05e016c6..ac109d65967b 100644 --- a/dev-java/rjava/Manifest +++ b/dev-java/rjava/Manifest @@ -1,4 +1,4 @@ DIST rJava_0.5-1.tar.gz 226783 RMD160 354f7752a547b0ac24cf535c3e09579b266cc6c9 SHA1 22c8a068cda394b72216309a7e0a0c51757517ad SHA256 dc46959b52b9014d05d2f7ce101984124c0cb51190adfb4b65454846a0914c59 -EBUILD rjava-0.5.1.ebuild 3806 RMD160 73b42cde50cfce7756578012f21c54d45c5ab6e0 SHA1 d43891d360bc08966ad71aa73ca9257e85448479 SHA256 c3d256b168e7be0b6585128949341b80b996a28dcfc7b4da2e26838dc39d4a12 -MISC ChangeLog 522 RMD160 0e57ea5509ac66dc3db92970c475a0cc1db742b1 SHA1 9d0a2fee90cd0c92dce7914b2421ab8aadc922e9 SHA256 425936e8149380bdf2332675a04b80ded48f5934a6a25647109b0ecab0738421 +EBUILD rjava-0.5.1.ebuild 3851 RMD160 f1460f9c6c35817a63356cdf91eeb44674b9874a SHA1 ffbd6f6c5084c8ad41ae67957956d90fec1092f0 SHA256 eff98ea738f22e041a870b0b86b69f968c1c29a6b19f8affe9d9c51e1e281ebe +MISC ChangeLog 683 RMD160 aa5c5c084babffd82ff43f4ee01354f6056fe9ed SHA1 7f481cc4046ad2f91ce0f8f3699e664a2702ffee SHA256 effb8d07d3d20ccccbe44285657445d4c7f2cd695193d044b0a91384af3ee363 MISC metadata.xml 608 RMD160 98a89fdf94e409c22893cc19e3700c8330d57688 SHA1 b0d1e7475373d57d0c7a96c327fbaf7eeea8d40f SHA256 73860a49b7c97e5788449dee0a53688a5235bb364a7b42a7a104231e549890ff 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 |