From 74a3e2d021aa445032d24dbe800bc0480ceff8e4 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 7 Jul 2013 21:44:57 +0300
Subject: [PATCH] cleanup iconv

---
 config/options                                             | 4 ----
 packages/3rdparty/lib/libxslt/build                        | 5 -----
 packages/3rdparty/lib/libxslt/meta                         | 4 ++--
 packages/3rdparty/multimedia/vdr/build                     | 6 ------
 packages/addons/multimedia/w_scan/build                    | 4 ----
 packages/addons/multimedia/w_scan/meta                     | 2 +-
 packages/addons/networking/backup/rsync/meta               | 2 +-
 packages/addons/networking/testing/iperf/meta              | 2 +-
 packages/addons/service/downloadmanager/transmission/build | 4 ----
 packages/addons/service/downloadmanager/transmission/meta  | 4 ++--
 packages/addons/service/multimedia/tvheadend/build         | 4 ----
 packages/addons/service/multimedia/tvheadend/meta          | 4 ++--
 packages/audio/flac/build                                  | 5 -----
 packages/audio/flac/meta                                   | 4 ++--
 packages/audio/libcdio/meta                                | 4 ++--
 packages/debug/evtest/meta                                 | 4 ++--
 packages/devel/glib/build                                  | 5 -----
 packages/devel/glib/meta                                   | 4 ++--
 packages/mediacenter/xbmc/build                            | 4 +---
 packages/network/afpfs-ng/meta                             | 4 ++--
 packages/network/samba/meta                                | 4 ++--
 packages/other/enca/build                                  | 6 ------
 packages/other/enca/meta                                   | 4 ++--
 packages/sysutils/fuse/meta                                | 4 ++--
 packages/sysutils/lm_sensors/build                         | 5 -----
 packages/sysutils/lm_sensors/meta                          | 4 ++--
 packages/textproc/libxml2/build                            | 5 -----
 packages/textproc/libxml2/meta                             | 4 ++--
 packages/textproc/xerces-c/build                           | 4 ----
 packages/textproc/xerces-c/meta                            | 4 ++--
 packages/x11/data/xkeyboard-config/meta                    | 2 +-
 31 files changed, 33 insertions(+), 92 deletions(-)

diff --git a/config/options b/config/options
index f1ad3221ba..eb2071241d 100644
--- a/config/options
+++ b/config/options
@@ -31,10 +31,6 @@ PROJECT_DIR="$ROOT/projects"
 # Target system library C (eglibc)
   TARGET_LIBC="eglibc"
 
-# Target iconv implementation (libiconv)
-# leave empty if we are using glibc's gconv
-  ICONV=""
-
 # Library strip
   LIBSTRIP="yes"
 
diff --git a/packages/3rdparty/lib/libxslt/build b/packages/3rdparty/lib/libxslt/build
index e4897f7f61..c31feb4d6c 100755
--- a/packages/3rdparty/lib/libxslt/build
+++ b/packages/3rdparty/lib/libxslt/build
@@ -24,17 +24,12 @@
 
 cd $PKG_BUILD
 
-if [ "$ICONV" = "libiconv" ]; then
-  CONFIG_LIBXML="--with-iconv"
-fi
-
 ./configure --host=$TARGET_NAME \
              --build=$HOST_NAME \
              --prefix=/usr \
              --sysconfdir=/etc \
              --enable-static \
              --disable-shared \
-             $CONFIG_LIBXML \
              --disable-ipv6 \
              --without-python \
              --without-crypto
diff --git a/packages/3rdparty/lib/libxslt/meta b/packages/3rdparty/lib/libxslt/meta
index 9f662864a4..5ba5a2471c 100644
--- a/packages/3rdparty/lib/libxslt/meta
+++ b/packages/3rdparty/lib/libxslt/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="http://xmlsoft.org/xslt/"
 PKG_URL="ftp://xmlsoft.org/libxml2/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="$ICONV"
-PKG_BUILD_DEPENDS="toolchain $ICONV"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="textproc"
 PKG_SHORTDESC="libxslt"
diff --git a/packages/3rdparty/multimedia/vdr/build b/packages/3rdparty/multimedia/vdr/build
index d183d26f92..81fef1e4ca 100755
--- a/packages/3rdparty/multimedia/vdr/build
+++ b/packages/3rdparty/multimedia/vdr/build
@@ -39,12 +39,6 @@ NO_KBD=yes
 VDR_USER=root
 EOF
 
