Third (and hopefully last) EFL revamp before I hand over maintainership to

Justin Patrin. We now have a efl.bbclass that contains common code for the
various libraries. This makes it possible to have very clean and concise bb's.

70 files changed, 259 insertions, 488 deletions

diff --git a/classes/efl.bbclass b/classes/efl.bbclass
new file mode 100644
index 0000000000..120f26f6ce
--- /dev/null
+++ b/classes/efl.bbclass
@@ -0,0 +1,33 @@
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+HOMEPAGE = "http://www.enlightenment.org"
+SECTION = "e/libs"
+
+SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"
+SRC_URI = "http://enlightenment.freedesktop.org/files/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit autotools pkgconfig binconfig
+
+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"
+
+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
+}
+
+PACKAGES = "${SRCNAME}-dev ${SRCNAME}-examples ${SRCNAME}"
+FILES_${SRCNAME} = "${libdir}"
+FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig"
+FILES_${SRCNAME}-examples = "${bindir} ${datadir}"
+
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/edb/.mtn2git_empty b/packages/edb/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/edb/.mtn2git_empty
+++ /dev/null
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/.mtn2git_empty b/packages/edje/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/edje/.mtn2git_empty
+++ /dev/null
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/.mtn2git_empty b/packages/eet/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/eet/.mtn2git_empty
+++ /dev/null
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/ecore/.mtn2git_empty b/packages/efl/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ecore/.mtn2git_empty
+++ b/packages/efl/.mtn2git_empty
diff --git a/packages/ecore/ecore-fb_0.9.9.013.bb b/packages/efl/ecore-fb_0.9.9.013.bb
index f52c0a2f2b..152cd5c4fd 100644
--- a/packages/ecore/ecore-fb_0.9.9.013.bb
+++ b/packages/efl/ecore-fb_0.9.9.013.bb
@@ -1,4 +1,4 @@
-include ecore_${PV}.inc
+include ecore.inc
 PR = "r0"
 
 EXTRA_OECONF = "--enable-ecore-fb \
diff --git a/packages/ecore/ecore-native_0.9.9.013.bb b/packages/efl/ecore-native_0.9.9.013.bb
index 4ead109e00..a90f508004 100644
--- a/packages/ecore/ecore-native_0.9.9.013.bb
+++ b/packages/efl/ecore-native_0.9.9.013.bb
@@ -6,17 +6,4 @@ 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() {
-	:
-}
+export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config-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..b21efb588e 100644
--- a/packages/ecore/ecore-x11_0.9.9.013.bb
+++ b/packages/efl/ecore-x11_0.9.9.013.bb
@@ -1,4 +1,4 @@
-include ecore_${PV}.inc
+include ecore.inc
 DEPENDS += "evas-x11"
 PR = "r1"
 
@@ -22,5 +22,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..a8ef0ec982 100644
--- a/packages/ecore/ecore_0.9.9.013.inc
+++ b/packages/efl/ecore.inc
@@ -1,26 +1,24 @@
 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://ecore-configure.patch;patch=1"
 S = "${WORKDIR}/ecore-${PV}"
 
-inherit autotools binconfig
-
 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}/
@@ -30,9 +28,4 @@ do_stage () {
 	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/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/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/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-fi