merge of 45a8c36fee40327f403ecf783f537bfd8cfec9fc

     and ea8a783e9cd41e22c7c2dd4d7a11eeb578c7f631

14 files changed, 105 insertions, 144 deletions

diff --git a/packages/e17/e-iconbar_20050810.bb b/packages/e17/e-iconbar_20050810.bb
index 0d3c14cc06..9eae8a37b2 100644
--- a/packages/e17/e-iconbar_20050810.bb
+++ b/packages/e17/e-iconbar_20050810.bb
@@ -13,4 +13,4 @@ inherit autotools
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
 
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*"
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
diff --git a/packages/e17/eclair_20050810.bb b/packages/e17/eclair_20050810.bb
new file mode 100644
index 0000000000..ba1e8fb10d
--- /dev/null
+++ b/packages/e17/eclair_20050810.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Eclair is the E17 multi media player"
+SECTION = "e/apps"
+DEPENDS = "freetype eet virtual/evas virtual/ecore embryo virtual/imlib2 edje-native edje emotion libxml2 sqlite3 taglibc"
+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/eclair"
+S = "${WORKDIR}/eclair"
+
+inherit autotools
+
+BROKEN = "1"
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
+
diff --git a/packages/e17/engage_20050810.bb b/packages/e17/engage_20050810.bb
index b74d21f028..e8f9467239 100644
--- a/packages/e17/engage_20050810.bb
+++ b/packages/e17/engage_20050810.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "engage, e17 icon dock"
+DESCRIPTION = "Engage is the E17 icon dock"
 DEPENDS = "esmart virtual/imlib2 edje virtual/ecore virtual/evas ewl e-wm"
 LICENSE = "MIT"
 SECTION = "e"
@@ -8,6 +8,8 @@ PR = "r0"
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=misc/engage"
 S = "${WORKDIR}/engage"
 
