merge of 6b0fa032aaf561cbe35dde4c36afbabd8f8ab47b

     and 845f932890628e6c650909f15f2585f2b763ace8

15 files changed, 171 insertions, 6 deletions

diff --git a/packages/apr/.mtn2git_empty b/packages/apr/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/apr/.mtn2git_empty
diff --git a/packages/apr/apr-util_1.1.2.bb b/packages/apr/apr-util_1.1.2.bb
new file mode 100644
index 0000000000..e9f9587420
--- /dev/null
+++ b/packages/apr/apr-util_1.1.2.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Apache Portable Runtime (APR) companion library"
+SECTION = "libs"
+DEPENDS = "apr expat gdbm"
+MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
+LICENSE = "Apache License, Version 2.0"
+
+PR = "r0"
+
+# apache mirrors?
+SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.gz"
+
+EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
+
+inherit autotools lib_package binconfig
+
+do_configure() {
+  oe_runconf
+}
+
+do_stage() {
+  oe_libinstall -a -so -C .libs libaprutil-1 ${STAGING_LIBDIR}
+}
diff --git a/packages/apr/apr_1.1.1.bb b/packages/apr/apr_1.1.1.bb
new file mode 100644
index 0000000000..f67f31005e
--- /dev/null
+++ b/packages/apr/apr_1.1.1.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Apache Portable Runtime (APR) library"
+SECTION = "libs"
+MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
+LICENSE = "Apache License, Version 2.0"
+
+PR = "r0"
+
+# apache mirrors?
+SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.bz2"
+
+inherit autotools lib_package binconfig
+
+do_configure() {
+  oe_runconf
+}
+
+do_stage() {
+  oe_libinstall -a -so -C .libs libapr-1 ${STAGING_LIBDIR}
+}
diff --git a/packages/avetanabt/.mtn2git_empty b/packages/avetanabt/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/avetanabt/.mtn2git_empty
diff --git a/packages/avetanabt/avetanabt_svn.bb b/packages/avetanabt/avetanabt_svn.bb
new file mode 100644
index 0000000000..08adcbbdfd
--- /dev/null
+++ b/packages/avetanabt/avetanabt_svn.bb
@@ -0,0 +1,62 @@
+DESCRIPTION = "avetanaBT: Bluetooth API implementation for Java (JSR-82)"
+SECTION = "devel"
+DEPENDS = "findutils-native jikes-native kaffeh-native fastjar-native bluez-libs classpath"
+#RDEPENDS = "bluez-utils"
+# Matthias Ringwald <mringwal@inf.ethz.ch> was helping me in the first phase. Thanks.
+MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
+LICENSE = "GPL"
+HOMEPAGE = "http://sourceforge.net/projects/avetanabt/"
+
+PV = "0.0cvs${CVSDATE}"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/avetanabt;module=avetanabt"
+
+S = "${WORKDIR}/avetanabt"
+
+PACKAGES = "${PN}"
+FILES_${PN} = "${libdir}/libavetanaBT.so ${datadir}/avetanabt/avetanaBT.jar"
+
+do_compile() {
+
+  # doing nearly the same as in Makefile written...
+
+  mkdir -p build
+  rm -fr build/*
+
+  # javac -> jikes
+  ${STAGING_BINDIR}/find {de,javax,com} -iname *.java > file.list
+  ${STAGING_BINDIR}/jikes -verbose --bootclasspath ${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d build @file.list
+
+  # jar -> fastjar
+  cd build
+  ${STAGING_BINDIR}/fastjar -cf ../avetanaBT.jar de javax com
+  cd ..
+
+  # JNI generated header file - de_avetana_bluetooth_stack_BlueZ.h
+  # javah -> kaffeh
+  cd c
+  ${STAGING_BINDIR}/kaffeh -jni -classpath ../avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar de.avetana.bluetooth.stack.BlueZ
+
+  # Native language (C) library - libavetanaBT.so
+  ${CXX} ${CXXFLAGS} -shared -lbluetooth -I${STAGING_INCDIR}/classpath BlueZ.cpp -o ../libavetanaBT.so ${LDFLAGS}
+  cd ..
+
+}
+
+do_stage() {
+
+  install -d ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt
+  install avetanaBT.jar ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt/
+
+}
+
+do_install() {
+
+  install -d ${D}${libdir}
+  install -m 0755 libavetanaBT.so ${D}${libdir}/
+
+  install -d ${D}${datadir}/avetanabt
+  install avetanaBT.jar ${D}${datadir}/avetanabt/
+ 
+}
diff --git a/packages/classpath/classpath_0.14.bb b/packages/classpath/classpath_0.14.bb
index ec29ad9cb8..c1c266c994 100644
--- a/packages/classpath/classpath_0.14.bb
+++ b/packages/classpath/classpath_0.14.bb
@@ -4,7 +4,7 @@ LICENSE = "Classpath"
 PRIORITY = "optional"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native"
 RDEPENDS_${PN} = "${PN}-common (${PV})"
@@ -22,6 +22,11 @@ FILES_${PN} = "${libdir}/${PN}"
 FILES_${PN}-common = "${datadir}/${PN}/glibj.zip"
 FILES_${PN}-examples = "${datadir}/${PN}/examples"
 
+do_stage() {
+        install -d ${STAGING_INCDIR}/classpath
+        install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
+}
+
 do_install() {
 	autotools_do_install
 	mv ${D}${libdir}/security ${D}${libdir}/${PN}
diff --git a/packages/classpath/classpath_0.15.bb b/packages/classpath/classpath_0.15.bb
index ec29ad9cb8..c1c266c994 100644
--- a/packages/classpath/classpath_0.15.bb
+++ b/packages/classpath/classpath_0.15.bb
@@ -4,7 +4,7 @@ LICENSE = "Classpath"
 PRIORITY = "optional"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native"
 RDEPENDS_${PN} = "${PN}-common (${PV})"
@@ -22,6 +22,11 @@ FILES_${PN} = "${libdir}/${PN}"
 FILES_${PN}-common = "${datadir}/${PN}/glibj.zip"
 FILES_${PN}-examples = "${datadir}/${PN}/examples"
 
+do_stage() {
+        install -d ${STAGING_INCDIR}/classpath
+        install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
+}
+
 do_install() {
 	autotools_do_install
 	mv ${D}${libdir}/security ${D}${libdir}/${PN}
diff --git a/packages/classpath/classpath_0.17.bb b/packages/classpath/classpath_0.17.bb
index ec29ad9cb8..fb41d7e9d8 100644
--- a/packages/classpath/classpath_0.17.bb
+++ b/packages/classpath/classpath_0.17.bb
@@ -4,7 +4,7 @@ LICENSE = "Classpath"
 PRIORITY = "optional"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native"
 RDEPENDS_${PN} = "${PN}-common (${PV})"
@@ -22,6 +22,11 @@ FILES_${PN} = "${libdir}/${PN}"
 FILES_${PN}-common = "${datadir}/${PN}/glibj.zip"
 FILES_${PN}-examples = "${datadir}/${PN}/examples"
 
+do_stage() {
+	install -d ${STAGING_INCDIR}/classpath
+	install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
+}
+
 do_install() {
 	autotools_do_install
 	mv ${D}${libdir}/security ${D}${libdir}/${PN}
diff --git a/packages/kaffe/kaffe.inc b/packages/kaffe/kaffe.inc
index 0cede21082..ea308f1043 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 = "jikes-native fastjar-native libffi"
+DEPENDS = "jikes-native fastjar-native libffi zip-native"
 
 SRC_URI += "file://disable-automake-checks.patch;patch=1"
 
diff --git a/packages/kaffe/kaffeh-native_1.1.5.bb b/packages/kaffe/kaffeh-native_1.1.5.bb
index dccc7559f4..569301f3f7 100644
--- a/packages/kaffe/kaffeh-native_1.1.5.bb
+++ b/packages/kaffe/kaffeh-native_1.1.5.bb
@@ -1,6 +1,6 @@
 SRC_URI = "http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/kaffe-${PV}.tar.gz"
 S = "${WORKDIR}/kaffe-${PV}"
-PR = "r2"
+PR = "r3"
 
 include kaffe.inc
 
@@ -22,4 +22,7 @@ EXTRA_OECONF = "--disable-alsatest \
 
 do_stage() {
 	install -m 0755 kaffe/kaffeh/kaffeh ${STAGING_BINDIR}/
+
+	install -d ${STAGING_DATADIR}/kaffeh
+	install -m 0755 libraries/javalib/*.jar ${STAGING_DATADIR}/kaffeh/
 }
diff --git a/packages/kaffe/kaffeh-native_cvs.bb b/packages/kaffe/kaffeh-native_cvs.bb
index 3a67db2759..2b10385e82 100644
--- a/packages/kaffe/kaffeh-native_cvs.bb
+++ b/packages/kaffe/kaffeh-native_cvs.bb
@@ -1,6 +1,6 @@
 PV = "1.1.5+cvs${CVSDATE}"
 DEFAULT_PREFERENCE = "-1"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "cvs://readonly:readonly@cvs.kaffe.org/cvs/kaffe;module=kaffe"
 S = "${WORKDIR}/kaffe"
@@ -25,4 +25,8 @@ EXTRA_OECONF = "--disable-alsatest \
 
 do_stage() {
 	install -m 0755 kaffe/kaffeh/kaffeh ${STAGING_BINDIR}/
+
+        install -d ${STAGING_DATADIR}/kaffeh
+        install -m 0755 libraries/javalib/*.jar ${STAGING_DATADIR}/kaffeh/
 }
+
diff --git a/packages/subversion/.mtn2git_empty b/packages/subversion/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/subversion/.mtn2git_empty
diff --git a/packages/subversion/files/.mtn2git_empty b/packages/subversion/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/subversion/files/.mtn2git_empty
diff --git a/packages/subversion/files/disable-revision-install.patch b/packages/subversion/files/disable-revision-install.patch
new file mode 100644
index 0000000000..a1c60654cb
--- /dev/null
+++ b/packages/subversion/files/disable-revision-install.patch
@@ -0,0 +1,22 @@
+--- subversion-1.2.0-r0/Makefile.in.old	2005-07-17 22:28:21.898728312 +0200
++++ subversion-1.2.0-r0/Makefile.in	2005-07-17 22:30:05.361999504 +0200
+@@ -260,7 +260,7 @@
+ clean: external-clean local-clean
+ distclean: external-distclean local-distclean
+ extraclean: external-extraclean local-extraclean
+-install: external-install local-install revision-install
++install: external-install local-install #revision-install
+ 
+ @INCLUDE_OUTPUTS@
+ 
+@@ -320,8 +320,8 @@
+ local-install: @INSTALL_RULES@
+ 
+ ### HACK!! Find a better way to do this
+-revision-install:
+-	subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
++#revision-install:
++#	subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
+ 
+ install-static: @INSTALL_STATIC_RULES@
+ 
diff --git a/packages/subversion/subversion_1.2.0.bb b/packages/subversion/subversion_1.2.0.bb
new file mode 100644
index 0000000000..790a552666
--- /dev/null
+++ b/packages/subversion/subversion_1.2.0.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "The Subversion (svn) client"
+SECTION = "console/network"
+DEPENDS = "apr-util"
+MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
+LICENSE = "GPL"
+
+PR = "r0"
+
+SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
+	   file://disable-revision-install.patch;patch=1"
+
+EXTRA_OECONF = "--without-neon --without-berkeley-db --without-apxs --without-apache --without-swig --with-apr=${STAGING_BINDIR} --with-apr-util=${STAGING_BINDIR}"
+
+inherit autotools
+
+do_configure() {
+  oe_runconf
+}