propagate from branch 'org.openembedded.dev' (head af7da4406babf078f2747a3588cfa451ae711315)

            to branch 'org.openembedded.nslu2-linux' (head 99bf568313454a05bf17df79cb135d7e4bb6c643)

105 files changed, 735 insertions, 2460 deletions

diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb
index 80e22d1924..a0b5996d6c 100644
--- a/packages/altboot/altboot.bb
+++ b/packages/altboot/altboot.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
  
 
-PR = "r5"
+PR = "r7"
 
 
 SRC_URI = "file://altboot-menu \
@@ -39,27 +39,32 @@ pkg_postinst() {
 }
 
 pkg_postinst_spitz() {
-	
 	# Note: Spitz support is a royal pain in the ass.
 	#       Since Spitz pivot_roots by default, there is no real way
 	#	a user can install an altboot.ipk into the flash FS.
 	#	So we need to do that manually (*SIGH*)
-	
+
 	# /l/m only exists on the HDD on spitz
 	if test -d /lib/modules
 	then
-		if [ -e /media/realroot/sbin/init ]; then
-		  ROOT_MOUNT_POINT="/media/realroot"
-		elif [ -e /media/ROM/sbin/init ]; then
-		   ROOT_MOUNT_POINT="/media/ROM"   
-		fi
-		ROOT_MOUNT_DEVICE = `cat /proc/mounts | grep $REALROOT | grep jffs2 | cut -d " " -f 1`
-		mount -oremount,rw $ROOT_MOUNT_DEVICE $ROOT_MOUNT_POINT
-		cp -R /etc/altboot* $ROOT_MOUNT_POINT/etc
-		cp /sbin/init.altboot $ROOT_MOINT_POINT/sbin
-		mv $ROOT_MOUNT_POINT/sbin/init $ROOT_MOUNT_POINT/sbin/init.orig
-		ln -s /sbin/init.altboot $ROOT_MOUNT_POINT/sbin/init
-	fi						
+	   if [ -e /media/realroot/sbin/init ]; then
+	      ROOT_MOUNT_POINT="/media/realroot"
+	   elif [ -e /media/ROM/sbin/init ]; then
+	      ROOT_MOUNT_POINT="/media/ROM"
+	   fi
+	   if [ ! "$ROOT_MOUNT_POINT" = "" ]; then
+	      ROOT_MOUNT_DEVICE=`cat /proc/mounts | grep $ROOT_MOUNT_POINT | grep jffs2 | cut -d " " -f 1`
+	      if [ ! "$ROOT_MOUNT_DEVICE" = "" ]; then
+	         mount -oremount,rw $ROOT_MOUNT_DEVICE $ROOT_MOUNT_POINT
+	         cp -R /etc/altboot* $ROOT_MOUNT_POINT/etc
+	         cp /sbin/init.altboot $ROOT_MOUNT_POINT/sbin
+	         if [ -f $ROOT_MOUNT_POINT/sbin/init ]; then
+	         	 mv $ROOT_MOUNT_POINT/sbin/init $ROOT_MOUNT_POINT/sbin/init.orig
+	         fi
+	         ln -s /sbin/init.altboot $ROOT_MOUNT_POINT/sbin/init
+	      fi
+	   fi
+	fi
 }
 
 pkg_postrm() {
@@ -67,6 +72,25 @@ pkg_postrm() {
 }
 
 pkg_postrm_spitz() {
-	# FIXME: To be written
-	a=a # do nothing
+	if test -d /lib/modules
+        then
+           if [ -e /media/realroot/sbin/init ]; then
+              ROOT_MOUNT_POINT="/media/realroot"
+           elif [ -e /media/ROM/sbin/init ]; then
+              ROOT_MOUNT_POINT="/media/ROM"
+           fi
+           if [ ! "$ROOT_MOUNT_POINT" = "" ]; then
+              ROOT_MOUNT_DEVICE=`cat /proc/mounts | grep $ROOT_MOUNT_POINT | grep jffs2 | cut -d " " -f 1`
+              if [ ! "$ROOT_MOUNT_DEVICE" = "" ]; then
+                 mount -oremount,rw $ROOT_MOUNT_DEVICE $ROOT_MOUNT_POINT
+	         if [ -f $ROOT_MOUNT_POINT/sbin/init.orig ]; then
+	            rm $ROOT_MOUNT_POINT/sbin/init
+	            rm $ROOT_MOUNT_POINT/sbin/init.altboot
+	            mv $ROOT_MOUNT_POINT/sbin/init.orig $ROOT_MOUNT_POINT/sbin/init
+	         else
+	   	 echo "$ROOT_MOUNT_POINT/sbin/init.orig not found, not uninstalling altboot!"
+	         fi
+	      fi
+           fi
+	fi
 }
diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func
index 251368a577..3a6c743f0d 100644
--- a/packages/altboot/files/altboot.func
+++ b/packages/altboot/files/altboot.func
@@ -182,9 +182,9 @@ set_password() {
 	mount -o remount,rw /
 	if test -z "$MASTER_PASSWORD"
 	then
-		echo -e "\nAltboot is a boot-manager which allows to boot from SD, CF and NFS"
+		echo -e "\nAltboot is a boot-manager which allows to boot from SD,\nCF and NFS"
 		echo -e "\nFor security reasons altboot requires a password\nto boot into init=/bin/sh."
-		echo -e "${C_RED}This is *not* your root password! It is used by altboot alone!${C_RESET}"
+		echo -e "${C_RED}This is *not* your root password!\nIt is used by altboot alone!${C_RESET}"
 		echo -e "${C_BLUE}\nNote:\tThe password will be echoed to the screen\n\tand it will be asked twice for confirmation.${C_RESET}"
 		echo -e "\nPlease enter a new master password:\n"
 
diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index 26b4639ccd..5c28edb5f3 100644
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -252,11 +252,11 @@ else
 
 	# Execute scripts in /etc/altboot.rc before doing anything else.
 	# Required for special situations, like booting spitz
-	RC_FILES=`ls /etc/altboot.rc | grep \\\\.sh$`
+	RC_FILES=`ls /etc/altboot.rc | grep \.sh$`
 
 	for file in $RC_FILES
 	do
-		 . $file >/dev/tty1 2>&1 || echo "/etc/altboot.rc/$file failed!"
+		 . /etc/altboot.rc/$file >/dev/tty1 2>&1 || echo "/etc/altboot.rc/$file failed!"
 	done
 	
 	if test "$ENABLE_ALTBOOT" != "yes" 
diff --git a/packages/altboot/files/spitz/altboot-menu/00-Default b/packages/altboot/files/spitz/altboot-menu/00-Default
index 06ed038473..01818262a3 100644
--- a/packages/altboot/files/spitz/altboot-menu/00-Default
+++ b/packages/altboot/files/spitz/altboot-menu/00-Default
@@ -38,7 +38,7 @@ run_module() {
 
 	# There are no device files on Spitz yet, requires HDD (bad for testing
 	# with CF)
-	for n in 1 2 3 4 5
+	for n in 0 1 2 3 4 5
 	do
 		! test -e /dev/loop$n && mknod /dev/loop$n b 7 $n
 	done
diff --git a/packages/altboot/files/spitz/altboot-menu/25-bootHDD3 b/packages/altboot/files/spitz/altboot-menu/25-bootHDD3
new file mode 100644
index 0000000000..4280cdd35c
--- /dev/null
+++ b/packages/altboot/files/spitz/altboot-menu/25-bootHDD3
@@ -0,0 +1,80 @@
+# !/bin/sh
+#
+# Copyright Matthias Hentges (c) 2005
+#
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL)
+
+
+# This file will teach you how to implement your own scripts while using existing altboot
+# code.
+
+# /sbin/init.altboot searches /etc/altboot-menu for scripts. It will only list scripts which
+# return a title when run with the "title" parameter. 
+# Script which do not return a title will never be shown in the boot menu!
+# 
+M_TITLE="Boot from images on HDD3"
+
+# The "title" parameter is implemented at the end of this script so it will never be reached
+# and the script will simply be ignored by altboot.
+
+
+# The die() function aborts the boot if something goes wrong and sets STDIN / STDERR / STDOUT
+# correctly.
+die() {
+	echo "ERROR: $1" >/dev/tty0
+	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
+}
+
+# This function is activated by init.altboot by calling this script with the "run" option
+run_module() {
+
+	# altboot.func contains re-useable code. If you intend to use check_target (see below)
+	# you must keep this line. If not, delete it.
+	test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!"	
+
+
+	# The only thing you'll have to do is get your medium mounted.
+	# The following lines mount a SD card on 2.4-series kernels on a Zaurus
+	
+	##########################################
+	
+	
+	echo -n "Mounting rootfs rw..." >/dev/tty0
+	mount -o remount,rw / >/dev/tty0 2>&1 && echo ok  >/dev/tty0|| die "mount -o remount,rw / failed"
+
+	#echo -n "Generating device files..." >/dev/tty0
+	#/etc/init.d/devices start && echo ok  >/dev/tty0|| die "FAILED"
+
+	cardmgr -o < /dev/tty0 > /dev/tty0 2>&1 || echo "cardmgr -o failed!"
+
+	check_fs $HDD3_DEVICE $HDD3_TYPE
+
+	echo -n "Mounting $HDD3_MOUNTPOINT..."  >/dev/tty0
+	if [ "$HDD3_TYPE" = "" ]; then
+		HDD3_TYPE="auto"
+	fi
+	/bin/mount -t $HDD3_TYPE -o defaults,noatime $HDD3_DEVICE $HDD3_MOUNTPOINT >/dev/null 2>&1 && echo ok  >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $HDD3_DEVICE $HDD3_MOUNTPOINT failed"
+		
+	echo ""
+
+	# Give the SD and CF mounting some time. This is a must for SD			
+	sleep 2
+	##########################################	
+	
+	# Once the medium (be it a CF or SD card, or even a NFS drive) is mounted somewhere,
+	# just call check_target with the mountpoint as parameter.
+	# check_target searches the medium for a real filesystem and loop-images and
+	# asks the user what to boot if there are several choices.
+	
+	# Check for a real fs and loop-images.
+	check_target "$HDD3_MOUNTPOINT" >/dev/tty0
+	
+	# Done :)
+		
+}
+
+
+case "$1" in
+title)	echo "$M_TITLE";;
+run)	run_module "$2";;
+esac
diff --git a/packages/altboot/files/spitz/altboot.cfg b/packages/altboot/files/spitz/altboot.cfg
index 2640d9279a..be90c62eb4 100644
--- a/packages/altboot/files/spitz/altboot.cfg
+++ b/packages/altboot/files/spitz/altboot.cfg
@@ -4,7 +4,7 @@
 # the ROM. This is currently broken.
 ENABLE_ALTBOOT="yes"
 TIMEOUT="3"
-REAL_INIT="/sbin/init"
+REAL_INIT="/sbin/init.sysvinit"
 SH_SHELL="/bin/sh"
 IMAGE_PATH="boot-images"
 IMAGE_TYPE="ext3"
diff --git a/packages/cumulus/cumulus_cvs.bb b/packages/cumulus/cumulus_cvs.bb
index 1fda3d2fde..b8c44b4233 100644
--- a/packages/cumulus/cumulus_cvs.bb
+++ b/packages/cumulus/cumulus_cvs.bb
@@ -6,10 +6,10 @@ LICENSE = "GPL"
 APPTYPE = "binary"
 APPNAME = "cumulus"
 APPDESKTOP = "${S}"
-PV = "1.2+cvs-${CVSDATE}"
-PR = "r2"
+PV = "1.2.1+cvs-${CVSDATE}"
+PR = "r0"
 
-SRC_URI = "http://cumulus.kflog.org/download/snapshot/cumulus-snapshot.tbz"
+SRC_URI = "http://www.kflog.org/fileadmin/user_upload/cumulus_snapshots/cumulus-snapshot.tbz"
 S = "${WORKDIR}/cumulus/cumulus"
 
 inherit opie
diff --git a/packages/curl/curl-native_7.14.0.bb b/packages/curl/curl-native_7.14.0.bb
index 0fc2e14452..59af4ef32e 100644
--- a/packages/curl/curl-native_7.14.0.bb
+++ b/packages/curl/curl-native_7.14.0.bb
@@ -1,6 +1,12 @@
 include curl_${PV}.bb
 inherit native
 
+do_stage () {
+        install -d ${STAGING_INCDIR}/curl
+        install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
+        oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
+}
+
 do_install() {
 	:
 }
diff --git a/packages/ecore/.mtn2git_empty b/packages/e17/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ecore/.mtn2git_empty
+++ b/packages/e17/.mtn2git_empty
diff --git a/packages/e17/e-iconbar_20050810.bb b/packages/e17/e-iconbar_20050810.bb
new file mode 100644
index 0000000000..0d3c14cc06
--- /dev/null
+++ b/packages/e17/e-iconbar_20050810.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "An Iconbar for the Enlightenment Window Manager"
+DEPENDS = "edb eet evas-x11 ecore-x11 edje esmart imlib2-x11"
+LICENSE = "MIT"
+SECTION = "e/apps"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+CVSDATE = "${PV}"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/iconbar"
+S = "${WORKDIR}/iconbar"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*"
diff --git a/packages/e17/e-utils_20050810.bb b/packages/e17/e-utils_20050810.bb
new file mode 100644
index 0000000000..273c7622e6
--- /dev/null
+++ b/packages/e17/e-utils_20050810.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Enlightenment Window Manager Utilities"
+DEPENDS = "freetype eet evas-x11 ecore-x11 edje engrave esmart epsilon ewl imlib2-x11 e17"
+LICENSE = "MIT"
+SECTION = "e/apps"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+CVSDATE = "${PV}"
+PR = "r0"
+
+inherit autotools
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e_utils"
+S = "${WORKDIR}/e_utils"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"
diff --git a/packages/ecore/files/.mtn2git_empty b/packages/e17/e-wm/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ecore/files/.mtn2git_empty
+++ b/packages/e17/e-wm/.mtn2git_empty
diff --git a/packages/e17/e-wm/fix-configure.patch b/packages/e17/e-wm/fix-configure.patch
new file mode 100644
index 0000000000..d2ee47e014
--- /dev/null
+++ b/packages/e17/e-wm/fix-configure.patch
@@ -0,0 +1,54 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- e/configure.in~fix-configure.patch
++++ e/configure.in
+@@ -114,9 +114,7 @@
+ AC_PATH_XTRA
+ AC_CHECK_HEADER(X11/X.h,
+   [
+-    x_dir=${x_dir:-/usr/X11R6}
+-    x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+-    x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
++    x_libs="-lX11 -lXext";
+   ],[
+     AC_MSG_ERROR([Cannot find X headers and libraries.])
+   ]
+--- e/src/bin/Makefile.am~fix-configure.patch
++++ e/src/bin/Makefile.am
+@@ -1,6 +1,5 @@
+ MAINTAINERCLEANFILES = Makefile.in
+-INCLUDES = -I$(includedir) \
+-	   -I$(top_srcdir) \
++INCLUDES = -I$(top_srcdir) \
+ 	   -I$(top_srcdir)/src/bin \
+ 	   -I$(top_srcdir)/src/lib \
+ 	   @e_cflags@ \
+--- e/src/lib/Makefile.am~fix-configure.patch
++++ e/src/lib/Makefile.am
+@@ -1,6 +1,5 @@
+ MAINTAINERCLEANFILES	= Makefile.in
+-INCLUDES		= -I$(includedir) \
+-			  -I$(top_srcdir)/src/bin \
++INCLUDES		= -I$(top_srcdir)/src/bin \
+ 			  @ecore_cflags@ \
+ 			  @evas_cflags@
+ 
+--- e/src/preload/Makefile.am~fix-configure.patch
++++ e/src/preload/Makefile.am
+@@ -2,7 +2,6 @@
+ 
+ INCLUDES               = -I. \
+                          -I$(top_srcdir) \
+-			 -I$(includedir) \
+                          -I$(top_srcdir)src/preload \
+                          @x_cflags@
+ pkgdir                 = $(libdir)/enlightenment/preload
+--- e/src/Makefile.am~fix-configure.patch
++++ e/src/Makefile.am
+@@ -1,2 +1,2 @@
+ MAINTAINERCLEANFILES = Makefile.in
+-SUBDIRS = bin modules lib preload
++SUBDIRS = bin modules preload
diff --git a/packages/e17/e-wm_20050810.bb b/packages/e17/e-wm_20050810.bb
new file mode 100644
index 0000000000..2f6b3c3443
--- /dev/null
+++ b/packages/e17/e-wm_20050810.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "E17 - the Enlightenment Window Mananger"
+DEPENDS = "freetype eet evas-x11 ecore-x11 embryo imlib2-x11 edje-native e"
+LICENSE = "MIT"
+SECTION = "e/apps"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+CVSDATE = "${PV}"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \
+           file://fix-configure.patch;patch=1"
+S = "${WORKDIR}/e"
+
+inherit autotools
+
+PROFILE = "LORES_PDA"
+PROFILE_c7x0 = "HIRES_PDA"
+PROFILE_tosa = "HIRES_PDA"
+PROFILE_spitz = "HIRES_PDA"
+PROFILE_akita = "HIRES_PDA"
+
+EXTRA_OECONF = "--with-profile=${PROFILE} \
+                --with-edje-cc=${STAGING_BINDIR}/edje_cc \
+                --x-includes=${STAGING_INCDIR}/X11 \
+                --x-libraries=${STAGING_LIBDIR}"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"
diff --git a/packages/e17/entice_20050810.bb b/packages/e17/entice_20050810.bb
new file mode 100644
index 0000000000..529f2e3b4c
--- /dev/null
+++ b/packages/e17/entice_20050810.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Entice is a picture viewer"
+SECTION = "e/apps"
+DEPENDS = "freetype eet evas ecore embryo imlib2 edje-native"
+LICENSE = "MIT"
+HOMEPAGE = "http://www.enlightenment.org"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+CVSDATE = "${PV}
+PR = "r0"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entice"
+S = "${WORKDIR}/entice"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*"
+
diff --git a/packages/edb/.mtn2git_empty b/packages/e17/entrance/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/edb/.mtn2git_empty
+++ b/packages/e17/entrance/.mtn2git_empty
diff --git a/packages/e17/entrance/longer-sleep.patch b/packages/e17/entrance/longer-sleep.patch
new file mode 100644
index 0000000000..66ad220de2
--- /dev/null
+++ b/packages/e17/entrance/longer-sleep.patch
@@ -0,0 +1,11 @@
+--- entrance/src/client/entrance_session.c.~1.71.~	2005-05-28 02:31:14.000000000 -0700
++++ entrance/src/client/entrance_session.c	2005-08-07 13:39:35.000000000 -0700
+@@ -454,7 +454,7 @@
+         shell = strdup("/bin/sh");
+         /* this bypasses a race condition where entrance loses its x
+            connection before the wm gets it and x goes and resets itself */
+-        sleep(10);
++        sleep(60);
+         /*
+          * FIXME These should be called!
+         ecore_x_shutdown();
diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb
new file mode 100644
index 0000000000..afc0e82825
--- /dev/null
+++ b/packages/e17/entrance_20050810.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Entrace is the Enlightenment login manager for X11"
+SECTION = "e/apps"
+LICENSE = "MIT"
+DEPENDS = "ecore-x11 edje-native embryo-native esmart"
+HOMEPAGE = "http://www.enlightenment.org"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+CVSDATE = "${PV}"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \
+           file://longer-sleep.patch;patch=1"
+S = "${WORKDIR}/entrance"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+
diff --git a/packages/ecore/ecore-native_0.9.9.013.bb b/packages/ecore/ecore-native_0.9.9.013.bb
deleted file mode 100644
index 4ead109e00..0000000000
--- a/packages/ecore/ecore-native_0.9.9.013.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-include ecore-fb_${PV}.bb
-inherit native
-DEPENDS = "curl-native edb-native eet-native evas-native freetype-native"
-
-export CURL_CONFIG = "${STAGING_BINDIR}/curl-config-native"
-export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config-native"
-export EDB_CONFIG = "${STAGING_BINDIR}/edb-config-native"
-export EET_CONFIG = "${STAGING_BINDIR}/eet-config-native"
-
-do_stage () {
-	for p in ${parts}; do
-		dir=`echo $p|tr A-Z a-z`
-		install -m 0644 ${S}/src/lib/$dir/$p.h ${STAGING_INCDIR}/
-		oe_libinstall -C src/lib/$dir lib$dir ${STAGING_LIBDIR}/
-	done
-	install -m 0644 ${S}/src/lib/ecore/Ecore_Data.h ${STAGING_INCDIR}/
-	install -m 0644 ${S}/ecore.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-do_install() {
-	:
-}
diff --git a/packages/ecore/files/fix-configure.patch b/packages/ecore/files/fix-configure.patch
deleted file mode 100644
index abaa4e10a4..0000000000
--- a/packages/ecore/files/fix-configure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- ecore-0.9.9.007/configure.in~fix-configure
-+++ ecore-0.9.9.007/configure.in
-@@ -15,7 +15,6 @@
- AC_CHECK_SIZEOF(int, 4)
- AM_ENABLE_SHARED
- AM_PROG_LIBTOOL
--AC_C___ATTRIBUTE__
- 
- if test "x${bindir}" = 'x${exec_prefix}/bin'; then
-   if test "x${exec_prefix}" = "xNONE"; then
diff --git a/packages/edb/edb-native_1.0.5.004.bb b/packages/edb/edb-native_1.0.5.004.bb
deleted file mode 100644
index 59cb8da587..0000000000
--- a/packages/edb/edb-native_1.0.5.004.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-include edb_${PV}.bb
-inherit native
-DEPENDS = "zlib-native"
-
-do_stage () {
-	install -m 0755 tools/.libs/edb_ed ${STAGING_BINDIR}
-	oe_libinstall -C src libedb ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/Edb.h ${STAGING_INCDIR}/
-}
-
-do_install() {
-	:
-}
-
diff --git a/packages/edb/edb_1.0.5.004.bb b/packages/edb/edb_1.0.5.004.bb
deleted file mode 100644
index d6204b289f..0000000000
--- a/packages/edb/edb_1.0.5.004.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "EDB is a database convenience library wrapped around the \
-Berkeley DB 2.7.7 by Sleepycat Software."
-HOMEPAGE = "http://www.enlightenment.org"
-SECTION = "e/libs"
-PRIORITY = "optional"
-DEPENDS = "zlib"
-LICENSE = "BSD"
-PR = "r0"
-
-do_prepsources () {
-  make clean distclean || true
-}
-addtask prepsources after do_fetch before do_unpack
-  
-SRC_URI = "http://enlightenment.freedesktop.org/files/edb-${PV}.tar.gz"
-S = "${WORKDIR}/edb-${PV}"
-  
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = "--disable-gtk \
-		--disable-ncurses"
-
-do_stage () {
-  oe_libinstall -C src libedb ${STAGING_LIBDIR}/
-  install -m 0644 ${S}/src/Edb.h ${STAGING_INCDIR}/
-}
-
-FILES_${PN} = "${libdir}/libedb*.so*"
-FILES_${PN}-dev += "${bindir} ${libdir}/pkgconfig"
-
diff --git a/packages/edje/edje_0.5.0.013.bb b/packages/edje/edje_0.5.0.013.bb
deleted file mode 100644
index 3730fbcf94..0000000000
--- a/packages/edje/edje_0.5.0.013.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "Edje is a complex graphical design & layout library."
-DEPENDS = "freetype virtual/evas virtual/ecore embryo eet edb edje-native"
-LICENSE = "MIT"
-HOMEPAGE = "http://www.enlightenment.org"
-SECTION = "e/libs"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-PR = "r0"
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/edje-${PV}.tar.gz"
-S = "${WORKDIR}/edje-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = "--disable-edje-cc \
-		--enable-fb-only"
-
-LEAD_SONAME = "libedje.so"
-
-do_stage () {
-	oe_libinstall -C src/lib libedje ${STAGING_LIBDIR}/
-	oe_libinstall -C src/lib libedje_edit ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/lib/Edje.h ${STAGING_INCDIR}/
-}
-
-BINARIES = "edje edje_ls edje_test edje_cc edje_decc edje_thumb"
-
-PACKAGES += "edje-examples"
-
-FILES_${PN} = "${libdir}/libedje*.so*"
-FILES_${PN}-dev += "${bindir}/edje-config ${bindir}/edje_ls ${bindir}/edje_cc ${bindir}/edje_decc ${bindir}/edje_thumb ${libdir}/pkgconfig"
-FILES_${PN}-examples = "${bindir}/edje ${bindir}/edje_test ${datadir}"
diff --git a/packages/eet/eet-native_0.9.10.013.bb b/packages/eet/eet-native_0.9.10.013.bb
deleted file mode 100644
index 81f0a349fa..0000000000
--- a/packages/eet/eet-native_0.9.10.013.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-PRIORITY = "optional"
-include eet_${PV}.bb
-inherit native
-DEPENDS = "zlib-native jpeg-native"
-LICENSE = "BSD"
-
-do_stage () {
-	install -m 0755 src/bin/.libs/eet ${STAGING_BINDIR}
-	oe_libinstall -C src/lib libeet ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/lib/Eet.h ${STAGING_INCDIR}/
-}
-
-do_install() {
-	:
-}
diff --git a/packages/eet/eet_0.9.10.013.bb b/packages/eet/eet_0.9.10.013.bb
deleted file mode 100644
index c2a7296706..0000000000
--- a/packages/eet/eet_0.9.10.013.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-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."
-HOMEPAGE = "http://www.enlightenment.org"
-SECTION = "e/libs"
-PRIORITY = "optional"
-DEPENDS = "zlib jpeg"
-PR = "r0"
-LICENSE = "BSD"
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/eet-${PV}.tar.gz"
-S = "${WORKDIR}/eet-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-do_stage () {
-	oe_libinstall -C src/lib libeet ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/lib/Eet.h ${STAGING_INCDIR}/
-}
-
-FILES_${PN} = "${libdir}/libeet*.so*"
-FILES_${PN}-dev += "${bindir} ${libdir}/pkgconfig"
diff --git a/packages/edje/.mtn2git_empty b/packages/efl/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/edje/.mtn2git_empty
+++ b/packages/efl/.mtn2git_empty
diff --git a/packages/eet/.mtn2git_empty b/packages/efl/e/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/eet/.mtn2git_empty
+++ b/packages/efl/e/.mtn2git_empty
diff --git a/packages/efl/e/fix-configure.patch b/packages/efl/e/fix-configure.patch
new file mode 100644
index 0000000000..9b328de16c
--- /dev/null
+++ b/packages/efl/e/fix-configure.patch
@@ -0,0 +1,48 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- e/configure.in~fix-configure.patch
++++ e/configure.in
+@@ -114,9 +114,7 @@
+ AC_PATH_XTRA
+ AC_CHECK_HEADER(X11/X.h,
+   [
+-    x_dir=${x_dir:-/usr/X11R6}
+-    x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+-    x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
++    x_libs="-lX11 -lXext";
+   ],[
+     AC_MSG_ERROR([Cannot find X headers and libraries.])
+   ]
+--- e/src/bin/Makefile.am~fix-configure.patch
++++ e/src/bin/Makefile.am
+@@ -1,6 +1,5 @@
+ MAINTAINERCLEANFILES = Makefile.in
+-INCLUDES = -I$(includedir) \
+-	   -I$(top_srcdir) \
++INCLUDES = -I$(top_srcdir) \
+ 	   -I$(top_srcdir)/src/bin \
+ 	   -I$(top_srcdir)/src/lib \
+ 	   @e_cflags@ \
+--- e/src/lib/Makefile.am~fix-configure.patch
++++ e/src/lib/Makefile.am
+@@ -1,6 +1,5 @@
+ MAINTAINERCLEANFILES	= Makefile.in
+-INCLUDES		= -I$(includedir) \
+-			  -I$(top_srcdir)/src/bin \
++INCLUDES		= -I$(top_srcdir)/src/bin \
+ 			  @ecore_cflags@ \
+ 			  @evas_cflags@
+ 
+--- e/src/preload/Makefile.am~fix-configure.patch
++++ e/src/preload/Makefile.am
+@@ -2,7 +2,6 @@
+ 
+ INCLUDES               = -I. \
+                          -I$(top_srcdir) \
+-			 -I$(includedir) \
+                          -I$(top_srcdir)src/preload \
+                          @x_cflags@
+ pkgdir                 = $(libdir)/enlightenment/preload
diff --git a/packages/efl/e_20050810.bb b/packages/efl/e_20050810.bb
new file mode 100644
index 0000000000..cb118c30a0
--- /dev/null
+++ b/packages/efl/e_20050810.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "Enlightenment Window Mananger Library"
+DEPENDS = "freetype eet evas-x11 ecore-x11 embryo imlib2-x11 edje-native"
+LICENSE = "MIT"
+CVSDATE = "${PV}"
+PR = "r0"
+
+inherit efl
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \
+           file://fix-configure.patch;patch=1"
+S = "${WORKDIR}/e"
+
+PROFILE = "LORES_PDA"
+PROFILE_c7x0 = "HIRES_PDA"
+PROFILE_tosa = "HIRES_PDA"
+PROFILE_spitz = "HIRES_PDA"
+PROFILE_akita = "HIRES_PDA"
+
+EXTRA_OECONF = "--with-profile=${PROFILE} \
+                --with-edje-cc=${STAGING_BINDIR}/edje_cc \
+                --x-includes=${STAGING_INCDIR}/X11 \
+                --x-libraries=${STAGING_LIBDIR}"
+
+do_compile() {
+	oe_runmake -C src/lib
+}
+
+headers = "E_Lib.h"
+
+do_install() {
+	oe_runmake -C src/lib install DESTDIR=${D}
+}
diff --git a/packages/ecore/ecore-fb_0.9.9.013.bb b/packages/efl/ecore-fb_0.9.9.013.bb
index f52c0a2f2b..f0f74734a9 100644
--- a/packages/ecore/ecore-fb_0.9.9.013.bb
+++ b/packages/efl/ecore-fb_0.9.9.013.bb
@@ -1,4 +1,5 @@
-include ecore_${PV}.inc
+include ecore.inc
+PROVIDES += "virtual/ecore"
 PR = "r0"
 
 EXTRA_OECONF = "--enable-ecore-fb \
diff --git a/packages/efl/ecore-native_0.9.9.013.bb b/packages/efl/ecore-native_0.9.9.013.bb
new file mode 100644
index 0000000000..30b6f78370
--- /dev/null
+++ b/packages/efl/ecore-native_0.9.9.013.bb
@@ -0,0 +1,3 @@
+include ecore-fb_${PV}.bb
+inherit native
+DEPENDS = "curl-native edb-native eet-native evas-native freetype-native"
diff --git a/packages/ecore/ecore-x11_0.9.9.013.bb b/packages/efl/ecore-x11_0.9.9.013.bb
index 9e7389c8ad..8a86aa0138 100644
--- a/packages/ecore/ecore-x11_0.9.9.013.bb
+++ b/packages/efl/ecore-x11_0.9.9.013.bb
@@ -1,4 +1,5 @@
-include ecore_${PV}.inc
+include ecore.inc
+PROVIDES += "virtual/ecore"
 DEPENDS += "evas-x11"
 PR = "r1"
 
@@ -22,5 +23,3 @@ parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \
 	 Ecore_Txt Ecore_Fb Ecore_Con \
 	 Ecore_Ipc Ecore_Evas Ecore_Config \
 	 Ecore_X"
-
-export x_cflags = ""
diff --git a/packages/ecore/ecore_0.9.9.013.inc b/packages/efl/ecore.inc
index 4598b20a4f..38c64e4615 100644
--- a/packages/ecore/ecore_0.9.9.013.inc
+++ b/packages/efl/ecore.inc
@@ -1,38 +1,31 @@
 DESCRIPTION = "Ecore is the core event abstraction layer for the enlightenment \
 foundation libraries. It makes makes doing selections, drag and drop, event loops, \
 timeouts and idle handlers fast, optimized, and convenient."
-HOMEPAGE = "http://www.enlightenment.org"
-SECTION = "e/libs"
-PRIORITY = "optional"
 LEAD_SONAME = "libecore.so"
-PROVIDES = "virtual/ecore"
 LICENSE = "MIT"
 DEPENDS = "curl edb eet virtual/evas freetype edb-native"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+
+inherit efl
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \
-           file://fix-configure.patch;patch=1"
+           file://configure.patch;patch=1"
 S = "${WORKDIR}/ecore-${PV}"
-
-inherit autotools binconfig
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
 
 EXTRA_OECONF = "<override me>"
 
+libraries = ""
+headers = ""
 parts = "<override me>"
 
-do_stage () {
+do_stage_append() {
 	for p in ${parts}; do
 		dir=`echo $p|tr A-Z a-z`
-		install -m 0644 ${S}/src/lib/$dir/$p.h ${STAGING_INCDIR}/
+		install -m 0644 ${S}/src/lib/$dir/$p*.h ${STAGING_INCDIR}/
 		oe_libinstall -C src/lib/$dir lib$dir ${STAGING_LIBDIR}/
 	done
 	install -m 0644 ${S}/src/lib/ecore/Ecore_Data.h ${STAGING_INCDIR}/
 	install -m 0644 ${S}/ecore.m4 ${STAGING_DATADIR}/aclocal/
 }
 
-PACKAGES =+ "ecore-examples ecore-config"
-
-FILES_${PN} = "${libdir}/libecore*.so* ${libdir}/ecore_config_ipc_ecore.so"
-FILES_${PN}-dev += "${bindir}/ecore-config ${libdir}/pkgconfig"
-FILES_ecore-config = "${bindir}/ecore_config"
-FILES_ecore-examples = "${bindir}/ecore_test ${bindir}/ecore_evas_test ${datadir}"
+FILES_${PN} += "${libdir}/libecore*.so* ${libdir}/ecore_config_ipc_ecore.so"
diff --git a/packages/embryo/.mtn2git_empty b/packages/efl/ecore/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/embryo/.mtn2git_empty
+++ b/packages/efl/ecore/.mtn2git_empty
diff --git a/packages/efl/ecore/configure.patch b/packages/efl/ecore/configure.patch
new file mode 100644
index 0000000000..a9ae62743d
--- /dev/null
+++ b/packages/efl/ecore/configure.patch
@@ -0,0 +1,27 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- ecore-0.9.9.013/configure.in~configure.patch
++++ ecore-0.9.9.013/configure.in
+@@ -15,7 +15,6 @@
+ AC_CHECK_SIZEOF(int, 4)
+ AM_ENABLE_SHARED
+ AM_PROG_LIBTOOL
+-AC_C___ATTRIBUTE__
+ 
+ if test "x${bindir}" = 'x${exec_prefix}/bin'; then
+   if test "x${exec_prefix}" = "xNONE"; then
+@@ -247,10 +246,8 @@
+       AM_CONDITIONAL(BUILD_ECORE_X, true)
+       AC_DEFINE(BUILD_ECORE_X, 1, [Build Ecore_X Module])
+       BUILD_ECORE_X=1
+-      x_dir=${x_dir:-/usr/X11R6}
+-      x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+-      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
+       x_ldflags=" "$ecore_x_libs;
++      x_libs="-lX11 -lXext";
+       ecore_x_libs="-lecore_x";
+     ],[
+       AM_CONDITIONAL(BUILD_ECORE_X, false)
diff --git a/packages/efl/edb-native_1.0.5.004.bb b/packages/efl/edb-native_1.0.5.004.bb
new file mode 100644
index 0000000000..234b0e05e5
--- /dev/null
+++ b/packages/efl/edb-native_1.0.5.004.bb
@@ -0,0 +1,7 @@
+include edb_${PV}.bb
+inherit native
+DEPENDS = "zlib-native"
+
+do_stage_append () {
+	install -m 0755 tools/.libs/edb_ed ${STAGING_BINDIR}
+}
diff --git a/packages/efl/edb_1.0.5.004.bb b/packages/efl/edb_1.0.5.004.bb
new file mode 100644
index 0000000000..2dace0cb07
--- /dev/null
+++ b/packages/efl/edb_1.0.5.004.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "EDB is a database convenience library wrapped around the \
+Berkeley DB 2.7.7 by Sleepycat Software."
+DEPENDS = "zlib"
+LICENSE = "BSD"
+PR = "r0"
+
+inherit efl
+
+EXTRA_OECONF = "--disable-gtk --disable-ncurses"
+
+libdirectory = "src"
+
diff --git a/packages/edje/edje-native_0.5.0.013.bb b/packages/efl/edje-native_0.5.0.013.bb
index dd0ca2b593..8f15b4edab 100644
--- a/packages/edje/edje-native_0.5.0.013.bb
+++ b/packages/efl/edje-native_0.5.0.013.bb
@@ -10,14 +10,13 @@ EXTRA_OECONF = "--with-fb-only \
   --with-embryo-config=${STAGING_BINDIR}/embryo-config-native	\
   --with-imlib2-config=${STAGING_BINDIR}/imlib2-config-native	"
 
-do_stage() {
+do_configure_prepend() {
+        sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c
+}
+
+do_stage_append() {
 	for i in ${BINARIES}
 	do
-		install -m 0755 src/bin/$i ${STAGING_BINDIR}
+		${HOST_SYS}-libtool --mode=install install -m 0755 src/bin/$i ${STAGING_BINDIR}
 	done
 }
-
-do_install() {
-	:
-}
-
diff --git a/packages/efl/edje_0.5.0.013.bb b/packages/efl/edje_0.5.0.013.bb
new file mode 100644
index 0000000000..40c2002860
--- /dev/null
+++ b/packages/efl/edje_0.5.0.013.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Edje is a complex graphical design & layout library."
+DEPENDS = "freetype virtual/evas virtual/ecore embryo eet edb edje-native"
+LICENSE = "MIT"
+PR = "r0"
+
+inherit efl
+
+EXTRA_OECONF = "--disable-edje-cc --enable-fb-only"
+LEAD_SONAME = "libedje.so"
+
+libraries += "libedje_edit"
+
+BINARIES = "edje edje_ls edje_test edje_cc edje_decc edje_thumb"
diff --git a/packages/efl/eet-native_0.9.10.013.bb b/packages/efl/eet-native_0.9.10.013.bb
new file mode 100644
index 0000000000..fa20c9fb30
--- /dev/null
+++ b/packages/efl/eet-native_0.9.10.013.bb
@@ -0,0 +1,7 @@
+include eet_${PV}.bb
+inherit native
+DEPENDS = "zlib-native jpeg-native"
+
+do_stage_append() {
+	install -m 0755 src/bin/.libs/eet ${STAGING_BINDIR}
+}
diff --git a/packages/efl/eet_0.9.10.013.bb b/packages/efl/eet_0.9.10.013.bb
new file mode 100644
index 0000000000..5820b910d9
--- /dev/null
+++ b/packages/efl/eet_0.9.10.013.bb
@@ -0,0 +1,9 @@
+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."
+DEPENDS = "zlib jpeg"
+LICENSE = "BSD"
+PR = "r0"
+
+inherit efl
diff --git a/packages/efl/embryo-native_0.9.1.013.bb b/packages/efl/embryo-native_0.9.1.013.bb
new file mode 100644
index 0000000000..ba24e954bc
--- /dev/null
+++ b/packages/efl/embryo-native_0.9.1.013.bb
@@ -0,0 +1,6 @@
+include embryo_${PV}.bb
+inherit native
+
+do_stage_append() {
+	${HOST_SYS}-libtool --mode=install install -m 0755 src/bin/embryo_cc ${STAGING_BINDIR}
+}
diff --git a/packages/efl/embryo_0.9.1.013.bb b/packages/efl/embryo_0.9.1.013.bb
new file mode 100644
index 0000000000..ee193e5c4d
--- /dev/null
+++ b/packages/efl/embryo_0.9.1.013.bb
@@ -0,0 +1,10 @@
+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."
+LICENSE = "MIT"
+PR = "r0"
+
+inherit efl
+
diff --git a/packages/efl/emotion_0.0.1.004.bb b/packages/efl/emotion_0.0.1.004.bb
new file mode 100644
index 0000000000..9fe32ce26b
--- /dev/null
+++ b/packages/efl/emotion_0.0.1.004.bb
@@ -0,0 +1,5 @@
+DESCRIPTION = "Emotion is a multimedia library based on libxine"
+LICENSE = "MIT"
+DEPENDS = "libxine"
+
+inherit efl
diff --git a/packages/efl/engrave_20050810.bb b/packages/efl/engrave_20050810.bb
new file mode 100644
index 0000000000..13e68259a9
--- /dev/null
+++ b/packages/efl/engrave_20050810.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Engrave is an Edje Editing Library"
+LICENSE = "MIT"
+DEPENDS = "jpeg edb ecore-x11 evas-x11 edje imlib2-x11"
+
+inherit efl
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/engrave"
+S = "${WORKDIR}/engrave"
+
+do_stage_append() {
+	for i in src/lib/engrave*.h
+	do
+		install -m 0644 $i ${STAGING_INCDIR}
+	done
+}
+
diff --git a/packages/efl/epeg_0.9.0.004.bb b/packages/efl/epeg_0.9.0.004.bb
new file mode 100644
index 0000000000..c35ec63606
--- /dev/null
+++ b/packages/efl/epeg_0.9.0.004.bb
@@ -0,0 +1,5 @@
+DESCRIPTION = "Epeg is a small library for handling thumbnails."
+LICENSE = "MIT"
+DEPENDS = "jpeg"
+
+inherit efl
diff --git a/packages/epeg/.mtn2git_empty b/packages/efl/epsilon/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/epeg/.mtn2git_empty
+++ b/packages/efl/epsilon/.mtn2git_empty
diff --git a/packages/epsilon/files/compile-fix.patch b/packages/efl/epsilon/compile-fix.patch
index 1c42cc59c4..1c42cc59c4 100644
--- a/packages/epsilon/files/compile-fix.patch
+++ b/packages/efl/epsilon/compile-fix.patch
diff --git a/packages/efl/epsilon_0.3.0.004.bb b/packages/efl/epsilon_0.3.0.004.bb
new file mode 100644
index 0000000000..d8dc08e11f
--- /dev/null
+++ b/packages/efl/epsilon_0.3.0.004.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Epsilon is a flexable and powerful image thumbnailing library \
+that is complient with the freedesktop.org Thumbnail Managing Standard."
+LICENSE = "GPL"
+DEPENDS = "edje epeg libpng virtual/imlib2"
+
+inherit efl
+
+SRC_URI += "file://compile-fix.patch;patch=1"
diff --git a/packages/epeg/files/.mtn2git_empty b/packages/efl/esmart/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/epeg/files/.mtn2git_empty
+++ b/packages/efl/esmart/.mtn2git_empty
diff --git a/packages/esmart/files/compile-fix.patch b/packages/efl/esmart/compile-fix.patch
index 08ca835aa7..08ca835aa7 100644
--- a/packages/esmart/files/compile-fix.patch
+++ b/packages/efl/esmart/compile-fix.patch
diff --git a/packages/efl/esmart_0.9.0.004.bb b/packages/efl/esmart_0.9.0.004.bb
new file mode 100644
index 0000000000..90b8aca6f9
--- /dev/null
+++ b/packages/efl/esmart_0.9.0.004.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "ESmart is a collection of smart Evas objects"
+LICENSE = "MIT"
+DEPENDS = "edje-native eet evas-x11 ecore-x11 epsilon embryo imlib2-x11 jpeg libtool"
+PR = "r1"
+
+inherit efl
+
+SRC_URI += "file://compile-fix.patch;patch=1"
+
+headers = ""
+libraries = ""
+
+myheaders = "esmart_container/Esmart_Container.h \
+             esmart_draggies/Esmart_Draggies.h \
+             esmart_file_dialog/Esmart_File_Dialog.h \
+             esmart_text_entry/Esmart_Text_Entry.h \
+             esmart_textarea/Esmart_Textarea.h \
+             esmart_thumb/Esmart_Thumb.h \
+             esmart_trans_x11/Esmart_Trans_X11.h"
+
+mylibraries = "esmart_container \
+               esmart_draggies \
+               esmart_file_dialog \
+               esmart_text_entry \
+               esmart_textarea \
+               esmart_thumb \
+               esmart_trans_x11"
+
+do_stage_append() {
+	install -d ${STAGING_INCDIR}/Esmart/
+	for i in ${myheaders}; do
+		install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/Esmart/
+	done
+	oe_libinstall -C src/lib libsmart ${STAGING_LIBDIR}/
+	for i in ${mylibraries}; do
+		oe_libinstall -C src/lib/$i lib$i ${STAGING_LIBDIR}/
+	done
+}
diff --git a/packages/efl/etox_0.9.0.004.bb b/packages/efl/etox_0.9.0.004.bb
new file mode 100644
index 0000000000..26edf1c0a4
--- /dev/null
+++ b/packages/efl/etox_0.9.0.004.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Etox is a type setting and text layout library based on Evas. \
+Etox helps you when it comes to displaying, moving, resizing, layering, \
+clipping, aligning and coloring fonts in different styles, and more."
+DEPENDS = "edb virtual/evas virtual/ecore"
+LICENSE = "MIT"
+PR = "r0"
+
+inherit efl
+
+libdirectory = "src"
diff --git a/packages/evas/evas-fb_0.9.9.013.bb b/packages/efl/evas-fb_0.9.9.013.bb
index ba0d4c7675..8086d0e95a 100644
--- a/packages/evas/evas-fb_0.9.9.013.bb
+++ b/packages/efl/evas-fb_0.9.9.013.bb
@@ -1,4 +1,5 @@
-include evas_${PV}.inc
+include evas.inc
+PROVIDES += "virtual/evas"
 PR = "r0"
 
 EXTRA_OECONF = "--enable-fb			\
diff --git a/packages/efl/evas-native_0.9.9.013.bb b/packages/efl/evas-native_0.9.9.013.bb
new file mode 100644
index 0000000000..a29967a051
--- /dev/null
+++ b/packages/efl/evas-native_0.9.9.013.bb
@@ -0,0 +1,3 @@
+include evas-fb_${PV}.bb
+inherit native
+DEPENDS = "freetype-native"
diff --git a/packages/evas/evas-x11_0.9.9.013.bb b/packages/efl/evas-x11_0.9.9.013.bb
index eef87843a4..3d37d23cde 100644
--- a/packages/evas/evas-x11_0.9.9.013.bb
+++ b/packages/efl/evas-x11_0.9.9.013.bb
@@ -1,8 +1,11 @@
-include evas_${PV}.inc
+include evas.inc
+PROVIDES += "virtual/evas"
 DEPENDS += "x11 xext"
 PR = "r2"
 
-EXTRA_OECONF = "--enable-fb			\
+EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
+		--x-libraries=${STAGING_LIBDIR} \
+		--enable-fb			\
 		--disable-directfb		\
 		--disable-buffer		\
 		--disable-software-qtopia	\
@@ -46,3 +49,4 @@ headers = "Evas_Engine_Software_X11.h \
            Evas_Engine_Buffer.h \
            Evas_Engine_FB.h \
            Evas.h"
+
diff --git a/packages/evas/evas_0.9.9.013.inc b/packages/efl/evas.inc
index 31b06c99ff..0588d8e28c 100644
--- a/packages/evas/evas_0.9.9.013.inc
+++ b/packages/efl/evas.inc
@@ -3,19 +3,15 @@ anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \
 down to using normal X11 primitives such as pixmaps, lines and rectangles if \
 your CPU or graphics hardware are too slow."
 LICENSE = "MIT"
-HOMEPAGE = "http://www.enlightenment.org"
-SECTION = "e/libs"
-PRIORITY = "optional"
-PROVIDES = "virtual/evas"
 DEPENDS = "libpng jpeg edb eet freetype"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-PR = "r1"
+
+inherit efl
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \
+           file://fix-configure.patch;patch=1 \
            file://pkg.m4"
 S = "${WORKDIR}/evas-${PV}"
-
-inherit autotools pkgconfig binconfig
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
 
 EXTRA_OECONF = "<override me>"
 
@@ -25,16 +21,5 @@ do_configure () {
 }
 
 headers = "<override me>"
+libraries = "libevas"
 
-do_stage () {
-	for i in ${headers}; do
-		install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/
-	done
-	oe_libinstall -C src/lib libevas ${STAGING_LIBDIR}/
-}
-
-PACKAGES =+ "evas-examples"
-
-FILES_${PN} = "${libdir}/libevas*.so*"
-FILES_${PN}-dev += "${bindir}/evas-config ${libdir}/pkgconfig"
-FILES_evas-examples = "${bindir}/evas_*_test ${datadir}"
diff --git a/packages/epsilon/.mtn2git_empty b/packages/efl/evas/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/epsilon/.mtn2git_empty
+++ b/packages/efl/evas/.mtn2git_empty
diff --git a/packages/efl/evas/fix-configure.patch b/packages/efl/evas/fix-configure.patch
new file mode 100644
index 0000000000..cc7462e72c
--- /dev/null
+++ b/packages/efl/evas/fix-configure.patch
@@ -0,0 +1,49 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- evas-0.9.9.013/configure.in~fix-configure
++++ evas-0.9.9.013/configure.in
+@@ -157,9 +157,7 @@
+     [
+       AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_X11, true)
+       AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend])
+-      x_dir=${x_dir:-/usr/X11R6}
+-      x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+-      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
++      x_libs="-lX11 -lXext";
+       ENGINE_SOFTWARE_X11_PRG="evas_software_x11_test evas_software_x11_perf_test evas_software_x11_perf_load"
+     ],
+     [
+@@ -221,7 +219,7 @@
+         X11/X.h,
+         [AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_XCB, true)
+          AC_DEFINE(BUILD_ENGINE_SOFTWARE_XCB, 1, [Software XCB Rendering Backend])
+-         xcb_dir=${x_dir:-/usr/X11R6}
++         xcb_dir=${x_dir:-}
+          xcb_cflags="${x_cflags:--I${x_includes:-$x_dir/include}} $XCB_CFLAGS $XCB_ICCCM_CFLAGS"
+          xcb_libs="${x_libs:--L${x_libraries:-$x_dir/lib}}  $XCB_LIBS $XCB_ICCCM_LIBS"
+          ENGINE_SOFTWARE_XCB_PRG="evas_software_xcb_test evas_software_xcb_perf_test evas_software_xcb_perf_load"],
+@@ -433,10 +431,10 @@
+ 	  AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend])
+ 	  AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true)
+ 	  AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support])
+-	  x_dir=${x_dir:-/usr/X11R6};
++	  x_dir=${x_dir:-};
+ 	  x_cflags=${x_cflags:--I$x_dir/include}
+ 	  x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}"
+-	  gl_cflags="-I/usr/include"
++	  gl_cflags=""
+ 	  gl_libs="-lGL -lGLU -lpthread"
+ 	  gl_dir=""
+ 	  ENGINE_GL_X11_PRG="evas_gl_x11_test"
+@@ -490,7 +488,7 @@
+       AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend])
+       AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true)
+       AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support])
+-      x_dir="/usr/X11R6";
++      x_dir="";
+       x_cflags="-I"$x_dir"/include"
+       x_libs="-L"$x_dir"/lib -lX11 -lXext"
+       ENGINE_CAIRO_X11_PRG="evas_cairo_x11_test"
diff --git a/packages/epsilon/files/.mtn2git_empty b/packages/efl/ewl/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/epsilon/files/.mtn2git_empty
+++ b/packages/efl/ewl/.mtn2git_empty
diff --git a/packages/ewl/ewl/fix-configure.patch b/packages/efl/ewl/ewl-configure.patch
index a754e0f819..a754e0f819 100644
--- a/packages/ewl/ewl/fix-configure.patch
+++ b/packages/efl/ewl/ewl-configure.patch
diff --git a/packages/efl/ewl_0.0.4.004.bb b/packages/efl/ewl_0.0.4.004.bb
new file mode 100644
index 0000000000..36d8c5c860
--- /dev/null
+++ b/packages/efl/ewl_0.0.4.004.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "The Enlightened Widget Library, \
+a simple-to-use general purpose widget library based on the enlightenment foundation libraries."
+DEPENDS = "edb eet virtual/evas virtual/ecore etox edje"
+LICENSE = "MIT"
+PR = "r0"
+
+inherit efl
+
+SRC_URI += "file://ewl-configure.patch;patch=1"
+
+do_stage_append() {
+	for i in src/lib/ewl_*.h
+	do
+		install -m 0644 $i ${STAGING_INCDIR}
+	done
+}
+
diff --git a/packages/esmart/.mtn2git_empty b/packages/efl/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/esmart/.mtn2git_empty
+++ b/packages/efl/files/.mtn2git_empty
diff --git a/packages/evas/files/pkg.m4 b/packages/efl/files/pkg.m4
index c80e0acfc4..c80e0acfc4 100644
--- a/packages/evas/files/pkg.m4
+++ b/packages/efl/files/pkg.m4
diff --git a/packages/imlib2/imlib2-fb_1.2.1.004.bb b/packages/efl/imlib2-fb_1.2.1.004.bb
index bddb085fdd..fdf9b17afc 100644
--- a/packages/imlib2/imlib2-fb_1.2.1.004.bb
+++ b/packages/efl/imlib2-fb_1.2.1.004.bb
@@ -1,4 +1,6 @@
 include imlib2.inc
+PROVIDES += "virtual/imlib2"
 
 EXTRA_OECONF = "--without-x \
 		--disable-mmx"
+
diff --git a/packages/imlib2/imlib2-native_1.2.1.004.bb b/packages/efl/imlib2-native_1.2.1.004.bb
index b4310c29a5..e3a46c4aba 100644
--- a/packages/imlib2/imlib2-native_1.2.1.004.bb
+++ b/packages/efl/imlib2-native_1.2.1.004.bb
@@ -4,8 +4,3 @@ DEPENDS = "freetype-native libpng-native jpeg-native"
 
 EXTRA_OECONF = "--disable-mmx \
                 --without-x"
-
-do_install() {
-	:
-}
-
diff --git a/packages/imlib2/imlib2-x11_1.2.1.004.bb b/packages/efl/imlib2-x11_1.2.1.004.bb
index 4cec9a979f..383473e589 100644
--- a/packages/imlib2/imlib2-x11_1.2.1.004.bb
+++ b/packages/efl/imlib2-x11_1.2.1.004.bb
@@ -1,8 +1,8 @@
 include imlib2.inc
+PROVIDES += "virtual/imlib2"
 DEPENDS += "x11 xext"
 
 EXTRA_OECONF = "--disable-mmx \
                 --with-x \
                 --x-includes=${STAGING_INCDIR} \
                 --x-libraries=${STAGING_LIBDIR}"
-
diff --git a/packages/imlib2/imlib2.inc b/packages/efl/imlib2.inc
index cf73ba446f..b4a2f267fc 100644
--- a/packages/imlib2/imlib2.inc
+++ b/packages/efl/imlib2.inc
@@ -1,35 +1,36 @@
 DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipulation."
-HOMEPAGE = "http://www.enlightenment.org"
 LICENSE = "BSD"
-SECTION = "e/libs"
-PRIORITY = "optional"
-PROVIDES = "virtual/imlib2"
 DEPENDS = "freetype libpng jpeg"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+
+inherit efl
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/imlib2-${PV}.tar.gz"
 S = "${WORKDIR}/imlib2-${PV}"
 
-inherit autotools pkgconfig binconfig
+libraries = ""
+headers = ""
 
-do_stage () {
-	oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/
+do_stage_append() {
+        oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/
+        install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/
 
-	install -d ${STAGING_LIBDIR}/imlib2/loaders
-	for i in src/modules/loaders/.libs/*.so
-	do
-		install -m 0755 $i ${STAGING_LIBDIR}/imlib2/loaders
-	done
+        install -d ${STAGING_LIBDIR}/imlib2/loaders
+        for i in src/modules/loaders/.libs/*.so
+        do
+                install -m 0755 $i ${STAGING_LIBDIR}/imlib2/loaders
+        done
 
-	install -d ${STAGING_LIBDIR}/imlib2/filters
-	for i in src/modules/filters/.libs/*.so
-	do
-		install -m 0755 $i ${STAGING_LIBDIR}/imlib2/filters
-	done
+        install -d ${STAGING_LIBDIR}/imlib2/filters
+        for i in src/modules/filters/.libs/*.so
+        do
+                install -m 0755 $i ${STAGING_LIBDIR}/imlib2/filters
+        done
 }
 
-do_install_append() {
+do_install() {
+        oe_libinstall -C src/lib libImlib2 ${D}${libdir}/
+        install -m 0644 ${S}/src/lib/Imlib2.h ${D}${incdir}/
+
         install -d ${D}${libdir}/imlib2/loaders
         for i in src/modules/loaders/.libs/*.so
         do
@@ -43,7 +44,7 @@ do_install_append() {
         done
 }
 
-PACKAGES =+ "imlib2-bin imlib2-loaders imlib2-filters"
+PACKAGES =+ "imlib2-loaders imlib2-filters"
 FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2"
 FILES_${PN}-dev += "${bindir}/imlib2-config"
 FILES_imlib2-bin = "${bindir}"
diff --git a/packages/embryo/embryo-native_0.9.1.013.bb b/packages/embryo/embryo-native_0.9.1.013.bb
deleted file mode 100644
index 89980d343e..0000000000
--- a/packages/embryo/embryo-native_0.9.1.013.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-include embryo_${PV}.bb
-inherit native
-
-do_stage () {
-	oe_libinstall -C src/lib libembryo ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/lib/Embryo.h ${STAGING_INCDIR}/
-}
diff --git a/packages/embryo/embryo_0.9.1.013.bb b/packages/embryo/embryo_0.9.1.013.bb
deleted file mode 100644
index 49a1e9df4e..0000000000
--- a/packages/embryo/embryo_0.9.1.013.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-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."
-SECTION = "e/libs"
-LICENSE = "MIT"
-PR = "r0"
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/embryo-${PV}.tar.gz"
-S = "${WORKDIR}/embryo-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-do_stage () {
-	oe_libinstall -C src/lib libembryo ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/lib/Embryo.h ${STAGING_INCDIR}/
-}
-
-PACKAGES += "embryo-examples"
-
-FILES_${PN} = "${libdir}/libembryo*.so*"
-FILES_${PN}-dev += "${bindir} ${libdir}/pkgconfig"
-FILES_${PN}-examples = "${datadir}"
-
diff --git a/packages/epeg/epeg_0.9.0.004.bb b/packages/epeg/epeg_0.9.0.004.bb
deleted file mode 100644
index aef2c178b9..0000000000
--- a/packages/epeg/epeg_0.9.0.004.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Epeg is a small library for handling thumbnails."
-SECTION = "e/libs"
-LICENSE = "MIT"
-DEPENDS = "jpeg"
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/epeg-${PV}.tar.gz"
-S = "${WORKDIR}/epeg-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-headers = "Epeg.h"
-
-do_stage() {
-    for i in ${headers}; do
-        install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/
-    done
-    oe_libinstall -C src/lib libepeg ${STAGING_LIBDIR}/
-}
-
-PACKAGES = "epeg-dev epeg-doc epeg"
-FILES_${PN}-dev += "${bindir}/epeg-config ${bindir}/epeg"
diff --git a/packages/epeg/files/dirs.patch b/packages/epeg/files/dirs.patch
deleted file mode 100644
index 8b0b5281d1..0000000000
--- a/packages/epeg/files/dirs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- epeg/src/lib/Makefile.am~dirs	2004-01-19 18:53:41.000000000 -0600
-+++ epeg/src/lib/Makefile.am	2004-07-13 16:29:16.000000000 -0500
-@@ -5,10 +5,7 @@
- # A list of all the files in the current directory which can be regenerated
- MAINTAINERCLEANFILES = Makefile.in
- 
--LDFLAGS		     = -L/usr/local/lib
--INCLUDES	     = -I/usr/local/include \
--		       -I$(includedir) \
--		       @my_includes@
-+INCLUDES	     = @my_includes@
- 
- lib_LTLIBRARIES      = libepeg.la
- include_HEADERS      = Epeg.h
-@@ -17,6 +14,6 @@
- epeg_memfile.c \
- epeg_private.h
- 
--libepeg_la_LIBADD       = $(LDFLAGS) @my_libs@
-+libepeg_la_LIBADD       = @my_libs@
- libepeg_la_DEPENDENCIES = $(top_builddir)/config.h
- libepeg_la_LDFLAGS      = -version-info 9:0:9
---- epeg/src/bin/Makefile.am~dirs	2004-07-08 10:42:50.000000000 -0500
-+++ epeg/src/bin/Makefile.am	2004-07-13 16:29:21.000000000 -0500
-@@ -2,7 +2,6 @@
- 
- INCLUDES = \
- -I../lib \
---I/usr/local/include \
- -I$(top_srcdir)/src/lib \
- @my_includes@
- 
diff --git a/packages/epsilon/epsilon_0.3.0.004.bb b/packages/epsilon/epsilon_0.3.0.004.bb
deleted file mode 100644
index 12a7ec4e0a..0000000000
--- a/packages/epsilon/epsilon_0.3.0.004.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Epsilon is a flexable and powerful image thumbnailing library \
-that is complient with the freedesktop.org Thumbnail Managing Standard. \
-Unlike Epeg, Epsilon has native support for PNG, and is built upon Imlib2 \
-making any format supported by Imlib2 such as JPEG, PNG, XCF, TIFF and GIF. \
-To provide the best possible performance Epsilon can even integrate \
-with Epeg directly to harness it's speed."
-SECTION = "e/libs"
-LICENSE = "GPL"
-DEPENDS = "edje epeg libpng virtual/imlib2"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/epsilon-${PV}.tar.gz \
-           file://compile-fix.patch;patch=1"
-S = "${WORKDIR}/epsilon-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-do_stage () {
-	oe_libinstall -C src/lib libepsilon ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/lib/Epsilon.h ${STAGING_INCDIR}/
-}
-
-PACKAGES = "epsilon-examples epsilon-dev epsilon"
-FILES_${PN}-dev += "${bindir}/epsilon-config"
-FILES_epsilon-examples = "${bindir}/epsilon"
-
diff --git a/packages/esmart/esmart_0.9.0.004.bb b/packages/esmart/esmart_0.9.0.004.bb
deleted file mode 100644
index e0f7272872..0000000000
--- a/packages/esmart/esmart_0.9.0.004.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "ESmart is a collection of smart Evas objects"
-SECTION = "e/libs"
-LICENSE = "MIT"
-DEPENDS = "eet evas-x11 ecore-x11 epsilon embryo virtual/imlib2 jpeg libtool"
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/esmart-${PV}.tar.gz \
-           file://compile-fix.patch;patch=1"
-S = "${WORKDIR}/esmart-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-headers = "esmart_container/Esmart_Container.h \
-           esmart_draggies/Esmart_Draggies.h \
-           esmart_file_dialog/Esmart_File_Dialog.h \
-           esmart_textarea/Esmart_Textarea.h \
-           esmart_thumb/Esmart_Thumb.h \
-           esmart_trans_x11/Esmart_Trans_X11.h"
-
-do_stage() {
-    for i in ${headers}; do
-        install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/
-    done
-    oe_libinstall -C src/lib libsmart ${STAGING_LIBDIR}/
-}
-
-PACKAGES = "esmart-dev esmart-doc esmart"
-FILES_${PN}-dev += "${bindir}/esmart-config ${bindir}/esmart"
diff --git a/packages/etox/.mtn2git_empty b/packages/etox/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/etox/.mtn2git_empty
+++ /dev/null
diff --git a/packages/etox/etox_0.9.0.004.bb b/packages/etox/etox_0.9.0.004.bb
deleted file mode 100644
index 26c24cc6b7..0000000000
--- a/packages/etox/etox_0.9.0.004.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Etox is a type setting and text layout library based on Evas. \
-Etox helps you when it comes to displaying, moving, resizing, layering, \
-clipping, aligning and coloring fonts in different styles, and more."
-SECTION = "e/libs"
-DEPENDS = "edb virtual/evas virtual/ecore"
-LICENSE = "MIT"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-PR = "r0"
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/etox-${PV}.tar.gz"
-S = "${WORKDIR}/etox-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-do_stage () {
-	oe_libinstall -C src libetox ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/Etox.h ${STAGING_INCDIR}/
-}
-
-PACKAGES += "etox-examples"
-
-FILES_${PN} = "${libdir}/libetox*.so*"
-FILES_${PN}-dev += "${bindir}/etox-config ${libdir}/pkgconfig"
-FILES_${PN}-examples = "${bindir}/etox* ${datadir}"
diff --git a/packages/evas/.mtn2git_empty b/packages/evas/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/evas/.mtn2git_empty
+++ /dev/null
diff --git a/packages/evas/evas-native_0.9.9.013.bb b/packages/evas/evas-native_0.9.9.013.bb
deleted file mode 100644
index ea23901c50..0000000000
--- a/packages/evas/evas-native_0.9.9.013.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-include evas-fb_${PV}.bb
-inherit native
-DEPENDS = "freetype-native"
-
-export EDB_CONFIG = "${STAGING_BINDIR}/edb-config-native"
-export EET_CONFIG = "${STAGING_BINDIR}/eet-config-native"
-
-do_stage () {
-        for i in ${headers}
-        do
-                install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/
-        done
-        oe_libinstall -C src/lib libevas ${STAGING_LIBDIR}/
-}
-
-do_install() {
-	:
-}
-
diff --git a/packages/evas/files/.mtn2git_empty b/packages/evas/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/evas/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/ewl/.mtn2git_empty b/packages/ewl/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/ewl/.mtn2git_empty
+++ /dev/null
diff --git a/packages/ewl/ewl/.mtn2git_empty b/packages/ewl/ewl/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/ewl/ewl/.mtn2git_empty
+++ /dev/null
diff --git a/packages/ewl/ewl/no-x-test.patch b/packages/ewl/ewl/no-x-test.patch
deleted file mode 100644
index c75da4ac04..0000000000
--- a/packages/ewl/ewl/no-x-test.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- ewl/test/ewl_embed_test.c~no-x-test
-+++ ewl/test/ewl_embed_test.c
-@@ -41,11 +41,12 @@
- 
- 	ewl_init(&argc, argv);
- 	ecore_evas_init();
--
-+#if 0
- 	if (!(ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 320, 240))) {
- 		printf("Failed to open display, exiting\n");
- 		exit(1);
- 	}
-+#endif
- 	ecore_evas_title_set(ee, "EWL Embed Test App");
- 	ecore_evas_name_class_set(ee, "EWL TEST APP", "EWL TEST APP");
- 	ecore_evas_show(ee);
-@@ -58,8 +59,10 @@
- 	evas_object_show(bg);
- 
- 	embed = ewl_embed_new();
-+#if 0
- 	embobj = ewl_embed_evas_set(EWL_EMBED(embed), ecore_evas_get(ee),
- 				    EWL_EMBED_EVAS_WINDOW(ecore_evas_software_x11_window_get(ee)));
-+#endif
- 	ewl_embed_focus_set(EWL_EMBED(embed), TRUE);
- 	evas_object_layer_set(embobj, 1);
- 	evas_object_show(embobj);
diff --git a/packages/ewl/ewl_0.0.4.004.bb b/packages/ewl/ewl_0.0.4.004.bb
deleted file mode 100644
index f309169dfa..0000000000
--- a/packages/ewl/ewl_0.0.4.004.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "The Enlightened Widget Library, \
-a simple-to-use general purpose widget library based on the enlightenment foundation libraries."
-SECTION = "e/libs"
-DEPENDS = "edb eet virtual/evas virtual/ecore etox edje"
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "MIT"
-PR = "r0"
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/ewl-${PV}.tar.gz \
-           file://fix-configure.patch;patch=1"
-S = "${WORKDIR}/ewl-${PV}"
-
-inherit autotools binconfig
-
-PARALLEL_MAKE = ""
-
-do_stage () {
-	oe_libinstall -C src libewl ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/lib/Ewl.h ${STAGING_INCDIR}/
-}
-
-PACKAGES += "ewl-examples"
-
-FILES_${PN} = "${libdir}/libewl*.so*"
-FILES_${PN}-dev += "${bindir}/ewl-config ${libdir}/pkgconfig"
-FILES_${PN}-examples = "${bindir}/ewl* ${bindir}/edje_ls ${datadir}"
-
diff --git a/packages/freetype/freetype-native_2.1.7.bb b/packages/freetype/freetype-native_2.1.7.bb
deleted file mode 100644
index 673cdb0d02..0000000000
--- a/packages/freetype/freetype-native_2.1.7.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SECTION = "base"
-LICENSE = "freetype"
-DESCRIPTION = "Freetype font rendering library"
-
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1"
-
-inherit autotools pkgconfig native binconfig
-DEPENDS = ""
-FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files"
-S = "${WORKDIR}/freetype-${PV}"
-PACKAGES = ""
-
-do_configure () {
-	(cd builds/unix && gnu-configize) || die "failure running gnu-configize"
-	oe_runconf
-}
-
-do_stage () {
-	autotools_stage_includes
-	oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
-}
diff --git a/packages/freetype/freetype-native_2.1.8.bb b/packages/freetype/freetype-native_2.1.8.bb
index ba8b59fe4d..64fac71cbe 100644
--- a/packages/freetype/freetype-native_2.1.8.bb
+++ b/packages/freetype/freetype-native_2.1.8.bb
@@ -1,24 +1,21 @@
-SECTION = "libs"
-LICENSE = "freetype"
-DESCRIPTION = "Freetype font rendering library"
-
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
-	   file://${FILESDIR}/configure.patch;patch=1"
-
-inherit autotools pkgconfig native binconfig
+include freetype_${PV}.bb
+inherit native
 DEPENDS = ""
 FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files"
-S = "${WORKDIR}/freetype-${PV}"
-PACKAGES = ""
 
-do_configure () {
+EXTRA_OEMAKE=
+
+do_configure() {
 	(cd builds/unix && gnu-configize) || die "failure running gnu-configize"
 	oe_runconf
 }
 
-do_stage () {
+do_stage() {
 	autotools_stage_includes
 	oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
 }
+
+do_install() {
+	:
+}
+
diff --git a/packages/freetype/freetype_2.1.7.bb b/packages/freetype/freetype_2.1.7.bb
deleted file mode 100644
index 751a4ae51c..0000000000
--- a/packages/freetype/freetype_2.1.7.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SECTION = "libs"
-LICENSE = "freetype"
-DESCRIPTION = "Freetype font rendering library"
-
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetpye-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1"
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += " ${bindir}"
-
-inherit autotools binconfig pkgconfig
-
-LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
-EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
-
-do_configure () {
-	cd builds/unix
-	gnu-configize
-	aclocal -I .
-	autoconf
-	cd ${S}
-	oe_runconf
-}
-
-do_stage () {
-	autotools_stage_includes
-	oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
-}
diff --git a/packages/freetype/freetype_2.1.8.bb b/packages/freetype/freetype_2.1.8.bb
index 49f71551dd..5e9db480ea 100644
--- a/packages/freetype/freetype_2.1.8.bb
+++ b/packages/freetype/freetype_2.1.8.bb
@@ -1,21 +1,18 @@
+DESCRIPTION = "Freetype font rendering library"
 SECTION = "libs"
 LICENSE = "freetype"
-DESCRIPTION = "Freetype font rendering library"
-
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1"
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += " ${bindir}"
+S = "${WORKDIR}/freetype-${PV}"
 
 inherit autotools pkgconfig binconfig
 
 LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
 EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
 
-do_configure () {
+do_configure() {
 	cd builds/unix
 	gnu-configize
 	aclocal -I .
@@ -24,7 +21,10 @@ do_configure () {
 	oe_runconf
 }
 
-do_stage () {
+do_stage() {
 	autotools_stage_includes
 	oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
 }
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}"
diff --git a/packages/gimp/gimp_2.3.2.bb b/packages/gimp/gimp_2.3.3.bb
index 98237579d0..98237579d0 100644
--- a/packages/gimp/gimp_2.3.2.bb
+++ b/packages/gimp/gimp_2.3.3.bb
diff --git a/packages/gnome/gnome-mime-data_2.4.2.bb b/packages/gnome/gnome-mime-data_2.4.2.bb
index 1a49ed8e72..c71f21c9d8 100644
--- a/packages/gnome/gnome-mime-data_2.4.2.bb
+++ b/packages/gnome/gnome-mime-data_2.4.2.bb
@@ -1,5 +1,7 @@
 LICENSE = "GPL"
 inherit gnome
 
-DEPENDS += "intltool-native"
-PR = "r1"
+DEPENDS += "shared-mime-info intltool-native"
+RDEPENDS = "shared-mime-info"
+
+PR = "r2"
diff --git a/packages/gpe-dm/files/Xserver-akita.patch b/packages/gpe-dm/files/Xserver-akita.patch
deleted file mode 100644
index 3439841969..0000000000
--- a/packages/gpe-dm/files/Xserver-akita.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpe-dm-0.47/Xserver.old	2005-08-05 20:42:27.246027809 +0200
-+++ gpe-dm-0.47/Xserver	2005-08-05 20:41:06.000000000 +0200
-@@ -62,7 +62,7 @@
- 		;;
- 	"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
- 		ARGS="$ARGS -rgba rgb" ;;
--	"SHARP Spitz")
-+	"SHARP Spitz" | "SHARP Akita")
- 		ARGS="$ARGS -rgba rgb -screen 640x480@270" ;;
- 	"Simpad")
- 		ARGS="$ARGS -rgba rgb" ;;
diff --git a/packages/gpe-dm/files/Xserver-spitz.patch b/packages/gpe-dm/files/Xserver-cxk.patch
index f30b705d13..89187a0e31 100644
--- a/packages/gpe-dm/files/Xserver-spitz.patch
+++ b/packages/gpe-dm/files/Xserver-cxk.patch
@@ -4,7 +4,7 @@
  		;;
  	"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
  		ARGS="$ARGS -rgba rgb" ;;
-+	"SHARP Spitz")
++	"SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
 +		ARGS="$ARGS -rgba rgb -screen 640x480@270" ;;
  	"Simpad")
  		ARGS="$ARGS -rgba rgb" ;;
diff --git a/packages/gpe-dm/gpe-dm_0.47.bb b/packages/gpe-dm/gpe-dm_0.47.bb
index ba20745e0d..b98a235ac5 100644
--- a/packages/gpe-dm/gpe-dm_0.47.bb
+++ b/packages/gpe-dm/gpe-dm_0.47.bb
@@ -6,11 +6,10 @@ SECTION = "gpe"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "glib-2.0"
-PR = "r3"
+PR = "r4"
 
 INITSCRIPT_NAME = "gpe-dm"
 INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
 
 SRC_URI += "file://collie-suspend-hack.patch;patch=1 \
-            file://Xserver-spitz.patch;patch=1 \
-	    file://Xserver-akita.patch;patch=1"
+	    file://Xserver-cxk.patch;patch=1"
diff --git a/packages/esmart/files/.mtn2git_empty b/packages/gtkextra/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/esmart/files/.mtn2git_empty
+++ b/packages/gtkextra/.mtn2git_empty
diff --git a/packages/gtkextra/gtk+extra_2.1.1.bb b/packages/gtkextra/gtk+extra_2.1.1.bb
new file mode 100644
index 0000000000..60b34544ed
--- /dev/null
+++ b/packages/gtkextra/gtk+extra_2.1.1.bb
@@ -0,0 +1,9 @@
+LICENSE		= "LGPL"
+HOMEPAGE 	= "http://gtkextra.sourceforge.net/"
+DESCRIPTION	= "Gtk+Extra is a set of custom widget for plots and images"
+
+SRC_URI		= "${SOURCEFORGE_MIRROR}/scigraphica/gtk+extra-${PV}.tar.gz"
+DEPENDS		= "gtk+"
+
+inherit autotools
+ 
diff --git a/packages/imlib2/.mtn2git_empty b/packages/imlib2/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/imlib2/.mtn2git_empty
+++ /dev/null
diff --git a/packages/imlib2/files/.mtn2git_empty b/packages/imlib2/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/imlib2/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/imlib2/files/binconfig.patch b/packages/imlib2/files/binconfig.patch
deleted file mode 100644
index 9383d581cd..0000000000
--- a/packages/imlib2/files/binconfig.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: imlib2-1.2.0/imlib2-config.in
-===================================================================
---- imlib2-1.2.0.orig/imlib2-config.in	2004-11-01 04:39:42.000000000 -0500
-+++ imlib2-1.2.0/imlib2-config.in	2005-03-12 19:39:48.283569432 -0500
-@@ -3,6 +3,8 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- exec_prefix_set=no
-+libdir=@libdir@
-+includedir=@includedir@
- 
- usage="\
- Usage: imlib2-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
-@@ -39,13 +41,13 @@
-       echo @VERSION@
-       ;;
-     --cflags)
--      if test @includedir@ != /usr/include ; then
--        includes=-I@includedir@
-+      if test ${includedir} != /usr/include ; then
-+        includes=-I${includedir}
-       fi
-       echo $includes
-       ;;
-     --libs)
--      libdirs=-L@libdir@
-+      libdirs=-L${libdir}
-       echo $libdirs -lImlib2 @my_libs@
-       ;;
-     *)
diff --git a/packages/imlib2/files/x.patch b/packages/imlib2/files/x.patch
deleted file mode 100644
index 98c1ec635b..0000000000
--- a/packages/imlib2/files/x.patch
+++ /dev/null
@@ -1,1813 +0,0 @@
-Index: imlib2-1.2.0/configure.in
-===================================================================
---- imlib2-1.2.0.orig/configure.in	2005-01-05 04:39:08.000000000 -0500
-+++ imlib2-1.2.0/configure.in	2005-03-12 20:26:02.313852728 -0500
-@@ -139,35 +139,12 @@
- freetype_cflags=`$FREETYPE_CONFIG --cflags`
- freetype_libs=`$FREETYPE_CONFIG --libs`
- 
--x11=no
--AC_ARG_ENABLE(x11,[  --disable-x11           attempt to build with X11 support [default=yes]],
--[
--  if test x$enableval = xyes; then
--    have_x=yes
--  else
--    have_x=no
--  fi
--],
--[
--  AC_CHECK_HEADER(X11/X.h,
--    [ have_x="yes" ],
--    [ have_x="no" ]
--  )
--]
--)
--AC_MSG_CHECKING(whether X11 support is to be enabled)
--if test "x$have_x" = "xyes"; then
--  x_dir="/usr/X11R6";
--  x_cflags="-I"$x_dir"/include"
--  x_libs="-L"$x_dir"/lib -lX11 -lXext"
--  AC_MSG_RESULT(enabling X11 support)
-+AC_PATH_XTRA
-+if test "x$with_x" = "xyes"; then
-   AM_CONDITIONAL(BUILD_X11, true)
-   AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
-+  X_LIBS="$X_LIBS -lX11 -lXext"
- else
--  x_dir=""
--  x_cflags=""
--  x_libs=""
--  AC_MSG_RESULT(disabling X11 support)
-   AM_CONDITIONAL(BUILD_X11, false)
- fi
- 
-Index: imlib2-1.2.0/src/Makefile.in
-===================================================================
---- imlib2-1.2.0.orig/src/Makefile.in	2004-04-06 13:56:48.000000000 -0400
-+++ imlib2-1.2.0/src/Makefile.in	2005-03-12 20:26:28.578859840 -0500
-@@ -0,0 +1,490 @@
-+# Makefile.in generated by automake 1.9.3 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = src
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+BUILD_BZ2_LOADER_FALSE = @BUILD_BZ2_LOADER_FALSE@
-+BUILD_BZ2_LOADER_TRUE = @BUILD_BZ2_LOADER_TRUE@
-+BUILD_GIF_LOADER_FALSE = @BUILD_GIF_LOADER_FALSE@
-+BUILD_GIF_LOADER_TRUE = @BUILD_GIF_LOADER_TRUE@
-+BUILD_JPEG_LOADER_FALSE = @BUILD_JPEG_LOADER_FALSE@
-+BUILD_JPEG_LOADER_TRUE = @BUILD_JPEG_LOADER_TRUE@
-+BUILD_MMX_FALSE = @BUILD_MMX_FALSE@
-+BUILD_MMX_TRUE = @BUILD_MMX_TRUE@
-+BUILD_PNG_LOADER_FALSE = @BUILD_PNG_LOADER_FALSE@
-+BUILD_PNG_LOADER_TRUE = @BUILD_PNG_LOADER_TRUE@
-+BUILD_TIFF_LOADER_FALSE = @BUILD_TIFF_LOADER_FALSE@
-+BUILD_TIFF_LOADER_TRUE = @BUILD_TIFF_LOADER_TRUE@
-+BUILD_X11_FALSE = @BUILD_X11_FALSE@
-+BUILD_X11_TRUE = @BUILD_X11_TRUE@
-+BUILD_ZLIB_LOADER_FALSE = @BUILD_ZLIB_LOADER_FALSE@
-+BUILD_ZLIB_LOADER_TRUE = @BUILD_ZLIB_LOADER_TRUE@
-+BZ2LIBS = @BZ2LIBS@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FREETYPE_CONFIG = @FREETYPE_CONFIG@
-+GIFLIBS = @GIFLIBS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JPEGLIBS = @JPEGLIBS@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LIBTOOL = @LIBTOOL@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAKEINFO = @MAKEINFO@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PNGLIBS = @PNGLIBS@
-+RANLIB = @RANLIB@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+STRIP = @STRIP@
-+TIFFLIBS = @TIFFLIBS@
-+VERSION = @VERSION@
-+X_CFLAGS = @X_CFLAGS@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_LIBS = @X_LIBS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+ZLIBLIBS = @ZLIBLIBS@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+my_includes = @my_includes@
-+my_libs = @my_libs@
-+oldincludedir = @oldincludedir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+MAINTAINERCLEANFILES = Makefile.in
-+SUBDIRS = lib bin modules
-+all: all-recursive
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  src/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+$(RECURSIVE_TARGETS):
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
-+	done; \
-+	rev="$$rev ."; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+ctags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	done
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	  empty_fix=.; \
-+	else \
-+	  include_option=--include; \
-+	  empty_fix=; \
-+	fi; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test ! -f $$subdir/TAGS || \
-+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+	  fi; \
-+	done; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || exit 1; \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-+	    (cd $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
-+	        distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-recursive
-+all-am: Makefile
-+installdirs: installdirs-recursive
-+installdirs-am:
-+install: install-recursive
-+install-exec: install-exec-recursive
-+install-data: install-data-recursive
-+uninstall: uninstall-recursive
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-recursive
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+clean: clean-recursive
-+
-+clean-am: clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-recursive
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool \
-+	distclean-tags
-+
-+dvi: dvi-recursive
-+
-+dvi-am:
-+
-+html: html-recursive
-+
-+info: info-recursive
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am:
-+
-+install-info: install-info-recursive
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-recursive
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-recursive
-+
-+pdf-am:
-+
-+ps: ps-recursive
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+uninstall-info: uninstall-info-recursive
-+
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libtool clean-recursive ctags \
-+	ctags-recursive distclean distclean-generic distclean-libtool \
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool \
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-Index: imlib2-1.2.0/src/bin/Makefile.am
-===================================================================
---- imlib2-1.2.0.orig/src/bin/Makefile.am	2004-11-01 04:39:42.000000000 -0500
-+++ imlib2-1.2.0/src/bin/Makefile.am	2005-03-12 20:15:33.099507848 -0500
-@@ -3,6 +3,7 @@
- INCLUDES = \
- -I../lib \
- -I$(top_srcdir)/src/lib \
-+$(X_CFLAGS) \
- @my_includes@
- 
- if BUILD_X11
-@@ -14,22 +15,22 @@
- $(X_BASED_PROGS)
- 
- imlib2_conv_SOURCES = imlib2_conv.c
--imlib2_conv_LDADD   = $(top_builddir)/src/lib/libImlib2.la
-+imlib2_conv_LDADD   = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la
- 
- imlib2_show_SOURCES = imlib2_show.c
--imlib2_show_LDADD   = $(top_builddir)/src/lib/libImlib2.la
-+imlib2_show_LDADD   = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la
- 
- imlib2_test_SOURCES = imlib2_test.c
--imlib2_test_LDADD   = $(top_builddir)/src/lib/libImlib2.la
-+imlib2_test_LDADD   = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la
- 
- imlib2_bumpmap_SOURCES = imlib2_bumpmap.c
--imlib2_bumpmap_LDADD   = $(top_builddir)/src/lib/libImlib2.la
-+imlib2_bumpmap_LDADD   = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la
- 
- imlib2_poly_SOURCES = imlib2_poly.c
--imlib2_poly_LDADD   = $(top_builddir)/src/lib/libImlib2.la
-+imlib2_poly_LDADD   = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la
- 
- imlib2_colorspace_SOURCES = imlib2_colorspace.c
--imlib2_colorspace_LDADD   = $(top_builddir)/src/lib/libImlib2.la
-+imlib2_colorspace_LDADD   = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la
- 
- imlib2_view_SOURCES = imlib2_view.c
--imlib2_view_LDADD   = $(top_builddir)/src/lib/libImlib2.la
-+imlib2_view_LDADD   = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la
-Index: imlib2-1.2.0/src/bin/Makefile.in
-===================================================================
---- imlib2-1.2.0.orig/src/bin/Makefile.in	2004-04-06 13:56:48.000000000 -0400
-+++ imlib2-1.2.0/src/bin/Makefile.in	2005-03-12 20:26:28.815823816 -0500
-@@ -0,0 +1,561 @@
-+# Makefile.in generated by automake 1.9.3 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+
-+SOURCES = $(imlib2_bumpmap_SOURCES) $(imlib2_colorspace_SOURCES) $(imlib2_conv_SOURCES) $(imlib2_poly_SOURCES) $(imlib2_show_SOURCES) $(imlib2_test_SOURCES) $(imlib2_view_SOURCES)
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+bin_PROGRAMS = imlib2_conv$(EXEEXT) $(am__EXEEXT_1)
-+subdir = src/bin
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+@BUILD_X11_TRUE@am__EXEEXT_1 = imlib2_show$(EXEEXT) \
-+@BUILD_X11_TRUE@	imlib2_test$(EXEEXT) imlib2_bumpmap$(EXEEXT) \
-+@BUILD_X11_TRUE@	imlib2_poly$(EXEEXT) \
-+@BUILD_X11_TRUE@	imlib2_colorspace$(EXEEXT) \
-+@BUILD_X11_TRUE@	imlib2_view$(EXEEXT)
-+am__installdirs = "$(DESTDIR)$(bindir)"
-+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+PROGRAMS = $(bin_PROGRAMS)
-+am_imlib2_bumpmap_OBJECTS = imlib2_bumpmap.$(OBJEXT)
-+imlib2_bumpmap_OBJECTS = $(am_imlib2_bumpmap_OBJECTS)
-+am__DEPENDENCIES_1 =
-+imlib2_bumpmap_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+	$(top_builddir)/src/lib/libImlib2.la
-+am_imlib2_colorspace_OBJECTS = imlib2_colorspace.$(OBJEXT)
-+imlib2_colorspace_OBJECTS = $(am_imlib2_colorspace_OBJECTS)
-+imlib2_colorspace_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+	$(top_builddir)/src/lib/libImlib2.la
-+am_imlib2_conv_OBJECTS = imlib2_conv.$(OBJEXT)
-+imlib2_conv_OBJECTS = $(am_imlib2_conv_OBJECTS)
-+imlib2_conv_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+	$(top_builddir)/src/lib/libImlib2.la
-+am_imlib2_poly_OBJECTS = imlib2_poly.$(OBJEXT)
-+imlib2_poly_OBJECTS = $(am_imlib2_poly_OBJECTS)
-+imlib2_poly_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+	$(top_builddir)/src/lib/libImlib2.la
-+am_imlib2_show_OBJECTS = imlib2_show.$(OBJEXT)
-+imlib2_show_OBJECTS = $(am_imlib2_show_OBJECTS)
-+imlib2_show_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+	$(top_builddir)/src/lib/libImlib2.la
-+am_imlib2_test_OBJECTS = imlib2_test.$(OBJEXT)
-+imlib2_test_OBJECTS = $(am_imlib2_test_OBJECTS)
-+imlib2_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+	$(top_builddir)/src/lib/libImlib2.la
-+am_imlib2_view_OBJECTS = imlib2_view.$(OBJEXT)
-+imlib2_view_OBJECTS = $(am_imlib2_view_OBJECTS)
-+imlib2_view_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+	$(top_builddir)/src/lib/libImlib2.la
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(imlib2_bumpmap_SOURCES) $(imlib2_colorspace_SOURCES) \
-+	$(imlib2_conv_SOURCES) $(imlib2_poly_SOURCES) \
-+	$(imlib2_show_SOURCES) $(imlib2_test_SOURCES) \
-+	$(imlib2_view_SOURCES)
-+DIST_SOURCES = $(imlib2_bumpmap_SOURCES) $(imlib2_colorspace_SOURCES) \
-+	$(imlib2_conv_SOURCES) $(imlib2_poly_SOURCES) \
-+	$(imlib2_show_SOURCES) $(imlib2_test_SOURCES) \
-+	$(imlib2_view_SOURCES)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+BUILD_BZ2_LOADER_FALSE = @BUILD_BZ2_LOADER_FALSE@
-+BUILD_BZ2_LOADER_TRUE = @BUILD_BZ2_LOADER_TRUE@
-+BUILD_GIF_LOADER_FALSE = @BUILD_GIF_LOADER_FALSE@
-+BUILD_GIF_LOADER_TRUE = @BUILD_GIF_LOADER_TRUE@
-+BUILD_JPEG_LOADER_FALSE = @BUILD_JPEG_LOADER_FALSE@
-+BUILD_JPEG_LOADER_TRUE = @BUILD_JPEG_LOADER_TRUE@
-+BUILD_MMX_FALSE = @BUILD_MMX_FALSE@
-+BUILD_MMX_TRUE = @BUILD_MMX_TRUE@
-+BUILD_PNG_LOADER_FALSE = @BUILD_PNG_LOADER_FALSE@
-+BUILD_PNG_LOADER_TRUE = @BUILD_PNG_LOADER_TRUE@
-+BUILD_TIFF_LOADER_FALSE = @BUILD_TIFF_LOADER_FALSE@
-+BUILD_TIFF_LOADER_TRUE = @BUILD_TIFF_LOADER_TRUE@
-+BUILD_X11_FALSE = @BUILD_X11_FALSE@
-+BUILD_X11_TRUE = @BUILD_X11_TRUE@
-+BUILD_ZLIB_LOADER_FALSE = @BUILD_ZLIB_LOADER_FALSE@
-+BUILD_ZLIB_LOADER_TRUE = @BUILD_ZLIB_LOADER_TRUE@
-+BZ2LIBS = @BZ2LIBS@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FREETYPE_CONFIG = @FREETYPE_CONFIG@
-+GIFLIBS = @GIFLIBS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JPEGLIBS = @JPEGLIBS@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LIBTOOL = @LIBTOOL@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAKEINFO = @MAKEINFO@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PNGLIBS = @PNGLIBS@
-+RANLIB = @RANLIB@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+STRIP = @STRIP@
-+TIFFLIBS = @TIFFLIBS@
-+VERSION = @VERSION@
-+X_CFLAGS = @X_CFLAGS@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_LIBS = @X_LIBS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+ZLIBLIBS = @ZLIBLIBS@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+my_includes = @my_includes@
-+my_libs = @my_libs@
-+oldincludedir = @oldincludedir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+MAINTAINERCLEANFILES = Makefile.in
-+INCLUDES = \
-+-I../lib \
-+-I$(top_srcdir)/src/lib \
-+$(X_CFLAGS) \
-+@my_includes@
-+
-+@BUILD_X11_TRUE@X_BASED_PROGS = imlib2_show imlib2_test imlib2_bumpmap imlib2_poly imlib2_colorspace imlib2_view
-+imlib2_conv_SOURCES = imlib2_conv.c
-+imlib2_conv_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la
-+imlib2_show_SOURCES = imlib2_show.c
-+imlib2_show_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la
-+imlib2_test_SOURCES = imlib2_test.c
-+imlib2_test_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la
-+imlib2_bumpmap_SOURCES = imlib2_bumpmap.c
-+imlib2_bumpmap_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la
-+imlib2_poly_SOURCES = imlib2_poly.c
-+imlib2_poly_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la
-+imlib2_colorspace_SOURCES = imlib2_colorspace.c
-+imlib2_colorspace_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la
-+imlib2_view_SOURCES = imlib2_view.c
-+imlib2_view_LDADD = $(X_LIBS) $(top_builddir)/src/lib/libImlib2.la
-+all: all-am
-+
-+.SUFFIXES:
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/bin/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  src/bin/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+install-binPROGRAMS: $(bin_PROGRAMS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  if test -f $$p \
-+	     || test -f $$p1 \
-+	  ; then \
-+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-+	  else :; fi; \
-+	done
-+
-+uninstall-binPROGRAMS:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-+	done
-+
-+clean-binPROGRAMS:
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  echo " rm -f $$p $$f"; \
-+	  rm -f $$p $$f ; \
-+	done
-+imlib2_bumpmap$(EXEEXT): $(imlib2_bumpmap_OBJECTS) $(imlib2_bumpmap_DEPENDENCIES) 
-+	@rm -f imlib2_bumpmap$(EXEEXT)
-+	$(LINK) $(imlib2_bumpmap_LDFLAGS) $(imlib2_bumpmap_OBJECTS) $(imlib2_bumpmap_LDADD) $(LIBS)
-+imlib2_colorspace$(EXEEXT): $(imlib2_colorspace_OBJECTS) $(imlib2_colorspace_DEPENDENCIES) 
-+	@rm -f imlib2_colorspace$(EXEEXT)
-+	$(LINK) $(imlib2_colorspace_LDFLAGS) $(imlib2_colorspace_OBJECTS) $(imlib2_colorspace_LDADD) $(LIBS)
-+imlib2_conv$(EXEEXT): $(imlib2_conv_OBJECTS) $(imlib2_conv_DEPENDENCIES) 
-+	@rm -f imlib2_conv$(EXEEXT)
-+	$(LINK) $(imlib2_conv_LDFLAGS) $(imlib2_conv_OBJECTS) $(imlib2_conv_LDADD) $(LIBS)
-+imlib2_poly$(EXEEXT): $(imlib2_poly_OBJECTS) $(imlib2_poly_DEPENDENCIES) 
-+	@rm -f imlib2_poly$(EXEEXT)
-+	$(LINK) $(imlib2_poly_LDFLAGS) $(imlib2_poly_OBJECTS) $(imlib2_poly_LDADD) $(LIBS)
-+imlib2_show$(EXEEXT): $(imlib2_show_OBJECTS) $(imlib2_show_DEPENDENCIES) 
-+	@rm -f imlib2_show$(EXEEXT)
-+	$(LINK) $(imlib2_show_LDFLAGS) $(imlib2_show_OBJECTS) $(imlib2_show_LDADD) $(LIBS)
-+imlib2_test$(EXEEXT): $(imlib2_test_OBJECTS) $(imlib2_test_DEPENDENCIES) 
-+	@rm -f imlib2_test$(EXEEXT)
-+	$(LINK) $(imlib2_test_LDFLAGS) $(imlib2_test_OBJECTS) $(imlib2_test_LDADD) $(LIBS)
-+imlib2_view$(EXEEXT): $(imlib2_view_OBJECTS) $(imlib2_view_DEPENDENCIES) 
-+	@rm -f imlib2_view$(EXEEXT)
-+	$(LINK) $(imlib2_view_LDFLAGS) $(imlib2_view_OBJECTS) $(imlib2_view_LDADD) $(LIBS)
-+
-+mostlyclean-compile:
-+	-rm -f *.$(OBJEXT)
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imlib2_bumpmap.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imlib2_colorspace.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imlib2_conv.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imlib2_poly.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imlib2_show.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imlib2_test.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imlib2_view.Po@am__quote@
-+
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-+
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(PROGRAMS)
-+installdirs:
-+	for dir in "$(DESTDIR)$(bindir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+clean: clean-am
-+
-+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am: install-binPROGRAMS
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-+	clean-generic clean-libtool ctags distclean distclean-compile \
-+	distclean-generic distclean-libtool distclean-tags distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-binPROGRAMS install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-strip installcheck installcheck-am installdirs \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-binPROGRAMS uninstall-info-am
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-Index: imlib2-1.2.0/src/lib/Makefile.am
-===================================================================
---- imlib2-1.2.0.orig/src/lib/Makefile.am	2004-11-02 01:19:14.000000000 -0500
-+++ imlib2-1.2.0/src/lib/Makefile.am	2005-03-12 20:11:32.783041504 -0500
-@@ -1,6 +1,6 @@
- AUTOMAKE_OPTIONS     = 1.4 foreign
- MAINTAINERCLEANFILES = Makefile.in
--INCLUDES	     = @my_includes@ -I. -I$(top_srcdir)  -I$(top_builddir)
-+INCLUDES	     = $(X_CFLAGS) @my_includes@ -I. -I$(top_srcdir)  -I$(top_builddir)
- 
- lib_LTLIBRARIES      = libImlib2.la
- include_HEADERS      = Imlib2.h
-@@ -79,10 +79,10 @@
- MMX_OBJS = $(MMX_SRCS:.S=.lo)
- 
- if BUILD_MMX
--libImlib2_la_LIBADD       = $(MMX_OBJS) @my_libs@
-+libImlib2_la_LIBADD       = $(X_LIBS) $(MMX_OBJS) @my_libs@
- libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(MMX_OBJS)
- else
--libImlib2_la_LIBADD       = @my_libs@
-+libImlib2_la_LIBADD       = $(X_LIBS) @my_libs@
- libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h
- endif
- libImlib2_la_LDFLAGS      = -version-info 3:0:2
-Index: imlib2-1.2.0/src/lib/Makefile.in
-===================================================================
---- imlib2-1.2.0.orig/src/lib/Makefile.in	2004-04-06 13:56:48.000000000 -0400
-+++ imlib2-1.2.0/src/lib/Makefile.in	2005-03-12 20:26:29.090782016 -0500
-@@ -0,0 +1,637 @@
-+# Makefile.in generated by automake 1.9.3 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+
-+
-+SOURCES = $(libImlib2_la_SOURCES) $(EXTRA_libImlib2_la_SOURCES)
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = src/lib
-+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
-+	$(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
-+libLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(lib_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am__DEPENDENCIES_2 = asm_blend.lo asm_blend_cmod.lo asm_rgba.lo \
-+	asm_rotate.lo asm_scale.lo
-+am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2)
-+am_libImlib2_la_OBJECTS = api.lo blend.lo color.lo color_helpers.lo \
-+	colormod.lo context.lo draw.lo dynamic_filters.lo ellipse.lo \
-+	file.lo filter.lo font_draw.lo font_load.lo font_main.lo \
-+	font_query.lo format.lo grab.lo grad.lo image.lo line.lo \
-+	polygon.lo rectangle.lo rend.lo rgba.lo rgbadraw.lo rotate.lo \
-+	scale.lo script.lo span.lo updates.lo ximage.lo
-+libImlib2_la_OBJECTS = $(am_libImlib2_la_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/depcomp
-+am__depfiles_maybe = depfiles
-+CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
-+LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
-+	$(CCASFLAGS)
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libImlib2_la_SOURCES) $(EXTRA_libImlib2_la_SOURCES)
-+DIST_SOURCES = $(libImlib2_la_SOURCES) $(EXTRA_libImlib2_la_SOURCES)
-+includeHEADERS_INSTALL = $(INSTALL_HEADER)
-+HEADERS = $(include_HEADERS)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+BUILD_BZ2_LOADER_FALSE = @BUILD_BZ2_LOADER_FALSE@
-+BUILD_BZ2_LOADER_TRUE = @BUILD_BZ2_LOADER_TRUE@
-+BUILD_GIF_LOADER_FALSE = @BUILD_GIF_LOADER_FALSE@
-+BUILD_GIF_LOADER_TRUE = @BUILD_GIF_LOADER_TRUE@
-+BUILD_JPEG_LOADER_FALSE = @BUILD_JPEG_LOADER_FALSE@
-+BUILD_JPEG_LOADER_TRUE = @BUILD_JPEG_LOADER_TRUE@
-+BUILD_MMX_FALSE = @BUILD_MMX_FALSE@
-+BUILD_MMX_TRUE = @BUILD_MMX_TRUE@
-+BUILD_PNG_LOADER_FALSE = @BUILD_PNG_LOADER_FALSE@
-+BUILD_PNG_LOADER_TRUE = @BUILD_PNG_LOADER_TRUE@
-+BUILD_TIFF_LOADER_FALSE = @BUILD_TIFF_LOADER_FALSE@
-+BUILD_TIFF_LOADER_TRUE = @BUILD_TIFF_LOADER_TRUE@
-+BUILD_X11_FALSE = @BUILD_X11_FALSE@
-+BUILD_X11_TRUE = @BUILD_X11_TRUE@
-+BUILD_ZLIB_LOADER_FALSE = @BUILD_ZLIB_LOADER_FALSE@
-+BUILD_ZLIB_LOADER_TRUE = @BUILD_ZLIB_LOADER_TRUE@
-+BZ2LIBS = @BZ2LIBS@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FREETYPE_CONFIG = @FREETYPE_CONFIG@
-+GIFLIBS = @GIFLIBS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JPEGLIBS = @JPEGLIBS@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LIBTOOL = @LIBTOOL@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAKEINFO = @MAKEINFO@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PNGLIBS = @PNGLIBS@
-+RANLIB = @RANLIB@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+STRIP = @STRIP@
-+TIFFLIBS = @TIFFLIBS@
-+VERSION = @VERSION@
-+X_CFLAGS = @X_CFLAGS@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_LIBS = @X_LIBS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+ZLIBLIBS = @ZLIBLIBS@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+my_includes = @my_includes@
-+my_libs = @my_libs@
-+oldincludedir = @oldincludedir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+AUTOMAKE_OPTIONS = 1.4 foreign
-+MAINTAINERCLEANFILES = Makefile.in
-+INCLUDES = $(X_CFLAGS) @my_includes@ -I. -I$(top_srcdir)  -I$(top_builddir)
-+lib_LTLIBRARIES = libImlib2.la
-+include_HEADERS = Imlib2.h
-+libImlib2_la_SOURCES = \
-+api.c \
-+blend.c \
-+blend.h \
-+color.c \
-+color.h \
-+color_helpers.c \
-+color_helpers.h \
-+colormod.c \
-+colormod.h \
-+common.h \
-+context.c \
-+context.h \
-+draw.c \
-+draw.h \
-+dynamic_filters.c \
-+dynamic_filters.h \
-+ellipse.c \
-+file.c \
-+file.h \
-+filter.c \
-+filter.h \
-+font.h \
-+font_draw.c \
-+font_load.c \
-+font_main.c \
-+font_query.c \
-+format.c \
-+format.h \
-+grab.c \
-+grab.h \
-+grad.c \
-+grad.h \
-+image.c \
-+image.h \
-+line.c \
-+loaderpath.h \
-+polygon.c \
-+rectangle.c \
-+rend.c \
-+rend.h \
-+rgba.c \
-+rgba.h \
-+rgbadraw.c \
-+rgbadraw.h \
-+rotate.c \
-+rotate.h \
-+scale.c \
-+scale.h \
-+script.c \
-+script.h \
-+span.c \
-+span.h \
-+updates.c \
-+updates.h \
-+ximage.c \
-+ximage.h
-+
-+AS = $(CC)
-+CCAS = $(CC)
-+ASFLAGS = -I$(top_srcdir) -I$(top_builddir)
-+CCASFLAGS = -I$(top_srcdir) -I$(top_builddir)
-+MMX_SRCS = \
-+asm_blend.S \
-+asm_blend_cmod.S \
-+asm_rgba.S \
-+asm_rotate.S \
-+asm_scale.S
-+
-+EXTRA_libImlib2_la_SOURCES = $(MMX_SRCS)
-+MMX_OBJS = $(MMX_SRCS:.S=.lo)
-+@BUILD_MMX_FALSE@libImlib2_la_LIBADD = $(X_LIBS) @my_libs@
-+@BUILD_MMX_TRUE@libImlib2_la_LIBADD = $(X_LIBS) $(MMX_OBJS) @my_libs@
-+@BUILD_MMX_FALSE@libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h
-+@BUILD_MMX_TRUE@libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(MMX_OBJS)
-+libImlib2_la_LDFLAGS = -version-info 3:0:2
-+all: all-am
-+
-+.SUFFIXES:
-+.SUFFIXES: .S .c .lo .o .obj
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  src/lib/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	  if test -f $$p; then \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-+	  else :; fi; \
-+	done
-+
-+uninstall-libLTLIBRARIES:
-+	@$(NORMAL_UNINSTALL)
-+	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-+	done
-+
-+clean-libLTLIBRARIES:
-+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+libImlib2.la: $(libImlib2_la_OBJECTS) $(libImlib2_la_DEPENDENCIES) 
-+	$(LINK) -rpath $(libdir) $(libImlib2_la_LDFLAGS) $(libImlib2_la_OBJECTS) $(libImlib2_la_LIBADD) $(LIBS)
-+
-+mostlyclean-compile:
-+	-rm -f *.$(OBJEXT)
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/api.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blend.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color_helpers.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colormod.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/context.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/draw.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dynamic_filters.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ellipse.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font_draw.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font_load.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font_main.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font_query.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/format.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grab.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grad.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/line.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/polygon.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rectangle.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rend.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgba.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgbadraw.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rotate.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scale.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/script.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/span.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/updates.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ximage.Plo@am__quote@
-+
-+.S.o:
-+	$(CCASCOMPILE) -c $<
-+
-+.S.obj:
-+	$(CCASCOMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.S.lo:
-+	$(LTCCASCOMPILE) -c -o $@ $<
-+
-+.c.o:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-+
-+.c.obj:
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+install-includeHEADERS: $(include_HEADERS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
-+	@list='$(include_HEADERS)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
-+	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
-+	done
-+
-+uninstall-includeHEADERS:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(include_HEADERS)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
-+	done
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-+installdirs:
-+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+clean: clean-am
-+
-+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-+	mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am: install-includeHEADERS
-+
-+install-exec-am: install-libLTLIBRARIES
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-+	uninstall-libLTLIBRARIES
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libLTLIBRARIES clean-libtool ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-includeHEADERS install-info \
-+	install-info-am install-libLTLIBRARIES install-man \
-+	install-strip installcheck installcheck-am installdirs \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-includeHEADERS uninstall-info-am \
-+	uninstall-libLTLIBRARIES
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
diff --git a/packages/meta/e-image.bb b/packages/meta/e-image.bb
index fe425050c0..883be10f6b 100644
--- a/packages/meta/e-image.bb
+++ b/packages/meta/e-image.bb
@@ -1,6 +1,6 @@
 export IMAGE_BASENAME = "e-image"
 
-DEPENDS = "task-bootstrap meta-e"
+DEPENDS = "task-bootstrap meta-e-x11"
 
 export IPKG_INSTALL = "task-bootstrap e-base"
 
diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index 132c12e8fb..0b3a62cf56 100644
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -1,18 +1,16 @@
-DESCRIPTION = "Meta-package for Enlightenment X11 Without FrameBuffer"
-MAINTAINER = "That Crazy fool emte <emte@labotomy.net>"
+DESCRIPTION = "Meta-package for Enlightenment/X11"
 PACKAGES = "e e-libs e-base"
 
 FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
               e##http://openzaurus.org/official/unstable/3.5.2/feed/e"
 
 ALLOW_EMPTY = 1
+RDEPENDS_e = "e-libs e-base"
 
-# task-e-libs = "virtual/libiconv imlib2 edb eet evas ecore epeg epsilon embryo edje esmart emotion etox ewl"
-# epsilon is currently broke for cross compiling without a patch, raster is looking at it
+task-e-libs = "virtual/libiconv imlib2-x11 edb eet evas-x11 ecore-x11 \
+               epeg embryo epsylon edje esmart emotion etox ewl"
 
-task-e-libs = "virtual/libiconv imlib2 edb eet evas ecore epeg embryo edje esmart emotion etox ewl"
-
-task-e-base = ""
+task-e-base = "entrance e17 e-iconbar e-utils"
 
 RDEPENDS_e-libs = "${task-e-libs}"
 DEPENDS += "${task-e-libs}"
diff --git a/packages/mpfr/mpfr-native_2.1.1.bb b/packages/mpfr/mpfr-native_2.1.1.bb
index b60620641f..119249895d 100644
--- a/packages/mpfr/mpfr-native_2.1.1.bb
+++ b/packages/mpfr/mpfr-native_2.1.1.bb
@@ -1,5 +1,4 @@
 include mpfr_${PV}.bb
-DEPENDS = "gmp-native"
-S = "${WORKDIR}/mpfr-${PV}"
 inherit native
+DEPENDS = "gmp-native"
 
diff --git a/packages/mpfr/mpfr_2.1.1.bb b/packages/mpfr/mpfr_2.1.1.bb
index dec3302200..8b739c0803 100644
--- a/packages/mpfr/mpfr_2.1.1.bb
+++ b/packages/mpfr/mpfr_2.1.1.bb
@@ -1,13 +1,12 @@
-DESCRIPTION = "A C library for multiple-precision floating-point \
-	       computations with exact rounding"
+DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding"
 LICENSE = "LGPL"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
-PR = "r1"
-
 DEPENDS = "gmp"
+PR = "r1"
 
-SRC_URI = "http://www.mpfr.org/mpfr-current/mpfr-${PV}.tar.bz2"
+SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
+S = "${WORKDIR}/mpfr-${PV}"
 
 inherit autotools
 
diff --git a/packages/mpfr/mpfr_cvs.bb b/packages/mpfr/mpfr_cvs.bb
index 22f8703027..9b715bc9ed 100644
--- a/packages/mpfr/mpfr_cvs.bb
+++ b/packages/mpfr/mpfr_cvs.bb
@@ -1,13 +1,11 @@
-DESCRIPTION = "A C library for multiple-precision floating-point \
-	       computations with exact rounding"
+DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding"
 LICENSE = "LGPL"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
-PR = "r1"
-
 DEPENDS = "gmp"
-
 PV = "0.0cvs${CVSDATE}"
+PR = "r1"
+
 SRC_URI = "cvs://cvs:@cvs-sop.inria.fr/CVS/spaces;module=mpfr;method=pserver"
 S = "${WORKDIR}/mpfr"
 
diff --git a/packages/xtscal/xtscal/xtscal-cxk.patch b/packages/xtscal/xtscal/xtscal-cxk.patch
new file mode 100644
index 0000000000..1cab8efb57
--- /dev/null
+++ b/packages/xtscal/xtscal/xtscal-cxk.patch
@@ -0,0 +1,11 @@
+--- xtscal-0.6.3/xtscal.in~	2004-09-10 12:10:36.000000000 -0700
++++ xtscal-0.6.3/xtscal.in	2005-08-04 09:26:46.000000000 -0700
+@@ -8,7 +8,7 @@
+ case `module_id` in
+ 	"HP IPAQ H3100" | "HP IPAQ H3800" )
+ 		ARGS="-rotate 90" ;;
+-	"HP IPAQ H3600" | "HP IPAQ H3700" | "HP IPAQ H3900" | *COLLIE | *POODLE)
++	"HP IPAQ H3600" | "HP IPAQ H3700" | "HP IPAQ H3900" | *COLLIE | *POODLE | *SPITZ | *AKITA | *BORZOI)
+ 		ARGS="-rotate 270" ;;
+ 	# H2200: works without rotation
+ esac
diff --git a/packages/xtscal/xtscal_0.6.3.bb b/packages/xtscal/xtscal_0.6.3.bb
index f745ed82c0..a2a770f4fe 100644
--- a/packages/xtscal/xtscal_0.6.3.bb
+++ b/packages/xtscal/xtscal_0.6.3.bb
@@ -5,8 +5,9 @@ SECTION = "x11/base"
 
 DEPENDS = "x11 libxft libxrandr xcalibrate"
 
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2"
+SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \
+           file://xtscal-cxk.patch;patch=1"
 
 inherit autotools