+inherit autotools pkgconfig binconfig
+
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
 
 do_prepsources () {
@@ -15,12 +17,5 @@ do_prepsources () {
 }
 addtask prepsources after do_fetch before do_unpack
 
-export EET_CONFIG = "${STAGING_BINDIR}/eet-config"
-export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config"
-export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config"
-export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config"
-export EDJE_CONFIG = "${STAGING_BINDIR}/edje-config"
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
 
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*"
-
-inherit autotools pkgconfig binconfig
diff --git a/packages/e17/entice_20050810.bb b/packages/e17/entice_20050810.bb
index ac454e7189..667d3f4da8 100644
--- a/packages/e17/entice_20050810.bb
+++ b/packages/e17/entice_20050810.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Entice is a picture viewer"
+DESCRIPTION = "Entice is the E17 picture viewer"
 SECTION = "e/apps"
 # can also depend on GIMP for editing
 DEPENDS = "virtual/evas edb virtual/ecore edje"
@@ -15,5 +15,5 @@ inherit autotools
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
 
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*"
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
 
diff --git a/packages/e17/examine_20050810.bb b/packages/e17/examine_20050810.bb
index 07ed88c0f5..6e79fd946f 100644
--- a/packages/e17/examine_20050810.bb
+++ b/packages/e17/examine_20050810.bb
@@ -11,17 +11,11 @@ S = "${WORKDIR}/examine"
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
 
+inherit autotools pkgconfig binconfig
+
 do_prepsources () {
   make clean distclean || true
 }
 addtask prepsources after do_fetch before do_unpack
 
-export EET_CONFIG = "${STAGING_BINDIR}/eet-config"
-export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config"
-export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config"
-export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config"
-export EDJE_CONFIG = "${STAGING_BINDIR}/edje-config"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*"
-
-inherit autotools pkgconfig binconfig
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
diff --git a/packages/libpng/libpng-native_1.2.5+1.2.6rc5.bb b/packages/libpng/libpng-native_1.2.5+1.2.6rc5.bb
deleted file mode 100644
index 5415774737..0000000000
--- a/packages/libpng/libpng-native_1.2.5+1.2.6rc5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SECTION = "libs"
-include libpng_${PV}.bb
-inherit native
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
-DEPENDS = "zlib-native"
diff --git a/packages/libpng/libpng-native_1.2.7.bb b/packages/libpng/libpng-native_1.2.7.bb
deleted file mode 100644
index 5415774737..0000000000
--- a/packages/libpng/libpng-native_1.2.7.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SECTION = "libs"
-include libpng_${PV}.bb
-inherit native
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
-DEPENDS = "zlib-native"
diff --git a/packages/libpng/libpng-native_1.2.8.bb b/packages/libpng/libpng-native_1.2.8.bb
index 7e611bf4a5..b03056f08d 100644
--- a/packages/libpng/libpng-native_1.2.8.bb
+++ b/packages/libpng/libpng-native_1.2.8.bb
@@ -3,7 +3,9 @@ inherit native
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
 DEPENDS = "zlib-native"
 
-do_stage() {
+INHIBIT_NATIVE_STAGE_INSTALL = "1"
+
+do_stage_append() {
         cp libpng.pc libpng12.pc
         install -m 644 png.h ${STAGING_INCDIR}/png.h
         install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
diff --git a/packages/libpng/libpng_1.2.5+1.2.6rc5.bb b/packages/libpng/libpng_1.2.5+1.2.6rc5.bb
deleted file mode 100644
index 216657cb8f..0000000000
--- a/packages/libpng/libpng_1.2.5+1.2.6rc5.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-DESCRIPTION = "PNG Library"
-SECTION = "libs"
-PRIORITY = "required"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "zlib"
-LICENSE = "PNG"
-PACKAGES =+ "${PN}12 ${PN}12-dev"
-
-FILES_${PN}12 = ${libdir}/libpng12.so.*
-FILES_${PN}12-dev = ${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc
-FILES_${PN} = ${libdir}/lib*.so.*
-FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
-		${libdir}/*.a ${libdir}/pkgconfig \
-		${datadir}/aclocal ${bindir} ${sbindir}
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-1.2.6rc5.tar.bz2"
-S = "${WORKDIR}/libpng-1.2.6rc5"
-
-inherit pkgconfig
-
-EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}"
-
-do_compile() {
-	sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//'
-	unset LDFLAGS
-	oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
-		   'ZLIBINC=${STAGING_INCDIR}' \
-		   'ZLIBLIB=${STAGING_LIBDIR}'
-}
-
-do_stage() {
-	cp libpng.pc libpng12.pc
-	install -m 644 png.h ${STAGING_INCDIR}/png.h
-	install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
-	oe_libinstall -so libpng12 ${STAGING_LIBDIR}
-	ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
-}
-
-do_install() {
-	install -d ${D}${bindir} ${D}${mandir} \
-		   ${D}${libdir} ${D}${includedir}
-	unset LDFLAGS
-	oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \
-		   'DB=${D}${bindir}' 'DI=${D}${includedir}' \
-		   'DL=${D}${libdir}' 'DM=${D}${mandir}' \
-		   install
-}
-
-python do_package() {
-        if bb.data.getVar('DEBIAN_NAMES', d, 1):
-            bb.data.setVar('PKG_${PN}', 'libpng12', d)
-        bb.build.exec_func('package_do_package', d)
-}
-
diff --git a/packages/libpng/libpng_1.2.7.bb b/packages/libpng/libpng_1.2.7.bb
deleted file mode 100644
index a93587c3a0..0000000000
--- a/packages/libpng/libpng_1.2.7.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-DESCRIPTION = "PNG Library"
-HOMEPAGE = "http://www.libpng.org/"
-LICENSE = "libpng"
-SECTION = "libs"
-PRIORITY = "required"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-
-DEPENDS = "zlib"
-
-PACKAGES =+ "${PN}12 ${PN}12-dev"
-
-FILES_${PN}12 = ${libdir}/libpng12.so.*
-FILES_${PN}12-dev = ${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc
-FILES_${PN} = ${libdir}/lib*.so.*
-FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
-		${libdir}/*.a ${libdir}/pkgconfig \
-		${datadir}/aclocal ${bindir} ${sbindir}
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
-S = "${WORKDIR}/libpng-${PV}"
-
-inherit pkgconfig
-
-EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}"
-
-do_compile() {
-	sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//'
-	unset LDFLAGS
-	oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
-		   'ZLIBINC=${STAGING_INCDIR}' \
-		   'ZLIBLIB=${STAGING_LIBDIR}'
-}
-
-do_stage() {
-	cp libpng.pc libpng12.pc
-	install -m 644 png.h ${STAGING_INCDIR}/png.h
-	install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
-	oe_libinstall -so libpng12 ${STAGING_LIBDIR}
-	ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
-}
-
-do_install() {
-	install -d ${D}${bindir} ${D}${mandir} \
-		   ${D}${libdir} ${D}${includedir}
-	unset LDFLAGS
-	oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \
-		   'DB=${D}${bindir}' 'DI=${D}${includedir}' \
-		   'DL=${D}${libdir}' 'DM=${D}${mandir}' \
-		   install
-}
-
-python do_package() {
-        if bb.data.getVar('DEBIAN_NAMES', d, 1):
-            bb.data.setVar('PKG_${PN}', 'libpng12', d)
-        bb.build.exec_func('package_do_package', d)
-}
-
diff --git a/packages/libpng/libpng_1.2.8.bb b/packages/libpng/libpng_1.2.8.bb
index 05f681527c..81274dc762 100644
--- a/packages/libpng/libpng_1.2.8.bb
+++ b/packages/libpng/libpng_1.2.8.bb
@@ -19,7 +19,7 @@ FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
 SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
 S = "${WORKDIR}/libpng-${PV}"
 
-inherit pkgconfig
+inherit pkgconfig binconfig
 
 EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}"
 
diff --git a/packages/taglib/.mtn2git_empty b/packages/taglib/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/taglib/.mtn2git_empty
diff --git a/packages/taglib/taglib_1.4.bb b/packages/taglib/taglib_1.4.bb
new file mode 100644
index 0000000000..2fbd4dc334
--- /dev/null
+++ b/packages/taglib/taglib_1.4.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "TagLib is a library for reading and editing the meta-data of several popular audio formats"
+SECTION = "libs"
+HOMEPAGE = "http://developer.kde.org/~wheeler/taglib.html"
+LICENSE = "LGPL"
+
+SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz"
+S = "${WORKDIR}/taglib-${PV}"
+
+inherit autotools qmake-base pkgconfig binconfig
+
+do_configure() {
+	# calling oe_runconf to generate pkgconfig and binconfig files
+	oe_runconf
+	cd ${S}/taglib && rm -f Makefile* && qmake -project -t lib && \
+	qmake -spec ${QMAKESPEC} -after CONFIG=console INCLUDEPATH+=${S}
+}
+
+do_compile() {
+	oe_runmake -C taglib
+}
+
+do_stage_append() {
+	install -d ${STAGING_INCDIR}/taglib
+	for i in `find taglib -name "*.h"`
+	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 libtaglib ${STAGING_LIBDIR}
+}
+
+do_install() {
+	install -d ${D}${libdir}
+	oe_libinstall -so -C taglib libtaglib ${D}${libdir}
+}
diff --git a/packages/taglib/taglibc_1.4.bb b/packages/taglib/taglibc_1.4.bb
new file mode 100644
index 0000000000..87f85da430
--- /dev/null
+++ b/packages/taglib/taglibc_1.4.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "TagLib is a library for reading and editing the meta-data \
+of several popular audio formats. Currently it supports both ID3v1 and ID3v2 \
+for MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC files"
+SECTION = "libs"
+HOMEPAGE = "http://developer.kde.org/~wheeler/taglib.html"
+DEPENDS = "taglib"
+LICENSE = "LGPL"
+
+SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz"
+S = "${WORKDIR}/taglib-${PV}"
+
+inherit autotools qmake-base pkgconfig binconfig
+
+do_configure() {
+	echo running oe_runconf to get pkgconfig and binconfig files created          
+	oe_runconf
+	cd ${S}/bindings/c && rm -f Makefile* && qmake -project -o tag_c.pro -t lib && \
+	qmake -spec ${QMAKESPEC} -after CONFIG=console INCLUDEPATH+=${STAGING_INCDIR}/taglib LIBS+=-ltag
+}
+
+do_compile() {
+	oe_runmake -C bindings/c
+}
+
+do_stage_append() {
+	install -d ${STAGING_INCDIR}/taglib
+	install -m 0644 bindings/c/tag_c.h ${STAGING_INCDIR}
+	oe_libinstall -so -C bindings/c libtag_c ${STAGING_LIBDIR}
+}
+
+do_install() {
+    oe_libinstall -so -C bindings/c libtag_c ${D}${libdir}
+}