-if [ "$ICONV" = "libiconv" ]; then
-cat >> Make.config <<EOF
-LIBS += -liconv
-EOF
-fi
-
 make vdr
 make include-dir
 make plugins
diff --git a/packages/addons/multimedia/w_scan/build b/packages/addons/multimedia/w_scan/build
index 015c4af742..9dff05a192 100755
--- a/packages/addons/multimedia/w_scan/build
+++ b/packages/addons/multimedia/w_scan/build
@@ -22,10 +22,6 @@
 
 . config/options
 
-if [ "$ICONV" = "libiconv" ]; then
-  export LIBS="-liconv"
-fi
-
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
diff --git a/packages/addons/multimedia/w_scan/meta b/packages/addons/multimedia/w_scan/meta
index 198f438248..1e535a8362 100644
--- a/packages/addons/multimedia/w_scan/meta
+++ b/packages/addons/multimedia/w_scan/meta
@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://wirbel.htpc-forum.de/w_scan/index2.html"
 PKG_URL="http://wirbel.htpc-forum.de/w_scan/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain $ICONV"
+PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="lib/multimedia"
 PKG_SHORTDESC="w_scan: eine kleine Anwendung zum Scannen von ATSC/DVB-C/S/T Transpondern/Bouquets nach Sendern und Erstellen einer VDR channels.conf."
diff --git a/packages/addons/networking/backup/rsync/meta b/packages/addons/networking/backup/rsync/meta
index 5efed5c829..5e0d8be516 100644
--- a/packages/addons/networking/backup/rsync/meta
+++ b/packages/addons/networking/backup/rsync/meta
@@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.samba.org/ftp/rsync/rsync.html"
 PKG_URL="ftp://rsync.samba.org/pub/rsync/src/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain $ICONV"
+PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="network/backup"
 PKG_SHORTDESC="rsync: A replacement for rcp that has many more features"
diff --git a/packages/addons/networking/testing/iperf/meta b/packages/addons/networking/testing/iperf/meta
index e8726f04bd..4ddc5a1ecf 100644
--- a/packages/addons/networking/testing/iperf/meta
+++ b/packages/addons/networking/testing/iperf/meta
@@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://sourceforge.net/projects/iperf/"
 PKG_URL="$SOURCEFORGE_SRC/iperf/files/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain $ICONV"
+PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="network/testing"
 PKG_SHORTDESC="iperf: A modern alternative for measuring maximum TCP and UDP bandwidth performance"
diff --git a/packages/addons/service/downloadmanager/transmission/build b/packages/addons/service/downloadmanager/transmission/build
index 8cef07953e..170f27ba72 100755
--- a/packages/addons/service/downloadmanager/transmission/build
+++ b/packages/addons/service/downloadmanager/transmission/build
@@ -22,10 +22,6 @@
 
 . config/options $1
 
-if [ "$ICONV" = "libiconv" ]; then
-  export LIBS="-liconv"
-fi
-
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
diff --git a/packages/addons/service/downloadmanager/transmission/meta b/packages/addons/service/downloadmanager/transmission/meta
index 639d68206e..cb158c40e3 100644
--- a/packages/addons/service/downloadmanager/transmission/meta
+++ b/packages/addons/service/downloadmanager/transmission/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.transmissionbt.com/"
 PKG_URL="http://download.transmissionbt.com/files/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="zlib $ICONV openssl curl libevent"
-PKG_BUILD_DEPENDS="toolchain $ICONV zlib openssl curl libevent"
+PKG_DEPENDS="zlib openssl curl libevent"
+PKG_BUILD_DEPENDS="toolchain zlib openssl curl libevent"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/downloadmanager"
 PKG_SHORTDESC="transmission: a fast, easy and free BitTorrent client"
diff --git a/packages/addons/service/multimedia/tvheadend/build b/packages/addons/service/multimedia/tvheadend/build
index 02fa45bdc6..e9573bb47a 100755
--- a/packages/addons/service/multimedia/tvheadend/build
+++ b/packages/addons/service/multimedia/tvheadend/build
@@ -25,10 +25,6 @@
 # do not build with LTO support
   strip_lto
 
-if [ "$ICONV" = "libiconv" ]; then
-  export LDFLAGS="$LDFLAGS -liconv"
-fi
-
 cd $PKG_BUILD
 ./configure --prefix=/usr \
             --arch=$TARGET_ARCH \
