diff --git a/packages/addons/service/tvheadend/changelog.txt b/packages/addons/service/tvheadend/changelog.txt
deleted file mode 100644
index 00d5d5449c..0000000000
--- a/packages/addons/service/tvheadend/changelog.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-8.0.102
-- update tvheadend to 4.0.9-12
-- fixes picons download from Tvh server
-
-8.0.101
-- update tvheadend to 4.0.9-5
-
-8.0.100
-- update for LibreELEC 8.0
-
-7.0.101
-- update tvheadend to 4.0.9-4
-- startup logic fix
-- added proper icon and description
-
-7.0.100
-- initial LibreELEC version
\ No newline at end of file
diff --git a/packages/addons/service/tvheadend/icon/icon.png b/packages/addons/service/tvheadend/icon/icon.png
deleted file mode 100644
index 097b78a9ab..0000000000
Binary files a/packages/addons/service/tvheadend/icon/icon.png and /dev/null differ
diff --git a/packages/addons/service/tvheadend/package.mk b/packages/addons/service/tvheadend/package.mk
deleted file mode 100644
index 87b4592c8f..0000000000
--- a/packages/addons/service/tvheadend/package.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC 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 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC 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. If not, see .
-################################################################################
-
-PKG_NAME="tvheadend"
-PKG_VERSION="e5400e2"
-PKG_VERSION_NUMBER="4.0.9"
-PKG_REV="102"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.tvheadend.org"
-PKG_URL="https://github.com/tvheadend/tvheadend/archive/$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain curl libdvbcsa libiconv libressl Python:host"
-PKG_SECTION="service.multimedia"
-PKG_SHORTDESC="Tvheadend: a TV streaming server for Linux"
-PKG_LONGDESC="Tvheadend ($PKG_VERSION_NUMBER): is a TV streaming server for Linux supporting DVB-S/S2, DVB-C, DVB-T/T2, IPTV, SAT>IP and ATSC"
-PKG_AUTORECONF="no"
-
-PKG_IS_ADDON="yes"
-PKG_ADDON_NAME="Tvheadend 4.0"
-PKG_ADDON_TYPE="xbmc.service"
-
-PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
- --arch=$TARGET_ARCH \
- --cpu=$TARGET_CPU \
- --cc=$CC \
- --enable-hdhomerun_client \
- --enable-hdhomerun_static \
- --disable-avahi \
- --disable-libav \
- --enable-inotify \
- --enable-epoll \
- --disable-uriparser \
- --enable-tvhcsa \
- --enable-bundle \
- --enable-dvbcsa \
- --disable-dbus_1 \
- --python=$TOOLCHAIN/bin/python"
-
-post_unpack() {
- sed -e 's/VER="0.0.0~unknown"/VER="'$PKG_VERSION_NUMBER' ~ LibreELEC Tvh-addon v'$PKG_ADDON_REPOVERSION'.'$PKG_REV'"/g' -i $PKG_BUILD/support/version
-}
-
-pre_configure_target() {
-# fails to build in subdirs
- cd $PKG_BUILD
- rm -rf .$TARGET_NAME
-
- export CROSS_COMPILE=$TARGET_PREFIX
- export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/iconv -L$SYSROOT_PREFIX/usr/lib/iconv"
-}
-
-post_make_target() {
- $CC -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o capmt_ca.so src/extra/capmt_ca.c -ldl
-}
-
-makeinstall_target() {
- : # nothing to do here
-}
-
-addon() {
- mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
- cp -P $PKG_BUILD/build.linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin
- cp -P $PKG_BUILD/capmt_ca.so $ADDON_BUILD/$PKG_ADDON_ID/bin
-}
diff --git a/packages/addons/service/tvheadend/source/bin/tv_grab_file b/packages/addons/service/tvheadend/source/bin/tv_grab_file
deleted file mode 100755
index 027ee869cd..0000000000
--- a/packages/addons/service/tvheadend/source/bin/tv_grab_file
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC 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 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC 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. If not, see .
-################################################################################
-
-if [ $# -lt 1 ]
-then
- . /etc/profile
-
- ADDON_HOME="$HOME/.kodi/userdata/addon_data/service.multimedia.tvheadend"
- ADDON_SETTINGS="$ADDON_HOME/settings.xml"
- XMLTV_TYPE=`grep XMLTV_TYPE $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
- XMLTV_LOCATION_FILE=`grep XMLTV_LOCATION_FILE $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
- XMLTV_LOCATION_WEB=`grep XMLTV_LOCATION_WEB $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
- XMLTV_LOCATION_SCRIPT=`grep XMLTV_LOCATION_SCRIPT $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
-
- if [ "$XMLTV_TYPE" = "FILE" ]; then
- cat "$XMLTV_LOCATION_FILE"
- exit 0
- elif [ "$XMLTV_TYPE" = "SCRIPT" ]; then
- if [ -e "$XMLTV_LOCATION_SCRIPT" ] ; then
- exec "$XMLTV_LOCATION_SCRIPT"
- fi
- elif [ "$XMLTV_TYPE" = "WEB" ]; then
- wget -qO - "$XMLTV_LOCATION_WEB"
- exit 0
- fi
-fi
-
-dflag=
-vflag=
-cflag=
-
-for a in "$@"
-do
-[ "$a" = "-d" -o "$a" = "--description" ] && dflag=1
-[ "$a" = "-v" -o "$a" = "--version" ] && vflag=1
-[ "$a" = "-c" -o "$a" = "--capabilities" ] && cflag=1
-done
-
-if [ -n "$dflag" ]
-then
-echo "tv_grab_file is a simple grabber that can be configured through the addon settings from Kodi"
-fi
-
-if [ -n "$vflag" ]
-then
-echo "1.0"
-fi
-
-if [ -n "$cflag" ]
-then
-echo "baseline"
-fi
diff --git a/packages/addons/service/tvheadend/source/bin/tvheadend.start b/packages/addons/service/tvheadend/source/bin/tvheadend.start
deleted file mode 100755
index d36fafa07c..0000000000
--- a/packages/addons/service/tvheadend/source/bin/tvheadend.start
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC 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 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC 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. If not, see .
-################################################################################
-
-. /etc/profile
-
-oe_setup_addon service.multimedia.tvheadend
-
-ADDON_SETTINGS="$ADDON_HOME/settings.xml"
-XMLTV_FILE="$ADDON_DIR/bin/tv_grab_file"
-XMLTV_SETTINGS_DIR="$ADDON_HOME/xmltv"
-XMLTV_SETTINGS_FILE="$XMLTV_SETTINGS_DIR/config"
-DVR_SETTINGS_DIR="$ADDON_HOME/dvr"
-DVR_SETTINGS_FILE="$DVR_SETTINGS_DIR/config"
-DVR_DIR="$HOME/recordings"
-TIMESHIFT_SETTINGS_DIR="$ADDON_HOME/timeshift"
-TIMESHIFT_SETTINGS_FILE="$TIMESHIFT_SETTINGS_DIR/config"
-TIMESHIFT_DIR="$ADDON_HOME/cache/timeshift"
-
-chmod a+x $ADDON_DIR/bin/*
-
-if [ "$WORKAROUND_SLEEP" == "true" ] ; then
- sleep $WORKAROUND_SLEEP_TIME
-fi
-
-if [ ! -f "$XMLTV_SETTINGS_FILE" ]; then
- mkdir -p $XMLTV_SETTINGS_DIR
- if [ -f $ADDON_DIR/xmltv-config ]; then
- cp $ADDON_DIR/xmltv-config $XMLTV_SETTINGS_FILE
- fi
-fi
-
-if [ ! -f "$DVR_SETTINGS_FILE" ]; then
- mkdir -p $DVR_DIR
- mkdir -p $DVR_SETTINGS_DIR
- if [ -f $ADDON_DIR/dvr-config ]; then
- cp $ADDON_DIR/dvr-config $DVR_SETTINGS_FILE
- fi
-fi
-
-if [ ! -f "$TIMESHIFT_SETTINGS_FILE" ]; then
- mkdir -p $TIMESHIFT_DIR
- mkdir -p $TIMESHIFT_SETTINGS_DIR
- if [ -f $ADDON_DIR/timeshift-config ]; then
- cp $ADDON_DIR/timeshift-config $TIMESHIFT_SETTINGS_FILE
- fi
-fi
-
-if [ "$DEBUG" = "yes" ]; then
- TVHEADEND_ARG="-B -C -s -u root -g video -c $ADDON_HOME"
-else
- TVHEADEND_ARG="-B -C -u root -g video -c $ADDON_HOME"
-fi
-
-# start userspace DVB driver/addon
-for driver_dvb in $(find /storage/.kodi/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
- driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}')
- logger -t Tvheadend "### Loading userspace DVB driver: $driver_dvb_name ###"
- # use ". " because of variable export
- . $driver_dvb
-done
-
-if [ "$WAIT_FOR_FEINIT" == "true" ] ; then
- while [ true ] ; do
- if [ -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend0 ] ; then
- break
- fi
- sleep 1
- done
-fi
-
-if [ "$PRELOAD_CAPMT_CA" == "true" ] ; then
- logger -t Tvheadend "### Preloading capmt_ca.so library ###"
- LD_PRELOAD="$ADDON_DIR/bin/capmt_ca.so $LD_PRELOAD" exec $ADDON_DIR/bin/tvheadend $TVHEADEND_ARG &>$ADDON_LOG_FILE
-else
- exec $ADDON_DIR/bin/tvheadend $TVHEADEND_ARG &>$ADDON_LOG_FILE
-fi
diff --git a/packages/addons/service/tvheadend/source/default.py b/packages/addons/service/tvheadend/source/default.py
deleted file mode 100644
index 56d184d880..0000000000
--- a/packages/addons/service/tvheadend/source/default.py
+++ /dev/null
@@ -1,17 +0,0 @@
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC 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 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC 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. If not, see .
-################################################################################
diff --git a/packages/addons/service/tvheadend/source/dvr-config b/packages/addons/service/tvheadend/source/dvr-config
deleted file mode 100644
index 26b820aaa4..0000000000
--- a/packages/addons/service/tvheadend/source/dvr-config
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "storage": "/storage/recordings",
- "retention-days": 31,
- "pre-extra-time": 0,
- "post-extra-time": 0,
- "day-dir": 0,
- "channel-dir": 0,
- "channel-in-title": 0,
- "date-in-title": 0,
- "time-in-title": 0,
- "whitespace-in-title": 0,
- "title-dir": 0,
- "episode-in-title": 0,
- "tag-files": 1
-}
diff --git a/packages/addons/service/tvheadend/source/resources/language/English/strings.xml b/packages/addons/service/tvheadend/source/resources/language/English/strings.xml
deleted file mode 100644
index cb11c7d0a0..0000000000
--- a/packages/addons/service/tvheadend/source/resources/language/English/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- XMLTV
- DVB
- XMLTV configuration
- XMLTV source type
- XMLTV File location
- XMLTV Web location
- XMLTV Script location
- DVB Configuration
- Unload DVB mudules before suspend
- Wait for frontend initialization
- Number of adapters to wait for
- Preload capmt_ca.so library
- Delay the start of Tvheadend
- time (s)
-
-
diff --git a/packages/addons/service/tvheadend/source/resources/settings.xml b/packages/addons/service/tvheadend/source/resources/settings.xml
deleted file mode 100644
index 910ac2418f..0000000000
--- a/packages/addons/service/tvheadend/source/resources/settings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/addons/service/tvheadend/source/settings-default.xml b/packages/addons/service/tvheadend/source/settings-default.xml
deleted file mode 100644
index 0f47b8e232..0000000000
--- a/packages/addons/service/tvheadend/source/settings-default.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/addons/service/tvheadend/source/sleep.d/tvheadend.power b/packages/addons/service/tvheadend/source/sleep.d/tvheadend.power
deleted file mode 100755
index 50c83aea18..0000000000
--- a/packages/addons/service/tvheadend/source/sleep.d/tvheadend.power
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC 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 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC 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. If not, see .
-################################################################################
-
-. /etc/profile
-
-oe_setup_addon service.multimedia.tvheadend
-
-SERVICE="service.multimedia.tvheadend"
-
-case "$1" in
- pre)
- if systemctl is-active "$SERVICE" &>/dev/null ; then
- systemctl stop "$SERVICE"
- for module in $REMOVE_MODULES ; do
- rmmod $module
- done
- fi
- ;;
- post)
- if systemctl is-enabled "$SERVICE" &>/dev/null ; then
- for module in $REMOVE_MODULES ; do
- modprobe $module
- done
- systemctl start "$SERVICE"
- fi
- ;;
-esac
diff --git a/packages/addons/service/tvheadend/source/system.d/service.multimedia.tvheadend.service b/packages/addons/service/tvheadend/source/system.d/service.multimedia.tvheadend.service
deleted file mode 100644
index 615d46f01a..0000000000
--- a/packages/addons/service/tvheadend/source/system.d/service.multimedia.tvheadend.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=TVHeadend Service
-After=network-online.service
-Requires=network-online.service
-
-[Service]
-ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.multimedia.tvheadend/bin/tvheadend.start"
-TimeoutStopSec=2
-Restart=always
-RestartSec=2
-StartLimitInterval=0
-
-[Install]
-WantedBy=kodi.target
diff --git a/packages/addons/service/tvheadend/source/timeshift-config b/packages/addons/service/tvheadend/source/timeshift-config
deleted file mode 100644
index ab43e9660c..0000000000
--- a/packages/addons/service/tvheadend/source/timeshift-config
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "enabled": 0,
- "ondemand": 0,
- "path": "/storage/.kodi/userdata/addon_data/service.multimedia.tvheadend/cache/timeshift",
- "unlimited_period": 0,
- "max_period": 3600,
- "unlimited_size": 0,
- "max_size": 1024
-}
diff --git a/packages/addons/service/tvheadend/source/xmltv-config b/packages/addons/service/tvheadend/source/xmltv-config
deleted file mode 100644
index 7da27e36e0..0000000000
--- a/packages/addons/service/tvheadend/source/xmltv-config
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "grabbers": [
- {
- "path": "/storage/.kodi/addons/service.multimedia.tvheadend/bin/tv_grab_file",
- "description": "tv_grag_file is a simple grabber that just read the ~/.xmltv/tv_grab_file.xmltv file",
- "version": "0.1\n",
- "mtime": 1318774706,
- "capabilities": 1
- }
- ],
- "grab-interval": 12,
- "grab-enabled": 1,
- "current-grabber": "/storage/.kodi/addons/service.multimedia.tvheadend/bin/tv_grab_file"
-}