From: Mirko Vogt <mirko@openwrt.org>
Date: Tue, 9 Dec 2008 22:40:46 +0000 (+0000)
Subject: move efl-libs to own directory
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5c5c5c8ea06dbe19d1041d484fc8ef63773cdcde;p=openwrt%2Fsvn-archive%2Fpackages.git

move efl-libs to own directory

SVN-Revision: 13567
---

diff --git a/Xorg/efl/ecore/Makefile b/Xorg/efl/ecore/Makefile
new file mode 100644
index 000000000..b08e3b3f0
--- /dev/null
+++ b/Xorg/efl/ecore/Makefile
@@ -0,0 +1,89 @@
+# 
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ecore
+PKG_REV:=37637
+PKG_VERSION:=r$(PKG_REV)
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/$(PKG_NAME)
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+
+PKG_FIXUP = libtool
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ecore
+  SECTION:=xorg-lib
+  CATEGORY:=Xorg
+  SUBMENU:=lib
+  TITLE:=Ecore is the core event abstraction layer and X abstraction layer
+  URL:=http://wiki.enlightenment.org/index.php/Ecore
+  DEPENDS:=+eet +evas +libXcursor +libXrandr +libXtst +libiconv
+endef
+
+define Package/ecore/description
+  Ecore is the core event abstraction layer and X abstraction layer that makes doing selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers fast, optimized, and convenient. It's a separate library so anyone can make use of the work put into Ecore to make this job easy for applications.
+endef
+
+EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include
+EXTRA_LDFLAGS+=-liconv -L$(STAGING_DIR)/usr/lib/libiconv/lib
+
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+	$(call Build/Configure/Default, \
+                --with-iconv-link \
+                --enable-ecore-txt \
+                --disable-ecore-config \
+                --disable-ecore-x-xcb \
+                --enable-ecore-x \
+                --enable-ecore-job \
+                --disable-ecore-directfb \
+                --disable-ecore-sdl \
+                --enable-ecore-fb \
+                --enable-ecore-evas \
+                --enable-ecore-evas-fb \
+                --disable-ecore-evas-x11-gl \
+                --enable-ecore-evas-xrender \
+                --disable-ecore-evas-dfb \
+                --disable-ecore-evas-sdl \
+                --disable-openssl \
+                --enable-abstract-sockets \
+                --enable-ecore-con \
+                --enable-ecore-ipc \
+                --enable-ecore-file \
+                --enable-inotify \
+                --disable-poll \
+                --disable-curl \
+                --disable-ecore-desktop \
+                --disable-gnutls \
+	)
+endef
+
+define Build/Compile
+	DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install
+endef
+
+define Build/InstallDev
+	mkdir -p $(1)/usr/include $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+endef
+
+define Package/ecore/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,ecore))
diff --git a/Xorg/efl/ecore/Makefile.native b/Xorg/efl/ecore/Makefile.native
new file mode 100644
index 000000000..53f4d038b
--- /dev/null
+++ b/Xorg/efl/ecore/Makefile.native
@@ -0,0 +1,94 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ecore
+PKG_VERSION:=
+PKG_RELEASE:=1
+
+PKG_SOURCE:=e17.libs.$(PKG_NAME)_anoncvs.enlightenment.org__20080825.tar.gz
+PKG_SOURCE_URL:=http://downloads.openmoko.org/sources/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}/
+
+PKG_FIXUP = libtool
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ecore
+  SECTION:=xorg-lib
+  CATEGORY:=Xorg
+  SUBMENU:=lib
+  TITLE:=Ecore is the core event abstraction layer and X abstraction layer
+  URL:=http://wiki.enlightenment.org/index.php/Ecore
+  DEPENDS:=+eet +evas +libXcursor +libXrandr +libXtst +libiconv
+endef
+
+define Package/ecore/description
+  Ecore is the core event abstraction layer and X abstraction layer that makes doing selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers fast, optimized, and convenient. It's a separate library so anyone can make use of the work put into Ecore to make this job easy for applications.
+endef
+
+EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include
+EXTRA_LDFLAGS+=-liconv -L$(STAGING_DIR)/usr/lib/libiconv/lib
+
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+	$(call Build/Configure/Default, \
+                --with-iconv-link \
+                --enable-ecore-txt \
+                --disable-ecore-config \
+                --disable-ecore-x-xcb \
+                --enable-ecore-x \
+                --enable-ecore-job \
+                --disable-ecore-directfb \
+                --disable-ecore-sdl \
+                --enable-ecore-fb \
+                --enable-ecore-evas \
+                --enable-ecore-evas-fb \
+                --disable-ecore-evas-x11-gl \
+                --disable-ecore-evas-xrender \
+                --disable-ecore-evas-dfb \
+                --disable-ecore-evas-sdl \
+                --disable-openssl \
+                --enable-abstract-sockets \
+                --enable-ecore-con \
+                --enable-ecore-ipc \
+                --enable-ecore-file \
+                --enable-inotify \
+                --disable-poll \
+                --disable-curl \
+                --disable-ecore-desktop \
+                --disable-ecore-imf \
+                --disable-ecore-imf_evas \
+	)
+endef
+
+define Build/Compile
+	mkdir -p $(PKG_INSTALL_DIR)/host $(PKG_INSTALL_DIR)/target
+	$(MAKE) -C $(PKG_BUILD_DIR) all
+	DESTDIR="$(PKG_INSTALL_DIR)/target" $(MAKE) -C $(PKG_BUILD_DIR) all install
+	$(MAKE) -C $(PKG_BUILD_DIR) clean
+	$(MAKE) -C $(PKG_BUILD_DIR) all CC="$(HOSTCC)" CFLAGS="" LDFLAGS="-I$(STAGING_DIR_HOST)/usr/lib/"
+	DESTDIR="$(PKG_INSTALL_DIR)/host" $(MAKE) -C $(PKG_BUILD_DIR) all install
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(STAGING_DIR_HOST)/usr/include $(STAGING_DIR_HOST)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/target/usr/include/* $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/target/usr/lib/* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/host/usr/include/* $(STAGING_DIR_HOST)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/host/usr/lib/* $(STAGING_DIR_HOST)/usr/lib/
+endef
+
+define Package/ecore/install
+	$(INSTALL_DIR) $(1)/usr/lib $(STAGING_DIR_HOST)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/taget/usr/lib/* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/host/usr/lib/* $(STAGING_DIR_HOST)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,ecore))
diff --git a/Xorg/efl/edbus/Makefile b/Xorg/efl/edbus/Makefile
new file mode 100644
index 000000000..e9e860dcf
--- /dev/null
+++ b/Xorg/efl/edbus/Makefile
@@ -0,0 +1,60 @@
+# 
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=e_dbus
+PKG_REV:=37637
+PKG_VERSION:=r$(PKG_REV)
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/$(PKG_NAME)
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+
+PKG_FIXUP = libtool
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/edbus
+  SECTION:=xorg-lib
+  CATEGORY:=Xorg
+  SUBMENU:=lib
+  TITLE:=Edbus
+  URL:=http://wiki.enlightenment.org/index.php
+  DEPENDS:=+dbus +ecore
+endef
+
+EXTRA_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+	$(call Build/Configure/Default)
+endef
+
+define Build/Compile
+	DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+endef
+
+define Package/edbus/install
+	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,edbus))
diff --git a/Xorg/efl/edje/Makefile b/Xorg/efl/edje/Makefile
new file mode 100644
index 000000000..5affd4d5d
--- /dev/null
+++ b/Xorg/efl/edje/Makefile
@@ -0,0 +1,64 @@
+# 
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=edje
+PKG_REV:=37637
+PKG_VERSION:=r$(PKG_REV)
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/$(PKG_NAME)
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+
+PKG_FIXUP = libtool
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/edje
+  SECTION:=xorg-lib
+  CATEGORY:=Xorg
+  SUBMENU:=lib
+  TITLE:=Edje is a graphical design and layout library
+  URL:=http://wiki.enlightenment.org/index.php/Edje
+  DEPENDS:=+libjpeg +zlib +eet +evas +ecore +embryo
+endef
+
+define Package/edje/description
+Edje is a graphical design and layout library based on Evas that provides an abstraction layer between the application code and the interface, while allowing extremely flexible dynamic layouts and animations.
+endef
+
+EXTRA_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+	$(call Build/Configure/Default, \
+		--disable-edje-cc \
+	)
+endef
+
+define Build/Compile
+	DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+endef
+
+define Package/edje/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,edje))
diff --git a/Xorg/efl/edje/Makefile.native b/Xorg/efl/edje/Makefile.native
new file mode 100644
index 000000000..e6a2d608a
--- /dev/null
+++ b/Xorg/efl/edje/Makefile.native
@@ -0,0 +1,91 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=edje
+PKG_VERSION:=
+PKG_RELEASE:=1
+
+PKG_SOURCE:=e17.libs.$(PKG_NAME)_anoncvs.enlightenment.org__20080825.tar.gz
+PKG_SOURCE_URL:=http://downloads.openmoko.org/sources/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}/
+
+PKG_FIXUP = libtool
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/edje
+  SECTION:=xorg-lib
+  CATEGORY:=Xorg
+  SUBMENU:=lib
+  TITLE:=Edje is a graphical design and layout library
+  URL:=http://wiki.enlightenment.org/index.php/Edje
+  DEPENDS:=+libjpeg +zlib +eet +evas +ecore +embryo
+endef
+
+define Package/edje/description
+Edje is a graphical design and layout library based on Evas that provides an abstraction layer between the application code and the interface, while allowing extremely flexible dynamic layouts and animations.
+endef
+
+EXTRA_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+	$(call Build/Configure/Default \
+		--disable-edje-cc \
+	)
+endef
+
+#edge provides an own compiler (edge_cc) which needs be compiled for the host-system
+#define Build/Compile
+#	mkdir -p $(PKG_INSTALL_DIR)/host $(PKG_INSTALL_DIR)/target
+#	$(MAKE) -C $(PKG_BUILD_DIR) all
+#	DESTDIR="$(PKG_INSTALL_DIR)/target" $(MAKE) -C $(PKG_BUILD_DIR) all install
+#	$(MAKE) -C $(PKG_BUILD_DIR) clean
+#	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+#		./configure \
+#			--prefix=/usr \
+#			--exec-prefix=/usr \
+#			--bindir=/usr/bin \
+#			--datadir=/usr/share \
+#			--includedir=/usr/include \
+#			--infodir=/usr/share/info \
+#			--libdir=/usr/lib \
+#			--libexecdir=/usr/lib \
+#			--localstatedir=/var \
+#			--mandir=/usr/share/man \
+#			--sbindir=/usr/sbin \
+#			--sysconfdir=/etc \
+#			LDFLAGS="-L$(STAGING_DIR_HOST)/usr/lib" \
+#			CFLAGS="-I$(STAGING_DIR_HOST)/usr/include" \
+#			EDGE_LDFLAGS=-L$(STAGING_DIR_HOST)/usr/lib \
+			EDGE_CFLAGS=-I$(STAGING_DIR_HOST)/usr/include \
+#	);
+#	$(MAKE) -C $(PKG_BUILD_DIR) all CC="$(HOSTCC)" LDFLAGS="-L$(STAGING_DIR_HOST)/usr/lib" "CFLAGS=-I$(STAGING_DIR_HOST)/usr/include"
+#	DESTDIR="$(PKG_INSTALL_DIR)/host" $(MAKE) -C $(PKG_BUILD_DIR) all install
+#endef
+
+#define Build/InstallDev
+#	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/bin $(STAGING_DIR_HOST)/usr/include $(STAGING_DIR_HOST)/usr/lib $(STAGING_DIR_HOST)/usr/bin
+#	$(CP) $(PKG_INSTALL_DIR)/target/usr/include/* $(1)/usr/include/
+#	$(CP) $(PKG_INSTALL_DIR)/target/usr/lib/* $(1)/usr/lib/
+#	$(CP) $(PKG_INSTALL_DIR)/target/usr/bin/edje_cc $(1)/usr/bin/
+#	$(CP) $(PKG_INSTALL_DIR)/host/usr/lib/* $(STAGING_DIR_HOST)/usr/lib/
+#	$(CP) $(PKG_INSTALL_DIR)/host/usr/bin/edje_cc $(STAGING_DIR_HOST)/usr/bin/
+#endef
+
+#define Package/edje/install
+#	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin $(STAGING_DIR_HOST)/usr/lib $(STAGING_DIR_HOST)/usr/bin
+#	$(CP) $(PKG_INSTALL_DIR)/target/usr/lib/*.so* $(1)/usr/lib/
+#	$(CP) $(PKG_INSTALL_DIR)/target/usr/bin/edje_cc $(1)/usr/bin/
+#	$(CP) $(PKG_INSTALL_DIR)/host/usr/lib/*.so* $(STAGING_DIR_HOST)/usr/lib/
+#	$(CP) $(PKG_INSTALL_DIR)/host/usr/bin/edje_cc $(STAGING_DIR_HOST)/usr/bin/
+#endef
+
+$(eval $(call BuildPackage,edje))
diff --git a/Xorg/efl/edje/patches/001-edje_cc-native.patch b/Xorg/efl/edje/patches/001-edje_cc-native.patch
new file mode 100644
index 000000000..9c7003c70
--- /dev/null
+++ b/Xorg/efl/edje/patches/001-edje_cc-native.patch
@@ -0,0 +1,18 @@
+diff -ruN edje.orig/src/bin/edje_cc_parse.c edje/src/bin/edje_cc_parse.c
+--- edje.orig/src/bin/edje_cc_parse.c	2008-10-08 03:40:17.000000000 +0200
++++ edje/src/bin/edje_cc_parse.c	2008-10-08 03:41:59.000000000 +0200
+@@ -667,12 +667,12 @@
+ 	 * Redirecting the output is required for MacOS 10.3, and works fine
+ 	 * on other systems.
+ 	 */
+-	snprintf(buf, sizeof(buf), "cat %s | cpp -I%s %s > %s",
++	snprintf(buf, sizeof(buf), "cat %s | /usr/bin/cpp -I%s %s > %s",
+ 		 file_in, inc, def, tmpn);
+ 	ret = system(buf);
+ 	if (ret < 0)
+ 	  {
+-	     snprintf(buf, sizeof(buf), "gcc -I%s %s -E -o %s %s",
++	     snprintf(buf, sizeof(buf), "/usr/bin/gcc -I%s %s -E -o %s %s",
+ 		      inc, def, tmpn, file_in);
+ 	     ret = system(buf);
+ 	  }
diff --git a/Xorg/efl/eet/Makefile b/Xorg/efl/eet/Makefile
new file mode 100644
index 000000000..6d31dbe15
--- /dev/null
+++ b/Xorg/efl/eet/Makefile
@@ -0,0 +1,65 @@
+# 
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=eet
+PKG_REV:=37637
+PKG_VERSION:=r$(PKG_REV)
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/$(PKG_NAME)
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+
+PKG_FIXUP = libtool
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/eet
+  SECTION:=xorg-lib
+  CATEGORY:=Xorg
+  SUBMENU:=lib
+  TITLE:=EET is a tiny library designed to write an arbitary set of chunks of data to a file
+  URL:=http://wiki.enlightenment.org/index.php/Eet
+  DEPENDS:=+libjpeg +zlib +eina
+endef
+
+define Package/eet/description
+  EET is a tiny library designed to write an arbitary set of chunks of data to a file and optionally compress each chunk (very much like a zip file) and allow fast random-access reading of the file later on. EET files are perfect for storing data that is written once (or rarely) and read many times, especially when the program does not want to have to read all the data in at once.
+endef
+
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+	$(call Build/Configure/Default, \
+		--disable-openssl \
+		--disable-gnutls \
+	)
+endef
+
+define Build/Compile
+	DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+endef
+
+define Package/eet/install
+	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,eet))
diff --git a/Xorg/efl/eet/Makefile.native b/Xorg/efl/eet/Makefile.native
new file mode 100644
index 000000000..73e37041c
--- /dev/null
+++ b/Xorg/efl/eet/Makefile.native
@@ -0,0 +1,83 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=eet
+PKG_VERSION:=
+PKG_RELEASE:=1
+
+PKG_SOURCE:=e17.libs.$(PKG_NAME)_anoncvs.enlightenment.org__20080825.tar.gz
+PKG_SOURCE_URL:=http://downloads.openmoko.org/sources/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}/
+
+PKG_FIXUP = libtool
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/eet
+  SECTION:=xorg-lib
+  CATEGORY:=Xorg
+  SUBMENU:=lib
+  TITLE:=EET is a tiny library designed to write an arbitary set of chunks of data to a file
+  URL:=http://wiki.enlightenment.org/index.php/Eet
+  DEPENDS:=+libjpeg +zlib
+endef
+
+define Package/eet/description
+  EET is a tiny library designed to write an arbitary set of chunks of data to a file and optionally compress each chunk (very much like a zip file) and allow fast random-access reading of the file later on. EET files are perfect for storing data that is written once (or rarely) and read many times, especially when the program does not want to have to read all the data in at once.
+endef
+
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+	$(call Build/Configure/Default, \
+	)
+endef
+
+define Build/Compile
+	mkdir -p $(PKG_INSTALL_DIR)/host $(PKG_INSTALL_DIR)/target
+	$(MAKE) -C $(PKG_BUILD_DIR) all
+	DESTDIR="$(PKG_INSTALL_DIR)/target" $(MAKE) -C $(PKG_BUILD_DIR) all install
+	$(MAKE) -C $(PKG_BUILD_DIR) clean
+	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+		./configure \
+			--prefix=/usr \
+			--exec-prefix=/usr \
+			--bindir=/usr/bin \
+			--datadir=/usr/share \
+			--includedir=/usr/include \
+			--infodir=/usr/share/info \
+			--libdir=/usr/lib \
+			--libexecdir=/usr/lib \
+			--localstatedir=/var \
+			--mandir=/usr/share/man \
+			--sbindir=/usr/sbin \
+			--sysconfdir=/etc \
+	);
+	$(MAKE) -C $(PKG_BUILD_DIR) all CC="$(HOSTCC)" CFLAGS="" LDFLAGS="-I$(STAGING_DIR_HOST)/usr/lib/"
+	DESTDIR="$(PKG_INSTALL_DIR)/host" $(MAKE) -C $(PKG_BUILD_DIR) all install
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/bin $(STAGING_DIR_HOST)/usr/include $(STAGING_DIR_HOST)/usr/lib $(STAGING_DIR_HOST)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/target/usr/include/* $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/target/usr/lib/* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/target/usr/bin/* $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/host/usr/lib/* $(STAGING_DIR_HOST)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/host/usr/bin/* $(STAGING_DIR_HOST)/usr/bin/
+endef
+
+define Package/eet/install
+	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin $(STAGING_DIR_HOST)/usr/lib $(STAGING_DIR_HOST)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/target/usr/lib/*.so* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/target/usr/bin/* $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/host/usr/lib/*.so* $(STAGING_DIR_HOST)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/host/usr/bin/* $(STAGING_DIR_HOST)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,eet))
diff --git a/Xorg/efl/efreet/Makefile b/Xorg/efl/efreet/Makefile
new file mode 100644
index 000000000..5ee014253
--- /dev/null
+++ b/Xorg/efl/efreet/Makefile
@@ -0,0 +1,61 @@
+# 
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=efreet
+PKG_REV:=37637
+PKG_VERSION:=r$(PKG_REV)
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/$(PKG_NAME)
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+
+PKG_FIXUP = libtool
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/efreet
+  SECTION:=xorg-lib
+  CATEGORY:=Xorg
+  SUBMENU:=lib
+  TITLE:=Enlightenment freedesktop.org library
+  URL:=http://wiki.enlightenment.org/index.php/Efreet
+  DEPENDS:=+ecore
+endef
+
+define Package/efreet/description
+ Efreet is an implementation of several specifications from freedesktop.org intended for use in Enlightenment DR17 (e17) and other applications using the Enlightenment Foundation Libraries (EFL).
+endef
+
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+	$(call Build/Configure/Default)
+endef
+
+define Build/Compile
+	DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install
+endef
+
+define Build/InstallDev
+	mkdir -p $(1)/usr/include $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+endef
+
+define Package/efreet/install
+	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libefreet*.so* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,efreet))
diff --git a/Xorg/efl/eina/Makefile b/Xorg/efl/eina/Makefile
new file mode 100644
index 000000000..b558ed027
--- /dev/null
+++ b/Xorg/efl/eina/Makefile
@@ -0,0 +1,63 @@
+#
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=eina
+PKG_REV:=37637
+PKG_VERSION:=r$(PKG_REV)
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/$(PKG_NAME)
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+
+PKG_FIXUP = libtool
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/eina
+  SECTION:=xorg-lib
+  CATEGORY:=Xorg
+  SUBMENU:=lib
+  TITLE:=Eina
+  URL:=http://wiki.enlightenment.org/index.php/Eina
+#  DEPENDS:=+libjpeg +zlib +eet +evas +ecore +embryo
+endef
+
+define Package/eina/description
+foobar
+endef
+
+EXTRA_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+	$(call Build/Configure/Default)
+endef
+
+define Build/Compile
+	DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+endef
+
+define Package/eina/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+	find $(1)/usr/lib -name *.la -name *.a | xargs rm -f
+endef
+
+$(eval $(call BuildPackage,eina))
diff --git a/Xorg/efl/embryo/Makefile b/Xorg/efl/embryo/Makefile
new file mode 100644
index 000000000..07b063064
--- /dev/null
+++ b/Xorg/efl/embryo/Makefile
@@ -0,0 +1,61 @@
+# 
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=embryo
+PKG_REV:=37637
+PKG_VERSION:=r$(PKG_REV)
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/$(PKG_NAME)
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+
+PKG_FIXUP = libtool
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/embryo
+  SECTION:=xorg-lib
+  CATEGORY:=Xorg
+  SUBMENU:=lib
+  TITLE:=Embryo implements a C like scripting language used in various parts of the Enlightenment project (edje)
+  URL:=http://wiki.enlightenment.org/index.php/Embryo
+  DEPENDS:=+eet +evas +libXtst +libXcursor +libXrandr 
+endef
+
+define Package/embryo/description
+  Embryo implements a C like scripting language used in various parts of the Enlightenment project, namely Edje. Embryo's scripting language is based on CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. Embryo allows scripting capabilities in places that otherwise wouldn't support basic programming structures such as in Edje EDCs.
+endef
+
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+	$(call Build/Configure/Default)
+endef
+
+define Build/Compile
+	DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install
+endef
+
+define Build/InstallDev
+	mkdir -p $(1)/usr/include $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+endef
+
+define Package/embryo/install
+	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libembryo.so* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/embryo_cc $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,embryo))
diff --git a/Xorg/efl/evas/Makefile b/Xorg/efl/evas/Makefile
new file mode 100644
index 000000000..4662c9a7c
--- /dev/null
+++ b/Xorg/efl/evas/Makefile
@@ -0,0 +1,120 @@
+# 
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=evas
+PKG_REV:=37637
+PKG_VERSION:=r$(PKG_REV)
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/$(PKG_NAME)
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+
+PKG_FIXUP = libtool
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/evas
+  SECTION:=xorg-lib
+  CATEGORY:=Xorg
+  SUBMENU:=lib
+  TITLE:=Evas is a hardware-accelerated canvas API for X-Windows
+  URL:=http://wiki.enlightenment.org/index.php/Evas
+  DEPENDS:=+eet +libfreetype +libjpeg +libpng +libX11 +libXext +libXrender +fontconfig
+endef
+
+define Package/evas/description
+  Evas is a hardware-accelerated canvas API for X-Windows that can draw anti-aliased text, smooth super and sub-sampled images, alpha-blend, as well as drop down to using normal X11 primitives such as pixmaps, lines and rectangles for speed if your CPU or graphics hardware are too slow.
+endef
+
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+	$(call Build/Configure/Default, \
+		--disable-pthreads		\
+		--enable-fb			\
+		--disable-directfb		\
+		--disable-sdl			\
+		--enable-buffer			\
+		--disable-software-ddraw	\
+		--disable-software-qtopia	\
+		--enable-simple-x11		\
+		--enable-software-x11		\
+		--enable-software-16-x11	\
+		--disable-software-xcb		\
+		--disable-gl-x11		\
+		--enable-xrender-x11		\
+		--disable-xrender-xcb		\
+		--disable-glitz-x11		\
+		--enable-image-loader-eet	\
+		--disable-image-loader-edb	\
+		--disable-image-loader-gif	\
+		--enable-image-loader-png	\
+		--enable-image-loader-jpeg	\
+		--enable-image-loader-tiff	\
+		--enable-image-loader-xpm	\
+		--enable-image-loader-svg	\
+		--enable-cpu-c			\
+		--enable-fontconfig		\
+		--enable-font-loader-eet	\
+		--enable-scale-sample		\
+		--enable-scale-smooth		\
+		--enable-convert-yuv		\
+		--enable-small-dither-mask	\
+		--enable-no-dither-mask	\
+		--enable-convert-8-rgb-332	\
+		--enable-convert-8-rgb-666	\
+		--enable-convert-8-rgb-232	\
+		--enable-convert-8-rgb-222	\
+		--enable-convert-8-rgb-221	\
+		--enable-convert-8-rgb-121	\
+		--enable-convert-8-rgb-111	\
+		--enable-convert-16-rgb-565	\
+		--enable-convert-16-rgb-555	\
+		--enable-convert-16-rgb-444	\
+		--enable-convert-16-rgb-ipq	\
+		--enable-convert-16-rgb-rot-0	\
+		--enable-convert-16-rgb-rot-90	\
+		--enable-convert-16-rgb-rot-180\
+		--enable-convert-16-rgb-rot-270	\
+		--enable-convert-24-rgb-888	\
+		--enable-convert-24-bgr-888	\
+		--enable-convert-32-rgb-8888	\
+		--enable-convert-32-rgbx-8888	\
+		--enable-convert-32-bgr-8888	\
+		--enable-convert-32-bgrx-8888	\
+		--enable-convert-32-rgb-rot-0	\
+		--enable-convert-32-rgb-rot-90	\
+		--enable-convert-32-rgb-rot-180 \
+		--enable-convert-32-rgb-rot-270 \
+	)
+endef
+
+define Build/Compile
+	DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+endef
+
+define Package/evas/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevas.so* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/evas $(1)/usr/lib/
+	find $(1)/usr/lib/evas -name *.la | xargs rm -rf
+	find $(1)/usr/lib/evas -name *.a | xargs rm -rf
+endef
+
+$(eval $(call BuildPackage,evas))
diff --git a/Xorg/lib/ecore/Makefile b/Xorg/lib/ecore/Makefile
deleted file mode 100644
index b08e3b3f0..000000000
--- a/Xorg/lib/ecore/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ecore
-PKG_REV:=37637
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=svn
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/$(PKG_NAME)
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-
-PKG_FIXUP = libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ecore
-  SECTION:=xorg-lib
-  CATEGORY:=Xorg
-  SUBMENU:=lib
-  TITLE:=Ecore is the core event abstraction layer and X abstraction layer
-  URL:=http://wiki.enlightenment.org/index.php/Ecore
-  DEPENDS:=+eet +evas +libXcursor +libXrandr +libXtst +libiconv
-endef
-
-define Package/ecore/description
-  Ecore is the core event abstraction layer and X abstraction layer that makes doing selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers fast, optimized, and convenient. It's a separate library so anyone can make use of the work put into Ecore to make this job easy for applications.
-endef
-
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include
-EXTRA_LDFLAGS+=-liconv -L$(STAGING_DIR)/usr/lib/libiconv/lib
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
-	$(call Build/Configure/Default, \
-                --with-iconv-link \
-                --enable-ecore-txt \
-                --disable-ecore-config \
-                --disable-ecore-x-xcb \
-                --enable-ecore-x \
-                --enable-ecore-job \
-                --disable-ecore-directfb \
-                --disable-ecore-sdl \
-                --enable-ecore-fb \
-                --enable-ecore-evas \
-                --enable-ecore-evas-fb \
-                --disable-ecore-evas-x11-gl \
-                --enable-ecore-evas-xrender \
-                --disable-ecore-evas-dfb \
-                --disable-ecore-evas-sdl \
-                --disable-openssl \
-                --enable-abstract-sockets \
-                --enable-ecore-con \
-                --enable-ecore-ipc \
-                --enable-ecore-file \
-                --enable-inotify \
-                --disable-poll \
-                --disable-curl \
-                --disable-ecore-desktop \
-                --disable-gnutls \
-	)
-endef
-
-define Build/Compile
-	DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install
-endef
-
-define Build/InstallDev
-	mkdir -p $(1)/usr/include $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/ecore/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,ecore))
diff --git a/Xorg/lib/ecore/Makefile.native b/Xorg/lib/ecore/Makefile.native
deleted file mode 100644
index 53f4d038b..000000000
--- a/Xorg/lib/ecore/Makefile.native
+++ /dev/null
@@ -1,94 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ecore
-PKG_VERSION:=
-PKG_RELEASE:=1
-
-PKG_SOURCE:=e17.libs.$(PKG_NAME)_anoncvs.enlightenment.org__20080825.tar.gz
-PKG_SOURCE_URL:=http://downloads.openmoko.org/sources/
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}/
-
-PKG_FIXUP = libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ecore
-  SECTION:=xorg-lib
-  CATEGORY:=Xorg
-  SUBMENU:=lib
-  TITLE:=Ecore is the core event abstraction layer and X abstraction layer
-  URL:=http://wiki.enlightenment.org/index.php/Ecore
-  DEPENDS:=+eet +evas +libXcursor +libXrandr +libXtst +libiconv
-endef
-
-define Package/ecore/description
-  Ecore is the core event abstraction layer and X abstraction layer that makes doing selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers fast, optimized, and convenient. It's a separate library so anyone can make use of the work put into Ecore to make this job easy for applications.
-endef
-
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include
-EXTRA_LDFLAGS+=-liconv -L$(STAGING_DIR)/usr/lib/libiconv/lib
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
-	$(call Build/Configure/Default, \
-                --with-iconv-link \
-                --enable-ecore-txt \
-                --disable-ecore-config \
-                --disable-ecore-x-xcb \
-                --enable-ecore-x \
-                --enable-ecore-job \
-                --disable-ecore-directfb \
-                --disable-ecore-sdl \
-                --enable-ecore-fb \
-                --enable-ecore-evas \
-                --enable-ecore-evas-fb \
-                --disable-ecore-evas-x11-gl \
-                --disable-ecore-evas-xrender \
-                --disable-ecore-evas-dfb \
-                --disable-ecore-evas-sdl \
-                --disable-openssl \
-                --enable-abstract-sockets \
-                --enable-ecore-con \
-                --enable-ecore-ipc \
-                --enable-ecore-file \
-                --enable-inotify \
-                --disable-poll \
-                --disable-curl \
-                --disable-ecore-desktop \
-                --disable-ecore-imf \
-                --disable-ecore-imf_evas \
-	)
-endef
-
-define Build/Compile
-	mkdir -p $(PKG_INSTALL_DIR)/host $(PKG_INSTALL_DIR)/target
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	DESTDIR="$(PKG_INSTALL_DIR)/target" $(MAKE) -C $(PKG_BUILD_DIR) all install
-	$(MAKE) -C $(PKG_BUILD_DIR) clean
-	$(MAKE) -C $(PKG_BUILD_DIR) all CC="$(HOSTCC)" CFLAGS="" LDFLAGS="-I$(STAGING_DIR_HOST)/usr/lib/"
-	DESTDIR="$(PKG_INSTALL_DIR)/host" $(MAKE) -C $(PKG_BUILD_DIR) all install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(STAGING_DIR_HOST)/usr/include $(STAGING_DIR_HOST)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/target/usr/include/* $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/target/usr/lib/* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/host/usr/include/* $(STAGING_DIR_HOST)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/host/usr/lib/* $(STAGING_DIR_HOST)/usr/lib/
-endef
-
-define Package/ecore/install
-	$(INSTALL_DIR) $(1)/usr/lib $(STAGING_DIR_HOST)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/taget/usr/lib/* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/host/usr/lib/* $(STAGING_DIR_HOST)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,ecore))
diff --git a/Xorg/lib/edbus/Makefile b/Xorg/lib/edbus/Makefile
deleted file mode 100644
index e9e860dcf..000000000
--- a/Xorg/lib/edbus/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=e_dbus
-PKG_REV:=37637
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=svn
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/$(PKG_NAME)
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-
-PKG_FIXUP = libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/edbus
-  SECTION:=xorg-lib
-  CATEGORY:=Xorg
-  SUBMENU:=lib
-  TITLE:=Edbus
-  URL:=http://wiki.enlightenment.org/index.php
-  DEPENDS:=+dbus +ecore
-endef
-
-EXTRA_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
-	$(call Build/Configure/Default)
-endef
-
-define Build/Compile
-	DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-define Package/edbus/install
-	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,edbus))
diff --git a/Xorg/lib/edje/Makefile b/Xorg/lib/edje/Makefile
deleted file mode 100644
index 5affd4d5d..000000000
--- a/Xorg/lib/edje/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=edje
-PKG_REV:=37637
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=svn
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/$(PKG_NAME)
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-
-PKG_FIXUP = libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/edje
-  SECTION:=xorg-lib
-  CATEGORY:=Xorg
-  SUBMENU:=lib
-  TITLE:=Edje is a graphical design and layout library
-  URL:=http://wiki.enlightenment.org/index.php/Edje
-  DEPENDS:=+libjpeg +zlib +eet +evas +ecore +embryo
-endef
-
-define Package/edje/description
-Edje is a graphical design and layout library based on Evas that provides an abstraction layer between the application code and the interface, while allowing extremely flexible dynamic layouts and animations.
-endef
-
-EXTRA_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
-	$(call Build/Configure/Default, \
-		--disable-edje-cc \
-	)
-endef
-
-define Build/Compile
-	DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/edje/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,edje))
diff --git a/Xorg/lib/edje/Makefile.native b/Xorg/lib/edje/Makefile.native
deleted file mode 100644
index e6a2d608a..000000000
--- a/Xorg/lib/edje/Makefile.native
+++ /dev/null
@@ -1,91 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=edje
-PKG_VERSION:=
-PKG_RELEASE:=1
-
-PKG_SOURCE:=e17.libs.$(PKG_NAME)_anoncvs.enlightenment.org__20080825.tar.gz
-PKG_SOURCE_URL:=http://downloads.openmoko.org/sources/
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}/
-
-PKG_FIXUP = libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/edje
-  SECTION:=xorg-lib
-  CATEGORY:=Xorg
-  SUBMENU:=lib
-  TITLE:=Edje is a graphical design and layout library
-  URL:=http://wiki.enlightenment.org/index.php/Edje
-  DEPENDS:=+libjpeg +zlib +eet +evas +ecore +embryo
-endef
-
-define Package/edje/description
-Edje is a graphical design and layout library based on Evas that provides an abstraction layer between the application code and the interface, while allowing extremely flexible dynamic layouts and animations.
-endef
-
-EXTRA_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
-	$(call Build/Configure/Default \
-		--disable-edje-cc \
-	)
-endef
-
-#edge provides an own compiler (edge_cc) which needs be compiled for the host-system
-#define Build/Compile
-#	mkdir -p $(PKG_INSTALL_DIR)/host $(PKG_INSTALL_DIR)/target
-#	$(MAKE) -C $(PKG_BUILD_DIR) all
-#	DESTDIR="$(PKG_INSTALL_DIR)/target" $(MAKE) -C $(PKG_BUILD_DIR) all install
-#	$(MAKE) -C $(PKG_BUILD_DIR) clean
-#	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-#		./configure \
-#			--prefix=/usr \
-#			--exec-prefix=/usr \
-#			--bindir=/usr/bin \
-#			--datadir=/usr/share \
-#			--includedir=/usr/include \
-#			--infodir=/usr/share/info \
-#			--libdir=/usr/lib \
-#			--libexecdir=/usr/lib \
-#			--localstatedir=/var \
-#			--mandir=/usr/share/man \
-#			--sbindir=/usr/sbin \
-#			--sysconfdir=/etc \
-#			LDFLAGS="-L$(STAGING_DIR_HOST)/usr/lib" \
-#			CFLAGS="-I$(STAGING_DIR_HOST)/usr/include" \
-#			EDGE_LDFLAGS=-L$(STAGING_DIR_HOST)/usr/lib \
-			EDGE_CFLAGS=-I$(STAGING_DIR_HOST)/usr/include \
-#	);
-#	$(MAKE) -C $(PKG_BUILD_DIR) all CC="$(HOSTCC)" LDFLAGS="-L$(STAGING_DIR_HOST)/usr/lib" "CFLAGS=-I$(STAGING_DIR_HOST)/usr/include"
-#	DESTDIR="$(PKG_INSTALL_DIR)/host" $(MAKE) -C $(PKG_BUILD_DIR) all install
-#endef
-
-#define Build/InstallDev
-#	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/bin $(STAGING_DIR_HOST)/usr/include $(STAGING_DIR_HOST)/usr/lib $(STAGING_DIR_HOST)/usr/bin
-#	$(CP) $(PKG_INSTALL_DIR)/target/usr/include/* $(1)/usr/include/
-#	$(CP) $(PKG_INSTALL_DIR)/target/usr/lib/* $(1)/usr/lib/
-#	$(CP) $(PKG_INSTALL_DIR)/target/usr/bin/edje_cc $(1)/usr/bin/
-#	$(CP) $(PKG_INSTALL_DIR)/host/usr/lib/* $(STAGING_DIR_HOST)/usr/lib/
-#	$(CP) $(PKG_INSTALL_DIR)/host/usr/bin/edje_cc $(STAGING_DIR_HOST)/usr/bin/
-#endef
-
-#define Package/edje/install
-#	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin $(STAGING_DIR_HOST)/usr/lib $(STAGING_DIR_HOST)/usr/bin
-#	$(CP) $(PKG_INSTALL_DIR)/target/usr/lib/*.so* $(1)/usr/lib/
-#	$(CP) $(PKG_INSTALL_DIR)/target/usr/bin/edje_cc $(1)/usr/bin/
-#	$(CP) $(PKG_INSTALL_DIR)/host/usr/lib/*.so* $(STAGING_DIR_HOST)/usr/lib/
-#	$(CP) $(PKG_INSTALL_DIR)/host/usr/bin/edje_cc $(STAGING_DIR_HOST)/usr/bin/
-#endef
-
-$(eval $(call BuildPackage,edje))
diff --git a/Xorg/lib/edje/patches/001-edje_cc-native.patch b/Xorg/lib/edje/patches/001-edje_cc-native.patch
deleted file mode 100644
index 9c7003c70..000000000
--- a/Xorg/lib/edje/patches/001-edje_cc-native.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ruN edje.orig/src/bin/edje_cc_parse.c edje/src/bin/edje_cc_parse.c
---- edje.orig/src/bin/edje_cc_parse.c	2008-10-08 03:40:17.000000000 +0200
-+++ edje/src/bin/edje_cc_parse.c	2008-10-08 03:41:59.000000000 +0200
-@@ -667,12 +667,12 @@
- 	 * Redirecting the output is required for MacOS 10.3, and works fine
- 	 * on other systems.
- 	 */
--	snprintf(buf, sizeof(buf), "cat %s | cpp -I%s %s > %s",
-+	snprintf(buf, sizeof(buf), "cat %s | /usr/bin/cpp -I%s %s > %s",
- 		 file_in, inc, def, tmpn);
- 	ret = system(buf);
- 	if (ret < 0)
- 	  {
--	     snprintf(buf, sizeof(buf), "gcc -I%s %s -E -o %s %s",
-+	     snprintf(buf, sizeof(buf), "/usr/bin/gcc -I%s %s -E -o %s %s",
- 		      inc, def, tmpn, file_in);
- 	     ret = system(buf);
- 	  }
diff --git a/Xorg/lib/eet/Makefile b/Xorg/lib/eet/Makefile
deleted file mode 100644
index 6d31dbe15..000000000
--- a/Xorg/lib/eet/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=eet
-PKG_REV:=37637
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=svn
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/$(PKG_NAME)
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-
-PKG_FIXUP = libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/eet
-  SECTION:=xorg-lib
-  CATEGORY:=Xorg
-  SUBMENU:=lib
-  TITLE:=EET is a tiny library designed to write an arbitary set of chunks of data to a file
-  URL:=http://wiki.enlightenment.org/index.php/Eet
-  DEPENDS:=+libjpeg +zlib +eina
-endef
-
-define Package/eet/description
-  EET is a tiny library designed to write an arbitary set of chunks of data to a file and optionally compress each chunk (very much like a zip file) and allow fast random-access reading of the file later on. EET files are perfect for storing data that is written once (or rarely) and read many times, especially when the program does not want to have to read all the data in at once.
-endef
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
-	$(call Build/Configure/Default, \
-		--disable-openssl \
-		--disable-gnutls \
-	)
-endef
-
-define Build/Compile
-	DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-define Package/eet/install
-	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,eet))
diff --git a/Xorg/lib/eet/Makefile.native b/Xorg/lib/eet/Makefile.native
deleted file mode 100644
index 73e37041c..000000000
--- a/Xorg/lib/eet/Makefile.native
+++ /dev/null
@@ -1,83 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=eet
-PKG_VERSION:=
-PKG_RELEASE:=1
-
-PKG_SOURCE:=e17.libs.$(PKG_NAME)_anoncvs.enlightenment.org__20080825.tar.gz
-PKG_SOURCE_URL:=http://downloads.openmoko.org/sources/
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}/
-
-PKG_FIXUP = libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/eet
-  SECTION:=xorg-lib
-  CATEGORY:=Xorg
-  SUBMENU:=lib
-  TITLE:=EET is a tiny library designed to write an arbitary set of chunks of data to a file
-  URL:=http://wiki.enlightenment.org/index.php/Eet
-  DEPENDS:=+libjpeg +zlib
-endef
-
-define Package/eet/description
-  EET is a tiny library designed to write an arbitary set of chunks of data to a file and optionally compress each chunk (very much like a zip file) and allow fast random-access reading of the file later on. EET files are perfect for storing data that is written once (or rarely) and read many times, especially when the program does not want to have to read all the data in at once.
-endef
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
-	$(call Build/Configure/Default, \
-	)
-endef
-
-define Build/Compile
-	mkdir -p $(PKG_INSTALL_DIR)/host $(PKG_INSTALL_DIR)/target
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	DESTDIR="$(PKG_INSTALL_DIR)/target" $(MAKE) -C $(PKG_BUILD_DIR) all install
-	$(MAKE) -C $(PKG_BUILD_DIR) clean
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		./configure \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-	);
-	$(MAKE) -C $(PKG_BUILD_DIR) all CC="$(HOSTCC)" CFLAGS="" LDFLAGS="-I$(STAGING_DIR_HOST)/usr/lib/"
-	DESTDIR="$(PKG_INSTALL_DIR)/host" $(MAKE) -C $(PKG_BUILD_DIR) all install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/bin $(STAGING_DIR_HOST)/usr/include $(STAGING_DIR_HOST)/usr/lib $(STAGING_DIR_HOST)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/target/usr/include/* $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/target/usr/lib/* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/target/usr/bin/* $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/host/usr/lib/* $(STAGING_DIR_HOST)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/host/usr/bin/* $(STAGING_DIR_HOST)/usr/bin/
-endef
-
-define Package/eet/install
-	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin $(STAGING_DIR_HOST)/usr/lib $(STAGING_DIR_HOST)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/target/usr/lib/*.so* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/target/usr/bin/* $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/host/usr/lib/*.so* $(STAGING_DIR_HOST)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/host/usr/bin/* $(STAGING_DIR_HOST)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,eet))
diff --git a/Xorg/lib/efreet/Makefile b/Xorg/lib/efreet/Makefile
deleted file mode 100644
index 5ee014253..000000000
--- a/Xorg/lib/efreet/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=efreet
-PKG_REV:=37637
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=svn
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/$(PKG_NAME)
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-
-PKG_FIXUP = libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/efreet
-  SECTION:=xorg-lib
-  CATEGORY:=Xorg
-  SUBMENU:=lib
-  TITLE:=Enlightenment freedesktop.org library
-  URL:=http://wiki.enlightenment.org/index.php/Efreet
-  DEPENDS:=+ecore
-endef
-
-define Package/efreet/description
- Efreet is an implementation of several specifications from freedesktop.org intended for use in Enlightenment DR17 (e17) and other applications using the Enlightenment Foundation Libraries (EFL).
-endef
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
-	$(call Build/Configure/Default)
-endef
-
-define Build/Compile
-	DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install
-endef
-
-define Build/InstallDev
-	mkdir -p $(1)/usr/include $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/efreet/install
-	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libefreet*.so* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,efreet))
diff --git a/Xorg/lib/eina/Makefile b/Xorg/lib/eina/Makefile
deleted file mode 100644
index b558ed027..000000000
--- a/Xorg/lib/eina/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=eina
-PKG_REV:=37637
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=svn
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/$(PKG_NAME)
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-
-PKG_FIXUP = libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/eina
-  SECTION:=xorg-lib
-  CATEGORY:=Xorg
-  SUBMENU:=lib
-  TITLE:=Eina
-  URL:=http://wiki.enlightenment.org/index.php/Eina
-#  DEPENDS:=+libjpeg +zlib +eet +evas +ecore +embryo
-endef
-
-define Package/eina/description
-foobar
-endef
-
-EXTRA_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
-	$(call Build/Configure/Default)
-endef
-
-define Build/Compile
-	DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/eina/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-	find $(1)/usr/lib -name *.la -name *.a | xargs rm -f
-endef
-
-$(eval $(call BuildPackage,eina))
diff --git a/Xorg/lib/embryo/Makefile b/Xorg/lib/embryo/Makefile
deleted file mode 100644
index 07b063064..000000000
--- a/Xorg/lib/embryo/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=embryo
-PKG_REV:=37637
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=svn
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/$(PKG_NAME)
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-
-PKG_FIXUP = libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/embryo
-  SECTION:=xorg-lib
-  CATEGORY:=Xorg
-  SUBMENU:=lib
-  TITLE:=Embryo implements a C like scripting language used in various parts of the Enlightenment project (edje)
-  URL:=http://wiki.enlightenment.org/index.php/Embryo
-  DEPENDS:=+eet +evas +libXtst +libXcursor +libXrandr 
-endef
-
-define Package/embryo/description
-  Embryo implements a C like scripting language used in various parts of the Enlightenment project, namely Edje. Embryo's scripting language is based on CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. Embryo allows scripting capabilities in places that otherwise wouldn't support basic programming structures such as in Edje EDCs.
-endef
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
-	$(call Build/Configure/Default)
-endef
-
-define Build/Compile
-	DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install
-endef
-
-define Build/InstallDev
-	mkdir -p $(1)/usr/include $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/embryo/install
-	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libembryo.so* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/embryo_cc $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,embryo))
diff --git a/Xorg/lib/evas/Makefile b/Xorg/lib/evas/Makefile
deleted file mode 100644
index 4662c9a7c..000000000
--- a/Xorg/lib/evas/Makefile
+++ /dev/null
@@ -1,120 +0,0 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=evas
-PKG_REV:=37637
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=svn
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/$(PKG_NAME)
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-
-PKG_FIXUP = libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/evas
-  SECTION:=xorg-lib
-  CATEGORY:=Xorg
-  SUBMENU:=lib
-  TITLE:=Evas is a hardware-accelerated canvas API for X-Windows
-  URL:=http://wiki.enlightenment.org/index.php/Evas
-  DEPENDS:=+eet +libfreetype +libjpeg +libpng +libX11 +libXext +libXrender +fontconfig
-endef
-
-define Package/evas/description
-  Evas is a hardware-accelerated canvas API for X-Windows that can draw anti-aliased text, smooth super and sub-sampled images, alpha-blend, as well as drop down to using normal X11 primitives such as pixmaps, lines and rectangles for speed if your CPU or graphics hardware are too slow.
-endef
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
-	$(call Build/Configure/Default, \
-		--disable-pthreads		\
-		--enable-fb			\
-		--disable-directfb		\
-		--disable-sdl			\
-		--enable-buffer			\
-		--disable-software-ddraw	\
-		--disable-software-qtopia	\
-		--enable-simple-x11		\
-		--enable-software-x11		\
-		--enable-software-16-x11	\
-		--disable-software-xcb		\
-		--disable-gl-x11		\
-		--enable-xrender-x11		\
-		--disable-xrender-xcb		\
-		--disable-glitz-x11		\
-		--enable-image-loader-eet	\
-		--disable-image-loader-edb	\
-		--disable-image-loader-gif	\
-		--enable-image-loader-png	\
-		--enable-image-loader-jpeg	\
-		--enable-image-loader-tiff	\
-		--enable-image-loader-xpm	\
-		--enable-image-loader-svg	\
-		--enable-cpu-c			\
-		--enable-fontconfig		\
-		--enable-font-loader-eet	\
-		--enable-scale-sample		\
-		--enable-scale-smooth		\
-		--enable-convert-yuv		\
-		--enable-small-dither-mask	\
-		--enable-no-dither-mask	\
-		--enable-convert-8-rgb-332	\
-		--enable-convert-8-rgb-666	\
-		--enable-convert-8-rgb-232	\
-		--enable-convert-8-rgb-222	\
-		--enable-convert-8-rgb-221	\
-		--enable-convert-8-rgb-121	\
-		--enable-convert-8-rgb-111	\
-		--enable-convert-16-rgb-565	\
-		--enable-convert-16-rgb-555	\
-		--enable-convert-16-rgb-444	\
-		--enable-convert-16-rgb-ipq	\
-		--enable-convert-16-rgb-rot-0	\
-		--enable-convert-16-rgb-rot-90	\
-		--enable-convert-16-rgb-rot-180\
-		--enable-convert-16-rgb-rot-270	\
-		--enable-convert-24-rgb-888	\
-		--enable-convert-24-bgr-888	\
-		--enable-convert-32-rgb-8888	\
-		--enable-convert-32-rgbx-8888	\
-		--enable-convert-32-bgr-8888	\
-		--enable-convert-32-bgrx-8888	\
-		--enable-convert-32-rgb-rot-0	\
-		--enable-convert-32-rgb-rot-90	\
-		--enable-convert-32-rgb-rot-180 \
-		--enable-convert-32-rgb-rot-270 \
-	)
-endef
-
-define Build/Compile
-	DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/evas/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevas.so* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/evas $(1)/usr/lib/
-	find $(1)/usr/lib/evas -name *.la | xargs rm -rf
-	find $(1)/usr/lib/evas -name *.a | xargs rm -rf
-endef
-
-$(eval $(call BuildPackage,evas))