--- /usr/portage/sys-libs/uclibc-ng/uclibc-ng-1.0.29.ebuild	2018-03-03 22:08:55.000000000 +0100
+++ sys-libs/uclibc-ng/uclibc-ng-1.0.29.ebuild	2018-03-03 21:15:19.602668800 +0100
@@ -18,23 +18,20 @@
 if [[ ${PV} != "9999" ]] ; then
 	PATCH_VER=""
 	SRC_URI="http://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
+	KEYWORDS="-* amd64 ~arm ~mips ~ppc ~x86"
 fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug hardened iconv ipv6 symlink-compat headers-only"
+IUSE="debug hardened libiconv ipv6 symlink-compat headers-only"
 RESTRICT="strip"
 
-# 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage
-#    will delete the ld.so sym link prematurely and break the system. So we
-#    will hard block and give manual migration instructions.
-# 2) Currently uclibc and uclibc-ng's iconv are in bad shape.  We've been using
-#    the breakout library.  The disadvantage here is that we have to sprinkle
-#    LDFAGS=-liconv on build systems that need to link against libiconv.
+# We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage
+# will delete the ld.so sym link prematurely and break the system. So we
+# will hard block and give manual migration instructions.
 RDEPEND="
 	!!sys-libs/uclibc
-	iconv? ( dev-libs/libiconv )"
+	libiconv? ( dev-libs/libiconv )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -136,8 +133,10 @@
 		LDSO_STANDALONE_SUPPORT
 		PROPOLICE_BLOCK_SEGV
 		PTHREADS_DEBUG_SUPPORT
-		UCLIBC_HAS_ARC4RANDOM
+		UCLIBC_HAS___PROGNAME
 		UCLIBC_HAS_BACKTRACE
+		UCLIBC_HAS_LIBICONV
+		UCLIBC_HAS_LIBINTL
 		UCLIBC_HAS_BSD_RES_CLOSE
 		UCLIBC_HAS_CONTEXT_FUNCS
 		UCLIBC_HAS_CTYPE_CHECKED