diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-07-08 04:22:28 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-07-08 04:22:28 +0000 |
| commit | e9a99754932965f45c2c8dc54e4f89c707ecdadf (patch) | |
| tree | 69bfc8e2890e74e432dffde22c12a344ad6bd9ae /dev-java/jamvm | |
| parent | Implement the merge of USE based dependencies as was listed in TODO. (diff) | |
| download | gentoo-2-e9a99754932965f45c2c8dc54e4f89c707ecdadf.tar.gz gentoo-2-e9a99754932965f45c2c8dc54e4f89c707ecdadf.tar.bz2 gentoo-2-e9a99754932965f45c2c8dc54e4f89c707ecdadf.zip | |
Restore patch that is still needed.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/jamvm')
| -rw-r--r-- | dev-java/jamvm/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/jamvm/files/classes-location.patch | 27 |
2 files changed, 32 insertions, 1 deletions
diff --git a/dev-java/jamvm/ChangeLog b/dev-java/jamvm/ChangeLog index edd2ad2d2417..d38e72eddb5e 100644 --- a/dev-java/jamvm/ChangeLog +++ b/dev-java/jamvm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/jamvm # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.45 2010/07/06 19:22:55 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.46 2010/07/08 04:22:28 flameeyes Exp $ + + 08 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org> + +files/classes-location.patch: + Restore patch that is still needed. 06 Jul 2010; Vlastimil Babka <caster@gentoo.org> -jamvm-1.4.2.ebuild, -jamvm-1.5.0-r3.ebuild, -files/jamvm-1.5.0.env, -jamvm-1.5.4.ebuild, diff --git a/dev-java/jamvm/files/classes-location.patch b/dev-java/jamvm/files/classes-location.patch new file mode 100644 index 000000000000..57d046a81882 --- /dev/null +++ b/dev-java/jamvm/files/classes-location.patch @@ -0,0 +1,27 @@ +diff -ur jamvm-1.5.0.old/configure.ac jamvm-1.5.0/configure.ac +--- jamvm-1.5.0.old/configure.ac 2008-03-03 17:31:46.000000000 +0200 ++++ jamvm-1.5.0/configure.ac 2008-03-03 17:36:14.000000000 +0200 +@@ -208,6 +208,7 @@ + install_dir=$prefix + fi + AC_DEFINE_UNQUOTED(INSTALL_DIR, "$install_dir", [Installation directory (prefix)]) ++AC_DEFINE_UNQUOTED(PKGDATADIR, "$datadir/$PACKAGE", [Package data directory (pkgdatadir)]) + + AC_ARG_ENABLE(zip, + [AS_HELP_STRING(--disable-zip,turn-off zip support in the bootstrap loader)],,) +diff -ur jamvm-1.5.0.old/src/class.h jamvm-1.5.0/src/class.h +--- jamvm-1.5.0.old/src/class.h 2008-03-03 17:31:46.000000000 +0200 ++++ jamvm-1.5.0/src/class.h 2008-03-03 17:36:51.000000000 +0200 +@@ -39,10 +39,10 @@ + separate class files in a directory structure */ + + #ifdef USE_ZIP +-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip" ++#define JAMVM_CLASSES PKGDATADIR"/classes.zip" + #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip" + #else +-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes" ++#define JAMVM_CLASSES PKGDATADIR"/classes" + #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath" + #endif + |