Restore patch that is still needed.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-java/jamvm/ChangeLog b/dev-java/jamvm/ChangeLog
index edd2ad2d2417ce937d90b5aa5ebcdec774110f94..d38e72eddb5e553353d3f44168de22c9fcc5bc5b 100644 (file)
--- 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/Manifest b/dev-java/jamvm/Manifest
index 890d9c2a378c1430c0e74fc13e03ae77e33c0c0e..462f2a7a8f1aa9024c423f877c6ec7603b382da5 100644 (file)
--- a/dev-java/jamvm/Manifest
+++ b/dev-java/jamvm/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX classes-location.patch 1184 RMD160 7ab849c181808d61bba64ed1a98a575ac14da4fd SHA1 632e5a2785435e95da534ea1c8a0d75004016083 SHA256 c973ef294f31c2937a55d5f683dc3ee2623877439b777093663e4f6367a791b1
 AUX jamvm-1.5.4-r1.env 353 RMD160 a9af0011b56fbb64ca9693c4a8b40fe03f851e6b SHA1 aa3300ba5d45cf0e95e943dca1069be0b85d60d1 SHA256 d4efccfae8d232ae923b41f5f8d547141751975e4b9506243f433fdde6fb8668
 DIST jamvm-1.5.4.tar.gz 656283 RMD160 7aa2a3d28c0d953c0d0048a3f8c48dc274ae10a0 SHA1 26863c78d5b0dfcc1a1492d24af58d192831b510 SHA256 7865693698bc4322cabe1014a4b7ebdec1bc1daf45f1a4457b6e908a4446b124
 EBUILD jamvm-1.5.4-r1.ebuild 2728 RMD160 f1ed2ced1bb0f989376220fb0b717fb8de658135 SHA1 71837be968863b47399753b0f0f3a3122b35d101 SHA256 3ac5c49552213cb434a5c6b12038e35e63076291543e44b19bef3c3350146d4b
-MISC ChangeLog 6699 RMD160 857f6c2e7612e2df26583e8b2ab0dad5188c6bbc SHA1 9ac11562a22ebd332d40c7b49410f0d13aeb9d39 SHA256 55796e17cadb9e93255014952f0f3e5f7fd7181c4eaf40b4d7b53bce1f8bed8a
+MISC ChangeLog 6830 RMD160 69820ee713fcca1e773026a37bbc22184e129ae4 SHA1 f736c526c9be9f9a46e97ce68592077f9f910d47 SHA256 ace3a8b14c899e84d0b3bfd2bc3a4df6f6a489efdca0bacfdbb8792919e55f0c
 MISC metadata.xml 250 RMD160 768ed9ef97f57c25c39ed3bd46a88b44e104526e SHA1 ec1919e99fc0395f90a0aff91ce77bf13c95d399 SHA256 380eb6d01f833fe0077b518b8f4b9230baf88fa61463de48ff6c672755edd442
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkw1Uo8ACgkQAiZjviIA2XiyUgCcDo3iVqwZpu207+1q3tC+6U6I
+/V4An1M6U74hvNwsaBAecY6PbLgdd5dj
+=5vxB
+-----END PGP SIGNATURE-----

diff --git a/dev-java/jamvm/files/classes-location.patch b/dev-java/jamvm/files/classes-location.patch
new file mode 100644 (file)
index 0000000..57d046a
--- /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
+