merge of '57fa0ccbbdbca8c188108e3c4fbde4702976f3c6'

     and 'b29b99ceeb63af04c2736ab8176705046dc326c0'

4 files changed, 38 insertions, 54 deletions

diff --git a/classes/e.bbclass b/classes/e.bbclass
index 9bac65fd9c..84d85f5542 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -1,5 +1,6 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SECTION = "e/apps"
+SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/${PN}-${PV}.tar.gz"
 
 inherit autotools pkgconfig binconfig
 
diff --git a/classes/efl.bbclass b/classes/efl.bbclass
deleted file mode 100644
index 808bf2eaae..0000000000
--- a/classes/efl.bbclass
+++ /dev/null
@@ -1,52 +0,0 @@
-inherit e
-
-SECTION = "e/libs"
-
-SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"
-SRC_URI = "${E_URI}/${SRCNAME}-${PV}.tar.gz"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-INHIBIT_AUTO_STAGE_INCLUDES  = "1"
-INHIBIT_NATIVE_STAGE_INSTALL = "1"
-
-libdirectory = "src/lib"
-libraries = "lib${SRCNAME}"
-headers = "${@bb.data.getVar('SRCNAME',d,1).capitalize()}.h"
-
-def efl_is_native(d):
-    import bb
-    return ["","-native"][bb.data.inherits_class('native', d)]
-
-do_stage_append () {
-	for i in ${libraries}
-	do
-		oe_libinstall -C ${libdirectory} $i ${STAGING_LIBDIR}
-	done
-	for i in ${headers}
-	do
-		install -m 0644 ${libdirectory}/$i ${STAGING_INCDIR}
-	done
-
-	# Install binaries automatically for native builds
-	if [ "${@efl_is_native(d)}" = "-native" ]
-	then
-
-		# Most EFL binaries start with the package name
-		for i in src/bin/${SRCNAME}*
-		do
-			if [ -x $i -a -f $i ]
-			then
-
-				# Don't install anything with an extension (.so, etc)
-				if echo $i | grep -v \\.
-				then
-					${HOST_SYS}-libtool --mode=install install -m 0755 $i ${STAGING_BINDIR}
-				fi
-			fi
-		done
-	fi
-}
-
-PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-examples"
-FILES_${PN}-dev += "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a"
-FILES_${PN}-examples = "${bindir} ${datadir}"
diff --git a/classes/efl1.bbclass b/classes/efl1.bbclass
new file mode 100644
index 0000000000..9fc5f2c44e
--- /dev/null
+++ b/classes/efl1.bbclass
@@ -0,0 +1,36 @@
+inherit autotools pkgconfig
+
+do_prepsources () {
+  make clean distclean || true
+}
+addtask prepsources after do_fetch before do_unpack
+
+SECTION = "e/libs"
+HOMEPAGE = "http://www.enlightenment.org"
+SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"
+SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+libdirectory = "src/lib"
+libraries = "lib${SRCNAME}"
+headers = "${@bb.data.getVar('SRCNAME',d,1).capitalize()}.h"
+
+def efl_is_native(d):
+    import bb
+    return ["","-native"][bb.data.inherits_class('native', d)]
+
+do_stage() {
+	autotools_stage_all
+}
+
+efl_stage_bin() {
+            rm -rf ${STAGE_TEMP}
+            mkdir -p ${STAGE_TEMP}
+            make DESTDIR="${STAGE_TEMP}" install
+            cp -pPR ${STAGE_TEMP}/${bindir}/* ${STAGING_BINDIR_CROSS}
+            rm -rf ${STAGE_TEMP}
+}
+
+PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-examples"
+FILES_${PN}-dev += "${bindir}/${PN}-config ${libdir}/pkgconfig/* ${libdir}/lib*.?a ${libdir}/lib*.a"
+FILES_${PN}-examples = "${bindir} ${datadir}"
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 210563aed1..75c85e8f3d 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -9,8 +9,7 @@ do_rootfs[depends] += "ipkg-native:do_populate_staging ipkg-utils-native:do_popu
 
 IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}"
 
-RDEPENDS += "ipkg ipkg-collateral"
-PACKAGE_INSTALL += "ipkg ipkg-collateral"
+DISTRO_EXTRA_RDEPENDS += " ipkg ipkg-collateral "
 PACKAGE_INSTALL_NO_DEPS ?= "0"
 
 rootfs_ipk_do_indexes () {