commit: a728d8583db95ba7dbe768bbc2e14dfcfed82709 Author: Sven Wegener <swegener <AT> gentoo <DOT> org> AuthorDate: Sat Jan 23 09:21:52 2016 +0000 Commit: Sven Wegener <swegener <AT> gentoo <DOT> org> CommitDate: Sun Jan 24 23:03:55 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a728d858
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 <swegener <AT> gentoo.org> .../files/4.0.6-use-glibc-version-iconv.patch | 40 ---------------------- media-tv/tvheadend/tvheadend-4.0.6.ebuild | 5 ++- media-tv/tvheadend/tvheadend-9999.ebuild | 1 + 3 files changed, 3 insertions(+), 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 deleted file mode 100644 index 9118786..0000000 --- a/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 984bcbb1acadd2957d7fc79dc4ec72e2e07a3572 Mon Sep 17 00:00:00 2001 -From: Olliver Schinagl <[email protected]> -Date: Sat, 26 Sep 2015 22:36:08 +0200 -Subject: [PATCH] Use glibc version iconv - -Signed-off-by: Olliver Schinagl <[email protected]> ---- - Makefile | 2 +- - configure | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 07d6965..0ec0259 100644 ---- a/Makefile -+++ b/Makefile -@@ -39,7 +39,7 @@ else - LDFLAGS += -ldl -lpthread -lm - endif - ifeq ($(CONFIG_LIBICONV),yes) --LDFLAGS += -liconv -+LDFLAGS += - endif - ifeq ($(PLATFORM), darwin) - LDFLAGS += -framework CoreServices -diff --git a/configure b/configure -index 487456b..a6cce11 100755 ---- a/configure -+++ b/configure -@@ -214,7 +214,7 @@ int test(void) - iconv_t ic = iconv_open("ASCII", "ASCII"); - return 0; - } --' -liconv -+' - - if enabled_or_auto dvben50221; then - check_cc_snippet libdvben50221 ' --- -2.4.6 - diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild index 596042b..5512e71 100644 --- 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 index 495a3d1..184366e 100644 --- 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 )
