edje, embryo, edb: split out binary programs into -utils packages again

- This time the -utils packages have their own bbs so they don't get their names auto-munged and so can be RDEPENDed on

6 files changed, 68 insertions, 17 deletions

diff --git a/packages/efl/edb-utils_1.0.5.005.bb b/packages/efl/edb-utils_1.0.5.005.bb
new file mode 100644
index 0000000000..401d0e7e46
--- /dev/null
+++ b/packages/efl/edb-utils_1.0.5.005.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "EDB is a database convenience library wrapped around the \
+Berkeley DB 2.7.7 by Sleepycat Software."
+DEPENDS = "zlib ncurses"
+LICENSE = "BSD"
+PR = "r4"
+
+inherit efl
+
+EXTRA_OECONF += "--disable-gtk"
+
+PACKAGES = "edb-utils"
+FILES_${PN} = "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed"
+RDEPENDS_${PN} += "ncurses"
+
+SRC_URI = "http://enlightenment.freedesktop.org/files/edb-${PV}.tar.gz"
+S = "${WORKDIR}/edb-${PV}"
+
+libraries = ""
+headers = ""
diff --git a/packages/efl/edb_1.0.5.005.bb b/packages/efl/edb_1.0.5.005.bb
index 5550538afb..6f771fb0de 100644
--- a/packages/efl/edb_1.0.5.005.bb
+++ b/packages/efl/edb_1.0.5.005.bb
@@ -2,17 +2,12 @@ DESCRIPTION = "EDB is a database convenience library wrapped around the \
 Berkeley DB 2.7.7 by Sleepycat Software."
 DEPENDS = "zlib ncurses"
 LICENSE = "BSD"
-PR = "r3"
-
-## package.bbclass kills packages when there are duplicates, this means
-##  that efl.bbclass can't have PACKAGES += and so the FILES for previous
-##  packages take precedence over -utils
-#PACKAGES = "edb-utils"
-#FILES_edb-utils = "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed"
-#RDEPENDS_edb-utils += "ncurses"
+PR = "r4"
 
 inherit efl
 
 EXTRA_OECONF += "--disable-gtk"
 
 libdirectory = "src"
+
+FILES_${PN}-examples = ""
diff --git a/packages/efl/edje-utils_0.5.0.023.bb b/packages/efl/edje-utils_0.5.0.023.bb
new file mode 100644
index 0000000000..6432fc1267
--- /dev/null
+++ b/packages/efl/edje-utils_0.5.0.023.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Edje is a complex graphical design & layout library."
+DEPENDS = "edje"
+LICENSE = "MIT"
+PR = "r6"
+
+inherit efl
+
+PACKAGES = "edje-utils"
+FILES_${PN} = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include"
+RDEPENDS_${PN} += "embryo-utils cpp cpp-symlinks gcc gcc-symlinks"
+
+SRC_URI = "http://enlightenment.freedesktop.org/files/edje-${PV}.tar.gz \
+           cvs://anonymous@thinktux.net/root;module=e17/libs/edje/m4;date=20060101"
+S = "${WORKDIR}/edje-${PV}"
+
+libraries = ""
+headers = ""
+
+do_configure_prepend() {
+	install -d "${S}/m4"
+	install "${WORKDIR}/m4/"*.m4 "${S}/m4"
+	aclocal -I m4
+}
diff --git a/packages/efl/edje_0.5.0.023.bb b/packages/efl/edje_0.5.0.023.bb
index 11662b226a..43e135ac5d 100644
--- a/packages/efl/edje_0.5.0.023.bb
+++ b/packages/efl/edje_0.5.0.023.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Edje is a complex graphical design & layout library."
 # can also install vim data files
 DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native virtual/imlib2"
 LICENSE = "MIT"
-PR = "r5"
+PR = "r6"
 
 ## package.bbclass kills packages when there are duplicates, this means
 ##  that efl.bbclass can't have PACKAGES += and so the FILES for previous
@@ -14,7 +14,7 @@ PR = "r5"
 
 inherit efl
 
-RDEPENDS_${PN}-dev += "libembryo-dev cpp cpp-symlinks gcc gcc-symlinks"
+FILES_${PN}-examples = "${datadir}/edje/data/images ${datadir}/edje/data/src ${datadir}/edje/data/test ${datadir}/edje/data/*.sh"
 
 FILES_${SRCNAME}-themes = ""
 
diff --git a/packages/efl/embryo-utils_0.9.1.023.bb b/packages/efl/embryo-utils_0.9.1.023.bb
new file mode 100644
index 0000000000..7899e4aa2f
--- /dev/null
+++ b/packages/efl/embryo-utils_0.9.1.023.bb
@@ -0,0 +1,18 @@
+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 = "r4"
+
+inherit efl
+
+SRC_URI = "http://enlightenment.freedesktop.org/files/embryo-${PV}.tar.gz"
+S = "${WORKDIR}/embryo-${PV}"
+
+PACKAGES = "embryo-utils"
+FILES_${PN} = "${bindir}/embryo ${bindir}/embryo_* ${datadir}/embryo/include"
+
+libraries = ""
+headers = ""
diff --git a/packages/efl/embryo_0.9.1.023.bb b/packages/efl/embryo_0.9.1.023.bb
index 603a0c8b47..65345eff94 100644
--- a/packages/efl/embryo_0.9.1.023.bb
+++ b/packages/efl/embryo_0.9.1.023.bb
@@ -4,12 +4,8 @@ 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 = "r3"
-
-## package.bbclass kills packages when there are duplicates, this means
-##  that efl.bbclass can't have PACKAGES += and so the FILES for previous
-##  packages take precedence over -utils
-#PACKAGES = "embryo-utils"
-#FILES_embryo-utils = "${bindir}/embryo ${bindir}/embryo_* ${datadir}/embryo/include"
+PR = "r4"
 
 inherit efl
+
+FILES_${PN}-examples = "${datadir}/${PN}/examples"