diff --git a/packages/addons/service/multimedia/tvheadend/meta b/packages/addons/service/multimedia/tvheadend/meta
index 8c43bc318a..4b872dafe9 100644
--- a/packages/addons/service/multimedia/tvheadend/meta
+++ b/packages/addons/service/multimedia/tvheadend/meta
@@ -26,8 +26,8 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
 #PKG_URL="https://github.com/downloads/tvheadend/tvheadend/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS="$ICONV openssl curl"
-PKG_BUILD_DEPENDS="toolchain $ICONV openssl curl"
+PKG_DEPENDS="openssl curl"
+PKG_BUILD_DEPENDS="toolchain openssl curl"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/multimedia"
 PKG_SHORTDESC="tvheadend (Version: $PKG_VERSION): a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources."
diff --git a/packages/audio/flac/build b/packages/audio/flac/build
index 8d15f8eae7..77d2fc89d6 100755
--- a/packages/audio/flac/build
+++ b/packages/audio/flac/build
@@ -22,10 +22,6 @@
 
 . config/options $1
 
-if [ "$ICONV" = "libiconv" ]; then
-  CONFIG_FLAC="--with-libiconv-prefix=$SYSROOT_PREFIX/usr"
-fi
-
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
@@ -40,7 +36,6 @@ cd $PKG_BUILD
             --disable-xmms-plugin \
             --disable-oggtest \
             --with-ogg="$SYSROOT_PREFIX/usr" \
-            $CONFIG_FLAC \
             --with-gnu-ld
 
 make
diff --git a/packages/audio/flac/meta b/packages/audio/flac/meta
index f8810c2b8a..1d2094fd45 100644
--- a/packages/audio/flac/meta
+++ b/packages/audio/flac/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://flac.sourceforge.net/"
 PKG_URL="http://downloads.xiph.org/releases/flac/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="$ICONV libogg"
-PKG_BUILD_DEPENDS="toolchain $ICONV libogg"
+PKG_DEPENDS="libogg"
+PKG_BUILD_DEPENDS="toolchain libogg"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
 PKG_SHORTDESC="flac: An Free Lossless Audio Codec"
diff --git a/packages/audio/libcdio/meta b/packages/audio/libcdio/meta
index aa71c5dc12..4ef3412511 100644
--- a/packages/audio/libcdio/meta
+++ b/packages/audio/libcdio/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/libcdio/"
 PKG_URL="http://ftp.gnu.org/gnu/libcdio/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="$ICONV"
-PKG_BUILD_DEPENDS="toolchain $ICONV"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
 PKG_SHORTDESC="libcdio: A CD-ROM reading and control library"
diff --git a/packages/debug/evtest/meta b/packages/debug/evtest/meta
index fe6d691384..e691dc9a80 100644
--- a/packages/debug/evtest/meta
+++ b/packages/debug/evtest/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://cgit.freedesktop.org/evtest/"
 PKG_URL="http://cgit.freedesktop.org/evtest/snapshot/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="$ICONV libxml2"
-PKG_BUILD_DEPENDS="toolchain $ICONV libxml2"
+PKG_DEPENDS="libxml2"
+PKG_BUILD_DEPENDS="toolchain libxml2"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug/tools"
 PKG_SHORTDESC="evtest: Simple tool for input event debugging."
diff --git a/packages/devel/glib/build b/packages/devel/glib/build
index a81e730a45..01cd20a037 100755
--- a/packages/devel/glib/build
+++ b/packages/devel/glib/build
@@ -26,10 +26,6 @@
   strip_lto
 
 
-if [ "$ICONV" = "libiconv" ]; then
-  CONFIG_GLIB="--with-libiconv"
-fi
-
 cd $PKG_BUILD
 mkdir -p .build-target && cd .build-target
 
@@ -63,7 +59,6 @@ glib_cv_va_val_copy='no' \
              --with-gnu-ld \
              --with-threads=posix \
              --with-pcre=system \
-             $CONFIG_GLIB \
 
 make
 $MAKEINSTALL
diff --git a/packages/devel/glib/meta b/packages/devel/glib/meta
index 3b1cd256d6..91b4cd6575 100644
--- a/packages/devel/glib/meta
+++ b/packages/devel/glib/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gtk.org/"
 PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.34/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="zlib $ICONV libffi"
