media-tv/tvheadend: Remove iconv patch and USE flag

The patch is wrong. The configure check only checks whether we need to link against libiconv for the iconv functions. iconv support is always activated and we need to unconditionally depend on virtual/libiconv. Signed-off-by: Sven Wegener <[email protected]>
johu · Jan 24, 2016 · a728d85 · a728d85
1 parent d17863d
commit a728d85
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 43 deletions.
diff --git a/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch b/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch
diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -17,9 +17,10 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="avahi ccache capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav iconv imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
+IUSE="avahi ccache capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
 
 RDEPEND="dev-libs/openssl:=
+	virtual/libiconv
 	avahi? ( net-dns/avahi )
 	capmt? ( virtual/linuxtv-dvb-headers )
 	ccache? ( dev-util/ccache sys-libs/zlib )
@@ -30,7 +31,6 @@ RDEPEND="dev-libs/openssl:=
 		libav? ( media-video/libav:= )
 	)
 	hdhomerun? ( media-libs/libhdhomerun )
-	iconv? ( virtual/libiconv )
 	imagecache? ( net-misc/curl )
 	uriparser? ( dev-libs/uriparser )
 	zlib? ( sys-libs/zlib )
@@ -65,7 +65,6 @@ pkg_setup() {
 src_prepare() {
 	# remove '-Werror' wrt bug #438424
 	sed -e 's:-Werror::' -i Makefile || die 'sed failed!'
-	epatch "${FILESDIR}/${PV}-use-glibc-version-iconv.patch"
 }
 
 src_configure() {

diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -17,6 +17,7 @@ KEYWORDS=""
 IUSE="avahi ccache +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib"
 
 DEPEND="dev-libs/openssl:0=
+	virtual/libiconv
 	avahi? ( net-dns/avahi )
 	ccache? ( dev-util/ccache )
 	dvb? ( virtual/linuxtv-dvb-headers )