diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
new file mode 100644
index 0000000..ea15c6a
--- /dev/null
+++ b/media-tv/tvheadend/Manifest
@@ -0,0 +1,7 @@
+AUX tvheadend.confd 355 SHA256 1dd2bed597ccb84e59beae0ec130287f31a4cc2c2e974708462f08d8885b2e5e SHA512 64ae0cca1e1b46a3ecb2fb4a4ba69ad1dd6a72ce57944b44be28768d293f9cca2ab29067335023f384433e8c75d976fbc4610ca574c930b9891a2f1c75ff4c0b WHIRLPOOL 156a098daf40f42098e3c6862ef307784a882a7e80e269525d702fd17a458b479911c41a3017621cf55cbd96d281fad0de1e6e59b6bb0f0d729cf94d2384343a
+AUX tvheadend.initd 375 SHA256 696dee0e0959cd2358b5250f89a9faf8db95172e55658ec8827e7d4999d0114e SHA512 df6b66aef890f18f3fb21900b7015e2bd4f4d876fd68a04198a9424aca0d61dea5febf503609e90d0cc1e8a4fdf139cabcb5b0ab0064423aeb7c366e3607e392 WHIRLPOOL 1dc4bd1bcacc01ff6e72cc01f7305c86dffccecfe189345ab99045521e39ff09af75a39dec702033179a113d3785db5431e706a31684f9a37c2ac47475abe575
+AUX tvheadend.service 304 SHA256 e4ed1f5a50620773cbffff9a22d6ea06311965a6ce139eb8d9f67df10986aecd SHA512 96c61ef4082ecf77ca17a377de3698ae2a47c29519e02676a28d1d2813d5f43dfc3b29d8b91a126a7b8da5f38a8dc2cf13044dba285e22235e7782053041207f WHIRLPOOL 704fb969e5d954330e12c1d4cafa588738cfac4c65d2a234cb8d9a46180a9e33ead0532d94d94fce4efaac566859ec21e4d6f548c56b42a89b7a4f82733a5b53
+DIST dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 123415 SHA256 83ed1b669009ef325e5d9ccb897e48b31e15e71e81bff442b3d0bbd650131c77 SHA512 aedf0429c2ec0a4692e19c0b4ae1e8c063a5a0fb8695359aa8f716a7f40fd88435ed8b1d2aec2461de3f49b533d6cd012c2a54d06058a5291781da4adf82d609 WHIRLPOOL afaef58cdf2ce1ca03c0a695dbf13192b544e3c5a0012cc70a55834d0b1034d509174684fd0fe3f2111becbe32aac16cad5d467adc278a4b6b16c7dbd384757f
+DIST tvheadend-4.0.9.tar.gz 15825419 SHA256 cea1106f45e286e8c25e6b2f0a581c28bd85e93ce3801ecaac7041568a214977 SHA512 ba8c6edcef126c6a260a9251b0948747074061c8f16fb20f03b250c6698645172c9396530b7fa44bf9cf4d8305fcece08c672c812ba6c48211edfbb2691fb58e WHIRLPOOL c0db6afa8d16201eab5fb188f81d062f84066037395f7e47e496d377e8207e2ffef021a58e07cba4af1217963fb2541b1822681fd33799113858329e9ff287bf
+EBUILD tvheadend-4.0.9.ebuild 3018 SHA256 07e8065248df131400eaae08cafbe3be52aff573cdbc81dad6c22ae580e96260 SHA512 6bd85e53da1070fcde826c2f11626372a2dddce9b3b501cae64efb84342384d56fa2718a609c769d2fe8fd795090c68eb183f94ed246f7bb7cf201117cca1bb7 WHIRLPOOL 950e20231acdfc69343fd395ee6b9e0a0e04cd4d30a8b536bdc1478f88dad97cddd0091ce9665d323950ee34c4dd140eb912e3b3f585e537dded59850d91e988
+MISC metadata.xml 1080 SHA256 e4eba5c862151ba15339d82a5722e402fd879d7d2517bf16ce4b0100d7963e53 SHA512 c73fe203e28350af2dc3d88fa9a8d4179d3171e4e07f24b7928abe4a4f95eca0c092b6eb2a0534e4b13045722da02cb691fe009669b683238978f14d5bf6e591 WHIRLPOOL 6dcfc45c179b926fa1d1629dc36df14736b793b72503aacae72507924ca086d930c464f455378ba2e5da76dac4d4af16169eaaba9ca21e1115ce6d58aa273bcc
diff --git a/media-tv/tvheadend/files/tvheadend.confd b/media-tv/tvheadend/files/tvheadend.confd
new file mode 100644
index 0000000..8be4a5d
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend.confd
@@ -0,0 +1,14 @@
+# /etc/conf.d/tvheadend: config file for /etc/init.d/tvheadend
+# See the tvheadend(1) manpage for more info.
+
+# Run Tvheadend as this user.
+TVHEADEND_USER="tvheadend"
+
+# Run Tvheadend as this group.
+TVHEADEND_GROUP="video"
+
+# Path to Tvheadend config.
+TVHEADEND_CONFIG="/etc/tvheadend"
+
+# Other options you want to pass to Tvheadend.
+TVHEADEND_OPTIONS=""
diff --git a/media-tv/tvheadend/files/tvheadend.initd b/media-tv/tvheadend/files/tvheadend.initd
new file mode 100644
index 0000000..58ded5e
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend.initd
@@ -0,0 +1,19 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting Tvheadend"
+	start-stop-daemon --start --quiet --exec /usr/bin/tvheadend \
+		-- -f -C -u ${TVHEADEND_USER} -g ${TVHEADEND_GROUP} \
+		-c ${TVHEADEND_CONFIG} ${TVHEADEND_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Tvheadend"
+	start-stop-daemon --stop --quiet --pidfile /var/run/tvheadend.pid
+	eend $?
+}
diff --git a/media-tv/tvheadend/files/tvheadend.service b/media-tv/tvheadend/files/tvheadend.service
new file mode 100644
index 0000000..227faff
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=tvheadend
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/tvheadend.pid
+ExecStart=/usr/bin/tvheadend -f -p /run/tvheadend.pid -C -c /etc/tvheadend -u tvheadend -g video
+ExecStop=/usr/bin/rm /run/tvheadend.pid
+Restart=always
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
new file mode 100644
index 0000000..9d99f12
--- /dev/null
+++ b/media-tv/tvheadend/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>wraeth@gentoo.org</email>
+		<name>Sam Jorna</name>
+	</maintainer>
+	<use>
+		<flag name="capmt">Enable support for capmt (dvbapi) protocol</flag>
+		<flag name="constcw">Enable support for the constcw protocol</flag>
+		<flag name="cwc">Enable support for the cwc (newcamd) protocol</flag>
+		<flag name="hdhomerun">Enable support for the HDHomeRun device</flag>
+		<flag name="iptv">Enable support for Internet Protocol TV</flag>
+		<flag name="satip">Enable support for IP-based Satellite TV</flag>
+		<flag name="timeshift">Enable TimeShift support</flag>
+		<flag name="xmltv">Use <pkg>media-tv/xmltv</pkg></flag>
+		<flag name="dvbscan">Use <pkg>media-tv/linuxtv-dvb-apps</pkg></flag>
+		<flag name="imagecache">Enable support for image caching</flag>
+		<flag name="uriparser">Use <pkg>dev-libs/uriparser</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">tvheadend/tvheadend</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-tv/tvheadend/tvheadend-4.0.9.ebuild b/media-tv/tvheadend/tvheadend-4.0.9.ebuild
new file mode 100644
index 0000000..88ebb51
--- /dev/null
+++ b/media-tv/tvheadend/tvheadend-4.0.9.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils linux-info systemd toolchain-funcs user
+
+DTV_SCAN_TABLES_VERSION="2015-02-08-f2053b3"
+
+DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
+HOMEPAGE="https://tvheadend.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		dvbscan? ( http://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2 )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
+
+# does not build with ffmpeg-3 - bug 574990
+# https://tvheadend.org/issues/3597
+RDEPEND="dev-libs/openssl:=
+	virtual/libiconv
+	avahi? ( net-dns/avahi )
+	dbus? ( sys-apps/dbus )
+	ffmpeg? (
+		!libav? (
+			media-video/ffmpeg:0=
+			<media-video/ffmpeg-3
+		)
+		libav? ( media-video/libav:= )
+	)
+	hdhomerun? ( media-libs/libhdhomerun )
+	uriparser? ( dev-libs/uriparser )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	dvb? ( virtual/linuxtv-dvb-headers )
+	capmt? ( virtual/linuxtv-dvb-headers )
+	virtual/pkgconfig"
+
+RDEPEND+="
+	xmltv? ( media-tv/xmltv )"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+DOCS=( README.md )
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+
+	if use dvbscan; then
+		mkdir "${S}/data/dvb-scan" || die
+		cd "${T}" || die
+		unpack dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2
+		rmdir "${S}/data/dvb-scan" || die
+		mv "${T}/usr/share/dvb" "${S}/data/dvb-scan" || die
+
+		# This is needed to prevent make from removing files
+		touch "${S}/data/dvb-scan/.stamp" || die
+	fi
+}
+
+pkg_setup() {
+	enewuser tvheadend -1 -1 /dev/null video
+}
+
+src_prepare() {
+	# remove '-Werror' wrt bug #438424
+	sed -e 's:-Werror::' -i Makefile || die 'sed failed!'
+}
+
+src_configure() {
+	econf --prefix="${EPREFIX}"/usr \
+		--datadir="${EPREFIX}"/usr/share \
+		--disable-ccache \
+		$(use_enable avahi) \
+		$(use_enable capmt) \
+		$(use_enable constcw) \
+		$(use_enable cwc) \
+		$(use_enable dbus) \
+		$(use_enable dvb linuxdvb) \
+		$(use_enable dvbscan) \
+		$(use_enable ffmpeg libav) \
+		$(use_enable hdhomerun hdhomerun_client) \
+		$(use_enable imagecache) \
+		$(use_enable inotify) \
+		$(use_enable iptv) \
+		$(use_enable satip satip_server) \
+		$(use_enable satip satip_client) \
+		$(use_enable timeshift) \
+		$(use_enable uriparser) \
+		$(use_enable zlib)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/tvheadend.initd" tvheadend
+	newconfd "${FILESDIR}/tvheadend.confd" tvheadend
+
+	systemd_dounit "${FILESDIR}/tvheadend.service"
+
+	dodir /etc/tvheadend
+	fperms 0700 /etc/tvheadend
+	fowners tvheadend:video /etc/tvheadend
+}
+
+pkg_postinst() {
+	elog "The Tvheadend web interface can be reached at:"
+	elog "http://localhost:9981/"
+	elog
+	elog "Make sure that you change the default username"
+	elog "and password via the Configuration / Access control"
+	elog "tab in the web interface."
+}
diff --git a/net-misc/flexget/ChangeLog b/net-misc/flexget/ChangeLog
index a5ef3aa..5fd4a57 100644
--- a/net-misc/flexget/ChangeLog
+++ b/net-misc/flexget/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/ChangeLog,v 1.23 2012/08/16 03:28:22 floppym Exp $
 
