merge of 'dd31500500238107a50637418ba3f63cb4b36a7d'

     and 'fd51b44f85d35014e5287bedc536e9abcbf56cad'

6 files changed, 30 insertions, 27 deletions

diff --git a/packages/ode/.mtn2git_empty b/packages/nonworking/ode/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ode/.mtn2git_empty
+++ b/packages/nonworking/ode/.mtn2git_empty
diff --git a/packages/ode/files/.mtn2git_empty b/packages/nonworking/ode/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ode/files/.mtn2git_empty
+++ b/packages/nonworking/ode/files/.mtn2git_empty
diff --git a/packages/ode/files/config.h b/packages/nonworking/ode/files/config.h
index 8711bd91b2..8711bd91b2 100644
--- a/packages/ode/files/config.h
+++ b/packages/nonworking/ode/files/config.h
diff --git a/packages/nonworking/ode/ode_0.8.bb b/packages/nonworking/ode/ode_0.8.bb
new file mode 100644
index 0000000000..9055681a36
--- /dev/null
+++ b/packages/nonworking/ode/ode_0.8.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "ODE is an Open Source Physics Engine."
+SECTION = "libs"
+HOMEPAGE = "http://www.ode.org"
+LICENSE = "LGPL"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/opende/ode-src-${PV}.zip \
+           file://config.h"
+
+inherit autotools
+
+#do_configure() {
+#	touch configurator.exe
+#	chmod a+rx configurator.exe
+#	install -m 0644 ${WORKDIR}/config.h include/ode/
+#}
+
+#do_compile() {
+#	oe_runmake CC="${CC}" CFLAGS="${CFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}" RANLIB="${RANLIB}" AR="${AR} qf " ode-lib
+#}
+
+#do_stage() {
+#	install -d ${STAGING_INCDIR}/ode/
+#	install -m 0644 include/ode/*.h ${STAGING_INCDIR}/ode/
+#	oe_libinstall -C lib -a libode ${STAGING_LIBDIR}
+#}
+
+#do_install() {
+#	:
+#}
diff --git a/packages/python/python-pyode_1.0.0.bb b/packages/nonworking/python/python-pyode_1.2.0.bb
index 95dc0228e3..95dc0228e3 100644
--- a/packages/python/python-pyode_1.0.0.bb
+++ b/packages/nonworking/python/python-pyode_1.2.0.bb
diff --git a/packages/ode/ode_0.5.bb b/packages/ode/ode_0.5.bb
deleted file mode 100644
index 3b287d4b36..0000000000
--- a/packages/ode/ode_0.5.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "ODE is an Open Source Physics Engine."
-SECTION = "libs"
-PR = "r0"
-LICENSE = "LGPL"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/opende/ode-${PV}.tgz \
-           file://config.h"
-
-do_configure() {
-	touch configurator.exe
-	chmod a+rx configurator.exe
-	install -m 0644 ${WORKDIR}/config.h include/ode/
-}
-
-do_compile() {
-	oe_runmake CC="${CC}" CFLAGS="${CFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}" RANLIB="${RANLIB}" AR="${AR} qf " ode-lib
-}
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/ode/
-	install -m 0644 include/ode/*.h ${STAGING_INCDIR}/ode/
-	oe_libinstall -C lib -a libode ${STAGING_LIBDIR}
-}
-
-do_install() {
-	:
-}