Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

2025-07-24 11:16:51 +00:00 · 2013-07-08 17:08:46 +02:00 · 2013-07-08 17:08:46 +02:00 · 8549317565
commit 8549317565
parent bf7b2144fb df8fb303bb
41 changed files with 38 additions and 99207 deletions
--- 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"

--- 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
--- 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"
--- 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
--- 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 \
--- 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."
--- a/packages/addons/networking/backup/rsync/build
+++ b/packages/addons/networking/backup/rsync/build
@ -30,5 +30,6 @@ cd $PKG_BUILD
            --localstatedir=/var \
            --disable-acl-support \
            --disable-xattr-support \
+            --with-included-popt \

 make
--- a/packages/addons/networking/backup/rsync/changelog.txt
+++ b/packages/addons/networking/backup/rsync/changelog.txt
@ -1,3 +1,6 @@
+3.1.2
+- use internal popt
+
 3.1.1
 - rebuild for OpenELEC-3.2

--- a/packages/addons/networking/backup/rsync/meta
+++ b/packages/addons/networking/backup/rsync/meta
@ -20,13 +20,13 @@

 PKG_NAME="rsync"
 PKG_VERSION="3.0.9"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 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 popt"
+PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="network/backup"
 PKG_SHORTDESC="rsync: A replacement for rcp that has many more features"
--- 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"
--- 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 \
--- 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"
--- 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 \
--- 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."
--- 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
--- 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"
--- 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"
--- 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."
--- 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
--- 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"
--- a/packages/devel/libiconv/build
+++ b/packages/devel/libiconv/build
@ -1,42 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-chmod +x ./configure ./preload/configure ./libcharset/configure
-
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --enable-static \
-            --enable-shared \
-            --disable-nls \
-            --disable-extra-encodings \
-            --with-gnu-ld
-
-make
-$MAKEINSTALL
-
-mkdir -p $SYSROOT_PREFIX/usr/share/aclocal
-  cp srcm4/*.m4 $SYSROOT_PREFIX/usr/share/aclocal
--- a/packages/devel/libiconv/install
+++ b/packages/devel/libiconv/install
@ -1,28 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libcharset/lib/.libs/*.so* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/charset.alias $INSTALL/usr/lib
--- a/packages/devel/libiconv/meta
+++ b/packages/devel/libiconv/meta
@ -1,37 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="libiconv"
-PKG_VERSION="20130504"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.gnu.org/software/libiconv/"
-# PKG_URL="http://ftp.gnu.org/pub/gnu/libiconv/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="devel"
-PKG_SHORTDESC="libiconv: Library converting between character encodings"
-PKG_LONGDESC="This library provides an iconv() implementation, for use on systems which don't have one, or whose implementation cannot convert from/to Unicode. This library is a drop-in soution for systems lacking a iconv() implementation in the C library."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
--- a/packages/devel/libiconv/patches/libiconv-20130504-gnulib.patch
+++ b/packages/devel/libiconv/patches/libiconv-20130504-gnulib.patch
--- a/packages/devel/popt/build
+++ b/packages/devel/popt/build
@ -1,36 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2013 Dag Wieers (dag@wieers.com)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --exec-prefix=/usr \
-            --sysconfdir=/etc \
-            --datadir=/usr/share \
-            --disable-shared \
-            --enable-static \
-
-make
-$MAKEINSTALL
--- a/packages/devel/popt/meta
+++ b/packages/devel/popt/meta
@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2023 Dag Wieers (dag@wieers.com)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="popt"
-PKG_VERSION="1.16"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="LGPL"
-PKG_SITE="http://www.rpm5.org/"
-PKG_URL="http://rpm5.org/files/popt/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="devel"
-PKG_SHORTDESC="popt: library for parsing command line parameters"
-PKG_LONGDESC="Popt is a C library for parsing command line parameters. Popt was heavily influenced by the getopt() and getopt_long() functions, but it improves on them by allowing more powerful argument expansion.  Popt can parse arbitrary argv[] style arrays and automatically set variables based on command line arguments. Popt allows command line arguments to be aliased via configuration files and includes utility functions for parsing arbitrary strings into argv[] arrays using shell-like rules."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="yes"
--- a/packages/devel/popt/patches/popt-automake-1.12.patch
+++ b/packages/devel/popt/patches/popt-automake-1.12.patch
@ -1,11 +0,0 @@
-diff -Naur popt-1.16/configure.ac popt-1.16.patch/configure.ac
--- popt-1.16/configure.ac	2010-05-04 22:55:54.000000000 +0200
-+++ popt-1.16.patch/configure.ac	2013-03-05 13:20:28.769315267 +0100
-@@ -46,7 +46,6 @@
- AC_SYS_LARGEFILE
- 
- AC_ISC_POSIX
-AM_C_PROTOTYPES
- 
- AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
- 
--- a/packages/devel/popt/patches/popt-automake-1.13.patch
+++ b/packages/devel/popt/patches/popt-automake-1.13.patch
@ -1,15 +0,0 @@
-diff -Naur popt-1.16/Makefile.am popt-1.16.patch/Makefile.am
--- popt-1.16/Makefile.am	2010-05-04 22:55:54.000000000 +0200
-+++ popt-1.16.patch/Makefile.am	2013-03-05 13:27:22.179156704 +0100
-@@ -34,11 +34,6 @@
- 
- noinst_SCRIPTS = testit.sh
- 
-TESTS_ENVIRONMENT = \
-test1="$(top_builddir)/test1"
-
-TESTS = $(top_srcdir)/testit.sh
-
- include_HEADERS = popt.h
- 
- usrlibdir = $(libdir)
--- 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
--- 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"
--- 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"
--- 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
--- 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."
--- 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"
--- 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 \
--- 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"
--- 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 \
--- 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"
--- 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 \
--- 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"
--- 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"