+*flexget-1.0_beta3231 (06 Jan 2013)
+
+  06 Jan 2013; Torsten Kurbad <gentoo@tk-webart.de> -flexget-1.0_beta3181.ebuild,
+  +flexget-1.0_beta3231.ebuild, ChangeLog, manifest:
+  Update to latest beta.
+
 *flexget-1.0_beta3181 (30 Oct 2012)
 
   30 Oct 2012; Torsten Kurbad <gentoo@tk-webart.de> +flexget-1.0_beta3181.ebuild,
diff --git a/net-misc/flexget/Manifest b/net-misc/flexget/Manifest
index ccc6f32..e9676ab 100644
--- a/net-misc/flexget/Manifest
+++ b/net-misc/flexget/Manifest
@@ -1,4 +1,4 @@
-DIST FlexGet-1.0r3181.tar.gz 728696 SHA256 78effc7c9565f82e58f700d9d545053081e3c950c89e687de86a88b9295947ae SHA512 aa1b08f97db4f05110b077251dbda183910cb42a348bdc808a9cca675e4bd6452845198ed55e3cfafd2e9c99dd6a447c9c3768b569b481ae4863a4b3ad763f50 WHIRLPOOL 4ebe0ccd968dfb3fd5f9068ff1a5baca59a80597c6a4b9451fa9c90b0bd00441a8c4eb18ff0e566885d64275caec340473980cdec851be967ad9f5db4831310c
-EBUILD flexget-1.0_beta3181.ebuild 1597 SHA256 80534619948c02dca571f8e1a03997a0b4c657d0a33f368253fa690e3c3070a1 SHA512 6610a7d38d6e013a9f82499ad360f53b1da3f68fb0fa88f83ab61c7aa33c2d5654603e5cbdfe98c2d522c0f5c891491964e73508bedb8c496e7d436242d43074 WHIRLPOOL b5e02d70f2991360a38066bf9d6d2ffb26ecd9013b393290c8d5403e333ef3e70ec66a5daaba91c8407c4c5300c084a35830cddc8b49ea9d6da7650e8135d9bc
-MISC ChangeLog 361 SHA256 0e5903467fb4e1955e56d1dabac5df835f1e655d614a5ca221bd29603a51248f SHA512 b621d2807d58b4788f776cba7407691fff7c437707bade301473eb77ece96556503ca5ea2287781a3a850c654b0ec6c4ca40a1e1d0399ed1e0f2f9694e584bd6 WHIRLPOOL f11e3f6437736892d434cd941cf2244eb4764540b707cc85831ace45688407457829548f0fc72f8427be7dbd1088b2bdca7ed55dbbeb2a0eb09bd0bb934fb46f
+DIST FlexGet-1.0.3231.tar.gz 777975 SHA256 3e2d4afc9f6a8bd22c96f926b6fbf8f1c3b274c3d72cf66f911f2ba49a0f93e1 SHA512 d1b31b9508484bb36d5c5754aac60e3209cf6f70c3207d302d98bc9675029195cf34aa29c75f6b65eaa52e8a14ffe156a83dbb84c5b6272982e13c07d9694769 WHIRLPOOL 659ccd634db52e2b893da5d7845102b7a9305df50b10756619e6b40329520e6117fc5ee222a0852161813c5b7b1b73f6be6bc65bf15fe66816725d7f1bd33e8a
+EBUILD flexget-1.0_beta3231.ebuild 1877 SHA256 5286020e2e993af96721e623b22431f81d8ef0dba321a1b4a2c6f80caa793310 SHA512 bcf76a27d6d316395c7922e8e6f720a4a8c6b51d0db0558f866c3f679eb2952e09681dc5697fd0207e035f71acc1ca47f1ba27337157abe403affaa28f66a89d WHIRLPOOL 4304b7bcfb5ff495d4f33df424295faeb253e089dfe3f151c4553e74d3e4284a20b2e1df21aa291381b99e536106c648c11414d8062dcad914a08d82dcaf16c3
+MISC ChangeLog 559 SHA256 44a477a3f1f9f310327ad2b992bd735b404561251cdce48bb72456e2863f0e4a SHA512 85e73780c6b8c9abfd16f66e9183c9d7a8a2bc06fdd6311d05572b316a3975dafbd29bfe6f872862b0d6d41e79fde99717df2dedac2be5eee76af58a2d387667 WHIRLPOOL 3108b3a39a6871b5e3fccd8865ee079163d507e3a22e29af90b3522d308ae875eaa6418b6d3e5621c90495ca32dd7741cb4353493720630567b684c93e6e1405
 MISC metadata.xml 232 SHA256 8e0308eed9efea18755c3fc2161057faa2b438c4d31895e776d2d5cd5ff109df SHA512 0ec524315be6762228ff54bca53ec039e93672dcef379ef6ef0087656d5e11644aebabcc08663af4f18bdb1b254e71f2b2d3f91277e2867022b93f00d975ae88 WHIRLPOOL bd96dd794e9fdf37bea367be6ada6deb0cf7b98f1978c9e23746f98b1fc2fef931077dd59f6bff7d64856ed284d39f638fb8e0517c61b42f6a0605db09297047
