From 2d497d37fccfe2b4c6bc0eed54ce305dea4c286c Mon Sep 17 00:00:00 2001
From: Robert Schuster <robertschuster@fsfe.org>
Date: Wed, 4 Aug 2010 11:21:16 +0200
Subject: classpath: Unified remaining recipes.

---
 recipes/classpath/classpath.inc       | 19 +++++++++++++++----
 recipes/classpath/classpath_0.97.2.bb | 16 +---------------
 recipes/classpath/classpath_0.98.bb   | 16 +---------------
 3 files changed, 17 insertions(+), 34 deletions(-)

(limited to 'recipes')

diff --git a/recipes/classpath/classpath.inc b/recipes/classpath/classpath.inc
index 41c7888702..762fceabe7 100644
--- a/recipes/classpath/classpath.inc
+++ b/recipes/classpath/classpath.inc
@@ -5,7 +5,8 @@ PRIORITY = "optional"
 LICENSE = "Classpath"
 PBN = "classpath"
 
-DEPENDS = "virtual/javac-native fastjar-native zip-native gmp antlr-native"
+DEPENDS = "virtual/javac-native fastjar-native zip-native gmp antlr-native gtk+ gconf libxtst"
+
 RPROVIDES_${PN} = ""
 
 RDEPENDS_${PN} = "${PBN}-common (>= ${PV})"
@@ -17,7 +18,6 @@ RPROVIDES_${PN}-common = "${PBN}-common"
 RPROVIDES_${PN}-gtk = "${PBN}-awt"
 
 SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
-	  
 
 S = "${WORKDIR}/${PBN}-${PV}"
 
@@ -31,13 +31,24 @@ EXTRA_OECONF = "\
   --with-vm=java \
   --disable-Werror \
   --with-antlr-jar=${STAGING_DATADIR_JAVA_NATIVE}/antlr.jar \
+  --disable-alsa \
+  --disable-dssi \
+  --disable-qt4-peer \
+  --disable-plugin \
+  --enable-gconf-peer \
+  --enable-gtk-peer \
+  --enable-local-sockets \
+  --with-vm=java \
   "
 
+DEPENDS += "gtk+ gconf libxtst"
+
+EXTRA_OECONF += "\
+               "
 inherit autotools java
 
 do_configure_prepend () {
-
-        cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}
+  cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}
 }
 	
 
diff --git a/recipes/classpath/classpath_0.97.2.bb b/recipes/classpath/classpath_0.97.2.bb
index b53ba2b456..406b38db88 100644
--- a/recipes/classpath/classpath_0.97.2.bb
+++ b/recipes/classpath/classpath_0.97.2.bb
@@ -13,21 +13,7 @@ SRC_URI += "\
   file://toolwrapper-exithook.patch \
   "
 
-PR = "r10"
-
-DEPENDS += "gtk+ gconf libxtst"
-
-EXTRA_OECONF += "\
-                --disable-alsa \
-                --disable-dssi \
-                --disable-qt4-peer \
-                --disable-plugin \
-                --enable-gconf-peer \
-                --enable-gtk-peer \
-                --enable-local-sockets \
-                --with-vm=java \
-               "
-
+PR = "r11"
 
 SRC_URI[md5sum] = "6a35347901ace03c31cc49751b338f31"
 SRC_URI[sha256sum] = "001fee5ad3ddd043783d59593153510f09064b0d9b5aea82f535266f62f02db4"
diff --git a/recipes/classpath/classpath_0.98.bb b/recipes/classpath/classpath_0.98.bb
index d64fa078bf..5edc9eedf8 100644
--- a/recipes/classpath/classpath_0.98.bb
+++ b/recipes/classpath/classpath_0.98.bb
@@ -8,21 +8,7 @@ SRC_URI += "\
   file://toolwrapper-exithook.patch \
   "
 
-PR = "r3"
-
-DEPENDS += "gtk+ gconf libxtst"
-
-EXTRA_OECONF += "\
-                --disable-alsa \
-                --disable-dssi \
-                --disable-qt4-peer \
-                --disable-plugin \
-                --enable-gconf-peer \
-                --enable-gtk-peer \
-                --enable-local-sockets \
-                --with-vm=java \
-               "
-
+PR = "r4"
 
 SRC_URI[md5sum] = "90c6571b8b0309e372faa0f9f6255ea9"
 SRC_URI[sha256sum] = "501b5acd4dff79b6100da22cef15080f31071821ce3cea6f1b739bc1b56fac3f"
-- 
cgit v1.2.3