exalt: update to current form

11 files changed, 60 insertions, 119 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index f0a064232b..b57ea4d673 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -42,9 +42,6 @@ SRCREV_pn-diversity-radar ?= "453"
 SRCREV_pn-eds-dbus ?= "736"
 SRCREV_pn-enlazar ?= "37"
 SRCREV_pn-essential-dialer ?= "194"
-SRCREV_pn-exalt ?= "79"
-SRCREV_pn-exalt-daemon ?= "78"
-SRCREV_pn-exalt-module ?= "78"
 SRCREV_pn-ezx-boot-usb-native ?= "2371"
 SRCREV_pn-ezx-gen-blob ?= "2426"
 SRCREV_pn-ezxd ?= "2074"
@@ -81,8 +78,6 @@ SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
 SRCREV_pn-libefso ?= "194"
-SRCREV_pn-libexalt ?= "78"
-SRCREV_pn-libexalt-dbus ?= "76"
 SRCREV_pn-libfakekey ?= "1455"
 SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
 SRCREV_pn-libgee ?= "0bddeeefb3bd5b003d77301705dbad181cddcaf6"
@@ -316,4 +311,8 @@ SRCREV_pn-illume ?= "${EFL_SRCREV}"
 SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}"
 SRCREV_pn-waker ?= "${EFL_SRCREV}"
 
+#exalt
+SRCREV_pn-exalt ?= "${EFL_SRCREV}"
+SRCREV_pn-exalt-client ?= "${EFL_SRCREV}"
+
 require conf/distro/include/sane-srcrevs-fso.inc