diff --git a/net-misc/flexget/flexget-1.0_beta3181.ebuild b/net-misc/flexget/flexget-1.0_beta3231.ebuild
similarity index 83%
rename from net-misc/flexget/flexget-1.0_beta3181.ebuild
rename to net-misc/flexget/flexget-1.0_beta3231.ebuild
index 734da3a..4ec4029 100644
--- a/net-misc/flexget/flexget-1.0_beta3181.ebuild
+++ b/net-misc/flexget/flexget-1.0_beta3231.ebuild
@@ -12,7 +12,7 @@ DISTUTILS_SRC_TEST="setup.py"
 inherit distutils eutils
 
 if [[ ${PV} != 9999 ]]; then
-	MY_P="FlexGet-${PV/_beta/r}"
+	MY_P="FlexGet-${PV/_beta/.}"
 	SRC_URI="http://download.flexget.com/unstable/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 else
@@ -71,4 +71,10 @@ src_prepare() {
 
 	epatch_user
 	distutils_src_prepare
+
+	local future_imports
+	future_imports=$( grep -r 'from __future__ import unicode_literals, division, absolute_import' \
+				"${S}/${PN}"/ui/ | awk -F ':' '{ print $1; }' )
+	sed -e '/^from __future__ import unicode_literals, division, absolute_import$/d' \
+		-i ${future_imports}
 }
