From 99f2384e364911cef5915e3535fb596d38afa1b9 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sat, 19 Jan 2008 15:00:26 +0000
Subject: kaffe: move common dependency on libart-lgpl into include file

---
 packages/kaffe/kaffe-gtk_1.1.5.bb |  2 +-
 packages/kaffe/kaffe-gtk_cvs.bb   |  2 +-
 packages/kaffe/kaffe.inc          | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/kaffe/kaffe-gtk_1.1.5.bb b/packages/kaffe/kaffe-gtk_1.1.5.bb
index 2e53f1938b..4dcc916e86 100644
--- a/packages/kaffe/kaffe-gtk_1.1.5.bb
+++ b/packages/kaffe/kaffe-gtk_1.1.5.bb
@@ -4,6 +4,6 @@ S = "${WORKDIR}/kaffe-${PV}"
 
 require kaffe.inc
 
-DEPENDS += "glib-2.0 gmp gtk+ libart-lgpl pango zlib libxtst kaffeh-native"
+DEPENDS += "glib-2.0 gmp gtk+ pango zlib libxtst kaffeh-native"
 
 EXTRA_OECONF += ""
diff --git a/packages/kaffe/kaffe-gtk_cvs.bb b/packages/kaffe/kaffe-gtk_cvs.bb
index c48f48f1cc..d75eb63319 100644
--- a/packages/kaffe/kaffe-gtk_cvs.bb
+++ b/packages/kaffe/kaffe-gtk_cvs.bb
@@ -7,6 +7,6 @@ S = "${WORKDIR}/kaffe"
 
 require kaffe.inc
 
-DEPENDS += "glib-2.0 gmp gtk+ libart-lgpl pango zlib libxtst kaffeh-native"
+DEPENDS += "glib-2.0 gmp gtk+ pango zlib libxtst kaffeh-native"
 
 EXTRA_OECONF += ""
diff --git a/packages/kaffe/kaffe.inc b/packages/kaffe/kaffe.inc
index 2ae0929a93..7863f733c0 100644
--- a/packages/kaffe/kaffe.inc
+++ b/packages/kaffe/kaffe.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Kaffe is a clean room implementation of the Java Virtual Machine"
 HOMEPAGE = "http://www.kaffe.org/"
 LICENSE  = "GPL LGPL W3C Classpath BSD"
 
-DEPENDS = "virtual/javac-native fastjar-native libffi zip-native"
+DEPENDS = "virtual/javac-native fastjar-native libffi zip-native libart-lgpl"
 RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
 
 SRC_URI += "file://disable-automake-checks.patch;patch=1"
@@ -44,10 +44,6 @@ oe_runconf () {
 	fi
 }
 
-PACKAGES =+ "${PN}-common"
-FILES_${PN} += "${libdir}/${PN}"
-FILES_${PN}-common = "${libdir}/${PN}/jre/lib/*.jar"
-
 do_install () {
 	autotools_do_install
 
@@ -84,3 +80,7 @@ pkg_postrm_${PN} () {
 		update-alternatives --remove $name ${libdir}/${PN}/jre/bin/$name
 	done
 }
+
+PACKAGES =+ "${PN}-common"
+FILES_${PN} += "${libdir}/${PN}"
+FILES_${PN}-common = "${libdir}/${PN}/jre/lib/*.jar"
-- 
cgit v1.2.3