-PKG_BUILD_DEPENDS="toolchain zlib $ICONV libffi pcre glib-host Python-host"
+PKG_DEPENDS="zlib libffi"
+PKG_BUILD_DEPENDS="toolchain zlib libffi pcre glib-host Python-host"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="glib: C support library"
diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 8f79cb8555..cad46ad520 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -49,9 +49,7 @@ fi
 if [ "$XBMC_SCR_RSXS" = yes ]; then
   XBMC_RSXS="--enable-rsxs"
   # fix build of RSXS Screensaver support if not using libiconv
-    if [ ! "$ICONV" = "libiconv" ]; then
-      export jm_cv_func_gettimeofday_clobber=no
-    fi
+    export jm_cv_func_gettimeofday_clobber=no
 else
   XBMC_RSXS="--disable-rsxs"
 fi
diff --git a/packages/network/afpfs-ng/meta b/packages/network/afpfs-ng/meta
index 3bc5a6273f..74f2fc69b4 100644
--- a/packages/network/afpfs-ng/meta
+++ b/packages/network/afpfs-ng/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://sourceforge.net/projects/afpfs-ng/"
 PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="$ICONV libgpg-error libgcrypt ncurses"
-PKG_BUILD_DEPENDS="toolchain $ICONV libgpg-error libgcrypt ncurses"
+PKG_DEPENDS="libgpg-error libgcrypt ncurses"
+PKG_BUILD_DEPENDS="toolchain libgpg-error libgcrypt ncurses"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"
 PKG_SHORTDESC="afpfs-ng: an Apple Filing Protocol client"
diff --git a/packages/network/samba/meta b/packages/network/samba/meta
index 75275f7d3f..43abf77b17 100644
--- a/packages/network/samba/meta
+++ b/packages/network/samba/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.samba.org"
 PKG_URL="http://samba.org/samba/ftp/stable/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="$ICONV zlib connman"
-PKG_BUILD_DEPENDS="toolchain zlib attr $ICONV"
+PKG_DEPENDS="zlib connman"
+PKG_BUILD_DEPENDS="toolchain zlib attr"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"
 PKG_SHORTDESC="samba: The free SMB / CIFS fileserver and client"
diff --git a/packages/other/enca/build b/packages/other/enca/build
index 72871b4d77..5a685bee3c 100755
--- a/packages/other/enca/build
+++ b/packages/other/enca/build
@@ -22,11 +22,6 @@
 
 . config/options $1
 
-if [ "$ICONV" = "libiconv" ]; then
-  CONFIG_ENCA="--with-libiconv-prefix=$SYSROOT_PREFIX/usr"
-  export LDFLAGS="$LDFLAGS -liconv"
-fi
-
 CFLAGS="$CFLAGS -fPIC -DPIC"
 
 cd $PKG_BUILD
@@ -44,7 +39,6 @@ CPPFLAGS="-I$SYSROOT_PREFIX/usr/include" \
             --disable-shared \
             --enable-static \
             --disable-external \
-            $CONFIG_ENCA \
             --without-librecode \
             --disable-rpath \
             --with-gnu-ld
diff --git a/packages/other/enca/meta b/packages/other/enca/meta
index 398a03bbe0..9f05e03112 100644
--- a/packages/other/enca/meta
+++ b/packages/other/enca/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://freshmeat.net/projects/enca/"
 PKG_URL="http://dl.cihar.com/enca/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="$ICONV"
-PKG_BUILD_DEPENDS="toolchain $ICONV"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="other"
 PKG_SHORTDESC="enca: detects the encoding of text files, on the basis of knowledge of their language."
diff --git a/packages/sysutils/fuse/meta b/packages/sysutils/fuse/meta
index f3b216bc52..97262b8660 100644
--- a/packages/sysutils/fuse/meta
+++ b/packages/sysutils/fuse/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://sourceforge.net/projects/fuse/"
 PKG_URL="$SOURCEFORGE_SRC/fuse/fuse-2.X/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="$ICONV"
-PKG_BUILD_DEPENDS="toolchain $ICONV"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="system"
 PKG_SHORTDESC="fuse: A simple user-space filesystem interface for Linux"
diff --git a/packages/sysutils/lm_sensors/build b/packages/sysutils/lm_sensors/build
index 3bf3f45468..cb494a7504 100755
--- a/packages/sysutils/lm_sensors/build
+++ b/packages/sysutils/lm_sensors/build
@@ -22,14 +22,9 @@
 
 . config/options $1
 