diff --git a/net-p2p/jdownloader/Manifest b/net-p2p/jdownloader/Manifest
index c75f93b..ee1ce08 100644
--- a/net-p2p/jdownloader/Manifest
+++ b/net-p2p/jdownloader/Manifest
@@ -1,2 +1,2 @@
 AUX jdownloader.initd 349 SHA256 1cf85c764d57e8069aec791570767558f36fd76fd725b844e51d225f6864d325 SHA512 72f6036b558a259136a5e7372c4947842393f696184ca0df029ce37bcbda11d2015a7384736fddc8c0fc50627d3ac7d96ef6a7774e58378e9927623050085cda WHIRLPOOL e1a6812a1837d1ebd5f79c42fd619364b656b841c6f96dfe3615d9d9d01b0bbd780e60fd7373c26dc5863bf7a3bcb398c03573fefe5667f47c230aa42f217f98
-EBUILD jdownloader-9999.ebuild 1224 SHA256 7b015d404e52fdea1fc68eaf083f862629cfd59d31f15c804f56b7d41bb1b6d9 SHA512 38b0b45fcce07691935a2cc3c186858ed63ab0a416549ad44e381a680fb262483d9146a018795d229a1f9185f66e398de23e165b32c2370cb83fd22113a2101e WHIRLPOOL 76e3ec665c3fe4db57a1912a132101c0d2b3f84f8f55eeed6ce5a8866a9d33a73fd1746ffa1eb3a4b37e369264ac202f90788162fe9f36546976ab51602e5c49
+EBUILD jdownloader-9999.ebuild 1365 SHA256 27b88881c4ad520fd74d910dc49c34acae46a501a84bea3d3f50d5780597c455 SHA512 3027e47328122425f5c55bd3aff7a01042e0c4ef2c4aa10a6586a4b499f6df38395d8f7f4a5d5951a4cdbddc703158b3ea89fa8b8a79ab8e178f96e6fa6c6d03 WHIRLPOOL a64ec7e8c4a63cf077027dd52a80e3faca60a5d2b1043f40030a3ad15ed127f87da4079d8d56297ec97d3c12fa33757f22cdc272d1542fefe6c2ad61869d6008
diff --git a/net-p2p/jdownloader/jdownloader-9999.ebuild b/net-p2p/jdownloader/jdownloader-9999.ebuild
index 36a248a..d54ebcf 100644
--- a/net-p2p/jdownloader/jdownloader-9999.ebuild
+++ b/net-p2p/jdownloader/jdownloader-9999.ebuild
@@ -28,19 +28,23 @@ DEPEND="dev-java/ant
 RDEPEND=">=virtual/jre-1.5"
 
 EANT_BUILD_XML="build/build.xml"
