dev-java/jamvm: Sort out patch naming convention. Fixes bug 563988.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

6 files changed, 27 insertions, 0 deletions

diff --git a/dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch b/dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch
new file mode 100644
index 000000000000..57d046a81882
--- /dev/null
+++ b/dev-java/jamvm/files/jamvm-1.5.4-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
+ 
diff --git a/dev-java/jamvm/files/jamvm-1.5.4-r2.env b/dev-java/jamvm/files/jamvm-1.5.4-env.file
index 85c551eb63d3..85c551eb63d3 100644
--- a/dev-java/jamvm/files/jamvm-1.5.4-r2.env
+++ b/dev-java/jamvm/files/jamvm-1.5.4-env.file
diff --git a/dev-java/jamvm/files/classes-location.patch b/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch
index 6cf7611f1f35..6cf7611f1f35 100644
--- a/dev-java/jamvm/files/classes-location.patch
+++ b/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch
diff --git a/dev-java/jamvm/files/jamvm.env b/dev-java/jamvm/files/jamvm-2.0.0-env.file
index 5eee6a9e0f39..5eee6a9e0f39 100644
--- a/dev-java/jamvm/files/jamvm.env
+++ b/dev-java/jamvm/files/jamvm-2.0.0-env.file
diff --git a/dev-java/jamvm/files/javac.in b/dev-java/jamvm/files/jamvm-2.0.0-javac.in
index 8eeda68c7a5e..8eeda68c7a5e 100644
--- a/dev-java/jamvm/files/javac.in
+++ b/dev-java/jamvm/files/jamvm-2.0.0-javac.in
diff --git a/dev-java/jamvm/files/noexecstack.patch b/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch
index 2a0f14c71a1e..2a0f14c71a1e 100644
--- a/dev-java/jamvm/files/noexecstack.patch
+++ b/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch