diff --git a/recipes-angstrom/angstrom/angstrom-feed-configs.bb b/recipes-angstrom/angstrom/angstrom-feed-configs.bb
index a857d1d..93c1e71 100644
--- a/recipes-angstrom/angstrom/angstrom-feed-configs.bb
+++ b/recipes-angstrom/angstrom/angstrom-feed-configs.bb
@@ -67,7 +67,7 @@ RPROVIDES_${PN} = "opkg-collateral"
 RRECOMMENDS_${PN} += "opkg"
 
 python populate_packages_prepend () {
-	etcdir = bb.data.expand('${sysconfdir}/opkg', d)
-	do_split_packages(d, etcdir, '^locale-(.*)\.conf$', 'angstrom-locale-%s-config', 'Angstrom feed config for the %s locale', extra_depends='', allow_links=True)
+    etcdir = bb.data.expand('${sysconfdir}/opkg', d)
+    do_split_packages(d, etcdir, '^locale-(.*)\.conf$', 'angstrom-locale-%s-config', 'Angstrom feed config for the %s locale', extra_depends='', allow_links=True)
 }
 
diff --git a/recipes-angstrom/angstrom/e-wm-config-angstrom.bb b/recipes-angstrom/angstrom/e-wm-config-angstrom.bb
index 868226c..0a1dea0 100644
--- a/recipes-angstrom/angstrom/e-wm-config-angstrom.bb
+++ b/recipes-angstrom/angstrom/e-wm-config-angstrom.bb
@@ -42,8 +42,8 @@ do_install() {
 RDEPENDS_${PN} = "e-wm places gnome-icon-theme"
 
 python populate_packages_prepend () {
-	angstrom_e_dir = bb.data.expand('${datadir}/enlightenment/data/config', d)
-	do_split_packages(d, angstrom_e_dir, '(.*)', 'e-wm-config-%s', 'E17 window manager %s config', extra_depends='e-wm places gnome-icon-theme', allow_links=True, allow_dirs=True)
+    angstrom_e_dir = bb.data.expand('${datadir}/enlightenment/data/config', d)
+    do_split_packages(d, angstrom_e_dir, '(.*)', 'e-wm-config-%s', 'E17 window manager %s config', extra_depends='e-wm places gnome-icon-theme', allow_links=True, allow_dirs=True)
 }
 
 PACKAGE_ARCH = "all"
diff --git a/recipes-devtools/meta/external-toolchain-angstrom.bb b/recipes-devtools/meta/external-toolchain-angstrom.bb
index cb7f2c3..8b6110a 100644
--- a/recipes-devtools/meta/external-toolchain-angstrom.bb
+++ b/recipes-devtools/meta/external-toolchain-angstrom.bb
@@ -14,19 +14,19 @@ INSANE_SKIP_glibc-dev = "True"
 SRC_URI = "file://SUPPORTED"
 
 PROVIDES = "\
-	virtual/${TARGET_PREFIX}gcc \
-	virtual/${TARGET_PREFIX}g++ \
-	virtual/${TARGET_PREFIX}gcc-initial \
-	virtual/${TARGET_PREFIX}gcc-intermediate \
-	virtual/${TARGET_PREFIX}binutils \
-	virtual/${TARGET_PREFIX}libc-for-gcc \
-	virtual/${TARGET_PREFIX}libc-initial \
-	virtual/libc \
-	virtual/libintl \
-	virtual/libiconv \
-	glibc-thread-db \
-	${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-angstrom', 'linux-libc-headers', '', d)} \
-	${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'external-toolchain-angstrom', 'gdbserver', '', d)} \
+    virtual/${TARGET_PREFIX}gcc \
+    virtual/${TARGET_PREFIX}g++ \
+    virtual/${TARGET_PREFIX}gcc-initial \
+    virtual/${TARGET_PREFIX}gcc-intermediate \
+    virtual/${TARGET_PREFIX}binutils \
+    virtual/${TARGET_PREFIX}libc-for-gcc \
+    virtual/${TARGET_PREFIX}libc-initial \
+    virtual/libc \
+    virtual/libintl \
+    virtual/libiconv \
+    glibc-thread-db \
+    ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-angstrom', 'linux-libc-headers', '', d)} \
+    ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'external-toolchain-angstrom', 'gdbserver', '', d)} \
 "
 
 DEPENDS = "${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-angstrom', '', 'linux-libc-headers', d)}"
@@ -37,55 +37,55 @@ PACKAGES_DYNAMIC += "glibc-locale-*"
 LEAD_SONAME = "libc.so.6"
 
 PACKAGES = "\
-	libgcc \
-	libgcc-dev \
-	libstdc++ \
-	libstdc++-dev \
-	${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-angstrom', 'linux-libc-headers', '', d)} \
-	${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'external-toolchain-angstrom', 'gdbserver', '', d)} \
-	glibc-dbg \
-	glibc \
-	catchsegv \
-	sln \
-	nscd \
-	ldd \
-	localedef \
-	glibc-utils \
-	glibc-dev \
-	glibc-locale \
-	libsegfault \
-	glibc-extra-nss \
-	glibc-thread-db \
-	glibc-pcprofile \
+    libgcc \
+    libgcc-dev \
+    libstdc++ \
+    libstdc++-dev \
+    ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-angstrom', 'linux-libc-headers', '', d)} \
+    ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'external-toolchain-angstrom', 'gdbserver', '', d)} \
+    glibc-dbg \
+    glibc \
+    catchsegv \
+    sln \
+    nscd \
+    ldd \
+    localedef \
+    glibc-utils \
+    glibc-dev \
+    glibc-locale \
+    libsegfault \
+    glibc-extra-nss \
+    glibc-thread-db \
+    glibc-pcprofile \
 "
 
 FILES_glibc = "\
-	${sysconfdir} \
-	${libexecdir}/* \
-	${datadir}/zoneinfo \
-	/lib/libc* \
-	/lib/libm* \
-	/lib/ld* \
-	/lib/libpthread* \
-	/lib/libresolv* \
-	/lib/librt* \
-	/lib/libutil* \
-	/lib/libnsl* \
-	/lib/libnss_files* \
-	/lib/libnss_compat* \
-	/lib/libnss_dns* \
-	/lib/libdl* \
-	/lib/libanl* \
-	/lib/libBrokenLocale* \
-	/sbin/ldconfig \
+    ${sysconfdir} \
+    ${libexecdir}/* \
+    ${datadir}/zoneinfo \
+    /lib/libc* \
+    /lib/libm* \
+    /lib/ld* \
+    /lib/libpthread* \
+    /lib/libresolv* \
+    /lib/librt* \
+    /lib/libutil* \
+    /lib/libnsl* \
+    /lib/libnss_files* \
+    /lib/libnss_compat* \
+    /lib/libnss_dns* \
+    /lib/libdl* \
+    /lib/libanl* \
+    /lib/libBrokenLocale* \
+    /sbin/ldconfig \
 "
 
 FILES_glibc-dev = "\
-	${includedir} \
-	${libdir}/*.o \
-	${bindir}/rpcgen \
-	${libdir}/*.so \
-	${libdir}/*.a \
+    ${includedir} \
+    ${libdir}/*.o \
+    ${bindir}/rpcgen \
+    ${libdir}/*.so \
+    ${libdir}/*.a \
 "
 
 FILES_glibc-dbg += " ${libdir}/gconv/.debug ${libexecdir}/*/.debug ${base_libdir}/.debug ${libdir}/.debug"
@@ -100,22 +100,22 @@ FILES_libgcc-dev = "${base_libdir}/libgcc_s.so"
 
 FILES_libstdc++ = "${libdir}/libstdc++.so.*"
 FILES_libstdc++-dev = "\
-	${includedir}/c++/* \
-	${libdir}/libstdc++.so \
-	${libdir}/libstdc++.la \
-	${libdir}/libstdc++.a \
-	${libdir}/libsupc++.la \
-	${libdir}/libsupc++.a \
+    ${includedir}/c++/* \
+    ${libdir}/libstdc++.so \
+    ${libdir}/libstdc++.la \
+    ${libdir}/libstdc++.a \
+    ${libdir}/libsupc++.la \
+    ${libdir}/libsupc++.a \
 "
 
 FILES_linux-libc-headers = "\
-	${includedir}/asm* \
-	${includedir}/linux \
-	${includedir}/mtd \
-	${includedir}/rdma \
-	${includedir}/scsi \
-	${includedir}/sound \
-	${includedir}/video \
+    ${includedir}/asm* \
+    ${includedir}/linux \
+    ${includedir}/mtd \
+    ${includedir}/rdma \
+    ${includedir}/scsi \
+    ${includedir}/sound \
+    ${includedir}/video \
 "
 
 FILES_libsegfault = "/lib/libSegFault*"
@@ -137,66 +137,66 @@ DESCRIPTION_localedef = "glibc: compile locale definition files"
 DESCRIPTION_gdbserver = "gdb - GNU debugger"
 
 def ang_get_main_version(d):
-	import os,bb
-	tp = bb.data.getVar('TOOLCHAIN_PATH', d, 1)
-	if tp == None:
-		return ""
-	if os.path.exists(tp+'/version'):
-		f = open(tp +'/version', 'r')
-		l = f.readlines();
-		f.close();
-		for s in l:
-			if s.find('Version') > 0:
-				ver = s.split()[2]
-				return ver
-		return ""
-	return ""
+    import os,bb
+    tp = bb.data.getVar('TOOLCHAIN_PATH', d, 1)
+    if tp == None:
+        return ""
+    if os.path.exists(tp+'/version'):
+        f = open(tp +'/version', 'r')
+        l = f.readlines();
+        f.close();
+        for s in l:
+            if s.find('Version') > 0:
+                ver = s.split()[2]
+                return ver
+        return ""
+    return ""
 
 def ang_get_gcc_version(d):
-	import subprocess,os,bb
-	tp = bb.data.getVar('TOOLCHAIN_PATH', d, 1)
-	if tp == None:
-		return ""
-	if os.path.exists(tp+'/bin/'+bb.data.getVar('TARGET_PREFIX', d, 1)+'gcc'):
-		return subprocess.Popen([tp+'/bin/'+bb.data.getVar('TARGET_PREFIX', d, 1)+'gcc', '-v'], stderr=subprocess.PIPE).communicate()[1].splitlines()[-1].split()[2]
+    import subprocess,os,bb
+    tp = bb.data.getVar('TOOLCHAIN_PATH', d, 1)
+    if tp == None:
+        return ""
+    if os.path.exists(tp+'/bin/'+bb.data.getVar('TARGET_PREFIX', d, 1)+'gcc'):
+        return subprocess.Popen([tp+'/bin/'+bb.data.getVar('TARGET_PREFIX', d, 1)+'gcc', '-v'], stderr=subprocess.PIPE).communicate()[1].splitlines()[-1].split()[2]
 
 def ang_get_libc_version(d):
-	import os,bb
-	tsp = bb.data.getVar('TOOLCHAIN_SYSPATH', d, 1)
-	if tsp == None:
-		return ""
-	if os.path.exists(tsp+'/lib/'):
-		for file in os.listdir(tsp+'/lib/'):
-			if file.find('libc-') == 0:
-				return file[5:-3]
-		return None
+    import os,bb
+    tsp = bb.data.getVar('TOOLCHAIN_SYSPATH', d, 1)
+    if tsp == None:
+        return ""
+    if os.path.exists(tsp+'/lib/'):
+        for file in os.listdir(tsp+'/lib/'):
+            if file.find('libc-') == 0:
+                return file[5:-3]
+        return None
 
 def ang_get_kernel_version(d):
-	import os,bb
-	tsp = bb.data.getVar('TOOLCHAIN_SYSPATH', d, 1)
-	if tsp == None:
-		return ""
-	if os.path.exists(tsp+'/usr/include/linux/'):
-		f = open(tsp+'/usr/include/linux/version.h', 'r')
-		l = f.readlines();
-		f.close();
-		for s in l:
-			if s.find('LINUX_VERSION_CODE') > 0:
-				ver = int(s.split()[2])
-				maj = ver / 65536
-				ver = ver % 65536
-				min = ver / 256
-				ver = ver % 256
-				return str(maj)+'.'+str(min)+'.'+str(ver)
-		return None
+    import os,bb
+    tsp = bb.data.getVar('TOOLCHAIN_SYSPATH', d, 1)
+    if tsp == None:
+        return ""
+    if os.path.exists(tsp+'/usr/include/linux/'):
+        f = open(tsp+'/usr/include/linux/version.h', 'r')
+        l = f.readlines();
+        f.close();
+        for s in l:
+            if s.find('LINUX_VERSION_CODE') > 0:
+                ver = int(s.split()[2])
+                maj = ver / 65536
+                ver = ver % 65536
+                min = ver / 256
+                ver = ver % 256
+                return str(maj)+'.'+str(min)+'.'+str(ver)
+        return None
 
 def ang_get_gdb_version(d):
-	import subprocess,os,bb
-	tp = bb.data.getVar('TOOLCHAIN_PATH', d, 1)
-	if tp == None:
-		return ""
-	if os.path.exists(tp+'/bin/'+bb.data.getVar('TARGET_PREFIX', d, 1)+'gdb'):
-		return subprocess.Popen([tp+'/bin/'+bb.data.getVar('TARGET_PREFIX', d, 1)+'gdb', '-v'],stdout=subprocess.PIPE).communicate()[0].splitlines()[0].split()[-1]
+    import subprocess,os,bb
+    tp = bb.data.getVar('TOOLCHAIN_PATH', d, 1)
+    if tp == None:
+        return ""
+    if os.path.exists(tp+'/bin/'+bb.data.getVar('TARGET_PREFIX', d, 1)+'gdb'):
+        return subprocess.Popen([tp+'/bin/'+bb.data.getVar('TARGET_PREFIX', d, 1)+'gdb', '-v'],stdout=subprocess.PIPE).communicate()[0].splitlines()[0].split()[-1]
 
 ANG_VER_MAIN := "${@ang_get_main_version(d)}"
 ANG_VER_GCC := "${@ang_get_gcc_version(d)}"
@@ -241,33 +241,33 @@ LICENSE_libstdc++-dev = "${ANG_LIC_RLE}"
 LICENSE_gdbserver = "${ANG_LIC_GDBSERVER}"
 
 do_install() {
-	install -d ${D}${sysconfdir}
-	install -d ${D}${bindir}
-	install -d ${D}${sbindir}
-	install -d ${D}${base_bindir}
-	install -d ${D}${libdir}
-	install -d ${D}${base_libdir}
-	install -d ${D}${base_sbindir}
-	install -d ${D}${datadir}
-	install -d ${D}${includedir}
+    install -d ${D}${sysconfdir}
+    install -d ${D}${bindir}
+    install -d ${D}${sbindir}
+    install -d ${D}${base_bindir}
+    install -d ${D}${libdir}
+    install -d ${D}${base_libdir}
+    install -d ${D}${base_sbindir}
+    install -d ${D}${datadir}
+    install -d ${D}${includedir}
 
-	cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${base_libdir}/{lib*,ld*} ${D}${base_libdir}
-	cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${base_sbindir}/ldconfig ${D}${base_sbindir}
-	cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${bindir}/{gencat,getconf,getent,iconv,locale,mtrace,pcprofiledump,rpcgen,sprof,tzselect,xtrace} ${D}${bindir}
-	cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${sbindir}/{iconvconfig,rpcinfo,zdump,zic} ${D}${sbindir}
-	cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${includedir}/{arpa,asm*,bits,drm,gnu,linux,mtd,net*,nfs,protocols,rdma,rpc*,scsi,sound,sys*,video,*.h} ${D}${includedir}
-	cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${libdir}/{?crt1.o,crt?.o,libBrokenLocale*,libanl*,libc.*,libc_*,libcrypt.*,libcidn.*,libdl.*,libg.*,libieee.*,libm.*,libmcheck.*,libnsl*,libnss*,libpthread*,libresolv*,librt*,libstdc*,libthread*,libutil*} ${D}${libdir}
+    cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${base_libdir}/{lib*,ld*} ${D}${base_libdir}
+    cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${base_sbindir}/ldconfig ${D}${base_sbindir}
+    cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${bindir}/{gencat,getconf,getent,iconv,locale,mtrace,pcprofiledump,rpcgen,sprof,tzselect,xtrace} ${D}${bindir}
+    cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${sbindir}/{iconvconfig,rpcinfo,zdump,zic} ${D}${sbindir}
+    cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${includedir}/{arpa,asm*,bits,drm,gnu,linux,mtd,net*,nfs,protocols,rdma,rpc*,scsi,sound,sys*,video,*.h} ${D}${includedir}
+    cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${libdir}/{?crt1.o,crt?.o,libBrokenLocale*,libanl*,libc.*,libc_*,libcrypt.*,libcidn.*,libdl.*,libg.*,libieee.*,libm.*,libmcheck.*,libnsl*,libnss*,libpthread*,libresolv*,librt*,libstdc*,libthread*,libutil*} ${D}${libdir}
 
-	${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-angstrom', '', 'rm -rf ${D}/usr/include/linux', d)}
+    ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-angstrom', '', 'rm -rf ${D}/usr/include/linux', d)}
 
-	cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/include/* ${D}${includedir}
-	${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'external-toolchain-angstrom', '', 'rm -rf ${D}/usr/bin/gdbserver', d)}
+    cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/include/* ${D}${includedir}
+    ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'external-toolchain-angstrom', '', 'rm -rf ${D}/usr/bin/gdbserver', d)}
 
-	sed -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libc.so > ${D}${libdir}/temp
-	mv ${D}${libdir}/temp ${D}${libdir}/libc.so
+    sed -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libc.so > ${D}${libdir}/temp
+    mv ${D}${libdir}/temp ${D}${libdir}/libc.so
 
-	sed -e "s# /lib# ../../lib#" -e "s# /usr/lib# .#g" ${D}${libdir}/libpthread.so > ${D}${libdir}/temp
-	mv ${D}${libdir}/temp ${D}${libdir}/libpthread.so
+    sed -e "s# /lib# ../../lib#" -e "s# /usr/lib# .#g" ${D}${libdir}/libpthread.so > ${D}${libdir}/temp
+    mv ${D}${libdir}/temp ${D}${libdir}/libpthread.so
 }
 
 TMP_LOCALE="/tmp/locale${libdir}/locale"
@@ -296,7 +296,7 @@ locale_base_postrm() {
 rm -rf ${TMP_LOCALE}
 mkdir -p ${TMP_LOCALE}
 if [ -f ${libdir}/locale/locale-archive ]; then
-	cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/
+    cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/
 fi
 localedef --delete-from-archive --inputfile=${datadir}/locales/%s --charmap=%s --prefix=/tmp/locale %s
 mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/
@@ -304,187 +304,187 @@ rm -rf ${TMP_LOCALE}
 }
 
 python package_do_split_gconvs () {
-	import os, re
-	if (bb.data.getVar('PACKAGE_NO_GCONV', d, 1) == '1'):
-		bb.note("package requested not splitting gconvs")
-		return
+    import os, re
+    if (bb.data.getVar('PACKAGE_NO_GCONV', d, 1) == '1'):
+        bb.note("package requested not splitting gconvs")
+        return
 
-	if not bb.data.getVar('PACKAGES', d, 1):
-		return
+    if not bb.data.getVar('PACKAGES', d, 1):
+        return
 
-	libdir = bb.data.getVar('libdir', d, 1)
-	if not libdir:
-		bb.error("libdir not defined")
-		return
-	datadir = bb.data.getVar('datadir', d, 1)
-	if not datadir:
-		bb.error("datadir not defined")
-		return
+    libdir = bb.data.getVar('libdir', d, 1)
+    if not libdir:
+        bb.error("libdir not defined")
+        return
+    datadir = bb.data.getVar('datadir', d, 1)
+    if not datadir:
+        bb.error("datadir not defined")
+        return
 
-	libcver = bb.data.getVar('ANG_VER_LIBC', d, 1)
-	if not libcver:
-		bb.error("ANG_VER_LIBC not defined")
-		return
+    libcver = bb.data.getVar('ANG_VER_LIBC', d, 1)
+    if not libcver:
+        bb.error("ANG_VER_LIBC not defined")
+        return
 
-	gconv_libdir = os.path.join(libdir, "gconv")
-	charmap_dir = os.path.join(datadir, "i18n", "charmaps")
-	locales_dir = os.path.join(datadir, "i18n", "locales")
-	binary_locales_dir = os.path.join(libdir, "locale")
+    gconv_libdir = os.path.join(libdir, "gconv")
+    charmap_dir = os.path.join(datadir, "i18n", "charmaps")
+    locales_dir = os.path.join(datadir, "i18n", "locales")
+    binary_locales_dir = os.path.join(libdir, "locale")
 
-	def set_pkg_ver(fn, pkg, file_regex, output_pattern, group):
-		bb.data.setVar('PKGV_' + pkg, libcver, d)
+    def set_pkg_ver(fn, pkg, file_regex, output_pattern, group):
+        bb.data.setVar('PKGV_' + pkg, libcver, d)
 
-	do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='glibc-gconv-%s', description='gconv module for character set %s', hook=set_pkg_ver, extra_depends='glibc-gconv')
+    do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='glibc-gconv-%s', description='gconv module for character set %s', hook=set_pkg_ver, extra_depends='glibc-gconv')
 
-	do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='glibc-charmap-%s', description='character map for %s encoding', hook=set_pkg_ver, extra_depends='')
+    do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='glibc-charmap-%s', description='character map for %s encoding', hook=set_pkg_ver, extra_depends='')
 
-	def calc_locale_deps(fn, pkg, file_regex, output_pattern, group):
-		deps = []
-		f = open(fn, "r")
-		c_re = re.compile('^copy "(.*)"')
-		i_re = re.compile('^include "(\w+)".*')
-		for l in f.readlines():
-			m = c_re.match(l) or i_re.match(l)
-			if m:
-				dp = legitimize_package_name('glibc-localedata-%s' % m.group(1))
-				if not dp in deps:
-					deps.append(dp)
-		f.close()
-		if deps != []:
-			bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d)
-		bb.data.setVar('PKGV_' + pkg, libcver, d)
+    def calc_locale_deps(fn, pkg, file_regex, output_pattern, group):
+        deps = []
+        f = open(fn, "r")
+        c_re = re.compile('^copy "(.*)"')
+        i_re = re.compile('^include "(\w+)".*')
+        for l in f.readlines():
+            m = c_re.match(l) or i_re.match(l)
+            if m:
+                dp = legitimize_package_name('glibc-localedata-%s' % m.group(1))
+                if not dp in deps:
+                    deps.append(dp)
+        f.close()
+        if deps != []:
+            bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d)
+        bb.data.setVar('PKGV_' + pkg, libcver, d)
 
-	do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='')
-	bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' glibc-gconv', d)
+    do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='')
+    bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' glibc-gconv', d)
 
-	f = open(os.path.join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r")
-	supported = f.readlines()
-	f.close()
+    f = open(os.path.join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r")
+    supported = f.readlines()
+    f.close()
 
-	dot_re = re.compile("(.*)\.(.*)")
+    dot_re = re.compile("(.*)\.(.*)")
 
-	# Collate the locales by base and encoding
-	encodings = {}
-	for l in supported:
-		l = l[:-1]
-		(locale, charset) = l.split(" ")
-		m = dot_re.match(locale)
-		if m:
-			locale = m.group(1)
-		if not encodings.has_key(locale):
-			encodings[locale] = []
-		encodings[locale].append(charset)
+    # Collate the locales by base and encoding
+    encodings = {}
+    for l in supported:
+        l = l[:-1]
+        (locale, charset) = l.split(" ")
+        m = dot_re.match(locale)
+        if m:
+            locale = m.group(1)
+        if not encodings.has_key(locale):
+            encodings[locale] = []
+        encodings[locale].append(charset)
 
-	def output_locale_source(name, locale, encoding):
-		pkgname = 'locale-base-' + legitimize_package_name(name)
+    def output_locale_source(name, locale, encoding):
+        pkgname = 'locale-base-' + legitimize_package_name(name)
 
-		bb.data.setVar('RDEPENDS_%s' % pkgname, 'localedef glibc-localedata-%s glibc-charmap-%s' % (legitimize_package_name(locale), legitimize_package_name(encoding)), d)
-		rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
-		m = re.match("(.*)_(.*)", name)
-		if m:
-			rprovides += ' virtual-locale-%s' % m.group(1)
-		bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d)
-		bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d)
-		bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d)
-		bb.data.setVar('pkg_postinst_%s' % pkgname, bb.data.getVar('locale_base_postinst', d, 1) % (locale, encoding, locale), d)
-		bb.data.setVar('pkg_postrm_%s' % pkgname, bb.data.getVar('locale_base_postrm', d, 1) % (locale, encoding, locale), d)
-		bb.data.setVar('PKGV_' + pkgname, libcver, d)
+        bb.data.setVar('RDEPENDS_%s' % pkgname, 'localedef glibc-localedata-%s glibc-charmap-%s' % (legitimize_package_name(locale), legitimize_package_name(encoding)), d)
+        rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
+        m = re.match("(.*)_(.*)", name)
+        if m:
+            rprovides += ' virtual-locale-%s' % m.group(1)
+        bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d)
+        bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d)
+        bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d)
+        bb.data.setVar('pkg_postinst_%s' % pkgname, bb.data.getVar('locale_base_postinst', d, 1) % (locale, encoding, locale), d)
+        bb.data.setVar('pkg_postrm_%s' % pkgname, bb.data.getVar('locale_base_postrm', d, 1) % (locale, encoding, locale), d)
+        bb.data.setVar('PKGV_' + pkgname, libcver, d)
 
-	def output_locale_binary(name, locale, encoding):
-		target_arch = bb.data.getVar("TARGET_ARCH", d, 1)
-		qemu = "qemu-%s" % target_arch
-		pkgname = 'locale-base-' + legitimize_package_name(name)
-		m = re.match("(.*)\.(.*)", name)
-		if m:
-			glibc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-",""))
-		else:
-			glibc_name = name
-		bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('glibc-binary-localedata-%s' % glibc_name), d)
-		rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
-		m = re.match("(.*)_(.*)", name)
-		if m:
-			rprovides += ' virtual-locale-%s' % m.group(1)
-		bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d)
-		bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d)
-		bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d)
-		bb.data.setVar('PKGV_' + pkgname, libcver, d)
+    def output_locale_binary(name, locale, encoding):
+        target_arch = bb.data.getVar("TARGET_ARCH", d, 1)
+        qemu = "qemu-%s" % target_arch
+        pkgname = 'locale-base-' + legitimize_package_name(name)
+        m = re.match("(.*)\.(.*)", name)
+        if m:
+            glibc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-",""))
+        else:
+            glibc_name = name
+        bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('glibc-binary-localedata-%s' % glibc_name), d)
+        rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
+        m = re.match("(.*)_(.*)", name)
+        if m:
+            rprovides += ' virtual-locale-%s' % m.group(1)
+        bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d)
+        bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d)
+        bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d)
+        bb.data.setVar('PKGV_' + pkgname, libcver, d)
 
-		treedir = os.path.join(bb.data.getVar("WORKDIR", d, 1), "locale-tree")
-		path = bb.data.getVar("PATH", d, 1)
-		i18npath = os.path.join(treedir, datadir, "i18n")
+        treedir = os.path.join(bb.data.getVar("WORKDIR", d, 1), "locale-tree")
+        path = bb.data.getVar("PATH", d, 1)
+        i18npath = os.path.join(treedir, datadir, "i18n")
 
-		localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name)
-		cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts)
-		bb.note("generating locale %s (%s)" % (locale, encoding))
-		if os.system(cmd):
-			raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd)
+        localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name)
+        cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts)
+        bb.note("generating locale %s (%s)" % (locale, encoding))
+        if os.system(cmd):
+            raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd)
 
-	def output_locale(name, locale, encoding):
-		output_locale_source(name, locale, encoding)
+    def output_locale(name, locale, encoding):
+        output_locale_source(name, locale, encoding)
 
-	# Reshuffle names so that UTF-8 is preferred over other encodings
-	non_utf8 = []
-	for l in encodings.keys():
-		if len(encodings[l]) == 1:
-			output_locale(l, l, encodings[l][0])
-			if encodings[l][0] != "UTF-8":
-				non_utf8.append(l)
-		else:
-			if "UTF-8" in encodings[l]:
-				output_locale(l, l, "UTF-8")
-				encodings[l].remove("UTF-8")
-			else:
-				non_utf8.append(l)
-			for e in encodings[l]:
-				output_locale('%s.%s' % (l, e), l, e)
+    # Reshuffle names so that UTF-8 is preferred over other encodings
+    non_utf8 = []
+    for l in encodings.keys():
+        if len(encodings[l]) == 1:
+            output_locale(l, l, encodings[l][0])
+            if encodings[l][0] != "UTF-8":
+                non_utf8.append(l)
+        else:
+            if "UTF-8" in encodings[l]:
+                output_locale(l, l, "UTF-8")
+                encodings[l].remove("UTF-8")
+            else:
+                non_utf8.append(l)
+            for e in encodings[l]:
+                output_locale('%s.%s' % (l, e), l, e)
 
-	if non_utf8 != []:
-		bb.note("the following locales are supported only in legacy encodings:")
-		bb.note("  " + " ".join(non_utf8))
+    if non_utf8 != []:
+        bb.note("the following locales are supported only in legacy encodings:")
+        bb.note("  " + " ".join(non_utf8))
 }
 
 python package_do_split_locales() {
-	if (bb.data.getVar('PACKAGE_NO_LOCALE', d, True) == '1'):
-		bb.debug(1, "package requested not splitting locales")
-		return
+    if (bb.data.getVar('PACKAGE_NO_LOCALE', d, True) == '1'):
+        bb.debug(1, "package requested not splitting locales")
+        return
 
-	packages = (bb.data.getVar('PACKAGES', d, True) or "").split()
+    packages = (bb.data.getVar('PACKAGES', d, True) or "").split()
 
-	datadir = bb.data.getVar('datadir', d, True)
-	if not datadir:
-		bb.note("datadir not defined")
-		return
+    datadir = bb.data.getVar('datadir', d, True)
+    if not datadir:
+        bb.note("datadir not defined")
+        return
 
-	if 'glibc-locale' in packages:
-		packages.remove('glibc-locale')
+    if 'glibc-locale' in packages:
+        packages.remove('glibc-locale')
 
-	localedir = os.path.join(datadir, 'locale')
+    localedir = os.path.join(datadir, 'locale')
 
-	if not os.path.isdir(localedir):
-		bb.debug(1, "No locale files in this package")
-		return
+    if not os.path.isdir(localedir):
+        bb.debug(1, "No locale files in this package")
+        return
 
-	locales = os.listdir(localedir)
-	for l in locales:
-		ln = legitimize_package_name(l)
-		pkg = 'glibc-locale-' + ln
-		packages.append(pkg)
-		bb.data.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l), d)
-		bb.data.setVar('RDEPENDS_' + pkg, 'glibc virtual-locale-%s' % ln, d)
-		bb.data.setVar('RPROVIDES_' + pkg, 'glibc-locale %s-translation' % ln, d)
-		bb.data.setVar('DESCRIPTION_' + pkg, '%s translation for glibc' % l, d)
-		bb.data.setVar('PKGV_' + pkg, bb.data.getVar('ANG_VER_LIBC', d, 1), d)
+    locales = os.listdir(localedir)
+    for l in locales:
+        ln = legitimize_package_name(l)
+        pkg = 'glibc-locale-' + ln
+        packages.append(pkg)
+        bb.data.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l), d)
+        bb.data.setVar('RDEPENDS_' + pkg, 'glibc virtual-locale-%s' % ln, d)
+        bb.data.setVar('RPROVIDES_' + pkg, 'glibc-locale %s-translation' % ln, d)
+        bb.data.setVar('DESCRIPTION_' + pkg, '%s translation for glibc' % l, d)
+        bb.data.setVar('PKGV_' + pkg, bb.data.getVar('ANG_VER_LIBC', d, 1), d)
 
-	bb.data.setVar('PACKAGES', ' '.join(packages), d)
+    bb.data.setVar('PACKAGES', ' '.join(packages), d)
 }
 
 python populate_packages_prepend () {
-	if bb.data.getVar('DEBIAN_NAMES', d, 1):
-		bb.data.setVar('PKG_glibc', 'libc6', d)
-		bb.data.setVar('PKG_glibc-dev', 'libc6-dev', d)
-		bb.data.setVar('PKG_libgcc', 'libgcc1', d)
-		bb.data.setVar('PKG_libgcc-dev', 'libgcc1-dev', d)
-	bb.build.exec_func('package_do_split_gconvs', d)
+    if bb.data.getVar('DEBIAN_NAMES', d, 1):
+        bb.data.setVar('PKG_glibc', 'libc6', d)
+        bb.data.setVar('PKG_glibc-dev', 'libc6-dev', d)
+        bb.data.setVar('PKG_libgcc', 'libgcc1', d)
+        bb.data.setVar('PKG_libgcc-dev', 'libgcc1-dev', d)
+    bb.build.exec_func('package_do_split_gconvs', d)
 }
 
 NATIVE_INSTALL_WORKS = "1"