+EANT_BUILD_TARGET="pack_linux"
 
 src_unpack() {
 	subversion_fetch "${ESVN_REPO_URI}" jdownloader
 	subversion_fetch "${ESVN_REPO_URI_AW_UTILS}" appwork-utils
-	subversion_fetch "${ESVN_REPO_URI_AW_UPDCLIENT}" appwork-updclient
-	subversion_fetch "${ESVN_REPO_URI_JD_BROWSER}" jd-browser
+	mv "${S}"/appworkutils/utils jdownloader/AppWorkUtils
+	#subversion_fetch "${ESVN_REPO_URI_AW_UPDCLIENT}" appwork-updclient
+	#subversion_fetch "${ESVN_REPO_URI_JD_BROWSER}" jd-browser
 }
 
 src_compile() {
-	cd "${S}/appwork-utils"
-	java-pkg-2_src_compile
-	cd "${S}/appwork-updclient"
-	java-pkg-2_src_compile
-	cd "${S}/jd-browser"
+	#cd "${S}/appwork-utils"
+	#java-pkg-2_src_compile
+	#cd "${S}/appwork-updclient"
+	#java-pkg-2_src_compile
+	#cd "${S}/jd-browser"
+	#java-pkg-2_src_compile
+	cd "${S}/jdownloader"
 	java-pkg-2_src_compile
 }