remove already disabled uClibc support, fix wrong PKG_LIBC_DEPENDS

39 files changed, 30 insertions, 607 deletions

diff --git a/package/Makefile b/package/Makefile
index a5b851d02..98571fa4a 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -15,12 +15,6 @@ package-$(ADK_PACKAGE_MUSL) += musl
 gcc-compile: musl-compile
 endif
 
-ifeq (${ADK_TARGET_LIB_UCLIBC},y)
-package-$(ADK_PACKAGE_UCLIBC) += uclibc
-package-$(ADK_PACKAGE_UCLIBCXX) += uclibc++
-gcc-compile: uclibc-compile
-endif
-
 ifeq (${ADK_TARGET_LIB_UCLIBC_NG},y)
 package-$(ADK_PACKAGE_UCLIBC_NG) += uclibc-ng
 package-$(ADK_PACKAGE_UCLIBCXX) += uclibc++
diff --git a/package/afpfs-ng/Makefile b/package/afpfs-ng/Makefile
index 38d013e31..9eba2fb6e 100644
--- a/package/afpfs-ng/Makefile
+++ b/package/afpfs-ng/Makefile
@@ -29,7 +29,7 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,AFPFS_NG,afpfs-ng,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBAFPCLIENT,libafpclient,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_LIBAFPCLIENT},${PKGSD_LIBAFPCLIENT},${PKGSC_LIBAFPCLIENT},$(PKG_OPTS)))
 
-ifeq ($(ADK_TARGET_LIB_UCLIBC)$(ADK_TARGET_LIB_UCLIBC_NG),y)
+ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y)
 TARGET_LDFLAGS+=	-liconv
 endif
 
diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile
index 2796f885c..cc69dc834 100644
--- a/package/aiccu/Makefile
+++ b/package/aiccu/Makefile
@@ -14,7 +14,7 @@ PKG_URL:=		http://www.sixxs.net/
 PKG_SITES:=		http://www.sixxs.net/archive/sixxs/aiccu/unix/
 PKG_CFLINE_AICCU:=	select ADK_KERNEL_TUN m
 
-PKG_LIBC_DEPENDS:=	uclibc-ng uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 DISTFILES:=		$(PKG_NAME)_$(PKG_VERSION).tar.gz
 WRKDIST=		${WRKDIR}/$(PKG_NAME)
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 7934f89f6..3b341df17 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -17,7 +17,7 @@ PKG_NOPARALLEL:=	1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 PKG_SUBPKGS:=		ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS
 PKG_SUBPKGS+=		ASTERISK_CHAN_SKINNY ASTERISK_CHAN_IAX2 ASTERISK_CODEC_SPEEX ASTERISK_CODEC_GSM
diff --git a/package/atftp/Makefile b/package/atftp/Makefile
index b8892ef8c..ca0355cf7 100644
--- a/package/atftp/Makefile
+++ b/package/atftp/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=atftp/}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc uclibc-ng glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 PKG_SUBPKGS:=		ATFTP ATFTPD
 PKGSD_ATFTPD:=		tftp server
diff --git a/package/atk/Makefile b/package/atk/Makefile
index 9d43572f0..60033a402 100644
--- a/package/atk/Makefile
+++ b/package/atk/Makefile
@@ -16,7 +16,6 @@ PKG_SITES:=		$(MASTER_SITE_GNOME:=atk/$(PKG_EXTRAVER)/)
 PKG_LIBNAME:=		libatk
 PKG_OPTS:=		dev
 
-PKG_BUILDDEP_UCLIBC:=	gettext-tiny
 PKG_BUILDDEP_UCLIBC_NG:=gettext-tiny
 
 include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile
index ce8419d8c..07e0a4e28 100644
--- a/package/digitemp/Makefile
+++ b/package/digitemp/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		libusb libusb-compat
 PKG_URL:=		http://www.digitemp.com/software/linux/
 PKG_SITES:=		http://www.digitemp.com/software/linux/
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/drbd/Makefile b/package/drbd/Makefile
index 65638a004..29b78c904 100644
--- a/package/drbd/Makefile
+++ b/package/drbd/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:=		http://oss.linbit.com/drbd/8.4/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 include $(ADK_TOPDIR)/mk/package.mk
 
diff --git a/package/ether-wake/Makefile b/package/ether-wake/Makefile
index e9b146554..b55c995f7 100644
--- a/package/ether-wake/Makefile
+++ b/package/ether-wake/Makefile
@@ -10,7 +10,7 @@ PKG_DESCR:=		wake-on-lan client
 PKG_SECTION:=		net/misc
 PKG_BB:=		1
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 NO_DISTFILES:=		1
 
 include ${ADK_TOPDIR}/mk/package.mk
diff --git a/package/fbset/Makefile b/package/fbset/Makefile
index d223106d7..ad61b9a20 100644
--- a/package/fbset/Makefile
+++ b/package/fbset/Makefile
@@ -15,7 +15,7 @@ PKG_BB:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 include ${ADK_TOPDIR}/mk/package.mk
 
diff --git a/package/heyu/Makefile b/package/heyu/Makefile
index efb253c16..e42604d2f 100644
--- a/package/heyu/Makefile
+++ b/package/heyu/Makefile
@@ -13,7 +13,7 @@ PKG_DEPENDS:=		setserial
 PKG_URL:=		http://heyu.tanj.com/
 PKG_SITES:=		http://heyu.tanj.com/download/
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
 
diff --git a/package/iptables-snmp/Makefile b/package/iptables-snmp/Makefile
index 8554a22da..c771132e2 100644
--- a/package/iptables-snmp/Makefile
+++ b/package/iptables-snmp/Makefile
@@ -15,7 +15,7 @@ PKG_SITES:=		http://www.nobiscuit.com/iptables-snmp/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 include $(ADK_TOPDIR)/mk/package.mk
 
diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile
index 7be8defe1..6b313b45f 100644
--- a/package/libgcc/Makefile
+++ b/package/libgcc/Makefile
@@ -6,9 +6,6 @@ include ${ADK_TOPDIR}/rules.mk
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
 include ${ADK_TOPDIR}/toolchain/glibc/Makefile.inc
 endif
-ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
-include ${ADK_TOPDIR}/toolchain/uclibc/Makefile.inc
-endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y)
 include ${ADK_TOPDIR}/toolchain/uclibc-ng/Makefile.inc
 endif
@@ -19,7 +16,7 @@ PKG_SECTION:=		base/libs
 PKG_OPTS:=		noremove
 
 PKG_DFLT_LIBGCC:=	y if !(ADK_TOOLCHAIN_ONLY)
-PKG_LIBC_DEPENDS:=	uclibc uclibc-ng glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 
 NO_DISTFILES:=		1
diff --git a/package/libnids/Makefile b/package/libnids/Makefile
index 0ae8dfe78..da34c1631 100644
--- a/package/libnids/Makefile
+++ b/package/libnids/Makefile
@@ -17,7 +17,7 @@ PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc-ng uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 include ${ADK_TOPDIR}/mk/package.mk
 
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index 6ccbcb430..1b9663769 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -12,9 +12,6 @@ endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y)
 include ${ADK_TOPDIR}/toolchain/uclibc-ng/Makefile.inc
 endif
-ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
-include ${ADK_TOPDIR}/toolchain/uclibc/Makefile.inc
-endif
 
 PKG_NAME:=		libpthread
 PKG_DESCR:=		posix threading library
diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile
index 280f2fc5a..75d192d67 100644
--- a/package/librpcsecgss/Makefile
+++ b/package/librpcsecgss/Makefile
@@ -16,7 +16,7 @@ PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc-ng uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 include $(ADK_TOPDIR)/mk/package.mk
 
diff --git a/package/librt/Makefile b/package/librt/Makefile
index 141735347..aabac631b 100644
--- a/package/librt/Makefile
+++ b/package/librt/Makefile
@@ -9,9 +9,6 @@ endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y)
 include ${ADK_TOPDIR}/toolchain/uclibc-ng/Makefile.inc
 endif
-ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
-include ${ADK_TOPDIR}/toolchain/uclibc/Makefile.inc
-endif
 
 PKG_NAME:=		librt
 PKG_DESCR:=		realtime library
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile
index 771754d0b..5c05ee144 100644
--- a/package/libstdcxx/Makefile
+++ b/package/libstdcxx/Makefile
@@ -9,9 +9,6 @@ endif
 ifeq ($(ADK_TARGET_LIB_MUSL),y)
 include ${ADK_TOPDIR}/toolchain/musl/Makefile.inc
 endif
-ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
-include ${ADK_TOPDIR}/toolchain/uclibc/Makefile.inc
-endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y)
 include ${ADK_TOPDIR}/toolchain/uclibc-ng/Makefile.inc
 endif
diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile
index de7254446..90bbc9d90 100644
--- a/package/libthread_db/Makefile
+++ b/package/libthread_db/Makefile
@@ -12,9 +12,6 @@ endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y)
 include ${ADK_TOPDIR}/toolchain/uclibc-ng/Makefile.inc
 endif
-ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
-include ${ADK_TOPDIR}/toolchain/uclibc/Makefile.inc
-endif
 
 PKG_NAME:=		libthread-db
 PKG_DESCR:=		posix threads library for gdb/gdbserver
diff --git a/package/libunistring/Makefile b/package/libunistring/Makefile
index cce139329..1546c4ffa 100755
--- a/package/libunistring/Makefile
+++ b/package/libunistring/Makefile
@@ -13,7 +13,7 @@ PKG_URL:=		http://www.gnu.org/software/libunistring/
 PKG_SITES:=		${MASTER_SITE_GNU:=libunistring/}
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	uclibc-ng uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
diff --git a/package/lsof/Makefile b/package/lsof/Makefile
index 18d90de7a..19b8406d7 100644
--- a/package/lsof/Makefile
+++ b/package/lsof/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		libtirpc
 PKG_URL:=		http://people.freebsd.org/~abe/
 PKG_SITES:=		ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 DISTFILES:=             ${PKG_NAME}_${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}_${PKG_VERSION}
diff --git a/package/mtr/Makefile b/package/mtr/Makefile
index 9053cde1c..910dce00b 100644
--- a/package/mtr/Makefile
+++ b/package/mtr/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:=		ftp://ftp.bitwizard.nl/mtr/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 include ${ADK_TOPDIR}/mk/package.mk
 
diff --git a/package/ndisc6/Makefile b/package/ndisc6/Makefile
index ff9293be9..7f2422b60 100644
--- a/package/ndisc6/Makefile
+++ b/package/ndisc6/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		net/ipv6
 PKG_URL:=		http://www.remlab.net/
 PKG_SITES:=		http://www.remlab.net/files/ndisc6/
 
-PKG_LIBC_DEPENDS:=	uclibc-ng uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 PKG_SUBPKGS:=		NDISC6 RDISC6 TCPTRACEROUTE6
 PKGSD_NDISC6:=		icmpv6 neighbour discovery tool
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 525ddd2f1..fab5a154a 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -18,7 +18,7 @@ PKG_NOPARALLEL:=	1
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 # GLOB_BRACE usage
-PKG_LIBC_DEPENDS:=	uclibc-ng uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 include ${ADK_TOPDIR}/mk/package.mk
 
diff --git a/package/pcc/Makefile b/package/pcc/Makefile
index 0dbfdd102..58ff82ad0 100644
--- a/package/pcc/Makefile
+++ b/package/pcc/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=	--host=${GNU_TARGET_NAME} \
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
 TARGET_CPPFLAGS+=	-DADK_FOR_GLIBC
 endif
-ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
+ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y)
 TARGET_CPPFLAGS+=	-DADK_FOR_UCLIBC
 endif
 
diff --git a/package/portsentry/Makefile b/package/portsentry/Makefile
index 28ddeff61..b9d03e3b6 100644
--- a/package/portsentry/Makefile
+++ b/package/portsentry/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		net/security
 PKG_URL:=		http://sourceforge.net/projects/sentrytools
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=sentrytools/}
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}_beta
diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile
index 139d68ac4..5944343bd 100644
--- a/package/pptpd/Makefile
+++ b/package/pptpd/Makefile
@@ -18,7 +18,7 @@ PKG_CFLINE_PPTPD+=	select ADK_KERNEL_PPP_MPPE m
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc-ng uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 include ${ADK_TOPDIR}/mk/package.mk
 
diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile
index 21482524c..a18214f42 100644
--- a/package/pulseaudio/Makefile
+++ b/package/pulseaudio/Makefile
@@ -18,7 +18,7 @@ PKG_URL:=		http://www.freedesktop.org/wiki/Software/PulseAudio/
 PKG_SITES:=		http://freedesktop.org/software/pulseaudio/releases/
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	uclibc-ng uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 include $(ADK_TOPDIR)/mk/package.mk
 
diff --git a/package/rp-pppoe/Makefile b/package/rp-pppoe/Makefile
index 52182bb17..0fb4b8f8c 100644
--- a/package/rp-pppoe/Makefile
+++ b/package/rp-pppoe/Makefile
@@ -15,7 +15,8 @@ PKG_SITES:=		http://www.roaringpenguin.com/files/download/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
+
 PKG_SUBPKGS:=		RP_PPPOE RP_PPPOE_CLIENT RP_PPPOE_RELAY RP_PPPOE_SERVER RP_PPPOE_SNIFF
 PKGSD_RP_PPPOE_CLIENT:=	PPPoE client
 PKGSN_RP_PPPOE_CLIENT:=	rp-pppoe
diff --git a/package/scanlogd/Makefile b/package/scanlogd/Makefile
index 20e9a8877..796ef0fda 100644
--- a/package/scanlogd/Makefile
+++ b/package/scanlogd/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:=		http://www.openwall.com/scanlogd/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 PKG_ARCH_DEPENDS:=	!arm
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 include ${ADK_TOPDIR}/mk/package.mk
 
diff --git a/package/shat/Makefile b/package/shat/Makefile
index 8087f4d10..078570a01 100644
--- a/package/shat/Makefile
+++ b/package/shat/Makefile
@@ -13,7 +13,7 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=shat/}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 include ${ADK_TOPDIR}/mk/package.mk
 
diff --git a/package/ssltunnel/Makefile b/package/ssltunnel/Makefile
index e34fd5286..27a81da2a 100644
--- a/package/ssltunnel/Makefile
+++ b/package/ssltunnel/Makefile
@@ -15,7 +15,7 @@ PKG_SITES:=		http://www.hsc.fr/ressources/outils/ssltunnel/download/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng glibc
 
 include ${ADK_TOPDIR}/mk/package.mk
 
