merge of '3725e0639f360f0af8007c241526006b0593ddd6'

     and 'ef5ab979ea7d69bb029547198259524fbad530ec'

8 files changed, 14 insertions, 7 deletions

diff --git a/packages/classpath/classpath-tools-native.bb b/packages/classpath/classpath-tools-native.bb
new file mode 100644
index 0000000000..df5df33407
--- /dev/null
+++ b/packages/classpath/classpath-tools-native.bb
@@ -0,0 +1,7 @@
+# Java recipes which need gjar, gjavah and so on need to depend on this
+# recipe.
+# This makes sure we not only have the tools' bytecode but also a proper
+# interpreter that can run it.
+DESCRIPTION = "Provides working jar, javah etc. from the GNU Classpath project"
+
+DEPENDS = "virtual/java-native classpath-native"
diff --git a/packages/javasqlite/javasqlite_20080130.bb b/packages/javasqlite/javasqlite_20080130.bb
index c6de994c67..3137fba4d4 100644
--- a/packages/javasqlite/javasqlite_20080130.bb
+++ b/packages/javasqlite/javasqlite_20080130.bb
@@ -8,7 +8,7 @@ SRC_URI = "\
   http://www.ch-werner.de/javasqlite/javasqlite-${PV}.tar.gz \
   file://build-fix.patch;patch=1"
 
-DEPENDS = "virtual/javac-native fastjar-native classpath-native javasqlite-mkconst-native classpath sqlite sqlite3"
+DEPENDS = "virtual/javac-native fastjar-native classpath-tools-native javasqlite-mkconst-native classpath sqlite sqlite3"
 RDEPENDS_${JPN} = "lib${PN}-jni"
 
 inherit java-library autotools
diff --git a/packages/libmatthew/libmatthew.inc b/packages/libmatthew/libmatthew.inc
index d7a483e25f..d68b78ad0d 100644
--- a/packages/libmatthew/libmatthew.inc
+++ b/packages/libmatthew/libmatthew.inc
@@ -3,7 +3,7 @@ AUTHOR = "Matthew Johnson <web@matthew.ath.cx>"
 HOMEPAGE = "http://www.matthew.ath.cx/projects/java"
 SECTION = "libs"
 LICENSE = "LGPL"
-DEPENDS = "classpath-native classpath fastjar-native virtual/javac-native"
+DEPENDS = "classpath-tools-native classpath"
 
 S = "${WORKDIR}/libmatthew-java-${PV}"
 
diff --git a/packages/midpath/midpath-common.inc b/packages/midpath/midpath-common.inc
index 1690b4fc44..0c320e4408 100644
--- a/packages/midpath/midpath-common.inc
+++ b/packages/midpath/midpath-common.inc
@@ -5,7 +5,7 @@ LICENSE  = "GPL"
 PRIORITY = "optional"
 SECTION  = "interpreters"
 
-DEPENDS = "virtual/javac-native classpath-native classpath fastjar-native"
+DEPENDS = "virtual/javac-native classpath-tools-native classpath fastjar-native"
 
 GLIBJ_ZIP = "${STAGING_DATADIR}/classpath/glibj.zip"
 
diff --git a/packages/phoneme/phoneme-advanced.inc b/packages/phoneme/phoneme-advanced.inc
index a6b2951517..b5be402ac7 100644
--- a/packages/phoneme/phoneme-advanced.inc
+++ b/packages/phoneme/phoneme-advanced.inc
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 HOMEPAGE = "https://phoneme.dev.java.net"
 AUTHOR = "Sun Microsystems, Inc."
 
-DEPENDS = "classpath-native virtual/javac-native linux-libc-headers"
+DEPENDS = "classpath-tools-native virtual/javac-native linux-libc-headers"
 
 inherit java update-alternatives
 
diff --git a/packages/rxtx/rxtx_2.1-7r2.bb b/packages/rxtx/rxtx_2.1-7r2.bb
index 0630d498d6..9b4f9fa4fa 100644
--- a/packages/rxtx/rxtx_2.1-7r2.bb
+++ b/packages/rxtx/rxtx_2.1-7r2.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://rxtx.org"
 
 PR = "r1"
 
-DEPENDS = "classpath classpath-native virtual/javac-native"
+DEPENDS = "classpath classpath-tools-native"
 
 inherit autotools java-library
 
diff --git a/packages/sqlitejdbc/sqlitejdbc_041.bb b/packages/sqlitejdbc/sqlitejdbc_041.bb
index c2ab0f9b23..ef3fee36fd 100644
--- a/packages/sqlitejdbc/sqlitejdbc_041.bb
+++ b/packages/sqlitejdbc/sqlitejdbc_041.bb
@@ -12,7 +12,7 @@ S = "${WORKDIR}/${PN}-v${PV}"
 
 inherit java-library
 
-DEPENDS = "classpath-native fastjar-native sqlite3 classpath"
+DEPENDS = "classpath-tools-native sqlite3 classpath"
 RDEPENDS_${JPN} = "libsqlitejdbc-jni"
 
 do_unpackpost() {
diff --git a/packages/swt/swt-gtk.inc b/packages/swt/swt-gtk.inc
index 56e77faefa..0bdaaab932 100644
--- a/packages/swt/swt-gtk.inc
+++ b/packages/swt/swt-gtk.inc
@@ -3,7 +3,7 @@ LICENSE = "CPL MPL LGPL"
 
 inherit java-library
 
-DEPENDS = "classpath-native cairo gtk+ atk libxtst"
+DEPENDS = "classpath-tools-native cairo gtk+ atk libxtst"
 
 S = "${WORKDIR}/swt-source"