-if [ "$ICONV" = "libiconv" ]; then
-  CONFIG_SENSORS="LIBICONV=-liconv"
-fi
-
 cd $PKG_BUILD
   make PREFIX=/usr \
        CC="$TARGET_CC" \
        AR="$TARGET_AR" \
        CFLAGS="$TARGET_CFLAGS" \
        CPPFLAGS="$TARGET_CPPFLAGS" \
-       $CONFIG_SENSORS \
diff --git a/packages/sysutils/lm_sensors/meta b/packages/sysutils/lm_sensors/meta
index 5ab34a4618..35e70b1141 100644
--- a/packages/sysutils/lm_sensors/meta
+++ b/packages/sysutils/lm_sensors/meta
@@ -26,8 +26,8 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://secure.netroedge.com/~lm78/"
 #PKG_URL="http://dl.lm-sensors.org/lm-sensors/releases/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_URL="http://ftp.gwdg.de/pub/linux/misc/lm-sensors/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="$ICONV"
-PKG_BUILD_DEPENDS="toolchain $ICONV"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="system"
 PKG_SHORTDESC="lm_sensors: Hardware monitoring via the SMBus"
diff --git a/packages/textproc/libxml2/build b/packages/textproc/libxml2/build
index 312d4e8beb..c75db65008 100755
--- a/packages/textproc/libxml2/build
+++ b/packages/textproc/libxml2/build
@@ -22,10 +22,6 @@
 
 . config/options $1
 
-if [ "$ICONV" = "libiconv" ]; then
-  CONFIG_LIBXML="--with-iconv"
-fi
-
 cd $PKG_BUILD
 mkdir -p .build-target
 
@@ -37,7 +33,6 @@ cd .build-target
              --enable-static \
              --enable-shared \
              --disable-silent-rules \
-             $CONFIG_LIBXML \
              --enable-ipv6 \
              --without-python \
              --with-zlib \
diff --git a/packages/textproc/libxml2/meta b/packages/textproc/libxml2/meta
index 10bd3958fe..b3a93350cd 100644
--- a/packages/textproc/libxml2/meta
+++ b/packages/textproc/libxml2/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="http://xmlsoft.org"
 PKG_URL="ftp://xmlsoft.org/libxml2/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="$ICONV zlib"
-PKG_BUILD_DEPENDS="toolchain $ICONV zlib"
+PKG_DEPENDS="zlib"
+PKG_BUILD_DEPENDS="toolchain zlib"
 PKG_PRIORITY="optional"
 PKG_SECTION="textproc"
 PKG_SHORTDESC="libxml: XML parser library for Gnome"
diff --git a/packages/textproc/xerces-c/build b/packages/textproc/xerces-c/build
index 6b9e63009d..602a1f6189 100755
--- a/packages/textproc/xerces-c/build
+++ b/packages/textproc/xerces-c/build
@@ -25,10 +25,6 @@
 # xerces_c fails to build with LTO support
 # strip_lto
 
-if [ "$ICONV" = "libiconv" ]; then
-  export LDFLAGS="$LDFLAGS -liconv"
-fi
-
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
diff --git a/packages/textproc/xerces-c/meta b/packages/textproc/xerces-c/meta
index c1060a7d3d..089cc71567 100644
--- a/packages/textproc/xerces-c/meta
+++ b/packages/textproc/xerces-c/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="APL"
 PKG_SITE="http://xml.apache.org/xerces-c/"
 PKG_URL="http://mirror.switch.ch/mirror/apache/dist/xerces/c/3/sources/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="$ICONV curl"
-PKG_BUILD_DEPENDS="toolchain $ICONV curl"
+PKG_DEPENDS="curl"
+PKG_BUILD_DEPENDS="toolchain curl"
 PKG_PRIORITY="optional"
 PKG_SECTION="textproc"
 PKG_SHORTDESC="xerces-c: A C++ XML parser"
diff --git a/packages/x11/data/xkeyboard-config/meta b/packages/x11/data/xkeyboard-config/meta
index a7c6815e5b..89f4c37dbd 100644
--- a/packages/x11/data/xkeyboard-config/meta
+++ b/packages/x11/data/xkeyboard-config/meta
@@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://www.x.org/releases/individual/data/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain util-macros xkbcomp $ICONV"
+PKG_BUILD_DEPENDS="toolchain util-macros xkbcomp"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/data"
 PKG_SHORTDESC="xkeyboard-config: X keyboard extension data files"