diff --git a/package/tvheadend/Makefile b/package/tvheadend/Makefile
index b30d60e43..519617aeb 100644
--- a/package/tvheadend/Makefile
+++ b/package/tvheadend/Makefile
@@ -18,7 +18,7 @@ $(eval $(call PKG_template,TVHEADEND,tvheadend,$(PKG_VERSION)-$(PKG_RELEASE),$(P
 
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
-ifeq ($(ADK_TARGET_LIB_UCLIBC)$(ADK_TARGET_LIB_UCLIBC_NG),y)
+ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y)
 XAKE_FLAGS+=		LDLIBS=-liconv
 endif
 
diff --git a/package/uclibc++/Config.in.manual b/package/uclibc++/Config.in.manual
index 4af136a06..cd37ca2db 100644
--- a/package/uclibc++/Config.in.manual
+++ b/package/uclibc++/Config.in.manual
@@ -4,7 +4,7 @@
 config ADK_PACKAGE_UCLIBCXX
 	prompt "uClibc++............. C++ library for embedded systems"
 	tristate
-	depends on ADK_TARGET_LIB_UCLIBC
+	depends on ADK_TARGET_LIB_UCLIBC_NG
 	default n
 	help
 	  A standard C++ library for embedded systems
diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index 226813332..8e6f73559 100644
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/Makefile
@@ -17,7 +17,7 @@ PKG_OPTS:=		dev
 
 DISTFILES:=		uClibc++-${PKG_VERSION}.tar.bz2
 
-PKG_LIBC_DEPENDS:=	uclibc
+PKG_LIBC_DEPENDS:=	uclibc-ng
 
 include ${ADK_TOPDIR}/mk/package.mk
 
diff --git a/package/uclibc/Config.in.manual b/package/uclibc/Config.in.manual
deleted file mode 100644
index ad66c1eb1..000000000
--- a/package/uclibc/Config.in.manual
+++ /dev/null
@@ -1,18 +0,0 @@
-config ADK_PACKAGE_UCLIBC
-	bool "uClibc.................. embedded C library"
-	depends on ADK_TARGET_LIB_UCLIBC
-	default y if ADK_TARGET_LIB_UCLIBC && !ADK_TOOLCHAIN_ONLY
-	default n
-	help
-	  Embedded C library.
-
-config ADK_PACKAGE_UCLIBC_TEST
-	bool "uClibc-test............. embedded C library (testsuite)"
-	select ADK_PACKAGE_MAKE if !ADK_TARGET_UCLINUX
-	select ADK_PACKAGE_LIBRT if !ADK_TARGET_UCLINUX
-	select ADK_PACKAGE_LIBPTHREAD if !ADK_TARGET_UCLINUX
-	select ADK_UCLIBC_TEST
-	depends on ADK_TARGET_LIB_UCLIBC
-	help
-	  Embedded C library testsuite.
-
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
deleted file mode 100644
index 5be4c3a5d..000000000
--- a/package/uclibc/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-include $(ADK_TOPDIR)/mk/kernel-ver.mk
-include $(ADK_TOPDIR)/mk/kernel-vars.mk
-include $(ADK_TOPDIR)/toolchain/uclibc/Makefile.inc
-
-PKG_NAME:=		uClibc
-PKG_DESCR:=		embedded c library
-PKG_SECTION:=		base/libs
-PKG_OPTS:=		noremove nostaging noscripts
-
-PKG_SUBPKGS:=		UCLIBC UCLIBC_DEV UCLIBC_TEST
-PKGSD_UCLIBC_DEV:=	development files for uclibc
-PKGSC_UCLIBC_DEV:=	devel
-PKGSD_UCLIBC_TEST:=	test suite for uclibc
-PKGSS_UCLIBC_TEST:=	make
-
-NO_DISTFILES:=		1
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,UCLIBC,uclibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,UCLIBC_DEV,uclibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_UCLIBC_DEV},${PKGSC_UCLIBC_DEV},${PKG_OPTS}))
-$(eval $(call PKG_template,UCLIBC_TEST,uclibc-test,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_UCLIBC_TEST},${PKGSC_UCLIBC_TEST},${PKG_OPTS}))
-
-CONFIG_STYLE:=          manual
-BUILD_STYLE:=           manual
-INSTALL_STYLE:=         manual
-
-do-install:
-	${INSTALL_DIR} $(IDIR_UCLIBC)/$(ADK_TARGET_LIBC_PATH) $(IDIR_UCLIBC)/etc
-	test -z $(ADK_RUNTIME_TIMEZONE) || \
-	    grep $(ADK_RUNTIME_TIMEZONE) ./files/tz.lst | \
-	    cut -f 2 > $(IDIR_UCLIBC)/etc/TZ
-ifneq ($(ADK_TARGET_USE_STATIC_LIBS)$(ADK_TARGET_UCLINUX),y)
-	$(CP) $(STAGING_TARGET_DIR)/lib/libc.so.* $(IDIR_UCLIBC)/$(ADK_TARGET_LIBC_PATH)
-	$(CP) $(STAGING_TARGET_DIR)/lib/libuClibc-$(PKG_VERSION).so \
-		$(IDIR_UCLIBC)/$(ADK_TARGET_LIBC_PATH)
-	$(CP) $(STAGING_TARGET_DIR)/lib/ld*-uClibc-$(PKG_VERSION).so \
-		$(IDIR_UCLIBC)/$(ADK_TARGET_LIBC_PATH)
-	$(CP) $(STAGING_TARGET_DIR)/lib/ld*-uClibc.so.* $(IDIR_UCLIBC)/$(ADK_TARGET_LIBC_PATH)
-	-for file in libcrypt libdl libm libresolv libutil; do \
-		$(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_UCLIBC)/$(ADK_TARGET_LIBC_PATH); \
-		$(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so \
-			$(IDIR_UCLIBC)/$(ADK_TARGET_LIBC_PATH); \
-	done
-endif
-
-uclibc-dev-install:
-	${INSTALL_DIR} ${IDIR_UCLIBC_DEV}/usr/lib ${IDIR_UCLIBC_DEV}/$(ADK_TARGET_LIBC_PATH)
-	${CP} ${STAGING_TARGET_DIR}/usr/lib/libc.so ${IDIR_UCLIBC_DEV}/usr/lib
-	${CP} ${STAGING_TARGET_DIR}/usr/lib/uclibc_nonshared.a ${IDIR_UCLIBC_DEV}/usr/lib
-	${CP} ${STAGING_TARGET_DIR}/usr/lib/crt*.o ${IDIR_UCLIBC_DEV}/usr/lib
-	for file in libcrypt libdl libm libresolv libutil; do \
-		cd $(IDIR_UCLIBC_DEV)/$(ADK_TARGET_LIBC_PATH); ln -sf $$file-$(PKG_VERSION).so $$file.so; \
-	done
-	${KERNEL_MAKE_ENV} \
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)/linux-$(KERNEL_FILE_VER) \
-		$(KERNEL_MAKE_OPTS) \
-		INSTALL_HDR_PATH=$(IDIR_UCLIBC_DEV)/usr \
-		headers_install
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \
-		PREFIX=$(IDIR_UCLIBC_DEV)/ \
-		DEVEL_PREFIX=/usr/ \
-		RUNTIME_PREFIX=$(IDIR_UCLIBC_DEV)/ \
-		HOSTCC="$(CC_FOR_BUILD)" \
-		CPU_CFLAGS="$(TARGET_CFLAGS)" \
-		install_headers
-	@find $(IDIR_UCLIBC_DEV) -name .install -exec rm {} \;
-	@find $(IDIR_UCLIBC_DEV) -name ..install.cmd -exec rm {} \;
-
-uclibc-test-install:
-	${INSTALL_DIR} ${IDIR_UCLIBC_TEST}/etc
-	echo '00:11:22:33:44:55 teeth' > ${IDIR_UCLIBC_TEST}/etc/ethers
-	${INSTALL_DIR} ${IDIR_UCLIBC_TEST}/opt/uclibc
-	${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}/test \
-		${IDIR_UCLIBC_TEST}/opt/uclibc
-	${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}/{Rules.mak,.config} \
-		${IDIR_UCLIBC_TEST}/opt/uclibc
-	@find ${IDIR_UCLIBC_TEST}/opt/uclibc -name \*.o -exec rm {} \;
-	# there is a problem with initramfs generation with the API dir. tests are disabled anyway.
-	rm -rf ${IDIR_UCLIBC_TEST}/opt/uclibc/API
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/uclibc/files/tz.lst b/package/uclibc/files/tz.lst
deleted file mode 100644
index 1c249bba0..000000000
--- a/package/uclibc/files/tz.lst
+++ /dev/null
@@ -1,451 +0,0 @@
-Africa/Abidjan	GMT0
-Africa/Accra	GMT0
-Africa/Addis Ababa	EAT-3
-Africa/Algiers	CET-1
-Africa/Asmera	EAT-3
-Africa/Bamako	GMT0
-Africa/Bangui	WAT-1
-Africa/Banjul	GMT0
-Africa/Bissau	GMT0
-Africa/Blantyre	CAT-2
-Africa/Brazzaville	WAT-1
-Africa/Bujumbura	CAT-2
-Africa/Cairo	EET-2EEST-3,M4.5.5/0,M9.5.4/24
-Africa/Casablanca	WET0
-Africa/Ceuta	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Africa/Conakry	GMT0
-Africa/Dakar	GMT0
-Africa/Dar es Salaam	EAT-3
-Africa/Djibouti	EAT-3
-Africa/Douala	WAT-1
-Africa/El Aaiun	WET0
-Africa/Freetown	WAT0
-Africa/Gaborone	CAT-2
-Africa/Harare	CAT-2
-Africa/Johannesburg	SAST-2
-Africa/Kampala	EAT-3
-Africa/Khartoum	EAT-3
-Africa/Kigali	CAT-2
-Africa/Kinshasa	WAT-1
-Africa/Lagos	WAT-1
-Africa/Libreville	WAT-1
-Africa/Lome	GMT0
-Africa/Luanda	WAT-1
-Africa/Lubumbashi	CAT-2
-Africa/Lusaka	CAT-2
-Africa/Malabo	WAT-1
-Africa/Maputo	CAT-2
-Africa/Maseru	SAST-2
-Africa/Mbabane	SAST-2
-Africa/Mogadishu	EAT-3
-Africa/Monrovia	GMT0
-Africa/Nairobi	EAT-3
-Africa/Ndjamena	WAT-1
-Africa/Niamey	WAT-1
-Africa/Nouakchott	GMT0
-Africa/Ouagadougou	GMT0
-Africa/Porto-Novo	WAT-1
-Africa/Sao Tome	GMT0
-Africa/Timbuktu	GMT0
-Africa/Tripoli	EET-2
-Africa/Tunis	CET-1
-Africa/Windhoek	WAT-1WAST-2,M9.1.0/2,M4.1.0/2
-America/Adak	HAST10HADT9,M4.1.0/2,M10.5.0/2
-America/Anchorage	AKST9AKDT8,M4.1.0/2,M10.5.0/2
-America/Anguilla	AST4
-America/Antigua	AST4
-America/Araguaina	BRT3BRST2,M10.2.0/0,M2.3.0/0
-America/Aruba	AST4
-America/Asuncion	PYT4PYST3,M10.1.0/0,M3.1.0/0
-America/Atka	HAST10HADT9,M4.1.0/2,M10.5.0/2
-America/Barbados	AST4
-America/Belem	BRT3
-America/Belize	CST6
-America/Boa Vista	AMT4
-America/Bogota	COT5
-America/Boise	MST7MDT6,M4.1.0/2,M10.5.0/2
-America/Buenos Aires	ART3
-America/Cambridge Bay	MST7MDT6,M4.1.0/2,M10.5.0/2
-America/Cancun	CST6CDT5,M5.1.0/2,M9.5.0/2
-America/Caracas	VET4
-America/Catamarca	ART3
-America/Cayenne	GFT3
-America/Cayman	EST5
-America/Chicago	CST6CDT5,M4.1.0/2,M10.5.0/2
-America/Chihuahua	MST7MDT6,M5.1.0/2,M9.5.0/2
-America/Cordoba	ART3
-America/Costa Rica	CST6
-America/Cuiaba	AMT4AMST3,M10.2.0/0,M2.3.0/0
-America/Curacao	AST4
-America/Danmarkshavn	GMT0
-America/Dawson	PST8PDT7,M4.1.0/2,M10.5.0/2
-America/Dawson Creek	MST7
-America/Denver	MST7MDT6,M4.1.0/2,M10.5.0/2
-America/Detroit	EST5EDT4,M4.1.0/2,M10.5.0/2
-America/Dominica	AST4
-America/Edmonton	MST7MDT6,M4.1.0/2,M10.5.0/2
-America/Eirunepe	ACT5
-America/El Salvador	CST6
-America/Ensenada	PST8PDT7,M4.1.0/2,M10.5.0/2
-America/Fort Wayne	EST5
-America/Fortaleza	BRT3BRST2,M10.2.0/0,M2.3.0/0
-America/Glace Bay	AST4ADT3,M4.1.0/2,M10.5.0/2
-America/Godthab	WGT3WGST2,M3.5.0/-2,M10.5.0/-1
-America/Goose Bay	AST4ADT3,M4.1.0/0:01,M10.5.0/0:01
-America/Grand Turk	EST5EDT4,M4.1.0/0,M10.5.0/0
-America/Grenada	AST4
-America/Guadeloupe	AST4
-America/Guatemala	CST6
-America/Guayaquil	ECT5
-America/Guyana	GYT4
-America/Halifax	AST4ADT3,M4.1.0/2,M10.5.0/2
-America/Havana	CST5CDT4,M4.1.0/0,M10.5.0/1
-America/Hermosillo	MST7
-America/Indiana/Indianapolis	EST5
-America/Indiana/Knox	EST5
-America/Indiana/Marengo	EST5
-America/Indiana/Vevay	EST5
-America/Indianapolis	EST5
-America/Inuvik	MST7MDT6,M4.1.0/2,M10.5.0/2
-America/Iqaluit	EST5EDT4,M4.1.0/2,M10.5.0/2
-America/Jamaica	EST5
-America/Jujuy	ART3
-America/Juneau	AKST9AKDT8,M4.1.0/2,M10.5.0/2
-America/Kentucky/Louisville	EST5EDT4,M4.1.0/2,M10.5.0/2
-America/Kentucky/Monticello	EST5EDT4,M4.1.0/2,M10.5.0/2
-America/Knox IN	EST5
-America/La Paz	BOT4
-America/Lima	PET5
-America/Los Angeles	PST8PDT7,M4.1.0/2,M10.5.0/2
-America/Louisville	EST5EDT4,M4.1.0/2,M10.5.0/2
-America/Maceio	BRT3BRST2,M10.2.0/0,M2.3.0/0
-America/Managua	CST6
-America/Manaus	AMT4
-America/Martinique	AST4
-America/Mazatlan	MST7MDT6,M5.1.0/2,M9.5.0/2
-America/Mendoza	ART3
-America/Menominee	CST6CDT5,M4.1.0/2,M10.5.0/2
-America/Merida	CST6CDT5,M5.1.0/2,M9.5.0/2
-America/Mexico City	CST6
-America/Miquelon	PMST3PMDT2,M4.1.0/2,M10.5.0/2
-America/Monterrey	CST6CDT5,M5.1.0/2,M9.5.0/2
-America/Montevideo	UYT3
-America/Montreal	EST5EDT4,M4.1.0/2,M10.5.0/2
-America/Montserrat	AST4
-America/Nassau	EST5EDT4,M4.1.0/2,M10.5.0/2
-America/New York	EST5EDT4,M4.1.0/2,M10.5.0/2
-America/Nipigon	EST5EDT4,M4.1.0/2,M10.5.0/2
-America/Nome	AKST9AKDT8,M4.1.0/2,M10.5.0/2
-America/Noronha	FNT2
-America/North Dakota/Center	CST6CDT5,M4.1.0/2,M10.5.0/2
-America/Panama	EST5
-America/Pangnirtung	EST5EDT4,M4.1.0/2,M10.5.0/2
-America/Paramaribo	SRT3
-America/Phoenix	MST7
-America/Port of Spain	AST4
-America/Port-au-Prince	EST5
-America/Porto Acre	ACT5
-America/Porto Velho	AMT4
-America/Puerto Rico	AST4
-America/Rainy River	CST6CDT5,M4.1.0/2,M10.5.0/2
-America/Rankin Inlet	CST6CDT5,M4.1.0/2,M10.5.0/2
-America/Recife	BRT3BRST2,M10.2.0/0,M2.3.0/0
-America/Regina	CST6
-America/Rio Branco	ACT5
-America/Rosario	ART3
-America/Santiago	CLT4CLST3,M10.2.0/0,M3.2.0/0
-America/Santo Domingo	AST4
-America/Sao Paulo	BRT3BRST2,M10.2.0/0,M2.3.0/0
-America/Scoresbysund	EGT1EGST0,M3.5.0/0,M10.5.0/1
-America/Shiprock	MST7MDT6,M4.1.0/2,M10.5.0/2
-America/St Johns	NST3:30NDT2:30,M4.1.0/0:01,M10.5.0/0:01
-America/St Kitts	AST4
-America/St Lucia	AST4
-America/St Thomas	AST4
-America/St Vincent	AST4
-America/Swift Current	CST6
-America/Tegucigalpa	CST6
-America/Thule	AST4
-America/Thunder Bay	EST5EDT4,M4.1.0/2,M10.5.0/2
-America/Tijuana	PST8PDT7,M4.1.0/2,M10.5.0/2
-America/Tortola	AST4
-America/Vancouver	PST8PDT7,M4.1.0/2,M10.5.0/2
-America/Virgin	AST4
-America/Whitehorse	PST8PDT7,M4.1.0/2,M10.5.0/2
-America/Winnipeg	CST6CDT5,M4.1.0/2,M10.5.0/3
-America/Yakutat	AKST9AKDT8,M4.1.0/2,M10.5.0/2
-America/Yellowknife	MST7MDT6,M4.1.0/2,M10.5.0/2
-Antarctica/Casey	WST-8
-Antarctica/Davis	DAVT-7
-Antarctica/DumontDUrville	DDUT-10
-Antarctica/Mawson	MAWT-6
-Antarctica/McMurdo	NZST-12NZDT-13,M10.1.0/2,M3.3.0/3
-Antarctica/Palmer	CLT4CLST3,M10.2.0/0,M3.2.0/0
-Antarctica/South Pole	NZST-12NZDT-13,M10.1.0/2,M3.3.0/3
-Antarctica/Syowa	SYOT-3
-Antarctica/Vostok	VOST-6
-Arctic/Longyearbyen	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Asia/Aden	AST-3
-Asia/Almaty	ALMT-6ALMST-7,M3.5.0/0,M10.5.0/0
-Asia/Amman	EET-2EEST-3,M3.5.4/0,M9.5.4/1
-Asia/Anadyr	ANAT-12ANAST-13,M3.5.0/2,M10.5.0/3
-Asia/Aqtau	AQTT-4AQTST-5,M3.5.0/0,M10.5.0/0
-Asia/Aqtobe	AQTT-5AQTST-6,M3.5.0/0,M10.5.0/0
-Asia/Ashgabat	TMT-5
-Asia/Ashkhabad	TMT-5
-Asia/Baghdad	AST-3ADT-4,J91/3,J274/4
-Asia/Bahrain	AST-3
-Asia/Baku	AZT-4AZST-5,M3.5.0/1,M10.5.0/1
-Asia/Bangkok	ICT-7
-Asia/Beirut	EET-2EEST-3,M3.5.0/0,M10.5.0/0
-Asia/Bishkek	KGT-5KGST-6,M3.5.0/2:30,M10.5.0/2:30
-Asia/Brunei	BNT-8
-Asia/Calcutta	IST-5:30
-Asia/Choibalsan	CHOT-9
-Asia/Chongqing	CST-8
-Asia/Chungking	CST-8
-Asia/Colombo	LKT-6
-Asia/Dacca	BDT-6
-Asia/Damascus	EET-2EEST-3,J91/0,J274/0
-Asia/Dhaka	BDT-6
-Asia/Dili	TPT-9
-Asia/Dubai	GST-4
-Asia/Dushanbe	TJT-5
-Asia/Gaza	EET-2EEST-3,M4.3.5/0,M10.3.5/0
-Asia/Harbin	CST-8
-Asia/Hong Kong	HKT-8
-Asia/Hovd	HOVT-7
-Asia/Irkutsk	IRKT-8IRKST-9,M3.5.0/2,M10.5.0/3
-Asia/Istanbul	EET-2EEST-3,M3.5.0/3,M10.5.0/4
-Asia/Jakarta	WIT-7
-Asia/Jayapura	EIT-9
-Asia/Jerusalem	IST-2IDT-3,J87/1,J276/1
-Asia/Kabul	AFT-4:30
-Asia/Kamchatka	PETT-12PETST-13,M3.5.0/2,M10.5.0/3
-Asia/Karachi	PKT-5
-Asia/Kashgar	CST-8
-Asia/Katmandu	NPT-5:45
-Asia/Krasnoyarsk	KRAT-7KRAST-8,M3.5.0/2,M10.5.0/3
-Asia/Kuala Lumpur	MYT-8
-Asia/Kuching	MYT-8
-Asia/Kuwait	AST-3
-Asia/Macao	CST-8
-Asia/Magadan	MAGT-11MAGST-12,M3.5.0/2,M10.5.0/3
-Asia/Manila	PHT-8
-Asia/Muscat	GST-4
-Asia/Nicosia	EET-2EEST-3,M3.5.0/3,M10.5.0/4
-Asia/Novosibirsk	NOVT-6NOVST-7,M3.5.0/2,M10.5.0/3
-Asia/Omsk	OMST-6OMSST-7,M3.5.0/2,M10.5.0/3
-Asia/Phnom Penh	ICT-7
-Asia/Pontianak	WIT-7
-Asia/Pyongyang	KST-9
-Asia/Qatar	AST-3
-Asia/Rangoon	MMT-6:30
-Asia/Riyadh	AST-3
-Asia/Saigon	ICT-7
-Asia/Sakhalin	SAKT-10SAKST-11,M3.5.0/2,M10.5.0/3
-Asia/Samarkand	UZT-5
-Asia/Seoul	KST-9
-Asia/Shanghai	CST-8
-Asia/Singapore	SGT-8
-Asia/Taipei	CST-8
-Asia/Tashkent	UZT-5
-Asia/Tbilisi	GET-4GEST-5,M3.5.0/0,M10.5.0/0
-Asia/Tehran	IRT-3:30IRST-4:30,J80/0,J266/0
-Asia/Tel Aviv	IST-2IDT-3,J87/1,J276/1
-Asia/Thimbu	BTT-6
-Asia/Thimphu	BTT-6
-Asia/Tokyo	JST-9
-Asia/Ujung Pandang	CIT-8
-Asia/Ulaanbaatar	ULAT-8
-Asia/Ulan Bator	ULAT-8
-Asia/Urumqi	CST-8
-Asia/Vientiane	ICT-7
-Asia/Vladivostok	VLAT-10VLAST-11,M3.5.0/2,M10.5.0/3
-Asia/Yakutsk	YAKT-9YAKST-10,M3.5.0/2,M10.5.0/3
-Asia/Yekaterinburg	YEKT-5YEKST-6,M3.5.0/2,M10.5.0/3
-Asia/Yerevan	AMT-4AMST-5,M3.5.0/2,M10.5.0/3
-Atlantic/Azores	AZOT1AZOST0,M3.5.0/0,M10.5.0/1
-Atlantic/Bermuda	AST4ADT3,M4.1.0/2,M10.5.0/2
-Atlantic/Canary	WET0WEST-1,M3.5.0/1,M10.5.0/2
-Atlantic/Cape Verde	CVT1
-Atlantic/Faeroe	WET0WEST-1,M3.5.0/1,M10.5.0/2
-Atlantic/Jan Mayen	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Atlantic/Madeira	WET0WEST-1,M3.5.0/1,M10.5.0/2
-Atlantic/Reykjavik	GMT0
-Atlantic/South Georgia	GST2
-Atlantic/St Helena	GMT0
-Atlantic/Stanley	FKT4FKST3,M9.1.0/2,M4.3.0/2
-Australia/ACT	EST-10EST-11,M10.5.0/2,M3.5.0/3
-Australia/Adelaide	CST-9:30CST-10:30,M10.5.0/2,M3.5.0/3
-Australia/Brisbane	EST-10
-Australia/Broken Hill	CST-9:30CST-10:30,M10.5.0/2,M3.5.0/3
-Australia/Canberra	EST-10EST-11,M10.5.0/2,M3.5.0/3
-Australia/Darwin	CST-9:30
-Australia/Hobart	EST-10EST-11,M10.1.0/2,M3.5.0/3
-Australia/LHI	LHST-10:30LHST-11,M10.5.0/2,M3.5.0/2
-Australia/Lindeman	EST-10
-Australia/Lord Howe	LHST-10:30LHST-11,M10.5.0/2,M3.5.0/2
-Australia/Melbourne	EST-10EST-11,M10.5.0/2,M3.5.0/3
-Australia/NSW	EST-10EST-11,M10.5.0/2,M3.5.0/3
-Australia/North	CST-9:30
-Australia/Perth	WST-8
-Australia/Queensland	EST-10
-Australia/South	CST-9:30CST-10:30,M10.5.0/2,M3.5.0/3
-Australia/Sydney	EST-10EST-11,M10.5.0/2,M3.5.0/3
-Australia/Tasmania	EST-10EST-11,M10.1.0/2,M3.5.0/3
-Australia/Victoria	EST-10EST-11,M10.5.0/2,M3.5.0/3
-Australia/West	WST-8
-Australia/Yancowinna	CST-9:30CST-10:30,M10.5.0/2,M3.5.0/3
-Brazil/DeNoronha	FNT2
-Brazil/East	BRT3BRST2,M10.2.0/0,M2.3.0/0
-Brazil/West	AMT4
-Canada/Atlantic	AST4ADT3,M4.1.0/2,M10.5.0/2
-Canada/Central	CST6CDT5,M4.1.0/2,M10.5.0/3
-Canada/East-Saskatchewan	CST6
-Canada/Eastern	EST5EDT4,M4.1.0/2,M10.5.0/2
-Canada/Mountain	MST7MDT6,M4.1.0/2,M10.5.0/2
-Canada/Newfoundland	NST3:30NDT2:30,M4.1.0/0:01,M10.5.0/0:01
-Canada/Pacific	PST8PDT7,M4.1.0/2,M10.5.0/2
-Canada/Saskatchewan	CST6
-Canada/Yukon	PST8PDT7,M4.1.0/2,M10.5.0/2
-Chile/Continental	CLT4CLST3,M10.2.0/0,M3.2.0/0
-Chile/EasterIsland	EAST6EASST5,M10.2.0/-2,M3.2.0/-2
-Cuba	CST5CDT4,M4.1.0/0,M10.5.0/1
-Egypt	EET-2EEST-3,M4.5.5/0,M9.5.4/24
-Eire	GMT0IST-1,M3.5.0/1,M10.5.0/2
-Europe/Amsterdam	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Andorra	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Athens	EET-2EEST-3,M3.5.0/3,M10.5.0/4
-Europe/Belfast	GMT0BST-1,M3.5.0/1,M10.5.0/2
-Europe/Belgrade	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Berlin	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Bratislava	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Brussels	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Bucharest	EET-2EEST-3,M3.5.0/3,M10.5.0/4
-Europe/Budapest	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Chisinau	EET-2EEST-3,M3.5.0/3,M10.5.0/4
-Europe/Copenhagen	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Dublin	GMT0IST-1,M3.5.0/1,M10.5.0/2
-Europe/Gibraltar	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Helsinki	EET-2EEST-3,M3.5.0/3,M10.5.0/4
-Europe/Istanbul	EET-2EEST-3,M3.5.0/3,M10.5.0/4
-Europe/Kaliningrad	EET-2EEST-3,M3.5.0/2,M10.5.0/3
-Europe/Kiev	EET-2EEST-3,M3.5.0/3,M10.5.0/4
-Europe/Lisbon	WET0WEST-1,M3.5.0/1,M10.5.0/2
-Europe/Ljubljana	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/London	GMT0BST-1,M3.5.0/1,M10.5.0/2
-Europe/Luxembourg	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Madrid	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Malta	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Minsk	EET-2EEST-3,M3.5.0/2,M10.5.0/3
-Europe/Monaco	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Moscow	MSK-3MSD-4,M3.5.0/2,M10.5.0/3
-Europe/Nicosia	EET-2EEST-3,M3.5.0/3,M10.5.0/4
-Europe/Oslo	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Paris	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Prague	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Riga	EET-2EEST-3,M3.5.0/3,M10.5.0/4
-Europe/Rome	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Samara	SAMT-4SAMST-5,M3.5.0/2,M10.5.0/3
-Europe/San Marino	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Sarajevo	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Simferopol	EET-2EEST-3,M3.5.0/3,M10.5.0/4
-Europe/Skopje	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Sofia	EET-2EEST-3,M3.5.0/3,M10.5.0/4
-Europe/Stockholm	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Tallinn	EET-2
-Europe/Tirane	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Tiraspol	EET-2EEST-3,M3.5.0/3,M10.5.0/4
-Europe/Uzhgorod	EET-2EEST-3,M3.5.0/3,M10.5.0/4
-Europe/Vaduz	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Vatican	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Vienna	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Vilnius	EET-2
-Europe/Warsaw	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Zagreb	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Europe/Zaporozhye	EET-2EEST-3,M3.5.0/3,M10.5.0/4
-Europe/Zurich	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Great Britain/Eire	GMT0BST-1,M3.5.0/1,M10.5.0/2
-Great Britain/Great Britain	GMT0BST-1,M3.5.0/1,M10.5.0/2
-Hong Kong	HKT-8
-Iceland	GMT0
-Indian/Antananarivo	EAT-3
-Indian/Chagos	IOT-6
-Indian/Christmas	CXT-7
-Indian/Cocos	CCT-6:30
-Indian/Comoro	EAT-3
-Indian/Kerguelen	TFT-5
-Indian/Mahe	SCT-4
-Indian/Maldives	MVT-5
-Indian/Mauritius	MUT-4
-Indian/Mayotte	EAT-3
-Indian/Reunion	RET-4
-Iran	IRT-3:30IRST-4:30,J80/0,J266/0
-Israel	IST-2IDT-3,J87/1,J276/1
-Jamaica	EST5
-Japan	JST-9
-Kwajalein	MHT-12
-Libya	EET-2
-Mexico/BajaNorte	PST8PDT7,M4.1.0/2,M10.5.0/2
-Mexico/BajaSur	MST7MDT6,M5.1.0/2,M9.5.0/2
-Mexico/General	CST6
-Navajo	MST7MDT6,M4.1.0/2,M10.5.0/2
-New Zealand/Chatham	CHAST-12:45CHADT-13:45,M10.1.0/2:45,M3.3.0/3:45
-New Zealand/New Zealand	NZST-12NZDT-13,M10.1.0/2,M3.3.0/3
-Pacific/Apia	WST11
-Pacific/Auckland	NZST-12NZDT-13,M10.1.0/2,M3.3.0/3
-Pacific/Chatham	CHAST-12:45CHADT-13:45,M10.1.0/2:45,M3.3.0/3:45
-Pacific/Easter	EAST6EASST5,M10.2.0/-2,M3.2.0/-2
-Pacific/Efate	VUT-11
-Pacific/Enderbury	PHOT-13
-Pacific/Fakaofo	TKT10
-Pacific/Fiji	FJT-12
-Pacific/Funafuti	TVT-12
-Pacific/Galapagos	GALT6
-Pacific/Gambier	GAMT9
-Pacific/Guadalcanal	SBT-11
-Pacific/Guam	ChST-10
-Pacific/Honolulu	HST10
-Pacific/Johnston	HST10
-Pacific/Kiritimati	LINT-14
-Pacific/Kosrae	KOST-11
-Pacific/Kwajalein	MHT-12
-Pacific/Majuro	MHT-12
-Pacific/Marquesas	MART9:30
-Pacific/Midway	SST11
-Pacific/Nauru	NRT-12
-Pacific/Niue	NUT11
-Pacific/Norfolk	NFT-11:30
-Pacific/Noumea	NCT-11
-Pacific/Pago Pago	SST11
-Pacific/Palau	PWT-9
-Pacific/Pitcairn	PST8
-Pacific/Ponape	PONT-11
-Pacific/Port Moresby	PGT-10
-Pacific/Rarotonga	CKT10
-Pacific/Saipan	ChST-10
-Pacific/Samoa	SST11
-Pacific/Tahiti	TAHT10
-Pacific/Tarawa	GILT-12
-Pacific/Tongatapu	TOT-13
-Pacific/Truk	TRUT-10
-Pacific/Wake	WAKT-12
-Pacific/Wallis	WFT-12
-Pacific/Yap	YAPT-10
-Poland	CET-1CEST-2,M3.5.0/2,M10.5.0/3
-Portugal	WET0WEST-1,M3.5.0/1,M10.5.0/2
-Singapore	SGT-8
-Turkey	EET-2EEST-3,M3.5.0/3,M10.5.0/4
-US/Alaska	AKST9AKDT8,M4.1.0/2,M10.5.0/2
-US/Aleutian	HAST10HADT9,M4.1.0/2,M10.5.0/2
-US/Arizona	MST7
-US/Central	CST6CDT5,M4.1.0/2,M10.5.0/2
-US/East-Indiana	EST5
-US/Eastern	EST5EDT4,M4.1.0/2,M10.5.0/2
-US/Hawaii	HST10
-US/Indiana-Starke	EST5
-US/Michigan	EST5EDT4,M4.1.0/2,M10.5.0/2
-US/Mountain	MST7MDT6,M4.1.0/2,M10.5.0/2
-US/Pacific	PST8PDT7,M4.1.0/2,M10.5.0/2
-US/Samoa	SST11
diff --git a/package/uclibc/files/uclibc.conffiles b/package/uclibc/files/uclibc.conffiles
deleted file mode 100644
index e9ee7e4d7..000000000
--- a/package/uclibc/files/uclibc.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/TZ