diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-01-16 23:34:29 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-01-16 23:34:29 +0000 |
commit | bcf20da9ec99f44f866d627e50634696d663dd19 (patch) | |
tree | 1d1ce35030521e9dc9c9bae376cb96904c0b4967 /dev-java | |
parent | Revision bump, install the shared object with the stub library as well, other... (diff) | |
download | gentoo-2-bcf20da9ec99f44f866d627e50634696d663dd19.tar.gz gentoo-2-bcf20da9ec99f44f866d627e50634696d663dd19.tar.bz2 gentoo-2-bcf20da9ec99f44f866d627e50634696d663dd19.zip |
Improve unbundled jar workings, make jffi and jna working as intended. Drop ppc keyword so that proper keywording request can be filed. Take co-maintainership with ruby team.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/jruby/ChangeLog | 12 | ||||
-rw-r--r-- | dev-java/jruby/files/jruby-1.4.0-system-jars.patch | 101 | ||||
-rw-r--r-- | dev-java/jruby/files/jruby-1.4.0-system-nailgun.patch | 18 | ||||
-rw-r--r-- | dev-java/jruby/jruby-1.4.0-r3.ebuild (renamed from dev-java/jruby/jruby-1.4.0-r2.ebuild) | 8 | ||||
-rw-r--r-- | dev-java/jruby/metadata.xml | 1 |
5 files changed, 117 insertions, 23 deletions
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog index 6c7070b9c4fb..f44c8bb485fa 100644 --- a/dev-java/jruby/ChangeLog +++ b/dev-java/jruby/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for dev-java/jruby # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.49 2010/01/16 21:14:07 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.50 2010/01/16 23:34:28 flameeyes Exp $ + +*jruby-1.4.0-r3 (16 Jan 2010) + + 16 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org> + -jruby-1.4.0-r2.ebuild, +jruby-1.4.0-r3.ebuild, + +files/jruby-1.4.0-system-jars.patch, + -files/jruby-1.4.0-system-nailgun.patch, metadata.xml: + Improve unbundled jar workings, make jffi and jna working as intended. + Drop ppc keyword so that proper keywording request can be filed. Take + co-maintainership with ruby team. *jruby-1.4.0-r2 (16 Jan 2010) diff --git a/dev-java/jruby/files/jruby-1.4.0-system-jars.patch b/dev-java/jruby/files/jruby-1.4.0-system-jars.patch new file mode 100644 index 000000000000..ae0f4b278199 --- /dev/null +++ b/dev-java/jruby/files/jruby-1.4.0-system-jars.patch @@ -0,0 +1,101 @@ +Index: jruby-1.4.0/bin/jruby +=================================================================== +--- jruby-1.4.0.orig/bin/jruby ++++ jruby-1.4.0/bin/jruby +@@ -19,16 +19,6 @@ case "`uname`" in + Darwin) darwin=true;; + esac + +-# +-# Figure out the OS and cpu the same as JNA would, so the library path can be set +-# +-case "`uname -m`" in +- i[34567]86) JNA_CPU=i386; JNA_ALT_CPU=amd64;; +- i86pc) JNA_CPU="x86"; JNA_ALT_CPU=amd64;; +- amd64|x86_64) JNA_CPU=amd64; JNA_ALT_CPU=i386;; +- sparc*) JNA_CPU=sparc; JNA_ALT_CPU=sparcv9;; +-esac +- + # ----- Verify and Set Required Environment Variables ------------------------- + + ## resolve links - $0 may be a link to home +@@ -49,12 +39,17 @@ while [ -h "$PRG" ] ; do + fi + done + +-JRUBY_HOME_1=`dirname "$PRG"` # the ./bin dir +-if [ "$JRUBY_HOME_1" = '.' ] ; then +- cwd=`pwd` +- JRUBY_HOME=`dirname $cwd` # JRUBY-2699 +-else +- JRUBY_HOME=`dirname "$JRUBY_HOME_1"` # the . dir ++# This will be filled in by the ebuild after install ++JRUBY_HOME= ++ ++if [ -z "$JRUBY_HOME" ]; then ++ JRUBY_HOME_1=`dirname "$PRG"` # the ./bin dir ++ if [ "$JRUBY_HOME_1" = '.' ] ; then ++ cwd=`pwd` ++ JRUBY_HOME=`dirname $cwd` # JRUBY-2699 ++ else ++ JRUBY_HOME=`dirname "$JRUBY_HOME_1"` # the . dir ++ fi + fi + + if [ -z "$JRUBY_OPTS" ] ; then +@@ -122,14 +117,7 @@ if [ "$JRUBY_PARENT_CLASSPATH" != "" ]; + # Use same classpath propagated from parent jruby + CP=$JRUBY_PARENT_CLASSPATH + else +- # add other jars in lib to CP for command-line execution +- for j in "$JRUBY_HOME"/lib/*.jar; do +- if [ "$CP" ]; then +- CP="$CP$CP_DELIMITER$j" +- else +- CP="$j" +- fi +- done ++ CP=$(java-config -d -p jruby) + + if $cygwin; then + CP=`cygpath -p -w "$CP"` +@@ -270,23 +258,9 @@ ruby_args=("${ruby_args[@]}" "$@") + set -- "${ruby_args[@]}" + + JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_STACK" +-JNA_OS="`uname -s | tr '[:upper:]' '[:lower:]'`" +-case "$JNA_OS" in +-darwin) JNA_PATH="$JRUBY_HOME/lib/native/darwin";; +- *) JNA_PATH="$JRUBY_HOME/lib/native/${JNA_OS}-${JNA_CPU}:$JRUBY_HOME/lib/native/${JNA_OS}-${JNA_ALT_CPU}";; +-esac +-#JAVA_OPTS="$JAVA_OPTS -Djna.boot.library.path=$JNA_PATH" +-JAVA_JNA="-Djna.boot.library.path=$JNA_PATH" ++JAVA_JNA="-Djna.boot.library.path=$(java-config -i jna)" + +-JFFI_BOOT="" +-for d in $JRUBY_HOME/lib/native/*`uname -s`; do +- if [ -z "$JFFI_BOOT" ]; then +- JFFI_BOOT="$d" +- else +- JFFI_BOOT="$JFFI_BOOT:$d" +- fi +-done +-JFFI_OPTS="-Djffi.boot.library.path=$JFFI_BOOT" ++JFFI_OPTS="-Djffi.boot.library.path=$(java-config -i jffi-0.4)" + + if $cygwin; then + JRUBY_HOME=`cygpath --mixed "$JRUBY_HOME"` +@@ -308,12 +282,7 @@ if $cygwin; then + fi + + if [ "$nailgun_client" != "" ]; then +- if [ -f $JRUBY_HOME/tool/nailgun/ng ]; then +- exec $JRUBY_HOME/tool/nailgun/ng org.jruby.util.NailMain $JRUBY_OPTS "$@" +- else +- echo "error: ng executable not found; run 'make' in ${JRUBY_HOME}/tool/nailgun" +- exit 1 +- fi ++ exec /usr/bin/ng org.jruby.util.NailMain $JRUBY_OPTS "$@" + else + if [ "$VERIFY_JRUBY" != "" ]; then + if [ "$PROFILE_ARGS" != "" ]; then diff --git a/dev-java/jruby/files/jruby-1.4.0-system-nailgun.patch b/dev-java/jruby/files/jruby-1.4.0-system-nailgun.patch deleted file mode 100644 index f8fef66fd823..000000000000 --- a/dev-java/jruby/files/jruby-1.4.0-system-nailgun.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: jruby-1.4.0/bin/jruby -=================================================================== ---- jruby-1.4.0.orig/bin/jruby -+++ jruby-1.4.0/bin/jruby -@@ -308,12 +308,7 @@ if $cygwin; then - fi - - if [ "$nailgun_client" != "" ]; then -- if [ -f $JRUBY_HOME/tool/nailgun/ng ]; then -- exec $JRUBY_HOME/tool/nailgun/ng org.jruby.util.NailMain $JRUBY_OPTS "$@" -- else -- echo "error: ng executable not found; run 'make' in ${JRUBY_HOME}/tool/nailgun" -- exit 1 -- fi -+ exec /usr/bin/ng org.jruby.util.NailMain $JRUBY_OPTS "$@" - else - if [ "$VERIFY_JRUBY" != "" ]; then - if [ "$PROFILE_ARGS" != "" ]; then diff --git a/dev-java/jruby/jruby-1.4.0-r2.ebuild b/dev-java/jruby/jruby-1.4.0-r3.ebuild index e86f875ed017..8492ce0bc3f8 100644 --- a/dev-java/jruby/jruby-1.4.0-r2.ebuild +++ b/dev-java/jruby/jruby-1.4.0-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.4.0-r2.ebuild,v 1.1 2010/01/16 21:14:07 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.4.0-r3.ebuild,v 1.1 2010/01/16 23:34:28 flameeyes Exp $ EAPI="2" JAVA_PKG_IUSE="doc source test" @@ -13,7 +13,7 @@ HOMEPAGE="http://jruby.codehaus.org/" SRC_URI="http://jruby.kenai.com/downloads/${PV}/${PN}-src-${MY_PV}.tar.gz" LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~x86" IUSE="bsf java6 ssl" CDEPEND=">=dev-java/bytelist-1.0.2:0 @@ -24,7 +24,7 @@ CDEPEND=">=dev-java/bytelist-1.0.2:0 >=dev-java/jvyamlb-0.2.5:0 >=dev-java/asm-3.2:3 dev-java/jcodings:0 - dev-java/jffi:0.4 + >=dev-java/jffi-0.6.0.2-r1:0.4 dev-java/jna:0 dev-java/joda-time:0 dev-util/jay:0[java] @@ -97,7 +97,7 @@ pkg_setup() { java_prepare() { epatch "${FILESDIR}/ftype-test-fixes.patch" epatch "${FILESDIR}/user-test-fixes.patch" - epatch "${FILESDIR}"/${P}-system-nailgun.patch + epatch "${FILESDIR}"/${P}-system-jars.patch # We don't need to use Retroweaver. There is a jarjar and a regular jar # target but even with jarjarclean, both are a pain. The latter target diff --git a/dev-java/jruby/metadata.xml b/dev-java/jruby/metadata.xml index 250f2d1940ea..0b153778e653 100644 --- a/dev-java/jruby/metadata.xml +++ b/dev-java/jruby/metadata.xml @@ -2,4 +2,5 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>java</herd> + <herd>ruby</herd> </pkgmetadata> |