diff --git a/recipes/e17/exalt-client_svn.bb b/recipes/e17/exalt-client_svn.bb
new file mode 100644
index 0000000000..469a95554a
--- /dev/null
+++ b/recipes/e17/exalt-client_svn.bb
@@ -0,0 +1,23 @@
+LICENSE = "LGPLv2"
+PV = "0.0.1+svnr${SRCREV}"
+
+require e-module.inc
+
+DEPENDS += "elementary exalt edje-native"
+
+CFLAGS += " -I${STAGING_INCDIR}/exalt -I${STAGING_INCDIR}/exalt_dbus"
+
+do_configure_prepend() {
+	sed -i -e /po/d configure.ac 
+	sed -i -e s:\ po::g Makefile.am
+}
+
+FILES_${PN} += "${libdir}/enlightenment/modules/*/*.desktop \
+                ${libdir}/enlightenment/modules/*/*.edj \
+                ${libdir}/enlightenment/modules/*/*/*.so"
+
+FILES_${PN}-static += "${libdir}/enlightenment/modules/*/*/*.a"
+FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.la"
+FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug"
+ 
+
diff --git a/recipes/e17/exalt_svn.bb b/recipes/e17/exalt_svn.bb
new file mode 100644
index 0000000000..8868296736
--- /dev/null
+++ b/recipes/e17/exalt_svn.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Exalt is a network manager for the windows manager Enlightenment DR17."
+HOMEPAGE = "http://watchwolf.fr/wiki/doku.php?id=exalt"
+
+LICENSE = "LGPLv2"
+DEPENDS = "elementary vpnc wpa-supplicant ecore eet edbus"
+RDEPENDS = "vpnc wpa-supplicant"
+
+PV = "0.9+svnr${SRCREV}"
+
+inherit e
+
+EXTRA_OECONF = " \
+--with-wpa_supplicant=${sbindir}/wpa_supplicant \
+--with-vpnc=${sbindir}/vpnc \
+--with-vpnc-disconnect=${sbindir}/vpnc-disconnect \
+"
+
+do_install_append() {
+	# install dbus config file
+	install -d ${D}${sysconfdir}/dbus-1/system.d/
+	install -m 0644 data/daemon/dbus/exalt.conf ${D}${sysconfdir}/dbus-1/system.d/exalt.conf
+
+	# install dbus service file
+	install -d ${D}${datadir}/dbus-1/system-services/	
+	install -m 0644 org.e.Exalt.service ${D}${datadir}/dbus-1/system-services/
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/dbus-1"
+
diff --git a/recipes/exalt/exalt-daemon/init b/recipes/exalt/exalt-daemon/init
deleted file mode 100644
index cbceed1793..0000000000
--- a/recipes/exalt/exalt-daemon/init
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-set -e
-
-#need dbus and hald
-
-start() {
-    echo -n "Starting Exalt daemon..."
-    start-stop-daemon --start --exec /usr/sbin/exalt-daemon \
-        --pidfile /var/run/exaltd.pid
-    echo "done."
-}
-
-stop() {
-    echo -n "Stopping Exalt daemon..."
-    start-stop-daemon --stop --exec /usr/sbin/exalt-daemon \
-	--pidfile /var/run/exaltd.pid
-    echo "done."
-}
-
-case "$1" in
-    start)
-	start
-	;;
-    stop)
-	stop
-	;;
-    restart)
-	stop
-	sleep 2
-	start
-	;;
-    *)
-	echo "Usage: $(basename $0) {start|stop|restart}"
-	exit 1
-esac
-
-exit 0
diff --git a/recipes/exalt/exalt-daemon_svn.bb b/recipes/exalt/exalt-daemon_svn.bb
deleted file mode 100644
index 8f5e9afa29..0000000000
--- a/recipes/exalt/exalt-daemon_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require exalt.inc
-
-DEPENDS = "evas edbus libexalt"
-
-SRC_URI += "file://init"
-
-do_install_append() {
-    install -D -m 0755 "${WORKDIR}/init" "${D}${sysconfdir}/dbus-1/event.d/40exaltd"
-}
-
-FILES_${PN} += "${sysconfdir}/dbus-1/event.d/"
-
-EXALT_MODULE = "daemon"
diff --git a/recipes/exalt/exalt-module/autotools-fix.patch b/recipes/exalt/exalt-module/autotools-fix.patch
deleted file mode 100644
index 8f3b3deb51..0000000000
--- a/recipes/exalt/exalt-module/autotools-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: module/Makefile.am
-===================================================================
---- module.orig/Makefile.am	2008-04-16 17:39:03.000000000 +0800
-+++ module/Makefile.am	2008-04-16 17:39:05.000000000 +0800
-@@ -26,7 +26,6 @@
- # the module .so file
- INCLUDES = -I. \
- 	 -I$(top_srcdir) \
--	 -I$(includedir) \
- 	 @EXALT_CFLAGS@ \
- 	 @e_cflags@
- 
diff --git a/recipes/exalt/exalt-module_svn.bb b/recipes/exalt/exalt-module_svn.bb
deleted file mode 100644
index 0a28a1a206..0000000000
--- a/recipes/exalt/exalt-module_svn.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require exalt.inc
-
-DEPENDS = "edbus libexalt-dbus"
-RDEPENDS_${PN} = "exalt"
-
-SRC_URI += "file://autotools-fix.patch;patch=1;minrev=78"
-
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-
-FILES_${PN} += "${libdir}/enlightenment/modules/module_exalt/*.edj \
-                ${libdir}/enlightenment/modules/module_exalt/*/*.so \
-                ${libdir}/enlightenment/modules/module_exalt/*.desktop \
-                ${libdir}/enlightenment/modules/module_exalt/module_exalt"
-FILES_${PN}-dev += "${libdir}/enlightenment/modules/module_exalt/*/*.a \
-                    ${libdir}/enlightenment/modules/module_exalt/*/*.la"
-FILES_${PN}-dbg += "${libdir}/enlightenment/modules/module_exalt/*/.debug"
-FILES_${PN}-locale += "${libdir}/enlightenment/modules/module_exalt/locale"
-
-EXALT_MODULE = "module"
diff --git a/recipes/exalt/exalt.inc b/recipes/exalt/exalt.inc
deleted file mode 100644
index 2e82be2d82..0000000000
--- a/recipes/exalt/exalt.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Exalt is a network manager for the windows manager Enlightenment DR17."
-AUTHOR = "John Lee <john_lee@openmoko.com>"
-HOMEPAGE = "http://watchwolf.fr/wiki/doku.php?id=exalt"
-PV = "0.0.0+svnr${SRCREV}"
-
-SRC_URI = "svn://svn.berlios.de/exalt/trunk;module=${EXALT_MODULE};proto=svn"
-
-S = "${WORKDIR}/${EXALT_MODULE}"
-
-inherit autotools pkgconfig
-
-EXALT_MODULE ?= "${PN}"
diff --git a/recipes/exalt/exalt_svn.bb b/recipes/exalt/exalt_svn.bb
deleted file mode 100644
index 0ed46a2e96..0000000000
--- a/recipes/exalt/exalt_svn.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require exalt.inc
-
-DEPENDS = "ecore etk edbus libexalt libexalt-dbus"
-RDEPENDS_${PN} = "exalt-daemon"
diff --git a/recipes/exalt/libexalt-dbus_svn.bb b/recipes/exalt/libexalt-dbus_svn.bb
deleted file mode 100644
index e40766bfe5..0000000000
--- a/recipes/exalt/libexalt-dbus_svn.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require exalt.inc
-
-DEPENDS = "ecore edbus libexalt"
-
-do_stage() {
-    autotools_stage_all
-}
-
-EXALT_MODULE = "libexalt_dbus"
diff --git a/recipes/exalt/libexalt_svn.bb b/recipes/exalt/libexalt_svn.bb
deleted file mode 100644
index cd70d52c77..0000000000
--- a/recipes/exalt/libexalt_svn.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require exalt.inc
-
-DEPENDS = "ecore eet ecore edbus evas wpa-supplicant dhcp"
-RDEPENDS_${PN} = "wpa-supplicant dhclient"
-
-do_stage() {
-    autotools_stage_all
-}