merge of 'e9e7550c64fb618ca229a869b9a5ccae9c437121'

     and 'efa64132e0fc0c02d7eb3be193b7df736281ee8a'

20 files changed, 88 insertions, 161 deletions

diff --git a/classes/efl1.bbclass b/classes/efl1.bbclass
deleted file mode 100644
index 2c8470e5e0..0000000000
--- a/classes/efl1.bbclass
+++ /dev/null
@@ -1,36 +0,0 @@
-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-07-10/${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/efl_library.bbclass b/classes/efl_library.bbclass
index 57b16d93f1..c2b6938e47 100644
--- a/classes/efl_library.bbclass
+++ b/classes/efl_library.bbclass
@@ -5,5 +5,5 @@ S = "${WORKDIR}/${SRCNAME}"
 
 PACKAGES =+ "${PN}-tests"
 FILES_${PN}-tests = "${bindir}/${PN} ${bindir}/*_* ${datadir}"
-FILES_${PN}-dev += "${bindir}/*-config ${libdir}/${PN}/*.a ${libdir}/${PN}/*.la"
+FILES_${PN}-dev += "${bindir}/*-config ${libdir}/${PN}/*.a ${libdir}/${PN}/*.la ${libdir}/${PN}/*/*.a ${libdir}/${PN}/*/*.la"
 FILES_${PN} = "${libdir}/*.so*"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 6c41587c4e..7e344b01db 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -92,6 +92,7 @@ SRCDATE_expedite ?= "20070601"
 SRCDATE_elitaire ?= "20070504"
 SRCDATE_entice ?= "20070601"
 SRCDATE_e-utils ?= "20070601"
+SRCDATE_enna ?= "20070721"
 
 # Misc apps, sorted by alphabet
 SRCDATE_avetanabt ?= "20060814"
diff --git a/packages/e17/edje-editor_cvs.bb b/packages/e17/edje-editor_cvs.bb
new file mode 100644
index 0000000000..72c83dc56e
--- /dev/null
+++ b/packages/e17/edje-editor_cvs.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Edje-Editor is just that."
+LICENSE = "MIT"
+DEPENDS = "etk"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
+
+inherit e
+
+SRC_URI = "${E_CVS};module=e17/proto/edje_editor"
+S = "${WORKDIR}/edje_editor"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
diff --git a/packages/efl++/.mtn2git_empty b/packages/e17/enna/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/efl++/.mtn2git_empty
+++ b/packages/e17/enna/.mtn2git_empty
diff --git a/packages/e17/enna_svn.bb b/packages/e17/enna_svn.bb
new file mode 100644
index 0000000000..49e1caeab0
--- /dev/null
+++ b/packages/e17/enna_svn.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Enna is a media center application based on EFL"
+LICENSE = "GPL"
+DEPENDS = "curl dbus eet evas edje ecore edbus emotion libmusicbrainz libxml2 taglibc"
+SECTION = "x11/multimedia"
+PV = "0.2.0+svn${SRCDATE}"
+
+inherit e
+
+SRC_URI = "svn://enna.svn.sourceforge.net/svnroot/enna/trunk;module=enna;proto=http \
+           file://locale-is-broken.patch;patch=1"
+S = "${WORKDIR}/enna"
+
+do_configure_prepend() {
+	touch po/Makefile.in.in
+}
+
diff --git a/packages/e17/exhibit_cvs.bb b/packages/e17/exhibit_cvs.bb
new file mode 100644
index 0000000000..1c3c836955
--- /dev/null
+++ b/packages/e17/exhibit_cvs.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Exhibit is the ETK picture viewer"
+DEPENDS = "evas ecore edje etk epsilon engrave"
+LICENSE = "MIT"
+PV = "0.0.0+cvs${SRCDATE}"
+PR = "r0"
+
+inherit e
+
+SRC_URI = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e;module=e17/apps/exhibit"
+S = "${WORKDIR}/${PN}"
diff --git a/packages/efl++/efl++-fb_cvs.bb b/packages/efl++/efl++-fb_cvs.bb
deleted file mode 100644
index 8706a32033..0000000000
--- a/packages/efl++/efl++-fb_cvs.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require efl++.inc
-
-PV = "0.1.0+cvs${SRCDATE}"
-
-SRC_URI = "cvs://anonymous@projects.linuxtogo.org/cvsroot/eflpp;module=efl++"
-S = "${WORKDIR}/efl++"
-
-
-
diff --git a/packages/efl++/efl++-x11_cvs.bb b/packages/efl++/efl++-x11_cvs.bb
deleted file mode 100644
index 4beb8c555e..0000000000
--- a/packages/efl++/efl++-x11_cvs.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require efl++.inc
-
-EXTRA_QMAKEVARS_POST += "CONFIG+=eflecorex11"
-PV = "0.1.0+cvs${SRCDATE}"
-
-SRC_URI = "cvs://anonymous@projects.linuxtogo.org/cvsroot/eflpp;module=efl++"
-S = "${WORKDIR}/efl++"
-
-
-
diff --git a/packages/efl++/efl++.inc b/packages/efl++/efl++.inc
deleted file mode 100644
index 52cea6e2aa..0000000000
--- a/packages/efl++/efl++.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-DESCRIPTION = "C++ Bindings for the Enlightenment Foundation Libraries"
-SECTION = "e/libs"
-LICENSE = "LGPL"
-AUTHOR = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-HOMEPAGE = "http://www.Vanille.de/projects/efl++.html"
-DEPENDS = "virtual/evas virtual/ecore etk edje libsigc++-2.0"
-PROVIDES = "virtual/efl++"
-
-SRC_URI = "http://www.Vanille.de/download/efl/efl++_${PV}.tar.bz2 \
-           file://fix-src.pro.patch;patch=1 \
-           file://disable-smart.patch;patch=1"
-S = "${WORKDIR}/efl++-${PV}"
-
-inherit qmake qt4x11
-
-PARALLEL_MAKE = ""
-QMAKE_PROFILES = "efl++.pro"
-EXTRA_QMAKEVARS_POST = "DESTDIR=${S}"
-export OE_QMAKE_LINK="${CXX}"
-export EDIR="${S}"
-
-do_configure_prepend() {
-	rm include.pro
-	cat <<EOF >include.pro
-include ( common.pro )
-
-LIBS        += -L${EDIR}
-
-EFLCONFIG      = console release eflbasic angstrom
-INCLUDEPATH += ${EDIR}/src/common ${EDIR}/src/extra ${EDIR}/src/misc
-INCLUDEPATH += ${EDIR}/src/evas ${EDIR}/src/ecore ${EDIR}/src/edje
-INCLUDEPATH += ${EDIR}/src/esmart ${EDIR}/src/ewl
-
-DEFINES += DATADIR=\"${datadir}/efl++/\"
-
-EOF
-}
-
-do_stage() {
-	for i in src/common/*.h src/evas/*.h src/ecore/*.h src/edje/*.h
-	do
-		install -m 0644 $i ${STAGING_INCDIR}
-	done
-	oe_libinstall -so -C ${S} libefl++ ${STAGING_LIBDIR}
-}
-
-do_install() {
-	oe_libinstall -so -C ${S} libefl++ ${D}${libdir}
-	install -d ${D}${bindir}
-	install *-* ${D}${bindir}
-	install -d ${D}${datadir}/efl++
-	cp -pPR data/* ${D}${datadir}/efl++
-}
-
-PACKAGES =+ "efl++-examples"
-FILES_${PN} = "${libdir}"
-FILES_efl++-examples = "${bindir} ${datadir}"
diff --git a/packages/efl++/files/disable-smart.patch b/packages/efl++/files/disable-smart.patch
deleted file mode 100644
index cdb157cdef..0000000000
--- a/packages/efl++/files/disable-smart.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- efl++-0.1.0/src/evas/evas.cpp~disable-smart
-+++ efl++-0.1.0/src/evas/evas.cpp
-@@ -7,9 +7,13 @@
- /* EFL */
- extern "C" {
- #include <Edje.h>
-+#ifdef EFL_SUPPORT_ESMART
- #include <Esmart/Esmart_Container.h>
- #include <Esmart/Esmart_Text_Entry.h>
-+#endif
-+#ifdef EFL_SUPPORT_EMOTION
- #include <Emotion.h>
-+#endif
- }
- 
- /* STD */
diff --git a/packages/efl++/files/fix-src.pro.patch b/packages/efl++/files/fix-src.pro.patch
deleted file mode 100644
index 234d38af3d..0000000000
--- a/packages/efl++/files/fix-src.pro.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- efl++-0.1.0/src/src.pro~fix-src.pro
-+++ efl++-0.1.0/src/src.pro
-@@ -30,6 +30,7 @@
-     include ( emotion/emotion.pro )
-     LIBS += -lemotion
- 	DEFINES += EFL_SUPPORT_EMOTION
-+}
- 
- eflesmart {
-     include ( esmart/esmart.pro )
diff --git a/packages/efl1/eflpp_cvs.bb b/packages/efl1/eflpp_cvs.bb
new file mode 100644
index 0000000000..c8c613d75e
--- /dev/null
+++ b/packages/efl1/eflpp_cvs.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "EFLpp are C++ bindings to the EFL"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
+HOMEPAGE = "http://www.vanille-media.de/site/index.php/projects/efl/"
+LICENSE = "LGPL"
+DEPENDS = "evas ecore edje emotion esmart etk ewl libsigc++-2.0"
+PV = "0.1.0+cvs${SRCDATE}"
+
+inherit efl_library
+
+SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME}"
diff --git a/packages/efl1/esmart_cvs.bb b/packages/efl1/esmart_cvs.bb
index c56ad891ea..17e1f42b95 100644
--- a/packages/efl1/esmart_cvs.bb
+++ b/packages/efl1/esmart_cvs.bb
@@ -5,6 +5,8 @@ PV = "0.9.0+cvs${SRCDATE}"
 
 inherit efl_library
 
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+
 PACKAGES =+ "${PN}-textentry \
              ${PN}-thumb \
              ${PN}-container \
diff --git a/packages/efl++/files/.mtn2git_empty b/packages/efl1/etk-native/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/efl++/files/.mtn2git_empty
+++ b/packages/efl1/etk-native/.mtn2git_empty
diff --git a/packages/efl1/etk-native_cvs.bb b/packages/efl1/etk-native_cvs.bb
new file mode 100644
index 0000000000..6770be4ab3
--- /dev/null
+++ b/packages/efl1/etk-native_cvs.bb
@@ -0,0 +1,10 @@
+require etk_cvs.bb
+inherit native
+DEPENDS = "evas-native ecore-native edje-native"
+
+SRC_URI += "file://no-tests.patch;patch=1"
+
+do_stage_append() {
+	mv ${STAGING_DIR}/include/etk ${STAGING_INCDIR}
+}
+
diff --git a/packages/musicbrainz/libmusicbrainz_2.1.2.bb b/packages/musicbrainz/libmusicbrainz_2.1.4.bb
index 43632d8670..7ab0997218 100644
--- a/packages/musicbrainz/libmusicbrainz_2.1.2.bb
+++ b/packages/musicbrainz/libmusicbrainz_2.1.4.bb
@@ -1,15 +1,13 @@
-DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs.  The library allows you to access the data held on the MusicBrainz server."
+DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. \
+It allows you to access the data held on the MusicBrainz server."
 HOMEPAGE = "http://musicbrainz.org"
 LICENSE = "LGPL"
 DEPENDS = "expat"
 
-SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-2.1.2.tar.gz"
+SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz"
 
 inherit autotools pkgconfig
 
 do_stage() {
-autotools_stage_all
+	autotools_stage_all
 }
-
-
-
diff --git a/packages/musicbrainz/libmusicbrainz_3.0.1.bb b/packages/musicbrainz/libmusicbrainz_3.0.1.bb
new file mode 100644
index 0000000000..51717f052d
--- /dev/null
+++ b/packages/musicbrainz/libmusicbrainz_3.0.1.bb
@@ -0,0 +1,16 @@
+DEFAULT_PREFERENCE = "-1"
+
+DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. \
+It allows you to access the data held on the MusicBrainz server."
+HOMEPAGE = "http://musicbrainz.org"
+LICENSE = "LGPL"
+DEPENDS = "expat"
+
+SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/packages/taglib/taglib_1.4.bb b/packages/taglib/taglib_1.4.bb
index 48aa375048..7d560ef620 100644
--- a/packages/taglib/taglib_1.4.bb
+++ b/packages/taglib/taglib_1.4.bb
@@ -28,11 +28,11 @@ do_stage_append() {
 	do
 		install $i ${STAGING_INCDIR}/taglib/
 	done
-    for i in `find taglib -name "*.tcc"`
-    do
-        install $i ${STAGING_INCDIR}/taglib/
-    done
-    oe_libinstall -so -C taglib libtag ${STAGING_LIBDIR}
+	for i in `find taglib -name "*.tcc"`
+	do
+		install $i ${STAGING_INCDIR}/taglib/
+	done
+	oe_libinstall -so -C taglib libtag ${STAGING_LIBDIR}
 }
 
 do_install() {
diff --git a/packages/taglib/taglibc_1.4.bb b/packages/taglib/taglibc_1.4.bb
index ecfc27fafb..8845c988c0 100644
--- a/packages/taglib/taglibc_1.4.bb
+++ b/packages/taglib/taglibc_1.4.bb
@@ -29,5 +29,5 @@ do_stage_append() {
 }
 
 do_install() {
-    oe_libinstall -so -C bindings/c libtag_c ${D}${libdir}
+	oe_libinstall -so -C bindings/c libtag_c ${D}${libdir}
 }