reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /media-tv
147 files changed, 10064 insertions, 0 deletions
diff --git a/media-tv/channeleditor/Manifest b/media-tv/channeleditor/Manifest
new file mode 100644
index 000000000000..b134b0b33bf2
--- /dev/null
+++ b/media-tv/channeleditor/Manifest
@@ -0,0 +1,8 @@
+AUX build-1.9.2.1.xml 1204 SHA256 64603ef0711cf5ddd2c71e8c6bcbb341f53a2e02c8f53b63e9c6baee8fe27fb2 SHA512 70ac356acd71f8846adb063274280285fbec2d693f89918da531e5825b38ed4281d84bbe385ba67f33e9ef5fc7451c370383790accdf11840cea2d1f327d2117 WHIRLPOOL 8f08a5f36b571d09316b55aa8fec3770c14d7330f7a8df8ab1b1f9d4cb59fb5ee7730d962a009ae257165c0a92f8e5a088315b6d5b2dc60a24e559d3acc88bef
+AUX channeleditor-1.9.2.1-messages.properties.patch 18594 SHA256 3759fc5a5f8784593015fcc47ab6466fbb40d7110d3dc9e3eeca32b3186a6d42 SHA512 2a023617e7231f1a140ec92a8ddd2997182de8fa662d728ece01d8a3fede358d2c2bf180e038f094938db2ca3aa6857fae11e9a53885d95a6af520d88ff62347 WHIRLPOOL 39dbd086663a587f3fb9144b943ba64223e4b168d2854e53441e0b363faad395951e3c9e714f522a9b95583c7476e87aab6c94d127f0021f50831f7467fc837a
+AUX channeleditor-1.9.2.1-messages_en.properties.patch 7226 SHA256 60543cc1571a4194fa662ad1a62c88529c977f0c50a0f1d114730d063cd48fef SHA512 8a2c09010ce01f001150a759bb91fdf2bdebf4a6776ada8fc1dfbb4b9000aeb4d5ad0be5bb99ed4b5237c4a070ebbea5ca862585a74f1c64dad5349127f45a97 WHIRLPOOL 8cf527632f7307573cb994540e5ec14d5878eba9e9cc0433e4c06a3060fd95c1d9b8d578e43569c14981b9d38106e634bb13a7178321a9d90788d053df8bfe3a
+DIST channeleditor_1.9.2.1_src.tar.gz 317608 SHA256 590ef8daa83244833136f317fc5599c7d998a186ee4f76c9953e4546605435d8 SHA512 84147868aa8b1aacf4ef31a7665822bc7ccd4f7372aaa040aacd8ee42581db1d67092b6b09cda6e447bae2c058fe4ceaab28f3e2a268a54dc5ac25452e64d7d9 WHIRLPOOL 36d1efd40f8931c6d26c28705a3681264d443a8af4c8fffd9cf302be8437a6bf18090d721217c9e71e447d3e2d0c7d95f445ec9bac9f58f7489344004c6479e0
+EBUILD channeleditor-1.9.2.1-r1.ebuild 1394 SHA256 24cf45f3a94926ae370322876b2a406efb7e4b0168b4dde0be824b64bdde1518 SHA512 f4de7488ef7cee2df4f90c074758b162e8f391509cd0f640166c3a15789af709ba4325973ec69daaad15c99c64366d597e15e85abc91723794a0e47930401fd2 WHIRLPOOL be61dca93ee18a96f3385bc1aa56ca9873546426405cc8a230c605ed8931eec05780bc69ba1287146fbab9abf6191e5883fc6eb18b03331c0caa83b60f59f3c4
+MISC ChangeLog 2600 SHA256 ddf0449b3ba188c7c9be9591d57d5c1e1e5890260f065985a38b83b11fcc8727 SHA512 9696fc6d4b10d711a98b1fc189e5b754a58b0e36c52f713a6db01f0407d20b37cbd7c7adee5b83e4b85424d6b6f75ad7597892a142c9f96d2f6894a4bbcf2759 WHIRLPOOL 60b0167e84f5a3af8e70290ad3e89ed8e52d7d290fb7b3502f9f7e5bf92c788260156e22984648ff172b7b80b767e89419f66711a5eab5ef14892b370d8d9bf4
+MISC ChangeLog-2015 2129 SHA256 6dc4a42b860ccefa67b28f9fbb3c724d8eae6ac97cf997694defed27371456c3 SHA512 e6cfb0b92a95284160406e271a62c12dba1182746d32a67bf3e2407ac3555ac508416bbb1cc03d8fc0ab401fb70ae067e179b1e7a99ebfafdef9b863aa1c12c6 WHIRLPOOL 28a62c624ae6ffab4de92a6f4b240c289f9a0d3da874b52463529644666b2475e11b975676d5bfdbc0970a7823f3f81cb68baf4a787be7b9ec274941d4413264
+MISC metadata.xml 332 SHA256 209efc6d185b9cbae74359720b99679265f6d9163d802c7a8b00fa74d14c80eb SHA512 69d8f78543a8a036dbb365e8cd89755265e8be29085c4f68de21b833325163ef17ec16927d0a3a3f414daf54dd123e6f654d82b7d354af59ce5665c5cf65ec6e WHIRLPOOL a651d0a4530bb5a63df6c2c6419510baabe1633bdf3d6d2d3a5a4db1142b209e619397463bdf1bf83624ac84d4beaeb09a02cecc867ac73e64db46480e620ebd
diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r1.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r1.ebuild
new file mode 100644
index 000000000000..b3c5d9fc82b5
--- /dev/null
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE=source
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Editor for VDR channels.conf"
+HOMEPAGE="http://www.renier.de/channeleditor"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=" >=virtual/jdk-1.5"
+
+S="${WORKDIR}/${PN}"
+
+mainclass() {
+	# read Main-Class from MANIFEST.MF
+	sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" \
+	|| die "reading Main-Class failed"
+}
+
+java_prepare() {
+	# move files out of build and remove stuff not needed in the package
+	mv build/* "${S}" || die "cleaning build dir failed"
+	rm -f src/java/org/javalobby/icons/{README,COPYRIGHT} \
+		|| die "removing files failed"
+
+	# copy build.xml
+	cp -f "${FILESDIR}/build-${PV}.xml" build.xml \
+		|| die "copying build.xml failed"
+
+	# convert CRLF to LF
+	edos2unix MANIFEST.MF
+
+	# include localisation changes
+	epatch "${FILESDIR}"/${P}-messages.properties.patch
+	epatch "${FILESDIR}"/${P}-messages_en.properties.patch
+}
+
+src_compile() {
+	eant build -Dmanifest.mainclass=$(mainclass)
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_dolauncher ${PN} --main $(mainclass)
+
+	use source && java-pkg_dosrc src
+
+	make_desktop_entry channeleditor Channeleditor "" "Utility"
+}
diff --git a/media-tv/channeleditor/files/build-1.9.2.1.xml b/media-tv/channeleditor/files/build-1.9.2.1.xml
new file mode 100644
index 000000000000..51e132550077
--- /dev/null
+++ b/media-tv/channeleditor/files/build-1.9.2.1.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<project name="channeleditor" default="build">
+	<!-- some properties -->
+	<property name="src.dir" value="src"/>
+	<property name="resources.dir" value="src/java/"/>
+	<property name="build.dir" value="build"/>
+	<property name="dist.dir" value="dist"/>
+	<property name="project.jar" value="${dist.dir}/${ant.project.name}.jar"/>
+	<property name="target.jdk" value="1.4"/>
+
+	<!-- init -->
+	<target name="init">
+		<mkdir dir="${dist.dir}"/>
+	</target>
+
+	<!-- compile everything -->
+	<target name="compile" depends="init">
+		<javac srcdir="${src.dir}"
+			destdir="${build.dir}"
+			source="${target.jdk}"
+			target="${target.jdk}"
+			encoding="ISO-8859-1"/>
+		<copy todir="${build.dir}">
+			<fileset dir="${resources.dir}" excludes="**/*.java"/>
+		</copy>
+	</target>
+
+	<!-- build the jar files -->
+	<target name="build" depends="compile">
+		<jar jarfile="${project.jar}" basedir="${build.dir}">
+			<manifest>
+				<attribute name="Main-Class" value="${manifest.mainclass}"/>
+			</manifest>
+		</jar>
+	</target>
+
+	<!-- zip the sources -->
+	<target name="sourcezip">
+		<zip destfile="${dist.dir}/${ant.project.name}-src.zip">
+			<zipfileset dir="${src.dir}" />
+		</zip>
+	</target>
+</project>
diff --git a/media-tv/channeleditor/files/channeleditor-1.9.2.1-messages.properties.patch b/media-tv/channeleditor/files/channeleditor-1.9.2.1-messages.properties.patch
new file mode 100644
index 000000000000..9459b004cea7
--- /dev/null
+++ b/media-tv/channeleditor/files/channeleditor-1.9.2.1-messages.properties.patch
@@ -0,0 +1,377 @@
+--- trunk/src/java/de/renier/vdr/channel/editor/messages.properties	2008/06/18 07:43:28	10
++++ trunk/src/java/de/renier/vdr/channel/editor/messages.properties	2008/06/23 07:01:09	12
+@@ -1,187 +1,187 @@
+-ChannelParkingPanel.0=Dient zur Ablage von Kan\u00E4len.
+-ChannelParkingPanel.2=Parkplatz l\u00F6schen
+-ChannelListingPanel.0=Leere Liste
+-ChannelDeletedPanel.0=Liste gel\u00F6schter Kan\u00E4le, Dient zur Wiederherstellung.
+-ChannelDeletedPanel.2=Eintr\u00E4ge in L\u00F6schliste endg\u00FCltig l\u00F6schen
+-ChannelEditor.10=Markierte oder Alle Kan\u00E4le vom Parkplatz zum aktuel markierten Kanal im Baum verschieben
+-ChannelEditor.11=Markierte Kan\u00E4le entfernen
+-ChannelEditor.12=Neuen Kanal anlegen
+-ChannelEditor.13=Neue Rubrik anlegen
+-ChannelEditor.14=Mehrfaches Umbennen der Kanalnamen - Vorranstellen eines Textes
+-ChannelEditor.15=Aktuelle Statistik
+-ChannelEditor.16=\u00FCber diese Anwendung
+-ChannelEditor.17=Parkplatz
+-ChannelEditor.19=L\u00F6schliste
+-ChannelEditor.21=Letze Dateien
+-ChannelEditor.23=Tools
+-ChannelEditor.24=Kanaleditor f\u00FCr VDR
+-ChannelEditor.25=ChannelEditor
+-ChannelPropertyPanel.0=Name:
+-ChannelPropertyPanel.1=Frequenz:
+-ChannelPropertyPanel.2=Quelle:
+-ChannelPropertyPanel.3=Parameter:
+-ChannelPropertyPanel.4=Symbolrate:
+-ChannelPropertyPanel.5=jPanel
+-ChannelPropertyPanel.6=VPID:
+-ChannelPropertyPanel.7=APID:
+-ChannelPropertyPanel.8=TPID:
+-ChannelPropertyPanel.9=SID:
+-ChannelListingPanel.10=Sortieren
+-ChannelPropertyPanel.10=TID:
+-ChannelPropertyPanel.11=CA-ID:
+-ChannelPropertyPanel.12=NID:
+-ChannelPropertyPanel.13=RID:
+-ChannelPropertyPanel.14=
+-ChannelPropertyPanel.15=Bouqet:
+-ChannelPropertyPanel.16=Startnr. (@):
+-ChannelPropertyPanel.17=Alias:
+-ChannelPropertyPanel.18=Kann \u00FCber Menu exportiert werden.
+-ChannelPropertyPanel.19=jPanel1
+-ChannelPropertyPanel.24=\u00C4nderungen \u00FCbernehmen
+-ChannelSearchInputDialog.0=Kanalsuche
+-ChannelSearchInputDialog.1=<html><body>Suchbegriff eingeben (Gesucht wird ein teil innerhalb des ausgew\u00E4hlten Feldes)<br>Die Suche startet vom zuletzt markierten Knoten und findet nur Kan\u00E4le die sich unterhalb dieses Knotens befinden.</body></html>
+-ChannelSearchInputDialog.2=Suchbegriff:
+-ChannelSearchInputDialog.3=<html><body><u>Suche in</u></body></html>
+-ChannelSearchInputDialog.4=Frequenz:
+-ChannelSearchInputDialog.5=Parameter:
+-ChannelSearchInputDialog.6=Quelle:
+-ChannelSearchInputDialog.7=Symbolrate:
+-ChannelSearchInputDialog.8=Pidfelder:
+-ChannelSearchInputDialog.9=Suchparameter
+-ChannelSearchInputDialog.10=Name:
+-ChannelSearchInputDialog.11=Bouqet:
+-ChannelSearchInputDialog.12=Suchen
+-ChannelSearchInputDialog.14=Suchbegriff darf nicht leer sein\!
+-ChannelSearchInputDialog.15=Mindestens ein Suchbereich muss angegeben sein\!
+-ChannelSearchInputDialog.16=Abbrechen
+-PreferencesDialog.0=Lokale Einstellungen
+-PreferencesDialog.1=Speichern
+-PreferencesDialog.3=Abbrechen
+-PreferencesDialog.5=Icon Layout:
+-PreferencesDialog.6=Font gr\u00F6sse (Kan\u00E4le):
+-PreferencesDialog.7=(0 = default)
+-PreferencesDialog.8=Sprache:
+-PreferencesAction.0=Einstellungen
+-CreateChannelDialog.0=Neuen Kanal anlegen
+-CreateChannelDialog.1=<html><body>Bitte geben sie alle notwendigen Kanalinformationen an.<br><u>ACHTUNG</u> \u00E4ltere VDR Versionen k\u00F6nnen keine doppelten Kan\u00E4le in der Liste einlesen\!</body></html>
+-CreateChannelDialog.2=Kanal anlegen
+-CreateChannelDialog.4=Es muss mindestens der Kanalname angegeben werden.
+-CreateChannelDialog.5=Abbrechen
+-CreateChannelAction.0=Neuen Kanal erzeugen
+-CreateCategoryAction.0=Neue Rubrik erzeugen
+-CreateCategoryAction.2=Bitte Name f\u00FCr neu zu erstellende Rubrik eingeben:
+-CreateCategoryAction.3=Neue Rubrik
+-ChannelEditor.0=Nichts selektiert
+-ChannelEditor.1=File
+-ChannelEditor.2=Info
+-ChannelEditor.3=Anwendung beenden
+-ChannelEditor.4=Kanalliste \u00F6ffnen
+-ChannelEditor.5=Aktuelle Kanalliste speichern
+-ChannelEditor.6=Aktuelle Kanalliste speichern unter..
+-ChannelEditor.7=\u00F6ffne Lokale Einstellungen
+-ChannelEditor.8=Kanal suchen
+-ChannelEditor.9=Markierte Kan\u00E4le auf den Parkplatz verschieben
+-ImportAliasAction.0=Alias Importieren
+-ImportAliasAction.2=Es wurden 
+-ImportAliasAction.3=\ alias Eintr\u00E4ge aus dem File '
+-ImportAliasAction.4=' gelesen.\n\n
+-ImportAliasAction.5=\ konnten davon Kan\u00E4len zugeordnet werden.\n
+-ImportAliasAction.6=Das angegebene File:\n\n
+-ImportAliasAction.7=\n\nkonnte nicht ge\u00F6ffnet werden.\n\n\n
+-SortNameAction.0=nach Namen
+-SortTypeAction.0=nach TV
+-SortTypeAction.1=nach TV Verschl\u00FCsselt
+-SortTypeAction.2=nach Radio
+-SortTypeAction.3=nach Radio Verschl\u00FCssellt
+-SortTypeAction.4=nach Service
+-SortTypeAction.5=nach Service Verschl\u00FCssellt
+-SortTypeAction.6=not supported
+-SortBouqetAction.0=nach Bouqet
+-SortFrequenzAction.0=nach Frequenz
+-OpenAction.0=\u00F6ffnen
+-OpenAction.2=\u00C4nderungen wurden nicht gespeichert. Wirklich neues File \u00F6ffnen?
+-OpenAction.3=Info
+-OpenAction.5=Configuration Files
+-OpenAction.6=Das angegebene File:\n\n
+-OpenAction.7=\n\nkonnte nicht ge\u00F6ffnet werden.\n\n\n
+-ParkAction.0=Parken
+-SaveAsAction.0=Speichern unter
+-SaveAsAction.3=Configuration Files
+-SaveAsAction.4=File '
+-SaveAsAction.5=' existiert bereits.\nSoll die Liste trotzdem gespeichert werden (Datei wird \u00FCberschrieben)?
+-SaveAsAction.6=Info
+-SaveAsAction.7=Fehler beim Speichern unter: 
+-SaveAsAction.8=
+-SaveAsAction.9=\nError message: 
+-SaveAction.0=Speichern
+-SaveAction.2=Fehler beim Speichern nach: 
+-SaveAction.3=\nError message: 
+-SaveAction.4=Error
+-SaveAsAction.10=Error
+-StatisticAction.0=Statistik
+-StatisticAction.4=<html><body>
+-StatisticAction.5=<h1>Statistik der Kanalliste</h1>
+-StatisticAction.6=<h3><u>Fileinformationen:</u></h3>
+-StatisticAction.7=<table>
+-StatisticAction.8=<tr><td><font color=green>Geladenes File</font></td><td><font color=blue>
+-StatisticAction.9=</font></td></tr>
+-StatisticAction.10=<tr><td><font color=green>Filepfad</font></td><td><font color=blue>
+-StatisticAction.11=</font></td></tr>
+-StatisticAction.12=<tr><td><font color=green>Filegr\u00F6sse</font></td><td><font color=blue>
+-StatisticAction.13=\ Byte</font></td></tr>
+-StatisticAction.14=</table>
+-StatisticAction.15=<h3><u>Kanalinformationen:</u></h3>
+-StatisticAction.16=<table>
+-StatisticAction.17=<tr><td><font color=green>Anzahl Kan\u00E4le insgesamt</font></td><td><font color=blue>
+-StatisticAction.18=</font></td></tr>
+-StatisticAction.19=<tr><td><font color=green>davon Rubriken</font></td><td><font color=blue>
+-StatisticAction.20=</font></td></tr>
+-StatisticAction.21=<tr><td><font color=green>davon TV</font></td><td><font color=blue>
+-StatisticAction.22=</font></td></tr>
+-StatisticAction.23=<tr><td><font color=green>davon Radio</font></td><td><font color=blue>
+-StatisticAction.24=</font></td></tr>
+-StatisticAction.25=<tr><td><font color=green>davon Service</font></td><td><font color=blue>
+-StatisticAction.26=</font></td></tr>
+-StatisticAction.27=<tr><td><font color=green>Neue Filegr\u00F6sse</font></td><td><font color=blue>
+-StatisticAction.28=\ Byte</font></td></tr>
+-StatisticAction.29=</table>
+-StatisticAction.30=</body></html>
+-StatisticAction.31=Statistik
+-UnparkAction.0=Entparken
+-ExportAliasAction.0=Alias Exportieren
+-ExportAliasAction.2=File '
+-ExportAliasAction.3=' existiert bereits.\nSoll die Aliasliste trotzdem gespeichert werden (Datei wird \u00FCberschrieben)?
+-ExportAliasAction.4=Info
+-ExportAliasAction.6=Es wurden 
+-ExportAliasAction.7=\ Alias Eintr\u00E4ge gespeichert.
+-ExportAliasAction.8=Fehler beim Speichern unter: 
+-ExportAliasAction.10=\nError message: 
+-ExportAliasAction.11=Error
+-DeleteChannelAction.0=Entfernen
+-CloseAction.0=Beenden
+-CloseAction.2=Ihr Parkplatz ist noch gef\u00FCllt\nDiese Inhalte gehen nach dem beenden verloren.\n\nMit dem beenden Vortfahren?
+-CloseAction.3=Info
+-CloseAction.4=\u00C4nderungen wurden nicht gespeichert. Wirklich beenden?
+-CloseAction.5=Info
+-SearchAction.0=Suchen
+-SearchAction.2=Es konnte kein Kanal gefunden werden\!\nSuchbegriff: 
+-SearchAction.3=Suchergebnis
+-AboutAction.0=\u00DCber
+-AboutAction.2=<html><body>
+-AboutAction.3=<h1>Kanaleditor f\u00FCr VDR Version 1.9.2.1</h1>
+-AboutAction.4=<p>Editor f\u00FCr die VDR Channel Files.<br>
+-AboutAction.5=F\u00FCr Datenverlust oder Besch\u00E4digung wird keinerlei Haftung \u00FCbernommen</p><br>
+-AboutAction.6=<hr>
+-AboutAction.7=<p>Copyright(C) 2007 by Renier Roth</p>
+-AboutAction.8=<p>Released under the terms of the GNU General Public License version 2 or later.</p>
+-AboutAction.11=<br><p><font size=-2>Icons  Copyright(C) 1998  by  Dean S. Jones dean@gallant.com www.gallant.com/icons.htm</font></p>
+-AboutAction.12=</body></html>
+-AboutAction.13=About
+-MultiRenameAction.0=Kanalnamen umbenennen
+-MultiRenameAction.2=Funktion zum vorranstellen eines Textes\nzu jedem Kanalnahmen innerhalb der zuletzt markierten Rubrik\n\nWird vom Hauptknoten ausgegangen werden alle Kan\u00E4le umbenannt.\n\nBitte Text eingeben, der vor dem Kanalnamen gestellt werden soll:
+-MultiRenameAction.3=Mehrfach Umbenennung
+-LocalProperties.5=Lokale Einstellungen
+-LocalProperties.6=Lokale einstellungen konnten nicht geladen werden\!
+-LocalProperties.10=ChannelEditor Property File
+-LocalProperties.11=Lokale Einstellungen
+-LocalProperties.12=Lokale Einstellungen k\u00F6nnen nicht gespeichert werden\!
++ChannelParkingPanel.0=Dient zur Ablage von Kan\u00E4len.
++ChannelParkingPanel.2=Parkplatz l\u00F6schen
++ChannelListingPanel.0=Leere Liste
++ChannelDeletedPanel.0=Liste gel\u00F6schter Kan\u00E4le. Dient zur Wiederherstellung.
++ChannelDeletedPanel.2=Eintr\u00E4ge in L\u00F6schliste endg\u00FCltig l\u00F6schen
++ChannelEditor.10=Markierte oder Alle Kan\u00E4le vom Parkplatz zum aktuell markierten Kanal im Baum verschieben
++ChannelEditor.11=Markierte Kan\u00E4le entfernen
++ChannelEditor.12=Neuen Kanal anlegen
++ChannelEditor.13=Neue Rubrik anlegen
++ChannelEditor.14=Mehrfaches Umbenennen der Kanalnamen - Vorranstellen eines Textes
++ChannelEditor.15=Aktuelle Statistik
++ChannelEditor.16=\u00DCber diese Anwendung
++ChannelEditor.17=Parkplatz
++ChannelEditor.19=L\u00F6schliste
++ChannelEditor.21=Letzte Dateien
++ChannelEditor.23=Werkzeuge
++ChannelEditor.24=Kanaleditor f\u00FCr VDR
++ChannelEditor.25=ChannelEditor
++ChannelPropertyPanel.0=Name:
++ChannelPropertyPanel.1=Frequenz:
++ChannelPropertyPanel.2=Quelle:
++ChannelPropertyPanel.3=Parameter:
++ChannelPropertyPanel.4=Symbolrate:
++ChannelPropertyPanel.5=jPanel
++ChannelPropertyPanel.6=VPID:
++ChannelPropertyPanel.7=APID:
++ChannelPropertyPanel.8=TPID:
++ChannelPropertyPanel.9=SID:
++ChannelListingPanel.10=Sortieren
++ChannelPropertyPanel.10=TID:
++ChannelPropertyPanel.11=CA-ID:
++ChannelPropertyPanel.12=NID:
++ChannelPropertyPanel.13=RID:
++ChannelPropertyPanel.14=
++ChannelPropertyPanel.15=Bouquet:
++ChannelPropertyPanel.16=Startnr. (@):
++ChannelPropertyPanel.17=Alias:
++ChannelPropertyPanel.18=Kann \u00FCber Menu exportiert werden.
++ChannelPropertyPanel.19=jPanel1
++ChannelPropertyPanel.24=\u00C4nderungen \u00FCbernehmen
++ChannelSearchInputDialog.0=Kanalsuche
++ChannelSearchInputDialog.1=<html><body>Suchbegriff eingeben (Gesucht wird ein Teil innerhalb des ausgew\u00E4hlten Feldes)<br>Die Suche startet vom zuletzt markierten Knoten und findet nur Kan\u00E4le die sich unterhalb dieses Knotens befinden.</body></html>
++ChannelSearchInputDialog.2=Suchbegriff:
++ChannelSearchInputDialog.3=<html><body><u>Suche in</u></body></html>
++ChannelSearchInputDialog.4=Frequenz:
++ChannelSearchInputDialog.5=Parameter:
++ChannelSearchInputDialog.6=Quelle:
++ChannelSearchInputDialog.7=Symbolrate:
++ChannelSearchInputDialog.8=Pidfelder:
++ChannelSearchInputDialog.9=Suchparameter
++ChannelSearchInputDialog.10=Name:
++ChannelSearchInputDialog.11=Bouquet:
++ChannelSearchInputDialog.12=Suchen
++ChannelSearchInputDialog.14=Suchbegriff darf nicht leer sein\!
++ChannelSearchInputDialog.15=Mindestens ein Suchbereich muss angegeben sein\!
++ChannelSearchInputDialog.16=Abbrechen
++PreferencesDialog.0=Lokale Einstellungen
++PreferencesDialog.1=Speichern
++PreferencesDialog.3=Abbrechen
++PreferencesDialog.5=Icon Layout:
++PreferencesDialog.6=Fontgr\u00F6sse (Kan\u00E4le):
++PreferencesDialog.7=(0 = default)
++PreferencesDialog.8=Sprache:
++PreferencesAction.0=Einstellungen
++CreateChannelDialog.0=Neuen Kanal anlegen
++CreateChannelDialog.1=<html><body>Bitte geben sie alle notwendigen Kanalinformationen an.<br><u>ACHTUNG</u> \u00E4ltere VDR Versionen k\u00F6nnen keine doppelten Kan\u00E4le einlesen\!</body></html>
++CreateChannelDialog.2=Kanal anlegen
++CreateChannelDialog.4=Es muss mindestens der Kanalname angegeben werden.
++CreateChannelDialog.5=Abbrechen
++CreateChannelAction.0=Neuen Kanal erzeugen
++CreateCategoryAction.0=Neue Rubrik erzeugen
++CreateCategoryAction.2=Bitte den Name f\u00FCr die neue Rubrik eingeben:
++CreateCategoryAction.3=Neue Rubrik
++ChannelEditor.0=Nichts selektiert
++ChannelEditor.1=Datei
++ChannelEditor.2=Info
++ChannelEditor.3=Anwendung beenden
++ChannelEditor.4=Kanalliste \u00F6ffnen
++ChannelEditor.5=Aktuelle Kanalliste speichern
++ChannelEditor.6=Aktuelle Kanalliste speichern unter..
++ChannelEditor.7=\u00D6ffne Lokale Einstellungen
++ChannelEditor.8=Kanal suchen
++ChannelEditor.9=Markierte Kan\u00E4le auf den Parkplatz verschieben
++ImportAliasAction.0=Alias Importieren
++ImportAliasAction.2=Es wurden 
++ImportAliasAction.3=\ alias Eintr\u00E4ge aus dem File '
++ImportAliasAction.4=' gelesen.\n\n
++ImportAliasAction.5=\ konnten davon Kan\u00E4len zugeordnet werden.\n
++ImportAliasAction.6=Das angegebene File:\n\n
++ImportAliasAction.7=\n\nkonnte nicht ge\u00F6ffnet werden.\n\n\n
++SortNameAction.0=nach Namen
++SortTypeAction.0=nach TV
++SortTypeAction.1=nach TV Verschl\u00FCsselt
++SortTypeAction.2=nach Radio
++SortTypeAction.3=nach Radio Verschl\u00FCssellt
++SortTypeAction.4=nach Service
++SortTypeAction.5=nach Service Verschl\u00FCssellt
++SortTypeAction.6=not supported
++SortBouqetAction.0=nach Bouquet
++SortFrequenzAction.0=nach Frequenz
++OpenAction.0=\u00D6ffnen
++OpenAction.2=\u00C4nderungen wurden nicht gespeichert. Wirklich eine neue Datei \u00F6ffnen?
++OpenAction.3=Info
++OpenAction.5=Kanallisten
++OpenAction.6=Die angegebene Datei:\n\n
++OpenAction.7=\n\nkonnte nicht ge\u00F6ffnet werden.\n\n\n
++ParkAction.0=Parken
++SaveAsAction.0=Speichern unter
++SaveAsAction.3=Kanallisten
++SaveAsAction.4=Die Datei '
++SaveAsAction.5=' existiert bereits.\nSoll die Liste trotzdem gespeichert werden (Datei wird \u00FCberschrieben)?
++SaveAsAction.6=Info
++SaveAsAction.7=Fehler beim Speichern unter: 
++SaveAsAction.8=
++SaveAsAction.9=\nError message: 
++SaveAction.0=Speichern
++SaveAction.2=Fehler beim Speichern nach: 
++SaveAction.3=\nError message: 
++SaveAction.4=Error
++SaveAsAction.10=Error
++StatisticAction.0=Statistik
++StatisticAction.4=<html><body>
++StatisticAction.5=<h1>Statistik der Kanalliste</h1>
++StatisticAction.6=<h3><u>Dateiinformationen:</u></h3>
++StatisticAction.7=<table>
++StatisticAction.8=<tr><td><font color=green>Geladene Datei</font></td><td><font color=blue>
++StatisticAction.9=</font></td></tr>
++StatisticAction.10=<tr><td><font color=green>Dateipfad</font></td><td><font color=blue>
++StatisticAction.11=</font></td></tr>
++StatisticAction.12=<tr><td><font color=green>Dateigr\u00F6sse</font></td><td><font color=blue>
++StatisticAction.13=\ Byte</font></td></tr>
++StatisticAction.14=</table>
++StatisticAction.15=<h3><u>Kanalinformationen:</u></h3>
++StatisticAction.16=<table>
++StatisticAction.17=<tr><td><font color=green>Anzahl Kan\u00E4le</font></td><td><font color=blue>
++StatisticAction.18=</font></td></tr>
++StatisticAction.19=<tr><td><font color=green>davon Rubriken</font></td><td><font color=blue>
++StatisticAction.20=</font></td></tr>
++StatisticAction.21=<tr><td><font color=green>davon TV</font></td><td><font color=blue>
++StatisticAction.22=</font></td></tr>
++StatisticAction.23=<tr><td><font color=green>davon Radio</font></td><td><font color=blue>
++StatisticAction.24=</font></td></tr>
++StatisticAction.25=<tr><td><font color=green>davon Service</font></td><td><font color=blue>
++StatisticAction.26=</font></td></tr>
++StatisticAction.27=<tr><td><font color=green>Neue Dateigr\u00F6sse</font></td><td><font color=blue>
++StatisticAction.28=\ Byte</font></td></tr>
++StatisticAction.29=</table>
++StatisticAction.30=</body></html>
++StatisticAction.31=Statistik
++UnparkAction.0=Entparken
++ExportAliasAction.0=Alias Exportieren
++ExportAliasAction.2=Die Datei '
++ExportAliasAction.3=' existiert bereits.\nSoll die Aliasliste trotzdem gespeichert werden (Datei wird \u00FCberschrieben)?
++ExportAliasAction.4=Info
++ExportAliasAction.6=Es wurden 
++ExportAliasAction.7=\ Alias Eintr\u00E4ge gespeichert.
++ExportAliasAction.8=Fehler beim Speichern unter: 
++ExportAliasAction.10=\nError message: 
++ExportAliasAction.11=Error
++DeleteChannelAction.0=Entfernen
++CloseAction.0=Beenden
++CloseAction.2=Ihr Parkplatz ist noch gef\u00FCllt!\nDiese Inhalte gehen nach dem Beenden verloren.\n\nMit dem Beenden Fortfahren?
++CloseAction.3=Info
++CloseAction.4=\u00C4nderungen wurden nicht gespeichert. Wirklich beenden?
++CloseAction.5=Info
++SearchAction.0=Suchen
++SearchAction.2=Es konnte kein Kanal gefunden werden\!\nSuchbegriff: 
++SearchAction.3=Suchergebnis
++AboutAction.0=\u00DCber
++AboutAction.2=<html><body>
++AboutAction.3=<h1>Kanaleditor f\u00FCr VDR Version 1.9.2.1</h1>
++AboutAction.4=<p>Editor f\u00FCr die VDR Kanalliste.<br>
++AboutAction.5=F\u00FCr Datenverlust oder Besch\u00E4digung wird keinerlei Haftung \u00FCbernommen.</p><br>
++AboutAction.6=<hr>
++AboutAction.7=<p>Copyright(C) 2007 by Renier Roth</p>
++AboutAction.8=<p>Released under the terms of the GNU General Public License version 2 or later.</p>
++AboutAction.11=<br><p><font size=-2>Icons  Copyright(C) 1998  by  Dean S. Jones dean@gallant.com www.gallant.com/icons.htm</font></p>
++AboutAction.12=</body></html>
++AboutAction.13=About
++MultiRenameAction.0=Kanalnamen umbenennen
++MultiRenameAction.2=Funktion zum Vorranstellen eines Textes\nzu jedem Kanalnahmen innerhalb der zuletzt markierten Rubrik.\n\nWird vom Hauptknoten ausgegangen werden alle Kan\u00E4le umbenannt.\n\nBitte Text eingeben, der vor den Kanalnamen gestellt werden soll:
++MultiRenameAction.3=Mehrfachumbenennung
++LocalProperties.5=Lokale Einstellungen
++LocalProperties.6=Lokale Einstellungen konnten nicht geladen werden\!
++LocalProperties.10=ChannelEditor Property File
++LocalProperties.11=Lokale Einstellungen
++LocalProperties.12=Lokale Einstellungen k\u00F6nnen nicht gespeichert werden\!
diff --git a/media-tv/channeleditor/files/channeleditor-1.9.2.1-messages_en.properties.patch b/media-tv/channeleditor/files/channeleditor-1.9.2.1-messages_en.properties.patch
new file mode 100644
index 000000000000..5a01dff9755b
--- /dev/null
+++ b/media-tv/channeleditor/files/channeleditor-1.9.2.1-messages_en.properties.patch
@@ -0,0 +1,160 @@
+--- trunk/src/java/de/renier/vdr/channel/editor/messages_en.properties	2008/06/18 07:43:28	10
++++ trunk/src/java/de/renier/vdr/channel/editor/messages_en.properties	2008/06/23 07:01:09	12
+@@ -4,15 +4,15 @@
+ ChannelDeletedPanel.0=Deleted channels (for recovery)
+ ChannelDeletedPanel.2=Clear removed channels
+ ChannelEditor.10=Move selected or clipboard items to selected tree
+-ChannelEditor.11=Remove selectedMarkierte Kan\u00E4le entfernen
++ChannelEditor.11=Remove selected
+ ChannelEditor.12=Add new channel
+ ChannelEditor.13=Add new category
+ ChannelEditor.14=Multiple channel rename - Add a text in front
+-ChannelEditor.15=Current statistic
++ChannelEditor.15=Current statistics
+ ChannelEditor.16=About
+ ChannelEditor.17=Clipboard
+ ChannelEditor.19=Removed channels
+-ChannelEditor.21=Letze Dateien
++ChannelEditor.21=Recent files
+ ChannelEditor.23=Tools
+ ChannelEditor.24=Channeleditor for VDR
+ ChannelEditor.25=Channeleditor
+@@ -32,10 +32,10 @@
+ ChannelPropertyPanel.12=NID:
+ ChannelPropertyPanel.13=RID:
+ ChannelPropertyPanel.14=
+-ChannelPropertyPanel.15=Bouqet:
+-ChannelPropertyPanel.16=Startnumber. (@):
++ChannelPropertyPanel.15=Bouquet:
++ChannelPropertyPanel.16=Start number. (@):
+ ChannelPropertyPanel.17=Alias:
+-ChannelPropertyPanel.18=can be exported through menu
++ChannelPropertyPanel.18=Can be exported through menu
+ ChannelPropertyPanel.19=jPanel1
+ ChannelPropertyPanel.24=Apply
+ ChannelSearchInputDialog.0=Channel search
+@@ -49,7 +49,7 @@
+ ChannelSearchInputDialog.8=Pidfield:
+ ChannelSearchInputDialog.9=Search parameter:
+ ChannelSearchInputDialog.10=Name:
+-ChannelSearchInputDialog.11=Bouqet:
++ChannelSearchInputDialog.11=Bouquet:
+ ChannelSearchInputDialog.12=Search
+ ChannelSearchInputDialog.14=Search term cannot be empty\!
+ ChannelSearchInputDialog.15=Enter at least one serch term\!
+@@ -63,9 +63,9 @@
+ PreferencesDialog.8=Language:
+ PreferencesAction.0=Settings
+ CreateChannelDialog.0=Add new Channel
+-CreateChannelDialog.1=<html><body>Bitte geben sie alle notwendigen Kanalinformationen an.<br><u>ACHTUNG</u> \u00E4ltere VDR Versionen k\u00F6nnen keine doppelten Kan\u00E4le in der Liste einlesen\!</body></html>
++CreateChannelDialog.1=<html><body>Please enter the complete channel data.<br><u>WARNING</u> older VDR versions are not able to read duplicate channels from the list\!</body></html>
+ CreateChannelDialog.2=Add channel
+-CreateChannelDialog.4=Es muss mindestens der Kanalname angegeben werden.
++CreateChannelDialog.4=Enter at least the channel name.
+ CreateChannelDialog.5=Abort
+ CreateChannelAction.0=Create new channel
+ CreateCategoryAction.0=Create new category
+@@ -88,25 +88,25 @@
+ ImportAliasAction.5=\ entrys could be assigned.\n
+ ImportAliasAction.6=The selected file:\n\n
+ ImportAliasAction.7=\n\ncould not be opened.\n\n\n
+-SortNameAction.0=after Name
+-SortTypeAction.0=after TV
+-SortTypeAction.1=after TV encrypted
+-SortTypeAction.2=after Radio
+-SortTypeAction.3=after Radio encrypted
+-SortTypeAction.4=after Service
+-SortTypeAction.5=after Service encrypted
++SortNameAction.0=by Name
++SortTypeAction.0=by TV
++SortTypeAction.1=by TV encrypted
++SortTypeAction.2=by Radio
++SortTypeAction.3=by Radio encrypted
++SortTypeAction.4=by Service
++SortTypeAction.5=by Service encrypted
+ SortTypeAction.6=not supported
+-SortBouqetAction.0=after Bouqet
+-SortFrequenzAction.0=after Frequency
++SortBouqetAction.0=by Bouquet
++SortFrequenzAction.0=by Frequency
+ OpenAction.0=Open
+ OpenAction.2=Nothing has been saved. Do you really want to open a new file?
+ OpenAction.3=Info
+-OpenAction.5=Configuration Files
++OpenAction.5=Channel lists
+ OpenAction.6=The selected file:\n\n
+ OpenAction.7=\n\ncould not be opened.\n\n\n
+ ParkAction.0=Clipboard
+ SaveAsAction.0=Save as
+-SaveAsAction.3=Configuration Files
++SaveAsAction.3=Channel lists
+ SaveAsAction.4=File '
+ SaveAsAction.5=' already exists.\nSave anyway? (old file will be overwritten)?
+ SaveAsAction.6=Info
+@@ -118,9 +118,9 @@
+ SaveAction.3=\nError message: 
+ SaveAction.4=Error
+ SaveAsAction.10=Error
+-StatisticAction.0=Statistic
++StatisticAction.0=Statistics
+ StatisticAction.4=<html><body>
+-StatisticAction.5=<h1>Statistic</h1>
++StatisticAction.5=<h1>Statistics</h1>
+ StatisticAction.6=<h3><u>File information:</u></h3>
+ StatisticAction.7=<table>
+ StatisticAction.8=<tr><td><font color=green>Loaded file</font></td><td><font color=blue>
+@@ -130,11 +130,11 @@
+ StatisticAction.12=<tr><td><font color=green>Filesize</font></td><td><font color=blue>
+ StatisticAction.13=\ Byte</font></td></tr>
+ StatisticAction.14=</table>
+-StatisticAction.15=<h3><u>Channelinformation:</u></h3>
++StatisticAction.15=<h3><u>Channel information:</u></h3>
+ StatisticAction.16=<table>
+ StatisticAction.17=<tr><td><font color=green>Number of channels</font></td><td><font color=blue>
+ StatisticAction.18=</font></td></tr>
+-StatisticAction.19=<tr><td><font color=green>Categorys</font></td><td><font color=blue>
++StatisticAction.19=<tr><td><font color=green>Categories</font></td><td><font color=blue>
+ StatisticAction.20=</font></td></tr>
+ StatisticAction.21=<tr><td><font color=green>TV</font></td><td><font color=blue>
+ StatisticAction.22=</font></td></tr>
+@@ -146,7 +146,7 @@
+ StatisticAction.28=\ Byte</font></td></tr>
+ StatisticAction.29=</table>
+ StatisticAction.30=</body></html>
+-StatisticAction.31=Statistic
++StatisticAction.31=Statistics
+ UnparkAction.0=Remove
+ ExportAliasAction.0=Export alias
+ ExportAliasAction.2=File '
+@@ -161,15 +161,15 @@
+ CloseAction.0=Quit
+ CloseAction.2=Clipboard not empty. Elements will be lost after quitting. Quit anyway?
+ CloseAction.3=Info
+-CloseAction.4=Changes unsaved. Do you really want to quit?
++CloseAction.4=Changes not saved. Do you really want to quit?
+ CloseAction.5=Info
+ SearchAction.0=Search
+-SearchAction.2=No Channel could be found\!\nSearch term: 
++SearchAction.2=No Channel found\!\nSearch term: 
+ SearchAction.3=Search result
+ AboutAction.0=About
+ AboutAction.2=<html><body>
+ AboutAction.3=<h1>Channeleditor for VDR Version 1.9.2.1</h1>
+-AboutAction.4=<p>Editor for channels.conf File.<br>
++AboutAction.4=<p>Editor for the VDR channels.conf File.<br>
+ AboutAction.5=Use at your own risk!</p><br>
+ AboutAction.6=<hr>
+ AboutAction.7=<p>Copyright(C) 2007 by Renier Roth</p>
+@@ -178,10 +178,10 @@
+ AboutAction.12=</body></html>
+ AboutAction.13=About
+ MultiRenameAction.0=Rename channel
+-MultiRenameAction.2=Function to add a text\nzu in front of each channel name in the last selected category. Each channel name in the last selected category\n\nIf root is selected, every channel will be renamed.\n\nPlease enter the text, which should be added:
++MultiRenameAction.2=Function to add a text\nin front of each channel name in the last selected category.\n\nIf the root knot is selected, every channel will be renamed.\n\nPlease enter the text, which should be added:
+ MultiRenameAction.3=Multiple rename
+ LocalProperties.5=Local settings
+ LocalProperties.6=Unable to load local settings\!
+-LocalProperties.10=Channelrditor property file
++LocalProperties.10=Channeleditor property file
+ LocalProperties.11=Local Settings
+ LocalProperties.12=Unable to save local settings\!
diff --git a/media-tv/channeleditor/metadata.xml b/media-tv/channeleditor/metadata.xml
new file mode 100644
index 000000000000..4cd923f21fcf
--- /dev/null
+++ b/media-tv/channeleditor/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>billie@gentoo.org</email>
+		<name>Daniel Pielmeier</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">channeleditor</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-tv/dvbstream/Manifest b/media-tv/dvbstream/Manifest
new file mode 100644
index 000000000000..88a5c5076de1
--- /dev/null
+++ b/media-tv/dvbstream/Manifest
@@ -0,0 +1,8 @@
+AUX dvbstream-0.7_pre20080302-telnet-port-switch.diff 976 SHA256 3ffa8bea5fd740f4fb8174cf0991d7874960028c36e0701c39843ba989b5adb6 SHA512 84f4cb764db871e1f3d42fdff7e550be2866caf21b725a065abce500a29f8db52087d02ac2446891c1a14f08521deb175362bdc2ffe00d5cb6bc237b31c02781 WHIRLPOOL ba4f301f3abe7f4f5287a3d5c36b82aa40ca47f06acc834195fc6dfdaca1d47597363cfb7120e40634d5b9ea1a397d26ded704bcf47978a1947e4edcbaefefd3
+AUX dvbstream-0.7_pre20080516-update.diff 334 SHA256 12cdcddab3e0efb83205ad98b8e14817a69310d69bdbae39ed083671eb5452b8 SHA512 c22d5e25dc9cad4fe864864b9f4100d6e335236f865f4c8a15b29ce0dd22f1aef77dd9777aeea0529e0cdf0402cc76e55b6140595a8d62231ffa6145f868be92 WHIRLPOOL 873abd93b15a0e8714009f07087f66fd80959f0a7f1015877c52b612dab76cf3774a1d88db001ce55186071382263d7d90e80c2d578b7c15824f55d43d480735
+DIST dvbstream-snapshot-20080302.tar.bz2 58089 SHA256 2c3eb657b794d9366b7f619ae35687b276bcded8629d2372af7251cd7eab7d24 SHA512 7116310435584b61c51f642d38cfdbbdf706df27448af7824b5a050e374ad72d3d08c2eb03de0d5ed6ec1cb15461e3be90ee8bd3b045b6ba858b5896c5546671 WHIRLPOOL 56c835806ef3b4ab177f96843ba6342519d950d75d906592857e4f3c47499f44f2301f4786282545f5d6e671dc1a616536f104f239059a5ab1e103c8c22ce2ea
+EBUILD dvbstream-0.7_pre20080516-r1.ebuild 1514 SHA256 b2fc23a34f4b133ee8f1b27d3d8c28cfd3bce7d91300d24dbe96a1e15b4bedc8 SHA512 fac51cad993fb651bd48eb7409aa16b781282201c92ce76bd72e371d0201ebc4e93441517fa15b83901cc9bcfc8871aa79c06703baa6445d3aae435372e4e6ce WHIRLPOOL 4299da1192d3a12c0142e5c2fb1d20cebf094502ab164b113ba68bcb060aadf755e92c341b65695e1742e1bf75142d09286ba8c75924501fd8463d60e1ee962d
+EBUILD dvbstream-0.7_pre20080516.ebuild 1361 SHA256 244bffc3955c43128bbad8e1e721b2a9913d3cab82e29c7be3620836629eca46 SHA512 3cd5f1752917d7d37636f7ff349c999b7158fccb785ae9ef41373a2fcd7e5d0b9bef2d116539ce36eb8ae3e672d1dfd01cc7998f959db7a0206c2c80d358893a WHIRLPOOL a3b2d47ee2b12d65fdc5152ddc95dbce0f07e3b9daa9efdac1cb58f536a44feeb5834444dfcb1ec92a2f4441ebeded872bd09807df64572300befb9133a49d72
+MISC ChangeLog 3844 SHA256 572ff915f4e014cc939f5a50fdc35c8f539aae1ec7fb4acd31ebce0fb6b190bb SHA512 23f9acbd6793e8caf102e557407eddd9715eecd81168fa97cf8cbd71787251943d89d2997f6e3a631e60337ce37436c64d31490f6afd3ee91493174a9eabcdd4 WHIRLPOOL d68da64862b876883a82c37249f65849af7c423b6064405b8eb327a5d864f61aaad36231abd405766d6db5b112e87bfa9936bbfd3c63317ba109142ef371d836
+MISC ChangeLog-2015 2305 SHA256 3afe231004f21cffc3540b1f0ec5336769352b5086675ec4e6c77ae8ea17606b SHA512 40cbb70c142ff36725e59877797d083d6dc303d0fb49131eb5018c8ddf9249cc2030a552afe09429d24be1abcda620ed55fb428f3f79e74cf0db0e98063ca492 WHIRLPOOL b8fa6968d883e5faa608394bf7172678b382970572c78cc3c952d39eb581d62e332f564587127b59950672c6d46c5c4df93e7656a4621ef5fbd8970dac3ceec8
+MISC metadata.xml 245 SHA256 7c656ee83ab551d755760649b09684fb1f62486aba33e9ae18dabf1ed84519c7 SHA512 d07141fde891b0f88b4f91ea7b4e7da644ad57f74ac7a9f3d43af56c387a9d06e4b995e18756222c77f8ca6d8fc6d83081806b77c19ded68dbc6fb6845af18e5 WHIRLPOOL 32be69e261cd695d74f2e272a1a56074d688d127a8c11fafc4c8da423388855c43999e77c467da74d2448795d84d5063f89ab6093635ef6ad945ce09023fb453
diff --git a/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild b/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild
new file mode 100644
index 000000000000..376728afc3e4
--- /dev/null
+++ b/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="RTP multicast stream server and other tools for DVB cards"
+HOMEPAGE="https://sourceforge.net/projects/dvbtools"
+MY_P="${PN}-snapshot-20080302"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+DEPEND="virtual/linuxtv-dvb-headers"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-update.diff"
+	"${FILESDIR}/${PN}-0.7_pre20080302-telnet-port-switch.diff"
+)
+
+src_prepare() {
+	default
+
+	sed -i Makefile \
+		-e 's:$(CFLAGS):$(CFLAGS) $(CPPFLAGS):' \
+		-e '/CFLAGS.*=.*-g -Wall -O2/s:-g -Wall -O2::' \
+		-e '/CFLAGS.*=/s:CFLAGS:CPPFLAGS:' \
+		-e 's:-I \.\./DVB/include:-I /usr/include:' \
+		-e 's:$(CC):$(CC) $(LDFLAGS):g' \
+		|| die 'failed to fix flags in the Makefile'
+
+	sed -e 's:\./svdrpsend.pl:dvbstream-send.pl:' \
+		-i TELNET/*.sh \
+		|| die 'failed to rename the svdrpsend.pl command in scripts'
+
+	sed -e 's:^DUMPRTP=.*$:DUMPRTP=dumprtp:' \
+		-e 's:^TS2ES=.*$:TS2ES=ts2es:' \
+		-i *.sh \
+		|| die 'failed to set DUMPRTP and TS2ES in scripts'
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin dvbstream dumprtp rtpfeed ts_filter
+	newbin TELNET/svdrpsend.pl dvbstream-send.pl
+
+	dodoc README*
+	newdoc TELNET/README README.telnet
+
+	insinto "/usr/share/doc/${PF}/tune"
+	doins TELNET/*.sh
+
+	insinto "/usr/share/doc/${PF}/multicast"
+	doins *.sh
+}
diff --git a/media-tv/dvbstream/dvbstream-0.7_pre20080516.ebuild b/media-tv/dvbstream/dvbstream-0.7_pre20080516.ebuild
new file mode 100644
index 000000000000..2c784607dcc7
--- /dev/null
+++ b/media-tv/dvbstream/dvbstream-0.7_pre20080516.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+IUSE=""
+
+DESCRIPTION="simple command line tools for DVB cards. Includes a RTP multicast stream server"
+HOMEPAGE="https://sourceforge.net/projects/dvbtools"
+
+#SRC_URI="mirror://sourceforge/dvbtools/${P}.tar.gz"
+#MY_P=${PN}-snapshot-${PV##*_pre}
+MY_P=${PN}-snapshot-20080302
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+
+RDEPEND="dev-lang/perl"
+DEPEND="virtual/linuxtv-dvb-headers"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-update.diff"
+	epatch "${FILESDIR}/${PN}-0.7_pre20080302-telnet-port-switch.diff"
+
+	cd "${S}"
+	sed -i Makefile \
+		-e 's:$(CFLAGS):$(CFLAGS) $(CPPFLAGS):' \
+		-e '/CFLAGS.*=.*-g -Wall -O2/s:-g -Wall -O2::' \
+		-e '/CFLAGS.*=/s:CFLAGS:CPPFLAGS:' \
+		-e 's:-I \.\./DVB/include:-I /usr/include:'
+
+	cp TELNET/svdrpsend.pl dvbstream-send.pl
+	cp TELNET/README README.telnet
+
+	sed -e 's:\./svdrpsend.pl:dvbstream-send.pl:' \
+		-i TELNET/*.sh
+
+	sed -e 's:^DUMPRTP=.*$:DUMPRTP=dumprtp:' \
+		-e 's:^TS2ES=.*$:TS2ES=ts2es:' \
+		-i *.sh
+}
+
+src_install() {
+	dobin dvbstream dumprtp rtpfeed ts_filter dvbstream-send.pl
+
+	dodoc README*
+
+	insinto /usr/share/doc/${PF}/tune
+	doins TELNET/*.sh
+
+	insinto /usr/share/doc/${PF}/multicast
+	doins *.sh
+}
diff --git a/media-tv/dvbstream/files/dvbstream-0.7_pre20080302-telnet-port-switch.diff b/media-tv/dvbstream/files/dvbstream-0.7_pre20080302-telnet-port-switch.diff
new file mode 100644
index 000000000000..6964b4f3e779
--- /dev/null
+++ b/media-tv/dvbstream/files/dvbstream-0.7_pre20080302-telnet-port-switch.diff
@@ -0,0 +1,26 @@
+diff -ru dvbstream-orig/dvbstream.c dvbstream/dvbstream.c
+--- dvbstream-orig/dvbstream.c	2008-05-16 18:23:03.023540289 +0200
++++ dvbstream/dvbstream.c	2008-05-16 18:25:32.293536581 +0200
+@@ -929,6 +929,7 @@
+ 
+   if (argc==1) {
+     fprintf(stderr,"Usage: dvbtune [OPTIONS] pid1 pid2 ... pid8\n\n");
++    fprintf(stderr,"-tp         TELNET port\n");
+     fprintf(stderr,"-i          IP multicast address\n");
+     fprintf(stderr,"-r          IP multicast port\n");
+     fprintf(stderr,"-net ip:prt IP address:port combination to be followed by pids list. Can be repeated to generate multiple RTP streams\n");
+@@ -1079,6 +1080,12 @@
+         LOF2=atoi(argv[i]);
+         LOF2*=1000UL;
+       }
++#ifdef ENABLE_TELNET
++      else if (strcmp(argv[i],"-tp")==0) {
++        i++;
++	port=atoi(argv[i]);
++      }
++#endif
+       else if (strcmp(argv[i],"-s")==0) {
+         i++;
+         srate=atoi(argv[i])*1000UL;
+Nur in dvbstream: dvbstream.c.orig.
+Nur in dvbstream: dvbstream.c.rej.
diff --git a/media-tv/dvbstream/files/dvbstream-0.7_pre20080516-update.diff b/media-tv/dvbstream/files/dvbstream-0.7_pre20080516-update.diff
new file mode 100644
index 000000000000..ed670e465376
--- /dev/null
+++ b/media-tv/dvbstream/files/dvbstream-0.7_pre20080516-update.diff
@@ -0,0 +1,12 @@
+diff -ru dvbstream-20080302/dvbstream.c dvbstream/dvbstream.c
+--- dvbstream-20080302/dvbstream.c	2007-09-14 23:02:39.000000000 +0200
++++ dvbstream/dvbstream.c	2008-03-24 19:28:16.000000000 +0100
+@@ -817,6 +817,8 @@
+     return 0;
+   else if(af == 3)
+     l += buf[4] + 1;
++  if(l >= TS_SIZE - 4)
++    return 0;
+ 
+   if(pid == 0)
+   {
diff --git a/media-tv/dvbstream/metadata.xml b/media-tv/dvbstream/metadata.xml
new file mode 100644
index 000000000000..55c5124b9172
--- /dev/null
+++ b/media-tv/dvbstream/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">dvbtools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-tv/dvbtune/Manifest b/media-tv/dvbtune/Manifest
new file mode 100644
index 000000000000..1d2b9a253e2d
--- /dev/null
+++ b/media-tv/dvbtune/Manifest
@@ -0,0 +1,6 @@
+AUX dvbtune-0.5-r1-gentoo.diff 470 SHA256 ea1865f743aa7d6b074fa045df42819a67d25219210dc92b88f96230c484d051 SHA512 0cefd5b9673e115cc360d72b211ef806ee16797443c35a78ecdc188c2c08eb4d54af7a1ca72526e18bae13de61f0126f5bc1eddcd7b0c9b5ed92ea46ae0b701e WHIRLPOOL 3028303c768a47cbd904d686e562ebcf83330e26e6115fef8afefe77028ab9e86af72609b0d86b2f7ec21394c36ed5895161e438018883cbe7fdfd625b2f5804
+DIST dvbtune-0.5.tar.gz 20601 SHA256 e6113080ca8a07202584edea0ac15d5a0948fc30361b7002d39bcb439ef79378 SHA512 0c6e8b8b4185b1b63638f0eff3e07b2c5e4b3bb9d95debb1625973cec2293315754487702ba9f7ed6bd6a0a518b09c8333d9ac4cd40b61f56c311c3d624fd365 WHIRLPOOL 26308845c14a3b25830a98673bc827d11704dccaa570738dd99a47e234ab767cb47f7d225d63f5f9abab6f6db01335f11bb9bb6aa47708c726de9e335d40e0f5
+EBUILD dvbtune-0.5-r1.ebuild 633 SHA256 fc720115f57bfba923f792d2c9d9b8763a7d95ac4c4662976451357135474fc0 SHA512 ea68bfa0a92403af049a755fbc322a19c89763fe3907f0c962dd90dc449f7e75011555dc6a518cd08b27c8bfee70e244f07a35bab6122f3ce41ad26a86ac612f WHIRLPOOL 918c5744fe946e8a6b24dff07fc44173051c9709738d6f365bd8e17a0b543d11ccd5e54b0cdb95b0f931cc266ca055e6b37849db8d1567424e26cc465900a462
+MISC ChangeLog 2640 SHA256 a6cae77cb8e277abc70a82db24435ddc761bf1337c0ceb2df232d59837c7b6dc SHA512 f28c44fd47fd06676ccf5d6b4101da1c496aef335be3fa66a218b5a8f0e8d2d19a17764265589e641104f68627f589bb1f4c6a89e51bfb6b8e3a73a059fe1cc8 WHIRLPOOL ae07fde5cfc4ac64c34332bb94b0853f106d8436dcc56b99e9b68fb3606d87a39b739d1d17ad852b22a5835ddf84d980e16bb94f653060df107b070a374e4ce5
+MISC ChangeLog-2015 1661 SHA256 4693b1b094d873170b439a4ca6f5bf9fc128ee71f1b6577cf0949662bcb7db6f SHA512 3d1b700a269393cf2b868f10ee319311ce9b180ef36f04f35be185a1354905d672fc3fb58f2242b1278699b0c2914a768f75b2035bc1b8d42fa8faa8bca342d4 WHIRLPOOL d422895dac15fe8f23b266a5970db862862d35c5ee1ea9176dffc069b7491bd8e2eb90a79a95e3fbc1780328fa1f87fa25091da5ed48aa619174001d1b96d1d9
+MISC metadata.xml 245 SHA256 7c656ee83ab551d755760649b09684fb1f62486aba33e9ae18dabf1ed84519c7 SHA512 d07141fde891b0f88b4f91ea7b4e7da644ad57f74ac7a9f3d43af56c387a9d06e4b995e18756222c77f8ca6d8fc6d83081806b77c19ded68dbc6fb6845af18e5 WHIRLPOOL 32be69e261cd695d74f2e272a1a56074d688d127a8c11fafc4c8da423388855c43999e77c467da74d2448795d84d5063f89ab6093635ef6ad945ce09023fb453
diff --git a/media-tv/dvbtune/dvbtune-0.5-r1.ebuild b/media-tv/dvbtune/dvbtune-0.5-r1.ebuild
new file mode 100644
index 000000000000..6aeb9ff922ff
--- /dev/null
+++ b/media-tv/dvbtune/dvbtune-0.5-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="simple tuning app for DVB cards"
+HOMEPAGE="https://sourceforge.net/projects/dvbtools"
+SRC_URI="mirror://sourceforge/dvbtools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="xml"
+
+RDEPEND="xml? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}
+	virtual/linuxtv-dvb-headers"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PF}-gentoo.diff
+}
+
+src_compile() {
+	emake dvbtune
+
+	use xml && emake xml2vdr
+}
+
+src_install() {
+	dobin dvbtune
+
+	use xml && dobin xml2vdr
+
+	dodoc README scripts/*
+}
diff --git a/media-tv/dvbtune/files/dvbtune-0.5-r1-gentoo.diff b/media-tv/dvbtune/files/dvbtune-0.5-r1-gentoo.diff
new file mode 100644
index 000000000000..a615317eb1de
--- /dev/null
+++ b/media-tv/dvbtune/files/dvbtune-0.5-r1-gentoo.diff
@@ -0,0 +1,20 @@
+--- dvbtune-0.5/Makefile.orig	2006-01-06 13:01:11.973196250 +0100
++++ dvbtune-0.5/Makefile	2006-01-06 13:01:46.667364500 +0100
+@@ -1,5 +1,6 @@
+ INCS=-I /usr/include/libxml2
+-CFLAGS= -Wall $(INCS)
++CFLAGS ?= -Wall
++CFLAGS += $(INCS)
+ CC=gcc
+ all: dvbtune
+ 
+@@ -33,7 +33,7 @@
+ dvbtune: dvbtune.c tune.o
+ 
+ xml2vdr: xml2vdr.c
+-	 $(CC) $(CFLAGS) -o xml2vdr xml2vdr.c -lxml2
++	 $(CC) $(CFLAGS) -o xml2vdr xml2vdr.c -lxml2 $(LDFLAGS)
+ 
+ clean:
+ 	rm -f *.o *~ dvbtune xml2vdr
+
diff --git a/media-tv/dvbtune/metadata.xml b/media-tv/dvbtune/metadata.xml
new file mode 100644
index 000000000000..55c5124b9172
--- /dev/null
+++ b/media-tv/dvbtune/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">dvbtools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
new file mode 100644
index 000000000000..2cbf171d4b95
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -0,0 +1,17 @@
+DIST gentoo-vdr-scripts-2.0.0.tar.bz2 37438 SHA256 6c2025714546a25632c5b8103b3fa4b7ca6adf963189800c91e99cb23f7b2a79 SHA512 0214b390e1e4fe4f65ceb940a1d092f88fe5263eda3c97ebfa7d2925a772165af3a3c62bfc964e577e374ce723aefccb29082f8219fda918ad17f966ad8ad392 WHIRLPOOL a3de83d95a51622de997d8231b973d6899a2fa21324492e11eb4001ad3c15dee5c6e65f20ee44fd43ebe2974b2b1acf623956d2d44b955bfee799d1a696ace65
+DIST gentoo-vdr-scripts-2.5.tar.bz2 39893 SHA256 39a3c5d1cf30f1b07a6218b2154835994bbf9d65358e916260bad970a6ca6432 SHA512 bed3db4e3c4f8195d5715d274a32485d067fa2e539ace417c2d73bac1294d46736754be589d5e18b77e0baa1b4d9cd7df5ff8a13db2850d92d2eb992f9b131a6 WHIRLPOOL 5a7626484784ad49624df92daab0997368f885d4d5f6ad732082c2a77c840f6e23f345cf35816890d43493c57fa70c90eb9a4ab785a8d4ead81f6779714138b9
+DIST gentoo-vdr-scripts-2.7.2.tar.bz2 48584 SHA256 65de19d3738442a08cdb603ab0e0116e96bbcd8d58b9c9b3f2942e0bcb5365cb SHA512 cb0297c7e78e4c110097d1c08a5f6642d8194d01dd47308f7a41c6d76f7b1675cc612d47a7725eb4f47a393086b034ca09703af0867ae02a36af4be12701f861 WHIRLPOOL 7fe4e106512cca4e26a778320cadf93976897622dac2fd2cf7e21e20e44da27caa69da71f7a779747bc05872e6b90ee7440a7c8fbd2165e6c6a2544804c71da1
+DIST gentoo-vdr-scripts-2.7.3.tar.bz2 49156 SHA256 a8fb04ca737080dd4fa4d300243d833f835885c0b4c9ca3f1808997713a626ec SHA512 9d00acaf77bbbf52f4a4d4b8284d94b9d191c354de52ea6f7bba0751be661feec4915cca20be3d24a0471efe4b3f24c5dcc025e3e8b0cc6b2c37f8843b91a520 WHIRLPOOL bd30b36284754d4e5c135c381e4114354b1292f4203d0367622c650252d8ecbcaabe58bc40b4d0ad26b54553f5ee0ff5e2e32e13abdd088bd26b0b41a97ee10c
+DIST gentoo-vdr-scripts-2.7.5.1.tar.bz2 49537 SHA256 e7adec1f89b4c11002b77a12fd97ce492acb72736f50d7c80a01cad27950336f SHA512 5b8f91f73ee42e290966eb9ae95b020b0a2c16f9d2c4eb79766934b8fa2e6bf415db20325254c0c6058abb868b010eb4180acc3714c18b47a5be390ee3e928c9 WHIRLPOOL acdd17e025e624450b4e9c89dfe75d5c0ff104686200aae3f2472488174af59104497a8a34c925c30ff68b10b0c0c6b38fdd3a2e5f9f1cd8562d6dfd9302b6e4
+DIST gentoo-vdr-scripts-2.7.5.tar.bz2 49457 SHA256 650220b1061672e5e021f3b2abaad01af0319833c3142aed7d27fe6cfc16469c SHA512 b79460ae73c1914b0057d44469c0ac3e30feab3fc9fa91af618a0753f5061184110af6f2426d0638861e899fe7ef8ddc749bee631e95dbf52da9d32ae3ae7afe WHIRLPOOL b94f40b82ddcce4e85469590136cf874450871abbb07359eb57ecda959e2ae1e66b662bc32e07e65af13a5c1d9f5fb023a62cf78ac64c31e2540e84b2a23beca
+DIST gentoo-vdr-scripts-2.7.tar.bz2 46618 SHA256 40f6e50e684b4dde9c026887119e80c9680212bfe41854c6526cc1346c0ae2a2 SHA512 95db4d2632d07cc86394fbc2898050d47175f01cc60b61230ba5363c770ba6ad5c5935987ac6a1131bc575887633ed6c8f6242f7de225fc875d0871123665bc5 WHIRLPOOL 889e2379fa9df6ae9992f6569779d4f485488e84c9c1065c43717ae07d15c601ce9a731e612e6bfaaf7df55d5eb4c7901f16bbf0eff680bc5b4ea25662885790
+EBUILD gentoo-vdr-scripts-2.0.0.ebuild 3517 SHA256 7302034f5ccbe9566cade8b03cf4dd11d564d9cd9cf3d561e963b61b4139c132 SHA512 533acb3b4300bd28615147cbd9147abdfaf5b088ac9f4b0049db7a1cb40b68f5e55574412473ce1455531f07d978a71c2619c6aa7199a1aadd20044d777824a2 WHIRLPOOL adf992fdf5d01d42624d5d28aaf13052b209babe25f5918c7ccb06ce2d86203bc6f91de3183829463d359d661a2e1f3152ddb01f3436857c68f0457b99226b66
+EBUILD gentoo-vdr-scripts-2.5.ebuild 3707 SHA256 6d7a9395a9304717615649b1d4f204eb68e580d7dd7e5fcbe557e3e2a9cbb5fe SHA512 5a58a2cf32d8aecb0e0af42a29c876674028ed68a60247b3d0e9e922536d89821bfae121113c7b17bfa789d769d95f2c1d972ad6bb4e2012982fec30746c16af WHIRLPOOL 1cc6f47f96939753d32e3c2eb2246d4a63f9714a57f24d5cd1a7072fa7ea2e87a9b761a59b3f7f638b6910a8fb21e017a85962179a76a46f3acc5a46b9c8816a
+EBUILD gentoo-vdr-scripts-2.7.2.ebuild 3635 SHA256 40b99d2082cac037285499059689168acf98e1ebdb838e94dc92d9e4c6e6c3da SHA512 ce90e054405fbea3197aa8304bee384172e67353863a6799af26f6ac2b678eed1ed9e6b0400e6c22f3ff635086041f50660ec83669869de34d2d9927a4af017b WHIRLPOOL 645d2e69498d1a082912404425de6eb9e4e0bcab512606dadbbd7873345577f690ceb85c83aeb3d90698390ded22c06fabae95252fe06d9f8083de80c2068e14
+EBUILD gentoo-vdr-scripts-2.7.3.ebuild 3633 SHA256 76bbe6d4b66acbe1afcbefc46b67685a663deb2b00b3a1f9d88c4e1f11d77529 SHA512 90532d380cb3e593fbec8a236731a626ed46dae40250c98472d43830ecf8ba2b718f42ff9748d9d956d80cfe1e46680d5d331fad59e5cbe8695c5e058201c017 WHIRLPOOL 667729b47884411575b5e7af5d7556d32f26d73cc07627ae9b7c688f52f75b58ee5c3c7e2652454dc14d978b112ad3746e851e9b56e0469a71c8b1402f4a0e5b
+EBUILD gentoo-vdr-scripts-2.7.5.1.ebuild 3512 SHA256 a70934708629db4dd21c5854b46989f5f186bf49a109013cca41ef229f9cf3f7 SHA512 467442153b47078e3a3a15aff3de6dbfaf75e0f4852e964a10f42ad526bf1611b23861afd5aba74256b769f3fbfb9357574f71b3bc32971a973ae99f77d10a57 WHIRLPOOL 23842ca154ff3333f0b2a57da35bdf67544d9277c5692062c8e00e6798dc6452d610340c3b6110235cdcfe7cdf68a2deaa99a8c8755b4b9de5d89fda4e4f0a6c
+EBUILD gentoo-vdr-scripts-2.7.5.ebuild 3505 SHA256 09d0c66f8a789ee25e3776da5bbbd65a640ec11a90f6926d49b967f8f6b9349b SHA512 8bb3d020026a5d44390c7772d1f9a074ee21f54daa9a7f2918b50112c0d96c57060bd7850be61951dd2073c4ee09e32d27cd1986e23146ec7f4d4301237a210c WHIRLPOOL d9c8364036b135e970ea4c30e79dd0a4c48e8b7bedfb58e61275d7ffcf996e1df5b21e5cd3125b51ab17f2ffc732331d1caa208392470b981a598712d44b0739
+EBUILD gentoo-vdr-scripts-2.7.ebuild 3633 SHA256 76bbe6d4b66acbe1afcbefc46b67685a663deb2b00b3a1f9d88c4e1f11d77529 SHA512 90532d380cb3e593fbec8a236731a626ed46dae40250c98472d43830ecf8ba2b718f42ff9748d9d956d80cfe1e46680d5d331fad59e5cbe8695c5e058201c017 WHIRLPOOL 667729b47884411575b5e7af5d7556d32f26d73cc07627ae9b7c688f52f75b58ee5c3c7e2652454dc14d978b112ad3746e851e9b56e0469a71c8b1402f4a0e5b
+MISC ChangeLog 4132 SHA256 a807ce76a9efa506e4e71161ae600419aa457cf2fb04963349ef46add46d246b SHA512 e48a9f3ab8aadd16c23e9649dc94dba45400823136851c0db065b95ac2d3ecfad6e6c231f1dcd82ec5fffc6596482949eb8b6824a19c2a523a153fffcafab79d WHIRLPOOL 341718c4ba783204a75bd499f199fc43d8316653bbb18eadb664877bc10839f3ef8fa903c9f9a0bf37b0a1327d2209eaba05cb66137c8fa9a931c149cbff00ab
+MISC ChangeLog-2015 28035 SHA256 67f949fcd43c91e324b068a554bff8752d2957fceea5029fc6dc7b03668b35bf SHA512 64a5d35e7c9e43a948330b2a552552a5294d25da09240e29eab0e5f517cd2a14a21a71c43bbacff9d3085f3c422086c5d19d25df03527028b6e665c67f2a05d6 WHIRLPOOL 86c096ae9d602e002651a54384d301dcfe4a8b76f9d9c1ca567896c38ca1d1271b8cbafc481a2cd7f61bf275b0f3617edafe858a482077253832cc35c34cdf85
+MISC metadata.xml 358 SHA256 b758a7e2620dea89a8ba65dd00787928c9af59b3e2b743c46c7c205e61d4215e SHA512 fcce89bd7190c6318e0821198da47932e23611064d500b3a5436d56390eac284eac00582af1294aa283a3cda8ad47dc9c34b2f5116d6dc0fcb1eaf7edded2384 WHIRLPOOL ebfc84480a8b09099705a7b2d71524ab2c005bdfbfdcb06d8937775a5d3275a94702c19192f2007b0042734ce861031f5f7263c323a9b617e9b16ee560a16fb1
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.0.0.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.0.0.ebuild
new file mode 100644
index 000000000000..7dfa59508244
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.0.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils user
+
+DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="nvram"
+
+RDEPEND="nvram? ( sys-power/nvram-wakeup )
+	app-admin/sudo
+	sys-process/wait_on_pid"
+
+VDR_HOME=/var/vdr
+
+pkg_setup() {
+	enewgroup vdr
+
+	# Add user vdr to these groups:
+	#   video - accessing dvb-devices
+	#   audio - playing sound when using software-devices
+	#   cdrom - playing dvds/audio-cds ...
+	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
+}
+
+src_prepare() {
+	# moved into own package
+	sed -e '/SUBDIRS =/s# bin # #' -i usr/Makefile
+	sed -e '/all:/s#compile##' -i Makefile
+}
+
+src_install() {
+	emake -s install DESTDIR="${D}" || die "make install failed"
+	dodoc README TODO ChangeLog README.grub2
+
+	# create necessary directories
+	diropts -ovdr -gvdr
+	keepdir "${VDR_HOME}"
+
+	local kd
+	for kd in shutdown-data merged-config-files dvd-images tmp; do
+		keepdir "${VDR_HOME}/${kd}"
+	done
+}
+
+pkg_preinst() {
+	local PLUGINS_NEW=0
+	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
+		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
+	fi
+	if [[ ${PLUGINS_NEW} > 0 ]]; then
+		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
+	else
+		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
+		local PLUGIN
+		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
+			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
+		done
+	fi
+
+	has_version "<${CATEGORY}/${PN}-0.5.4"
+	previous_less_than_0_5_4=$?
+}
+
+VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
+
+pkg_postinst() {
+	if [[ $previous_less_than_0_5_4 = 0 ]] ; then
+		einfo "\nVDR use now default the --cachedir parameter to store the epg.file"
+		einfo "Please do not override this with the EPGFILE variable\n"
+
+		einfo "svdrp port 2001 support removed\n"
+
+		einfo "--rcu support removed, use media-plugin/vdr-rcu\n"
+	fi
+
+	elog "nvram wakeup is optional."
+	elog "To make use of it emerge sys-power/nvram-wakeup."
+	elog
+
+	elog "Plugins which should be used are now set via its"
+	elog "own config-file called /etc/conf.d/vdr.plugins"
+	elog "or enabled via the frontend eselect vdr-plugin."
+	elog
+
+	if [[ -f "${ROOT}/etc/init.d/dvbsplash" ]]; then
+		ewarn
+		ewarn "You have dvbsplash installed!"
+		ewarn "/etc/init.d/dvbsplash will now be deleted"
+		ewarn "as it causes difficult to debug problems."
+		ewarn
+		rm "${ROOT}/etc/init.d/dvbsplash"
+	fi
+
+	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
+		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
+	then
+		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
+		ewarn "This no longer has any effect, please use"
+		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
+	fi
+}
+
+pkg_config() {
+	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
+
+		einfo "Removing depricated entry from /etc/sudoers:"
+		einfo "-  ${VDRSUDOENTRY}"
+
+		cd "${T}"
+		cat >sudoedit-vdr.sh <<-SUDOEDITOR
+			#!/bin/bash
+			sed -i \${1} -e '/\/usr\/share\/vdr\/bin\/vdrshutdown-really.sh *$/d'
+
+		SUDOEDITOR
+		chmod a+x sudoedit-vdr.sh
+
+		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
+
+		einfo "Edited /etc/sudoers"
+	fi
+}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.5.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.5.ebuild
new file mode 100644
index 000000000000..9e6b28936a4c
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.5.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="nvram"
+
+RDEPEND="nvram? ( sys-power/nvram-wakeup )
+	app-admin/sudo
+	sys-process/wait_on_pid"
+
+VDR_HOME=/var/vdr
+
+pkg_setup() {
+	enewgroup vdr
+
+	# Add user vdr to these groups:
+	#   video - accessing dvb-devices
+	#   audio - playing sound when using software-devices
+	#   cdrom - playing dvds/audio-cds ...
+	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
+}
+
+src_prepare() {
+	# moved into own package
+	sed -e '/SUBDIRS =/s# bin # #' -i usr/Makefile
+	sed -e '/all:/s#compile##' -i Makefile
+}
+
+src_install() {
+	emake -s install DESTDIR="${D}" || die "make install failed"
+	dodoc README TODO ChangeLog README.grub2 README.shutdown README.shutdown-jobs README.systemd README.vdrcaps
+
+	# create necessary directories
+	diropts -ovdr -gvdr
+	keepdir "${VDR_HOME}"
+
+	local kd
+	for kd in shutdown-data merged-config-files dvd-images tmp; do
+		keepdir "${VDR_HOME}/${kd}"
+	done
+}
+
+pkg_preinst() {
+	local PLUGINS_NEW=0
+	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
+		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
+	fi
+	if [[ ${PLUGINS_NEW} > 0 ]]; then
+		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
+	else
+		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
+		local PLUGIN
+		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
+			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
+		done
+	fi
+
+	has_version "<${CATEGORY}/${PN}-0.5.4"
+	previous_less_than_0_5_4=$?
+}
+
+VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
+
+pkg_postinst() {
+	if [[ $previous_less_than_0_5_4 = 0 ]] ; then
+		einfo "\nVDR use now default the --cachedir parameter to store the epg.file"
+		einfo "Please do not override this with the EPGFILE variable\n"
+
+		einfo "svdrp port 2001 support removed\n"
+
+		einfo "--rcu support removed, use media-plugin/vdr-rcu\n"
+	fi
+
+	elog "nvram wakeup is optional."
+	elog "To make use of it emerge sys-power/nvram-wakeup."
+	elog
+
+	elog "Plugins which should be used are now set via its"
+	elog "own config-file called /etc/conf.d/vdr.plugins"
+	elog "or enabled via the frontend eselect vdr-plugin."
+	elog
+
+	if [[ -f "${ROOT}/etc/init.d/dvbsplash" ]]; then
+		ewarn
+		ewarn "You have dvbsplash installed!"
+		ewarn "/etc/init.d/dvbsplash will now be deleted"
+		ewarn "as it causes difficult to debug problems."
+		ewarn
+		rm "${ROOT}/etc/init.d/dvbsplash"
+	fi
+
+	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
+		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
+	then
+		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
+		ewarn "This no longer has any effect, please use"
+		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
+	fi
+
+	einfo "systemd is now supported by gentoo-vdr-scripts"
+	einfo "Please read for detailed info on this vdr's README.systemd"
+}
+
+pkg_config() {
+	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
+
+		einfo "Removing depricated entry from /etc/sudoers:"
+		einfo "-  ${VDRSUDOENTRY}"
+
+		cd "${T}"
+		cat >sudoedit-vdr.sh <<-SUDOEDITOR
+			#!/bin/bash
+			sed -i \${1} -e '/\/usr\/share\/vdr\/bin\/vdrshutdown-really.sh *$/d'
+
+		SUDOEDITOR
+		chmod a+x sudoedit-vdr.sh
+
+		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
+
+		einfo "Edited /etc/sudoers"
+	fi
+}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.2.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.2.ebuild
new file mode 100644
index 000000000000..80c34f17a1c9
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="nvram"
+
+RDEPEND="nvram? ( sys-power/nvram-wakeup )
+	app-admin/sudo
+	sys-process/wait_on_pid"
+
+VDR_HOME=/var/vdr
+
+pkg_setup() {
+	enewgroup vdr
+
+	# Add user vdr to these groups:
+	#   video - accessing dvb-devices
+	#   audio - playing sound when using software-devices
+	#   cdrom - playing dvds/audio-cds ...
+	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
+}
+
+src_prepare() {
+	# moved into own package
+	sed -e '/SUBDIRS =/s# bin # #' -i usr/Makefile
+	sed -e '/all:/s#compile##' -i Makefile
+}
+
+src_install() {
+	default
+	dodoc README* TODO ChangeLog
+
+	# create necessary directories
+	diropts -ovdr -gvdr
+	keepdir "${VDR_HOME}"
+
+	local kd
+	for kd in shutdown-data merged-config-files dvd-images; do
+		keepdir "${VDR_HOME}/${kd}"
+	done
+}
+
+pkg_preinst() {
+	local PLUGINS_NEW=0
+	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
+		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
+	fi
+	if [[ ${PLUGINS_NEW} > 0 ]]; then
+		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
+	else
+		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
+		local PLUGIN
+		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
+			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
+		done
+	fi
+
+	has_version "<${CATEGORY}/${PN}-0.5.4"
+	previous_less_than_0_5_4=$?
+
+	has_version "<${CATEGORY}/${PN}-2.6"
+	previous_less_than_2_6=$?
+}
+
+VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
+
+pkg_postinst() {
+	if [[ $previous_less_than_0_5_4 = 0 ]] ; then
+		elog "\nVDR use now default the --cachedir parameter to store the epg.file"
+		elog "Please do not override this with the EPGFILE variable\n"
+
+		elog "svdrp port 2001 support removed\n"
+
+		elog "--rcu support removed, use media-plugin/vdr-rcu\n"
+	fi
+
+	if [[ $previous_less_than_2_6 = 0 ]]; then
+		elog "${CATEGORY}/${PN} supports now a init script"
+		elog "to start a X server"
+		elog "Please refer for detailed info to"
+		elog "${CATGORY}/${PN} README.x11-setup\n"
+	fi
+
+	if use nvram; then
+		elog "nvram wakeup is optional."
+		elog "To make use of it emerge sys-power/nvram-wakeup.\n"
+	fi
+
+	elog "Plugins which should be used are now set via its"
+	elog "own config-file called /etc/conf.d/vdr.plugins"
+	elog "or enabled via the frontend eselect vdr-plugin.\n"
+
+	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
+		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
+	then
+		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
+		ewarn "This no longer has any effect, please use"
+		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
+	fi
+
+	elog "systemd is supported by ${CATEGORY}/${PN}"
+	elog "Please read for detailed info on this"
+	elog "${CATEGORY}/${PN} README.systemd"
+}
+
+pkg_config() {
+	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
+
+		einfo "Removing depricated entry from /etc/sudoers:"
+		einfo "-  ${VDRSUDOENTRY}"
+
+		cd "${T}"
+		cat >sudoedit-vdr.sh <<-SUDOEDITOR
+			#!/bin/bash
+			sed -i \${1} -e '/\/usr\/share\/vdr\/bin\/vdrshutdown-really.sh *$/d'
+
+		SUDOEDITOR
+		chmod a+x sudoedit-vdr.sh
+
+		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
+
+		einfo "Edited /etc/sudoers"
+	fi
+}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.3.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.3.ebuild
new file mode 100644
index 000000000000..50266d56682e
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.3.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="nvram"
+
+RDEPEND="nvram? ( sys-power/nvram-wakeup )
+	app-admin/sudo
+	sys-process/wait_on_pid"
+
+VDR_HOME=/var/vdr
+
+pkg_setup() {
+	enewgroup vdr
+
+	# Add user vdr to these groups:
+	#   video - accessing dvb-devices
+	#   audio - playing sound when using software-devices
+	#   cdrom - playing dvds/audio-cds ...
+	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
+}
+
+src_prepare() {
+	# moved into own package
+	sed -e '/SUBDIRS =/s# bin # #' -i usr/Makefile
+	sed -e '/all:/s#compile##' -i Makefile
+}
+
+src_install() {
+	default
+	dodoc README* TODO ChangeLog
+
+	# create necessary directories
+	diropts -ovdr -gvdr
+	keepdir "${VDR_HOME}"
+
+	local kd
+	for kd in shutdown-data merged-config-files dvd-images; do
+		keepdir "${VDR_HOME}/${kd}"
+	done
+}
+
+pkg_preinst() {
+	local PLUGINS_NEW=0
+	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
+		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
+	fi
+	if [[ ${PLUGINS_NEW} > 0 ]]; then
+		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
+	else
+		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
+		local PLUGIN
+		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
+			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
+		done
+	fi
+
+	has_version "<${CATEGORY}/${PN}-0.5.4"
+	previous_less_than_0_5_4=$?
+
+	has_version "<${CATEGORY}/${PN}-2.6"
+	previous_less_than_2_6=$?
+}
+
+VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
+
+pkg_postinst() {
+	if [[ $previous_less_than_0_5_4 = 0 ]] ; then
+		elog "\nVDR use now default the --cachedir parameter to store the epg.file"
+		elog "Please do not override this with the EPGFILE variable\n"
+
+		elog "svdrp port 2001 support removed\n"
+
+		elog "--rcu support removed, use media-plugin/vdr-rcu\n"
+	fi
+
+	if [[ $previous_less_than_2_6 = 0 ]]; then
+		elog "${CATEGORY}/${PN} supports now a init script"
+		elog "to start a X server"
+		elog "Please refer for detailed info to"
+		elog "${CATGORY}/${PN} README.x11-setup\n"
+	fi
+
+	if use nvram; then
+		elog "nvram wakeup is optional."
+		elog "To make use of it emerge sys-power/nvram-wakeup.\n"
+	fi
+
+	elog "Plugins which should be used are now set via its"
+	elog "own config-file called /etc/conf.d/vdr.plugins"
+	elog "or enabled via the frontend eselect vdr-plugin.\n"
+
+	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
+		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
+	then
+		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
+		ewarn "This no longer has any effect, please use"
+		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
+	fi
+
+	elog "systemd is supported by ${CATEGORY}/${PN}"
+	elog "Please read for detailed info on this"
+	elog "${CATEGORY}/${PN} README.systemd"
+}
+
+pkg_config() {
+	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
+
+		einfo "Removing depricated entry from /etc/sudoers:"
+		einfo "-  ${VDRSUDOENTRY}"
+
+		cd "${T}"
+		cat >sudoedit-vdr.sh <<-SUDOEDITOR
+			#!/bin/bash
+			sed -i \${1} -e '/\/usr\/share\/vdr\/bin\/vdrshutdown-really.sh *$/d'
+
+		SUDOEDITOR
+		chmod a+x sudoedit-vdr.sh
+
+		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
+
+		einfo "Edited /etc/sudoers"
+	fi
+}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.1.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.1.ebuild
new file mode 100644
index 000000000000..557ea20e5750
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="nvram"
+
+RDEPEND="nvram? ( sys-power/nvram-wakeup )
+	app-admin/sudo
+	sys-process/wait_on_pid"
+
+VDR_HOME=/var/vdr
+
+pkg_setup() {
+	enewgroup vdr
+
+	# Add user vdr to these groups:
+	#   video - accessing dvb-devices
+	#   audio - playing sound when using software-devices
+	#   cdrom - playing dvds/audio-cds ...
+	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
+}
+
+src_install() {
+	local DOCS=( README* TODO ChangeLog )
+
+	default
+
+	# create necessary directories
+	diropts -ovdr -gvdr
+	keepdir "${VDR_HOME}"
+
+	local kd
+	for kd in shutdown-data merged-config-files dvd-images; do
+		keepdir "${VDR_HOME}/${kd}"
+	done
+}
+
+pkg_preinst() {
+	local PLUGINS_NEW=0
+	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
+		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
+	fi
+	if [[ ${PLUGINS_NEW} > 0 ]]; then
+		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
+	else
+		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
+		local PLUGIN
+		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
+			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
+		done
+	fi
+
+	has_version "<${CATEGORY}/${PN}-0.5.4"
+	previous_less_than_0_5_4=$?
+
+	has_version "<${CATEGORY}/${PN}-2.6"
+	previous_less_than_2_6=$?
+}
+
+VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
+
+pkg_postinst() {
+	if [[ $previous_less_than_0_5_4 = 0 ]] ; then
+		elog "\nVDR use now default the --cachedir parameter to store the epg.file"
+		elog "Please do not override this with the EPGFILE variable\n"
+
+		elog "svdrp port 2001 support removed\n"
+
+		elog "--rcu support removed, use media-plugin/vdr-rcu\n"
+	fi
+
+	if [[ $previous_less_than_2_6 = 0 ]]; then
+		elog "${CATEGORY}/${PN} supports now a init script"
+		elog "to start a X server"
+		elog "Please refer for detailed info to"
+		elog "${CATGORY}/${PN} README.x11-setup\n"
+	fi
+
+	if use nvram; then
+		elog "nvram wakeup is optional."
+		elog "To make use of it emerge sys-power/nvram-wakeup.\n"
+	fi
+
+	elog "Plugins which should be used are now set via its"
+	elog "own config-file called /etc/conf.d/vdr.plugins"
+	elog "or enabled via the frontend eselect vdr-plugin.\n"
+
+	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
+		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
+	then
+		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
+		ewarn "This no longer has any effect, please use"
+		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
+	fi
+
+	elog "systemd is supported by ${CATEGORY}/${PN}"
+	elog "Please read for detailed info on this"
+	elog "${CATEGORY}/${PN} README.systemd"
+}
+
+pkg_config() {
+	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
+
+		einfo "Removing depricated entry from /etc/sudoers:"
+		einfo "-  ${VDRSUDOENTRY}"
+
+		cd "${T}"
+		cat >sudoedit-vdr.sh <<-SUDOEDITOR
+			#!/bin/bash
+			sed -i \${1} -e '/\/usr\/share\/vdr\/bin\/vdrshutdown-really.sh *$/d'
+
+		SUDOEDITOR
+		chmod a+x sudoedit-vdr.sh
+
+		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
+
+		einfo "Edited /etc/sudoers"
+	fi
+}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.ebuild
new file mode 100644
index 000000000000..6fdabc3dcf24
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="nvram"
+
+RDEPEND="nvram? ( sys-power/nvram-wakeup )
+	app-admin/sudo
+	sys-process/wait_on_pid"
+
+VDR_HOME=/var/vdr
+
+pkg_setup() {
+	enewgroup vdr
+
+	# Add user vdr to these groups:
+	#   video - accessing dvb-devices
+	#   audio - playing sound when using software-devices
+	#   cdrom - playing dvds/audio-cds ...
+	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
+}
+
+src_install() {
+	local DOCS=( README* TODO ChangeLog )
+
+	default
+
+	# create necessary directories
+	diropts -ovdr -gvdr
+	keepdir "${VDR_HOME}"
+
+	local kd
+	for kd in shutdown-data merged-config-files dvd-images; do
+		keepdir "${VDR_HOME}/${kd}"
+	done
+}
+
+pkg_preinst() {
+	local PLUGINS_NEW=0
+	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
+		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
+	fi
+	if [[ ${PLUGINS_NEW} > 0 ]]; then
+		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
+	else
+		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
+		local PLUGIN
+		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
+			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
+		done
+	fi
+
+	has_version "<${CATEGORY}/${PN}-0.5.4"
+	previous_less_than_0_5_4=$?
+
+	has_version "<${CATEGORY}/${PN}-2.6"
+	previous_less_than_2_6=$?
+}
+
+VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
+
+pkg_postinst() {
+	if [[ $previous_less_than_0_5_4 = 0 ]] ; then
+		elog "\nVDR use now default the --cachedir parameter to store the epg.file"
+		elog "Please do not override this with the EPGFILE variable\n"
+
+		elog "svdrp port 2001 support removed\n"
+
+		elog "--rcu support removed, use media-plugin/vdr-rcu\n"
+	fi
+
+	if [[ $previous_less_than_2_6 = 0 ]]; then
+		elog "${CATEGORY}/${PN} supports now a init script"
+		elog "to start a X server"
+		elog "Please refer for detailed info to"
+		elog "${CATGORY}/${PN} README.x11-setup\n"
+	fi
+
+	if use nvram; then
+		elog "nvram wakeup is optional."
+		elog "To make use of it emerge sys-power/nvram-wakeup.\n"
+	fi
+
+	elog "Plugins which should be used are now set via its"
+	elog "own config-file called /etc/conf.d/vdr.plugins"
+	elog "or enabled via the frontend eselect vdr-plugin.\n"
+
+	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
+		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
+	then
+		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
+		ewarn "This no longer has any effect, please use"
+		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
+	fi
+
+	elog "systemd is supported by ${CATEGORY}/${PN}"
+	elog "Please read for detailed info on this"
+	elog "${CATEGORY}/${PN} README.systemd"
+}
+
+pkg_config() {
+	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
+
+		einfo "Removing depricated entry from /etc/sudoers:"
+		einfo "-  ${VDRSUDOENTRY}"
+
+		cd "${T}"
+		cat >sudoedit-vdr.sh <<-SUDOEDITOR
+			#!/bin/bash
+			sed -i \${1} -e '/\/usr\/share\/vdr\/bin\/vdrshutdown-really.sh *$/d'
+
+		SUDOEDITOR
+		chmod a+x sudoedit-vdr.sh
+
+		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
+
+		einfo "Edited /etc/sudoers"
+	fi
+}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.ebuild
new file mode 100644
index 000000000000..50266d56682e
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="nvram"
+
+RDEPEND="nvram? ( sys-power/nvram-wakeup )
+	app-admin/sudo
+	sys-process/wait_on_pid"
+
+VDR_HOME=/var/vdr
+
+pkg_setup() {
+	enewgroup vdr
+
+	# Add user vdr to these groups:
+	#   video - accessing dvb-devices
+	#   audio - playing sound when using software-devices
+	#   cdrom - playing dvds/audio-cds ...
+	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
+}
+
+src_prepare() {
+	# moved into own package
+	sed -e '/SUBDIRS =/s# bin # #' -i usr/Makefile
+	sed -e '/all:/s#compile##' -i Makefile
+}
+
+src_install() {
+	default
+	dodoc README* TODO ChangeLog
+
+	# create necessary directories
+	diropts -ovdr -gvdr
+	keepdir "${VDR_HOME}"
+
+	local kd
+	for kd in shutdown-data merged-config-files dvd-images; do
+		keepdir "${VDR_HOME}/${kd}"
+	done
+}
+
+pkg_preinst() {
+	local PLUGINS_NEW=0
+	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
+		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
+	fi
+	if [[ ${PLUGINS_NEW} > 0 ]]; then
+		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
+	else
+		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
+		local PLUGIN
+		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
+			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
+		done
+	fi
+
+	has_version "<${CATEGORY}/${PN}-0.5.4"
+	previous_less_than_0_5_4=$?
+
+	has_version "<${CATEGORY}/${PN}-2.6"
+	previous_less_than_2_6=$?
+}
+
+VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
+
+pkg_postinst() {
+	if [[ $previous_less_than_0_5_4 = 0 ]] ; then
+		elog "\nVDR use now default the --cachedir parameter to store the epg.file"
+		elog "Please do not override this with the EPGFILE variable\n"
+
+		elog "svdrp port 2001 support removed\n"
+
+		elog "--rcu support removed, use media-plugin/vdr-rcu\n"
+	fi
+
+	if [[ $previous_less_than_2_6 = 0 ]]; then
+		elog "${CATEGORY}/${PN} supports now a init script"
+		elog "to start a X server"
+		elog "Please refer for detailed info to"
+		elog "${CATGORY}/${PN} README.x11-setup\n"
+	fi
+
+	if use nvram; then
+		elog "nvram wakeup is optional."
+		elog "To make use of it emerge sys-power/nvram-wakeup.\n"
+	fi
+
+	elog "Plugins which should be used are now set via its"
+	elog "own config-file called /etc/conf.d/vdr.plugins"
+	elog "or enabled via the frontend eselect vdr-plugin.\n"
+
+	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
+		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
+	then
+		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
+		ewarn "This no longer has any effect, please use"
+		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
+	fi
+
+	elog "systemd is supported by ${CATEGORY}/${PN}"
+	elog "Please read for detailed info on this"
+	elog "${CATEGORY}/${PN} README.systemd"
+}
+
+pkg_config() {
+	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
+
+		einfo "Removing depricated entry from /etc/sudoers:"
+		einfo "-  ${VDRSUDOENTRY}"
+
+		cd "${T}"
+		cat >sudoedit-vdr.sh <<-SUDOEDITOR
+			#!/bin/bash
+			sed -i \${1} -e '/\/usr\/share\/vdr\/bin\/vdrshutdown-really.sh *$/d'
+
+		SUDOEDITOR
+		chmod a+x sudoedit-vdr.sh
+
+		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
+
+		einfo "Edited /etc/sudoers"
+	fi
+}
diff --git a/media-tv/gentoo-vdr-scripts/metadata.xml b/media-tv/gentoo-vdr-scripts/metadata.xml
new file mode 100644
index 000000000000..9eb70f5875c8
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
+  <use>
+    <flag name="nvram">Add support for using nvram-wakeup to set wakeup time in bios</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-tv/gtk-v4l/Manifest b/media-tv/gtk-v4l/Manifest
new file mode 100644
index 000000000000..d95ba518d0f9
--- /dev/null
+++ b/media-tv/gtk-v4l/Manifest
@@ -0,0 +1,6 @@
+AUX gtk-v4l-0.4-device-remove-source-on-finalize.patch 1850 SHA256 9284321fd38cdd73089b029cce3b869e2f4a69803ec2b5c86063a9edf6568c08 SHA512 2fea2369c1f2084a71f4f934c870f14b08ddf61fa0ed50fb9de9c8250b431519cf38470d404d8428e667c958c9a1b2a674fc71177f508d85a1b7468b881a2d3c WHIRLPOOL 3899a753f125e719a43e9af3f800d4428234d892ae5bffbeb05c1ddfd2b004c9eaeec4c76be987e90b2e815fc3854488c63817a09a1b0055b6ebe9a620baf8a2
+DIST gtk-v4l-0.4.tar.gz 328732 SHA256 a87fe9e3afc141dd98be7bf8875faa679a914f438611fb01a7b25b75c2d75b6c SHA512 ed0e1245d9b1cfce6612c91dacd09f26850a9420088d7de172c4bd582b70f4427820940e6cf98a831493edfe52d20fb02d6b2d62b695a24127097f50963df321 WHIRLPOOL f53ca9b344a2692c6e11c6a439d0e836d84e721f27a852809d5824ac3d310fc5dfbad44cb3295de3fd6707fa5674cda7bf2fc88c968b5b1e4f5b31ec6bc08b3a
+EBUILD gtk-v4l-0.4.ebuild 806 SHA256 7f96bedb081e7a6dfb969c5f5915373674e085269a64a1b6bb7f430000ea903e SHA512 02f2d08a85b127dc279d8e4659d66522fc4c61ddc9c8688bf82560978a9dc2cb40e7ddda4e9764ca933308a4e75ec5583e7e8604c790a0d2a3a666dbd148dbec WHIRLPOOL 74943c0b559711ce94de3cded5504d9f4d065aa4036578e0f3fabc593251ad5f0c24c69edf28a9cf2badfcf364d00027bc82d56547fa4ff73648c4f41ba18251
+MISC ChangeLog 2605 SHA256 6d94e588a50327c2af3c7fef939e3c8973b8771c3bc9e8aeaba9d6f621f42580 SHA512 e3faa0b8d2096db361a27a9a2a4ba0c28458efe0579280b882e143c95ad17f19c5fb20bbe01cb9d2eea7e8eaa554e742834d901f52b504de76e3d44673d54eec WHIRLPOOL b4c4e28dcbf1471ce460b041115d0447d0c6646843775c88549cd2e5fc5590b0ab88070b27069886cf8ebf57874f47f57480275eb73b225bbbc8265a08c1bea0
+MISC ChangeLog-2015 684 SHA256 fca53b80d7f16e345aad13283f31df5a5c0c15d02d8ad21bd2edc012f60c7dc3 SHA512 a707debb7a71ace8ce73090647d929a81c7a67967c16d0dafabf4f710acded5625ae57d3420f09bea57bacb83bd7f6613b36b8f585ced8be583c47ecfee752a2 WHIRLPOOL cad29d4d186ba0827c7cf0cb26252bff8a2279594a5b22ae6d1baba2732396777735c4db8f92b72113ac95b5b1d7043aa5742ded92ea5cca31a1c7ea19ad44a7
+MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/media-tv/gtk-v4l/files/gtk-v4l-0.4-device-remove-source-on-finalize.patch b/media-tv/gtk-v4l/files/gtk-v4l-0.4-device-remove-source-on-finalize.patch
new file mode 100644
index 000000000000..301c6b152810
--- /dev/null
+++ b/media-tv/gtk-v4l/files/gtk-v4l-0.4-device-remove-source-on-finalize.patch
@@ -0,0 +1,53 @@
+From e7730e2eb0e148e94f6bba13a70ddf61ae94b313 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 9 May 2012 13:00:07 +0200
+Subject: [PATCH] gtk-v4l-device: remove source on finalize
+
+This fixes us from getting events from it, with a user_data argument
+pointing to the finalized object, when the fd gets re-used if another device
+gets plugged in later, and that device then generates ctrl events.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ lib/gtk-v4l-device.c |   10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/lib/gtk-v4l-device.c b/lib/gtk-v4l-device.c
+index c4ce1e5..67e8ccc 100644
+--- a/lib/gtk-v4l-device.c
++++ b/lib/gtk-v4l-device.c
+@@ -43,6 +43,7 @@ enum
+ struct _Gtkv4lDevicePrivate {
+   GList *controls;
+   GIOChannel *channel;
++  guint channel_source_id;
+ };
+ 
+ /* will create gtk_v4l_device_get_type and set gtk_v4l_device_parent_class */
+@@ -166,8 +167,10 @@ gtk_v4l_device_finalize (GObject *object)
+   g_list_foreach (self->priv->controls, gtk_v4l_device_free_control, NULL);
+   g_list_free (self->priv->controls);
+ 
+-  if (self->priv->channel)
++  if (self->priv->channel) {
++    g_source_remove (self->priv->channel_source_id);
+     g_io_channel_unref (self->priv->channel);
++  }
+ 
+   if (self->fd != -1)
+     close (self->fd);
+@@ -303,8 +306,9 @@ gtk_v4l_device_new_control (Gtkv4lDevice *self, struct v4l2_queryctrl *query)
+   r = v4l2_ioctl(self->fd, VIDIOC_SUBSCRIBE_EVENT, &sub);
+   if (r >= 0 && !self->priv->channel) {
+     self->priv->channel = g_io_channel_unix_new (self->fd);
+-    g_io_add_watch (self->priv->channel, G_IO_PRI, gtk_v4l_device_ctrl_event,
+-                    self);
++    self->priv->channel_source_id =
++      g_io_add_watch (self->priv->channel, G_IO_PRI, gtk_v4l_device_ctrl_event,
++                      self);
+   }
+ }
+ 
+-- 
+1.7.10
+
diff --git a/media-tv/gtk-v4l/gtk-v4l-0.4.ebuild b/media-tv/gtk-v4l/gtk-v4l-0.4.ebuild
new file mode 100644
index 000000000000..e703e30893d4
--- /dev/null
+++ b/media-tv/gtk-v4l/gtk-v4l-0.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A control application for Video 4 Linux (based on C and GTK+)"
+HOMEPAGE="http://fedorahosted.org/gtk-v4l/"
+SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2
+	>=media-libs/libv4l-0.6
+	virtual/libgudev:=
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-device-remove-source-on-finalize.patch
+	sed -i -e '/^Categories/s:Application:GTK:' ${PN}.desktop.in || die
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/media-tv/gtk-v4l/metadata.xml b/media-tv/gtk-v4l/metadata.xml
new file mode 100644
index 000000000000..097975e3adc2
--- /dev/null
+++ b/media-tv/gtk-v4l/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
diff --git a/media-tv/ivtv-utils/Manifest b/media-tv/ivtv-utils/Manifest
new file mode 100644
index 000000000000..b3e7e127bf49
--- /dev/null
+++ b/media-tv/ivtv-utils/Manifest
@@ -0,0 +1,7 @@
+AUX ivtv-utils-1.4.0-gentoo.patch 2488 SHA256 2e0801ca1724c6b1feb1335321ffb05bde8402335fb13a06eb878bb6825cbf82 SHA512 552b98643cef842087a47a6bd88a64d8943770356e8d6860a4c40ab43bd4cc550dd452e783d134cf14ee6e2dd22722257fbebf4b6103c7fee3d678f1ceab09f5 WHIRLPOOL 67d8c93364bef52ee22cb246be0648fdd5b63b059e5dac44d05a1d4172743c68aaf709b8c79c4e56660117e60378def21a89566f497c0f4b92f88347cc07a253
+AUX ivtv-utils-1.4.1-overflow.patch 1762 SHA256 6f733004df4c266a9fb9685a9e2da880b3f46b96573ecfdf0a33e904fb1f2a79 SHA512 775acf1bc8b13e811a4aad1d9f7ab3051634e8a7d521a1a594e06262cb9a0d782d55b37bdc93618390253403b5ed98af5756d24522a5f61489401f4ffc71903e WHIRLPOOL 66217d215a387957dfbf90fd57ead1ef2b5e1e06b175d801713257482f6cbb628c7e049fc56cf8ca9c877e672c6b9c0375af275a4e90d1eeb2d6f677325e8c31
+DIST ivtv-utils-1.4.1.tar.gz 189918 SHA256 8eebe8bda62f348779c24522f78fb3c0231e33d303b6381185eeb795fe761ef6 SHA512 719c922fb819ba7f0ca3d4bbede571c416dc9f282bd8a7e2fbe7d9b4298541a104f8a848e113379eeec052206658b7a0a2e0eea1b7917e90f2aee37fe0010bed WHIRLPOOL 2782635126541de34aa78968222baa576171ec1c806b7279eab751805cabbcf2e299dc4f2569bec31f3acc0270ec95bc700c181c5e9994e241af2cc968aec9d5
+EBUILD ivtv-utils-1.4.1.ebuild 901 SHA256 27b151ada5004f36958f79f59652e99e40b776dc18a8d6b554a7f394a3a37ba8 SHA512 de39ffc9d653bace3d8885159ad902f1c726dcc37d430c03a3bf83c53aa93ab6de5ac7e554eae1aaec8271e246240e778678ce91b66098bd5bc548135d5a565f WHIRLPOOL ad48906a6adbb65f7ea369954b479851bc1372c6dfed38b4d6ff0630dbcb86f0a1e9c5d0ee2efb8163e7565510b303a5c7b8331334ac5ccc411da6cb405ebaa6
+MISC ChangeLog 2670 SHA256 88a704d0c47bc00b73ad41803d8ce76eccc1aeb759eecb509944019f0b97df7d SHA512 671bc32008135bc9dc122a38fe88cfc82437bded7c59e754f17c036eabce97e2c0a17a4b378086098d0a496de22088ea0a235f9f0968d8726b52067fbbe4d22f WHIRLPOOL 14fb837eecf1e88ba635904414c49a7da4641f81245abce4358d127b410756f87154e5a07709100407a4d9043f24ec5060475e42041f2cc66590133a2e4e41de
+MISC ChangeLog-2015 3512 SHA256 bb5e85e6e4916859cfa2291d0d42a0f3ab8739dd61f50b0b15b97b9432756590 SHA512 fd3f2e3ea3253b877bafb44aaddc853109a5fa4ee3675c00b25905676af84ac6208bcf826feaef6be968c8fec0c17bf9bf46eb7e7edbd4408f537bff0c899dfa WHIRLPOOL a2900cebd22559a8ca62d798ee65c634e83148ecccb5ea32f52ba871824c1b1a62ddd0bffc30719cf9e25ca76bb4cd2bd90bdff319343ac20404ff2282005314
+MISC metadata.xml 387 SHA256 76294106cddf2c0f498db97493692ca042da2abef03c71eba3f4ab0bbc484dc6 SHA512 22ed4f0b1e523a49f89d2cbd0d8d760fe2b96098d2ed311d7a9fb873337730e822734085a7574e3133e993451e2980815134795f28131fc8398aa537c7d7c3db WHIRLPOOL e37da366ef596a17744d2752bd63ab6fe0338e7485eca2ba42bba4749ce7f4e9184446907670d97e765ea088981beb2ffbcd9801c93a933327e356f475b19a6a
diff --git a/media-tv/ivtv-utils/files/ivtv-utils-1.4.0-gentoo.patch b/media-tv/ivtv-utils/files/ivtv-utils-1.4.0-gentoo.patch
new file mode 100644
index 000000000000..4b75d177e391
--- /dev/null
+++ b/media-tv/ivtv-utils/files/ivtv-utils-1.4.0-gentoo.patch
@@ -0,0 +1,99 @@
+Fixing multiple QA issues
+ * respect user {CC,CXX,LD}FLAGS
+ * fix linking order
+ * make job server for install phase
+
+Don't install ivtv-ctl (bug #333291) and v4l2-ctl (bug #278255)
+Don't install duplicate kernel headers (bug #244584)
+
+https://bugs.gentoo.org/show_bug.cgi?id=321303
+
+Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
+
+--- test/Makefile
++++ test/Makefile
+@@ -7,13 +7,13 @@
+ 	ivtv-osd-dma-test ivtv-fb-colormap-test \
+ 	ivtv-fb-16-bit-test ps-analyzer
+ 
+-CFLAGS = -I../utils -D_GNU_SOURCE -O2 -Wall
+-CXXFLAGS = $(CFLAGS)
+-LDFLAGS = -lm
++CFLAGS += -I../utils -D_GNU_SOURCE -Wall
++CXXFLAGS += -I../utils -D_GNU_SOURCE -Wall
++LDLIBS = -lm
+ 
+ all: $(EXES)
+ 
+-install: all
++install:
+
+ clean: 
+ 	rm -f *.o $(EXES)
+--- utils/Makefile.orig	2010-05-24 15:35:11.321677941 +0000
++++ utils/Makefile	2010-05-24 15:35:15.595615306 +0000
+@@ -9,41 +9,39 @@
+ X86_EXES := ivtvplay ivtv-mpegindex #ivtv-encoder
+ endif
+ 
+-EXES := v4l2-ctl ivtv-ctl ivtv-radio $(X86_EXES)
++EXES := ivtv-radio $(X86_EXES)
+ 
+ BIN := $(EXES) ivtv-tune/ivtv-tune cx25840ctl/cx25840ctl
+ 
+ 
+ HEADERS := linux/ivtv.h linux/ivtvfb.h
+ 
+-CFLAGS = -D_GNU_SOURCE -O2 -Wall -g -I.
+-CXXFLAGS = $(CFLAGS)
++CFLAGS   += -D_GNU_SOURCE -Wall -I.
++CXXFLAGS += -D_GNU_SOURCE -Wall -I.
+ 
+-all:: $(EXES)
+-	$(MAKE) CFLAGS="$(CFLAGS)" -C ivtv-tune
+-	$(MAKE) CFLAGS="$(CFLAGS)" -C cx25840ctl
++all: $(EXES)
++	$(MAKE) $(MAKEOPTS) CFLAGS="$(CFLAGS)" -C ivtv-tune
++	$(MAKE) $(MAKEOPTS) CFLAGS="$(CFLAGS)" -C cx25840ctl
+ 
+ ivtv-ctl: ivtv-ctl.o
+-	$(CC) -lm -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lm
+ 
+ v4l2-ctl: v4l2-ctl.o
+-	$(CXX) -lm -o $@ $^
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -lm
+ 
+ v4l2-dbg: v4l2-dbg.o v4l2-driverids.o v4l2-chipids.o
+-	$(CXX) -lm -o $@ $^
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -lm
+ 
+ ivtvplay: ivtvplay.cc
+-	$(CXX) $(CXXFLAGS) -lm -lpthread -o $@ $^
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -lm -lpthread
+ 
+ encoder.o: encoder.c
+ 	$(CC) $(CFLAGS) -DVIDEO_PORT=0 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -c $^
+ 
+ ivtv-encoder: enc_mindex.o enc_chann.o encoder.o
+-	$(CC) -lpthread -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lpthread
+ 
+-install: all
+-	install -d $(DESTDIR)/$(HDRDIR)
+-	install -m 0644 $(HEADERS) $(DESTDIR)/$(HDRDIR)
++install:
+ 	install -d $(DESTDIR)/$(BINDIR)
+ 	install -m 0755 $(BIN) $(DESTDIR)/$(BINDIR)
+ 
+--- Makefile
++++ Makefile
+@@ -1,6 +1,6 @@
+ all clean install:
+-	make -C utils $@
+-	make -C test $@
++	$(MAKE) -C utils $@
++	$(MAKE) -C test $@
+ 
+ distclean: clean
+ 
diff --git a/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-overflow.patch b/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-overflow.patch
new file mode 100644
index 000000000000..1c2a66159639
--- /dev/null
+++ b/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-overflow.patch
@@ -0,0 +1,71 @@
+http://bugs.gentoo.org/339405
+
+--- utils/cx25840ctl/cx25840ctl.c
++++ utils/cx25840ctl/cx25840ctl.c
+@@ -57,7 +57,7 @@
+ 		return 0;
+ 	}
+ 
+-	sprintf(device, "/dev/i2c-%s", opt.inputs[0]);
++	snprintf(device, sizeof(device), "/dev/i2c-%s", opt.inputs[0]);
+ 
+ 	// open the device
+ 	if ((fd = open(device, O_RDWR)) < 0)
+@@ -67,7 +67,7 @@
+ 		exit(1);
+ 	}
+ 
+-	sprintf(sysfile, "/sys/bus/i2c/devices/%s-%04x/name", opt.inputs[0], address);
++	snprintf(sysfile, sizeof(sysfile), "/sys/bus/i2c/devices/%s-%04x/name", opt.inputs[0], address);
+ 	if ((fp = fopen(sysfile, "r")) != NULL)
+ 	{
+ 		fgets(name, sizeof(name), fp);
+--- utils/ivtv-ctl.c
++++ utils/ivtv-ctl.c
+@@ -358,7 +358,7 @@
+ 	__u32 reset = 0;
+ 	int new_debug_level, gdebug_level;
+ 	double timestamp;
+-	char ptsstr[64];
++	char ptsstr[256];
+ 	char short_options[26 * 2 * 2 + 1];
+ 
+ 	if (argc == 1) {
+@@ -420,7 +420,7 @@
+ 				static char newdev[20];
+ 				char dev = device[0];
+ 
+-				sprintf(newdev, "/dev/video%c", dev);
++				snprintf(newdev, sizeof(newdev), "/dev/video%c", dev);
+ 				device = newdev;
+ 			}
+ 			break;
+@@ -600,7 +600,7 @@
+ 		char buf[20];
+ 		new_debug_level = debug_level;
+ 
+-		sprintf(buf, "%d", debug_level);
++		snprintf(buf, sizeof(buf), "%d", debug_level);
+ 		if (dowrite(buf, "/sys/module/ivtv/parameters/debug") == 0) {
+ 			printf(" set debug level: ");
+ 			print_debug_mask(new_debug_level);
+--- utils/v4l2-ctl.cpp
++++ utils/v4l2-ctl.cpp
+@@ -416,7 +416,7 @@
+ {
+ 	char buf[10];
+ 
+-	sprintf(buf, "%08x", num);
++	snprintf(buf, sizeof(buf), "%08x", num);
+ 	return buf;
+ }
+ 
+@@ -1449,7 +1449,7 @@
+ 				static char newdev[20];
+ 				char dev = device[0];
+ 
+-				sprintf(newdev, "/dev/video%c", dev);
++				snprintf(newdev, sizeof(newdev), "/dev/video%c", dev);
+ 				device = newdev;
+ 			}
+ 			break;
diff --git a/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild b/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
new file mode 100644
index 000000000000..14f05778ee08
--- /dev/null
+++ b/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="IVTV utilities for Hauppauge PVR PCI cards"
+HOMEPAGE="http://www.ivtvdriver.org/"
+SRC_URI="http://dl.ivtvdriver.org/ivtv/archive/1.4.x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="perl"
+
+DEPEND="!media-tv/ivtv"
+RDEPEND="${DEPEND}
+	media-tv/v4l-utils
+	perl? (
+		dev-perl/Video-Frequencies
+		dev-perl/Video-ivtv
+		dev-perl/Config-IniFiles
+		virtual/perl-Getopt-Long
+		dev-perl/Tk
+		)"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.4.0-gentoo.patch \
+		"${FILESDIR}"/${PN}-1.4.1-overflow.patch
+}
+
+src_compile() {
+	tc-export CC CXX
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+	dodoc ChangeLog README doc/*
+
+	if use perl; then
+		dobin utils/perl/*.pl
+		dodoc utils/perl/README.ptune
+	fi
+}
diff --git a/media-tv/ivtv-utils/metadata.xml b/media-tv/ivtv-utils/metadata.xml
new file mode 100644
index 000000000000..c66a729df574
--- /dev/null
+++ b/media-tv/ivtv-utils/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>cardoe@gentoo.org</email>
+    <name>Doug Goldstein</name>
+  </maintainer>
+  <longdescription>
+    Driver for ivtv based tv tuner cards, currently supports Hauppauge 
+    PVR-[23]50 cards
+  </longdescription>
+</pkgmetadata>
diff --git a/media-tv/ivtvplayer/Manifest b/media-tv/ivtvplayer/Manifest
new file mode 100644
index 000000000000..0307339a5168
--- /dev/null
+++ b/media-tv/ivtvplayer/Manifest
@@ -0,0 +1,5 @@
+DIST ivtvplayer-0.1.3.tar.gz 24159 SHA256 4727057b97a5e527e9617cd14e6ee9d892532fbb5e455d70166af07c1724aa17 SHA512 620502620ff1795145183249131f0d5e94e559ca367b7b0bc3a57b458d79d82424502b098e054207eac503ed97086fc04b2fd7b71a20f8c5f2bbb98541ba1e5f WHIRLPOOL 585ca071e131060240c973a4d442006a041fb530c9ad955a07b9e7d7dcbe24cbad7e3134cabcc87b653fc532633de3ae93e7bf84f20fd6b4aee308848de82ca1
+EBUILD ivtvplayer-0.1.3-r1.ebuild 908 SHA256 49470313c781fbd2255645ac9521afc29be98014bd63f5462e3b4a80055361c1 SHA512 4f066a6789bd3daec3cc6f761793cdc7c4602dac5634927bcc5a4bbf58f84acd55d688b9b5bc7e20dacac1bb42b03552bde2cb4caf192dad10efa197d1be5065 WHIRLPOOL 92ef185042c6244cc1b10fda467618cf34a68c4b8654b8acea0c15c559f5d4fb4a39b5a2ea3fda780305548957052c3d677699132a8e2f23e5666bb201e7553d
+MISC ChangeLog 2884 SHA256 fb16e94f4e1850900519ebf9147470ca3d4ed30d602ad08d12aa18e95939c0b7 SHA512 ef005fb99039fc410b5dfdb01f65f9708332ba02f5958d25f0857e69f715dc51111da1ecdc7aac96cfb59d86e27c4f1de5d7d2d5e2388ebd7f93da7af35dcaa9 WHIRLPOOL 9d3d1364d67df9bbb928521fcad8f30edb03ca86065c0c43959ebe0f5490f6dfc120812c5846a63370f341a7b2b0fb03a7f28618abc0fc026b5b95dfe1a1dc09
+MISC ChangeLog-2015 932 SHA256 941171b957c12457e45316711237b6c2412b1b721b80c77b787384227bd8cb2d SHA512 90a559d24944cc237d992485319fe40cf9f8d32b6889d08e7758447fd9f716ec47ed920df54efae06805eef5ac5caa2cebb1e75ea248cb3ca6fb3ce6dc470318 WHIRLPOOL 682410de5e8e4a46028216c0b15c9180ad4851ac08bb08adb7f1b9968841c73a09ec27a87246e853297457c6fcf1826746b388ac3d15a43dbd68695832dface4
+MISC metadata.xml 247 SHA256 d799453a4ece620cf165958c3ecbb6960442846f8efc75d119b44d1254d475ee SHA512 50e21cb207d9753832d0c385f358c779437b8e40c1f40b15fe5cb3ef1d54f754f1360c8c40026e47895485dcb2ed31e2a1fb19f5b04776dc5aa0eea99d809b34 WHIRLPOOL 4c351fcdb8e92d011f26b77cf145cc05b1a8428de91756bc7ef995eabf8328af99809d2978c0d4aa9adc53b1c320949b4a01c4b3321d0d14f2eecb5abdf77fb3
diff --git a/media-tv/ivtvplayer/ivtvplayer-0.1.3-r1.ebuild b/media-tv/ivtvplayer/ivtvplayer-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..4dbdb1a2f761
--- /dev/null
+++ b/media-tv/ivtvplayer/ivtvplayer-0.1.3-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Simple IVTV command line TV and radio player with support of LIRC"
+HOMEPAGE="https://sourceforge.net/projects/ivtvplayer/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk xosd"
+RDEPEND="media-tv/v4l-utils
+	 || ( media-video/mplayer[v4l]
+		media-video/mplayer[dvb] )
+	 media-sound/alsa-utils
+	 dev-perl/XML-Simple
+	 gtk? ( dev-perl/Gtk2 )
+	 xosd? ( dev-perl/X-Osd )
+	 >=dev-perl/Lirc-Client-1.50"
+DEPEND=""
+
+src_install() {
+	dobin bin/itv
+	dobin bin/iradio
+	if use gtk ; then
+		dobin bin/ictl
+	fi
+	dodoc doc/README doc/CHANGES
+	dodoc conf/*
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "Example of itv, iradio and its LIRC configuration file is located in"
+	einfo "directory /usr/share/doc/${PF}/."
+	einfo ""
+}
diff --git a/media-tv/ivtvplayer/metadata.xml b/media-tv/ivtvplayer/metadata.xml
new file mode 100644
index 000000000000..72a393cd3ce7
--- /dev/null
+++ b/media-tv/ivtvplayer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">ivtvplayer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
new file mode 100644
index 000000000000..4f25b03cd326
--- /dev/null
+++ b/media-tv/kodi/Manifest
@@ -0,0 +1,23 @@
+AUX generate.sh 803 SHA256 8e32ccbd56e2d36d9d0504282881b3ee1d33ee7293827b75444b917093955d09 SHA512 064b11416be5583202d92ab0c87156b7098bf4a97c7875ad3a0b11e048ebcfd69aeb22653e8175e7ad0cd400ed2d9c27aa8d1d25be04d34438f4c4f86e329986 WHIRLPOOL 3565b3f6ef9650bfbb3b9e4b6ee5b71d1d245e62520f00f88f1c0b2ade6bf923200a1e94efdbbea8d5e53449f38ac78bc4714280e276e085c91ada404ebfeb89
+AUX kodi-17.3-ftpparse_string.patch 2076 SHA256 332c31ff05d41813021a14b337f903b0fa096196036bbf4fd7ebe4c78447da8d SHA512 d23865fe6624291d88c0a7674aa52b7e15889a96eb41590827248d8215643f773d0f02871efa858d2c533674627d4e6ebc69cba56be6ec9b58277bb2d6c204df WHIRLPOOL 7ddc32530f91840f5387c6767676cb17e5e243116821a7c1bef45750a17ee71895a74d9fb2e1260828537cacca89036a24fd2ce346a3eaf1ed5b0a91bca11335
+AUX kodi-17.3-unrar-vulnerability.patch 1883 SHA256 85e60dba6e78a7dd6c39667898cd1cbb2da176d5d9917006e09c015f4fa8028c SHA512 5c59a3c47ea9bcd21712da0ca0dc6bf0618f2f9cad6fd011ebcc94ae90868159e528237727e174a5b137b2e6ef2cb895c01c1b4be91cae0c402697a7d85791aa WHIRLPOOL 701a33d7c88105bcb108cb1eb006491f0a45baffaae9a4b66e3de2d7820dcb0888162b54321276c3cf5afb90a03f7eece1c2392f30d1fb5a535872502d49214b
+AUX kodi-17.4-mariadb.patch 999 SHA256 cf25973c666e7f61b8068f19b1bf55273e1b956c44855c4b0313121e20ebbd27 SHA512 4262dbcab7acaf495cb9fb4780cdc32c7f9f1933a0246b5cd8b4d2c94cb665b8cfba6900cd1677ce5a2703f3579c7d54a209876963146bc8ebedb11e7dbc11c1 WHIRLPOOL b59c1d8a19388c15158d73ea14d5e49bc5994ff721280298fc669a62bb298577856f6a5526c6da4506c886a81fa1fa2e8812a475fbb0c678b0a6eb737f5b9c60
+AUX kodi-cmake-no-java.patch 2297 SHA256 571c477b39531c3d924a18f3f404485875fe4e7752d700984cc4140db804fce5 SHA512 9eb7d64694411ce7e47976291fabce96b055c8b4b60bdd7cd37f992d8a3c813de1ef828464e6996124303b015b5c64eccbade10290747180f4ac1fe6a1747d19 WHIRLPOOL 68cceb70ec22cd636586e7bdbe27f1dcd27d689647e7482d15497882a228f3aa73750436926ab3b16008119c9faca65511486fcaa235ce35e566d267f1b63c44
+DIST ffmpeg-kodi-3.1.6-Krypton.tar.gz 11170735 SHA256 01f914742f6af8afd1d2eb076425975e24c4eed75f5d57f1c816086dc4625192 SHA512 060d06946ee71106196587b36eccf7fb7d0710d6ee72dae2e08f23e5bf7e223a3bac77f1730121f494ecf5f860a40635978023317a06f27a3b28752fa537f1a1 WHIRLPOOL ae6f0b3b798e92cd72aed8eb3e6dc82708c86052590b30ae93e1b8275dca89c5a4470dbc8ff51bfefd72bd40036b7bd1b7695ee77e90bab35b5e80bcb8b79826
+DIST ffmpeg-kodi-3.1.9-Krypton-17.4.tar.gz 11186492 SHA256 ead247d5d804399951531ba904d1b59b60c9163e2d8fbab014cf495a40f91266 SHA512 4f399578f95d42357c73dc01fb5372042070ce11ff82e97695cc5a69574f35b9a860042ea0d43cfd562f03ac06fd888c074a838944c0c1aef7a692f89ea85dda WHIRLPOOL 24c3c926bb0f204a66d4e01c9d96e34ab22d20389f9274ead9ff01393c62a1502f8604f9096f36f1fafb5c0526d6ccb5062a8b90e34a9773f2cfa89f8f87d069
+DIST ffmpeg-kodi-3.3.3-Leia-Alpha-1.tar.gz 11865820 SHA256 d8767a13f6968a79657629c61aa97db265f699401db8c00ebfe69eb9d3bad262 SHA512 ee3ef407501493834c1ccdc63b26c4ab521d27cd470d4ce3dabd7d34fa1ac8c1690a83639ed9cd8d38ca0039a7ae2a89812a6b614f21542e7fd5354ab5f10596 WHIRLPOOL 0117ea950fbae6d59ac3c6f322cbc8f7fbae45400a7c46eda27f7b172836f1a70812346a091692e5cdac55870ccb6ae6698b24a747fc7c7f2c578591736a41f3
+DIST kodi-17.3-generated-addons.tar.xz 57548 SHA256 6175ac64dbcbe2c747cd77f876b8e2bb3e516daa4707d7ccf768d76a89b27bd1 SHA512 56d1912f5e24d3fcda3010783a5b32728ece9c81c718ac6f8db2cbbd096059fe97b8d1971b34bbde1216558a8e5db874f7b2179e1f18942774ae5486167bca9a WHIRLPOOL 1023c69687ac9958e72ab70c15a280800ea4866f8e0dc2740d9bfd50f75bef71c28f23f01a841f254022610e1388d14217ea384213161264dae721515c9dabe3
+DIST kodi-17.3.tar.gz 58466114 SHA256 1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1 SHA512 832071c3e9f332281a767f29168f6d6d003a86b42df849e81d907c2280f81f959ae42a850eddc889ae2280bba6106de3355e701ff2d71c88ee14cb20c84e7987 WHIRLPOOL 0ed5585f891459292a1cfd4451bee1f2b19af217e462b810468b00395ee024ba346300f84c67c6dc428d27abcaef4eec9dc7b844e66e2ab83543830a106a1634
+DIST kodi-17.4-generated-addons.tar.xz 57576 SHA256 dffa734a5fd40493b338ce76cdf49e42572b437fd449ceded3183ac09929e015 SHA512 80bb6b159c3556c75ad02110c5431fbc21339b74988421269f049cdf9b630a7e819aa5816f315aa7279247cab3d09680c5966449642d0c3e25ef1c789b285581 WHIRLPOOL 39715af523582b1eb982b6da7bb6f2a6557f99f9bb38cfd69899f0e92db977cf965648c1ff2ad6bf2e77d09b26ef655256b5c1025bc224984f0040a3713958ba
+DIST kodi-17.4.tar.gz 58475144 SHA256 b05e11b2d108222bfc3ff0c9a466d798c0feedf1228166239948e6ed37c3cb4f SHA512 fc4eff6606c84459ab24323888d39bf1f5d433aaf7136c17d85631f768761f61e498297c500befc986dd6de14de87a5a28f7a9c36c8d7c35d49ca15c99db37ef WHIRLPOOL 15f35516da71f9e64b4e7fdfa2a285236961db36ccc98fe2fa65809a0ef355c5e7b2a37cf3e36cd3bc9bc6717a3e26b7537e77d8828c09daaca7d79f9150c7d6
+DIST libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz 95395 SHA256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34 SHA512 12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9 WHIRLPOOL 8570ad8d2b6e629cc1c7e544be2853cab3bb50fd73438cea47c7a0919b251cecf906f7446ef3714c54ee3e636278dc0dabab47f772440624ff49877068b7b50a
+DIST libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz 130603 SHA256 8e3f0563e16df898fe115e1723e3f78dbc953f6e9cf4f04568add215371d9ed2 SHA512 901c6f24afa1d78b6ed78d1ee30daf634ca0bbc0467ef9cc3416bcab4fbc4fda6869ffa051791d85c0b510de748805328627681ef044668a7857299f0035232e WHIRLPOOL 588d060f418f18ef193061ff88260ac7929647b2babde5b78ab73141ffc7f3782ce1254bfee1234ec0da8bb28bc16ede301b4ec1e2d3073b9c6d22cb526f06ca
+DIST libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz 124326 SHA256 e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b SHA512 e59ae0bfdc62698e407e3d70503c6a7c5e308545c9dae7843e25db3b5b62d9b26256be77ef4e884263add6b4abec3438c324bfd5715f6ca2ce7fa5962d43a6c2 WHIRLPOOL b42130027d201e545fabc27677bd4238d04bcbc5a0e622ca6da396ac340ea94b5c60004557334464a31dac880603dab99e2f189e41d6cddbe9e32728c626085a
+EBUILD kodi-17.3-r1.ebuild 8578 SHA256 fa8ebd38137a7df6c484cab7042f1303cf1284287f3b80a9f2ed3fcd43675d7d SHA512 c28e83c02371954747024c2d28d7348632773d7977ded7870d4c85242b4a4e3bf1f54008beff6fcfd50ff0a42cf0131d1fa25a09c83326f22371ce30bfa9cbb9 WHIRLPOOL 97ee56487651ee966fbd054234d456f05576675f1e13453a1a3d4cc28b001683600f8f5a1850e48c8f75aa121f63eab9134bd040c20ccf20c516f381d163f3d4
+EBUILD kodi-17.3.ebuild 8451 SHA256 786a0a33fcbc3a003989d0e6b733a0e6fc0d1b31c7f284d07cf12220cae35dc6 SHA512 de1310214a2a5087793dd6040786c0c97ed7c3fbdbba933ace0dc3623b8c58ac91bad0591a37e9c021d5b548567f9d5cf76dbd87685a80f317fd50f8bc7c7e78 WHIRLPOOL b5ca0a7864d4ce135660c93625c1761641f31b79e74f2f49846a2bcad7a431d46ad26fd8852a155ebf0ca1c2aa3d77543116fe29e6360ab8831b38f11e791f03
+EBUILD kodi-17.4-r1.ebuild 8791 SHA256 3060e2630be81ec93d730d9273a5d5ebdb056f33e74b1c7cac846e7afa5106f4 SHA512 f691fbc68fbb5e2c4fd7406f370071735c4f30b487c957f43b6b424f7f0b6c99e184b7e0bd752a224638cb456d25a54e16e7dcf957cd1cdead777d7bf07e32f7 WHIRLPOOL 6aacfc2b20545e8701e3e9ba358aea73b5a0a89083bd086bbabc1b7549d58ce2016077d85320e65c65b8cf318465f1ccaa2a802ac66be1056b50397edfab8a12
+EBUILD kodi-17.4.ebuild 8681 SHA256 19035885bb21b3e78cec298e749f77949857d5a5647ebc8524263684e7d22d99 SHA512 b4c5456292e67fd3051114f5d6d7de9d6241af0ba55c7d850e2d38bf58c0d22134c05f8134312e45f947e5dc736935a925f6b6b24f31465c879b5122ea86a714 WHIRLPOOL 56980d9351a6a992618cdccec8a77da66170a7ad14a62a4f4883c5e016f2135384c461b1d742d8cbb784bd1c7e3a065720f1c4faedfce9a035399d33a3363798
+EBUILD kodi-9999.ebuild 9403 SHA256 d3c8f0647982189ba21dcc0600fd2e4285bcf29bcee0e5c0247b1fefd4f77236 SHA512 7cde42449aa74ffd11bc0c66269648736025c9f021206ae0639816b604b75913b4e65a15fa4e9e4d16c66d7362c966fb8583438cbb93faac0bbcddc5f4a9cdab WHIRLPOOL bafdfd78ef353d3115d5cdee9061c59ae5646dd63c7068e6e236635fe5e5410154d49ba6057ab0c49bd66a82304d069af5dee9b4c27984bbb985d7291806dad6
+MISC ChangeLog 10199 SHA256 3f5e1658ba52c3c11da3a40af2339ab0cae0416e7d0d9b0b3433f1d02e6e3edc SHA512 b437c274abf9d6b4651468397b8be5df7cd4e5bf1fdea94120e0c642d368bb3af6bc90f9253c940c65ef5c2352d9e7063041bd73efbf0f9e1e43876f5298070c WHIRLPOOL f8945ddb9ee4c3ef8ddac0bfc216ea3a5307b04a6f8d9c94c6338a880efe484e6a4654dab0baf3bd721c810da5670d8ba390132b15fc24a5876b1ddeb472252d
+MISC ChangeLog-2015 3574 SHA256 5c2511969e6a8bb6539549dd321d0883acf23d2e2be8232a04f1ce8bed0a84b2 SHA512 49f435da4fee73c3406d7c26ba752c584a9d95469cd75cdc5c4154271093ed9d4d8d9c3cce789fcaea361c389b89643af593599733e97d34a9d8a771cc14936a WHIRLPOOL 5b82789cdbac9fc836b79a922d7604dc3c107f94024b4a6092155baf7e19aceb711be0ff6dc64ea2a4b6de3a2c54a1a457a9c1daee05ebec96c94c7e68fa21ae
+MISC metadata.xml 1716 SHA256 b3f5652694008ec0fba636013aefdeca3707abc43e0561041d31a5d4d5dedfcf SHA512 4ea0d31caa3a4c10ff5a421fa830c9db3eeb2628cecc19759ad218eb551d2c4382016ec5655a5c5be1e257eec29cad0717523a9fe3f251ff762cdf0ba60b4355 WHIRLPOOL 68819dd60cafb92496e2776fd94ebb0167477e45d5ab3063e351ecbe51ab714fb3fdeca9dec4654d0d185a1284c47265180e50973a0a919a91625b7a0a58182d
diff --git a/media-tv/kodi/files/generate.sh b/media-tv/kodi/files/generate.sh
new file mode 100755
index 000000000000..2e5b67fb90e1
--- /dev/null
+++ b/media-tv/kodi/files/generate.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+# Generate the various interface files that normally requires java.
+# This makes building the release versions much nicer.
+
+set -eux
+
+PV=$1
+PN=kodi
+P="${PN}-${PV}"
+DISTDIR="/usr/portage/distfiles"
+GITDIR="/usr/local/src/kodi/git"
+
+if [[ ${PV} != "9999" ]] ; then
+	rm -rf xbmc-*/
+	tar xf ${DISTDIR}/${P}.tar.gz
+	d=$(echo xbmc-*/)
+else
+	stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d)
+	P+="-${stamp}"
+	cd ${GITDIR}
+	d=.
+fi
+#cd ${d} && git init . && git add . && git commit -qmm && cd ..
+make -C ${d} -j -f codegenerator.mk
+tar="${DISTDIR}/${P}-generated-addons.tar.xz"
+tar cf - \
+	${d}/xbmc/interfaces/python/generated/*.cpp \
+	${d}/xbmc/interfaces/json-rpc/ServiceDescription.h \
+	| xz > "${tar}"
+if [[ ${PV} != "9999" ]] ; then
+	rm -rf xbmc-*/
+fi
+
+du -b "${tar}"
diff --git a/media-tv/kodi/files/kodi-17.3-ftpparse_string.patch b/media-tv/kodi/files/kodi-17.3-ftpparse_string.patch
new file mode 100644
index 000000000000..da8d57a3d6b2
--- /dev/null
+++ b/media-tv/kodi/files/kodi-17.3-ftpparse_string.patch
@@ -0,0 +1,82 @@
+From 634153c85115b44015cdb1ddd6263f5a87e4e41b Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Sun, 7 May 2017 17:30:47 +0300
+Subject: [PATCH] FTPParse.cpp: use std::string
+
+---
+ xbmc/filesystem/FTPParse.cpp | 44 ++++++++++++++++++++++----------------------
+ 1 file changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/xbmc/filesystem/FTPParse.cpp b/xbmc/filesystem/FTPParse.cpp
+index 8dd9633ae19e..d78349adb580 100644
+--- a/xbmc/filesystem/FTPParse.cpp
++++ b/xbmc/filesystem/FTPParse.cpp
+@@ -30,7 +30,7 @@ CFTPParse::CFTPParse()
+   m_time = 0;
+ }
+ 
+-string CFTPParse::getName()
++std::string CFTPParse::getName()
+ {
+   return m_name;
+ }
+@@ -55,16 +55,16 @@ time_t CFTPParse::getTime()
+   return m_time;
+ }
+ 
+-void CFTPParse::setTime(string str)
++void CFTPParse::setTime(std::string str)
+ {
+   /* Variables used to capture patterns via the regexes */
+-  string month;
+-  string day;
+-  string year;
+-  string hour;
+-  string minute;
+-  string second;
+-  string am_or_pm;
++  std::string month;
++  std::string day;
++  std::string year;
++  std::string hour;
++  std::string minute;
++  std::string second;
++  std::string am_or_pm;
+ 
+   /* time struct used to set the time_t variable */
+   struct tm time_struct = {};
+@@ -334,21 +334,21 @@ int CFTPParse::getDayOfWeek(int month, int date, int year)
+   return day_of_week;
+ }
+ 
+-int CFTPParse::FTPParse(string str)
++int CFTPParse::FTPParse(std::string str)
+ {
+   /* Various variable to capture patterns via the regexes */
+-  string permissions;
+-  string link_count;
+-  string owner;
+-  string group;
+-  string size;
+-  string date;
+-  string name;
+-  string type;
+-  string stuff;
+-  string facts;
+-  string version;
+-  string file_id;
++  std::string permissions;
++  std::string link_count;
++  std::string owner;
++  std::string group;
++  std::string size;
++  std::string date;
++  std::string name;
++  std::string type;
++  std::string stuff;
++  std::string facts;
++  std::string version;
++  std::string file_id;
+ 
+   /* Regex for standard Unix listing formats */
+   pcrecpp::RE unix_re("^([-bcdlps])" // type
diff --git a/media-tv/kodi/files/kodi-17.3-unrar-vulnerability.patch b/media-tv/kodi/files/kodi-17.3-unrar-vulnerability.patch
new file mode 100644
index 000000000000..95644d6921e7
--- /dev/null
+++ b/media-tv/kodi/files/kodi-17.3-unrar-vulnerability.patch
@@ -0,0 +1,45 @@
+See https://trac.kodi.tv/ticket/17510
+diff --git a/lib/UnrarXLib/rarvm.cpp b/lib/UnrarXLib/rarvm.cpp
+index 901c35dcb4..42df0a0110 100644
+--- a/lib/UnrarXLib/rarvm.cpp
++++ b/lib/UnrarXLib/rarvm.cpp
+@@ -873,14 +873,16 @@ void RarVM::ExecuteStandardFilter(VM_StandardFilters FilterType)
+       break;
+     case VMSF_DELTA:
+       {
+-        int DataSize=R[4],Channels=R[0],SrcPos=0,Border=DataSize*2;
+-        SET_VALUE(false,&Mem[VM_GLOBALMEMADDR+0x20],DataSize);
+-        if (DataSize>=VM_GLOBALMEMADDR/2)
+-          break;
+-        for (int CurChannel=0;CurChannel<Channels;CurChannel++)
++        uint DataSize=R[4],Channels=R[0],SrcPos=0,Border=DataSize*2;
++        if (DataSize>VM_MEMSIZE/2 || Channels>MAX3_UNPACK_CHANNELS || Channels==0)
++          break;
++
++        // Bytes from same channels are grouped to continual data blocks,
++        // so we need to place them back to their interleaving positions.
++        for (uint CurChannel=0;CurChannel<Channels;CurChannel++)
+         {
+           byte PrevByte=0;
+-          for (int DestPos=DataSize+CurChannel;DestPos<Border;DestPos+=Channels)
++          for (uint DestPos=DataSize+CurChannel;DestPos<Border;DestPos+=Channels)
+             Mem[DestPos]=(PrevByte-=Mem[SrcPos++]);
+         }
+       }
+diff --git a/lib/UnrarXLib/unpack.hpp b/lib/UnrarXLib/unpack.hpp
+index 83fb0f0254..36ac30d181 100644
+--- a/lib/UnrarXLib/unpack.hpp
++++ b/lib/UnrarXLib/unpack.hpp
+@@ -1,6 +1,12 @@
+ #ifndef _RAR_UNPACK_
+ #define _RAR_UNPACK_
+ 
++// Limit maximum number of channels in RAR3 delta filter to some reasonable
++// value to prevent too slow processing of corrupt archives with invalid
++// channels number. Must be equal or larger than v3_MAX_FILTER_CHANNELS.
++// No need to provide it for RAR5, which uses only 5 bits to store channels.
++#define MAX3_UNPACK_CHANNELS      1024
++
+ enum BLOCK_TYPES {BLOCK_LZ,BLOCK_PPM};
+ 
+ struct Decode
diff --git a/media-tv/kodi/files/kodi-17.4-mariadb.patch b/media-tv/kodi/files/kodi-17.4-mariadb.patch
new file mode 100644
index 000000000000..6def8f8a3043
--- /dev/null
+++ b/media-tv/kodi/files/kodi-17.4-mariadb.patch
@@ -0,0 +1,23 @@
+From ff848b104182467e5048351fdf27a07dd55a34a6 Mon Sep 17 00:00:00 2001
+From: Wolfgang Schupp <w.schupp@a1.net>
+Date: Tue, 29 Aug 2017 09:08:05 +0200
+Subject: [PATCH] Merge pull request #12727 from candrews/patch-6
+
+[cmake] FindMySqlClient: Compatibility with MariaDB
+---
+ project/cmake/modules/FindMySqlClient.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/project/cmake/modules/FindMySqlClient.cmake b/project/cmake/modules/FindMySqlClient.cmake
+index ceccea39b1e3..7b485778e4fc 100644
+--- a/project/cmake/modules/FindMySqlClient.cmake
++++ b/project/cmake/modules/FindMySqlClient.cmake
+@@ -21,7 +21,7 @@ else()
+   set(EXTRA_FIND_ARGS)
+ endif()
+ 
+-find_path(MYSQLCLIENT_INCLUDE_DIR mysql/mysql_time.h)
++find_path(MYSQLCLIENT_INCLUDE_DIR NAMES mysql/mysql.h mysql/server/mysql.h)
+ find_library(MYSQLCLIENT_LIBRARY_RELEASE NAMES mysqlclient libmysql
+                                          PATH_SUFFIXES mysql
+                                          ${EXTRA_FIND_ARGS})
diff --git a/media-tv/kodi/files/kodi-cmake-no-java.patch b/media-tv/kodi/files/kodi-cmake-no-java.patch
new file mode 100644
index 000000000000..2d965ab351ee
--- /dev/null
+++ b/media-tv/kodi/files/kodi-cmake-no-java.patch
@@ -0,0 +1,56 @@
+diff --git a/xbmc/interfaces/swig/CMakeLists.txt b/xbmc/interfaces/swig/CMakeLists.txt
+index 6e676159eb..d45a2ecbab 100644
+--- a/xbmc/interfaces/swig/CMakeLists.txt
++++ b/xbmc/interfaces/swig/CMakeLists.txt
+@@ -1,43 +1,21 @@
+ function(generate_file file)
+-  set(classpath ${GROOVY_DIR}/groovy-all-${GROOVY_VER}.jar
+-                ${GROOVY_DIR}/commons-lang-${COMMONS_VER}.jar
+-                ${CORE_SOURCE_DIR}/tools/codegenerator
+-                ${CMAKE_CURRENT_SOURCE_DIR}/../python)
+-  if(NOT CORE_SYSTEM_NAME STREQUAL windows)
+-    set(devnull "/dev/null")
+-    string(REPLACE ";" ":" classpath "${classpath}")
+-  else()
+-    set(devnull "nul")
+-  endif()
+-
+-  set(CPP_FILE ${file}.cpp)
+-  add_custom_command(OUTPUT ${CPP_FILE}
+-                     COMMAND ${SWIG_EXECUTABLE}
+-                     ARGS -w401 -c++ -o ${file}.xml -xml -I${CORE_SOURCE_DIR}/xbmc -xmllang python ${CMAKE_CURRENT_SOURCE_DIR}/../swig/${file}
+-                     COMMAND ${Java_JAVA_EXECUTABLE}
+-                     ARGS -cp "${classpath}" groovy.ui.GroovyMain ${CORE_SOURCE_DIR}/tools/codegenerator/Generator.groovy ${file}.xml ${CMAKE_CURRENT_SOURCE_DIR}/../python/PythonSwig.cpp.template ${file}.cpp > ${devnull}
+-                     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../swig/${file})
++  set(CPP_FILE ${CORE_SOURCE_DIR}/xbmc/interfaces/python/generated/${file}.cpp)
+   set(SOURCES ${SOURCES} "${CPP_FILE}" PARENT_SCOPE)
+ endfunction()
+ 
+-find_package(Java COMPONENTS Runtime REQUIRED)
+ find_package(SWIG REQUIRED)
+ 
+ # The generated bindings
+-set(INPUTS AddonModuleXbmcaddon.i
+-           AddonModuleXbmcgui.i
+-           AddonModuleXbmc.i
+-           AddonModuleXbmcplugin.i
+-           AddonModuleXbmcvfs.i
+-           AddonModuleXbmcwsgi.i)
+-
+-set(GROOVY_DIR ${CORE_SOURCE_DIR}/tools/codegenerator/groovy)
+-set(GROOVY_VER 2.4.4)
+-set(COMMONS_VER 2.6)
++set(INPUTS AddonModuleXbmcaddon
++           AddonModuleXbmcgui
++           AddonModuleXbmc
++           AddonModuleXbmcplugin
++           AddonModuleXbmcvfs
++           AddonModuleXbmcwsgi)
+ 
+ foreach(INPUT IN LISTS INPUTS)
+   generate_file(${INPUT})
+-  list(APPEND GEN_SRCS ${CMAKE_CURRENT_BINARY_DIR}/${INPUT}.cpp)
++  list(APPEND GEN_SRCS ${CMAKE_CURRENT_BINARY_DIR}/${INPUT}.i.cpp)
+ endforeach()
+ 
+ add_library(python_binding STATIC ${SOURCES})
diff --git a/media-tv/kodi/kodi-17.3-r1.ebuild b/media-tv/kodi/kodi-17.3-r1.ebuild
new file mode 100644
index 000000000000..439cdcf8d0a0
--- /dev/null
+++ b/media-tv/kodi/kodi-17.3-r1.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Does not work with py3 here
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1
+
+LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
+LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
+LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
+FFMPEG_VERSION="3.1.6"
+CODENAME="Krypton"
+PATCHES=(
+	"${FILESDIR}/${P}-ftpparse_string.patch"
+	"${FILESDIR}/${P}-unrar-vulnerability.patch"
+)
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
+	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )"
+
+DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gles opengl )
+	gles? ( X )
+	opengl? ( X )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	airplay? (
+		app-pda/libplist
+		net-libs/shairplay
+	)
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	bluray? ( >=media-libs/libbluray-0.7.0 )
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	dev-db/sqlite
+	dev-libs/expat
+	dev-libs/fribidi
+	cec? ( >=dev-libs/libcec-4.0 )
+	dev-libs/libpcre[cxx]
+	dev-libs/libxml2
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	>=dev-libs/yajl-2
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-libs/libcdio
+	gles? ( media-libs/mesa[gles2] )
+	libusb? ( virtual/libusb:1 )
+	media-fonts/corefonts
+	>=media-fonts/noto-20160531
+	media-fonts/roboto
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/libass-0.13.4
+	media-libs/mesa[egl]
+	>=media-libs/taglib-1.11.1
+	system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] )
+	mysql? ( virtual/mysql )
+	>=net-misc/curl-7.51.0
+	nfs? ( net-fs/libnfs:= )
+	opengl? ( media-libs/glu )
+	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	sftp? ( net-libs/libssh[sftp] )
+	sys-libs/zlib
+	udev? ( virtual/udev )
+	vaapi? ( x11-libs/libva[opengl] )
+	vdpau? (
+		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+	)
+	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
+	X? (
+		x11-libs/libdrm
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXrender
+	)
+	xslt? ( dev-libs/libxslt )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+	lirc? (
+		|| ( app-misc/lirc app-misc/inputlircd )
+	)
+	!media-tv/xbmc
+	udisks? ( sys-fs/udisks:0 )
+	upower? (
+		systemd? ( sys-power/upower )
+		!systemd? (
+			|| ( sys-power/upower-pm-utils sys-power/upower )
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/bzip2
+	app-arch/unzip
+	app-arch/xz-utils
+	app-arch/zip
+	dev-lang/swig
+	dev-libs/crossguid
+	dev-util/cmake
+	dev-util/gperf
+	media-libs/giflib
+	>=media-libs/libjpeg-turbo-1.5.1:=
+	>=media-libs/libpng-1.6.26:0=
+	test? ( dev-cpp/gtest )
+	virtual/pkgconfig
+	x86? ( dev-lang/nasm )
+"
+case ${PV} in
+9999)
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+	# Force java for latest git version to avoid having to hand maintain the
+	# generated addons package.  #488118
+	DEPEND+="
+		virtual/jre
+		"
+	;;
+*)
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/rc}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
+		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
+	KEYWORDS="amd64 ~x86"
+	IUSE+=" java"
+	DEPEND+="
+		java? ( virtual/jre )
+		"
+
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+	;;
+esac
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+CMAKE_USE_DIR=${S}/project/cmake/
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if in_iuse java && use !java; then
+		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
+	fi
+	cmake-utils_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/linux/*.cpp || die
+
+	# Prepare tools and libs witch are configured with autotools during compile time
+	AUTOTOOLS_DIRS=(
+		"${S}"/lib/cpluff
+		"${S}"/tools/depends/native/TexturePacker/src
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src
+	)
+
+	local d
+	for d in "${AUTOTOOLS_DIRS[@]}" ; do
+		pushd ${d} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+		popd >/dev/null || die
+	done
+	elibtoolize
+
+	# Prevent autoreconf rerun
+	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+		"${S}"/project/cmake/modules/FindCpluff.cmake \
+		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LIRC=$(usex lirc)
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_NONFREE=$(usex nonfree)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_OPENSSL=ON
+		-DENABLE_OPTICAL=$(usex dvd)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_SSH=$(usex sftp)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_XSLT=$(usex xslt)
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
+		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
+	)
+
+	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+	use !system-ffmpeg && mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz" )
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all
+	use test && emake -C "${BUILD_DIR}" kodi-test
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
+
+	newicon media/icon48x48.png kodi.png
+
+	# Replace bundled fonts with system ones.
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
+	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
+		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
+
+	local f
+	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
+		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
+		dosym ../../../../fonts/noto/"${f}" \
+			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
+	done
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
+}
diff --git a/media-tv/kodi/kodi-17.3.ebuild b/media-tv/kodi/kodi-17.3.ebuild
new file mode 100644
index 000000000000..48000044633d
--- /dev/null
+++ b/media-tv/kodi/kodi-17.3.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Does not work with py3 here
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1
+
+LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
+LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
+LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
+FFMPEG_VERSION="3.1.6"
+CODENAME="Krypton"
+PATCHES=(
+	"${FILESDIR}/${P}-ftpparse_string.patch"
+)
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
+	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )"
+
+DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gles opengl )
+	gles? ( X )
+	opengl? ( X )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	airplay? (
+		app-pda/libplist
+		net-libs/shairplay
+	)
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	bluray? ( >=media-libs/libbluray-0.7.0 )
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	dev-db/sqlite
+	dev-libs/expat
+	dev-libs/fribidi
+	cec? ( >=dev-libs/libcec-4.0 )
+	dev-libs/libpcre[cxx]
+	dev-libs/libxml2
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	>=dev-libs/yajl-2
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-libs/libcdio
+	gles? ( media-libs/mesa[gles2] )
+	libusb? ( virtual/libusb:1 )
+	media-fonts/corefonts
+	>=media-fonts/noto-20160531
+	media-fonts/roboto
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/libass-0.13.4
+	media-libs/mesa[egl]
+	>=media-libs/taglib-1.11.1
+	system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] )
+	mysql? ( virtual/mysql )
+	>=net-misc/curl-7.51.0
+	nfs? ( net-fs/libnfs:= )
+	opengl? ( media-libs/glu )
+	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	sftp? ( net-libs/libssh[sftp] )
+	sys-libs/zlib
+	udev? ( virtual/udev )
+	vaapi? ( x11-libs/libva[opengl] )
+	vdpau? (
+		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+	)
+	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
+	X? (
+		x11-libs/libdrm
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXrender
+	)
+	xslt? ( dev-libs/libxslt )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+	lirc? (
+		|| ( app-misc/lirc app-misc/inputlircd )
+	)
+	!media-tv/xbmc
+	udisks? ( sys-fs/udisks:0 )
+	upower? (
+		systemd? ( sys-power/upower )
+		!systemd? (
+			|| ( sys-power/upower-pm-utils sys-power/upower )
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/bzip2
+	app-arch/unzip
+	app-arch/xz-utils
+	app-arch/zip
+	dev-lang/swig
+	dev-libs/crossguid
+	dev-util/cmake
+	dev-util/gperf
+	media-libs/giflib
+	>=media-libs/libjpeg-turbo-1.5.1:=
+	>=media-libs/libpng-1.6.26:0=
+	test? ( dev-cpp/gtest )
+	virtual/pkgconfig
+	x86? ( dev-lang/nasm )
+"
+case ${PV} in
+9999)
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+	# Force java for latest git version to avoid having to hand maintain the
+	# generated addons package.  #488118
+	DEPEND+="
+		virtual/jre
+		"
+	;;
+*)
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/rc}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
+		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
+	KEYWORDS="amd64 x86"
+	IUSE+=" java"
+	DEPEND+="
+		java? ( virtual/jre )
+		"
+
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+	;;
+esac
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+CMAKE_USE_DIR=${S}/project/cmake/
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if in_iuse java && use !java; then
+		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
+	fi
+	cmake-utils_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/linux/*.cpp || die
+
+	# Prepare tools and libs witch are configured with autotools during compile time
+	AUTOTOOLS_DIRS=(
+		"${S}"/lib/cpluff
+		"${S}"/tools/depends/native/TexturePacker/src
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src
+	)
+
+	local d
+	for d in "${AUTOTOOLS_DIRS[@]}" ; do
+		pushd ${d} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+		popd >/dev/null || die
+	done
+	elibtoolize
+
+	# Prevent autoreconf rerun
+	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+		"${S}"/project/cmake/modules/FindCpluff.cmake \
+		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LIRC=$(usex lirc)
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_NONFREE=$(usex nonfree)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_OPENSSL=ON
+		-DENABLE_OPTICAL=$(usex dvd)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_SSH=$(usex sftp)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_XSLT=$(usex xslt)
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
+		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
+	)
+
+	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+	use !system-ffmpeg && mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz" )
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all $(usev test)
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
+
+	newicon media/icon48x48.png kodi.png
+
+	# Replace bundled fonts with system ones.
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
+	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
+		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
+
+	local f
+	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
+		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
+		dosym ../../../../fonts/noto/"${f}" \
+			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
+	done
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
+}
diff --git a/media-tv/kodi/kodi-17.4-r1.ebuild b/media-tv/kodi/kodi-17.4-r1.ebuild
new file mode 100644
index 000000000000..de54ded326de
--- /dev/null
+++ b/media-tv/kodi/kodi-17.4-r1.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Does not work with py3 here
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
+
+LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
+LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
+LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
+FFMPEG_VERSION="3.1.9"
+FFMPEG_KODI_VERSION="$(get_version_component_range 1-2)"
+CODENAME="Krypton"
+PATCHES=(
+	"${FILESDIR}/${P}-mariadb.patch"
+)
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
+	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+
+DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gles opengl )
+	gles? ( X )
+	opengl? ( X )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	airplay? (
+		app-pda/libplist
+		net-libs/shairplay
+	)
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	bluray? ( >=media-libs/libbluray-0.7.0 )
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	dev-db/sqlite
+	dev-libs/expat
+	dev-libs/fribidi
+	cec? ( >=dev-libs/libcec-4.0 )
+	dev-libs/libpcre[cxx]
+	dev-libs/libxml2
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	>=dev-libs/yajl-2
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-libs/libcdio
+	gles? ( media-libs/mesa[gles2] )
+	lcms? ( media-libs/lcms:2 )
+	libusb? ( virtual/libusb:1 )
+	media-fonts/corefonts
+	>=media-fonts/noto-20160531
+	media-fonts/roboto
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/libass-0.13.4
+	media-libs/mesa[egl]
+	>=media-libs/taglib-1.11.1
+	system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc] )
+	mysql? ( virtual/mysql )
+	>=net-misc/curl-7.51.0
+	nfs? ( net-fs/libnfs:= )
+	opengl? ( media-libs/glu )
+	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	sftp? ( net-libs/libssh[sftp] )
+	sys-libs/zlib
+	udev? ( virtual/udev )
+	vaapi? ( x11-libs/libva[opengl] )
+	vdpau? (
+		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+	)
+	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
+	X? (
+		x11-libs/libdrm
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXrender
+	)
+	xslt? ( dev-libs/libxslt )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+	lirc? (
+		|| ( app-misc/lirc app-misc/inputlircd )
+	)
+	!media-tv/xbmc
+	udisks? ( sys-fs/udisks:0 )
+	upower? (
+		systemd? ( sys-power/upower )
+		!systemd? (
+			|| ( sys-power/upower-pm-utils sys-power/upower )
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/bzip2
+	app-arch/unzip
+	app-arch/xz-utils
+	app-arch/zip
+	dev-lang/swig
+	dev-libs/crossguid
+	dev-util/cmake
+	dev-util/gperf
+	media-libs/giflib
+	>=media-libs/libjpeg-turbo-1.5.1:=
+	>=media-libs/libpng-1.6.26:0=
+	test? ( dev-cpp/gtest )
+	virtual/pkgconfig
+	x86? ( dev-lang/nasm )
+"
+case ${PV} in
+9999)
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+	# Force java for latest git version to avoid having to hand maintain the
+	# generated addons package.  #488118
+	DEPEND+="
+		virtual/jre
+		"
+	;;
+*)
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/rc}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
+		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
+	KEYWORDS="~amd64 ~x86"
+	IUSE+=" java"
+	DEPEND+="
+		java? ( virtual/jre )
+		"
+
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+	;;
+esac
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+CMAKE_USE_DIR=${S}/project/cmake/
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if in_iuse java && use !java; then
+		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
+	fi
+	cmake-utils_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/linux/*.cpp || die
+
+	# Prepare tools and libs witch are configured with autotools during compile time
+	AUTOTOOLS_DIRS=(
+		"${S}"/lib/cpluff
+		"${S}"/tools/depends/native/TexturePacker/src
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src
+	)
+
+	local d
+	for d in "${AUTOTOOLS_DIRS[@]}" ; do
+		pushd ${d} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+		popd >/dev/null || die
+	done
+	elibtoolize
+
+	# Prevent autoreconf rerun
+	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+		"${S}"/project/cmake/modules/FindCpluff.cmake \
+		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LCMS2=$(usex lcms)
+		-DENABLE_LIRC=$(usex lirc)
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_NONFREE=$(usex nonfree)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_OPENSSL=ON
+		-DENABLE_OPTICAL=$(usex dvd)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_SSH=$(usex sftp)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_XSLT=$(usex xslt)
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
+		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
+	)
+
+	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+	if use system-ffmpeg; then
+		mycmakeargs+=( -DWITH_FFMPEG="yes" )
+	else
+		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all
+	use test && emake -C "${BUILD_DIR}" kodi-test
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
+
+	newicon media/icon48x48.png kodi.png
+
+	# Replace bundled fonts with system ones.
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
+	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
+		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
+
+	local f
+	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
+		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
+		dosym ../../../../fonts/noto/"${f}" \
+			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
+	done
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
+}
diff --git a/media-tv/kodi/kodi-17.4.ebuild b/media-tv/kodi/kodi-17.4.ebuild
new file mode 100644
index 000000000000..50e4a9c83256
--- /dev/null
+++ b/media-tv/kodi/kodi-17.4.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Does not work with py3 here
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
+
+LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
+LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
+LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
+FFMPEG_VERSION="3.1.9"
+FFMPEG_KODI_VERSION="$(get_version_component_range 1-2)"
+CODENAME="Krypton"
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
+	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+
+DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gles opengl )
+	gles? ( X )
+	opengl? ( X )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	airplay? (
+		app-pda/libplist
+		net-libs/shairplay
+	)
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	bluray? ( >=media-libs/libbluray-0.7.0 )
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	dev-db/sqlite
+	dev-libs/expat
+	dev-libs/fribidi
+	cec? ( >=dev-libs/libcec-4.0 )
+	dev-libs/libpcre[cxx]
+	dev-libs/libxml2
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	>=dev-libs/yajl-2
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-libs/libcdio
+	gles? ( media-libs/mesa[gles2] )
+	libusb? ( virtual/libusb:1 )
+	media-fonts/corefonts
+	>=media-fonts/noto-20160531
+	media-fonts/roboto
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/libass-0.13.4
+	media-libs/mesa[egl]
+	>=media-libs/taglib-1.11.1
+	system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc] )
+	mysql? ( virtual/mysql )
+	>=net-misc/curl-7.51.0
+	nfs? ( net-fs/libnfs:= )
+	opengl? ( media-libs/glu )
+	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	sftp? ( net-libs/libssh[sftp] )
+	sys-libs/zlib
+	udev? ( virtual/udev )
+	vaapi? ( x11-libs/libva[opengl] )
+	vdpau? (
+		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+	)
+	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
+	X? (
+		x11-libs/libdrm
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXrender
+	)
+	xslt? ( dev-libs/libxslt )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+	lirc? (
+		|| ( app-misc/lirc app-misc/inputlircd )
+	)
+	!media-tv/xbmc
+	udisks? ( sys-fs/udisks:0 )
+	upower? (
+		systemd? ( sys-power/upower )
+		!systemd? (
+			|| ( sys-power/upower-pm-utils sys-power/upower )
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/bzip2
+	app-arch/unzip
+	app-arch/xz-utils
+	app-arch/zip
+	dev-lang/swig
+	dev-libs/crossguid
+	dev-util/cmake
+	dev-util/gperf
+	media-libs/giflib
+	>=media-libs/libjpeg-turbo-1.5.1:=
+	>=media-libs/libpng-1.6.26:0=
+	test? ( dev-cpp/gtest )
+	virtual/pkgconfig
+	x86? ( dev-lang/nasm )
+"
+case ${PV} in
+9999)
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+	# Force java for latest git version to avoid having to hand maintain the
+	# generated addons package.  #488118
+	DEPEND+="
+		virtual/jre
+		"
+	;;
+*)
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/rc}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
+		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
+	KEYWORDS="~amd64 ~x86"
+	IUSE+=" java"
+	DEPEND+="
+		java? ( virtual/jre )
+		"
+
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+	;;
+esac
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+CMAKE_USE_DIR=${S}/project/cmake/
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if in_iuse java && use !java; then
+		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
+	fi
+	cmake-utils_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/linux/*.cpp || die
+
+	# Prepare tools and libs witch are configured with autotools during compile time
+	AUTOTOOLS_DIRS=(
+		"${S}"/lib/cpluff
+		"${S}"/tools/depends/native/TexturePacker/src
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src
+	)
+
+	local d
+	for d in "${AUTOTOOLS_DIRS[@]}" ; do
+		pushd ${d} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+		popd >/dev/null || die
+	done
+	elibtoolize
+
+	# Prevent autoreconf rerun
+	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+		"${S}"/project/cmake/modules/FindCpluff.cmake \
+		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LIRC=$(usex lirc)
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_NONFREE=$(usex nonfree)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_OPENSSL=ON
+		-DENABLE_OPTICAL=$(usex dvd)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_SSH=$(usex sftp)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_XSLT=$(usex xslt)
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
+		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
+	)
+
+	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+	if use system-ffmpeg; then
+		mycmakeargs+=( -DWITH_FFMPEG="yes" )
+	else
+		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all
+	use test && emake -C "${BUILD_DIR}" kodi-test
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
+
+	newicon media/icon48x48.png kodi.png
+
+	# Replace bundled fonts with system ones.
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
+	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
+		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
+
+	local f
+	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
+		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
+		dosym ../../../../fonts/noto/"${f}" \
+			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
+	done
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
+}
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
new file mode 100644
index 000000000000..0f68a3f58fe6
--- /dev/null
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -0,0 +1,321 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Does not work with py3 here
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1
+
+LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
+LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
+LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
+FFMPEG_VERSION="3.3.3"
+CODENAME="Leia"
+FFMPEG_KODI_VERSION="Alpha-1"
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
+	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+
+DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gbm gles lcms libressl libusb lirc mysql nfs +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	gbm? ( gles )
+	|| ( gles opengl )
+	^^ ( gbm wayland X )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	airplay? (
+		app-pda/libplist
+		net-libs/shairplay
+	)
+	alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
+	bluetooth? ( net-wireless/bluez )
+	bluray? ( >=media-libs/libbluray-1.0.1 )
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	dev-db/sqlite
+	dev-libs/expat
+	>=dev-libs/fribidi-0.19.7
+	cec? ( >=dev-libs/libcec-4.0 )
+	dev-libs/libpcre[cxx]
+	>=dev-libs/libxml2-2.9.4
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	>=dev-libs/libcdio-0.94
+	dev-libs/libfmt
+	gbm? (	media-libs/mesa[gbm] )
+	gles? ( media-libs/mesa[gles2] )
+	lcms? ( media-libs/lcms:2 )
+	libusb? ( virtual/libusb:1 )
+	media-fonts/corefonts
+	>=media-fonts/noto-20160531
+	media-fonts/roboto
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.8
+	>=media-libs/libass-0.13.4
+	media-libs/mesa[egl]
+	>=media-libs/taglib-1.11.1
+	system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc] )
+	mysql? ( virtual/mysql )
+	>=net-misc/curl-7.51.0
+	nfs? ( net-fs/libnfs:= )
+	opengl? ( media-libs/glu )
+	!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	sftp? ( net-libs/libssh[sftp] )
+	>=sys-libs/zlib-1.2.11
+	udev? ( virtual/udev )
+	vaapi? (
+		x11-libs/libva[egl]
+		opengl? ( x11-libs/libva[opengl] )
+		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
+		vdpau? ( x11-libs/libva[vdpau] )
+		wayland? ( x11-libs/libva[wayland] )
+		X? ( x11-libs/libva[X] )
+	)
+	virtual/libiconv
+	vdpau? (
+		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+	)
+	wayland? (
+		dev-cpp/waylandpp
+		media-libs/mesa[wayland]
+		>=dev-libs/wayland-protocols-1.7
+		x11-libs/libxkbcommon
+	)
+	webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		system-ffmpeg? ( media-video/ffmpeg[X] )
+	)
+	x11-libs/libdrm
+	xslt? ( dev-libs/libxslt )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+	lirc? (
+		|| ( app-misc/lirc app-misc/inputlircd )
+	)
+	!media-tv/xbmc
+	udisks? ( sys-fs/udisks:0 )
+	upower? (
+		systemd? ( sys-power/upower )
+		!systemd? (
+			|| ( sys-power/upower-pm-utils sys-power/upower )
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-lang/swig
+	dev-libs/crossguid
+	dev-libs/rapidjson
+	dev-util/cmake
+	dev-util/gperf
+	media-libs/giflib
+	>=media-libs/libjpeg-turbo-1.5.1:=
+	>=media-libs/libpng-1.6.26:0=
+	test? ( dev-cpp/gtest )
+	virtual/pkgconfig
+	x86? ( dev-lang/nasm )
+"
+case ${PV} in
+9999)
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+	# Force java for latest git version to avoid having to hand maintain the
+	# generated addons package.  #488118
+	DEPEND+="
+		virtual/jre
+		"
+	;;
+*)
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/rc}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
+		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
+	KEYWORDS="~amd64 ~x86"
+	IUSE+=" java"
+	DEPEND+="
+		java? ( virtual/jre )
+		"
+
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+	;;
+esac
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if in_iuse java && use !java; then
+		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
+	fi
+	cmake-utils_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/linux/*.cpp || die
+
+	# Prepare tools and libs witch are configured with autotools during compile time
+	AUTOTOOLS_DIRS=(
+		"${S}"/lib/cpluff
+		"${S}"/tools/depends/native/TexturePacker/src
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src
+	)
+
+	local d
+	for d in "${AUTOTOOLS_DIRS[@]}" ; do
+		pushd ${d} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+		popd >/dev/null || die
+	done
+	elibtoolize
+
+	# Prevent autoreconf rerun
+	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+		"${S}"/cmake/modules/FindCpluff.cmake \
+		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LCMS2=$(usex lcms)
+		-DENABLE_LIRC=$(usex lirc)
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_OPENSSL=ON
+		-DENABLE_OPTICAL=$(usex dvd)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_SSH=$(usex sftp)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_XSLT=$(usex xslt)
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
+		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
+	)
+
+	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+	if use system-ffmpeg; then
+		mycmakeargs+=( -DWITH_FFMPEG="yes" )
+	else
+		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+	fi
+
+	if use gbm; then
+		mycmakeargs+=( -DCORE_PLATFORM_NAME="gbm" )
+	fi
+
+	if use wayland; then
+		mycmakeargs+=( -DCORE_PLATFORM_NAME="wayland" )
+		if use opengl; then
+			mycmakeargs+=( -DWAYLAND_RENDER_SYSTEM="gl" )
+		else
+			mycmakeargs+=( -DWAYLAND_RENDER_SYSTEM="gles" )
+		fi
+	fi
+
+	if use X; then
+		mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all
+	use test && emake -C "${BUILD_DIR}" kodi-test
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
+
+	newicon media/icon48x48.png kodi.png
+
+	# Replace bundled fonts with system ones.
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
+	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
+		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
+
+	local f
+	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
+		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
+		dosym ../../../../fonts/noto/"${f}" \
+			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
+	done
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
+}
diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml
new file mode 100644
index 000000000000..919f9f79dc4d
--- /dev/null
+++ b/media-tv/kodi/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>candrews@gentoo.org</email>
+		<name>Craig Andrews</name>
+	</maintainer>
+	<use>
+		<flag name="airplay">enable AirPlay support</flag>
+		<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
+		<flag name="cec">Enable support for HDMI-CEC devices via libcec</flag>
+		<flag name="gbm">Use the Graphics Buffer Manager for EGL on KMS.</flag>
+		<flag name="gles">Enable support for GLES</flag>
+		<flag name="lirc">Enable support for controlling Totem with a remote control using <pkg>app-misc/lirc</pkg></flag>
+		<flag name="nfs">Enable NFS client support</flag>
+		<flag name="nonfree">Enable non-free components</flag>
+		<flag name="dvd">Enable optical (CD/DVD drive) support</flag>
+		<flag name="sftp">Support browsing files over SFTP</flag>
+		<flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag>
+		<flag name="libusb">Use <pkg>virtual/libusb</pkg> for usb device hotplug support. This flag should only be enabled if you're running a non-Linux kernel or you don't want to use <pkg>sys-fs/udev</pkg>.</flag>
+		<flag name="udev">Use <pkg>sys-fs/udev</pkg> rules to handle devices' permissions and hotplug support. Unless you know what you're doing do not disable this flag on Linux kernels. This is provided as an option for completeness.</flag>
+		<flag name="webserver">Enable internal webserver</flag>
+		<flag name="xslt">Enable XSLT support using <pkg>dev-libs/libxslt</pkg></flag>
+	</use>
+	<upstream>
+		<bugs-to>https://trac.kodi.tv/</bugs-to>
+		<remote-id type="github">xbmc/xbmc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-tv/linuxtv-dvb-apps/Manifest b/media-tv/linuxtv-dvb-apps/Manifest
new file mode 100644
index 000000000000..08760ab0e856
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/Manifest
@@ -0,0 +1,8 @@
+AUX linuxtv-dvb-apps-1.1.1.20100223-alevt.patch 1418 SHA256 1707ddbdac648059c84837fdabdcb2fa2d73661748f82163023a187d0ecc9ffd SHA512 7490d18c3408bc412a3f3a3bb54544885f863ee146176dd8f9caae624043b5ad797f9fe9edc1ae627fd82b0fdb392e6f458d814e68a11ef4efa253c1add4016d WHIRLPOOL 3feab555bd3c4b721fb815a19799ed04f2228a4e8841a1b1de2913770d34cdd1b616738031cf3b7b077cafa66c27febd683b69441caaad0f7d1a7ca357f3a0dd
+AUX linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch 607 SHA256 8eb444d72c922db4166c5f926ae80537c56e1087ef792be34749caa6629f7e94 SHA512 abaf61336531e33148a8a0d5d4dfa545a607b077430e6e9ae363a667524fcf3d41e5fec1112e795dcf6be5160a8ef57049b224dac42b1211d3ea3b9f865dba48 WHIRLPOOL bfe1e4b63c54eb4b903030fe33ef1a5332756f652ace3b423b03e695e4959c9fd26eb03bc15ed67b8ef324cce508e53b90dc66b6766a7e466e2d5ee085708591
+AUX linuxtv-dvb-apps-1.1.1.20100223-perl526.patch 519 SHA256 4460c9c8f4474fcc776b8d02d1c527584a81dbc84b69db9ed9a8b43ca24d49c5 SHA512 73fea472e484f41d9c3eb676628dc2765081c92202823c03489d866534cdfef81559205cdb7f0e4578f217e0b0102ee94ed1faf56b7c3a3eb8c4c7d9dfc1b1e8 WHIRLPOOL 4c6ae0761d1d9c112b5186733d6b3b38bf919d81bb8ec587d53cf40c01e9d9c2847558a6a65af64a4319cbb67a103d7a2b92ba5146afd6d316f291db6c1c0359
+DIST linuxtv-dvb-apps-1.1.1.20100223.tar.bz2 429129 SHA256 8a657a1479de665a6d95d8f5585ffd0228232e1a030b88435d4c40d85e983461 SHA512 0950197e2a199b1ab4392fa2e893d9b537d2b8fed05b24d8b81a2abf11ed2373dcb299a51e217c6508ea68b81691728b120328e4080de68519449fc5fd506161 WHIRLPOOL 5129c13fbc1cc65c9a5177d29de87563c22f4a8c78bbe4534e65a9c46b3683344c5a296cd157379c7af9500a9079daea8418b927a65ed1596d24d6300441ed20
+EBUILD linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild 2032 SHA256 bd7047f81e84001069539e1eef0324ce84642c73f5ed2aac18e8d2f659c00a26 SHA512 9e65d54aa3cc1443a524f79d35b77037618255d47b25c97d9a8d7c807b35299d44e85d041be4b3f0f76a293195d3be0b6846762f85e5dda3e6e774d95f2047d1 WHIRLPOOL 581bede68c39bc1c38be1aec105c6ecce3693a3700a51d00c278cef4f3e2a896a4c9c14a51f37b993088f5ae829718c949d99e765062c97d27309448ed221e2a
+MISC ChangeLog 2617 SHA256 bade41ff7c0a71b6cea9dc29fce8d648b826e19c4d40360c9340766e7ba41c28 SHA512 dce96c6587db511cf2584ff144f1c3b864a541b8d95195a2106b511e66ee2226ab0085046105e4864efa67d0a341294c0757edfa9da51531d4d8facf79355d75 WHIRLPOOL efbf4df00451cc5cb04ba385d4eacddf463f6c3fdc2e5c0a48017a5f0f7d73a8d50c6c7f49d97b4aad9eb309e4c33d751fdb4108db8896dd4e112e460b19984e
+MISC ChangeLog-2015 10778 SHA256 ce7291532ddc2241bd4df91f2680d813acd3b28f1cedcdb2eb89f93a439a8aec SHA512 72c1167fd940b2eaba154b7010fbc55f3f630f83e101bffa40d09276a30308eb7b8b712dc766ffea6cf532f0b34ce6876e774382c911de549656545296f183d1 WHIRLPOOL 9c9b18f24fb3d04aff6bc792bb8ea75cc546be003388c34674ebdecd75a3687128d69c56f04dbdbb04db03edcf9f9646957bb077630673bac62587c231ef3dee
+MISC metadata.xml 230 SHA256 bebcab1c2af9e2005e2f5978b5c50dae409a8511461dabef3c3c27729dba300b SHA512 1aaabf344edf8981ded68904e05257b579370a589c86b1ea8984378ad6a8ed3daf91c5e9069c07d207d47cf1f70a8039c644dbf6108557ed2053cba9769723ed WHIRLPOOL 6e3cc025f14b01e5a40dd541889bf9602e2d270ba84e930f15da8005039f9dbb6d22d42f7017d5d6146e348ff7b0f5bf8c0a0d4fce0026fa81343b2458d07cf2
diff --git a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-alevt.patch b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-alevt.patch
new file mode 100644
index 000000000000..d19ac7e4878f
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-alevt.patch
@@ -0,0 +1,37 @@
+--- linuxtv-dvb-apps-1.1.1.20100223/util/alevt/exp-gfx.c
++++ linuxtv-dvb-apps-1.1.1.20100223/util/alevt/exp-gfx.c
+@@ -137,6 +137,7 @@
+ 
+ #ifdef WITH_PNG
+ 
++#include <zlib.h>
+ #include <png.h>
+ static int png_open(struct export *e);
+ static int png_option(struct export *e, int opt, char *arg);
+--- linuxtv-dvb-apps-1.1.1.20100223/util/alevt/Makefile
++++ linuxtv-dvb-apps-1.1.1.20100223/util/alevt/Makefile
+@@ -25,13 +25,13 @@
+ all: alevt alevt-date alevt-cap alevt.1 alevt-date.1 alevt-cap.1
+ 
+ alevt: $(OBJS)
+-	$(CC) $(OPT) $(OBJS) -o alevt -L$(PREFIX)/lib -L$(PREFIX)/lib64 -lX11 $(EXPLIBS)
++	$(CC) $(OPT) $(OBJS) -o alevt -L$(PREFIX)/lib -L$(PREFIX)/lib64 -lX11 $(EXPLIBS) $(LDFLAGS)
+ 
+ alevt-date: $(TOBJS)
+-	$(CC) $(OPT) $(TOBJS) -o alevt-date $(ZVBILIB)
++	$(CC) $(OPT) $(TOBJS) -o alevt-date $(ZVBILIB) $(LDFLAGS)
+ 
+ alevt-cap: $(COBJS)
+-	$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS)
++	$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS) $(LDFLAGS)
+ 
+ font.o: font1.xbm font2.xbm font3.xbm font4.xbm
+ fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm
+@@ -73,7 +73,6 @@
+ 	install -m 0644 alevt.1		$(DESTDIR)$(PREFIX)/share/man/man1
+ 	install -m 0644 alevt-date.1	$(DESTDIR)$(PREFIX)/share/man/man1
+ 	install -m 0644 alevt-cap.1	$(DESTDIR)$(PREFIX)/share/man/man1
+-	install -m 0644 alevt.png $(DESTDIR)$(PREFIX)/share/pixmaps
+ 	install -m 0644 alevt.desktop $(DESTDIR)$(PREFIX)/share/applications
+ 
+ uninstall: clean
diff --git a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch
new file mode 100644
index 000000000000..063b4b6c479d
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch
@@ -0,0 +1,20 @@
+--- linuxtv-dvb-apps-1.1.1.20100223/Make.rules
++++ linuxtv-dvb-apps-1.1.1.20100223/Make.rules
+@@ -46,7 +46,7 @@
+ %: %.c
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -MMD $(LDFLAGS) -o $@ $< $(filter-out %.h %.c,$^) $(LOADLIBES) $(LDLIBS)
+ %.so:
+-	$(CC) -shared -o $@ $^
++	$(CC) $(LDFLAGS) -Wl,-soname -Wl,$@ -shared -o $@ $^
+ %.a:
+ 	$(AR) rcs $@ $^
+ clean::
+@@ -76,7 +76,7 @@
+ 	@$(CC) $(CPPFLAGS) $(CFLAGS) -MMD $(LDFLAGS) -o $@ $< $(filter-out %.h %.c,$^) $(LOADLIBES) $(LDLIBS)
+ %.so:
+ 	@echo CC $@
+-	@$(CC) -shared -o $@ $^
++	@$(CC) $(LDFLAGS) -Wl,-soname -Wl,$@ -shared -o $@ $^
+ %.a:
+ 	@echo AR $@
+ 	@$(AR) rcs $@ $^
diff --git a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-perl526.patch b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-perl526.patch
new file mode 100644
index 000000000000..4db9ac3b5460
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-perl526.patch
@@ -0,0 +1,12 @@
+diff -ruN linuxtv-dvb-apps-1.1.1.20100223.orig/util/scan/section_generate.pl linuxtv-dvb-apps-1.1.1.20100223/util/scan/section_generate.pl
+--- linuxtv-dvb-apps-1.1.1.20100223.orig/util/scan/section_generate.pl	2010-02-14 12:21:19.000000000 -0000
++++ linuxtv-dvb-apps-1.1.1.20100223/util/scan/section_generate.pl	2017-08-06 08:35:19.625688435 -0000
+@@ -4,7 +4,7 @@
+ 
+ die "no section perl file given" unless @ARGV;
+ 
+-my $h = require($ARGV[0]);
++my $h = require("./".$ARGV[0]);
+ 
+ our $basename;
+ our $debug = $ARGV[1];
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild
new file mode 100644
index 000000000000..1cb348724186
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+HOMEPAGE="https://www.linuxtv.org/"
+DESCRIPTION="Small utils for DVB to scan, zap, view signal strength, ..."
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="alevt usb"
+
+RDEPEND="
+	alevt? (
+		!media-video/alevt
+		media-libs/libpng:0=
+		media-libs/zvbi[v4l]
+		sys-libs/zlib
+		x11-libs/libX11
+	)
+	usb? ( virtual/libusb:0 )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	virtual/linuxtv-dvb-headers
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-alevt.patch \
+		"${FILESDIR}"/${P}-perl526.patch
+
+	# do not compile test-progs, incompatible with videodev2.h
+	sed -e '/-C test/d' \
+		-i Makefile || die
+
+	# remove copy of header-files
+	rm -rf "${S}"/include || die
+}
+
+src_compile() {
+	emake V=1 CC=$(tc-getCC) $(usex usb "ttusb_dec_reset=1" "")
+	if use alevt ; then
+		emake -C util/alevt CC=$(tc-getCC) OPT="${CFLAGS}"
+	fi
+}
+
+src_install() {
+	insinto /usr/bin
+	emake V=1 prefix="${EROOT}usr" libdir="${EROOT}usr/$(get_libdir)" \
+		$(usex usb "ttusb_dec_reset=1" "") \
+		DESTDIR="${D}" INSTDIR="${T}" install
+	if use alevt ; then
+		dodir /usr/share/applications
+		dodir /usr/share/man/man1
+		emake -C util/alevt DESTDIR="${D}" install
+	fi
+
+	# rename scan to scan-dvb
+	mv "${D}"/usr/bin/scan{,-dvb} || die
+
+	# install zap-files
+	local dir=""
+	for dir in dvb-{s,c,t} atsc ; do
+		insinto /usr/share/dvb/zap/${dir}
+		doins "${S}"/util/szap/channels-conf/${dir}/*
+	done
+
+	# install remote-key files
+	insinto /usr/share/dvb/av7110_loadkeys
+	doins util/av7110_loadkeys/*.rc*
+
+	# install Documentation
+	dodoc README
+	newdoc util/scan/README README.scan-dvb
+	newdoc util/szap/README README.zap
+	newdoc util/av7110_loadkeys/README README.av7110_loadkeys
+
+	use usb && newdoc util/ttusb_dec_reset/README README.ttusb_dec_reset
+}
+
+pkg_postinst() {
+	elog "/usr/bin/scan has been installed as scan-dvb."
+}
diff --git a/media-tv/linuxtv-dvb-apps/metadata.xml b/media-tv/linuxtv-dvb-apps/metadata.xml
new file mode 100644
index 000000000000..dba6ee3e4a56
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<use>
+	<flag name="alevt">Build videotext decoder</flag>
+</use>
+</pkgmetadata>
diff --git a/media-tv/me-tv/Manifest b/media-tv/me-tv/Manifest
new file mode 100644
index 000000000000..628a6d37d551
--- /dev/null
+++ b/media-tv/me-tv/Manifest
@@ -0,0 +1,7 @@
+AUX me-tv-1.4.0.10-C++11-throw-in-destructors.patch 628 SHA256 9bb85343a6293808777f73ca35468730e29d53eb451f19f4f8308ee5276a01bc SHA512 478089007245fd2307ad127cd80a230dd642d967d9e4a34ca3038fcdb0fc61093b19491acd5c313e89c0c6c5a46e47365a7866895bfad3a3468331beb775fbc3 WHIRLPOOL 6abd4836c7d380d7b062cb3ef15ab1be744cd021c82c72942a86094e2b2e19fbb5ea7cd81ea6beed95ad9c52c55d8a560dee4633796a0ed12b3bf08cf6984b83
+AUX me-tv-1.4.0.10-gcc47.patch 643 SHA256 9a68b0e2e3b27affa01242034b8e8b3f12858880dfb2f48028ee6c11cd8e4918 SHA512 e01cb109c5674ddfe08535cfd4f45f347180d8db98ce10a1ec521feddf297e781293138e2ad2eedb9eca1f0b780f8fc83b8ed8779576ba66784e9bd0bb7cbb33 WHIRLPOOL 9b31bc8ca62c5a6b014d30e51c4bbf5be9329340af3f9f23257a6edbd352c4bab330b6bc955816fac023a4128ea7c344c6f54041a882eab662ca68606b98e59a
+DIST me-tv-1.4.0.10.tar.gz 549653 SHA256 a0ee03feb3271c5cd68e5d36f938d2f967db462d28627d39b1d57be60b02f38c SHA512 98988a343f900c6b7a276ada47025f9a703a490eb499f3aad9fb7163c73113061dc205a29b454f06e817ef24d44ae58981fd5a19dfb0a48be669394e91bd5ee8 WHIRLPOOL 8f263ed8ed1dec94b67d607052ce04f2c2d62607d8fdddf1703888905512a9ced76372c81dd210552b3df512adb6b4876e131bf2d288b51444775edbe28ce119
+EBUILD me-tv-1.4.0.10.ebuild 1258 SHA256 c04d7d2a7986024556013fd2af71e7f9b39acb9ed028bb5a22a092c1333c5db6 SHA512 8b1400a3c21ff7428a4d2827e0403752e3e98e3750201f065c2d4de6238b9d910f7064e2578c79c055b22c1fe455ef52e4d1f4c4f0f64da30f183c7ed32bf19a WHIRLPOOL c86a80555869900e3c521f5889898d211fe47106457f0997275896cbd453609e5917c7283fb32f1ee2cf005721ec4640b1e7799226cd9dcdde8d18528834caa1
+MISC ChangeLog 3334 SHA256 e8fceafc1e04a26c93571ce4950f7b4c72e1eb572d4f96b2eb51c5dcf2d28da5 SHA512 2068aff2e98fa2c5bc04d4845175d3cd9da422bf43a879ca1df5b339947b20cfc0948e7ef280d2f9f996578ea4d0fdb9268be51558517efeb090adce45c10a01 WHIRLPOOL d813298fee254058f9da2f8daf71ee9cef242c846771b68f4c223bc520235bde69d66b7401009015ec14eda0895288ee0d163323b4fe1245b80bc812cead999c
+MISC ChangeLog-2015 687 SHA256 823a288059bf5cb8ef7642cef4c18ee65a26bb0e03c70cbb27aea0992a60a920 SHA512 1b1fdcb634b877e4d65c5402182d5910bac9e9387bc3c6d579c8fa0deb95da06d8918de23f303fdd9dc7751cf59ff160b4da126ff811d20aaadd843f2e13cead WHIRLPOOL 0f916fcc6c2352ca84fb433d5d2f4cbd4baacc09f90f99f03e7d025619e00605ce6d8d0d70215b778c2caba7ddc85b469d2e834470aa03ed5f2a7f2b67b715ad
+MISC metadata.xml 701 SHA256 fa76a7cab1b87f71d21de18a9bd96c8e8010e272def0fbf35888c3e0dd1d8efb SHA512 8dabe002eb6159ac03291d4a208fb56012efc156e2ac963cd5af2f7962a6c31e91f05bea39b4a685fb35725b6cd03cc2f4535c64b515c556e2f00eea7cb05438 WHIRLPOOL 647dbfda4f6ead307f87743cfa533e334bff522c1552e9784b70410a1acbcd4ccd796d7c92aa90554152a92fd15f09b77a95e21e91a4c5fd0a11d753cab7ada4
diff --git a/media-tv/me-tv/files/me-tv-1.4.0.10-C++11-throw-in-destructors.patch b/media-tv/me-tv/files/me-tv-1.4.0.10-C++11-throw-in-destructors.patch
new file mode 100644
index 000000000000..322a0d6b8463
--- /dev/null
+++ b/media-tv/me-tv/files/me-tv-1.4.0.10-C++11-throw-in-destructors.patch
@@ -0,0 +1,35 @@
+--- a/server/data.cc
++++ b/server/data.cc
+@@ -68,7 +68,7 @@
+ 	}
+ }
+ 
+-Statement::~Statement()
++Statement::~Statement() NOEXCEPT
+ {
+ 	if (sqlite3_finalize(statement) != 0)
+ 	{
+--- a/server/data.h
++++ b/server/data.h
+@@ -26,6 +26,12 @@
+ #include <linux/dvb/frontend.h>
+ #include <glibmm.h>
+ 
++#if __cplusplus >= 201103L
++#define NOEXCEPT noexcept(false)
++#else
++#define NOEXCEPT
++#endif
++
+ typedef std::list<Glib::ustring> StringList;
+ 
+ namespace Data
+@@ -68,7 +74,7 @@
+ 
+ 	public:
+ 		Statement(Connection& connection, const Glib::ustring& command);
+-		~Statement();
++		~Statement() NOEXCEPT;
+ 
+ 		void reset();
+ 		guint step();
diff --git a/media-tv/me-tv/files/me-tv-1.4.0.10-gcc47.patch b/media-tv/me-tv/files/me-tv-1.4.0.10-gcc47.patch
new file mode 100644
index 000000000000..c785e971997e
--- /dev/null
+++ b/media-tv/me-tv/files/me-tv-1.4.0.10-gcc47.patch
@@ -0,0 +1,26 @@
+ https://bugs.gentoo.org/452108
+ 
+ common/common.cc | 1 +
+ server/thread.cc | 1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/common/common.cc
++++ b/common/common.cc
+@@ -18,6 +18,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+  */
+ 
++#include <unistd.h>
+ #include "../common/common.h"
+ #include "../common/i18n.h"
+ #include "../common/exception.h"
+--- a/server/thread.cc
++++ b/server/thread.cc
+@@ -18,6 +18,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+  */
+ 
++#include <unistd.h>
+ #include "thread.h"
+ #include "../common/i18n.h"
+ #include "../common/exception.h"
diff --git a/media-tv/me-tv/me-tv-1.4.0.10.ebuild b/media-tv/me-tv/me-tv-1.4.0.10.ebuild
new file mode 100644
index 000000000000..89efd2f0c89b
--- /dev/null
+++ b/media-tv/me-tv/me-tv-1.4.0.10.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic versionator autotools gnome2
+
+DESCRIPTION="Me TV is a GTK desktop application for watching digital television"
+HOMEPAGE="http://me-tv.sourceforge.net/"
+SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/$(get_version_component_range 1-3)/+download/${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="http"
+
+RDEPEND="
+	>=dev-cpp/gconfmm-2.6
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libxmlpp:2.6
+	dev-libs/libunique:1
+	>=dev-libs/dbus-glib-0.92
+	net-libs/gnet:2
+	=dev-db/sqlite-3*
+	>=media-video/vlc-1.1.8
+	media-libs/gstreamer:0.10
+	media-plugins/gst-plugins-xvideo:0.10
+	media-libs/gst-plugins-base:0.10
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	append-cxxflags -std=c++11
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+	epatch "${FILESDIR}"/${P}-C++11-throw-in-destructors.patch
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	if use http; then
+		dodoc -r http/
+	fi
+}
+
+pkg_postinst() {
+	if use http; then
+		elog "The HTTP server port, .. are hardcoded"
+	fi
+	elog "Please note that Version 1.4 has a new DB so you"
+	elog "have to re-import your channels."
+}
diff --git a/media-tv/me-tv/metadata.xml b/media-tv/me-tv/metadata.xml
new file mode 100644
index 000000000000..2b4a8b01044c
--- /dev/null
+++ b/media-tv/me-tv/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lordvan@gentoo.org</email>
+    <name>Thomas Raschbacher</name>
+  </maintainer>
+  <longdescription>Me TV is a GTK desktop application for watching digital television services that use the DVB standard.
+
+Me TV works with DVB-T, DVB-S, DVB-C and ATSC devices that are supported by Linux kernel drivers.</longdescription>
+  <use>
+    <flag name="http">Installation of Web-frontend</flag>
+  </use>
+  <upstream>
+    <remote-id type="launchpad">me-tv</remote-id>
+    <remote-id type="sourceforge">me-tv</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-tv/metadata.xml b/media-tv/metadata.xml
new file mode 100644
index 000000000000..395509311a63
--- /dev/null
+++ b/media-tv/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The media-tv category contains television-related applications.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie media-tc enthält TV-Applikationen.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría media-tv contiene aplicaciones relacionadas con la
+		televisión.
+	</longdescription>
+	<longdescription lang="ja">
+		media-tvカテゴリーにはテレビジョン関連のアプリケーションが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De media-tv categorie bevat TV-applicaties.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm media-tv chứa các ứng dụng liên quan đến truyền hình - TV.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria media-tv contiene applicazioni per la TV.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria media-tv contém aplicações relacionadas com
+		televisão.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria media-tv zawiera programy związane z telewizją.
+	</longdescription>
+</catmetadata>
+
diff --git a/media-tv/mythtv-status/Manifest b/media-tv/mythtv-status/Manifest
new file mode 100644
index 000000000000..997713279a20
--- /dev/null
+++ b/media-tv/mythtv-status/Manifest
@@ -0,0 +1,6 @@
+AUX mythtv-status.1 10118 SHA256 6779c2f5cd2ab48b4c8b5431311481124f0d4ec25db9c92cdf5c92d98e843370 SHA512 b7c7faed71ee4601a6b48181ae1e0540dc5f7bf64b4fdf6a117c974a617a1d1e3de32b4d78f100426c67367ae39cb2618aa39adbb7fa1fe4f414f01fb1d2a5a5 WHIRLPOOL 012b7c94d9fb68a1430591e5b4a49dc70f3b7e05e05974f6c0d3e8d6d3d2a4df28749a0907104155948b59a16f9a3eeafb17f1fb6bdd0dd5c7f6ce80679f2d21
+DIST mythtv-status-0.10.4.tar.gz 37640 SHA256 01ace567c9462d42901e86afa78d75bf8c64b94073bf26cb0acf22e2c6e75e98 SHA512 9701eb59e084df0bdcc487cc79949bb8efd9657b9982a2e545220938255657b49a72cc30c94a08ebc8341ec0d222e03646466f806bc44de3f2d531b75d0d7c1a WHIRLPOOL e55c666f48016326159fa55c0c423d56db6e00678d1d00c6d56dc5e554e297492dbf906724e233a9239a31b65a2f3b8f38364a6576381655415edc667be30486
+EBUILD mythtv-status-0.10.4.ebuild 821 SHA256 dd39d8bf14088d5190d451dbfcc6cc43291132713c21781d26530c391fba80c6 SHA512 97aa7586fed4a0910463ac7eb66f7b9a08e012bb90c1a39edc0eb09ea51c2f1c18b5c4309dd8bf93087badea4cdabbb742be6f273db129e7720c139db8e82a5c WHIRLPOOL 2f1eb137975bbb51039f53cb45b154be0e98133464c2f3781aa313e985c5480199dbdc160a8551780436f7ca7ff158191bada8ae932041aa48d58dbd35460d83
+MISC ChangeLog 2635 SHA256 407c2eba013e441e8496b7265c6b202061e5b5363d0026f5c3d767b1f6a80a77 SHA512 97e4769f2ed16a0706eb8409bb4380b19f100e305eab5c6e2d3abc928c3f54086c33308171b9f67987adb3a40dc8a45dbaa9833328046875a6b66f44ae136a15 WHIRLPOOL 0b7ed881aefa170a53e4084fa0a0659a3fa07deda0ddbd3440974f0109eb6f9b3a989f648dce69ce3066df67d59682cd57aba5ad41ec2839cf2eb38232ae622a
+MISC ChangeLog-2015 1161 SHA256 6539b2531f789e35dae7eaac3403a7b77befb731eb57301f14fec75a042966d4 SHA512 b1233c16194270b76c0228dcc785804bc42759b29ae99fc75f01290c918d2b3cf90851f8ed78007a0c84d64cc303af5ba6749810da38256fdccef7523d37a6f6 WHIRLPOOL 628d745bcf0b6b795a65e6566efb170e6f009746249717f5b4c68ccef3480dd206e7be29940ff0c4c16f145c1d2eecad8942bb001dbcbbaf92a03b4a99f8b9b6
+MISC metadata.xml 167 SHA256 5fe493e76bba84455c54b3a46adfae5a1bfe01c764ef0d9e5f6d3e8a1d142188 SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 WHIRLPOOL dc6c3dfc7fd7f0d76c97f0786cb76a55b8564f8437f96d4ccebf985817b9f6dcc4c61830aa5df80d725e4a54b281ea2e03d6b0859214af081112cba15025e64b
diff --git a/media-tv/mythtv-status/files/mythtv-status.1 b/media-tv/mythtv-status/files/mythtv-status.1
new file mode 100644
index 000000000000..a4f49fa944ff
--- /dev/null
+++ b/media-tv/mythtv-status/files/mythtv-status.1
@@ -0,0 +1,281 @@
+.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.ie \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.el \{\
+.    de IX
+..
+.\}
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "MYTHTV-STATUS 1"
+.TH MYTHTV-STATUS 1 "2012-07-07" "perl v5.14.2" "User Contributed Perl Documentation"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
+mythtv\-status \- Display the status of a MythTV backend
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+.Vb 1
+\& mythtv\-status [options]
+.Ve
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+This script queries a MythTV backend and reports on the status of it,
+any upcoming recordings and any which are happening right now.
+.PP
+The intention is to warn you if there is a program being recorded or
+about to be recorded.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\fB\-c, \-\-colour\fR" 4
+.IX Item "-c, --colour"
+Use colour when showing the status of the encoder(s).
+.IP "\fB\-d, \-\-description\fR" 4
+.IX Item "-d, --description"
+Display the description for the scheduled recordings.
+.IP "\fB\-\-disk\-space\-warn\fR" 4
+.IX Item "--disk-space-warn"
+The threshold (in percent) of used disk space that we should show
+the disk space in red (if using colour) or send an email if we're
+in email mode with email only on warnings.
+.IP "\fB\-\-encoder\-details\fR" 4
+.IX Item "--encoder-details"
+Display the input \s-1ID\s0 and channel name against the recording details.
+.IP "\fB\-\-encoder\-skip\-idle\fR" 4
+.IX Item "--encoder-skip-idle"
+Suppress displaying idle encoders in the Encoders block.
+.IP "\fB\-e, \-\-episode\fR" 4
+.IX Item "-e, --episode"
+Display the episode (subtitle) for the scheduled recordings.
+.IP "\fB\-\-email <address>[ \-\-email <address> ...]\fR" 4
+.IX Item "--email <address>[ --email <address> ...]"
+Send the output to the listed email addresses.  By default the encoder status,
+currently recording shows and time till next recording is surpressed from
+the email.
+.Sp
+To turn the additional blocks on you can use \fB\-\-encoders\fR, \fB\-\-recording\-now\fR
+and/or \fB\-\-next\-recording\fR.
+.IP "\fB\-\-email\-only\-on\-alert\fR" 4
+.IX Item "--email-only-on-alert"
+Only send an email out (if \-\-email is present) if there is an alert
+(i.e., schedule conflict or low disk space).
+.IP "\fB\-?, \-\-help\fR" 4
+.IX Item "-?, --help"
+Display help.
+.IP "\fB\-\-file <file>\fR" 4
+.IX Item "--file <file>"
+Load \s-1XML\s0 from the file specified instead of querying a MythTV backend.
+Handy for debugging things.
+.IP "\fB\-\-save\-file <file>\fR" 4
+.IX Item "--save-file <file>"
+Save the \s-1XML\s0 we received from the MythTV backend.
+Handy for debugging things.
+.IP "\fB\-\-guide\-days\-warn <days>\fR" 4
+.IX Item "--guide-days-warn <days>"
+Warn if the number of days of guide data present is equal to or below
+this level.  Default is 2 days.
+.IP "\fB\-h \s-1HOST\s0, \-\-host=HOST\fR" 4
+.IX Item "-h HOST, --host=HOST"
+The host to check, defaults to localhost.
+.IP "\fB\-\-nostatus\fR, \fB\-\-noencoders\fR, \fB\-\-norecording\-now\fR, \fB\-\-noscheduled\-recordings\fR, \fB\-\-noschedule\-conflicts\fR, \fB\-\-nonext\-recording\fR, \fB\-\-nototal\-disk\-space\fR, \fB\-\-nodisk\-space\fR, \fB\-\-noguide\-data\fR, \fB\-\-noauto\-expire\fR" 4
+.IX Item "--nostatus, --noencoders, --norecording-now, --noscheduled-recordings, --noschedule-conflicts, --nonext-recording, --nototal-disk-space, --nodisk-space, --noguide-data, --noauto-expire"
+Suppress displaying blocks of the output if they would normally be displayed.
+.IP "\fB\-p \s-1PORT\s0, \-\-port=PORT\fR" 4
+.IX Item "-p PORT, --port=PORT"
+The port to use when connecting to MythTV, defaults to 6544.
+.IP "\fB\-\-oneliner\-bullets\fR" 4
+.IX Item "--oneliner-bullets"
+Insert asterisks (*) before each of the oneliners to stop some
+email clients from thinking the oneliner block is a paragraph and
+trying to word wrap them.
+.IP "\fB\-\-auto\-expire\fR" 4
+.IX Item "--auto-expire"
+Display the shows due to auto expire (output is normally suppressed).
+.IP "\fB\-\-auto\-expire\-count\fR" 4
+.IX Item "--auto-expire-count"
+How many of the auto expire shows to display, defaults to 10.
+.IP "\fB\-\-recording\-in\-warn\fR" 4
+.IX Item "--recording-in-warn"
+If the \*(L"Next Recording In\*(R" time is less than this amount, display it
+in red.  This in seconds, and defaults to 3600 (1 hour).
+.IP "\fB\-\-verbose\fR" 4
+.IX Item "--verbose"
+Have slightly more verbose output.  This includes any warnings that might
+be generated while parsing the \s-1XML\s0.
+.IP "\fB\-v, \-\-version\fR" 4
+.IX Item "-v, --version"
+Show the version of mythtv-status and then exit.
+.SH "OUTPUT"
+.IX Header "OUTPUT"
+The output of this script is broken up into several chunks they are:
+.IP "Status" 4
+.IX Item "Status"
+Some general info about the backend, currently just the timestamp of when
+this program was run.
+.IP "Guide Data" 4
+.IX Item "Guide Data"
+The number of days of guide data is present.  By default it is only shown
+if the number of days is below the warning level.  To show it regardless
+of the warning level use \-\-guide\-data.
+.IP "Encoders" 4
+.IX Item "Encoders"
+Each encoder that the backend knows about are listed, with the hostname
+they are on, the encoder \s-1ID\s0 (in brackets) and the current status.
+.IP "Recording Now" 4
+.IX Item "Recording Now"
+Any programs which are being recorded right now.
+.IP "Scheduled Recordings" 4
+.IX Item "Scheduled Recordings"
+Up to 10 programs which are scheduled to be recorded today and tomorrow.
+.IP "Schedule Conflicts" 4
+.IX Item "Schedule Conflicts"
+Any upcoming schedule conflicts (not just limited to today or tomorrow).
+.IP "Shows due to Auto Expire" 4
+.IX Item "Shows due to Auto Expire"
+The shows which will be deleted and the order they'll be deleted if the
+auto expirer kicks in.
+.IP "Total Disk Space" 4
+.IX Item "Total Disk Space"
+The amount of disk space in total, and used by MythTV.
+.IP "Next Recording In" 4
+.IX Item "Next Recording In"
+If there are no recordings currently happening, then the amount of time until
+the next recording is displayed.
+.IP "Disk Space" 4
+.IX Item "Disk Space"
+Details about each storage group that MythTV knows about.  By default this
+only shows storage groups that are above the warning level.  Use
+\&\fB\-\-disk\-space\fR to turn on display of all storage groups.
+.SH "RETURN CODES"
+.IX Header "RETURN CODES"
+mythtv-status provides some return codes.
+.IP "0" 4
+Standard return code
+.IP "1" 4
+.IX Item "1"
+A warning is generated
+.SH "AUTHOR"
+.IX Header "AUTHOR"
+Andrew Ruthven, andrew@etc.gen.nz
+.SH "LICENSE"
+.IX Header "LICENSE"
+Copyright (c) 2007\-2009 Andrew Ruthven <andrew@etc.gen.nz>
+This code is hereby licensed for public consumption under the \s-1GNU\s0 \s-1GPL\s0 v3.
diff --git a/media-tv/mythtv-status/metadata.xml b/media-tv/mythtv-status/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/media-tv/mythtv-status/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/media-tv/mythtv-status/mythtv-status-0.10.4.ebuild b/media-tv/mythtv-status/mythtv-status-0.10.4.ebuild
new file mode 100644
index 000000000000..a9bea06654da
--- /dev/null
+++ b/media-tv/mythtv-status/mythtv-status-0.10.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Displays the current status of MythTV at the command prompt"
+HOMEPAGE="http://www.etc.gen.nz/projects/mythtv/mythtv-status.html"
+SRC_URI="http://www.etc.gen.nz/projects/mythtv/tarballs/${P}.tar.gz"
+#SRC_URI="mirror://ubuntu/pool/universe/m/mythtv-status/mythtv-status_0.10.2.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-perl/libwww-perl
+	dev-perl/XML-LibXML
+	dev-perl/Date-Manip
+	dev-perl/MIME-tools
+	dev-perl/Sys-SigAction
+	dev-perl/Config-Auto
+	media-tv/mythtv[perl]"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dobin bin/mythtv-status
+	doman "${FILESDIR}/mythtv-status.1"
+	dodoc README FAQ ChangeLog THANKS
+}
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
new file mode 100644
index 000000000000..229ca090b1cd
--- /dev/null
+++ b/media-tv/mythtv/Manifest
@@ -0,0 +1,13 @@
+AUX bash_profile 63 SHA256 9a753f699d07b5f481374d13ea3f2b2439a22f3a9a49b6280cc8d9eebf0b2ca9 SHA512 1338a6871ba04100b3c74f91140be834ee659cb7fcf3aa1bdd251631e47690fae88b8eb80984ff5e35b2a4cf9b3fb1b0be8205fe220c82b19e9d935cc790d5b6 WHIRLPOOL 10220cf7662f150863b47529a90c831407ce93d272d64960cfa727992d0b4dfe2e13de2c62d7a4b27f924526307822fa488d9551f6e8f62a47f63a89dfaee9fe
+AUX mythbackend.conf-r1 700 SHA256 7da59cf1e2da944e6f9c549251ffd59a379db1bd95fbc2aa47e311c64972935f SHA512 1e88f58a003cf583c7c1eda4832ffd22223dab7cfbdf87f075c9fbac6735fd5a15c42ff056fa1d9a060e8249c4be5153d05329ea9b838818b495e33d0af788c5 WHIRLPOOL bb194c4dcd92e89ceb43c81b2fc61ab7716d31487616f3826c22372d6881418bf8a80e98b7239b897ffbf2e6cd91fa9ac35303deb5732e19d1c176491a048861
+AUX mythbackend.init-r2 2050 SHA256 2307a5794bb0c8ea1294527084224bd0dde6b366b95181491940612fea80ec04 SHA512 8eeb64cf32eaaf3415c4ffae4a72ce365e20d51b5cefac73aced87faeb92503a2c0c2baa4048cfdc521436bf3fab0769122b168d9f18e0b4c0890c329a6b2fc8 WHIRLPOOL e7b607f75b4f68eb07ff13a604d0be8232b5d3c53f67728a93b9d679d44a8e789583f0f4f94b01b8a8ab12058ae458e7e6a2777d28e5c2297ab0a0055eb062c7
+AUX mythbackend.service-28 2689 SHA256 25f6083a610d691c6ce933514ae893f83eb45dca8a1e0bc603d90d9213056539 SHA512 945cd721c7114e7c9a334063c6f85de40c2dd8a40271b1755b31881ae2c067b67d34685e1cb2d9b09fdaa9bf58ea2763e4e314b288e53f8bfcef7b6942ce5dd1 WHIRLPOOL 5cc1fb186df853a8c6ea35a3e5dbd54e1abb309f49b4ab2afc31905f0604249ef960a057bc40ed0dd702893a76409735deb3b1bbfd3b9e83311d9d451d74891a
+AUX mythfrontend.conf 474 SHA256 8aa8de5df71905490448b7eeb9960599f2c813c8b576e95ff6fcba5986340a3f SHA512 8b3967f5e7d719fefe50b8868dc1b974c3f6337335e7e65799ddb331abe07df0fadb4cb619758fefeaa0c4d0d1dac6f00e0982736cab5acac993bdaced0051c2 WHIRLPOOL a369da19de64fe3cf97a0c346d386de724671aa41cc10c1fef780ce49eeb23c2515e7725e682843ba9f8c142a88e9cbd7b463738e251e039b7ae407ecfd77b04
+AUX mythfrontend.wrapper 794 SHA256 db90ac5ff3bec3f2a81f376cc94c553d2cce026fd921bc822a6e3428fd8fa2e0 SHA512 d69676d3b981c76988bbe60277f74028668c851db7db3c37a60ecc95ae18d9f77cd38511fcd3deb95d1f87bf659d7b0bcd7f1dd469801950d28f7b3f6f6947e3 WHIRLPOOL dd47702ed5c130c2c407e1c0b107eac6d9378b0e4635806caed510aba8a38dd65818151eae3bc9ed59055f4f8b1c0c2cb7ddd7f35bdc353bd207ca93979053ae
+AUX mythtv.logrotate.d-r4 235 SHA256 322817abac79967e996f9afdd00b8814e38f51954babca910612127b8cfd5891 SHA512 8dd8936599acabfa55ad7efb870de431e03cb86c3c96156c2c0eee6675962dcc527391260f2ba66e3d54c1d41373001ef25c9d2421e83940c686d14b5f29fff7 WHIRLPOOL ea31e6635b0cd6dccc92878c6c1ec477c448ce894835a11e8131f8855c3f42c00cde91e5f4a3b97dd3aa1340a800453d4eb03e3b8db7a24bffdb342be42aa0e7
+AUX xinitrc-r1 234 SHA256 0b335cc6d1e22d71f61bacfdcfed6cc450fecf7ff10bdb4bad50fd085bd7b2db SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188 WHIRLPOOL 6796d4d83ff200bd36cc02e3765222efd77dd7baa69ed9d6845b7ecb836fcd0b110f7ce644af1e2c4af3f76c4c924f7e69499b0b4f9f511ace31f3f9cc804240
+DIST mythtv-0.28.1.tar.gz 104477892 SHA256 73dd4de0de6fe5688c290781b76de6380b256a87159f2c6e3dad66870389da1f SHA512 67a81858cd19b90f519113b234119ecc248366d8545c862d887755f256cddf04d9ca16a7bf67f63e06f7628730e7dbde2a2099ca8aaeb9061b2e55a5a0b7d5e7 WHIRLPOOL 370f3a528438d50d302ab6adadba5089b32749f8127cbf270b85ef16d35ca15026e0947e292920a3dd6acf2ed65de68af8754d985944bd59f3310a42b03551de
+EBUILD mythtv-0.28.1-r1.ebuild 10105 SHA256 d6a4e1a0cd091b272e047f89abf95132c9ea03c53f7f0c1dbcc44001f8dde0b8 SHA512 360609fa43a4ead2ed4d5800af54fee9f914f37c24b5fa51995e159f0ff14a27858c7e4b6bcf141b42a197d4900486e58a59f72455524bce43fda73a91d0c54b WHIRLPOOL 275486c3b42520f872873045ee62b4ac54d63bc624feb1339949aa1c133f1ae50d840ec6bf1190865ff761bfa48ad7bf881f6bd29ccae021ff19d1eecc6d86fd
+MISC ChangeLog 10904 SHA256 309d32b9ca07ba393dc4b6d03907746917d85b3f11486d72543e65538eb8b4cd SHA512 d0fc7f72414aaebdb26651bc8b1715b6feb38e0f4533372cb1c02989ba6cfe8133e535f181bc404f4f357c305b2a6533e55409aa1f90c272b4c45199bf759efe WHIRLPOOL 40cd374bca79222a5c6c56fef4a66ae1ce0b41658f4589c83a51c9a734ff9960ddcd0b30f942f56b1a5af6c13bb99c9ac98f37f246c8454034dfdebc544d8851
+MISC ChangeLog-2015 82055 SHA256 4d13079f06f3b39715485dddc585ec44b066a7af69e19b35be4316d41b819b95 SHA512 c4b170ea2c09681cd65f15a6d6814d2dbc11b28d335468ed2ea8ea755ee8cc0db32758c533d18c288a8a43c66e03295ec28d7dbd5ca3382b2822378b393b8813 WHIRLPOOL 578892bdd904fcb626acaa691e0174053fa96550f62de4f531c6d16bf9fd049021596327fc9b7dff1c5e5499602e673caef748deb380c34164473185ae08db3b
+MISC metadata.xml 3168 SHA256 89b5f955ab578dac50b2d17b0bbb5f249195338e111ee4f786b284404ee63835 SHA512 4bf85c050f41bfee848e52c45fd7e8bf577a07b4448b63b57448caa18abe9026827a07d90a8c7bb1d9f24ff5e61523a93725a3c8a2c6bf547e01f7de0a49d417 WHIRLPOOL 2e432187b55e103cacd862862e94a4fd33376c78b7eebf1e78dc39b8360964699bad81d56cd28ecd4615a1fededd5c5275b81969510700dce01b0a7494b88479
diff --git a/media-tv/mythtv/files/bash_profile b/media-tv/mythtv/files/bash_profile
new file mode 100644
index 000000000000..5de354bccae9
--- /dev/null
+++ b/media-tv/mythtv/files/bash_profile
@@ -0,0 +1,4 @@
+# .bash_profile
+case "`tty`" in
+	*tty8) startx; logout ;;
+esac
diff --git a/media-tv/mythtv/files/mythbackend.conf-r1 b/media-tv/mythtv/files/mythbackend.conf-r1
new file mode 100644
index 000000000000..f7709c439b10
--- /dev/null
+++ b/media-tv/mythtv/files/mythbackend.conf-r1
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Accepts any valid combination of logging options to mythbackend
+# To get a valid list run: /usr/bin/mythbackend -v help
+#MYTHBACKEND_VERBOSE="general"
+
+# Configures where mythbackend logs
+# Valid values:
+# * files           - logs each individual daemon in /var/log/mythtv (default)
+# * database        - logs into the database
+# * syslog FACILITY - logs to syslog using FACILITY (see syslog(3))
+# * console         - logs only to the console (no mythlogserver)
+#MYTHBACKEND_LOGGING="files"
+
+# Allows you to pass specific startup options to mythbackend
+# e.g. --noupnp
+#MYTHBACKEND_OPTS=""
diff --git a/media-tv/mythtv/files/mythbackend.init-r2 b/media-tv/mythtv/files/mythbackend.init-r2
new file mode 100644
index 000000000000..dc063030d47c
--- /dev/null
+++ b/media-tv/mythtv/files/mythbackend.init-r2
@@ -0,0 +1,72 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="MythTV backend recording daemon"
+extra_started_commands="resched upnprebuild"
+description_resched="Forces the recording scheduler to update"
+description_upnprebuild="Rebuilds the UPnP media cache"
+
+MYTHBACKEND_OPTS=${MYTHBACKEND_OPTS:-"${MYTHBACKEND_OPTS}"}
+MYTHBACKEND_VERBOSE=${MYTHBACKEND_VERBOSE:-"general"}
+MYTHBACKEND_LOGGING=${MYTHBACKEND_LOGGING:-"files"}
+
+name="MythTV backend"
+command="/usr/bin/mythbackend"
+pidfile="/run/mythtv/mythbackend.pid"
+start_stop_daemon_args="--pidfile ${pidfile} --user mythtv:video"
+command_args="--daemon --pidfile ${pidfile} --verbose ${MYTHBACKEND_VERBOSE} ${MYTHBACKEND_OPTS}"
+
+depend() {
+	# mythbackend doesn't need to run on the same machine that
+	# mysql runs on. so its use for that reason
+	use logger net.lo mysql LCDd
+}
+
+start_pre() {
+	case "${MYTHBACKEND_LOGGING}" in
+		database) logging="--enable-dblog" ;;
+		syslog\ *) logging="--${MYTHBACKEND_LOGGING}" ;;
+		files) logging="--logpath /var/log/mythtv" ;;
+		console) logging="--nologserver" ;;
+		*)
+			eerror "Invalid MYTHBACKEND_LOGGING value"
+			exit 1
+			;;
+	esac
+
+	#fixes for bug #101308
+	unset DISPLAY
+	unset SESSION_MANAGER
+
+	# Work around any strange permissions that may be on these files.
+	[ "x${MYTHBACKEND_LOGGING}" = "xfiles" ] && \
+		checkpath --directory --owner mythtv:video --mode 0755 /var/log/mythtv
+	checkpath --directory --owner mythtv:video --mode 0775 /home/mythtv
+	checkpath --directory --owner mythtv:video --mode 0750 /run/mythtv
+}
+
+start() {
+	ebegin "Starting ${name}"
+	start-stop-daemon --start ${start_stop_daemon_args} --exec ${command} \
+		-- ${command_args} ${logging}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${name}"
+	start-stop-daemon --stop --retry 10 --progress --pidfile ${pidfile}
+	eend $?
+}
+
+resched() {
+	ebegin "Updating the recording scheduler"
+	${command} --resched
+	eend $?
+}
+
+upnprebuild() {
+	ebegin "Rebuilding UPnP media cache"
+	${command} --upnprebuild
+	eend $?
+}
diff --git a/media-tv/mythtv/files/mythbackend.service-28 b/media-tv/mythtv/files/mythbackend.service-28
new file mode 100644
index 000000000000..3ab4c9b19ded
--- /dev/null
+++ b/media-tv/mythtv/files/mythbackend.service-28
@@ -0,0 +1,66 @@
+# Do not edit this file, it will be replaced on update
+# If you need to make modifications to this unit file first make a copy in # /etc/systemd/system
+
+# This file is part of the packaging of MythTV #
+# MythTV is free software; view http://www.mythtv.org for more information.
+#
+# It is sometimes necessary to wait for a capture device to finish (hot)plug
+# initialization before the backend starts.  If this is necessary, 
+# create a Wants and After entry for all the capture devices that
+# one wishes to wait to be created before the backend starts using the systemd
+# device name mangling names (/dev/some/thing turns 
+# into dev-some-thing.device).  These normally should  be udev persistent 
+# filename rules to avoid confusion.
+# See the MythTV wiki for udev persistent filename # discussions found at:
+# http://www.mythtv.org/wiki/Device_Filenames_and_udev
+#
+# In order to insure that systemd will create a device unit for the 
+# capture device, one must insure that udev will have the tag "systemd"
+# (i.e. add TAG+="systemd" to the udev rule).
+#
+# The MythTV package ships with a default udev rule file located in: 
+# /lib/udev/rules.d/99-mythbackend.rules
+
+[Unit]
+Description=MythTV backend service
+After=network.target mysqld.service
+# Uncomment the following line if you will be using the mythweb plugin on the 
+# same system as mythbackend.
+#Wants=httpd.service
+
+[Service]
+Type=notify
+
+Environment=MYTHCONFDIR=/etc/mythtv
+# Default setting assumes a system wide install. Otherwise it should be set to 
+# the folder containing the .mythtv subfolder containing the config.xml file 
+# Such as
+#Environment=HOME=/usr/share/mythtv
+# or
+Environment=HOME=/~/.mythtv
+
+# systemd changes execution from the calling user (possibly root) to this user
+# if you have permissions problems or obscure errors try logging in as mythtv 
+# See notes below
+User=mythtv
+
+# Uncomment one of the following...
+# Use sysloging rather than separate logging:
+#ExecStart=/usr/bin/mythbackend --syslog local7 
+
+# If Type=forking you must specify the --daemon and --pidfile options:
+#ExecStart=/usr/bin/mythbackend --daemon --logpath /var/log/mythtv --loglevel crit --pidfile /run/mythtv/mythbackend.pid 
+#PIDFILE=/run/mythtv/mythbackend.pid
+
+# Systemd sends stdout to syslog, and mythbackend has console logging enabled without --daemon.
+# Send stdout to /dev/null so console logging doesn't go to syslog
+#StandardOutput=null
+# Default setting for Type=simple.
+#ExecStart=/usr/bin/mythbackend --logpath /var/log/mythtv --loglevel crit
+ExecStart=/usr/bin/mythbackend --loglevel notice
+
+# Whether systemd will continue over-watch and restart on any halt
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-tv/mythtv/files/mythfrontend.conf b/media-tv/mythtv/files/mythfrontend.conf
new file mode 100644
index 000000000000..5dad284705ab
--- /dev/null
+++ b/media-tv/mythtv/files/mythfrontend.conf
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation 
+# Distributed under the terms of the GNU General Public License v2
+
+# Should 'mythfrontend' really execute mythwelcome instead?
+# Default: false
+MYTHWELCOME=false
+
+# Options to pass to mythfrontend or mythwelcome based on the above setting
+# Note: If you have mythwelcome enabled, it does not pass arguments to
+# mythfrontend. You must configure this inside mythwelcome
+# Default: --syslog local7
+MYTHFRONTEND_OPTS="--syslog local7"
diff --git a/media-tv/mythtv/files/mythfrontend.wrapper b/media-tv/mythtv/files/mythfrontend.wrapper
new file mode 100644
index 000000000000..ce3608ec1f9a
--- /dev/null
+++ b/media-tv/mythtv/files/mythfrontend.wrapper
@@ -0,0 +1,29 @@
+#!/bin/sh
+# Based on Mythbuntu's script
+
+# Check if the frontend is already running,
+# if it is bring it to the foreground.
+# This is to prevent multiple frontends from running
+/usr/bin/pgrep mythfrontend.real 2>&1 > /dev/null && \
+    /usr/bin/wmctrl -a "MythTV Frontend" 2> /dev/null && \
+    exit 0
+
+# Check if you're part of the video group
+if [ -n "$(groups | grep -v video)" ]; then
+    echo "'$USER' is not part of the 'video' group." >&2
+    echo "For best results add '$USER' to the 'video' group." >&2
+fi
+
+if [ -e /etc/conf.d/mythfrontend ]; then
+    . /etc/conf.d/mythfrontend
+fi
+
+if [ "x${MYTHWELCOME}" = "xtrue" ]; then
+    exec /usr/bin/mythwelcome ${MYTHFRONTEND_OPTS} "$@"
+    RET=$?
+else
+    exec /usr/bin/mythfrontend.real ${MYTHFRONTEND_OPTS} "$@"
+    RET=$?
+fi
+
+exit ${RET}
diff --git a/media-tv/mythtv/files/mythtv.logrotate.d-r4 b/media-tv/mythtv/files/mythtv.logrotate.d-r4
new file mode 100644
index 000000000000..28e3ce62bfdb
--- /dev/null
+++ b/media-tv/mythtv/files/mythtv.logrotate.d-r4
@@ -0,0 +1,14 @@
+/var/log/mythtv/*.log {
+	weekly
+	rotate 8
+	missingok
+	ifempty
+	nocreate
+	nocompress
+	sharedscripts
+	olddir /var/log/mythtv/old
+	lastaction
+		killall -HUP mythlogserver
+		find /var/log/mythtv/old -type f -mtime +30 -delete
+	endscript
+}
diff --git a/media-tv/mythtv/files/xinitrc-r1 b/media-tv/mythtv/files/xinitrc-r1
new file mode 100644
index 000000000000..c366fe487a84
--- /dev/null
+++ b/media-tv/mythtv/files/xinitrc-r1
@@ -0,0 +1,8 @@
+# .xinitrc
+[ -x /usr/bin/nvidia-settings ] && /usr/bin/nvidia-settings -l
+/usr/bin/xset s noblank
+/usr/bin/xset s off
+/usr/bin/xset -dpms
+/usr/bin/evilwm &
+# Configure arguments via /etc/conf.d/mythfrontend
+exec /usr/bin/mythfrontend
diff --git a/media-tv/mythtv/metadata.xml b/media-tv/mythtv/metadata.xml
new file mode 100644
index 000000000000..b162d154de78
--- /dev/null
+++ b/media-tv/mythtv/metadata.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="alsa">Allows MythTV to directly output sound to ALSA devices,
+		this is needed if you are using ALSA dmix or SPDIF. Note, you will have
+		to physically type your device into the MythTV configuration since it
+		will only give you /dev/dsp devices in the drop down.</flag>
+		<flag name="altivec">Builds ffmpeg's codec libraries with altivec
+		support.</flag>
+		<flag name="autostart">Uses a custom autostart configuration gleaned from
+		experience with MythTV since its early versions and discussed with
+		other MythTV maintainers and users. Does not rely on KDE being installed
+		like most methods do.</flag>
+		<flag name="bluray">Pulls in libbluray for BluRay support.</flag>
+		<flag name="cec">Allows you to control CEC enabled TVs via HDMI. Currently
+		requires a USB based CEC -&gt; HDMI injector between your TV and video
+		card since no graphics drivers support CEC natively.</flag>
+		<flag name="crystalhd">Allows you to utilize a Broadcom CrystalHD hardware
+		based video decoder to improve the performance of video decode.</flag>
+		<flag name="debug">Instructs Qt to use the 'debug' target instead of
+		'release' target. If your MythTV is crashing or you need a backtrace,
+		you need to compile it with this option otherwise the debugging data is
+		useless.</flag>
+		<flag name="dvb">Enables support for Linux DVB cards. These include all
+		cards that work with digital signals such as ATSC, DVB-T, DVB-C, and
+		DVB-S, QAM-64, and QAM-256.</flag>
+		<flag name="egl">Support EGL video output.</flag>
+		<flag name="fftw">Support visualizations via <pkg>sci-libs/fftw</pkg></flag>
+		<flag name="hls">HTTP Live Streaming support</flag>
+		<flag name="ieee1394">Allows MythTV to communicate and use Firewire enabled
+		Cable boxes. These are typically found in the United States, where such
+		support is required by law. This will also install Firewire test
+		programs and external channel changers if the internal changer does not
+		work.</flag>
+		<flag name="jack">Allows MythTV to use JACK as your sound output device. You
+		will have to manually configure the path to your JACK settings.</flag>
+		<flag name="lcd">Tells MythTV that you have an instance of
+		<pkg>app-misc/lcdproc</pkg> configured on your machine and it should
+		output information such as current time, show name, episode name, etc to
+		that LCD.</flag>
+		<flag name="lirc">Adds LIRC support directly to MythTV allowing for built in
+		control via a LIRC device.</flag>
+		<flag name="mythlogserver">Enable support for syslog and file logging. Not
+		used with systemd.</flag>
+		<flag name="perl">Builds the perl bindings for MythTV. Allows you to write
+		scripts in Perl to control your MythTV setup or communicate with
+		it.</flag>
+		<flag name="wrapper">Use Ubuntu mythtfrontend wrapper.</flag>
+		<flag name="xmltv">Pulls in the <pkg>media-tv/xmltv</pkg> TV listing
+		grabbers for users not using Schedules Direct.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">MythTV/mythtv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-tv/mythtv/mythtv-0.28.1-r1.ebuild b/media-tv/mythtv/mythtv-0.28.1-r1.ebuild
new file mode 100644
index 000000000000..ac83e415065f
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.28.1-r1.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+# git diff --relative=mythtv v0.27.6.. > ~/mythtv-0.27.6/patches/mythtv.patch
+BACKPORTS="03f44039848bd09444ff4baa8dc158bd61454079"
+MY_P=${P%_p*}
+MY_PV=${PV%_p*}
+
+inherit flag-o-matic multilib eutils python-single-r1 qmake-utils user systemd vcs-snapshot
+
+MYTHTV_BRANCH="fixes/0.28"
+
+DESCRIPTION="Homebrew PVR project"
+HOMEPAGE="https://www.mythtv.org"
+SRC_URI="https://github.com/MythTV/mythtv/archive/${BACKPORTS}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0/${PV}"
+
+IUSE_INPUT_DEVICES="input_devices_joystick"
+IUSE="alsa altivec autostart bluray cec crystalhd debug dvb dvd egl fftw +hls \
+ieee1394 jack lcd libass lirc +mythlogserver perl pulseaudio python systemd +theora \
+vaapi vdpau +vorbis +wrapper +xml xmltv +xvid zeroconf ${IUSE_INPUT_DEVICES}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bluray? ( xml )
+	theora? ( vorbis )"
+
+COMMON="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5[mysql]
+	dev-qt/qtopengl:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-gfx/exiv2:=
+	media-libs/freetype:2
+	media-libs/taglib
+	>=media-sound/lame-3.93.1
+	sys-libs/zlib
+	virtual/mysql
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXv
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+	x11-misc/wmctrl
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	bluray? (
+		dev-libs/libcdio:=
+		media-libs/libbluray:=
+		sys-fs/udisks:2
+	)
+	cec? ( dev-libs/libcec )
+	dvb? (
+		media-libs/libdvb
+		virtual/linuxtv-dvb-headers
+	)
+	dvd? (
+		dev-libs/libcdio:=
+		sys-fs/udisks:2
+	)
+	egl? ( media-libs/mesa[egl] )
+	fftw? ( sci-libs/fftw:3.0= )
+	hls? (
+		media-libs/faac
+		<media-libs/libvpx-1.7.0:=
+		>=media-libs/x264-0.0.20111220:=
+	)
+	ieee1394? (
+		>=media-libs/libiec61883-1.0.0
+		>=sys-libs/libavc1394-0.5.3
+		>=sys-libs/libraw1394-1.2.0
+	)
+	jack? ( media-sound/jack-audio-connection-kit )
+	lcd? ( app-misc/lcdproc )
+	libass? ( >=media-libs/libass-0.9.11:= )
+	lirc? ( app-misc/lirc )
+	perl? (
+		>=dev-perl/libwww-perl-5
+		dev-perl/DBD-mysql
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-INET6
+		dev-perl/LWP-Protocol-https
+		dev-perl/Net-UPnP
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/lxml
+		dev-python/mysql-python
+		dev-python/urlgrabber
+	)
+	systemd? ( sys-apps/systemd:= )
+	theora? ( media-libs/libtheora media-libs/libogg )
+	vaapi? ( x11-libs/libva[opengl] )
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? ( >=media-libs/libvorbis-1.0 media-libs/libogg )
+	xml? ( >=dev-libs/libxml2-2.6.0 )
+	xvid? ( >=media-libs/xvid-1.1.0 )
+	zeroconf? (
+		dev-libs/openssl:0=
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+RDEPEND="${COMMON}
+	!media-tv/mythtv-bindings
+	!x11-themes/mythtv-themes
+	media-fonts/corefonts
+	media-fonts/dejavu
+	media-fonts/liberation-fonts
+	x11-apps/xinit
+	autostart? (
+		net-dialup/mingetty
+		x11-apps/xset
+		x11-wm/evilwm
+	)
+	dvd? ( media-libs/libdvdcss )
+	xmltv? ( >=media-tv/xmltv-0.5.43 )
+"
+DEPEND="${COMMON}
+	dev-lang/yasm
+	x11-proto/xf86vidmodeproto
+	x11-proto/xineramaproto
+"
+
+S="${WORKDIR}/${P}/mythtv"
+
+MYTHTV_GROUPS="video,audio,tty,uucp"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
+	usermod -a -G ${MYTHTV_GROUPS} mythtv
+}
+
+src_prepare() {
+	# Perl bits need to go into vender_perl and not site_perl
+	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
+		-i "${S}"/bindings/perl/Makefile
+
+	# Fix up the version info since we are using the fixes/${PV} branch
+	echo "SOURCE_VERSION=\"v${MY_PV}\"" > "${S}"/VERSION
+	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION
+	echo "SOURCE_VERSION=\"${BACKPORTS}\"" > "${S}"/EXPORTED_VERSION
+	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/EXPORTED_VERSION
+
+	echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=
+
+	# Setup paths
+	myconf="${myconf} --prefix=${EPREFIX}/usr"
+	myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
+	myconf="${myconf} --libdir-name=$(get_libdir)"
+	myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
+
+	# Audio
+	myconf="${myconf} $(use_enable alsa audio-alsa)"
+	myconf="${myconf} $(use_enable jack audio-jack)"
+	use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
+
+	use altivec    || myconf="${myconf} --disable-altivec"
+	myconf="${myconf} $(use_enable dvb)"
+	myconf="${myconf} $(use_enable ieee1394 firewire)"
+	myconf="${myconf} $(use_enable lirc)"
+	myconf="${myconf} $(use_enable xvid libxvid)"
+	myconf="${myconf} --dvb-path=/usr/include"
+	myconf="${myconf} --enable-xrandr"
+	myconf="${myconf} --enable-xv"
+	myconf="${myconf} --enable-x11"
+	myconf="${myconf} --enable-nonfree"
+	myconf="${myconf} --enable-libmp3lame"
+	use cec || myconf="${myconf} --disable-libcec"
+	use zeroconf || myconf="${myconf} --disable-libdns-sd"
+	myconf="${myconf} $(use_enable theora libtheora)"
+	myconf="${myconf} $(use_enable vorbis libvorbis)"
+
+	if use hls; then
+		myconf="${myconf} --enable-libx264"
+		myconf="${myconf} --enable-libvpx"
+		myconf="${myconf} --enable-libfaac"
+	fi
+
+	myconf="${myconf} $(use_enable libass)"
+
+	if use perl && use python; then
+		myconf="${myconf} --with-bindings=perl,python"
+	elif use perl; then
+		myconf="${myconf} --without-bindings=python"
+		myconf="${myconf} --with-bindings=perl"
+	elif use python; then
+		myconf="${myconf} --without-bindings=perl"
+		myconf="${myconf} --with-bindings=python"
+	else
+		myconf="${myconf} --without-bindings=perl,python"
+	fi
+
+	use python && myconf="${myconf} --python=${EPYTHON}"
+
+	if use debug; then
+		myconf="${myconf} --compile-type=debug"
+	else
+		myconf="${myconf} --compile-type=release"
+		#myconf="${myconf} --enable-debug" does nothing per sphery
+		#myconf="${myconf} --disable-stripping" does nothing per sphery
+	fi
+
+	# Video
+	myconf="${myconf} $(use_enable vdpau)"
+	myconf="${myconf} $(use_enable vaapi)"
+	myconf="${myconf} $(use_enable crystalhd)"
+
+	# Input
+	use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
+
+	# Clean up DSO load times and other compiler bits
+	myconf="${myconf} --enable-symbol-visibility"
+	myconf="${myconf} --enable-pic"
+
+	# CPU settings
+	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+		[ "${i}" = "native" ] && i="host"
+		myconf="${myconf} --cpu=${i}"
+		break
+	done
+
+	if tc-is-cross-compiler ; then
+		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
+		myconf="${myconf} --cross-prefix=${CHOST}-"
+	fi
+
+	# Build boosters
+	has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+	has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
+
+	myconf="${myconf} $(use_enable systemd systemd_notify)"
+	use systemd || myconf="${myconf} $(use_enable mythlogserver)"
+
+	chmod +x ./external/FFmpeg/version.sh
+
+	einfo "Running ./configure ${myconf}"
+	./configure \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		--qmake=$(qt5_get_bindir)/qmake \
+		${myconf} || die "configure died"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "install failed"
+	dodoc AUTHORS UPGRADING README
+
+	insinto /usr/share/mythtv/database
+	doins database/*
+
+	newinitd "${FILESDIR}"/mythbackend.init-r2 mythbackend
+	newconfd "${FILESDIR}"/mythbackend.conf-r1 mythbackend
+	systemd_newunit "${FILESDIR}"/mythbackend.service-28 mythbackend.service
+
+	dodoc keys.txt
+
+	keepdir /etc/mythtv
+	chown -R mythtv "${ED}"/etc/mythtv
+	keepdir /var/log/mythtv
+	chown -R mythtv "${ED}"/var/log/mythtv
+	dodir /var/log/mythtv/old
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
+
+	insinto /usr/share/mythtv/contrib
+	# Ensure we don't install scripts needing the perl bindings (bug #516968)
+	use perl || find contrib/ -name '*.pl' -exec rm -f {} \;
+	# Ensure we don't install scripts needing the python bindings (bug #516968)
+	use python || find contrib/ -name '*.py' -exec rm -f {} \;
+	doins -r contrib/*
+
+	# Install our mythfrontend wrapper which is similar to Mythbuntu's
+	if use wrapper; then
+		mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real"
+		newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
+		newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
+	fi
+
+	if use autostart; then
+		dodir /etc/env.d/
+		echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
+
+		insinto /home/mythtv
+		newins "${FILESDIR}"/bash_profile .bash_profile
+		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
+	fi
+
+	# Make Python files executable
+	find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
+		if [[ ! "${file##*/}" = "__init__.py" ]]; then
+			chmod a+x "${file}"
+		fi
+	done
+
+	# Ensure that Python scripts are executed by Python 2
+	python_fix_shebang "${ED}/usr/share/mythtv"
+
+	# Make shell & perl scripts executable
+	find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
+		while read file; do
+		chmod a+x "${file}"
+	done
+}
+
+pkg_preinst() {
+	export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
+}
+
+pkg_postinst() {
+	elog "To have this machine operate as recording host for MythTV, "
+	elog "mythbackend must be running. Run the following:"
+	elog "rc-update add mythbackend default"
+	elog
+	elog "Your recordings folder must be owned 'mythtv'. e.g."
+	elog "chown -R mythtv /var/lib/mythtv"
+
+	elog "Want mythfrontend to start automatically?"
+	elog "Set USE=autostart. Details can be found at:"
+	elog "https://dev.gentoo.org/~cardoe/mythtv/autostart.html"
+	elog
+	elog "Note that the systemd unit now restarts by default and logs"
+	elog "to journald via the console at the notice verbosity."
+}
+
+pkg_info() {
+	if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
+		"${EROOT}"/usr/bin/mythfrontend --version
+	fi
+}
+
+pkg_config() {
+	echo "Creating mythtv MySQL user and mythconverg database if it does not"
+	echo "already exist. You will be prompted for your MySQL root password."
+	"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
+}
diff --git a/media-tv/nvtv/Manifest b/media-tv/nvtv/Manifest
new file mode 100644
index 000000000000..4250c03b9f3d
--- /dev/null
+++ b/media-tv/nvtv/Manifest
@@ -0,0 +1,7 @@
+AUX nvtv.start 425 SHA256 7cf414a7aac450511c68fe17efbc06c0b70c761d4a253d9a86bdd09f30294778 SHA512 e91e5bfb5573becbebc0eea3070fd8d18c0abdea6687cdb540ceef0dad7021328cf28e6ca4e6399b1787586e325cd03f60e09a8462aef0341f2297ac05204b66 WHIRLPOOL c1c63b1c70ad4464fb9d99f4ff008c2e7c181a3e9d22ff3f7941c620c8bfb99c17f4db653128bdd8ffd733a2924c3dc87f169fb07ef6a3e0dc623db65940a8ef
+AUX respect-cflags.patch 865 SHA256 1340bdd18264d3af5af87eb6b20d9a1610d54a97116377e2f346685e84937abb SHA512 abe0a9ccce9c9a9a729aadf444c4bd91e7c94ab3c04817ad12fa471f77fb8fa54235ddc86c798fac94c988cfa58075d3bf2fc40ef26fdd3c629b6f81848951e5 WHIRLPOOL bd62581764ab4ee3743170099fd5f8a975cdae26d006dfb536eda6cc170006153b7047531cd8e908beddc1ca9bb6a5217a29a28ddab46c454d0e1b98bbbe533e
+DIST nvtv-0.4.7.tar.gz 419564 SHA256 f044c6de2df66196fa589ed0d33203bd10d88604f447befce1a6f62eb7b08dac SHA512 086de916b3b783a2071906e8f2eb98009f2f73627dc75ee086bde9864de3fb18ddf6d981c56225ac3dca3c837ff3575deb2aeca042be4cca9dc7a876cc41282d WHIRLPOOL c5ac613d4331f62c761addc321f3b619dc73206b5c5d5bbf75cbb7e261537521f8f67cbc4ea154dc89c9ebcba6b95c08b7b78569c50f8d2f895481b7aefc4a11
+EBUILD nvtv-0.4.7-r3.ebuild 819 SHA256 4e69fefa13e4c59e5140c684d0f1bd38a4143db7fd9f9869456f53e09895418a SHA512 b52b03361c6c122a26e22bc1ceb95c1c7d701be536695f0108c98eb01734f856f4f55c55120f3be9328794e65738485c97ba7a0577bd26d088fbfa64e78acd44 WHIRLPOOL 707f98ee33d8333aac030c041e4519159bb5d3dafe3639156dc130dc9304507cb82b361ab01bcc78db788909f57400098c832eadb616cd250366c6852e00a404
+MISC ChangeLog 3392 SHA256 efcd09af34baf6414c6f2ee3e2185df2426a52acb8538e6214ea51bda6eacd2d SHA512 6a4ae8c1e060e9d651cd4ee377198c676303474f4a0fa9698bdec87f2958b39642dba4d1cb8e418346785df1fe20e4281607253de8776ee01cbc634e3371bc86 WHIRLPOOL f74b934c679b73804ffea964bf5e259c1640d2267f86007217ef3389ff85c2a4b189b95776ce3bbb9a1b788bbbd9eb1c0a8955dd1222af8119d648b19ccd77f8
+MISC ChangeLog-2015 3206 SHA256 c7932bc11f699a3cc4b4ab42085e64c7f15b91f8b88a93b5cc4aee5cdb79934d SHA512 14822890f1a0a8b785d014e2bd459210f8d1a3533d2984486f82671f6b26d33d852cc3ea0a01ba3efe2087f379ed7104fc0cccd17e0863c37f46049c31b65471 WHIRLPOOL 584f5f39b0ee1eb12e93e2b1b5311308413a920319fcb0a21da4e43f7c7ccd318028509fb31b9010fd12e2be731b10caebbb66397a523e8752f4d18b09722a0d
+MISC metadata.xml 306 SHA256 fd7158d14fd0d1f35148a06680ed1316e74c7c9427df3ebc22a3923be32810dc SHA512 fb364cfd967773a1db12aafedcae8812dba9413da3eea5513a29537733214ee128432296bc5a51a79ba72863b8344e8dcac657092d6b199e8c34f56052cc7d6d WHIRLPOOL 08793c97f5cd25d6a1a7f19557210fd323fa460c470489d0d2e29bfe9291a0214c694be595a42b2f554b816e704143bf330c75769add427d80719e233479f812
diff --git a/media-tv/nvtv/files/nvtv.start b/media-tv/nvtv/files/nvtv.start
new file mode 100644
index 000000000000..57b471a0986b
--- /dev/null
+++ b/media-tv/nvtv/files/nvtv.start
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use modules logger
+}
+
+start() {
+	ebegin "Starting NVidia TV-Out Server"
+	start-stop-daemon --start --quiet --exec /usr/sbin/nvtvd \
+		--background 1>&2
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping NVidia TV-Out Server"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/nvtvd 1>&2
+	eend $?
+}
diff --git a/media-tv/nvtv/files/respect-cflags.patch b/media-tv/nvtv/files/respect-cflags.patch
new file mode 100644
index 000000000000..2fa991f72638
--- /dev/null
+++ b/media-tv/nvtv/files/respect-cflags.patch
@@ -0,0 +1,31 @@
+The rest of the build system will respect the user's CFLAGS if we
+don't wipe them out, so just delete the line that does that. The
+removal of the gtk-1.x stuff is so that we can run eautoreconf and
+have it work; we don't support gtk1 in Gentoo anyway.
+
+diff --git a/configure.in b/configure.in
+index f8f48cc..d8f1261 100755
+--- a/configure.in
++++ b/configure.in
+@@ -57,9 +57,6 @@ dnl
+ dnl Debugging enables, CFLAGS
+ dnl
+ 
+-dnl Clear -g -O2 from CFLAGS
+-CFLAGS=""
+-
+ AC_MSG_CHECKING(for debugging info)
+ 
+ AC_ARG_ENABLE(debug,
+@@ -110,11 +107,6 @@ if test ${with_gtk} = no ; then
+ fi
+ 
+ if test ${have_gtk} = no ; then
+-  if test ${with_gtk} = yes -o ${with_gtk} = gtk1 ; then
+-    AM_PATH_GTK(1.2.0, have_gtk=gtk1)
+-  fi
+-fi
+-if test ${have_gtk} = no ; then
+   if test ${with_gtk} = yes -o ${with_gtk} = gtk2 ; then
+     AM_PATH_GTK_2_0(2.0.0, have_gtk=gtk2)
+   fi
diff --git a/media-tv/nvtv/metadata.xml b/media-tv/nvtv/metadata.xml
new file mode 100644
index 000000000000..3f29b9b27482
--- /dev/null
+++ b/media-tv/nvtv/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>TV-Out for NVidia cards</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">nv-tv-out</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-tv/nvtv/nvtv-0.4.7-r3.ebuild b/media-tv/nvtv/nvtv-0.4.7-r3.ebuild
new file mode 100644
index 000000000000..39d120ba773d
--- /dev/null
+++ b/media-tv/nvtv/nvtv-0.4.7-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+IUSE="X gtk"
+
+DESCRIPTION="TV-Out for NVidia cards"
+HOMEPAGE="https://sourceforge.net/projects/nv-tv-out/"
+SRC_URI="mirror://sourceforge/nv-tv-out/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+
+RDEPEND="sys-apps/pciutils[-zlib]
+	gtk? ( x11-libs/gtk+:2 )
+	X? ( x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xf86vidmodeproto )"
+
+PATCHES=( "${FILESDIR}/respect-cflags.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with gtk) $(use_with X x)
+}
+
+src_install() {
+	dobin src/nvtv
+	dosbin src/nvtvd
+	dodoc ANNOUNCE BUGS FAQ README doc/*.txt doc/USAGE
+	newinitd "${FILESDIR}"/nvtv.start nvtv
+}
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
new file mode 100644
index 000000000000..a4e5248d19a1
--- /dev/null
+++ b/media-tv/plex-media-server/Manifest
@@ -0,0 +1,12 @@
+AUX conf.d/plex-media-server 216 SHA256 d202e6c380248d08a494deabec6087b22d3e0508cbc3bf38e42f822c329662c8 SHA512 d3d68fa58a1c1064803a9607708123302890571e823e5bc26de741bb15bd51db19234636672ff01757cbbcdb984c60663545689fa915761c78c3cf49e6da0f95 WHIRLPOOL 73f4e4ac835c434c7ee3a207d8bcd128510b447df18468b1cf6366fa02cf4dfe3a2299ee1dc40de7fada8d43f0c8ba934b76aa0a821d3de98f18d234e9f87108
+AUX init.d/plex-media-server 413 SHA256 2733006ead10955216f5676722f2af729fdbed13b3de706c37e7baaad9995826 SHA512 aeb873a00081f20abd27cc76d395908ae0643bd8aa665557adafef2ed97edbe93c18b55818b49227746f9c3ce4b7a81ceb9132f07d8d873bc7b5a932b944a402 WHIRLPOOL 4e3b19cad2283861f68bbe1e84bf39541a56aab193fb1e17f63a19e951204639734236437d7c8bb863ed1236d0a1228b5173b53660caa995b6dac91fcec3cfbf
+AUX systemd/plex-media-server.service 159 SHA256 5dfda2be8f0d49990418ef770fde1be352f637eff7e95d04dd8a7801353a7966 SHA512 9066840efa43b127dd0d4b26ea0552894db97bf48f89003258095986e7d4728e05bee2f49de856777ed3d0b5ec41654c14505bc9867b227b754aeecd0529abd6 WHIRLPOOL 7ba1f4d91f5bdd3d9a59235689b6a864804726e6b4a649c7504d2adc5eb333930dd6f17d0f3be9804c79210503063a06a08e2ee5501437b4d06a24d2f2f717cd
+AUX virtualenv_start_pms.patch 839 SHA256 1e0a63ee4568f34e1309133a11708d85f3df6a51134c4f630b6fbd0369d3d6e1 SHA512 55fb8f3234942d10c0d6d1820fbab48b8a9f26f069031946dae551cde8b7d18d61ef36ec994719d2519687dc75e5ec27205702395a8af112bda720b7a62072aa WHIRLPOOL 60b680f5d073c2d4a83ac2c7f0034eaf1f03a8449d3beeefaaff6d202a06e909ab975cbc004361badb266114c70f5adf4b0d679acff9baa984e7b1dc7856daf5
+DIST plexmediaserver_1.5.6.3790-4613ce077_amd64.deb 105490284 SHA256 633a7fad995347fed1b22dd6983156d24ac95659d541ee4cf8eea505d4cc5575 SHA512 87173c290937706f05461b7ca3b217e09262ec02b0fa728580c18802e3b7246899f2840fdd6703256e32cd92adb71e3d5321c0a38569827f005eb1face9144f7 WHIRLPOOL d9de5e1a90e8644aa14702e034d1799cd1f1fab1c7c730a2334bdac6e1c90a44a0febdfdb42ab791a728bf6daf9baf655c3f2dd82ff9632a86340a9e9aef38e9
+DIST plexmediaserver_1.7.5.4035-313f93718_amd64.deb 106646674 SHA256 a8c9d2961443c22c85b2795f267bafe576561d365a85d18a97627508a3515844 SHA512 033296004a57c0b7ded412298e7bb2c817ca5c4276683115e0bfb88ecb3445355745ef8216aa4ec92926a3f3ff5ae813470ad4a2edc7f85ed32386e363e76203 WHIRLPOOL 912b2057f71f51a3820a5e660f8726af000165a72ea36f480a62786057cf1e7c42f20741119cd7de14565360d45b6e6c6888ae2cc6ccdc67e7f1d7b8da54c530
+DIST plexmediaserver_1.8.1.4139-c789b3fbb_amd64.deb 107251412 SHA256 30b907c94d5b76991831fd3555e4447724683c4e01617a71d39bfe5be11af126 SHA512 17b6de15920013e74f0a634f004b9b599bebd266412f694963967c766e8879b54485a9b07178a575d246c6bc53b202e38da89e293fd7219d0cf993bf9e27afec WHIRLPOOL c907c627a8e693b5b029958e87b01b8c27e3f40ec6ddc04d9b95e67570260ac344bfad9aa35dfdd2ec13f492f7fed3817373c713b5163b7f9c22db1970b8091f
+EBUILD plex-media-server-1.5.6.ebuild 3995 SHA256 a91c780e32236b444fa5ef62ebf4b453858ed89433db9d49c5b29e1a29452029 SHA512 d4b2880b329a8da3849ece23f5f8a2dc31196dc1d18a649d1cd705effb6eb6b88c6eeb36e446c434539ae1abdad622f0bd4028247a894ca1a0a2ae2a6abffa26 WHIRLPOOL 18824fc58827aec21e3529215acde2f1cdf5c9c88abe35d8b3c955b2c1f303870eca437c06dac11953ccfb4c2c50d9de407307e18ada7e01d097e0fe41c79b69
+EBUILD plex-media-server-1.7.5.ebuild 3995 SHA256 a943db03df95fa6389ed034666ffcffbc63e2ffff76032eafe618248079d246b SHA512 9254a8cd9dd5744e7fae65b77f73c13c0e17a1d625e9ad794e80b10735c26774b41f00f0fb4a99a7fa191a11cfec877fde2edaca64c38122a68c0a2fd44ae8af WHIRLPOOL 5f14cb5121c13a541555324fca156dcd9b033f4bc24381bf1e6dad91f43f2bc9317fe06214016d2a3d933aea9748ee0a9017d268bfba9be7b796789ba8f7d793
+EBUILD plex-media-server-1.8.1.ebuild 3996 SHA256 0b0d50530b98a0e0385ad85c38689846099379fa7bbcb1884dead42459481876 SHA512 b15514c52cc78012eca48d84a679b57c6b097780cff6b35c0771c46646e8958a9d290eaf032fdb2d3207050e95699d0120a93f07105995bed6a2983abe8bbce7 WHIRLPOOL 0f5c54075dc15529fcdb6cc83eedd701305209eeb2dce75672171882015826ce916af10e69cdd89e74bda128d0a73d676f9e161b2c6c25407715ae07af034874
+MISC ChangeLog 956 SHA256 43feb195a2794a3cbf1d2787afc7b8e1f353fddfff5ece61a3582b32beb20907 SHA512 c2952fbddd06bb4b62201aae7e9763fef435d5c1e0b0861ed94afc952a3351f6eff2909dcfc6b926410a1de3c31f32291e31f8cee340208d448e37e2025ec6db WHIRLPOOL 06e4f631d6a82fd2064f71bbd63d40b6f5cd313b9975d03d3f63bcef05872a371f7314a5e5ec400ece522cb7518b31d3de3958c18c31bf27972fa3ea54936648
+MISC metadata.xml 272 SHA256 502d1021bb3076e7536a5af5b0f6575feb41af3488752838419d29f23b586d81 SHA512 21fe9d289af64cd556f7c8edb452857c3285dec0e3b83a3be2e8a67dda1da59994ab70de86c78a5d9fe9a3c488ff82dc909f7e5fee946386bffb410b02caafdb WHIRLPOOL 9f1c8d9f91ef6bcec596fa1c3497c87ca4ffee718eff8246e71bc739bdef0905c08d3eab0a0ed6b1298f75134ed7250ef301a683b2829f54f5f81de91074a358
diff --git a/media-tv/plex-media-server/files/conf.d/plex-media-server b/media-tv/plex-media-server/files/conf.d/plex-media-server
new file mode 100644
index 000000000000..7fe754fb1d81
--- /dev/null
+++ b/media-tv/plex-media-server/files/conf.d/plex-media-server
@@ -0,0 +1,7 @@
+# Config file for /etc/init.d/plex-media-server
+
+PLEX_PIDFILE="/var/run/plex-media-server.pid"
+PLEX_OUTLOG="/var/log/pms/out.log"
+PLEX_ERRLOG="/var/log/pms/err.log"
+PLEX_USER="plex"
+PLEX_SCRIPT="/usr/sbin/start_pms"
diff --git a/media-tv/plex-media-server/files/init.d/plex-media-server b/media-tv/plex-media-server/files/init.d/plex-media-server
new file mode 100755
index 000000000000..102ac80c287c
--- /dev/null
+++ b/media-tv/plex-media-server/files/init.d/plex-media-server
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+
+depend() {
+	need avahi-daemon
+}
+
+start() {
+	ebegin "Starting Plex Media Server"
+	start-stop-daemon -S -m -p ${PLEX_PIDFILE} -1 ${PLEX_OUTLOG} -2 ${PLEX_ERRLOG} --quiet -u ${PLEX_USER} -N -5 -b --exec ${PLEX_SCRIPT}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Plex Media Server"
+	kill -- -`cat ${PLEX_PIDFILE}`
+
+	# Remove stale pid file since this is a dirty solution
+	rm ${PLEX_PIDFILE}
+	eend $?
+}
diff --git a/media-tv/plex-media-server/files/systemd/plex-media-server.service b/media-tv/plex-media-server/files/systemd/plex-media-server.service
new file mode 100644
index 000000000000..12412a844860
--- /dev/null
+++ b/media-tv/plex-media-server/files/systemd/plex-media-server.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Plex Media Server
+After=network.target
+
+[Service]
+Type=simple
+User=plex
+ExecStart=/usr/sbin/start_pms
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-tv/plex-media-server/files/virtualenv_start_pms.patch b/media-tv/plex-media-server/files/virtualenv_start_pms.patch
new file mode 100644
index 000000000000..bb4d575240b3
--- /dev/null
+++ b/media-tv/plex-media-server/files/virtualenv_start_pms.patch
@@ -0,0 +1,23 @@
+--- a/usr/sbin/start_pms	2017-03-01 13:35:28.340489280 -0500
++++ b/usr/sbin/start_pms	2017-03-01 13:36:05.574540305 -0500
+@@ -8,16 +8,20 @@
+ export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="${HOME}/Library/Application Support"
+ if [ -f /etc/default/locale ]; then
+   export LANG="`cat /etc/default/locale|awk -F '=' '/LANG=/{print $2}'|sed 's/"//g'`"
+   export LC_ALL="$LANG"
+ fi
+ 
+ test -f /etc/default/plexmediaserver && . /etc/default/plexmediaserver
+ 
++# Activate python virtualenv
++. "${PLEX_MEDIA_SERVER_HOME}"/Resources/Python/bin/activate
++
++
+ if [ ! -d "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR" ]
+ then
+   mkdir -p "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR"
+   if [ ! $? -eq 0 ]
+   then
+     echo "WARNING COULDN'T CREATE $PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR, MAKE SURE I HAVE PERMISSON TO DO THAT!"
+     exit 1
+   fi
diff --git a/media-tv/plex-media-server/metadata.xml b/media-tv/plex-media-server/metadata.xml
new file mode 100644
index 000000000000..68319c2b587c
--- /dev/null
+++ b/media-tv/plex-media-server/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>fearedbliss@gentoo.org</email>
+        <name>Jonathan Vasquez</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/media-tv/plex-media-server/plex-media-server-1.5.6.ebuild b/media-tv/plex-media-server/plex-media-server-1.5.6.ebuild
new file mode 100644
index 000000000000..4c60daa53930
--- /dev/null
+++ b/media-tv/plex-media-server/plex-media-server-1.5.6.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils user systemd unpacker pax-utils python-single-r1
+
+MINOR_VERSION="3790-4613ce077"
+
+_APPNAME="plexmediaserver"
+_USERNAME="plex"
+_SHORTNAME="${_USERNAME}"
+_FULL_VERSION="${PV}.${MINOR_VERSION}"
+
+URI="https://downloads.plex.tv/plex-media-server"
+
+DESCRIPTION="A free media library that is intended for use with a plex client."
+HOMEPAGE="http://www.plex.tv/"
+SRC_URI="amd64? ( ${URI}/${_FULL_VERSION}/plexmediaserver_${_FULL_VERSION}_amd64.deb )"
+SLOT="0"
+LICENSE="Plex"
+RESTRICT="bindist strip"
+KEYWORDS="-* amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	sys-apps/fix-gnustack
+	dev-python/virtualenv[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	net-dns/avahi
+	${PYTHON_DEPS}"
+
+QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
+QA_PREBUILT="*"
+QA_MULTILIB_PATHS=(
+	"usr/lib/${_APPNAME}/.*"
+	"usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*"
+)
+
+EXECSTACKED_BINS=( "${ED%/}/usr/lib/plexmediaserver/libgnsdk_dsp.so*" )
+BINS_TO_PAX_MARK=( "${ED%/}/usr/lib/plexmediaserver/Plex Script Host" )
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/virtualenv_start_pms.patch" )
+
+pkg_setup() {
+	enewgroup ${_USERNAME}
+	enewuser ${_USERNAME} -1 /bin/bash /var/lib/${_APPNAME} "${_USERNAME},video"
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_install() {
+	# Move the config to the correct place
+	local CONFIG_VANILLA="/etc/default/plexmediaserver"
+	local CONFIG_PATH="/etc/${_SHORTNAME}"
+	dodir "${CONFIG_PATH}"
+	insinto "${CONFIG_PATH}"
+	doins "${CONFIG_VANILLA#/}"
+	sed -e "s#${CONFIG_VANILLA}#${CONFIG_PATH}/${_APPNAME}#g" -i "${S}"/usr/sbin/start_pms || die
+
+	# Remove Debian specific files
+	rm -rf "usr/share/doc" || die
+
+	# Copy main files over to image and preserve permissions so it is portable
+	cp -rp usr/ "${ED}" || die
+
+	# Make sure the logging directory is created
+	local LOGGING_DIR="/var/log/pms"
+	dodir "${LOGGING_DIR}"
+	chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${LOGGING_DIR}" || die
+
+	# Create default library folder with correct permissions
+	local DEFAULT_LIBRARY_DIR="/var/lib/${_APPNAME}"
+	dodir "${DEFAULT_LIBRARY_DIR}"
+	chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${DEFAULT_LIBRARY_DIR}" || die
+
+	# Install the OpenRC init/conf files
+	doinitd "${FILESDIR}/init.d/${PN}"
+	doconfd "${FILESDIR}/conf.d/${PN}"
+
+	_handle_multilib
+
+	# Install systemd service file
+	local INIT_NAME="${PN}.service"
+	local INIT="${FILESDIR}/systemd/${INIT_NAME}"
+	systemd_newunit "${INIT}" "${INIT_NAME}"
+
+	_remove_execstack_markings
+	_add_pax_markings
+
+	einfo "Configuring virtualenv"
+	virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"usr/lib/plexmediaserver/Resources/Python || die
+	pushd "${ED}"usr/lib/plexmediaserver/Resources/Python &>/dev/null || die
+	find . -type f -exec sed -i -e "s#${D}##g" {} + || die
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	einfo ""
+	elog "Plex Media Server is now installed. Please check the configuration file in /etc/${_SHORTNAME}/${_APPNAME} to verify the default settings."
+	elog "To start the Plex Server, run 'rc-config start plex-media-server', you will then be able to access your library at http://<ip>:32400/web/"
+}
+
+# Finds out where the library directory is for this system
+# and handles ldflags as to not break library dependencies
+# during rebuilds.
+_handle_multilib() {
+	# Prevent revdep-rebuild, @preserved-rebuild breakage
+	cat > "${T}"/66plex <<-EOF || die
+		LDPATH="${EPREFIX}/usr/$(get_libdir)/plexmediaserver"
+	EOF
+
+	doenvd "${T}"/66plex
+}
+
+# Remove execstack flags from some libraries/executables so that it works in hardened setups.
+_remove_execstack_markings() {
+	for f in "${EXECSTACKED_BINS[@]}"; do
+		# Unquoting 'f' so that expansion works.
+		fix-gnustack -f ${f} > /dev/null
+	done
+}
+
+# Add pax markings to some binaries so that they work on hardened setup.
+_add_pax_markings() {
+	for f in "${BINS_TO_PAX_MARK[@]}"; do
+		pax-mark m "${f}"
+	done
+}
diff --git a/media-tv/plex-media-server/plex-media-server-1.7.5.ebuild b/media-tv/plex-media-server/plex-media-server-1.7.5.ebuild
new file mode 100644
index 000000000000..fc75725f5941
--- /dev/null
+++ b/media-tv/plex-media-server/plex-media-server-1.7.5.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils user systemd unpacker pax-utils python-single-r1
+
+MINOR_VERSION="4035-313f93718"
+
+_APPNAME="plexmediaserver"
+_USERNAME="plex"
+_SHORTNAME="${_USERNAME}"
+_FULL_VERSION="${PV}.${MINOR_VERSION}"
+
+URI="https://downloads.plex.tv/plex-media-server"
+
+DESCRIPTION="A free media library that is intended for use with a plex client."
+HOMEPAGE="http://www.plex.tv/"
+SRC_URI="amd64? ( ${URI}/${_FULL_VERSION}/plexmediaserver_${_FULL_VERSION}_amd64.deb )"
+SLOT="0"
+LICENSE="Plex"
+RESTRICT="bindist strip"
+KEYWORDS="-* amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	sys-apps/fix-gnustack
+	dev-python/virtualenv[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	net-dns/avahi
+	${PYTHON_DEPS}"
+
+QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
+QA_PREBUILT="*"
+QA_MULTILIB_PATHS=(
+	"usr/lib/${_APPNAME}/.*"
+	"usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*"
+)
+
+EXECSTACKED_BINS=( "${ED%/}/usr/lib/plexmediaserver/libgnsdk_dsp.so*" )
+BINS_TO_PAX_MARK=( "${ED%/}/usr/lib/plexmediaserver/Plex Script Host" )
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/virtualenv_start_pms.patch" )
+
+pkg_setup() {
+	enewgroup ${_USERNAME}
+	enewuser ${_USERNAME} -1 /bin/bash /var/lib/${_APPNAME} "${_USERNAME},video"
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_install() {
+	# Move the config to the correct place
+	local CONFIG_VANILLA="/etc/default/plexmediaserver"
+	local CONFIG_PATH="/etc/${_SHORTNAME}"
+	dodir "${CONFIG_PATH}"
+	insinto "${CONFIG_PATH}"
+	doins "${CONFIG_VANILLA#/}"
+	sed -e "s#${CONFIG_VANILLA}#${CONFIG_PATH}/${_APPNAME}#g" -i "${S}"/usr/sbin/start_pms || die
+
+	# Remove Debian specific files
+	rm -rf "usr/share/doc" || die
+
+	# Copy main files over to image and preserve permissions so it is portable
+	cp -rp usr/ "${ED}" || die
+
+	# Make sure the logging directory is created
+	local LOGGING_DIR="/var/log/pms"
+	dodir "${LOGGING_DIR}"
+	chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${LOGGING_DIR}" || die
+
+	# Create default library folder with correct permissions
+	local DEFAULT_LIBRARY_DIR="/var/lib/${_APPNAME}"
+	dodir "${DEFAULT_LIBRARY_DIR}"
+	chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${DEFAULT_LIBRARY_DIR}" || die
+
+	# Install the OpenRC init/conf files
+	doinitd "${FILESDIR}/init.d/${PN}"
+	doconfd "${FILESDIR}/conf.d/${PN}"
+
+	_handle_multilib
+
+	# Install systemd service file
+	local INIT_NAME="${PN}.service"
+	local INIT="${FILESDIR}/systemd/${INIT_NAME}"
+	systemd_newunit "${INIT}" "${INIT_NAME}"
+
+	_remove_execstack_markings
+	_add_pax_markings
+
+	einfo "Configuring virtualenv"
+	virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"usr/lib/plexmediaserver/Resources/Python || die
+	pushd "${ED}"usr/lib/plexmediaserver/Resources/Python &>/dev/null || die
+	find . -type f -exec sed -i -e "s#${D}##g" {} + || die
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	einfo ""
+	elog "Plex Media Server is now installed. Please check the configuration file in /etc/${_SHORTNAME}/${_APPNAME} to verify the default settings."
+	elog "To start the Plex Server, run 'rc-config start plex-media-server', you will then be able to access your library at http://<ip>:32400/web/"
+}
+
+# Finds out where the library directory is for this system
+# and handles ldflags as to not break library dependencies
+# during rebuilds.
+_handle_multilib() {
+	# Prevent revdep-rebuild, @preserved-rebuild breakage
+	cat > "${T}"/66plex <<-EOF || die
+		LDPATH="${EPREFIX}/usr/$(get_libdir)/plexmediaserver"
+	EOF
+
+	doenvd "${T}"/66plex
+}
+
+# Remove execstack flags from some libraries/executables so that it works in hardened setups.
+_remove_execstack_markings() {
+	for f in "${EXECSTACKED_BINS[@]}"; do
+		# Unquoting 'f' so that expansion works.
+		fix-gnustack -f ${f} > /dev/null
+	done
+}
+
+# Add pax markings to some binaries so that they work on hardened setup.
+_add_pax_markings() {
+	for f in "${BINS_TO_PAX_MARK[@]}"; do
+		pax-mark m "${f}"
+	done
+}
diff --git a/media-tv/plex-media-server/plex-media-server-1.8.1.ebuild b/media-tv/plex-media-server/plex-media-server-1.8.1.ebuild
new file mode 100644
index 000000000000..4511bd18b108
--- /dev/null
+++ b/media-tv/plex-media-server/plex-media-server-1.8.1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils user systemd unpacker pax-utils python-single-r1
+
+MINOR_VERSION="4139-c789b3fbb"
+
+_APPNAME="plexmediaserver"
+_USERNAME="plex"
+_SHORTNAME="${_USERNAME}"
+_FULL_VERSION="${PV}.${MINOR_VERSION}"
+
+URI="https://downloads.plex.tv/plex-media-server"
+
+DESCRIPTION="A free media library that is intended for use with a plex client."
+HOMEPAGE="http://www.plex.tv/"
+SRC_URI="amd64? ( ${URI}/${_FULL_VERSION}/plexmediaserver_${_FULL_VERSION}_amd64.deb )"
+SLOT="0"
+LICENSE="Plex"
+RESTRICT="bindist strip"
+KEYWORDS="-* ~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	sys-apps/fix-gnustack
+	dev-python/virtualenv[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	net-dns/avahi
+	${PYTHON_DEPS}"
+
+QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
+QA_PREBUILT="*"
+QA_MULTILIB_PATHS=(
+	"usr/lib/${_APPNAME}/.*"
+	"usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*"
+)
+
+EXECSTACKED_BINS=( "${ED%/}/usr/lib/plexmediaserver/libgnsdk_dsp.so*" )
+BINS_TO_PAX_MARK=( "${ED%/}/usr/lib/plexmediaserver/Plex Script Host" )
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/virtualenv_start_pms.patch" )
+
+pkg_setup() {
+	enewgroup ${_USERNAME}
+	enewuser ${_USERNAME} -1 /bin/bash /var/lib/${_APPNAME} "${_USERNAME},video"
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_install() {
+	# Move the config to the correct place
+	local CONFIG_VANILLA="/etc/default/plexmediaserver"
+	local CONFIG_PATH="/etc/${_SHORTNAME}"
+	dodir "${CONFIG_PATH}"
+	insinto "${CONFIG_PATH}"
+	doins "${CONFIG_VANILLA#/}"
+	sed -e "s#${CONFIG_VANILLA}#${CONFIG_PATH}/${_APPNAME}#g" -i "${S}"/usr/sbin/start_pms || die
+
+	# Remove Debian specific files
+	rm -rf "usr/share/doc" || die
+
+	# Copy main files over to image and preserve permissions so it is portable
+	cp -rp usr/ "${ED}" || die
+
+	# Make sure the logging directory is created
+	local LOGGING_DIR="/var/log/pms"
+	dodir "${LOGGING_DIR}"
+	chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${LOGGING_DIR}" || die
+
+	# Create default library folder with correct permissions
+	local DEFAULT_LIBRARY_DIR="/var/lib/${_APPNAME}"
+	dodir "${DEFAULT_LIBRARY_DIR}"
+	chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${DEFAULT_LIBRARY_DIR}" || die
+
+	# Install the OpenRC init/conf files
+	doinitd "${FILESDIR}/init.d/${PN}"
+	doconfd "${FILESDIR}/conf.d/${PN}"
+
+	_handle_multilib
+
+	# Install systemd service file
+	local INIT_NAME="${PN}.service"
+	local INIT="${FILESDIR}/systemd/${INIT_NAME}"
+	systemd_newunit "${INIT}" "${INIT_NAME}"
+
+	_remove_execstack_markings
+	_add_pax_markings
+
+	einfo "Configuring virtualenv"
+	virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"usr/lib/plexmediaserver/Resources/Python || die
+	pushd "${ED}"usr/lib/plexmediaserver/Resources/Python &>/dev/null || die
+	find . -type f -exec sed -i -e "s#${D}##g" {} + || die
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	einfo ""
+	elog "Plex Media Server is now installed. Please check the configuration file in /etc/${_SHORTNAME}/${_APPNAME} to verify the default settings."
+	elog "To start the Plex Server, run 'rc-config start plex-media-server', you will then be able to access your library at http://<ip>:32400/web/"
+}
+
+# Finds out where the library directory is for this system
+# and handles ldflags as to not break library dependencies
+# during rebuilds.
+_handle_multilib() {
+	# Prevent revdep-rebuild, @preserved-rebuild breakage
+	cat > "${T}"/66plex <<-EOF || die
+		LDPATH="${EPREFIX}/usr/$(get_libdir)/plexmediaserver"
+	EOF
+
+	doenvd "${T}"/66plex
+}
+
+# Remove execstack flags from some libraries/executables so that it works in hardened setups.
+_remove_execstack_markings() {
+	for f in "${EXECSTACKED_BINS[@]}"; do
+		# Unquoting 'f' so that expansion works.
+		fix-gnustack -f ${f} > /dev/null
+	done
+}
+
+# Add pax markings to some binaries so that they work on hardened setup.
+_add_pax_markings() {
+	for f in "${BINS_TO_PAX_MARK[@]}"; do
+		pax-mark m "${f}"
+	done
+}
diff --git a/media-tv/shoutcast2vdr/Manifest b/media-tv/shoutcast2vdr/Manifest
new file mode 100644
index 000000000000..a7b8ada851c7
--- /dev/null
+++ b/media-tv/shoutcast2vdr/Manifest
@@ -0,0 +1,6 @@
+DIST shoutcast2vdr-0.0.8.gz 3538 SHA256 fa63f656ea5a0f25794337e26aac0bedf74f2758bef65bf51ffb750c326bb227 SHA512 ae5ce60c993ff85b3ac9ab3567be55a22ad1929b98a035b323583fa6166b21a96bd7e7017917865d4a339790e7d6c1113820d7230787225d97c68e2174f02c37 WHIRLPOOL 322ea24c91ca63e1629656d0df05400a56296854305aa41274211eabc8a1143bd766d571c4b7922193df23dc8be65830df6970457b18f451f6ede8443c9007b5
+EBUILD shoutcast2vdr-0.0.8-r1.ebuild 718 SHA256 f189c8453317290feacf81615390c146a493fa3e568d8f3fc6e64c6f5df1ace9 SHA512 6ba6486ceded70f6328eb25594f4ea8f3094b19055d98ae6f65b2e84b42d52e457b0f707aa4e5d45e96387f830411ce9c30c225bf40dbf7812dd4989f6574aae WHIRLPOOL 5dabf148c45c84c890324cf3a2b23def60abf65f84fb7b779679ab38a50b01af74d32520a574fc14e6bb11ba7d438eaff923f9e4ba522e07e5132587e2e1ca5f
+EBUILD shoutcast2vdr-0.0.8.ebuild 681 SHA256 2b875c7e7a474b62ac9a02f8b7ade8cfa967701d4b70b741278c8b3a1efef00b SHA512 6866b48f59b6cdd93997e517702a302041014b386e1c742b8ff9d1db971ec91ac2a5068a3301bd89acd1b5fcdbe2ae1799c323c7f9434d406acde1dddbcfc932 WHIRLPOOL 33c9a0d7d60c7c07ea122254f60016e603529ae8f8cb17444dfb6f22ee3ec1c3cda27ca46755735e25b90d860eab37dd54ac11f465a2e24bab399415bcf7d88c
+MISC ChangeLog 2908 SHA256 b0764872dadb086f1e5f7cfa5fe54fb92266ffdecc3b3dec1073ad0ca7c24ae4 SHA512 8675f7dd4624444624d0a41471141969e21d262e90ee875fc826b3c6c88e53bdf2f009843e320b467ff08dabb19ea60d8e73e25c9ea5fd45978c69ddc3401cb0 WHIRLPOOL 76c9992e02ffd662eba78c1df1264071ad927b898202b800e678eb758deaefae341e0b00df75cfe0c3a3353429ceae402707750cb685b905d4011718b5ba25f6
+MISC ChangeLog-2015 1046 SHA256 f3221c076597ddb768892ff976abb82f9d5fc47f9b13f196bce537d1a5593ee8 SHA512 0ff414939cc4c1520ece676ecac1cecfd461aa4fb6dbc4fe8a86368cad4820aa20e058d536e980d35b7044c24d91233a80582fdaf0a4b36577d9a7a87af9df2b WHIRLPOOL edd23c37f311df0caf71472971e230f483ee2c291e00ad1700582a46b6e034d3a821c922c91cf8aadc5f3370b73eb437c51ef9def52169cf962ea91c3ff128a6
+MISC metadata.xml 243 SHA256 161359b6e9eddec137a431eea66785e070bbc25fab3ae1b57f900e411fc37fe7 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06 WHIRLPOOL ebf59815181c251040396bb44206b875f6d996abcff030fdbf8355b47d6ea8c4f2669847ea1af194112de469258d7ca09ed77b682924ca495958a65f957dbf39
diff --git a/media-tv/shoutcast2vdr/metadata.xml b/media-tv/shoutcast2vdr/metadata.xml
new file mode 100644
index 000000000000..27f419c289c3
--- /dev/null
+++ b/media-tv/shoutcast2vdr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>vdr@gentoo.org</email>
+<name>Gentoo VDR Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-tv/shoutcast2vdr/shoutcast2vdr-0.0.8-r1.ebuild b/media-tv/shoutcast2vdr/shoutcast2vdr-0.0.8-r1.ebuild
new file mode 100644
index 000000000000..3c2005d2d825
--- /dev/null
+++ b/media-tv/shoutcast2vdr/shoutcast2vdr-0.0.8-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="VDR script: generate shoutcast playlists"
+HOMEPAGE="http://www.vdr-portal.de/board/thread.php?threadid=19478"
+SRC_URI="http://www.kost.sh/vdr/${P}.gz"
+
+KEYWORDS="amd64 x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND="media-video/vdr"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+PLAYLIST_DIR="/var/cache/vdr/music/playlists"
+
+src_prepare() {
+	sed -i shoutcast2vdr-0.0.8 -e "s:outputdir=/home/volker/vdr/radio:outputdir=${PLAYLIST_DIR}:"
+
+	# wrt bug 520624
+	sed -i shoutcast2vdr-0.0.8 -e "s:mkdir:mkdir -p:"
+}
+
+src_install() {
+	exeinto /usr/share/vdr/shoutcast2vdr
+	newexe shoutcast2vdr-0.0.8 shoutcast2vdr
+}
diff --git a/media-tv/shoutcast2vdr/shoutcast2vdr-0.0.8.ebuild b/media-tv/shoutcast2vdr/shoutcast2vdr-0.0.8.ebuild
new file mode 100644
index 000000000000..b73c3a00017f
--- /dev/null
+++ b/media-tv/shoutcast2vdr/shoutcast2vdr-0.0.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="VDR script: generate shoutcast playlists"
+HOMEPAGE="http://www.vdr-portal.de/board/thread.php?threadid=19478"
+SRC_URI="http://www.kost.sh/vdr/${P}.gz"
+
+KEYWORDS="amd64 x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND="media-video/vdr"
+
+S="${WORKDIR}"
+
+PLAYLIST_DIR="/var/cache/vdr/music/playlists"
+
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+
+	sed -i shoutcast2vdr-0.0.8 -e "s:outputdir=/home/volker/vdr/radio:outputdir=${PLAYLIST_DIR}:"
+}
+
+src_install() {
+
+	exeinto /usr/share/vdr/shoutcast2vdr
+	newexe shoutcast2vdr-0.0.8 shoutcast2vdr
+
+	keepdir ${PLAYLIST_DIR}
+}
diff --git a/media-tv/tvbrowser/Manifest b/media-tv/tvbrowser/Manifest
new file mode 100644
index 000000000000..10468562c607
--- /dev/null
+++ b/media-tv/tvbrowser/Manifest
@@ -0,0 +1,62 @@
+AUX 3.4.1.0-build.xml.patch 4723 SHA256 1f9d9f9f7f6b079b1e6c9fe05946b28a143963eaba113e50d1fda47d0a828dff SHA512 0954f2a1284e87b2115eb2889194c77702cb9d3426f3a3cf8661799a5e556b3c3b250e14c7365bcddde51d94cfc9dde0f9fbed1ca85c13b7d75a4d0b103985c6 WHIRLPOOL de7e7358ebd8af81bc28b0b63578be13212be0f6a20dad0008bc70744e7c0d6cc34964bd6272fe507b3db3331a97191466c21ea5e195a3677e47abe76e108b41
+AUX 3.4.1.0-remove-registrykey.patch 7364 SHA256 c7e082a01dd3893075a43c7d20bc456b741dc295dcc468063dc5c0917bf9cab8 SHA512 cb9807818a3019fe4579bbcea6bdcc9a1fd230452cb3b0521bc29d3b35c36f7522efdf50b057e8d377ece5201f9035537e0cd39c7ebb992d8cfa8af6d8ad3a53 WHIRLPOOL 1caa949d1d81fa9686f4df13f20f57efd025f828cf79798156942ebdab3163fd4a3437f8465a771d346e2b821a08e965b62e703dfcf4d91c8f6c1df729ffe10d
+AUX 3.4.3-build.xml.patch 4723 SHA256 1f9d9f9f7f6b079b1e6c9fe05946b28a143963eaba113e50d1fda47d0a828dff SHA512 0954f2a1284e87b2115eb2889194c77702cb9d3426f3a3cf8661799a5e556b3c3b250e14c7365bcddde51d94cfc9dde0f9fbed1ca85c13b7d75a4d0b103985c6 WHIRLPOOL de7e7358ebd8af81bc28b0b63578be13212be0f6a20dad0008bc70744e7c0d6cc34964bd6272fe507b3db3331a97191466c21ea5e195a3677e47abe76e108b41
+AUX 3.4.3-remove-registrykey.patch 7364 SHA256 c7e082a01dd3893075a43c7d20bc456b741dc295dcc468063dc5c0917bf9cab8 SHA512 cb9807818a3019fe4579bbcea6bdcc9a1fd230452cb3b0521bc29d3b35c36f7522efdf50b057e8d377ece5201f9035537e0cd39c7ebb992d8cfa8af6d8ad3a53 WHIRLPOOL 1caa949d1d81fa9686f4df13f20f57efd025f828cf79798156942ebdab3163fd4a3437f8465a771d346e2b821a08e965b62e703dfcf4d91c8f6c1df729ffe10d
+AUX tvbrowser-9999-build.xml 37260 SHA256 ea0a0a1cd4d218dd22cad2d7ba65e352bc0b5fa9d37e59767528ed1bd8897ab8 SHA512 f12ed9ce772b94756f4db94bff27b82e025f5293a483d7e340924bf3b429739c19f0d051f2437340fb2eb9482f134bfa08d803faaddf74b33604a68fb8a3d294 WHIRLPOOL 2c56741cd3c94d954440d8bbc023bd40ee3fb6db9315d8fe26d597fac65e3e257a75677c989bd537bc6d121a97604377f09e88af6ef909ef41c6e21f794bafc1
+DIST BeOSthemepack.zip 39412 SHA256 ec2acb46a77f38a9750ede23ab573b2c2773bedd37fa1ac7bbaa0bdc74982574 SHA512 479d9180cf8678cb555a86ecc80d19f0f615f7c2f5807acf550d117cfda44155ca80315f51f67c17799b71f9768e9988919d23bfd38abce0887195f30ecb97c3 WHIRLPOOL 430f961de95389f7b503da63fdb01881dad4a54f4799d99917336eff0b167f11b7d6287bc10618292255a93665e498b04d57e6e40526b8688bd3e09f94ea6959
+DIST amarachthemepack.zip 53700 SHA256 80bbe3df2c3e44f26bb390994e271264bcc71ff581527039bf677fa38df4a547 SHA512 da0a082dea2abccec47137ef1db54a57b1becfbf0fc1b99fe41c0f60c254f1963dfde032bd622d034a3abde4ead1c2aa00f3ea2d872859ad384168ebe8fd1c52 WHIRLPOOL d748b611c12a3dcfb148282cad27626c802f70b260ac20397548625c3803e821ba0fb0d0a0157c53d72462dc8179d03cecc701c22b72da5130690ff42f1db1e1
+DIST aquathemepack.zip 90542 SHA256 eabbfc07a3aa6172145c3786d5ec2abe5185daad358718305e9cd920642b4b01 SHA512 f73c60c0273f796487d04adbc9e6e535a6117f07154b48ad0d41725b50674762fa14b340cf3869167e8eac6f28ddb2e7b0133a0f5ab8fdf548fb7d6419ac9ceb WHIRLPOOL b8bff080331b67a3ebe8eedf5fd854efa95e3155ba5375b8d80ed3ba053ed8fd8de0761b83ae0a2139e47ec852aa0c1eb92a8b9c9df49f3b15b5c25aa52ada1a
+DIST architectBluethemepack.zip 52161 SHA256 4a6cb351ed88e924fb06a35f3e5a7bfbc01013c2464cb8a2edd0f15a9b7bc39b SHA512 67cff378b8b6eb033e61d8b1c1dc689316e4fe80233d7b2f40a1579bd8ae5b04de2797cbdfb2083bf4922594ffa2955ea0f920a9346e0ffc2dbc659cf864e408 WHIRLPOOL a8c89b8500a31e6cb681db11816d4afb49f6eed7c54458359837a8d025a688b62b2ac63b5eb4fa65ec1763f78177912988012c6003d191644b93a0f7d6700218
+DIST architectOlivethemepack.zip 52265 SHA256 eafff0696a2db1ee258448689d945d5720faa8e70877f44fb6c8de9847365693 SHA512 b2dd6cfa4ff0e45e663bb672cb53e58aa954f86b639f761df128c4fdaf9f37d5e9ff2b3f58b3aebe6c763943b69ec56fedda33ce342fe575c4e1ce5e2d6293f7 WHIRLPOOL b0b783d083003d1c6d28449030e951cad88b75731b163fd6cf1c6eccf4ad5454002b19bd312241b6b643c7883b39e593c0accd43fc8a0596f02d006a6d7a05fb
+DIST b0sumiErgothempack.zip 54621 SHA256 fedc7995976f35487a8c7acc2712d993e4a328352494ee8899c58d3ddce885f7 SHA512 6caf37070e214b5ebad3c18f6bf743f04d66b97334f154b698e9e502f56c459c7cf3dbc2101fba61312ca28e35712c0dd27ec64631cb8863b34f9228521955c9 WHIRLPOOL bc644f132025219d3e049f6cefba6bf445ada164b159a75c81d8875038839e4ea30384efea9b77cdffa05e3704bf0415eaae71ef01e3f8a66e1a6ed7f8121051
+DIST b0sumithemepack.zip 53817 SHA256 ba28a68ef1627ed44c67370645601d0a53ace6c9ed23ae139159d923d48ebc3f SHA512 77fca69c714e4f1966ec6a893e1ca990108bd2e967e4ab762445de8c57f6436d83d762c43fbae3d46a5631ced1166a74f4b67742a61b75b65d1f22e18c03360e WHIRLPOOL e556ef033a5e5d6da0727da8185b5e9e80910e7ae5c6be9a60be6d82b73b1bfc2ef6fcc2fd35ffe459d9b240cd036b82f2b22aae58e56e9b9a3ae6dde067cf6b
+DIST bbjthemepack.zip 63397 SHA256 e6d3900a0486c5bd808df5660329505cde601752ee7058fe2e1efe3cdc3a3ea3 SHA512 619787c2449bbecea496565e15ed49d7ca65b7d8a9a0122300c5f397ab921431e495cb7256166a908b82dc48f17dc3c4bfd559805c5c4325fa074c86ac3fac4c WHIRLPOOL acb633297a98e22bdef791304c7405a77a9bcbcd743bae98ce93a341fcdc160dc8b4dcbefcef100675ba2948603e322fd4ee537d8a04b17893556fb122aa4671
+DIST beigeazulthemepack.zip 81543 SHA256 185eae63d028f76923f201209d3fdd39222f9df6a73ee7d19b38a859551432e2 SHA512 7bf5529766f6ff19a8ce2c5ff6e2782d1deead8595efbc6b88a79fd8fa0be8f64e8e023d7997c1d0d8554beccde82e09c118e98bd3532faf63fa3466a15de392 WHIRLPOOL d7be6dbfcb7e89856fb7681b2c63cb6156c4006bbf04459a1a77d08ce880754546f9bf85eb8cd992481f597b2b4f8d52db9f530034b9470c96409437f2969b83
+DIST beosthemepack.zip 22851 SHA256 1a5744c1fdf68e0f6893ef27300de4be57327a532edfe751a808b1ae923815f7 SHA512 f1e49fa793e067c19d25576a4a4b1d18f6d78f7a5377da40c87d1d4829aa185581b75cda533e0bafd49db53f8f41e165be3145eabe4afac23503b42a42a593ff WHIRLPOOL 06b23321efa78375c4724f21a6d46a8d2d5d1595390306d1968bae1f07666c86beea18c137d36b2278b32ac01b0110e7938344addc4e811a8905b7c7eadada84
+DIST blueMetalthemepack.zip 67613 SHA256 205d44aa6a6035480c2e062c4b6876fa73545c45b513ec7bf1ce033cbc13336a SHA512 7b471a6debdb1fe42a4c005c768d2fa534ecf9f292f2ccce5f4e4d1968ccc57299e28e7f3ae9fcfecf032e924e0f3fd5186637d4676bebb80eea29170b5fc6f5 WHIRLPOOL fac2be1e4179850e1ed44d5249d000ac944ab97c690342cd013f7af106b812ea10fe447cb29388fdfc1a73b1f6e1929604e8f66fa444f593bb3c869938de6764
+DIST blueTurquesathemepack.zip 62676 SHA256 c3764fe15785e2aa63a5bd86f60d9d992fa8a52262cbc366d9b612286cf5abc3 SHA512 49be6c67e2e00eca499d92288f2d353971567046497286ab5b9c50c04a15429dcc11a8d35095af5e9f338fd375dd08ebbdba3acacfabef216142ed38d7abb652 WHIRLPOOL f0c58d78b78577c51e6098e888fb5e90688d429cfc7ac8916389d05d9654bbfa3c412e46fca6c691e08279b1ec26efcfd6cb81952990594319a84ba4cbb49da7
+DIST cellshadedthemepack.zip 54354 SHA256 bc2d594a4a4dce63b2db91bec7faa1f60398783fe0d26aed40215c004c6d8a24 SHA512 2d66e9c4dcc97a5e2bfef09d40e41c18ea5f285be5db8b2c62d9a7f1d6fbb51ca82f1ec2e656559bd25a5eddb9521e92ee609663dca612d7e4ba9d62a72a7f08 WHIRLPOOL f6d786ca4da3fd5ce3de53f28853a7758ae5296a681174259a2b057c11af6bbed10a235438e967886f71c71561bb2d7234cee85799bdd2720e8f3cd4d86ec903
+DIST chaNinja-Bluethemepack.zip 77692 SHA256 927bdc98a4cb1b26c5150f40d6e8825f33d34391b6703da8cc14c246dd8e461f SHA512 e2bd79f5ea5413df77f36b38a6922fdf7d55bdc4eb6be044b4ae2de97127d437f771b101e8349d1aef8b3e62a74838c3bce692d54b198691f6b477d882ccadf7 WHIRLPOOL 1c8e92d3d818fd7fa806e2f0d238a54de0afd65e52dac5bb709c065dc1685e0d209ce9660b5b98aa18913aa80284b07508eac7832142f66734ce9e52b015da13
+DIST coronaHthemepack.zip 82406 SHA256 79f1eab6d2c09c66001404bcb562d4db25edddfd142af2763c63fad6e96c775f SHA512 ad5ac7b3cb86f4dde835a880fe5fbca4a389a9b64c6404ace3ac809f1361d9524c298d579fd0de9da950d81cfff7d2cca6ff8fdfc502182d8b0e0d3fb6360898 WHIRLPOOL 20943fd9000a5ad8f654286ffda70f3e86ab9939bdbf2f11dc80b1fc71f51716ad1c98c00819c31f5131809eeb059b027daf9a76c1c9eb6ea4e82cb7362b4bd8
+DIST cougarthemepack.zip 49992 SHA256 d3b2b83ab1f149ee6cafe22e5bdb755ce1f46c68be43bdb989d8e9e63102d037 SHA512 687e776167b50a84863e97c3795280df68f65e1863f9655c5584b24ddf74a4509ac9ad769a3d939b9454c5835b08ea5d586ffbb249bf4307af7025a7a0369014 WHIRLPOOL 9343a2b9af429c15cf13e7a294ae8e9018675c60391f34ac2a0ae79bf82d73aaea2695123efdea6142f90d90729bf528a0e87b2c9266cef5e7ebbc44e3324cc3
+DIST crystal2themepack.zip 58696 SHA256 1b70750575aceca938f24ea7c25dccf4c899cccf926dda6bb4c1d3d8c10e2451 SHA512 875c4964af8fca451131ab2a071de094947528b648deb8aa653dd9a86832224d8ba92e19a22c926204acab7cf3342504ae8f28ba43bb5e911f886facdc4473b7 WHIRLPOOL 6ef37968c8a7aab088529c97592b60eabf2e90fe18def154278ae94498abc0c5950b18530d7fe83bc61e3ec9dc27afbadcd64cc26d596e8ecfd322f18e28eabe
+DIST fatalEthemepack.zip 57391 SHA256 c47933c59b6f55a2decea26b69f536c1d841b207d310c468586597af2659a553 SHA512 5dcf086e509be63a752ddab90e1d2691c194ec46f382f0a454f703694f562404e657ce434fed1cfe9c5760b541e44a71b1c43ce826d917f6f5c424ac1fd0fc1a WHIRLPOOL 436b50d947cdb7062081dab871aa631f019c3708294cd6f4e04c5656f7c1a71801487ae0795de7f837d4d694d7e900f52616db1ec712c28fbe3999b69fca2f89
+DIST gfxOasisthemepack.zip 55859 SHA256 2b9e71141ede87fee8dbef4858c3e707866ab96a1d070cd1745d54da62bf79d2 SHA512 6335fa82c27a92ee188318a4829fa4a50af5b6fafda102096a27239d236eb023ad45d43dcd08533bcc6442298ed323cba4db62278036a9da366a85c3fb73006c WHIRLPOOL 63b4c36ddb28bac1615b4037c1562f5728fe75b80ad136a5545bab44980315f7074ac2ae64d62ef7a43191c5cccf4fee63c45341cd95193c307216981509603e
+DIST gorillathemepack.zip 43281 SHA256 f508880ab9610fde40b187a14844c52f11197e331b98506a536b27733756cc60 SHA512 cbc53c8ad1ea8cda40bf1ff43d92da9890831e8d25945c0930bcadcf298e7640bb3d55511d5065e360a03c864db313dd602911ec25e8b8169d74b797d0a6263a WHIRLPOOL 0362893ac81e0c3493e0fdcd86f0dc12739d07a8ebee9c5beea4fb4947bd8baf5c69f2ae2d57d102df8a52fff4fd8ac930a0a9482a2f9b2e75320a257e19eb11
+DIST hmmXPBluethemepack.zip 40046 SHA256 42c18247445e3d6624b326cee90a81e1977891c8e580b649033a295585a72102 SHA512 1f0dc4d22171cb2430a5e7a1827262fa4b2530d6230b893e94d52933a94656392200047849fde652dee004303811d308ce98d95994c6580b26a4ed50915e42f8 WHIRLPOOL c8d39856fd4baf82fed262a0e479d2a2d4829e3d999dd5c0e8e12a53f74660df427deb9adbda6a4547a819a6f979c98c36841209153c057677d0fe9b9a78e7ea
+DIST hmmXPMonoBluethemepack.zip 39815 SHA256 7886dcc91c0d692c3d80b0016f89724187a8a90e70d59bfb6c64d9506ece77cb SHA512 4d8fd6f445234f8f1f50ec6a77dbef6d86521d910bc8ff54afba340d82a5a39b9227ec33e6889745c9ad6f607d023375ab3a2e7b97cc41744f4066209f0ac03a WHIRLPOOL 448fb99e9405cbe08c6d9b762e2ee1f0f07d87975ce74a2fffb6901fcf279a8a6ab5fa5486a11d1cf5e99a25ee6921013ec5608538f54653158b7a2e191b2cb6
+DIST iBarthemepack.zip 68829 SHA256 acf46246336007f161dd396cc92ff17927dc45991ffb8a54c24620493ed65b6b SHA512 c4a5d3921cba2980dd147d62ec4db9aee44b7be35af3c5a50adfbb861edd95ed61655b31346e51efa1b087f04891890ed44597c456cd7fd3704f8605375733d2 WHIRLPOOL 1fccd783da812cf88f9d8eca380639287af9c3ee9f30e03943a77d0764bcb0c785df7d6b2513cd57dd012dd55e217bbc59a6005669ee1c35ba36d846fb966ca9
+DIST macosthemepack.zip 38584 SHA256 3876e6adffff030bb5dc605c80632cfb3518f8f8d6d3540776c74c2662b14e17 SHA512 53dccdaacdcc277d9ae2464a85d285f7ea740d49e0464212b4089f0ce6f08ccb69b295bf9ac4bf8c324cef2f4cedce1b3dcc8e7cde9b0a510860c9071abbc191 WHIRLPOOL a1b81763dd71be046f39a07ee7e7e105f23458ad605af45ff93f725013a4a0907211ea57debecc1a93ccc3f0d2dd852516ccc975b694962d970646400a0b578c
+DIST midnightthemepack.zip 44585 SHA256 b3517806229fabcf5872da7acbe3d0878a710e4cee63908423a384bf5b4f8eed SHA512 be59dec17246aac30fd767de4e0d21fd467e17cc1f4ac8080e1b63d2d2e0d5e70424d0bd1e5b6be53d09167ff4c6af848807682c8bd514cdc7d879d13e96bfc2 WHIRLPOOL 9cb41da825560cbf884fd1906a55e43d1c96ae7f650d576fc4faea1e483ee4442c72588ce94c5ddd5ba0bdea3341141cfec05b4262936f5813609a49a6aa127a
+DIST mmMagra-Xthemepack.zip 76329 SHA256 e6c4062797568f4a1667974529e17d9c50ebc1a1fbcc826f0f536eaf4919ac34 SHA512 17838f010083298bdf652177c601ee73d2dfdc0661f03999992eefe2382302ad033a8e284c093d3a93698869a2e5e5617659618ba44e5b342cfb882bdd4282b0 WHIRLPOOL 0f71e67060a62b4c8bd5b4bb8a4899be48facc436976fdb24f2d90154c9223154a69188c0d97d1dc3a2efee138b83a496eea4270762de8feb1afa1ef02a10dc2
+DIST modernthemepack.zip 97490 SHA256 1b64d58c6ef0b00e3b7128bb242ae80da14977f7d54ef24b09102aa212b2ac70 SHA512 607df1e04b58dbdded89ec673b25046d254e49698c450e57dba43b6dad235e96b1521a5b604834626daa75b9922027dc985ffdf902216ffbe66f279258dc4caa WHIRLPOOL 5d823097b5a4b7a5287c0f2876c86641ca06a61f0cdc93023b44e1e0c9f3f999997535cdc65df3ac2c16bb924bdde76a48f54510b1aa2c95c434e954e8b967d1
+DIST noia.zip 174721 SHA256 bd6236c8c8cb7c38d667904130417927a154c4201b5373b65260466083fb7a7d SHA512 f883bcc8e8242b74a32252b1fcf2a87e4329b756eb52b0137b286cc7e766f5aebea31743cf7c95376034655c3f36fe81882be8cd0caa873dc99dbe2b18ebaa1f WHIRLPOOL 92700a98bfac5211e49d597aa533fc6c6db7d44c7b8c1745e4ebe082fd4ea810a6c29df0f37a42d29f063e0eaf8ca6b2dadc8c33434bfd72a2a7e8a07acaa872
+DIST nuvola.zip 286612 SHA256 8ac40d72387663961062d09dbc749f2b2a865aebca8243bf94cb8d5101e9e894 SHA512 db47fbaf0f3eb1cb3613c4e5878c98f7fcb4c9db7fccd65d0e443debaf7de6b98bf5a03510e6f6fc6bcd071ec0c814a39aba42c09b8ba29ca26ebb630d5e7a3e WHIRLPOOL 0150f8a396d08d524cec59dbb28521b4d7c077db65989c4dd63b6aa1fedbdf9661eb408329b81603be47cc0ecb2b46218c30025f80b8fd4be4a4bf517bd04c06
+DIST oliveGreenLunaXPthemepack.zip 62509 SHA256 bd71c50b464a5778a3af4c7c0eec18d6917b378a960b1ba7d31dfa272d13ab49 SHA512 0fc245c02907fdf0984963d77e2da47dcb7c5d54fd2f68f893759ebc9ceb8702267325373edce3def03e96c695965df6946ddcf3d58f144e20a51d52307d4024 WHIRLPOOL 29ef223d3ca76df2f00ed6ac05901e604e1687db125f2d72eb1f364abf8949846a445b61b0301ec7386e363ab1943d5c9e0e70e152c70351e4d1d689e79aa42e
+DIST opusLunaSilverthemepack.zip 55716 SHA256 c1e1e77e1f9bc328a5b472c522fc3c3daf69e6e86ced280cda57283a065f1bdc SHA512 4701d500aca71ff0524a463731a266a306db5bf3127d40143478fbe239039d0cd38b3765bd42037ade2a14e55e79f5d2de47902042ded385e7b4016228315a0a WHIRLPOOL fbd0a6108de8eba157cea391934faeb0bef04f053101114bd48f5e86835b737f647f2e6e92de630da18499349acd96daa2787771a7bf60fc6ae52f0509695061
+DIST opusOSBluethemepack.zip 56227 SHA256 bea825716bfb76959a33607b4e7894a5ac1b09a0ca2e505e8441ba892f5fefcf SHA512 f1aa79ee4d6c1ce8efe19be3c275851bb3588e71961fe3f3b1cf3bf013ab1e80f55fb6a62e475a6a92864b25db0f646fa2d44490c66403c387df9f2468d9f3b6 WHIRLPOOL b1314b333fb931c41f50e486f1f359a7ef38ed265381a4f4260c8f0f2e3d2c9041d53beb18121a8044f38daedd5faa1ac63b576cc9608c47f4612d864d2b6e45
+DIST opusOSDeepthemepack.zip 56418 SHA256 527ad7ae50992b2dbb52217658c03cb855451dd7731b0b71bbc16eabd0a503df SHA512 3b89a6fadcd10e4be8be5f0d1fc5c0f54d0904dd462f1aa3284717b841296a19f2985faf79333091f59de45567ed77114ee6fb8039a3047d0c16f26e19af2ed9 WHIRLPOOL 0f4edcc40a4a1cd90c00cc134679fc3be77b3bf3a527162792e79a7be8790eac0456bc9137f11be67e4a1422e920efe847481015bbbaf147c2409096a60555f3
+DIST opusOSOlivethemepack.zip 55758 SHA256 a1d9e1ef4f0047151a7966eb19b2b0721ccbe5cc31de378b0081ac787b348e92 SHA512 9b60f6af405653a97ba959ca1fedd2b0f16e704f7b027d5999dbdc6331c28a217adbf041cc55499ad2b7f1e3c3e466afd5491a761a9f0f20bcb19612dcb43549 WHIRLPOOL ff8f9fe290d2b1e8213f8c373ca623ea32f1fed5a824c64e5f859284954c4e04e44aec8e63b7ba84819cffed4b0ecd87147f3379c538ee1f5961adc84499aada
+DIST quickSilverRthemepack.zip 75812 SHA256 4e6c4597a56d4a75daf17b94717792ea0e3ad4eeeb0f3c6fc154c80d38ae7a4e SHA512 8cb111da5da83a37bdef84f4219416dfc6b3c58c5713ac36c364d720474978c9605ae99682b5bced884978b3cb303e4682f12ffd9b490f2888e31f25665b9a91 WHIRLPOOL c9204f627e3cd88dab303d8ee13e82929c0851367aebd27b7c5f67a2169c98bd5f204b4f9993714821b40f81a442f37def3577acb4b83241b6f99d56f841e11d
+DIST roueBluethemepack.zip 48959 SHA256 9514431ae6a4ecf8ad6621b00ff01b583a46efe570c4309e13c26750fa4e0035 SHA512 807012473bb25024856178a8b7fa00628b1514065184ef1c5b88f57528fcc448bc6f4969cf3b8c2a318c6e139fecdccf6b62d32ceace4344a72be3242e3d7bd3 WHIRLPOOL 627a743da69f6f7bd2365cd431574cff66210204843edf1b79d20eb4bf91bfc32f4f7d85d95bf8aabebeddb82639bdf20a8ab501d49837cca7e061fc683bcfd0
+DIST roueBrownthemepack.zip 49043 SHA256 f6c02ae51aa197cc43db9a1854da54e24efdb590c254a259cc1844ce1a0ead79 SHA512 84e3f6c6a37a687aad1c0c78a61631ee8fa08f9b3d539e619400e7f1d8bf2f07bc946a39bbc6b4d654131e8b31a3159b7ecd60fa6bb772e4579eaef4700e2d0a WHIRLPOOL 33e2e7e61bea66e816a700b882c5e1e365c8af60f9997bd52df839b15f3ca634b9377b479e96da3815d544b6e621fe52e5c2d9b33a04fd5e8df871e5cce501e4
+DIST roueGreenthemepack.zip 48957 SHA256 87402bf8f7b508e6be51bf0305a9ad3bcdc5e3c311149bb2db2d66b3c19782e8 SHA512 ba302cf75c387e7e01462ce2b65ca490ee68ae79fa4e1aaf100396bfc24ceac556248acc2828cde6489f9ddd2c738482f7cf763a39df820f34ede1d562045bbb WHIRLPOOL 6d9a378b12a8f38d7a66dcb1f7a7541db0446f54722581c9dd4fe704910b76454bcc785065675059222966cabd9ee0a589db1c695ebf0e40490ffd68f49a9d3a
+DIST royalInspiratthemepack.zip 50579 SHA256 fcc9bdb217c78d22fed169e8c3686a652afeff8b46a845832709bea13270eb02 SHA512 69b6ce41595b5325850a0d2930e714b568871bf4c237aeb6361a4b7dc7d842c5b5eb30cfabe42662b8decf8e0101816c932730e32291ba606ce18d7cb9e71cac WHIRLPOOL e41c0ee12bc9f9327049a7dbcfd1b56cf5eed2544286e65cbe77237e769b3f55fbf19b716e0364107afea094c5347d989d4f039431c0f89a75dbcb1524a9d781
+DIST silverLunaXPthemepack.zip 54618 SHA256 f53cfa989a023b28337a7794956746de2aae81ab43784360db18b73c29197d52 SHA512 2949b849c50adf7f07ecc6e208d31fc9417ebb3e4dd79b4508616440d9a2e408d7b899f51e3dbe69bb754a335fa45ae6ca5e79c19353bb759f3eb79608f663c0 WHIRLPOOL f4e97bb78b0445a38b83ab4d55412b8afaf55de51a80118ef1bb24e5a330729f8c4643592f7b3c6f1c07029c8fddbcf99e1bc05515252cca923c8d0fc702a573
+DIST solunaRthemepack.zip 59579 SHA256 49a561c657223de888dd390c2011edb1fac1dc6a95543ffc41f70c0fe015a9d8 SHA512 1082c24b1cfa881e03c7c3a398c2dfe3260459118763dd461cdfc09d11b16107f252b62ba56714acf897b8f3c2399478e5362b0d13f7dbeee7f809d0a76a2eb8 WHIRLPOOL 232419fb5258b01f6e92466e993bc5106dc08164b7af006e59411693e9a3a8ba71a2d97967bac0e1eb9f7335b05c04aa3ae70d2d01c92c5a6bb08e16dbeb53b6
+DIST tango_without_heart.zip 217125 SHA256 6c7fce9223d1827bea881c2b9901d0e5c8a111e09ebab6e45ec0a9d70b07e9a6 SHA512 03ba432c84b58acb1f488ef9d5fafef3523188948696fd9a8b707be55210db90d227d18f09999d43975a834dabdb89d939328cbef564ba05cf162271dee4fc7b WHIRLPOOL f37427d27b07bdf3c4a2b2e2b5dca44202a84d2461bb43174828c3892a220fb40c445c1ee9cac042b650ea26788f6f9339ad509ba10cefe0cab20162add1fdf0
+DIST tigerGraphitethemepack.zip 75611 SHA256 94d2b4978686158a421122dec73b385725b21408c0941984b6f37677c965fb35 SHA512 6b40a4f920f2ce1e63d365a0f56ab6babe280a6d4da193b39262d677f0cb3c92ceb98da84acf7aa9e94eab0e8bf0cc607ad48fe4a77e1976007479125b75ed5d WHIRLPOOL 70b22222cfc70773c361b658510477e44947be68d785867b445799bade497ee9a172b0099f04c62996e96f59af372a807d8d10b1993496fb1e33ef56e6579437
+DIST tigerthemepack.zip 77856 SHA256 55002367d55ffe7953e5e059d9357ce6d9111bbba303532b91263ca7ec69dbf5 SHA512 7d6fb04f2f69f97eab7b5b58fd3e3df421b015dd0a49a426c00458c0e17d7add84a389304cf850511ffe637d6e37c6b759d8dcd39091c03049d5cc4da085a991 WHIRLPOOL 4bc4bae43bd8236cdd8a64b85d7be0e91df48b7133b924d4d14458cf62ecfd162dc61cbbdb60f5a70f11f6e2891a977d9ed8a89b064d7d6af794cab8c63b64a5
+DIST toxicthemepack.zip 68233 SHA256 a3d6c2311f8a35381c8aa3ac9b7bead5ba81b00a47d4e4bd27b5e38de6322600 SHA512 350f091bd67b2c78a4c69936bce9d7f922c1b57f3711f173d4763856a6f60ba0f284a3cb63fbfe810381d6ea6d21afe14fec13fb6e2efb526c28d1d79501bf02 WHIRLPOOL 3b0bb5d288714014d6635cb6fe86fdb284d80698f95eb750c7fbd86b7de611f08fc59a7d656e1ed5a64b15e8e11401e24af0dcda3d53de14af2368085de04007
+DIST tulliana.zip 258520 SHA256 d9a7670c3933757f58bc6913433b6f00e984c0cbff17eaf59076d951ac195a88 SHA512 96ae1835892763e70dd02b2739837063a57318b32a106556415037e8e0688db4d8caa9e7c50495ad6dbfc6ed9499b08af10956c164f5435bde2942b90ddb291a WHIRLPOOL 57e2052bca12b0fcb7eb889d6b51d775d74a6f4cd3cd1b638ffd06fb74a3336e26a7c6626ddcbcd204342d1c7f71614cdc8247a4aa245f17eef9997075be5135
+DIST tvbrowser_3.4.1.0_src.zip 14256785 SHA256 e9079d4bb8a2b823770c3590662fa5bf9575b3ab7985201faa17dba01130248d SHA512 ec95898449209863ecb800db8395436be8946c30947ef25075caebe03db27c0393451a25f123d99b5d1ed82638920fa5102d4c1b16ddfdd9fd316f19de75d07a WHIRLPOOL aea5673ef79c0d962e01176ad59fa5174529d87db9efed044c85400df6d6897ce4053a0514e03e1a4bf01dac63a76d62206c0cbd4fec3dddb7b1dc4228fca6db
+DIST tvbrowser_3.4.3_src.zip 13225215 SHA256 567daf0dd779c6b0346c8687f969e2509d3b373f6283d8d4f4a21040f26c5588 SHA512 0991e5b0bea7fd676c61fe22e236675f7ed19e4476dc0202a649bcb395affeb310331b065859e632380c7f1781d6a21d426756d77a030d2bfa70570b15510124 WHIRLPOOL 47f049c7e4f74828734274ff05acbbd93c6b315457ef811d3f24895fd95591eaa062be36d92f7eeb869954e24eb0b53d62266936e81ac55078c141ac753f4d67
+DIST underlingthemepack.zip 59786 SHA256 67dfd8757162dce375e02c250403a7184b64fbd1c1eb754a11373467ff96eb44 SHA512 d123c6ddb8db820a6d825e36433d31505b88e5e5578d0e368d639c3817893e9300d85bcd7a16a7a7329e962bf87919fad250d87e3759ceb32db6ffc1d6290c0a WHIRLPOOL 15bcccc7704389dfdde629dee895ecb37ac56ae89680b3e8629fd8539fef0a0c9218cdfa4969b2a1b8c841e4b3b5f0164e6cec395f43ab9c3c409ba5bc6b4f8c
+DIST whistlerthemepack.zip 32206 SHA256 0d8e5fab4cc148d35610f11061ddc7cd8eb23116919d99c8c673c1956ae6711e SHA512 1d9969fa436b7065db57f06ccd6ffb6b3c395a3ca4f976b9eb69445de9f63bfb55755e832269b3192365b5c30fb953998ca95d2b16e7c8bd06d78d8a42703a3c WHIRLPOOL 2724a0d005876a976a701c69509b701957edabd919b6e3d1a2cdfce1827a9a198de64a3f402af79004dee5db212f3732dde4e799d3e5016bcc95f993c18be362
+DIST xplunathemepack.zip 63343 SHA256 c8a2328597e0b05866919a2c925baf39dad294d1feade9d28cf4cf01722b95ee SHA512 79698db5fc4dfdcf85d96f595227679c4bc593d7f8e89923a3af0243ebeb0cb0a101bc48821f37f736298406c564f0332ab7eed5748a4efb092acd95827b4a06 WHIRLPOOL 784531315de55bb917b9451b0c9dd84f8a6a297594f8742743ed64a3702d9833c83104b422874c972e1d92b8a971ddaf2ac4bd8670054e40c2c908a8eb2bbe72
+EBUILD tvbrowser-3.4.1.0-r1.ebuild 2266 SHA256 55277665f9c13680299e0d9a90df9212f045b59ed5ba8988dec7fbf3d342b766 SHA512 134ac2d2d9d4466b61c4589ae0537b7fc2d484d67a21cdd595419622ae44eee4ed5c0c36e520e68030245ae6c6758770ae4e90270e9a1f0e341e8452de916be6 WHIRLPOOL 877f0d3d08067a3210feffe8f5de58e8dfdfc08c97fc01e4557c44472eeea5f673b15f3df3b444b901fb07dc90150812016424ed59e106a5dacff2963883dc9c
+EBUILD tvbrowser-3.4.3.ebuild 2273 SHA256 dcc23e58a953141395866b808d2ceb24ee04cb8590aa850e20114beeb9342a6c SHA512 12f09b249f4a0d90baa59654e1fc890e9eee919f5e1bd76d26ef40a4ae7c5b3497df485495a8f5361a81f8d4401e21d75234c2c849646a2ce2c4816e9bdbf764 WHIRLPOOL ec29e0fa2b6736a8954fa6c10b7cfb9107339cdefd55e5170cd59e752758841fe5c341232ada587785899804709cafaabcd3c89989d391db56ee8b8dc9ed6e78
+EBUILD tvbrowser-9999-r1.ebuild 4989 SHA256 07e57ab73d842b4a9a43d57b0cd70e91336277e952de0caa99f431732ae3cdaf SHA512 fef9c3876a108e06666cf7a8a5ef4466544facb6382f191d174065aca08300c891212c6c0fcec71295b8352909cd7d7af8f36dafa51e9fba7c59dd5971846f12 WHIRLPOOL 738ac6e9fde67fda0316303d7af0ddd628eb1ed8909796bdce57226adc8c0d609c731c690c3b80deba2bdef8c72a43bdaa147fa32a80227ca5a676d354e3a2fb
+MISC ChangeLog 4645 SHA256 eaf0cccd89993e2fa7449d52602e108532307a8d54ac1e7640396184d85a0ae9 SHA512 c9c3ddb3c8a6e9801eaf5dc210d0cdac8d774e72c1bd6809afa64d1d7b433473758ca4aa80f4532d95a63669c67df54829cadff0d62c586ceafc716894094f44 WHIRLPOOL 2f87687abcbf930d1e2ee866f3df0d860b4b94daf719a2b8a29e9442d535827510de75ee96b812f705bc96028bb74dd9fc945c89bed41efe298f8cba74adb377
+MISC ChangeLog-2015 9620 SHA256 5f31a2df76b08713addc217bd99fd01fc7b091c799b5bc4e13ace00f575eab9f SHA512 e207d487bc1aaf3c4f6a5dbda1168a60cb2839fc525cabdc3703e8d105f150cbfc74d0b9a2f3ca256ab293705f1052a4628910293bb721aa2cc9308273964851 WHIRLPOOL 6fc0c54d0e52cf3417007bae552b6b6e924a6d9a3864346fd2890ecaebb4093e7351ac9dca2bb303f77b7a70e585ee456cee574d5bdda3c3d02efb0fb2e7289a
+MISC metadata.xml 399 SHA256 ab7eb22990b736faddd5c56c84e8f1e15064db322fbe6e6c33a246b36dacc791 SHA512 dba0d738c1cf9b165101f7b752ff24cc3c4fb90dc697d6c49670a77a86508190edfe6de82d35099f938262fb21a77340bd9730b996c925638968c0f6bfec1342 WHIRLPOOL 742489ed24dd16ba46ef4bab7285d07c3a1ff90f609d219ebc369ffcbecbccedca380c8b0ebc40b07a4ab8f6fbc6836220cd7dced37665a13c3ba4ba431f78bd
diff --git a/media-tv/tvbrowser/files/3.4.1.0-build.xml.patch b/media-tv/tvbrowser/files/3.4.1.0-build.xml.patch
new file mode 100644
index 000000000000..570bff32db76
--- /dev/null
+++ b/media-tv/tvbrowser/files/3.4.1.0-build.xml.patch
@@ -0,0 +1,109 @@
+--- build.xml.orig	2015-03-24 17:34:18.753531031 +0000
++++ build.xml	2015-03-24 17:38:48.013509290 +0000
+@@ -105,32 +105,6 @@
+ |  Task definitions
+ |
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+-
+-  <!-- Creates an .app file for Mac OS X (http://informagen.com/JarBundler/)  -->
+-  <taskdef name="jarbundler"
+-           classpath="deployment/macosx/jarbundler-2.0.0.jar"
+-           classname="net.sourceforge.jarbundler.JarBundler" />
+-
+-  <!-- Creates a Windows Executable using launch4j (http://launch4j.sf.net) -->
+-	<taskdef name="launch4j"
+-	    classname="net.sf.launch4j.ant.Launch4jTask"
+-	    classpath="${deployment.dir}/win/launch4j/launch4j.jar:${deployment.dir}/win/launch4j/lib/xstream.jar" />
+-
+-  <!-- Creates a linux desktopEntry-->
+-	<taskdef name="desktopEntry"
+-		classname="com.googlecode.ant_deb_task.DesktopEntry"
+-		classpathref="ant-deb.classpath"/>
+-
+-  <!-- Creates an Ubuntu package-->
+-	<taskdef name="deb"
+-		classname="com.googlecode.ant_deb_task.Deb"
+-		classpathref="ant-deb.classpath"/>
+-	
+-  <!-- Creates a RedHad package-->
+-	<taskdef name="rrpm"
+-		classname="org.redline_rpm.RedlineTask"
+-		classpathref="ant-rpm.classpath"/>
+-
+   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ |
+ |  Display all targets
+@@ -329,6 +303,7 @@
+     <echo message="Creating the jars ..."/>
+ 
+     <!-- Extract the libraries for the tvbrowser.jar into the temp.dir -->
++    <!--
+     <unjar src="${lib.dir}/${lib.skinlf.name}-${lib.skinlf.version}.jar" dest="${unpacked.dir}/${lib.skinlf.name}.jar"/>
+     <unjar src="${lib.dir}/${lib.bsh.name}-${lib.bsh.version}.jar" dest="${unpacked.dir}/${lib.bsh.name}.jar"/>
+     <unjar src="${lib.dir}/${lib.jgoodies-common.name}-${lib.jgoodies-common.version}.jar" dest="${unpacked.dir}/${lib.jgoodies-common.name}.jar"/>
+@@ -343,6 +318,7 @@
+     <unjar src="${lib.dir}/${lib.texhyphj.name}-${lib.texhyphj.version}.jar" dest="${unpacked.dir}/${lib.texhyphj.name}.jar" />
+     <unjar src="${lib.dir}/${lib.substance.name}-${lib.substance.version}.jar" dest="${unpacked.dir}/${lib.substance.name}.jar" />
+     <unjar src="${lib.dir}/${lib.trident.name}-${lib.trident.version}.jar" dest="${unpacked.dir}/${lib.trident.name}.jar" />
++    -->
+ 
+     <!-- Pack the tvbrowser.jar -->
+     <jar jarfile="${tvbrowser-default.runtime.dir}/tvbrowser.jar"
+@@ -357,6 +333,7 @@
+       <fileset dir="${classes.dir}" includes="tvdataservice/**"/>
+       <fileset dir="${classes.dir}" includes="util/**"/>
+       <fileset dir="${classes.dir}" includes="com/**"/>
++      <!--
+       <fileset dir="${classes.dir}/imgs" includes="splash.png"/>
+       <fileset dir="${unpacked.dir}/${lib.skinlf.name}.jar" includes="com/**"/>
+    	  <fileset dir="${unpacked.dir}/${lib.skinlf.name}.jar" includes="org/**"/>
+@@ -373,6 +350,7 @@
+       <fileset dir="${unpacked.dir}/${lib.texhyphj.name}.jar" includes="net/**"/>
+       <fileset dir="${unpacked.dir}/${lib.substance.name}.jar" includes="org/**"/>
+       <fileset dir="${unpacked.dir}/${lib.trident.name}.jar" includes="org/**"/>
++      -->
+     </jar>
+ 
+     <!-- Copy the other stuff -->
+@@ -431,7 +409,9 @@
+ 
+     <!-- Extract the libraries for the tvbrowser.jar into the temp.dir -->
+     <mkdir dir="${unpacked.dir}/${lib.commons.net.name}.jar"/>
++    <!--
+     <unjar src="${lib.dir}/${lib.commons.net.name}-${lib.commons.net.version}.jar" dest="${unpacked.dir}/${lib.commons.net.name}.jar"/>
++    -->
+ 
+   </target>
+ 
+@@ -555,6 +535,7 @@
+ 	
+   <!-- Creates the desktop entry file for Linux platforms -->
+   <target name="tvbrowser-desktop-entry">
++      <!--
+   	<desktopEntry
+         toFile="${tvbrowser-linux.runtime.dir}/tvbrowser.desktop"
+         name="TV-Browser"
+@@ -571,6 +552,7 @@
+     	<comment lang="de" value="Anpassbare und einfach zu benutzende TV-Zeitschrift - geschrieben in Java"/>
+    	</desktopEntry>
+   	<echo file="${tvbrowser-linux.runtime.dir}/tvbrowser.desktop" append="true">StartupWMClass=tvbrowser-TVBrowser</echo>
++    -->
+   </target>
+ 
+   <!-- Creates the desktop entry file for Ubuntu platform -->
+@@ -752,6 +734,7 @@
+ 
+   <!-- Creates the windows exe file -->
+   <target name="exe" depends="runtime-win">
++      <!--
+   	<launch4j configFile="${deployment.dir}/win/launch4j/tvbrowser.xml"
+   		fileversion="${tvbrowser.version.file}"
+   		productversion="${tvbrowser.version.file}"
+@@ -762,6 +745,7 @@
+   		productversion="${tvbrowser.version.file}"
+   		txtfileversion="${tvbrowser.version}"
+   		txtproductversion="${tvbrowser.version}"/>
++      -->
+   </target>
+ 
+   <!-- Creates the windows transportable exe file -->
diff --git a/media-tv/tvbrowser/files/3.4.1.0-remove-registrykey.patch b/media-tv/tvbrowser/files/3.4.1.0-remove-registrykey.patch
new file mode 100644
index 000000000000..2c52ddada29a
--- /dev/null
+++ b/media-tv/tvbrowser/files/3.4.1.0-remove-registrykey.patch
@@ -0,0 +1,150 @@
+--- src/tvbrowser/TVBrowser.java.orig	2015-03-24 17:41:56.811494046 +0000
++++ src/tvbrowser/TVBrowser.java	2015-03-24 17:43:30.625486471 +0000
+@@ -113,9 +113,6 @@
+ import util.ui.UIThreadRunner;
+ import util.ui.UiUtilities;
+ import util.ui.textcomponentpopup.TextComponentPopupEventQueue;
+-import ca.beq.util.win32.registry.RegistryKey;
+-import ca.beq.util.win32.registry.RegistryValue;
+-import ca.beq.util.win32.registry.RootKey;
+ 
+ import com.jgoodies.looks.LookUtils;
+ import com.l2fprod.gui.plaf.skin.SkinLookAndFeel;
+@@ -567,77 +564,6 @@
+           public void run() {
+             ChannelList.completeChannelLoading();
+             initializeAutomaticDownload();
+-            if (Launch.isOsWindowsNtBranch()) {
+-              try {
+-                RegistryKey desktopSettings = new RegistryKey(
+-                    RootKey.HKEY_CURRENT_USER, "Control Panel\\Desktop");
+-                RegistryValue autoEnd = desktopSettings
+-                    .getValue("AutoEndTasks");
+-
+-                if (autoEnd.getData().equals("1")) {
+-                  RegistryValue killWait = desktopSettings
+-                      .getValue("WaitToKillAppTimeout");
+-
+-                  int i = Integer.parseInt(killWait.getData().toString());
+-
+-                  if (i < 5000) {
+-                    JOptionPane pane = new JOptionPane();
+-
+-                    String cancel = mLocalizer.msg("registryCancel",
+-                        "Close TV-Browser");
+-                    String dontDoIt = mLocalizer.msg("registryJumpOver",
+-                        "Not this time");
+-
+-                    pane.setOptions(new String[] {
+-                        Localizer.getLocalization(Localizer.I18N_OK), dontDoIt,
+-                        cancel });
+-                    pane.setOptionType(JOptionPane.YES_NO_CANCEL_OPTION);
+-                    pane.setMessageType(JOptionPane.WARNING_MESSAGE);
+-                    pane
+-                        .setMessage(mLocalizer
+-                            .msg(
+-                                "registryWarning",
+-                                "The fast shutdown of Windows is activated.\nThe timeout to wait for before Windows is closing an application is too short,\nto give TV-Browser enough time to save all settings.\n\nThe setting hasn't the default value. It was changed by a tool or by you.\nTV-Browser will now try to change the timeout.\n\nIf you don't want to change this timeout select 'Not this time' or 'Close TV-Browser'."));
+-
+-                    pane.setInitialValue(mLocalizer.msg("registryCancel",
+-                        "Close TV-Browser"));
+-
+-                    JDialog d = pane.createDialog(UiUtilities
+-                        .getLastModalChildOf(mainFrame), UIManager
+-                        .getString("OptionPane.messageDialogTitle"));
+-                    d.setModal(true);
+-                    UiUtilities.centerAndShow(d);
+-
+-                    if (pane.getValue() == null
+-                        || pane.getValue().equals(cancel)) {
+-                      mainFrame.quit();
+-                    } else if (!pane.getValue().equals(dontDoIt)) {
+-                      try {
+-                        killWait.setData("5000");
+-                        desktopSettings.setValue(killWait);
+-                        JOptionPane
+-                            .showMessageDialog(
+-                                UiUtilities.getLastModalChildOf(mainFrame),
+-                                mLocalizer
+-                                    .msg("registryChanged",
+-                                        "The timeout was changed successfully.\nPlease reboot Windows!"));
+-                      } catch (Exception registySetting) {
+-                        JOptionPane
+-                            .showMessageDialog(
+-                                UiUtilities.getLastModalChildOf(mainFrame),
+-                                mLocalizer
+-                                    .msg(
+-                                        "registryNotChanged",
+-                                        "<html>The Registry value couldn't be changed. Maybe you haven't the right to do it.<br>If it is so contact you Administrator and let him do it for you.<br><br><b><Attention:/b> The following description is for experts. If you change or delete the wrong value in the Registry you could destroy your Windows installation.<br><br>To get no warning on TV-Browser start the Registry value <b>WaitToKillAppTimeout</b> in the Registry path<br><b>HKEY_CURRENT_USER\\Control Panel\\Desktop</b> have to be at least <b>5000</b> or the value for <b>AutoEndTasks</b> in the same path have to be <b>0</b>.</html>"),
+-                                Localizer.getLocalization(Localizer.I18N_ERROR),
+-                                JOptionPane.ERROR_MESSAGE);
+-                      }
+-                    }
+-                  }
+-                }
+-              } catch (Throwable registry) {
+-              }
+-            }
+ 
+             if (currentVersion != null
+                 && currentVersion.compareTo(new Version(2, 71, false)) < 0) {
+--- src/tvbrowser/ui/settings/StartupSettingsTab.java.orig	2015-03-24 17:51:54.418445794 +0000
++++ src/tvbrowser/ui/settings/StartupSettingsTab.java	2015-03-24 17:52:23.370443456 +0000
+@@ -50,8 +50,6 @@
+ import tvbrowser.ui.mainframe.PeriodItem;
+ import util.ui.Localizer;
+ import util.ui.UiUtilities;
+-import ca.beq.util.win32.registry.RegistryKey;
+-import ca.beq.util.win32.registry.RootKey;
+ 
+ import com.jgoodies.forms.builder.PanelBuilder;
+ import com.jgoodies.forms.factories.Borders;
+@@ -163,41 +161,6 @@
+         .getBoolean());
+     mSettingsPn.add(mShowStartScreenChB, cc.xy(2, ++y));
+ 
+-    if (System.getProperty("os.name").toLowerCase().startsWith("windows") && !TVBrowser.isTransportable()) {
+-      layout.insertRow(++y, RowSpec.decode("1dlu"));
+-      layout.insertRow(++y, RowSpec.decode("pref"));
+-
+-      try {
+-        RegistryKey shellFolders = new RegistryKey(RootKey.HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders");
+-        String path = shellFolders.getValue("Startup").getData().toString();
+-
+-        if(path == null || path.length() < 1 || !(new File(path)).isDirectory()) {
+-          throw new Exception();
+-        }
+-
+-        mLinkFileFile = new File(path,"TV-Browser.url");
+-
+-        try {
+-          mLinkFile = new LinkFile(mLinkFileFile);
+-
+-          if(mLinkFileFile.isFile()) {
+-            try {
+-              if (!mLinkFile.hasTarget((new File("tvbrowser.exe")).getAbsoluteFile())) {
+-                createLink(mLinkFile);
+-              }
+-            }catch(Exception linkException) {
+-              mLinkFileFile.delete();
+-            }
+-          }
+-        }catch(FileNotFoundException fe) {}
+-
+-        mAutostartWithWindows = new JCheckBox(mLocalizer.msg("autostart","Start TV-Browser with Windows"),
+-            mLinkFileFile.isFile());
+-
+-        mSettingsPn.add(mAutostartWithWindows, cc.xy(2, y));
+-      } catch (Throwable e) {e.printStackTrace();}
+-    }
+-
+     y++;
+ 
+     mSettingsPn.add(createRefreshPanel(), cc.xyw(1,++y,5));
+@@ -513,4 +476,4 @@
+       return new File(mTarget).equals(file);
+     }
+   }
+-}
+\ No newline at end of file
++}
diff --git a/media-tv/tvbrowser/files/3.4.3-build.xml.patch b/media-tv/tvbrowser/files/3.4.3-build.xml.patch
new file mode 100644
index 000000000000..570bff32db76
--- /dev/null
+++ b/media-tv/tvbrowser/files/3.4.3-build.xml.patch
@@ -0,0 +1,109 @@
+--- build.xml.orig	2015-03-24 17:34:18.753531031 +0000
++++ build.xml	2015-03-24 17:38:48.013509290 +0000
+@@ -105,32 +105,6 @@
+ |  Task definitions
+ |
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+-
+-  <!-- Creates an .app file for Mac OS X (http://informagen.com/JarBundler/)  -->
+-  <taskdef name="jarbundler"
+-           classpath="deployment/macosx/jarbundler-2.0.0.jar"
+-           classname="net.sourceforge.jarbundler.JarBundler" />
+-
+-  <!-- Creates a Windows Executable using launch4j (http://launch4j.sf.net) -->
+-	<taskdef name="launch4j"
+-	    classname="net.sf.launch4j.ant.Launch4jTask"
+-	    classpath="${deployment.dir}/win/launch4j/launch4j.jar:${deployment.dir}/win/launch4j/lib/xstream.jar" />
+-
+-  <!-- Creates a linux desktopEntry-->
+-	<taskdef name="desktopEntry"
+-		classname="com.googlecode.ant_deb_task.DesktopEntry"
+-		classpathref="ant-deb.classpath"/>
+-
+-  <!-- Creates an Ubuntu package-->
+-	<taskdef name="deb"
+-		classname="com.googlecode.ant_deb_task.Deb"
+-		classpathref="ant-deb.classpath"/>
+-	
+-  <!-- Creates a RedHad package-->
+-	<taskdef name="rrpm"
+-		classname="org.redline_rpm.RedlineTask"
+-		classpathref="ant-rpm.classpath"/>
+-
+   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ |
+ |  Display all targets
+@@ -329,6 +303,7 @@
+     <echo message="Creating the jars ..."/>
+ 
+     <!-- Extract the libraries for the tvbrowser.jar into the temp.dir -->
++    <!--
+     <unjar src="${lib.dir}/${lib.skinlf.name}-${lib.skinlf.version}.jar" dest="${unpacked.dir}/${lib.skinlf.name}.jar"/>
+     <unjar src="${lib.dir}/${lib.bsh.name}-${lib.bsh.version}.jar" dest="${unpacked.dir}/${lib.bsh.name}.jar"/>
+     <unjar src="${lib.dir}/${lib.jgoodies-common.name}-${lib.jgoodies-common.version}.jar" dest="${unpacked.dir}/${lib.jgoodies-common.name}.jar"/>
+@@ -343,6 +318,7 @@
+     <unjar src="${lib.dir}/${lib.texhyphj.name}-${lib.texhyphj.version}.jar" dest="${unpacked.dir}/${lib.texhyphj.name}.jar" />
+     <unjar src="${lib.dir}/${lib.substance.name}-${lib.substance.version}.jar" dest="${unpacked.dir}/${lib.substance.name}.jar" />
+     <unjar src="${lib.dir}/${lib.trident.name}-${lib.trident.version}.jar" dest="${unpacked.dir}/${lib.trident.name}.jar" />
++    -->
+ 
+     <!-- Pack the tvbrowser.jar -->
+     <jar jarfile="${tvbrowser-default.runtime.dir}/tvbrowser.jar"
+@@ -357,6 +333,7 @@
+       <fileset dir="${classes.dir}" includes="tvdataservice/**"/>
+       <fileset dir="${classes.dir}" includes="util/**"/>
+       <fileset dir="${classes.dir}" includes="com/**"/>
++      <!--
+       <fileset dir="${classes.dir}/imgs" includes="splash.png"/>
+       <fileset dir="${unpacked.dir}/${lib.skinlf.name}.jar" includes="com/**"/>
+    	  <fileset dir="${unpacked.dir}/${lib.skinlf.name}.jar" includes="org/**"/>
+@@ -373,6 +350,7 @@
+       <fileset dir="${unpacked.dir}/${lib.texhyphj.name}.jar" includes="net/**"/>
+       <fileset dir="${unpacked.dir}/${lib.substance.name}.jar" includes="org/**"/>
+       <fileset dir="${unpacked.dir}/${lib.trident.name}.jar" includes="org/**"/>
++      -->
+     </jar>
+ 
+     <!-- Copy the other stuff -->
+@@ -431,7 +409,9 @@
+ 
+     <!-- Extract the libraries for the tvbrowser.jar into the temp.dir -->
+     <mkdir dir="${unpacked.dir}/${lib.commons.net.name}.jar"/>
++    <!--
+     <unjar src="${lib.dir}/${lib.commons.net.name}-${lib.commons.net.version}.jar" dest="${unpacked.dir}/${lib.commons.net.name}.jar"/>
++    -->
+ 
+   </target>
+ 
+@@ -555,6 +535,7 @@
+ 	
+   <!-- Creates the desktop entry file for Linux platforms -->
+   <target name="tvbrowser-desktop-entry">
++      <!--
+   	<desktopEntry
+         toFile="${tvbrowser-linux.runtime.dir}/tvbrowser.desktop"
+         name="TV-Browser"
+@@ -571,6 +552,7 @@
+     	<comment lang="de" value="Anpassbare und einfach zu benutzende TV-Zeitschrift - geschrieben in Java"/>
+    	</desktopEntry>
+   	<echo file="${tvbrowser-linux.runtime.dir}/tvbrowser.desktop" append="true">StartupWMClass=tvbrowser-TVBrowser</echo>
++    -->
+   </target>
+ 
+   <!-- Creates the desktop entry file for Ubuntu platform -->
+@@ -752,6 +734,7 @@
+ 
+   <!-- Creates the windows exe file -->
+   <target name="exe" depends="runtime-win">
++      <!--
+   	<launch4j configFile="${deployment.dir}/win/launch4j/tvbrowser.xml"
+   		fileversion="${tvbrowser.version.file}"
+   		productversion="${tvbrowser.version.file}"
+@@ -762,6 +745,7 @@
+   		productversion="${tvbrowser.version.file}"
+   		txtfileversion="${tvbrowser.version}"
+   		txtproductversion="${tvbrowser.version}"/>
++      -->
+   </target>
+ 
+   <!-- Creates the windows transportable exe file -->
diff --git a/media-tv/tvbrowser/files/3.4.3-remove-registrykey.patch b/media-tv/tvbrowser/files/3.4.3-remove-registrykey.patch
new file mode 100644
index 000000000000..2c52ddada29a
--- /dev/null
+++ b/media-tv/tvbrowser/files/3.4.3-remove-registrykey.patch
@@ -0,0 +1,150 @@
+--- src/tvbrowser/TVBrowser.java.orig	2015-03-24 17:41:56.811494046 +0000
++++ src/tvbrowser/TVBrowser.java	2015-03-24 17:43:30.625486471 +0000
+@@ -113,9 +113,6 @@
+ import util.ui.UIThreadRunner;
+ import util.ui.UiUtilities;
+ import util.ui.textcomponentpopup.TextComponentPopupEventQueue;
+-import ca.beq.util.win32.registry.RegistryKey;
+-import ca.beq.util.win32.registry.RegistryValue;
+-import ca.beq.util.win32.registry.RootKey;
+ 
+ import com.jgoodies.looks.LookUtils;
+ import com.l2fprod.gui.plaf.skin.SkinLookAndFeel;
+@@ -567,77 +564,6 @@
+           public void run() {
+             ChannelList.completeChannelLoading();
+             initializeAutomaticDownload();
+-            if (Launch.isOsWindowsNtBranch()) {
+-              try {
+-                RegistryKey desktopSettings = new RegistryKey(
+-                    RootKey.HKEY_CURRENT_USER, "Control Panel\\Desktop");
+-                RegistryValue autoEnd = desktopSettings
+-                    .getValue("AutoEndTasks");
+-
+-                if (autoEnd.getData().equals("1")) {
+-                  RegistryValue killWait = desktopSettings
+-                      .getValue("WaitToKillAppTimeout");
+-
+-                  int i = Integer.parseInt(killWait.getData().toString());
+-
+-                  if (i < 5000) {
+-                    JOptionPane pane = new JOptionPane();
+-
+-                    String cancel = mLocalizer.msg("registryCancel",
+-                        "Close TV-Browser");
+-                    String dontDoIt = mLocalizer.msg("registryJumpOver",
+-                        "Not this time");
+-
+-                    pane.setOptions(new String[] {
+-                        Localizer.getLocalization(Localizer.I18N_OK), dontDoIt,
+-                        cancel });
+-                    pane.setOptionType(JOptionPane.YES_NO_CANCEL_OPTION);
+-                    pane.setMessageType(JOptionPane.WARNING_MESSAGE);
+-                    pane
+-                        .setMessage(mLocalizer
+-                            .msg(
+-                                "registryWarning",
+-                                "The fast shutdown of Windows is activated.\nThe timeout to wait for before Windows is closing an application is too short,\nto give TV-Browser enough time to save all settings.\n\nThe setting hasn't the default value. It was changed by a tool or by you.\nTV-Browser will now try to change the timeout.\n\nIf you don't want to change this timeout select 'Not this time' or 'Close TV-Browser'."));
+-
+-                    pane.setInitialValue(mLocalizer.msg("registryCancel",
+-                        "Close TV-Browser"));
+-
+-                    JDialog d = pane.createDialog(UiUtilities
+-                        .getLastModalChildOf(mainFrame), UIManager
+-                        .getString("OptionPane.messageDialogTitle"));
+-                    d.setModal(true);
+-                    UiUtilities.centerAndShow(d);
+-
+-                    if (pane.getValue() == null
+-                        || pane.getValue().equals(cancel)) {
+-                      mainFrame.quit();
+-                    } else if (!pane.getValue().equals(dontDoIt)) {
+-                      try {
+-                        killWait.setData("5000");
+-                        desktopSettings.setValue(killWait);
+-                        JOptionPane
+-                            .showMessageDialog(
+-                                UiUtilities.getLastModalChildOf(mainFrame),
+-                                mLocalizer
+-                                    .msg("registryChanged",
+-                                        "The timeout was changed successfully.\nPlease reboot Windows!"));
+-                      } catch (Exception registySetting) {
+-                        JOptionPane
+-                            .showMessageDialog(
+-                                UiUtilities.getLastModalChildOf(mainFrame),
+-                                mLocalizer
+-                                    .msg(
+-                                        "registryNotChanged",
+-                                        "<html>The Registry value couldn't be changed. Maybe you haven't the right to do it.<br>If it is so contact you Administrator and let him do it for you.<br><br><b><Attention:/b> The following description is for experts. If you change or delete the wrong value in the Registry you could destroy your Windows installation.<br><br>To get no warning on TV-Browser start the Registry value <b>WaitToKillAppTimeout</b> in the Registry path<br><b>HKEY_CURRENT_USER\\Control Panel\\Desktop</b> have to be at least <b>5000</b> or the value for <b>AutoEndTasks</b> in the same path have to be <b>0</b>.</html>"),
+-                                Localizer.getLocalization(Localizer.I18N_ERROR),
+-                                JOptionPane.ERROR_MESSAGE);
+-                      }
+-                    }
+-                  }
+-                }
+-              } catch (Throwable registry) {
+-              }
+-            }
+ 
+             if (currentVersion != null
+                 && currentVersion.compareTo(new Version(2, 71, false)) < 0) {
+--- src/tvbrowser/ui/settings/StartupSettingsTab.java.orig	2015-03-24 17:51:54.418445794 +0000
++++ src/tvbrowser/ui/settings/StartupSettingsTab.java	2015-03-24 17:52:23.370443456 +0000
+@@ -50,8 +50,6 @@
+ import tvbrowser.ui.mainframe.PeriodItem;
+ import util.ui.Localizer;
+ import util.ui.UiUtilities;
+-import ca.beq.util.win32.registry.RegistryKey;
+-import ca.beq.util.win32.registry.RootKey;
+ 
+ import com.jgoodies.forms.builder.PanelBuilder;
+ import com.jgoodies.forms.factories.Borders;
+@@ -163,41 +161,6 @@
+         .getBoolean());
+     mSettingsPn.add(mShowStartScreenChB, cc.xy(2, ++y));
+ 
+-    if (System.getProperty("os.name").toLowerCase().startsWith("windows") && !TVBrowser.isTransportable()) {
+-      layout.insertRow(++y, RowSpec.decode("1dlu"));
+-      layout.insertRow(++y, RowSpec.decode("pref"));
+-
+-      try {
+-        RegistryKey shellFolders = new RegistryKey(RootKey.HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders");
+-        String path = shellFolders.getValue("Startup").getData().toString();
+-
+-        if(path == null || path.length() < 1 || !(new File(path)).isDirectory()) {
+-          throw new Exception();
+-        }
+-
+-        mLinkFileFile = new File(path,"TV-Browser.url");
+-
+-        try {
+-          mLinkFile = new LinkFile(mLinkFileFile);
+-
+-          if(mLinkFileFile.isFile()) {
+-            try {
+-              if (!mLinkFile.hasTarget((new File("tvbrowser.exe")).getAbsoluteFile())) {
+-                createLink(mLinkFile);
+-              }
+-            }catch(Exception linkException) {
+-              mLinkFileFile.delete();
+-            }
+-          }
+-        }catch(FileNotFoundException fe) {}
+-
+-        mAutostartWithWindows = new JCheckBox(mLocalizer.msg("autostart","Start TV-Browser with Windows"),
+-            mLinkFileFile.isFile());
+-
+-        mSettingsPn.add(mAutostartWithWindows, cc.xy(2, y));
+-      } catch (Throwable e) {e.printStackTrace();}
+-    }
+-
+     y++;
+ 
+     mSettingsPn.add(createRefreshPanel(), cc.xyw(1,++y,5));
+@@ -513,4 +476,4 @@
+       return new File(mTarget).equals(file);
+     }
+   }
+-}
+\ No newline at end of file
++}
diff --git a/media-tv/tvbrowser/files/tvbrowser-9999-build.xml b/media-tv/tvbrowser/files/tvbrowser-9999-build.xml
new file mode 100644
index 000000000000..7b1e967f9a29
--- /dev/null
+++ b/media-tv/tvbrowser/files/tvbrowser-9999-build.xml
@@ -0,0 +1,965 @@
+<?xml version="1.0"?>
+<!--
+ | Ant build script for the TV-Browser project.
+ |
+ | TV-Browser
+ | Copyright (C) 04-2003 Martin Oberhauser (martin@tvbrowser.org)
+ |
+ | 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
+ | of the License, 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 this program; if not, write to the Free Software
+ | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ |
+ | CVS information:
+ |  $RCSfile$
+ |   $Source$
+ |     $Date: 2014-12-09 22:04:57 +0100 (Tue, 09 Dec 2014) $
+ |   $Author: ds10 $
+ | $Revision: 8377 $
+ |
+ | Author: Til Schneider, www.murfman.de
+ +-->
+<project name="TV-Browser" default="targets" basedir=".">
+
+
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |
+  |  The properties and paths
+  |
+   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <property environment="env"/>
+  <property file="build.properties"/>
+  <property name="programname" value="TV-Browser"/>
+  <property name="programname.file" value="tvbrowser"/>
+  <property name="classes.dir" value="classes"/>
+  <property name="lib.dir" value="lib"/>
+  <property name="txt.dir" value="txt"/>
+  <property name="src.dir" value="src"/>
+  <property name="test.src.dir" value="test/src"/>
+  <property name="test.classes.dir" value="test/classes"/>
+  <property name="doc.dir" value="doc"/>
+  <property name="doc.header" value="${programname} ${tvbrowser.version} API"/>
+  <property name="doc.title" value="API documentation for ${programname} ${tvbrowser.version}"/>
+  <property name="doc.bottom" value="${programname} ${tvbrowser.version}, Copyright (C) 2004-2008 TV-Browser Team (dev@tvbrowser.org)"/>
+
+  <property name="unpacked.dir" value="unpacked"/>
+
+  <property name="runtime.dir" value="runtime"/>
+  <property name="tvbrowser-default.runtime.dir" value="${runtime.dir}/tvbrowser_default"/>
+
+  <property name="tvbrowser-win.runtime.dir" value="${runtime.dir}/tvbrowser_win"/>
+  <property name="tvbrowser-linux.runtime.dir" value="${runtime.dir}/tvbrowser_linux"/>
+  <property name="tvbrowser-transportable.runtime.dir" value="${runtime.dir}/tvbrowser_transportable"/>
+  <property name="tvbrowser-nightly.runtime.dir" value="${runtime.dir}/tvbrowser_nightly"/>
+  <property name="tvbrowser-mac.runtime.dir" value="${runtime.dir}/tvbrowser_mac"/>
+	  <property name="tvbrowser-macjava.runtime.dir" value="${runtime.dir}/tvbrowser_macjava"/>
+  <property name="themepacks.dir" value="themepacks"/>
+  <property name="personas.dir" value="personas"/>
+
+  <property name="deployment.dir" value="deployment" />
+  <property name="win.dir" value="${deployment.dir}/win"/>
+  <property name="linux.dir" value="${deployment.dir}/linux"/>
+  <property name="osx.dir" value="${deployment.dir}/macosx"/>
+  <property name="x11.dir" value="${deployment.dir}/x11"/>
+  <property name="installer.dir" value="${win.dir}/installer"/>
+  <property name="package-lists.dir" value="${txt.dir}/package-lists"/>
+  <property name="public.dir" value="public"/>
+  <property name="newsplugin.url" value="http://www.tvbrowser.org/data/uploads/1372016422809_543/NewsPlugin.jar"/>
+
+  <path id="sourcepath">
+    <pathelement location="${src.dir}"/>
+  </path>
+
+  <path id="classpath">
+    <pathelement location="${classes.dir}"/>
+    <fileset dir="${lib.dir}">
+      <include name="*.jar"/>
+      <exclude name="ant.jar"/>
+    </fileset>
+  </path>
+
+  <path id="docpath">
+    <path refid="sourcepath"/>
+  </path>
+
+  <path id="ant-deb.classpath">
+	 <fileset dir="${deployment.dir}/linux/ant-deb-task" includes="*.jar"/>
+  </path>
+	
+  <path id="ant-rpm.classpath">
+	 <fileset dir="${deployment.dir}/linux/redline-rpm" includes="*.jar"/>
+  </path>
+
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  |
+  |  Display all targets
+  |
+  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <target name="targets" description="lists all the available public targets">
+    <echo message="usage: build [target]"/>
+    <echo message=""/>
+    <echo message="main targets:"/>
+    <echo message="============="/>
+    <echo message="  targets               Shows this list of targets."/>
+    <echo message="  download-libs         Downloads all necessary libraries from the Internet."/>
+    <echo message="  dump-info             Dumps some information (VM-Version...)."/>
+    <echo message="  public-default        Creates platform-independent binaries"/>
+    <echo message="  public-mac            Creates binaries for the Mac OS X (requires Mac OS X)"/>
+  	<echo message="  public-macjava        Creates binaries for the Mac OS X with Java from Oracle (requires Mac OS X)"/>
+  	<echo message="  public-linux          Creates binaries for Linux platforms"/>
+  	<echo message="  public-ubuntu         Creates binaries for Ubuntu platforms"/>
+  	<echo message="  public-fedora         Creates binaries for Fedora platforms"/>
+  	<echo message="  public-transportable  Creates platform-independent binaries for transportable version of TV-Browser (requires Windows)"/>
+  	<echo message="  public-nightly        Creates platform-independent binaries for nightly transportable version of TV-Browser (without platform dependent starters)"/>
+    <echo message="  public-src            Creates a .zip file containing the full source code of TV-Browser"/>
+    <echo message="  public-doc            Generates the JavaDoc documentation."/>
+  	<echo message="  release-packages      Generates all packages needed for a TV-Browser release (without Mac version, works only under Windows)."/>
+    <echo message=""/>
+    <echo message="further targets:"/>
+    <echo message="================"/>
+    <echo message="  clean                 Deletes all class files, runtime directories and temporary files."/>
+    <echo message="  clean-runtime         Deletes the runtime directory."/>
+    <echo message="  make-default          Compiles the platform independent source code."/>
+   	<echo message="  make-transportable    Compiles the platform independent source code for transportable version."/>
+    <echo message="  make-linux            Compiles the source code for linux platforms."/>
+    <echo message="  make-win              Compiles the source code for windows platforms."/>
+    <echo message="  make-mac              Compiles the source code for Mac OS X."/>
+  	<echo message="  make-macjava          Compiles the source code for Mac OS X with Java from Oracle."/>
+    <echo message="  runtime-default       Creates the platform independent runtime directory" />
+  	<echo message="  runtime-transportable Creates the platform independent runtime directory for transportable version" />
+    <echo message="  runtime-linux         Creates a runtime directory for linux platforms" />
+    <echo message="  runtime-mac           Creates a runtime directory for Mac OS X" />
+  	<echo message="  runtime-macjava       Creates a runtime directory for Mac OS X with Java from Oracle" />
+    <echo message="  runtime-win           Creates a runtime directory for MS Windows" />
+    <echo message="  test                  Runs the JUnit tests."/>
+  </target>
+
+
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |
+   |  Clean tasks: remove files
+   |
+    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+
+  <!-- Deletes the runtime director -->
+  <target name="clean">
+    <delete dir="${classes.dir}"/>
+    <delete dir="${unpacked.dir}"/>
+    <delete dir="${test.classes.dir}"/>
+  </target>
+
+
+  <!-- Deletes the classes and the runtime directory. -->
+  <target name="clean-default" depends="clean">
+    <delete dir="${tvbrowser-default.runtime.dir}"/>
+  </target>
+
+  <!-- Deletes the classes and the runtime directory. -->
+  <target name="clean-transportable" depends="clean">
+	<delete dir="${tvbrowser-transportable.runtime.dir}"/>
+  </target>
+
+  <!-- Deletes the classes and the runtime directory. -->
+  <target name="clean-win" depends="clean">
+    <delete dir="${tvbrowser-win.runtime.dir}"/>
+  </target>
+
+  <!-- Deletes the classes and the runtime directory. -->
+  <target name="clean-linux" depends="clean">
+    <delete dir="${tvbrowser-linux.runtime.dir}"/>
+  </target>
+
+  <!-- Deletes the classes and the runtime directory. -->
+  <target name="clean-mac" depends="clean">
+    <delete dir="${tvbrowser-mac.runtime.dir}"/>
+  </target>
+
+	  <!-- Deletes the classes and the runtime directory. -->
+	  <target name="clean-macjava" depends="clean">
+	    <delete dir="${tvbrowser-macjava.runtime.dir}"/>
+	  </target>
+
+	  <target name="clean-all" depends="clean-mac, clean-macjava, clean-linux, clean-win, clean-default">
+	    <delete dir="${public.dir}"/>
+	  </target>
+
+
+
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+|
+|  Make tasks: compile the source code
+|
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+  <target name="copy-resources">
+    <copy todir="${classes.dir}">
+      <fileset dir="${src.dir}" includes="**/*.gif"/>
+      <fileset dir="${src.dir}" includes="**/*.jpg"/>
+      <fileset dir="${src.dir}" includes="**/*.png"/>
+      <fileset dir="${src.dir}" includes="**/*.dtd"/>
+      <fileset dir="${src.dir}" includes="**/*.properties"/>
+      <fileset dir="${src.dir}" includes="**/*.theme"/>
+      <fileset dir="${src.dir}" includes="**/*.csv"/>
+    </copy>
+  </target>
+
+  <!-- Compiles the platform independent source code -->
+  <target name="make-default" depends="copy-resources">
+    <echo message="Compiling the source code ... "/>
+    <mkdir dir="${classes.dir}"/>
+    <javac destdir="${classes.dir}" debug="${debug}" deprecation="true" encoding="UTF-8" target="1.6" source="1.6">
+      <src>
+        <path refid="sourcepath"/>
+      </src>
+      <classpath>
+        <path refid="classpath"/>
+      </classpath>
+    </javac>
+
+
+  </target>
+
+
+  <!-- Compiles the source code for windows platforms -->
+  <target name="make-win" depends="make-default">
+
+  </target>
+
+
+  <!-- Compiles the source code for linux platforms -->
+  <target name="make-linux" depends="make-default">
+
+  </target>
+
+  <!-- Compiles the source code for transportable version of TV-Browser -->
+  <target name="make-transportable" depends="make-default">
+
+  </target>
+
+  <!-- Compiles the source code for mac platforms -->
+  <target name="make-mac" depends="copy-resources">
+    <echo message="Compiling the source code ..."/>
+    <mkdir dir="${classes.dir}"/>
+    <javac destdir="${classes.dir}" debug="${debug}" deprecation="true" encoding="UTF-8" target="1.5" source="1.5">
+      <src>
+        <path refid="sourcepath"/>
+      </src>
+      <classpath>
+        <path refid="classpath"/>
+        <path location="/System/Library/Java"/>
+      </classpath>
+    </javac>
+
+  </target>
+	
+	  <!-- Compiles the source code for mac platforms with Java from Oracle -->
+	  <target name="make-macjava" depends="copy-resources">
+	    <echo message="Compiling the source code ..."/>
+	    <mkdir dir="${classes.dir}"/>
+	    <javac destdir="${classes.dir}" debug="${debug}" deprecation="true" encoding="UTF-8" target="1.6" source="1.6">
+	      <src>
+	        <path refid="sourcepath"/>
+	      </src>
+	      <classpath>
+	        <path refid="classpath"/>
+	        <path location="/Library/Java/JavaVirtualMachines"/>
+	      </classpath>
+	    </javac>
+
+	  </target>
+	
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+   |
+   |  Runtime tasks: create runtime folders for the specified platform
+   |
+    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <target name="mkdirs">
+    <!-- Make the TV-Browser runtime -->
+    <delete dir="${tvbrowser-default.runtime.dir}"/>
+    <mkdir dir="${tvbrowser-default.runtime.dir}"/>
+		<mkdir dir="${tvbrowser-default.runtime.dir}/plugins"/>  	
+  </target>
+	
+  <!-- Creates the platform independent runtime folder -->
+  <target name="runtime" depends="clean-default, make-default, mkdirs">
+    <echo message="Creating the jars ..."/>
+
+    <!-- Pack the tvbrowser.jar -->
+    <jar jarfile="${tvbrowser-default.runtime.dir}/tvbrowser.jar"
+         compress="true"
+         index="true">
+      <manifest>
+        <attribute name="Main-Class" value="tvbrowser.TVBrowser"/>
+      	<attribute name="SplashScreen-Image" value="splash.png"/>
+      </manifest>
+      <fileset dir="${classes.dir}" includes="tvbrowser/**"/>
+      <fileset dir="${classes.dir}" includes="devplugin/**"/>
+      <fileset dir="${classes.dir}" includes="tvdataservice/**"/>
+      <fileset dir="${classes.dir}" includes="util/**"/>
+      <fileset dir="${classes.dir}" includes="com/**"/>
+      <fileset dir="${classes.dir}/imgs" includes="splash.png"/>
+    </jar>
+
+    <!-- Copy the other stuff -->
+    <echo message="Copying the images and all the other stuff ..."/>
+    <mkdir dir="${tvbrowser-default.runtime.dir}/imgs"/>
+    <copy todir="${tvbrowser-default.runtime.dir}/imgs">
+      <fileset dir="${classes.dir}/imgs" excludes="splash.png"/>
+    </copy>
+
+    <copy todir="${tvbrowser-default.runtime.dir}/imgs">
+	    <fileset dir="./images/additional">
+		    <include name="*.ico"/>
+	    </fileset>
+    </copy>
+  	
+  	<mkdir dir="${tvbrowser-default.runtime.dir}/personas"/>
+    <copy todir="${tvbrowser-default.runtime.dir}/personas">
+	    <fileset dir="./personas"/>
+	</copy>
+    <copy todir="${tvbrowser-default.runtime.dir}">
+      <fileset dir="${txt.dir}" includes="LICENSE.txt"/>
+      <fileset dir="${txt.dir}" includes="COPYRIGHT.txt"/>
+      <fileset dir="${deployment.dir}/common" includes="**" />
+      <!--    <fileset dir="${txt.dir}" includes="website.url"/>          -->
+      <!--    <fileset dir="${txt.dir}" includes="default.properties"/>   -->
+      <!--    <fileset dir="${txt.dir}" includes="osx.properties"/>       -->
+      <!--    <fileset dir="${txt.dir}" includes="windows.properties"/>   -->
+      <!--    <fileset dir="${txt.dir}" includes="tvbrowser.sh"/>         -->
+    </copy>
+
+    <!-- Themepacks -->
+    <mkdir dir="${tvbrowser-default.runtime.dir}/themepacks"/>
+    <copy todir="${tvbrowser-default.runtime.dir}/themepacks">
+      <fileset dir="themepacks"/>
+    </copy>
+
+    <!-- Icon-Themes -->
+    <mkdir dir="${tvbrowser-default.runtime.dir}/icons"/>
+    
+     <!-- Info-Icon-Themes -->
+    <mkdir dir="${tvbrowser-default.runtime.dir}/infothemes"/>
+    
+    <zip destfile="${tvbrowser-default.runtime.dir}/infothemes/tvb_default.zip">
+  		<zipfileset dir="images/infothemes/tvb_default"></zipfileset>
+  	</zip>
+    <zip destfile="${tvbrowser-default.runtime.dir}/infothemes/tvb_colored.zip">
+  		<zipfileset dir="images/infothemes/tvb_colored"></zipfileset>
+  	</zip>
+  	
+  	<zip destfile="${tvbrowser-default.runtime.dir}/icons/Tango.zip">
+  		<zipfileset dir="images/themes/tango"></zipfileset>
+  	</zip>
+  	<zip destfile="${tvbrowser-default.runtime.dir}/icons/CrystalClear.zip">
+  		<zipfileset dir="images/themes/CrystalClear"></zipfileset>
+  	</zip>
+  </target>
+
+  <!-- Creates the default runtime folder (platform independent) -->
+  <target name="runtime-default" depends="clean-default, make-default, runtime">
+  </target>
+
+
+  <!-- Creates the runtime folder for the transportable version -->
+  <target name="runtime-transportable" depends="clean-transportable, make-transportable, runtime">
+	<echo message="deployment dir is ${deployment.dir}, win is ${win.dir}" />
+	<mkdir dir="${tvbrowser-transportable.runtime.dir}"/>
+  	<mkdir dir="${tvbrowser-transportable.runtime.dir}/settings"/>
+    <copy todir="${tvbrowser-transportable.runtime.dir}/settings">
+      <fileset dir="${deployment.dir}" includes="packer.txt"/>
+    </copy>
+	<copy todir="${tvbrowser-transportable.runtime.dir}">
+  	  <fileset dir="${tvbrowser-default.runtime.dir}"/>
+      <fileset dir="${win.dir}/jRegistryKey" includes="jRegistryKey.dll" />
+	</copy>
+  </target>
+
+  <!-- Creates the runtime folder for the windows platform -->
+  <target name="runtime-win" depends="clean-win, make-win, runtime">
+    <echo message="deployment dir is ${deployment.dir}, win is ${win.dir}" />
+    <mkdir dir="${tvbrowser-win.runtime.dir}"/>
+    <copy todir="${tvbrowser-win.runtime.dir}">
+      <fileset dir="${tvbrowser-default.runtime.dir}"/>
+      <fileset dir="${win.dir}/jRegistryKey" includes="jRegistryKey.dll" />
+      <fileset dir="${deployment.dir}" includes="windows.properties"/>
+      <fileset dir="${win.dir}" includes="tvbrowser_noDD.txt"/>
+    </copy>
+
+  </target>
+
+
+  <!-- Creates the runtime folder for the Mac platform -->
+  <target name="runtime-mac" depends="clean-mac, make-mac, runtime">
+
+    <delete dir="${tvbrowser-mac.runtime.dir}"/>
+    <mkdir dir="${tvbrowser-mac.runtime.dir}"/>
+
+    <jarbundler dir="${tvbrowser-mac.runtime.dir}"
+                verbose="false"
+                name="TV-Browser"
+		        icon="./images/additional/tvbrowser.icns"
+                mainclass="tvbrowser.TVBrowser"
+                extraclasspath="/System/Library/Java"
+                jvmversion="1.6+"
+                vmoptions="-Dpropertiesfile=osx.properties -Xmx256m"
+                bundleid="org.tvbrowser"
+                smalltabs="true"
+                antialiasedgraphics="true"
+                antialiasedtext="true"
+                liveresize="true"
+                growboxintrudes="false"
+                screenmenu="true"
+                developmentregion="Global"
+                version="${tvbrowser.version}"
+                workingdirectory="$APP_PACKAGE/Contents/Resources"
+                jars="${tvbrowser-default.runtime.dir}/tvbrowser.jar">
+        <resourcefileset dir="${tvbrowser-default.runtime.dir}">
+             <exclude name="tvbrowser.jar"/>
+        </resourcefileset>
+    </jarbundler>
+
+    <copy todir="${tvbrowser-mac.runtime.dir}/TV-Browser.app/Contents/Resources">
+      <fileset dir="${deployment.dir}" includes="osx.properties"/>
+    </copy>
+
+  </target>
+
+	<!-- Creates the runtime folder for the Mac platform with Java from Oracle->
+	  <target name="runtime-macjava" depends="clean-macjava, make-macjava, runtime, test"-->
+	  <target name="runtime-macjava" depends="clean-macjava, make-macjava, runtime">
+
+	  <!-- Creates an .app file for Mac OS X with appbundler for Java SE 7+ from infinitekind -->
+		<taskdef name="appbundler"
+		    classpath="deployment/macosx7/appbundler-1.0ea.jar"
+		    classname="com.oracle.appbundler.AppBundlerTask" />
+
+	    <!--runtime dir="${env.JAVA_HOME}"/-->
+
+		<delete dir="${tvbrowser-macjava.runtime.dir}"/>
+		<mkdir dir="${tvbrowser-macjava.runtime.dir}"/>
+
+		<appbundler 
+		    outputdirectory="${tvbrowser-macjava.runtime.dir}" 
+		    name="TV-Browser" 
+		    icon="images/additional/tvbrowser.icns"
+		    displayname="TV-Browser" 
+		    identifier="tvbrowser.TVBrowser" 
+		    shortversion="${tvbrowser.version}"
+		    applicationCategory="public.app-category.entertainment"
+		    workingDirectory="$APP_ROOT/Contents/Resources"
+		    mainclassname="tvbrowser.TVBrowser"
+		    highResolutionCapable="false">
+		<classpath dir="${tvbrowser-default.runtime.dir}">
+		    <include name="*.jar"/>
+		</classpath>
+		<!-- OSX specific options, optional -->
+		<option value="-Dpropertiesfile=osx.properties"/>
+		<option value="-Dapple.laf.useScreenMenuBar=true"/>
+		<option value="-Dcom.apple.macos.use-file-dialog-packages=true"/>
+		<!--option value="-Dcom.apple.macos.useScreenMenuBar=true"/-->
+		<option value="-Dcom.apple.mrj.application.apple.menu.about.name=${bundle.name}"/>
+		<option value="-Dcom.apple.smallTabs=true"/>
+		<option value="-Xmx1024M"/>
+		</appbundler>
+
+	    <copy todir="${tvbrowser-macjava.runtime.dir}/TV-Browser.app/Contents/Resources">
+	        <fileset dir="${tvbrowser-default.runtime.dir}" excludes="tvbrowser.jar"/>
+	    </copy>
+	    <copy todir="${tvbrowser-macjava.runtime.dir}/TV-Browser.app/Contents/Resources">
+	      <fileset dir="${deployment.dir}" includes="osx.properties"/>
+	    </copy>
+
+	  </target>
+	
+	
+  <!-- Creates the desktop entry file for Linux platforms -->
+  <target name="tvbrowser-desktop-entry">
+  	<desktopEntry
+        toFile="${tvbrowser-linux.runtime.dir}/tvbrowser.desktop"
+        name="TV-Browser"
+        icon="imgs/tvbrowser128.png"
+        exec="tvbrowser.sh"
+  		tryExec="tvbrowser.sh"
+        categories="Video;AudioVideo;TV"
+    	  type="Application"
+    >
+    	<name lang="de" value="${programname}"/>
+    	<genericName value="Digital TV Guide"/>
+    	<genericName lang="de" value="Digitale TV-Zeitschrift"/>
+    	<comment value="Themeable and easy to use TV Guide - written in Java"/>
+    	<comment lang="de" value="Anpassbare und einfach zu benutzende TV-Zeitschrift - geschrieben in Java"/>
+   	</desktopEntry>
+  	<echo file="${tvbrowser-linux.runtime.dir}/tvbrowser.desktop" append="true">StartupWMClass=tvbrowser-TVBrowser</echo>
+  </target>
+
+  <!-- Creates the desktop entry file for Ubuntu platform -->
+  <target name="tvbrowser-desktop-entry-deb">
+  	<desktopEntry
+        toFile="${tvbrowser-linux.runtime.dir}/tvbrowser.desktop"
+        name="${programname}"
+        icon="/usr/share/tvbrowser/imgs/tvbrowser128.png"
+        exec="tvbrowser"
+        categories="Video;AudioVideo;TV"
+    	  type="Application"
+  			comment="Easy to use TV Guide - written in Java"
+    >
+    	<name lang="de" value="${programname}"/>
+    	<genericName value="Digital TV Guide"/>
+    	<genericName lang="de" value="Digitale TV-Zeitschrift"/>
+    	<comment value="Themeable and easy to use TV Guide - written in Java"/>
+    	<comment lang="de" value="Anpassbare und einfach zu benutzende TV-Zeitschrift - geschrieben in Java"/>
+   	</desktopEntry>
+  	<echo file="${tvbrowser-linux.runtime.dir}/tvbrowser.desktop" append="true">StartupWMClass=tvbrowser-TVBrowser</echo>
+  </target>
+
+  <!-- Creates the runtime folder for linux platforms -->
+  <target name="runtime-linux" depends="clean-linux, make-linux, runtime">
+    <delete dir="${tvbrowser-linux.runtime.dir}"/>
+    <mkdir dir="${tvbrowser-linux.runtime.dir}"/>
+    <copy todir="${tvbrowser-linux.runtime.dir}">
+      <fileset dir="${tvbrowser-default.runtime.dir}"/>
+      <fileset dir="${deployment.dir}" includes="linux.properties"/>
+      <fileset dir="${linux.dir}" includes="tvbrowser.sh"/>
+     <!-- <fileset dir="${linux.dir}" includes="tvbrowser.desktop"/>-->
+    </copy>
+   	<chmod perm="u+x" file="${tvbrowser-linux.runtime.dir}/tvbrowser.sh"/>
+  </target>
+
+  <target name="release-packages" depends="public-linux, public-ubuntu, public-fedora, public-default, public-doc, public-src"/>
+
+  <!-- Creates the release binaries (.zip) for the platform independent TV-Browser version -->
+  <target name="public-default" depends="runtime-default" description="creates platform-independent binaries">
+    <mkdir dir="${public.dir}"/>
+
+    <zip destfile="${public.dir}/tvbrowser_${tvbrowser.version}_bin.zip">
+      <zipfileset prefix="tvbrowser-${tvbrowser.version}"
+                  dir="${tvbrowser-default.runtime.dir}"/>
+    </zip>
+  </target>
+
+  <target name="clean-public">
+  	<delete>
+  		<fileset dir="${public.dir}" includes="**/*"/>
+  	</delete>
+  </target>
+	
+  <target name="public-nightly" depends="clean-public,runtime-transportable" description="Creates platform-independent binaries for nightly transportable version of TV-Browser (without platform dependent starters)">
+  	<mkdir dir="${public.dir}"/>
+
+    <tstamp>
+      <format property="TODAY" pattern="yyyy-MM-dd"/>
+    </tstamp>
+
+  	<echo file="${tvbrowser-transportable.runtime.dir}/NIGHTLY_VALUES" append="false">${TODAY}-nightly</echo>
+
+	<zip destfile="${public.dir}/tvbrowser_${tvbrowser.version}_${TODAY}_nightly_bin_transportable.zip">
+		<zipfileset prefix="tvbrowser-nightly-transportable" dir="${tvbrowser-transportable.runtime.dir}"/>
+	</zip>
+
+  </target>
+
+  <target name="public-ubuntu" depends="runtime-linux, tvbrowser-desktop-entry-deb" description="Creates binaries for Ubuntu platforms">
+  	<mkdir dir="${public.dir}"/>
+
+  	<deb
+        todir="${public.dir}"
+        package="tvbrowser"
+        section="utils"
+        depends="sun-java6-jre | openjdk-6-jre | sun-java7-jre | openjdk-7-jre | openjdk-8-jre | default-jre | java6-runtime | java7-runtime | java8-runtime "
+  	    recommends="openjdk-6-jre">
+
+        <version upstream="${tvbrowser.version}"/>
+        <maintainer name="TV-Browser team" email="dev@tvbrowser.org"/>
+
+  		<!-- do not indent the description, otherwise the indent will be visible in the package manager and other tools -->
+        <description synopsis="Digital TV Guide">Themeable and easy to use TV Guide - written in Java.</description>
+
+  	    <tarfileset dir="${tvbrowser-linux.runtime.dir}" prefix="usr/share/tvbrowser">
+  	    	<include name="imgs/**"/>
+  	    	<include name="plugins/**"/>
+  	    	<include name="themepacks/**"/>
+  	    	<include name="infothemes/**"/>
+  	    	<exclude name="tvbrowser.sh"/>
+  	    	<exclude name="tvbrowser.desktop"/>
+  	    	<include name="*"/>
+  	    </tarfileset>
+  		
+  		<tarfileset dir="${tvbrowser-linux.runtime.dir}/personas" prefix="usr/share/tvbrowser/personas" />
+  		
+  		<tarfileset dir="${tvbrowser-linux.runtime.dir}/icons" prefix="usr/share/tvbrowser/icons">
+  			<include name="*"/>
+  		</tarfileset>
+  		<tarfileset dir="${tvbrowser-linux.runtime.dir}" prefix="usr/share/tvbrowser" filemode="755" includes="**/tvbrowser.sh" />
+  		<tarfileset dir="${tvbrowser-linux.runtime.dir}" prefix="usr/share/applications" includes="**/tvbrowser.desktop"/>
+  	   	<tarfileset dir="${deployment.dir}/linux"
+  	                 prefix="usr/bin"
+  	   	   filemode="755" includes="**/tvbrowser" />
+  	</deb>
+  </target>
+
+  <target name="public-fedora" depends="runtime-linux, tvbrowser-desktop-entry-deb" description="Creates binaries for RedHat platforms">
+  	<mkdir dir="${public.dir}"/>
+
+  	<rrpm
+  		destination="${public.dir}"
+        name="tvbrowser"
+  		version="${tvbrowser.version}"
+  		group="Java">
+
+  	    <zipfileset  dir="${tvbrowser-linux.runtime.dir}" prefix="/usr/share/tvbrowser">
+  	    	<include name="imgs/**"/>
+  	    	<include name="plugins/**"/>
+  	    	<include name="themepacks/**"/>
+  	    	<include name="infothemes/**"/>
+  	    	<exclude name="tvbrowser.sh"/>
+  	    	<exclude name="tvbrowser.desktop"/>
+  	    	<include name="*"/>
+  	    </zipfileset>
+  		
+  		<zipfileset dir="${tvbrowser-linux.runtime.dir}/personas" prefix="/usr/share/tvbrowser/personas" />
+  		
+  		<zipfileset dir="${tvbrowser-linux.runtime.dir}/icons" prefix="/usr/share/tvbrowser/icons">
+  			<include name="*"/>
+  		</zipfileset>
+  		<zipfileset dir="${tvbrowser-linux.runtime.dir}" prefix="/usr/share/tvbrowser" filemode="755" includes="**/tvbrowser.sh" />
+  		<zipfileset dir="${tvbrowser-linux.runtime.dir}" prefix="/usr/share/applications" includes="**/tvbrowser.desktop"/>
+  	   	<zipfileset dir="${deployment.dir}/linux"
+  	                 prefix="/usr/bin"
+  	   	   filemode="755" includes="**/tvbrowser" />
+  		<depends name="java" version="1.6"/>
+  	</rrpm>
+  </target>
+
+  <!-- Creates the release binaries (.tar.gz) for linux platforms -->
+  <target name="public-linux" depends="runtime-linux, tvbrowser-desktop-entry" description="Creates binaries for Linux platforms">
+    <mkdir dir="${public.dir}"/>
+
+    <tar tarfile="${public.dir}/tvbrowser_${tvbrowser.version}_bin.tar.gz" compression="gzip">
+      <tarfileset dir="${tvbrowser-linux.runtime.dir}" prefix="tvbrowser-${tvbrowser.version}" excludes="**/tvbrowser.sh"/>
+   	  <tarfileset dir="${tvbrowser-linux.runtime.dir}"
+    	              prefix="tvbrowser-${tvbrowser.version}"
+				 mode="755" includes="**/tvbrowser.sh" />
+    </tar>
+
+  </target>
+
+  <!--
+    | Does the JUnit s.
+    |
+    | If this target does not work, copy the file "junit.jar" from the directory "lib"
+    | in your ANT_HOME/lib directory. (ANT_HOME/lib is on my machine "/usr/share/ant/lib")
+    +-->
+  <target name="test" depends="make-default">
+	<echo>${ant.version}. JUnit4 tests will only work with Ant>=1.7</echo>
+  	<mkdir dir="${test.classes.dir}"/>
+    <javac destdir="${test.classes.dir}" debug="${debug}" deprecation="true" encoding="UTF-8" target="1.5" source="1.5">
+      <src>
+        <path path="${test.src.dir}"/>
+      </src>
+      <classpath>
+        <path refid="classpath"/>
+      </classpath>
+    </javac>
+
+    <copy todir="${test.classes.dir}">
+      <fileset dir="${test.src.dir}" includes="**/*.gif"/>
+      <fileset dir="${test.src.dir}" includes="**/*.jpg"/>
+      <fileset dir="${test.src.dir}" includes="**/*.png"/>
+      <fileset dir="${test.src.dir}" includes="**/*.dtd"/>
+      <fileset dir="${test.src.dir}" includes="**/*.properties"/>
+      <fileset dir="${test.src.dir}" includes="**/*.theme"/>
+      <fileset dir="${test.src.dir}" includes="**/*.txt"/>
+    </copy>
+
+
+    <junit haltonfailure="yes" fork="no" >
+      <classpath>
+        <path refid="classpath"/>
+        <path path="${test.classes.dir}"/>
+      </classpath>
+
+      <formatter type="brief" usefile="false"/>
+
+      <batchtest>
+        <fileset dir="${test.src.dir}">
+          <include name="**/*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+
+  <!--
+  | Generates the JavaDoc documentation.
+  +-->
+  <target name="public-doc" description="Generates the JavaDoc documentation">
+    <echo message="Generating JavaDoc documentation ..." />
+    <delete dir="${doc.dir}"/>
+    <mkdir dir="${doc.dir}"/>
+    <javadoc packagenames="*"
+             sourcepathref="docpath"
+             classpathref="classpath"
+             destdir="${doc.dir}"
+             doctitle="${doc.title}"
+             windowtitle="${doc.title}"
+             additionalparam="-breakiterator"
+             header="${doc.header}"
+             bottom="${doc.bottom}"
+             access="package"
+             failonerror="false"
+    		     encoding="UTF-8"
+    	       charset="UTF-8" 
+  	         docencoding="UTF-8">
+      <link offline="true"
+            href="${java-api-location}"
+            packagelistLoc="${package-lists.dir}/jdk/"/>
+    </javadoc>
+
+
+    <zip destfile="${public.dir}/tvbrowser_${tvbrowser.version}_doc.zip">
+      <zipfileset prefix="tvbrowser_v${tvbrowser.version}/doc"
+                  dir="${doc.dir}"/>
+    </zip>
+
+  </target>
+
+  <!--
+   | Dump some information.
+   +-->
+  <target name="dump-info">
+    <echo message="JAVA_HOME=${env.JAVA_HOME}" />
+    <echo message="java.vm.info=${java.vm.info}" />
+    <echo message="java.vm.name=${java.vm.name}" />
+    <echo message="java.vm.vendor=${java.vm.vendor}" />
+    <echo message="java.vm.version=${java.vm.version}" />
+    <echo message="os.arch=${os.arch}" />
+    <echo message="os.name=${os.name}" />
+    <echo message="os.version=${os.version}" />
+    <echo message="file.encoding=${file.encoding}" />
+    <echo message="user.language=${user.language}" />
+  </target>
+
+
+
+
+  <target name="public-src" description="Creates a .zip file containing the full source code of TV-Browser">
+    <mkdir dir="${public.dir}"/>
+    <zip destfile="${public.dir}/tvbrowser_${tvbrowser.version}_src.zip">
+      <zipfileset prefix="tvbrowser-${tvbrowser.version}"
+                  dir=".">
+
+        <exclude name="${classes.dir}/**" />
+        <exclude name="${public.dir}/**" />
+        <exclude name="${runtime.dir}/**" />
+        <exclude name="${unpacked.dir}/**" />
+
+      </zipfileset>
+    </zip>
+  </target>
+
+
+	<!-- - - - - - - - - - - - - - - - - -
+          internal target: download-zipped-lib
+         - - - - - - - - - - - - - - - - - -->
+  <target name="download-zipped-lib">
+
+  	<macrodef name="propertycopy">
+  	  <attribute name="name"/>
+  	  <attribute name="from"/>
+  	  <sequential>
+  	    <property name="@{name}" value="${@{from}}"/>
+  	  </sequential>
+  	</macrodef>
+
+		<propertycopy name="lib.url" from="lib.${lib}.url"/>
+		<propertycopy name="lib.name" from="lib.${lib}.name"/>
+		<propertycopy name="lib.version" from="lib.${lib}.version"/>
+
+  	<get dest="${lib.dir}/download.zip" src="${lib.url}"/>
+  	<unzip src="${lib.dir}/download.zip" dest="${lib.dir}/download">
+		  <patternset>
+		    <include name="**/${lib.name}*.jar"/>
+		  </patternset>
+  		<flattenmapper/>
+		</unzip>
+    <copy todir="${lib.dir}" verbose="true" overwrite="true">
+      <fileset dir="${lib.dir}/download">
+        <include name="${lib.name}.jar"/>
+        <include name="${lib.name}-?.?.jar"/>
+        <include name="${lib.name}-?.?.?.jar"/>
+        <include name="${lib.name}-?.?.??.jar"/>
+        <include name="${lib.name}-r*.jar"/>
+      </fileset>
+    	<mapper>
+    		<mergemapper to="${lib.name}-${lib.version}.jar"/>
+    	</mapper>
+    </copy>
+  	<delete dir="${lib.dir}/download"/>
+  </target>
+
+<!-- - - - - - - - - - - - - - - - - -
+        internal target: download-tarred-lib
+       - - - - - - - - - - - - - - - - - -->
+  <target name="download-tarred-lib">
+  	<macrodef name="propertycopy">
+  	  <attribute name="name"/>
+  	  <attribute name="from"/>
+  	  <sequential>
+  	    <property name="@{name}" value="${@{from}}"/>
+  	  </sequential>
+  	</macrodef>
+
+		<propertycopy name="lib.url" from="lib.${lib}.url"/>
+		<propertycopy name="lib.name" from="lib.${lib}.name"/>
+		<propertycopy name="lib.version" from="lib.${lib}.version"/>
+
+  	<get dest="${lib.dir}/download.tar.gz" src="${lib.url}"/>
+		<gunzip src="${lib.dir}/download.tar.gz"/>
+		<untar src="${lib.dir}/download.tar" dest="${lib.dir}/download">
+		  <patternset>
+		    <include name="**/${lib.name}*.jar"/>
+		  </patternset>
+  		<flattenmapper/>
+		</untar>
+    <copy todir="${lib.dir}" verbose="true" overwrite="true">
+      <fileset dir="${lib.dir}/download">
+        <include name="${lib.name}.jar"/>
+        <include name="${lib.name}-?.?.jar"/>
+        <include name="${lib.name}-?.?.?.jar"/>
+        <include name="${lib.name}-?.?.??.jar"/>
+      </fileset>
+    	<mapper>
+    		<mergemapper to="${lib.name}-${lib.version}.jar"/>
+    	</mapper>
+    </copy>
+  	<delete dir="${lib.dir}/download"/>
+  </target>
+
+<!-- - - - - - - - - - - - - - - - - -
+          internal target: download-lib
+         - - - - - - - - - - - - - - - - - -->
+  <target name="download-lib">
+  	<macrodef name="propertycopy">
+  	  <attribute name="name"/>
+  	  <attribute name="from"/>
+  	  <sequential>
+  	    <property name="@{name}" value="${@{from}}"/>
+  	  </sequential>
+  	</macrodef>
+
+		<propertycopy name="lib.url" from="lib.${lib}.url"/>
+		<propertycopy name="lib.name" from="lib.${lib}.name"/>
+		<propertycopy name="lib.version" from="lib.${lib}.version"/>
+
+		<get dest="${lib.dir}/${lib.name}-${lib.version}.jar" src="${lib.url}"/>
+  </target>
+
+	<target name="download-libs" description="downloads all necessary library files">
+		<mkdir dir="${lib.dir}"/>
+
+		<!-- bsh -->
+		<antcall target="download-lib">
+			<param name="lib" value="bsh"/>
+		</antcall>
+
+		<!-- commons codec -->
+		<antcall target="download-zipped-lib">
+			<param name="lib" value="commons.codec"/>
+		</antcall>
+
+		<!-- commons lang -->
+		<antcall target="download-zipped-lib">
+			<param name="lib" value="commons.lang"/>
+		</antcall>
+
+		<!-- commons net -->
+		<antcall target="download-zipped-lib">
+			<param name="lib" value="commons.net"/>
+		</antcall>
+
+		<!-- htmlparser -->
+		<antcall target="download-zipped-lib">
+			<param name="lib" value="htmlparser"/>
+		</antcall>
+
+		<!-- jgoodies common -->
+		<antcall target="download-zipped-lib">
+			<param name="lib" value="jgoodies-common"/>
+		</antcall>
+
+		<!-- jgoodies forms -->
+		<antcall target="download-zipped-lib">
+			<param name="lib" value="jgoodies-forms"/>
+		</antcall>
+
+		<!-- jgoodies looks -->
+		<antcall target="download-zipped-lib">
+			<param name="lib" value="jgoodies-looks"/>
+		</antcall>
+
+		<!-- jRegistryKey -->
+		<antcall target="download-zipped-lib">
+			<param name="lib" value="jregistrykey"/>
+		</antcall>
+
+		<!-- l2prod common tasks -->
+		<antcall target="download-zipped-lib">
+			<param name="lib" value="tasks"/>
+		</antcall>
+
+		<!-- opencsv -->
+		<antcall target="download-tarred-lib">
+			<param name="lib" value="opencsv"/>
+		</antcall>
+
+		<!-- skinlf -->
+		<antcall target="download-zipped-lib">
+			<param name="lib" value="skinlf"/>
+		</antcall>
+
+		<!-- stax -->
+		<antcall target="download-lib">
+			<param name="lib" value="stax"/>
+		</antcall>
+		<antcall target="download-lib">
+			<param name="lib" value="stax.api"/>
+		</antcall>
+
+		<!-- substance -->
+		<antcall target="download-lib">
+			<param name="lib" value="substance"/>
+		</antcall>
+
+		<!-- texhyphj -->
+		<antcall target="download-zipped-lib">
+			<param name="lib" value="texhyphj"/>
+		</antcall>
+
+		<!-- trident -->
+		<antcall target="download-lib">
+			<param name="lib" value="trident"/>
+		</antcall>
+
+		<delete dir="${lib.dir}">
+		  <patternset>
+		    <include name="*.zip"/>
+		    <include name="*.tar.gz"/>
+		    <include name="*.tar"/>
+		  </patternset>
+		</delete>
+	</target>
+	<target name="public-tvdatakit"></target>
+
+</project>
diff --git a/media-tv/tvbrowser/metadata.xml b/media-tv/tvbrowser/metadata.xml
new file mode 100644
index 000000000000..303da98bf4b4
--- /dev/null
+++ b/media-tv/tvbrowser/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <use>
+    <flag name="themes">Install extra theme packs</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">tvbrowser</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-tv/tvbrowser/tvbrowser-3.4.1.0-r1.ebuild b/media-tv/tvbrowser/tvbrowser-3.4.1.0-r1.ebuild
new file mode 100644
index 000000000000..4f7bacedb245
--- /dev/null
+++ b/media-tv/tvbrowser/tvbrowser-3.4.1.0-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Themeable and easy to use TV Guide - written in Java"
+HOMEPAGE="http://www.tvbrowser.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.zip"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+IUSE=""
+
+COMMON_DEP="dev-java/bsh:0
+	dev-java/commons-codec:0
+	dev-java/commons-lang:3.1
+	dev-java/commons-net:0
+	dev-java/jakarta-oro:2.0
+	dev-java/jgoodies-common:1.8
+	dev-java/jgoodies-forms:1.8
+	dev-java/jgoodies-looks:2.6
+	dev-java/l2fprod-common:0
+	dev-java/htmlparser-org:0
+	dev-java/log4j:0
+	dev-java/skinlf:0
+	dev-java/xalan:0
+	dev-java/opencsv:0
+	dev-java/texhyphj:0
+	dev-java/trident:0
+	x11-libs/libXt
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libXtst
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp"
+
+DEPEND="${COMMON_DEP}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.6"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PV}-*.patch
+
+	rm -v lib/{bsh-,commons,jgoodies,l2fprod-common-tasks,skinlf,stax,htmlparser,opencsv,trident,texhyphj,jRegistryKey}*.jar
+
+	find deployment -name '*.jar' -delete || die
+	find . -name '*.class' -delete || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="bsh
+	commons-codec
+	commons-lang-3.1
+	jgoodies-common-1.8
+	jgoodies-forms-1.8
+	jgoodies-looks-2.6
+	l2fprod-common
+	skinlf
+	htmlparser-org
+	opencsv
+	texhyphj"
+EANT_BUILD_TARGET="runtime-linux"
+EANT_DOC_TARGET="public-doc"
+
+src_install() {
+	java-pkg_dojar runtime/${PN}_linux/${PN}.jar
+	java-pkg_dojar lib/substance-6.1.jar
+	java-pkg_register-dependency trident,opencsv
+
+	insinto /usr/share/${PN}
+	doins -r runtime/${PN}_linux/{imgs,icons,plugins,infothemes}
+	doins runtime/${PN}_linux/linux.properties
+
+	insinto /usr/share/${PN}/themepacks
+	doins themepacks/themepack.zip
+
+	java-pkg_dolauncher "tvbrowser" \
+		--main tvbrowser.TVBrowser \
+		--pwd /usr/share/${PN} \
+		--java_args " -Dpropertiesfile=/usr/share/${PN}/linux.properties"
+
+	make_desktop_entry ${PN} "TV-Browser" \
+		/usr/share/tvbrowser/imgs/tvbrowser128.png "AudioVideo;TV;Video"
+
+	use source && java-pkg_dosrc src/*
+	use doc && java-pkg_dojavadoc doc
+}
diff --git a/media-tv/tvbrowser/tvbrowser-3.4.3.ebuild b/media-tv/tvbrowser/tvbrowser-3.4.3.ebuild
new file mode 100644
index 000000000000..05e1a6d71e13
--- /dev/null
+++ b/media-tv/tvbrowser/tvbrowser-3.4.3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Themeable and easy to use TV Guide - written in Java"
+HOMEPAGE="http://www.tvbrowser.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.zip"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+IUSE=""
+
+CDEPEND="
+	dev-java/bsh:0
+	dev-java/commons-codec:0
+	dev-java/commons-lang:3.1
+	dev-java/commons-net:0
+	dev-java/jakarta-oro:2.0
+	dev-java/jgoodies-common:1.8
+	dev-java/jgoodies-forms:1.8
+	dev-java/jgoodies-looks:2.6
+	dev-java/l2fprod-common:0
+	dev-java/htmlparser-org:0
+	dev-java/log4j:0
+	dev-java/skinlf:0
+	dev-java/xalan:0
+	dev-java/opencsv:0
+	dev-java/texhyphj:0
+	dev-java/trident:0
+	x11-libs/libXt
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libXtst
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PV}-*.patch
+
+	find deployment -name '*.jar' -delete || die
+	find . -name '*.class' -delete || die
+
+	rm -v lib/{bsh-,commons,jgoodies,l2fprod-common-tasks,skinlf,stax,htmlparser,opencsv,trident,texhyphj,jRegistryKey}*.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="
+	bsh
+	commons-codec
+	commons-lang-3.1
+	jgoodies-common-1.8
+	jgoodies-forms-1.8
+	jgoodies-looks-2.6
+	l2fprod-common
+	skinlf
+	htmlparser-org
+	opencsv
+	texhyphj"
+EANT_BUILD_TARGET="runtime-linux"
+EANT_DOC_TARGET="public-doc"
+
+src_install() {
+	java-pkg_dojar runtime/${PN}_linux/${PN}.jar
+	java-pkg_dojar lib/substance-6.1.jar
+	java-pkg_register-dependency trident,opencsv
+
+	insinto /usr/share/${PN}
+	doins -r runtime/${PN}_linux/{imgs,icons,plugins,infothemes}
+	doins runtime/${PN}_linux/linux.properties
+
+	insinto /usr/share/${PN}/themepacks
+	doins themepacks/themepack.zip
+
+	java-pkg_dolauncher "tvbrowser" \
+		--main tvbrowser.TVBrowser \
+		--pwd /usr/share/${PN} \
+		--java_args " -Dpropertiesfile=/usr/share/${PN}/linux.properties"
+
+	make_desktop_entry ${PN} "TV-Browser" \
+		/usr/share/tvbrowser/imgs/tvbrowser128.png "AudioVideo;TV;Video"
+
+	use source && java-pkg_dosrc src/*
+	use doc && java-pkg_dojavadoc doc
+}
diff --git a/media-tv/tvbrowser/tvbrowser-9999-r1.ebuild b/media-tv/tvbrowser/tvbrowser-9999-r1.ebuild
new file mode 100644
index 000000000000..955d0b93ac15
--- /dev/null
+++ b/media-tv/tvbrowser/tvbrowser-9999-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 flag-o-matic virtualx subversion
+
+tp_base="http://javootoo.l2fprod.com/plaf/skinlf/themepacks"
+tvp_base="http://tvbrowser.org/downloads"
+
+DESCRIPTION="Themeable and easy to use TV Guide - written in Java"
+HOMEPAGE="http://www.tvbrowser.org/"
+ESVN_REPO_URI="https://svn.code.sf.net/p/tvbrowser/code/trunk/tvbrowser"
+SRC_URI="
+themes? (
+	${tp_base}/BeOSthemepack.zip
+	${tp_base}/amarachthemepack.zip
+	${tp_base}/aquathemepack.zip
+	${tp_base}/architectBluethemepack.zip
+	${tp_base}/architectOlivethemepack.zip
+	${tp_base}/b0sumiErgothempack.zip
+	${tp_base}/b0sumithemepack.zip
+	${tp_base}/bbjthemepack.zip
+	${tp_base}/beigeazulthemepack.zip
+	${tp_base}/beosthemepack.zip
+	${tp_base}/blueMetalthemepack.zip
+	${tp_base}/blueTurquesathemepack.zip
+	${tp_base}/cellshadedthemepack.zip
+	${tp_base}/chaNinja-Bluethemepack.zip
+	${tp_base}/coronaHthemepack.zip
+	${tp_base}/cougarthemepack.zip
+	${tp_base}/crystal2themepack.zip
+	${tp_base}/fatalEthemepack.zip
+	${tp_base}/gfxOasisthemepack.zip
+	${tp_base}/gorillathemepack.zip
+	${tp_base}/hmmXPBluethemepack.zip
+	${tp_base}/hmmXPMonoBluethemepack.zip
+	${tp_base}/iBarthemepack.zip
+	${tp_base}/macosthemepack.zip
+	${tp_base}/midnightthemepack.zip
+	${tp_base}/mmMagra-Xthemepack.zip
+	${tp_base}/modernthemepack.zip
+	${tp_base}/oliveGreenLunaXPthemepack.zip
+	${tp_base}/opusLunaSilverthemepack.zip
+	${tp_base}/opusOSBluethemepack.zip
+	${tp_base}/opusOSDeepthemepack.zip
+	${tp_base}/opusOSOlivethemepack.zip
+	${tp_base}/quickSilverRthemepack.zip
+	${tp_base}/roueBluethemepack.zip
+	${tp_base}/roueBrownthemepack.zip
+	${tp_base}/roueGreenthemepack.zip
+	${tp_base}/royalInspiratthemepack.zip
+	${tp_base}/silverLunaXPthemepack.zip
+	${tp_base}/solunaRthemepack.zip
+	${tp_base}/tigerGraphitethemepack.zip
+	${tp_base}/tigerthemepack.zip
+	${tp_base}/toxicthemepack.zip
+	${tp_base}/underlingthemepack.zip
+	${tp_base}/whistlerthemepack.zip
+	${tp_base}/xplunathemepack.zip
+
+	${tvp_base}/noia.zip
+	${tvp_base}/nuvola.zip
+	${tvp_base}/tulliana.zip
+	${tvp_base}/tango_without_heart.zip
+)"
+
+SLOT="0"
+KEYWORDS=""
+LICENSE="GPL-3"
+
+IUSE="themes"
+
+CDEPEND="dev-java/bsh:0
+	dev-java/commons-codec:0
+	dev-java/commons-lang:3.3
+	dev-java/commons-net:0
+	dev-java/jakarta-oro:2.0
+	dev-java/jgoodies-common:1.8
+	dev-java/jgoodies-forms:1.8
+	dev-java/jgoodies-looks:2.6
+	dev-java/l2fprod-common:0
+	dev-java/log4j:0
+	dev-java/skinlf:0
+	dev-java/swt:4.2
+	dev-java/xalan:0
+	x11-libs/libXt:0
+	x11-libs/libSM:0
+	x11-libs/libICE:0
+	x11-libs/libXext:0
+	x11-libs/libXtst:0
+	x11-libs/libX11:0
+	x11-libs/libXau:0
+	x11-libs/libXdmcp:0"
+
+DEPEND="${CDEPEND}
+	app-arch/unzip:0
+	>=virtual/jdk-1.6
+	test? ( dev-java/junit:0 dev-java/ant-junit:0 )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+src_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die "Failed to replace build.xml."
+
+	# Yes, there are some bundled jars.
+	# Can't help but use them for the time being.
+	local error="Failed to unbundle or remove libraries or classes."
+	pushd lib > /dev/null
+		rm -v bsh-*.jar commons*.jar jgoodies*.jar l2fprod-common-tasks*.jar \
+			skinlf*.jar stax*.jar || die ${error}
+	popd > /dev/null
+
+	find deployment -name '*.jar' -exec rm -v {} \; || die ${error}
+	find . -name '*.class' -exec rm -v {} \; || die ${error}
+
+	# These tests fail.
+	rm -v \
+		test/src/util/misc/TextLineBreakerTest.java \
+		test/src/util/ui/html/HTMLTextHelperTest.java
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="bsh,commons-codec,commons-lang-3.3,jgoodies-common-1.8,jgoodies-forms-1.8,jgoodies-looks-2.6,l2fprod-common,skinlf"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},ant-junit,junit"
+
+EANT_BUILD_TARGET="runtime-linux"
+EANT_DOC_TARGET="public-doc"
+
+src_test() {
+	VIRTUALX_COMMAND="java-pkg-2_src_test" virtualmake
+}
+
+src_install() {
+	pushd runtime/${PN}_linux > /dev/null
+		java-pkg_dojar ${PN}.jar
+
+		local todir="${JAVA_PKG_SHAREPATH}"
+
+		cp -a {imgs,icons,plugins} "${D}/${todir}" || die "Failed to copy directories."
+		cp linux.properties "${D}/${todir}" || die "Failed to copy linux.properties."
+
+		insinto "${todir}/themepacks"
+		doins themepacks/themepack.zip
+
+		if use themes ; then
+			pushd "${DISTDIR}" > /dev/null
+				doins *pack.zip
+
+				insinto "${todir}/icons"
+				doins noia.zip nuvola.zip tulliana.zip tango_without_heart.zip
+			popd > /dev/null
+		fi
+
+		java-pkg_dolauncher "tvbrowser" \
+			--main tvbrowser.TVBrowser \
+			--pwd ${todir} \
+			--java_args " -Dpropertiesfile=${todir}/linux.properties"
+
+		make_desktop_entry ${PN} "TV-Browser" \
+			/usr/share/tvbrowser/imgs/tvbrowser128.png "AudioVideo;TV;Video"
+	popd > /dev/null
+
+	java-pkg_dojar $(ls lib/*.jar)
+	#java-pkg_dojar lib/{htmlparser-1.6.jar,jRegistryKey-1.4.5.jar,opencsv-2.3.jar}
+	#java-pkg_dojar lib/{substance-6.1.jar,texhyphj-1.1.jar,trident-1.3.jar}
+
+	use source && java-pkg_dosrc src
+	use doc && java-pkg_dojavadoc doc
+}
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
new file mode 100644
index 000000000000..254394c73b57
--- /dev/null
+++ b/media-tv/tvheadend/Manifest
@@ -0,0 +1,11 @@
+AUX tvheadend-4.0.9-hdhomerun-include.patch 985 SHA256 5b4147ebf7a73301e1f45f285622ebe30826370070a6f4113123f476c122df3a SHA512 860db8a1a0172b200d0eafcc628b086d557433b83025a7744bfc077ec97efec57f63d314f4c29904d75ba42fdb54eb676f384644f601bb0b30d42ee3acf65c58 WHIRLPOOL 058575af90b72360a541a9793851f89add52559dfe6cf37408bc1d79d08551dbe437dcbfc7f19ed92980acf86028ea670220d8bde240f3a4760705b528e4d5cb
+AUX tvheadend.confd 355 SHA256 1dd2bed597ccb84e59beae0ec130287f31a4cc2c2e974708462f08d8885b2e5e SHA512 64ae0cca1e1b46a3ecb2fb4a4ba69ad1dd6a72ce57944b44be28768d293f9cca2ab29067335023f384433e8c75d976fbc4610ca574c930b9891a2f1c75ff4c0b WHIRLPOOL 156a098daf40f42098e3c6862ef307784a882a7e80e269525d702fd17a458b479911c41a3017621cf55cbd96d281fad0de1e6e59b6bb0f0d729cf94d2384343a
+AUX tvheadend.initd 376 SHA256 3803724e39b424e78017857d075159b207d957a642d7cb7a61efd05185205ea1 SHA512 e0cd720289185f9a483901b8d52aec989934423630dfa99d2fec5006bc5c16d6ce013dacd62e2fe2395a77bcd9649dbcc8972cb118c1789ac4427dae3af98c12 WHIRLPOOL d18a0148c166fc28e9ec4a8942e6c36259dd169101b51a1b498c104b4851cac830f2467a799b4e1038aff74f26719057cc1b85fb69d97b0eb7a7e75ccba09852
+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 2997 SHA256 e76a61c134900ce8660ff0b7d2063330d7837c49288533438d59971a62c230ed SHA512 f883337bdcb8b892c7891c793e5962c4b66882df69b60f04d78f9137671bfbb63d8acea2f6bdbd39ece155a0b6dc6e9364e3fa6a329411f125ccd6e2943ca83c WHIRLPOOL 051cea3a435a6468384fe712f8c6d801f283461b31e7a64d7adcc47ddcb15dc5acd46d2b85c0a013eae489a6aecc5c9a1a2217f21fd3fb340d54c0a976aa062b
+EBUILD tvheadend-9999.ebuild 2455 SHA256 1a6550f0ea61ec7bb4b7b7c5a638742e5cd6a7f0061c2da7a3d03633cbca4205 SHA512 9e80cc150eba627c07cc62849280f9930b8f1b1ff88e71c638ea920eb971c551ed805a2b9f96a1b7123c82fc80dddc559088c2bdd9d87c2e50a3ad24536474cf WHIRLPOOL c04c80f4f3adbbafbb1b8f1a7dcdce50b7f9b5a9c27d8b69b9d2aacdce001087574d40e4361ed0ef3326c9113e4139970180575f3dbd9e5b8f503b6916dfc58c
+MISC ChangeLog 10445 SHA256 fd24af1e733fab77c9f6efbd8518e6bb7bbf37a6f6982b50f88a3daf4f6ce907 SHA512 c9ba2a58a234ea2b396869c3b477fda67925987214a842d51c699cb1e46708d29b271da42a8ac023a874fe866dd7f1de7ca1ae05b34754f4a490ce1f92bf6c55 WHIRLPOOL d6441556b2b9aa4744672885c421367575596323d4f4ffce5c63e28093d8d46e50ac26fa69cdb64e83594ca9f1477a86b8c84ac53b283f37be828233eacc3ed0
+MISC ChangeLog-2015 1487 SHA256 43bb094efebee39a10638f45ee95b1cf3f28c7382a6e9ff0ad7a2738ccbda5b4 SHA512 9ab2bb9ee52778da4eb57e649770ca88ed9e922b4ebcf8e792d2ea56f029287a3a0ba1fd79c644a93ea3524a6d178b4edc5ab2419d21780f032154fff0169423 WHIRLPOOL 005553c8f4468766deccde5f4b9e3f3d98cadc1418807899d4297510c53c418fea9d9e31faad502ae80c72061fadf81749e6b62bb1fdedce52e960a7ea27314f
+MISC metadata.xml 1080 SHA256 e4eba5c862151ba15339d82a5722e402fd879d7d2517bf16ce4b0100d7963e53 SHA512 c73fe203e28350af2dc3d88fa9a8d4179d3171e4e07f24b7928abe4a4f95eca0c092b6eb2a0534e4b13045722da02cb691fe009669b683238978f14d5bf6e591 WHIRLPOOL 6dcfc45c179b926fa1d1629dc36df14736b793b72503aacae72507924ca086d930c464f455378ba2e5da76dac4d4af16169eaaba9ca21e1115ce6d58aa273bcc
diff --git a/media-tv/tvheadend/files/tvheadend-4.0.9-hdhomerun-include.patch b/media-tv/tvheadend/files/tvheadend-4.0.9-hdhomerun-include.patch
new file mode 100644
index 000000000000..8a0768fa6f02
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.0.9-hdhomerun-include.patch
@@ -0,0 +1,27 @@
+diff --git a/configure b/configure
+index 47d2cf2..6f9fcc5 100755
+--- a/configure
++++ b/configure
+@@ -290,7 +290,7 @@ if enabled hdhomerun_static; then
+ else
+ 
+   if enabled_or_auto hdhomerun_client; then
+-    if check_cc_header 'libhdhomerun/hdhomerun' libhdhomerun; then
++    if check_cc_header 'hdhomerun/hdhomerun' libhdhomerun; then
+       enable  hdhomerun_client
+       LDFLAGS="$LDFLAGS -lhdhomerun"
+     fi
+diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h b/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h
+index 962627a..6d1c52b 100644
+--- a/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h
++++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h
+@@ -24,7 +24,8 @@
+ #include "htsbuf.h"
+ #include "tvhdhomerun.h"
+ 
+-#include <libhdhomerun/hdhomerun.h>
++#include <hdhomerun/hdhomerun.h>
++#include <hdhomerun/hdhomerun_debug.h>
+ 
+ typedef struct tvhdhomerun_device_info tvhdhomerun_device_info_t;
+ typedef struct tvhdhomerun_device      tvhdhomerun_device_t;
diff --git a/media-tv/tvheadend/files/tvheadend.confd b/media-tv/tvheadend/files/tvheadend.confd
new file mode 100644
index 000000000000..8be4a5dadce9
--- /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 000000000000..27956ccb234b
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+
+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 000000000000..227faffcb082
--- /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 000000000000..9d99f1238417
--- /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 000000000000..8fe7e7352725
--- /dev/null
+++ b/media-tv/tvheadend/tvheadend-4.0.9.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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? ( https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2 )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zeroconf zlib"
+
+# does not build with ffmpeg-3 - bug 574990
+# https://tvheadend.org/issues/3597
+RDEPEND="dev-libs/openssl:=
+	virtual/libiconv
+	dbus? ( sys-apps/dbus )
+	ffmpeg? (
+		!libav? ( <media-video/ffmpeg-3:= )
+		libav? ( media-video/libav:= )
+	)
+	hdhomerun? ( media-libs/libhdhomerun )
+	uriparser? ( dev-libs/uriparser )
+	zeroconf? ( net-dns/avahi )
+	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 )
+PATCHES=( "${FILESDIR}/${P}-hdhomerun-include.patch" )
+
+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_configure() {
+	econf --prefix="${EPREFIX}"/usr \
+		--datadir="${EPREFIX}"/usr/share \
+		--disable-ccache \
+		--nowerror \
+		--disable-hdhomerun_static \
+		$(use_enable capmt) \
+		$(use_enable constcw) \
+		$(use_enable cwc) \
+		$(use_enable dbus dbus_1) \
+		$(use_enable dvbscan) \
+		$(use_enable dvb linuxdvb) \
+		$(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 zeroconf avahi) \
+		$(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/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
new file mode 100644
index 000000000000..ac205c566bb0
--- /dev/null
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils git-r3 linux-info systemd toolchain-funcs user
+
+DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
+HOMEPAGE="https://tvheadend.org/"
+EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+
+IUSE="capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zeroconf zlib"
+
+RDEPEND="dev-libs/openssl:=
+	virtual/libiconv
+	dbus? ( sys-apps/dbus )
+	ffmpeg? (
+		!libav? ( >=media-video/ffmpeg-3:= )
+		libav? ( media-video/libav:= )
+	)
+	hdhomerun? ( media-libs/libhdhomerun )
+	uriparser? ( dev-libs/uriparser )
+	zeroconf? ( net-dns/avahi )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	dvb? ( virtual/linuxtv-dvb-headers )
+	capmt? ( virtual/linuxtv-dvb-headers )
+	virtual/pkgconfig"
+
+RDEPEND+="
+	dvbscan? ( media-tv/linuxtv-dvb-apps )
+	xmltv? ( media-tv/xmltv )"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+DOCS=( README.md )
+
+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-hdhomerun_static \
+		--disable-ffmpeg_static \
+		--disable-ccache \
+		--disable-dvbscan \
+		$(use_enable capmt) \
+		$(use_enable constcw) \
+		$(use_enable cwc) \
+		$(use_enable dbus) \
+		$(use_enable dvb linuxdvb) \
+		$(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 zeroconf avahi) \
+		$(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/media-tv/tvnamer/Manifest b/media-tv/tvnamer/Manifest
new file mode 100644
index 000000000000..d5b531f43e8c
--- /dev/null
+++ b/media-tv/tvnamer/Manifest
@@ -0,0 +1,7 @@
+DIST tvnamer-2.3.tar.gz 44415 SHA256 230b5608002f048640e270639cfb43f3301f08127af46e1243a033c8e1c62696 SHA512 b1b0ac4e665a04215cb3d4e738197285c800c554b276e56ccd14af17fc624ffe7dab92b208f9791806045eb1ad0a59d6e76e52464e488f919e48dff2a879d96c WHIRLPOOL e04543a1921c327681fc748d85a9278270ebaa9ac211e069ed78309b3cbed64c86ee5114e0a13827418546ed9ec550c6dc1588ecd5386cf29e9cdabea0cc82cb
+DIST tvnamer-2.4.tar.gz 45272 SHA256 5b756daf16f295b7759fe89a53705bc323e3edce1a926404f3b70b6579fd3182 SHA512 9271dca535910abed3f5ce24de4e65f7b951d2b6f80e07854bef06d52f7cdf40be8eb76934467ebae08bf919503a434c527a37caade1a3e696fbceb4446884fd WHIRLPOOL ea8e829e5d452fcf2b334683ae1fe72e569444a4d19c95e13ca7ccc5a8ffb3adcd8a4606a4d9fc1554c1ef90ffad7da0d59095d25e5d4dd81d4dfe4631e17c36
+EBUILD tvnamer-2.3.ebuild 460 SHA256 ce26169838c62985311fe83700d20d3c468b9f47c793561b6e05698031a19e7d SHA512 a6e53665b9c6f660b67f47cb1ca91cd1a69332b1ec5136cf47a36038e38d60e1a39cf8851db0fc1dbfacdb5a541a39f19f94b2cd8dda96ce37e4a4eb78d12a0c WHIRLPOOL ed6688cce4f70b5e3834daaf7d359d10028eb0339dc412d79379b9b6831f89d58902e5e84155de1ba967982078d8b49f7362d7e96e36f8b63fa743a464edb056
+EBUILD tvnamer-2.4.ebuild 527 SHA256 98ad26eba720e13ac442b570b0787c090be440c0b31dc2f78d3768bc31e6a1d8 SHA512 df07b3ea9565473c89946b5f9dd776bbc38f09dabf474376b3f03947f80cbbd33a6b64ceed86b21b997cd00415f5cc4eb2f019f1b07d5e19c8ee7a3ef859f9a7 WHIRLPOOL 1df35b0f4229858a4a1459048a908a117f8158e5299f254925801f61b11d00469ec0077a51067e79b58252581425c44b795f90c906cc971e8a952942ffcde639
+MISC ChangeLog 2476 SHA256 5c057b64da7b349dfc9effa9537fb6ab5c6e8001e5ad17e095d3b5438f221773 SHA512 92c13b761c21f154181c4c140e945ce90037dbf335f63e25c7fabf22f355efebb2590fc94ecb1b093d498dec70cbee9e91863ffcd88376ce38f73e2f0b7253a6 WHIRLPOOL cce3255c17648ed1c588abbd2c8d1eadc49a2d84323756b8297a1c2136acd9afb5ed908a3ec115957f3fa137a6c290b6b5af8ea7adb4984f95cfed769370339b
+MISC ChangeLog-2015 675 SHA256 c387316e38b886ff8f81c8658a5887d4a5ad6c07dc9ddaf7068b1b3af1fd20a8 SHA512 5607a1f4f1d1554afe7e81f50a7943ebcbf5eaec48ce89585eecb4fb56548ec7f561add9c080526a4e29de4e725e3c168c5796136ef082fd0142925b67bf6383 WHIRLPOOL cf543e7704dfe6ed7472867ed4c1d81c7bc579718931c8f11662f6697c6ab2367c5792e3749b5111a1ac800624059559b22492b5bd081e29f2ddf5a70ac27d43
+MISC metadata.xml 379 SHA256 32cbb71b588bda3f210b51864981bc2770c24788b4cb0fa0b3c7b2e3bc1bb1a1 SHA512 d7a09db1fcdc1ec0b6fb78769fd219248bb4c5e858273d45554d5ac2021678a5d97f9b81cfbcd2ae05a1f9446c1c218463e8375d195335613df5834617463ae6 WHIRLPOOL 675948820954e61fc999f96873841ab5ef0cd9d1a77752b9ed3a6f9ccd61b0ac5d269a02116fdf54fa11327b797aca0f7c346a95041f3028dfe11a1b44ca80cd
diff --git a/media-tv/tvnamer/metadata.xml b/media-tv/tvnamer/metadata.xml
new file mode 100644
index 000000000000..a602ac66d0a1
--- /dev/null
+++ b/media-tv/tvnamer/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>thev00d00@gentoo.org</email>
+    <name>Ian Whyman</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">tvnamer</remote-id>
+    <remote-id type="github">dbr/tvnamer</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-tv/tvnamer/tvnamer-2.3.ebuild b/media-tv/tvnamer/tvnamer-2.3.ebuild
new file mode 100644
index 000000000000..3e5d77f8cf37
--- /dev/null
+++ b/media-tv/tvnamer/tvnamer-2.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Automatic TV episode file renamer, data from thetvdb.com"
+HOMEPAGE="https://github.com/dbr/tvnamer"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/tvdb_api"
+DEPEND="${DEPEND}
+	dev-python/setuptools
+"
diff --git a/media-tv/tvnamer/tvnamer-2.4.ebuild b/media-tv/tvnamer/tvnamer-2.4.ebuild
new file mode 100644
index 000000000000..5d978a2fa6e3
--- /dev/null
+++ b/media-tv/tvnamer/tvnamer-2.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+inherit distutils-r1
+
+DESCRIPTION="Automatic TV episode file renamer, data from thetvdb.com"
+HOMEPAGE="https://github.com/dbr/tvnamer"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/tvdb_api-1.10_pre[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/media-tv/v4l-dvb-saa716x/Manifest b/media-tv/v4l-dvb-saa716x/Manifest
new file mode 100644
index 000000000000..bb177d7d677d
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/Manifest
@@ -0,0 +1,19 @@
+AUX OSD_RAW_CMD_patch_2.diff 843 SHA256 41ad8460fd67ec56466266fd4e89de712dc8ca99327cf95670a5a0a27b6a9a14 SHA512 57688acc06ac9fcde332e3fba9d4048ac962d7c65c3844ff60e1d48956f7fe0f02315859f427cd5e21695ffa0c3d5cbd46ff953d7d1eca4b3e2ab165f6985e71 WHIRLPOOL 18ef1d95fa4bd2e0e3d353356782d39f84179a9f0f48bb36f5b4705500d7c4030b3ad684a2e186c3c6e64d72d55059f65fb9cd63c170701865b39f406fe9541d
+AUX v4l-dvb-saa716x-3.19-set_gpio.patch 733 SHA256 6ea366636aa838d2d1499d314085e3d8eafba91de37ebc57b0be0d069140ba8c SHA512 e713779f02ebdc090a364e2339217c7f4fa2d54ba53d26f61a1a0241d19078e0278da14c8ba6520354d8a037c6834ae90271e39cdda279cfd8f4047277f24116 WHIRLPOOL bba297c62a576612ff54dcd741ec8f5f2a1640e79da503b068637bd0341c2dc39fcebf107994a27dbc3302ef92182562fe223368e8de578da214ca0917dbfd2f
+AUX v4l-dvb-saa716x-4.10-fix-compile.patch 515 SHA256 4cd4d8c6a28494f9bb521e36b9202b99045173788196c29ea7b6419aedb4edcd SHA512 6dc1b7b24c0d4c4b21f765ee0ac72f8b48f85ec40bb2cb7d51e589d03e64521d026a4e49f4b8c5d0e5b46b4e9332ac3785fa9a682a19dbad94f3b7ac50950653 WHIRLPOOL 643463962a10f3c6be053e4c9d20ae265f0c9f40575b70498c8bf32c05d41e80247ecf4d9180d7e45fefad6fdada1107f77ff1aaa333662e8d79ef40214d00dc
+AUX v4l-dvb-saa716x-4.2-fix-compile.patch 2397 SHA256 5544e0df1995516fe025404c69b13c168e3848c32193039874a2e6da990ddbd1 SHA512 621852c315437a9f5ada9f5624f08d25154d331cd0a95c479f3835ba9452cd0a17ecf6fdc4b37b5eb7504456ab8565e8d6670be8680e4ea6052b5f5c22c15c12 WHIRLPOOL f7fed682d4c7b3e39b101c8f1f3e4ecf0c61333fa9d616f3d7a5326b61c8c7f688db9abbf742a1ba5dc563050e196a2b7a949d50bdb5ce9301545df62d2dbbea
+AUX v4l-dvb-saa716x-4.5.2-fix-compile.patch 498 SHA256 e340d64d44611d10f69ee89797dc0bf05a7510c0853441b2401a715b662f1b7d SHA512 3c94389b3ffb380a585d51b7e27e3fdf36b053524983fd58531e1d00b1ade2680759822df41363fa2e2ef279570f364178c7f4870c9c6b2fb52124f83eb4afb1 WHIRLPOOL 91e139f86ef5a5ab1c789ad09d8e0a0d78e8eefac1eadf04fa63ab5d22e48957e8ba345009c44edf0bfaf9d84ea84356e1e5defa987a8338bc216f4710fecacd
+AUX v4l-dvb-saa716x-4.6.0-fix-compile.patch 692 SHA256 31baa03e8913a7c5724301f421f0072d97e5ef0efdcedb5dc6e3c7cd1045193c SHA512 64b03e316d938a3830b7aad3c6b6431a9360202470e62d3c696c4203ee98b15595be3bda727468b28a6f43b539931530a408582aab6fe280b8a0200224f2b96f WHIRLPOOL f33ace1023beaf958d00bac30a03a861334d7d3966f3bd0065c1b176795441115bc70deda55e476de2de08fc2ffe4b9a1c242820dcce9b5dd60f512723e88707
+AUX v4l-dvb-saa716x-4.9-fix-warnings.patch 6368 SHA256 19eaad1c40ab9165003ff6ed1655bf9947f4372786b92ce84c8f7b3ed1a124ad SHA512 e697a87b14727d8877ecc78622050bb9d8e5b0d964796c5c3275a8d72359712ec85a578e2189a102b23eedcdb17381533de9641a22103982ad5b0c9702e77901 WHIRLPOOL 1bff1fde73f8cbe50ee6f92ecf04699854b3c0efa442f0b99e8ccc2c40830142328468d9bed7a3fb444ac0245f35154c16b804e18a54966bcb5a7b21c1b83b57
+AUX v4l-dvb-saa716x-Makefilepatch-2.diff 562 SHA256 2b4cd1fd3d185f3d20654d759db177beffa52984178e55e149789697f10edf69 SHA512 e0ff1c5a79f7b02323eff281bf6dc6ebb7a8fe7a43eb83ebd4a7379468924d3992790899bfabbbf2ee411cda6366ad6a677d8ad004a306e14b55d891f6f69dc0 WHIRLPOOL 289bbb5858afed31c77e9427e7e4d2872ed14ae048c9e84ba0faad8435de431271798f5b6ba53bc1217d4554ff36cab94b980cc5a6ead92610be25f85c192432
+DIST v4l-dvb-saa716x-0.0.1_p20140322.tar.gz 5026505 SHA256 79ff65c1354506ffb951e23bc1667c372cf22e9eca8309f9b7486fcfec22ef29 SHA512 2b452f6951064f01e88ccf1a2a6f0c9db8ac96779f7b8d56d33cf387d6ed196922edf6b6234d5887ce9dfdb7013772dc874be5ad5893b8e92b23ffe1f2b5d6ea WHIRLPOOL c6f63e835a670455aa871d179283d283d1e3da23f83c868040a48a402178d73d0c7f44ee807076e3cbd72a7b3e1f050d3e6103d2a49c778eddfe19efdba815a7
+DIST v4l-dvb-saa716x-0.0.1_p20141109.tar.gz 5028238 SHA256 2c6608f94df9da7681e2b22fdbdd842cdd1e97dd1dac6017c713c1fc037cd2bd SHA512 a67f095d4878b4ceb3b340e725925385fee33b289e875e9e0903370d0ec909d66893d9ac846d5c7fedf469129a3327e3458668db5a83ff2718c04174e6e07c66 WHIRLPOOL 156cac6e08c57c1a4c2b5511d211de784d941c22d6bc7c2aa8188e9c01b8cf043e4f7a3af595180c68af4de6be7d1bfba4f27323c14a18afdd3110e8629802a3
+DIST v4l-dvb-saa716x-0.0.1_p20160322.tar.gz 5028181 SHA256 daef53afa986ef74f035ab82c7b85bbfc51641b13a544241ee7db95cab2fd5b7 SHA512 94a41467688a0363586c654102e35366071218432042bc324d041298ad4812139201f8df17eadb37ebb9baf2b097447fc0859270bcc4e8e0c73b17e0b8045343 WHIRLPOOL 0fdc8fcbb3197c6bc4bbe678f179b352180b5045ef0fd635967092ed94572569a0884c3de113d1849ee5db12f6c1ed4a08401519303395e2cd2e69735ed55dca
+EBUILD v4l-dvb-saa716x-0.0.1_p20140322.ebuild 1513 SHA256 082bd16b3ebe18551d15d591fa79d253e8ecb402c970bb992cc99ff41418a5cb SHA512 ebc9cff7871e560b72a72756540f58b25ac0ff785461f29445bef733de113dce0b0275ed2e51ea42a7756985c9df8c40dc3a8099f4638553ac6ca54c46d270fc WHIRLPOOL 1e3123fad39d35bd0c547131890765207998d2cc8e9afa406d13575c8f98c445d3d06889ea704aba700d808836ed5471a0520dc1e738fe49df9e75fb29902b10
+EBUILD v4l-dvb-saa716x-0.0.1_p20141109-r1.ebuild 1591 SHA256 e0241e0c8579b61fb28326d37878c5940fc924d2798571719f2228fec7605af9 SHA512 b5a733666792782ff0b312ff1674f579b92471447e963683eb60d21ed0961715525409294f8c4987ecfd6de9731c2c434fc818de76fc0cd8099d20cda67ea3c3 WHIRLPOOL 283fa42b2373931fded15436e997614c2ae27d6dd78d6aefe11240dde0e4714b16557b39d9944909d9c8c9c8a35ce49ddd1a404b08bcc49acdceba46c61e9f26
+EBUILD v4l-dvb-saa716x-0.0.1_p20141109-r2.ebuild 1771 SHA256 ab8124d6c6d9b9a9a8687361399093b0b226c4f200f62030fc92d260b0844453 SHA512 bd9996ba8df5b3e9713d179da9468dd22821d7e655bb2147d56f9186b93e88725195680501d19b8bb0ea4652f245e48bdf9c21f6896db3fbf257ed253068be92 WHIRLPOOL 0cc10a7e1fb12e6846e7be8e312b4d4a5e87af9324a4b4167242700633add49fb246c188a65ebdd8b00dcd671933763d3df7fc659471435c2ef9925dcad45fa0
+EBUILD v4l-dvb-saa716x-0.0.1_p20141109.ebuild 1510 SHA256 5f396e66577f249ae3cffd403211a79639e6d14a05f60dd362705859dd3c37b9 SHA512 5df495f3f4b64e1cc34260f7de274e294997798dfcdd35ff521290c9a36d1fe0f9622b3a674e873f29f5dffcabfa8a195e657607e1903e28dd2be04b022270b8 WHIRLPOOL 5ed395ce94f3215da72cd2fcb5190092d89ac029062a9d5e9d5f91aee7c6c588a5ad0140cdc1cb9f81afb3df1d16445bd803ff2a8d8ffd7b081d83ec5fd303f1
+EBUILD v4l-dvb-saa716x-0.0.1_p20170225.ebuild 2017 SHA256 9a8cd7d4945f13f31f9f30bf63e6e77936f8402376ff0701b170d935585e64f8 SHA512 5dd9acd0e0300de379ef7f8ed21a9e5b81ae2f8f2dcd93d909aea6385ec868a26eed82fd7ee648b655e3d947ba62b302eb5e8639ad1512c281921c9e1a1aa9c8 WHIRLPOOL 9cb778cbada6e24bad4b1628ddc4cf326fd03ef9155728f09fc54f5ad20830b3ba441634f49690471630e51577cc2fcd933c41088e4d854fedf417150b0e2076
+MISC ChangeLog 3521 SHA256 6eef4f16a5a13414cf25e0334343f7dd0bfd5fde44dec4e9a664e06e8c2a033a SHA512 b60ebcd0d6c518b0c3dd6dd97daeb4a55b45a5e8c8ee31b8e4c3b455fb238987cb5e699d20b07d4b763ac95cde13b52f47f127c63e3f165c4d7486400befb9b0 WHIRLPOOL ec0fe795565671341ba2578807d5aa5af0c0d84ac06fd35e3b7a14c5779ebfb123aab4285dee7e67a771469b106618f1705d7e39a0bdc7e4d26a5e52eb5328a7
+MISC ChangeLog-2015 1745 SHA256 6986bd5ef889327b639fc97fbd322ff57d71eca63e1d201522305b4939e34311 SHA512 cc308432cba30422a4f3ded5397210aedf07779d5faaa2c15a4f41d489b8db98755b8d110a31ca059e0605710facbe276c26da880482a8565705aa8204cc019c WHIRLPOOL 9f2fb5360ef99d7dc1fd5f0b5d927f540cd331d9015d37ea5d8200b83f72cd8ac8adf423e7f757cfd05162c9933cd32e42c981f5e5c6814a3c8946f96f1896a1
+MISC metadata.xml 732 SHA256 05c276ae6ba4b6b5cb0940b4f839bfdaf9a94001c92762a9ceae2627a9922af6 SHA512 8ead5a434ccb0231a76a1ffda1fd1811d3f1d59175b67d5d12f9e3f738ff209f8a71f84a592d5906bc2d31b69f63ec64a4b4dfb3e26a5e46e5adac07d23d8924 WHIRLPOOL fd20341e3ca5ba562f0ae83aef4ed4567a95be1a4e77346b1d373e3a52c0770f780623965ec11f02f068130fb3ae77d4ef95ab771f03213ee6302be89c4f8889
diff --git a/media-tv/v4l-dvb-saa716x/files/OSD_RAW_CMD_patch_2.diff b/media-tv/v4l-dvb-saa716x/files/OSD_RAW_CMD_patch_2.diff
new file mode 100644
index 000000000000..7f09a1d60f1a
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/files/OSD_RAW_CMD_patch_2.diff
@@ -0,0 +1,27 @@
+--- linux/drivers/media/common/saa716x/saa716x_ff_cmd.h.orig	2011-11-12 14:46:51.175700236 +0100
++++ linux/drivers/media/common/saa716x/saa716x_ff_cmd.h	2011-11-12 14:45:10.103702959 +0100
+@@ -1,6 +1,24 @@
+ #ifndef __SAA716x_FF_CMD_H
+ #define __SAA716x_FF_CMD_H
+ 
++#if !defined OSD_RAW_CMD
++typedef struct osd_raw_cmd_s {
++    const void *cmd_data;
++    int cmd_len;
++    void *result_data;
++    int result_len;
++} osd_raw_cmd_t;
++
++typedef struct osd_raw_data_s {
++    const void *data_buffer;
++    int data_length;
++    int data_handle;
++} osd_raw_data_t;
++
++#define OSD_RAW_CMD            _IOWR('o', 162, osd_raw_cmd_t)
++#define OSD_RAW_DATA           _IOWR('o', 163, osd_raw_data_t)
++#endif
++
+ extern int sti7109_cmd_init(struct sti7109_dev *sti7109);
+ extern int sti7109_raw_cmd(struct sti7109_dev * sti7109,
+ 			   osd_raw_cmd_t * cmd);
diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-3.19-set_gpio.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-3.19-set_gpio.patch
new file mode 100644
index 000000000000..895caa4449e0
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-3.19-set_gpio.patch
@@ -0,0 +1,24 @@
+--- v4l-dvb-saa716x-d7e98fc59230-orig/linux/drivers/media/common/saa716x/saa716x_budget.c	2014-11-09 15:44:55.000000000 +0100
++++ v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c	2015-02-28 13:58:01.258743639 +0100
+@@ -497,10 +497,10 @@
+ 		break;
+ 	}
+ 
+-	err = stv090x_set_gpio(fe, 2, 0, en, 0);
++	err = skystar2_stv090x_config.set_gpio(fe, 2, 0, en, 0);
+ 	if (err < 0)
+ 		goto exit;
+-	err = stv090x_set_gpio(fe, 3, 0, sel, 0);
++	err = skystar2_stv090x_config.set_gpio(fe, 3, 0, sel, 0);
+ 	if (err < 0)
+ 		goto exit;
+ 
+@@ -519,7 +519,7 @@
+ 	else
+ 		value = 0;
+ 
+-	err = stv090x_set_gpio(fe, 4, 0, value, 0);
++	err = skystar2_stv090x_config.set_gpio(fe, 4, 0, value, 0);
+ 	if (err < 0)
+ 		goto exit;
+ 
diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.10-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.10-fix-compile.patch
new file mode 100644
index 000000000000..4086da102b80
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.10-fix-compile.patch
@@ -0,0 +1,18 @@
+--- a/linux/drivers/media/common/saa716x/saa716x_ff.h
++++ b/linux/drivers/media/common/saa716x/saa716x_ff.h
+@@ -1,7 +1,6 @@
+ #ifndef __SAA716x_FF_H
+ #define __SAA716x_FF_H
+ 
+-#include "dvb_filter.h"
+ #include "dvb_ringbuffer.h"
+ #include <linux/version.h>
+ #include <linux/workqueue.h>
+@@ -95,6 +94,7 @@
+ #define MAX_RESULT_LEN		256
+ #define MAX_DATA_LEN		(1024 * 1024)
+ 
++#define TS_SIZE			188
+ #define TSOUT_LEN		(1024 * TS_SIZE)
+ #define TSOUT_LEVEL_FILL	(350 * TS_SIZE)
+ #define TSOUT_LEVEL_HIGH	(30 * TS_SIZE)
diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.2-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.2-fix-compile.patch
new file mode 100644
index 000000000000..392ef2583075
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.2-fix-compile.patch
@@ -0,0 +1,34 @@
+diff -urN powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c
+--- powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c	2015-09-03 00:30:08.662553247 +0200
++++ v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c	2015-09-03 00:31:03.899206845 +0200
+@@ -306,7 +306,7 @@
+ #define SAA716x_MODEL_TWINHAN_VP1028	"Twinhan/Azurewave VP-1028"
+ #define SAA716x_DEV_TWINHAN_VP1028	"DVB-S"
+ 
+-static int vp1028_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
++static int vp1028_dvbs_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage)
+ {
+ 	struct saa716x_dev *saa716x = fe->dvb->priv;
+ 
+diff -urN powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c
+--- powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c	2014-11-09 15:44:55.000000000 +0100
++++ v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c	2015-09-03 00:31:03.899206845 +0200
+@@ -321,7 +321,7 @@
+ 	.request_firmware	= tda1004x_vp6090_request_firmware,
+ };
+ 
+-static int vp6090_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
++static int vp6090_dvbs_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage)
+ {
+ 	struct saa716x_dev *saa716x = fe->dvb->priv;
+ 
+diff -urN powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c
+--- powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c	2014-11-09 15:44:55.000000000 +0100
++++ v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c	2015-09-03 00:31:03.900206839 +0200
+@@ -1,3 +1,5 @@
++#include <asm/atomic.h>
++#include <linux/spinlock_types.h>
+ #include <asm/io.h>
+ #include <asm/pgtable.h>
+ #include <asm/page.h>
+
diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.5.2-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.5.2-fix-compile.patch
new file mode 100644
index 000000000000..ac499acdccbc
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.5.2-fix-compile.patch
@@ -0,0 +1,13 @@
+fix compile with kernel >= 4.5.2
+wrt bug 581450
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> 2016/05/05
+--- a/linux/drivers/media/common/saa716x/saa716x_pci.c.old	2016-04-27 20:59:51.000000000 +0200
++++ b/linux/drivers/media/common/saa716x/saa716x_pci.c	2016-04-27 21:19:03.117822874 +0200
+@@ -1,6 +1,7 @@
+ #include <asm/atomic.h>
+ #include <linux/spinlock_types.h>
+ #include <asm/io.h>
++#include <asm/processor.h>
+ #include <asm/pgtable.h>
+ #include <asm/page.h>
+ #include <linux/kmod.h>
diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.6.0-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.6.0-fix-compile.patch
new file mode 100644
index 000000000000..5aeaabd29af1
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.6.0-fix-compile.patch
@@ -0,0 +1,24 @@
+--- a/linux/drivers/media/common/saa716x/saa716x_pci.c	2017-02-26 18:48:27.196949325 +0100
++++ b/linux/drivers/media/common/saa716x/saa716x_pci.c	2017-02-26 18:50:28.149283794 +0100
+@@ -1,9 +1,6 @@
+ #include <asm/atomic.h>
+ #include <linux/spinlock_types.h>
+-#include <asm/io.h>
+ #include <asm/processor.h>
+-#include <asm/pgtable.h>
+-#include <asm/page.h>
+ #include <linux/kmod.h>
+ #include <linux/vmalloc.h>
+ #include <linux/init.h>
+@@ -20,11 +17,6 @@
+ 
+ #define DRIVER_NAME				"SAA716x Core"
+ 
+-static irqreturn_t saa716x_msi_handler(int irq, void *dev_id)
+-{
+-	return IRQ_HANDLED;
+-}
+-
+ static int saa716x_enable_msi(struct saa716x_dev *saa716x)
+ {
+ 	struct pci_dev *pdev = saa716x->pdev;
diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.9-fix-warnings.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.9-fix-warnings.patch
new file mode 100644
index 000000000000..a32ab60868a6
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.9-fix-warnings.patch
@@ -0,0 +1,146 @@
+--- a/linux/drivers/media/common/saa716x/saa716x_rom.c	2015-12-29 19:40:55.000000000 +0100
++++ a/linux/drivers/media/common/saa716x/saa716x_rom.c	2017-07-11 00:51:19.149941914 +0200
+@@ -113,7 +113,7 @@
+ 	memcpy(rom_header, &buf[*offset], sizeof (struct saa716x_romhdr));
+ 	if (rom_header->header_size != sizeof (struct saa716x_romhdr)) {
+ 		dprintk(SAA716x_ERROR, 1,
+-			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
++			"ERROR: Header size mismatch! Read size=%zd bytes, Expected=%d",
+ 			sizeof (struct saa716x_romhdr),
+ 			rom_header->header_size);
+ 
+@@ -237,7 +237,7 @@
+ 	saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
+ 	if (header.size != sizeof (struct saa716x_decoder_hdr)) {
+ 		dprintk(SAA716x_ERROR, 1,
+-			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
++			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
+ 			header.size,
+ 			sizeof (struct saa716x_decoder_hdr));
+ 
+@@ -268,7 +268,7 @@
+ 	saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
+ 	if (header.size != sizeof (struct saa716x_gpio_hdr)) {
+ 		dprintk(SAA716x_ERROR, 1,
+-			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
++			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
+ 			header.size,
+ 			sizeof (struct saa716x_gpio_hdr));
+ 
+@@ -305,7 +305,7 @@
+ 	saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
+ 	if (header.size != sizeof (struct saa716x_video_decoder_hdr)) {
+ 		dprintk(SAA716x_ERROR, 1,
+-			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
++			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
+ 			header.size,
+ 			sizeof (struct saa716x_video_decoder_hdr));
+ 
+@@ -386,7 +386,7 @@
+ 	saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
+ 	if (header.size != sizeof (struct saa716x_audio_decoder_hdr)) {
+ 		dprintk(SAA716x_ERROR, 1,
+-			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
++			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
+ 			header.size,
+ 			sizeof (struct saa716x_audio_decoder_hdr));
+ 
+@@ -417,7 +417,7 @@
+ 	saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
+ 	if (header.size != sizeof (struct saa716x_evsrc_hdr)) {
+ 		dprintk(SAA716x_ERROR, 1,
+-			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
++			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
+ 			header.size,
+ 			sizeof (struct saa716x_evsrc_hdr));
+ 
+@@ -448,7 +448,7 @@
+ 	saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
+ 	if (header.size != sizeof (struct saa716x_xbar_hdr)) {
+ 		dprintk(SAA716x_ERROR, 1,
+-			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
++			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
+ 			header.size,
+ 			sizeof (struct saa716x_xbar_hdr));
+ 
+@@ -486,7 +486,7 @@
+ 	saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
+ 	if (header.size != sizeof (struct saa716x_tuner_hdr)) {
+ 		dprintk(SAA716x_ERROR, 1,
+-			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
++			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
+ 			header.size,
+ 			sizeof (struct saa716x_tuner_hdr));
+ 
+@@ -516,7 +516,7 @@
+ 	saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
+ 	if (header.size != sizeof (struct saa716x_pll_hdr)) {
+ 		dprintk(SAA716x_ERROR, 1,
+-			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
++			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
+ 			header.size,
+ 			sizeof (struct saa716x_pll_hdr));
+ 
+@@ -546,7 +546,7 @@
+ 	saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
+ 	if (header.size != sizeof (struct saa716x_channel_decoder_hdr)) {
+ 		dprintk(SAA716x_ERROR, 1,
+-			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
++			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
+ 			header.size,
+ 			sizeof (struct saa716x_channel_decoder_hdr));
+ 
+@@ -576,7 +576,7 @@
+ 	saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
+ 	if (header.size != sizeof (struct saa716x_encoder_hdr)) {
+ 		dprintk(SAA716x_ERROR, 1,
+-			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
++			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
+ 			header.size,
+ 			sizeof (struct saa716x_encoder_hdr));
+ 
+@@ -606,7 +606,7 @@
+ 	saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
+ 	if (header.size != sizeof (struct saa716x_ir_hdr)) {
+ 		dprintk(SAA716x_ERROR, 1,
+-			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
++			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
+ 			header.size,
+ 			sizeof (struct saa716x_ir_hdr));
+ 
+@@ -637,7 +637,7 @@
+ 	saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
+ 	if (header.size != sizeof (struct saa716x_eeprom_hdr)) {
+ 		dprintk(SAA716x_ERROR, 1,
+-			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
++			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
+ 			header.size,
+ 			sizeof (struct saa716x_eeprom_hdr));
+ 
+@@ -668,7 +668,7 @@
+ 	saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
+ 	if (header.size != sizeof (struct saa716x_filter_hdr)) {
+ 		dprintk(SAA716x_ERROR, 1,
+-			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
++			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
+ 			header.size,
+ 			sizeof (struct saa716x_filter_hdr));
+ 
+@@ -699,7 +699,7 @@
+ 	saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
+ 	if (header.size != sizeof (struct saa716x_streamdev_hdr)) {
+ 		dprintk(SAA716x_ERROR, 1,
+-			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
++			"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
+ 			header.size,
+ 			sizeof (struct saa716x_streamdev_hdr));
+ 
+@@ -789,7 +789,7 @@
+ 
+ 	memcpy(device, &buf[*offset], sizeof (struct saa716x_devinfo));
+ 	if (device->struct_size != sizeof (struct saa716x_devinfo)) {
+-		dprintk(SAA716x_ERROR, 1, "ERROR: Device size mismatch! Read=%d bytes, expected=%d bytes",
++		dprintk(SAA716x_ERROR, 1, "ERROR: Device size mismatch! Read=%d bytes, expected=%zd bytes",
+ 		device->struct_size,
+ 		sizeof (struct saa716x_devinfo));
+ 
diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-Makefilepatch-2.diff b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-Makefilepatch-2.diff
new file mode 100644
index 000000000000..78ba021fb4fe
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-Makefilepatch-2.diff
@@ -0,0 +1,8 @@
+--- v4l-dvb-saa716x-cfa4b4faab67/linux/drivers/media/common/saa716x/Makefile.orig	2013-03-02 07:44:51.112642592 +0100
++++ v4l-dvb-saa716x-cfa4b4faab67/linux/drivers/media/common/saa716x/Makefile	2013-03-02 07:46:56.703138542 +0100
+@@ -24,3 +24,5 @@
+ obj-$(CONFIG_DVB_SAA716X_FF)	  += saa716x_ff.o
+ 
+ EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends/
++EXTRA_CFLAGS += -Idrivers/media/common/tuners/ # up to kernel 3.6
++EXTRA_CFLAGS += -Idrivers/media/tuners/        # kernel 3.7+
diff --git a/media-tv/v4l-dvb-saa716x/metadata.xml b/media-tv/v4l-dvb-saa716x/metadata.xml
new file mode 100644
index 000000000000..5fcb0acfd4a5
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/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>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+		<description>Proxied maintainer</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>hd_brummy@gentoo.org</email>
+		<name>Joerg Bornkessel</name>
+		<description>Proxying maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="firmware">Install firmware</flag>
+	</use>
+	<upstream>
+		<remote-id type="bitbucket">powARman/v4l-dvb-saa716x</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20140322.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20140322.ebuild
new file mode 100644
index 000000000000..fddf0a89509f
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20140322.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit linux-info linux-mod
+
+DESCRIPTION="driver for saa716x based dvb cards like Technotrend S2-6400 or Technisat Skystar 2 eXpress HD"
+HOMEPAGE="http://powarman.dyndns.org/hgwebdir.cgi/v4l-dvb-saa716x/"
+
+HG_REVISION="196681f1e154"
+HG_REVISION_DATE="20140322"
+
+SRC_URI="http://powarman.dyndns.org/hgwebdir.cgi/v4l-dvb-saa716x/archive/${HG_REVISION}.tar.gz
+-> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+firmware"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	firmware? ( sys-firmware/tt-s2-6400-firmware )"
+
+S="${WORKDIR}/v4l-dvb-saa716x-${HG_REVISION}"
+
+BUILD_TARGETS="modules"
+MODULE_NAMES="saa716x_ff(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_core(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_budget(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_hybrid(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
+
+CONFIG_CHECK="DVB_CORE DVB_STV6110x DVB_STV090x"
+
+src_prepare() {
+	epatch "${FILESDIR}/OSD_RAW_CMD_patch_2.diff"
+	epatch "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff"
+}
+
+src_compile() {
+	BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \
+	CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \
+	CONFIG_DVB_SAA716X_HYBRID=m"
+	addpredict "${ROOT}"/usr/src/linux/
+	linux-mod_src_compile
+}
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r1.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r1.ebuild
new file mode 100644
index 000000000000..7abe09c0dba0
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit linux-info linux-mod
+
+DESCRIPTION="driver for saa716x based dvb cards like Technotrend S2-6400 or Technisat Skystar 2 eXpress HD"
+HOMEPAGE="https://bitbucket.org/powARman/v4l-dvb-saa716x/overview"
+
+HG_REVISION="d7e98fc59230"
+HG_REVISION_DATE="20141109"
+
+SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${HG_REVISION}.tar.gz
+-> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+firmware"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	firmware? ( sys-firmware/tt-s2-6400-firmware )"
+
+S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_REVISION}"
+
+BUILD_TARGETS="modules"
+MODULE_NAMES="saa716x_ff(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_core(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_budget(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_hybrid(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
+
+CONFIG_CHECK="DVB_CORE DVB_STV6110x DVB_STV090x"
+
+src_prepare() {
+	epatch "${FILESDIR}/OSD_RAW_CMD_patch_2.diff"
+	epatch "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/v4l-dvb-saa716x-3.19-set_gpio.patch"
+}
+
+src_compile() {
+	BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \
+	CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \
+	CONFIG_DVB_SAA716X_HYBRID=m"
+	addpredict "${ROOT}"/usr/src/linux/
+	linux-mod_src_compile
+}
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r2.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r2.ebuild
new file mode 100644
index 000000000000..31091d858f4a
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info linux-mod
+
+DESCRIPTION="driver for saa716x based dvb cards like Technotrend S2-6400 or Technisat Skystar 2 eXpress HD"
+HOMEPAGE="https://bitbucket.org/powARman/v4l-dvb-saa716x/overview"
+
+HG_REVISION="d7e98fc59230"
+HG_REVISION_DATE="20141109"
+
+SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${HG_REVISION}.tar.gz
+-> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+firmware"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	firmware? ( sys-firmware/tt-s2-6400-firmware )"
+
+S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_REVISION}"
+
+BUILD_TARGETS="modules"
+MODULE_NAMES="saa716x_ff(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_core(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_budget(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_hybrid(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
+
+CONFIG_CHECK="DVB_CORE DVB_STV6110x DVB_STV090x"
+
+src_prepare() {
+	default
+
+	eapply -p0 "${FILESDIR}/OSD_RAW_CMD_patch_2.diff"
+	eapply "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff"
+	kernel_is ge 3 19 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-3.19-set_gpio.patch"
+	kernel_is ge 4 2 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.2-fix-compile.patch"
+	kernel_is ge 4 5 2 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.5.2-fix-compile.patch"
+}
+
+src_compile() {
+	BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \
+	CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \
+	CONFIG_DVB_SAA716X_HYBRID=m"
+	addpredict "${ROOT}"/usr/src/linux/
+	linux-mod_src_compile
+}
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109.ebuild
new file mode 100644
index 000000000000..546a5580fc14
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit linux-info linux-mod
+
+DESCRIPTION="driver for saa716x based dvb cards like Technotrend S2-6400 or Technisat Skystar 2 eXpress HD"
+HOMEPAGE="https://bitbucket.org/powARman/v4l-dvb-saa716x/overview"
+
+HG_REVISION="d7e98fc59230"
+HG_REVISION_DATE="20141109"
+
+SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${HG_REVISION}.tar.gz
+-> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+firmware"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	firmware? ( sys-firmware/tt-s2-6400-firmware )"
+
+S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_REVISION}"
+
+BUILD_TARGETS="modules"
+MODULE_NAMES="saa716x_ff(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_core(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_budget(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_hybrid(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
+
+CONFIG_CHECK="DVB_CORE DVB_STV6110x DVB_STV090x"
+
+src_prepare() {
+	epatch "${FILESDIR}/OSD_RAW_CMD_patch_2.diff"
+	epatch "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff"
+}
+
+src_compile() {
+	BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \
+	CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \
+	CONFIG_DVB_SAA716X_HYBRID=m"
+	addpredict "${ROOT}"/usr/src/linux/
+	linux-mod_src_compile
+}
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225.ebuild
new file mode 100644
index 000000000000..e5bf0fcf5e47
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info linux-mod
+
+DESCRIPTION="driver for saa716x based dvb cards like TT S2-6400 or Skystar 2 eXpress HD"
+HOMEPAGE="https://bitbucket.org/powARman/v4l-dvb-saa716x/overview"
+
+HG_REVISION="3b9fce66666a"
+HG_REVISION_DATE="20160322"
+
+SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${HG_REVISION}.tar.gz
+-> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="+firmware"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	firmware? ( sys-firmware/tt-s2-6400-firmware )"
+
+S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_REVISION}"
+
+BUILD_TARGETS="modules"
+MODULE_NAMES="saa716x_ff(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_core(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_budget(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_hybrid(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
+
+CONFIG_CHECK="DVB_CORE DVB_STV6110x DVB_STV090x"
+
+src_prepare() {
+	default
+
+	eapply -p0 "${FILESDIR}/OSD_RAW_CMD_patch_2.diff"
+	eapply "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff"
+	kernel_is ge 3 19 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-3.19-set_gpio.patch"
+	kernel_is ge 4 2 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.2-fix-compile.patch"
+	kernel_is ge 4 5 2 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.5.2-fix-compile.patch"
+	kernel_is ge 4 6 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.6.0-fix-compile.patch"
+	kernel_is ge 4 9 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.9-fix-warnings.patch"
+	kernel_is ge 4 10 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.10-fix-compile.patch"
+}
+
+src_compile() {
+	BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \
+	CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \
+	CONFIG_DVB_SAA716X_HYBRID=m"
+	addpredict "${EROOT%/}"/usr/src/linux/
+	linux-mod_src_compile
+}
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
new file mode 100644
index 000000000000..e388749d0775
--- /dev/null
+++ b/media-tv/v4l-utils/Manifest
@@ -0,0 +1,12 @@
+AUX v4l-utils-1.6.2-sysmacros.patch 1853 SHA256 d12b979cc73086fd33162d68540431533d061d1ded7aabfb3b0fa5573e20ddcd SHA512 ea3e4a19c8b57833519b6356e647572021ac2a6a00942394a89949ff02aa3e0f70a72b0ef0f025615a7c81c0c79f1cacaa01a82161a05d806e3c8c792995353d WHIRLPOOL ceb13ea9bc4dd5526ed5e45a330f9a8d19fb80f3ca59c14d558cc68d3ce87a561ecd7f41763a73a5ce1d70658d2f5bf0afb420b5107a15768919d99ab09c87e2
+DIST v4l-utils-1.10.1.tar.bz2 1352235 SHA256 6147ccc29fe7dd3c5c3994d613c4f2a099bac8b44694a96e5cf4d7caca8336c0 SHA512 524bfd4e93e82f2dd55f0baa3e8be5850d4675b46fd0197b6d1287fc0d502c6b5c64bdf461af9630345f2d847d6aa5b6dc483693cee452da0b6729f156a5d98d WHIRLPOOL 5bd3624acf46f5e79f7ee8f114ec9c5d27bfb25adf9a74c1265b4ff08fe55a828a53e6a58f3ed15dc18f3adcd98e07ac5fc21237ede347944f333a6015d964f6
+DIST v4l-utils-1.12.3.tar.bz2 1588049 SHA256 5a47dd6f0e7dfe902d94605c01d385a4a4e87583ff5856d6f181900ea81cf46e SHA512 6d0269d900c5dad08499ee551ce1507b8b750895f48423ccd534db51cf68794b59a279743fd22dc6da0c092ca31ef744aa564f26b6d6252cbbc7a62e2e1c714a WHIRLPOOL 1d5606defb85981ef6ab91536a1dd4ebe674bb89fff6fcbbc35a1bae00e9a7dd8e14abac10bb59947a0bdfcdec98259af48cd0b252f4ad75fff101e6030ba57a
+DIST v4l-utils-1.12.5.tar.bz2 1588944 SHA256 0618162ddb0b57fe7c45407d4d66ed79e3a134cdbc9e72598d34e61d3359e20d SHA512 ed2e7545a728360b9684db68330885b498a3a5611f49b80e54da72109d9ba2aa75e85f89f085ff0a6f077b17c880101fa5b78c9dff8a0df2eac1866bd80a04ea WHIRLPOOL 07d2c8184812366998134f3bda7c5a2f2888780f84324e6da342a43f7da824655db6d6a929c910f5569ec33774acc36542811ffe6cf74676b70e910c6c84d293
+DIST v4l-utils-1.6.2.tar.bz2 1148309 SHA256 d3d6eb1f0204fb11f3d318bfca35d5f73cc077f88fac7665a47856a16496be7d SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2 WHIRLPOOL bd1b825354ca52e62e8c5f83d43bfd2cec63611c65d6b2709a7274fd15ae0fa21345d2b95a073c0b3a33b7c94b304562f1efcf112e1357a58515bd0d6f37f396
+EBUILD v4l-utils-1.10.1.ebuild 1680 SHA256 c527cea54536f4a4e3c841a043dc2868277067568d42405008848e8fd9bbe097 SHA512 1af282cccf2a73a286fbdd0d92fd6e47e78911fba2063b960f45190cadb4760db666b61355094fe0542503d7c2caf9bab0772af9efbb49df514e24a53af631d9 WHIRLPOOL 0518d76af9d1d56041318b0059b49c0c49a5bbfb1a9a5e04edb9ac31705c161d304242f0c7c69a3967349d6ae8249a8e0082653a0a786ae86c525e5f935afc5b
+EBUILD v4l-utils-1.12.3.ebuild 1546 SHA256 62431a675b2df50f069571e8508f55c5f46f31d68fe7cd70e2d16b507f0fa6e5 SHA512 c51a9eca93a84e8814b7e6e2e365261492722c248448f1767f8753f7574196178fc099542d0c7307bce42e543c19eacb2b02282e8f4fcc279a04065723a3baec WHIRLPOOL 56e91139623f2af07026da154d3ee27f9005da90378453cd6b6227c704759747078471ee9538d85ec13f70d9d9846a2449609ab9ff263ec1a1ab55e746468979
+EBUILD v4l-utils-1.12.5.ebuild 1546 SHA256 62431a675b2df50f069571e8508f55c5f46f31d68fe7cd70e2d16b507f0fa6e5 SHA512 c51a9eca93a84e8814b7e6e2e365261492722c248448f1767f8753f7574196178fc099542d0c7307bce42e543c19eacb2b02282e8f4fcc279a04065723a3baec WHIRLPOOL 56e91139623f2af07026da154d3ee27f9005da90378453cd6b6227c704759747078471ee9538d85ec13f70d9d9846a2449609ab9ff263ec1a1ab55e746468979
+EBUILD v4l-utils-1.6.2.ebuild 1358 SHA256 623744672694b2561084826b87040770158892fb7c02120e20aa7db490f98110 SHA512 92a7469693ab83d81f9c2e03da48d1442f0b5cf86bf8cea6e11be0096d0b48b5d79010ef948423356a5d479571968089bbff511f09543140aea6a9cf6771f36c WHIRLPOOL c543c7c3dbaa855132515db53b653f30df2f13453922bac65958df353126141bcaa2a026001b3d7e157d028e52c92e035377d2fe8c1cb63855684cf0ff0a74c8
+MISC ChangeLog 3227 SHA256 91044ade907592c7839094656e6cc80342ab3656e90d0077aafc36a6545a16d5 SHA512 e9ced4e62338802aaae533afb4d96d34effb3a0073d750ccfd31f7523fb543b4a25cc991d2c3b9292aed1816d701750e4dbe49289429341c0eb77412bdd5bcea WHIRLPOOL 12a87544db316a6fb87bbd180b62c66d7073eb1f3cb62470964eea6d8758ddce33767635553c6e720e7d571a8f10dbba321b84061bd3bde8731c41e2866e10c1
+MISC ChangeLog-2015 6775 SHA256 b918d9a4b981c6858d7df3341cbd638509c40045d81da5bad7a86712ba2f8558 SHA512 d097df66ad0468628e7918ac4de5b6754aac9777d09e980db5b454a87f44dbda9cde1e7338d759305a37e2722598779b3a8bd5cc2d8e349a4941c327a1e5cd26 WHIRLPOOL ec9dbd313f80067aba22a0f91b9b0f9a032887f673655a70ce313063f425f479812963576cf93ce9aa6e092eeb9f12f9fd2afb624e44757f74e5bd7b8a7f8d35
+MISC metadata.xml 256 SHA256 09a8ad8d1626f1013c0de6f41fb61a1c72ea298e12eced6073f0fb879aa65dd2 SHA512 efe3e668ae6d6c6e11e5783c9133fbc6378a4cf21d502aaf7ada64dec0418f457480754a907ac037bb9f7acc008410c6c2f9db57322b9b44256aec74b14ef63c WHIRLPOOL ba23220780a07a4574eb7bbcb21413093b2ee3a1f6b9d8339eb55fb7c35597639311d6415847dc3de6fa9e063e1305ab48bc2eef0c0769c64ae9eefa9fc6825b
diff --git a/media-tv/v4l-utils/files/v4l-utils-1.6.2-sysmacros.patch b/media-tv/v4l-utils/files/v4l-utils-1.6.2-sysmacros.patch
new file mode 100644
index 000000000000..fe5636ae5ecb
--- /dev/null
+++ b/media-tv/v4l-utils/files/v4l-utils-1.6.2-sysmacros.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/580910
+
+From 8edd80d3654843d9441fb5e43dfbf2b3e81f84b5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 14 Mar 2016 16:56:40 -0400
+Subject: [PATCH] include sys/sysmacros.h for major() & minor()
+
+Linux C libraries are looking to disentangle sysmacros.h from the
+sys/types.h header to clean up namespace pollution.  Since these
+macros are provided in glibc/etc... today, switch to pulling in
+this header directly.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ contrib/test/mc_nextgen_test.c            | 1 +
+ lib/libv4lconvert/control/libv4lcontrol.c | 1 +
+ utils/libmedia_dev/get_media_devices.c    | 1 +
+ utils/media-ctl/libmediactl.c             | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/lib/libv4lconvert/control/libv4lcontrol.c b/lib/libv4lconvert/control/libv4lcontrol.c
+index 3c8335c..59f28b1 100644
+--- a/lib/libv4lconvert/control/libv4lcontrol.c
++++ b/lib/libv4lconvert/control/libv4lcontrol.c
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
+diff --git a/utils/libmedia_dev/get_media_devices.c b/utils/libmedia_dev/get_media_devices.c
+index e3a2200..edfeb41 100644
+--- a/utils/libmedia_dev/get_media_devices.c
++++ b/utils/libmedia_dev/get_media_devices.c
+@@ -20,6 +20,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <string.h>
+ #include <stdlib.h>
+diff --git a/utils/media-ctl/libmediactl.c b/utils/media-ctl/libmediactl.c
+index 4a82d24..16dddbe 100644
+--- a/utils/media-ctl/libmediactl.c
++++ b/utils/media-ctl/libmediactl.c
+@@ -24,6 +24,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ 
+ #include <ctype.h>
+ #include <errno.h>
+-- 
+2.6.2
+
diff --git a/media-tv/v4l-utils/metadata.xml b/media-tv/v4l-utils/metadata.xml
new file mode 100644
index 000000000000..681f0dcf3b5d
--- /dev/null
+++ b/media-tv/v4l-utils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tetromino@gentoo.org</email>
+		<name>Alexandre Rostovtsev</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild b/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
new file mode 100644
index 000000000000..147bd5f55f41
--- /dev/null
+++ b/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic udev
+
+DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
+HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
+SRC_URI="http://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="qt5 udev"
+
+RDEPEND=">=media-libs/libv4l-${PV}
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		virtual/opengl
+		media-libs/alsa-lib
+	)
+	udev? ( virtual/libudev )
+	!media-tv/v4l2-ctl
+	!<media-tv/ivtv-utils-1.4.0-r2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-1.6.2-sysmacros.patch #580910
+	eapply_user
+}
+
+src_configure() {
+	if use qt5; then
+		append-cxxflags -std=c++11
+		local qt5_paths=( \
+			MOC="$(pkg-config --variable=host_bins Qt5Core)/moc" \
+			UIC="$(pkg-config --variable=host_bins Qt5Core)/uic" \
+			RCC="$(pkg-config --variable=host_bins Qt5Core)/rcc" \
+		)
+	fi
+	# Hard disable the flags that apply only to the libs.
+	econf \
+		--disable-static \
+		$(use_enable qt5 qv4l2) \
+		$(use_with udev libudev) \
+		--with-udevdir="$(get_udevdir)" \
+		--without-jpeg \
+		"${qt5_paths[@]}"
+}
+
+src_install() {
+	emake -C utils DESTDIR="${D}" install
+	emake -C contrib DESTDIR="${D}" install
+
+	dodoc README
+	newdoc utils/libv4l2util/TODO TODO.libv4l2util
+	newdoc utils/libmedia_dev/README README.libmedia_dev
+	newdoc utils/dvb/README README.dvb
+	newdoc utils/xc3028-firmware/README README.xc3028-firmware
+	newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
+}
diff --git a/media-tv/v4l-utils/v4l-utils-1.12.3.ebuild b/media-tv/v4l-utils/v4l-utils-1.12.3.ebuild
new file mode 100644
index 000000000000..f3d5a556761a
--- /dev/null
+++ b/media-tv/v4l-utils/v4l-utils-1.12.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic udev
+
+DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
+HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
+SRC_URI="http://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="qt5"
+
+RDEPEND=">=media-libs/libv4l-${PV}
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		virtual/opengl
+		media-libs/alsa-lib
+	)
+	virtual/libudev
+	!media-tv/v4l2-ctl
+	!<media-tv/ivtv-utils-1.4.0-r2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	if use qt5; then
+		append-cxxflags -std=c++11
+		local qt5_paths=( \
+			MOC="$(pkg-config --variable=host_bins Qt5Core)/moc" \
+			UIC="$(pkg-config --variable=host_bins Qt5Core)/uic" \
+			RCC="$(pkg-config --variable=host_bins Qt5Core)/rcc" \
+		)
+	fi
+	# Hard disable the flags that apply only to the libs.
+	econf \
+		--disable-static \
+		$(use_enable qt5 qv4l2) \
+		--with-udevdir="$(get_udevdir)" \
+		--without-jpeg \
+		"${qt5_paths[@]}"
+}
+
+src_install() {
+	emake -C utils DESTDIR="${D}" install
+	emake -C contrib DESTDIR="${D}" install
+
+	dodoc README
+	newdoc utils/libv4l2util/TODO TODO.libv4l2util
+	newdoc utils/libmedia_dev/README README.libmedia_dev
+	newdoc utils/dvb/README README.dvb
+	newdoc utils/xc3028-firmware/README README.xc3028-firmware
+	newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
+}
diff --git a/media-tv/v4l-utils/v4l-utils-1.12.5.ebuild b/media-tv/v4l-utils/v4l-utils-1.12.5.ebuild
new file mode 100644
index 000000000000..f3d5a556761a
--- /dev/null
+++ b/media-tv/v4l-utils/v4l-utils-1.12.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic udev
+
+DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
+HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
+SRC_URI="http://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="qt5"
+
+RDEPEND=">=media-libs/libv4l-${PV}
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		virtual/opengl
+		media-libs/alsa-lib
+	)
+	virtual/libudev
+	!media-tv/v4l2-ctl
+	!<media-tv/ivtv-utils-1.4.0-r2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	if use qt5; then
+		append-cxxflags -std=c++11
+		local qt5_paths=( \
+			MOC="$(pkg-config --variable=host_bins Qt5Core)/moc" \
+			UIC="$(pkg-config --variable=host_bins Qt5Core)/uic" \
+			RCC="$(pkg-config --variable=host_bins Qt5Core)/rcc" \
+		)
+	fi
+	# Hard disable the flags that apply only to the libs.
+	econf \
+		--disable-static \
+		$(use_enable qt5 qv4l2) \
+		--with-udevdir="$(get_udevdir)" \
+		--without-jpeg \
+		"${qt5_paths[@]}"
+}
+
+src_install() {
+	emake -C utils DESTDIR="${D}" install
+	emake -C contrib DESTDIR="${D}" install
+
+	dodoc README
+	newdoc utils/libv4l2util/TODO TODO.libv4l2util
+	newdoc utils/libmedia_dev/README README.libmedia_dev
+	newdoc utils/dvb/README README.dvb
+	newdoc utils/xc3028-firmware/README README.xc3028-firmware
+	newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
+}
diff --git a/media-tv/v4l-utils/v4l-utils-1.6.2.ebuild b/media-tv/v4l-utils/v4l-utils-1.6.2.ebuild
new file mode 100644
index 000000000000..d0dd8bdac240
--- /dev/null
+++ b/media-tv/v4l-utils/v4l-utils-1.6.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils udev
+
+DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
+HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
+SRC_URI="http://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~hppa ppc ~ppc64 sparc x86"
+IUSE="qt4 udev"
+
+RDEPEND=">=media-libs/libv4l-${PV}
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+		virtual/opengl
+		media-libs/alsa-lib
+	)
+	udev? ( virtual/libudev )
+	!media-tv/v4l2-ctl
+	!<media-tv/ivtv-utils-1.4.0-r2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.6.2-sysmacros.patch #580910
+}
+
+src_configure() {
+	# Hard disable the flags that apply only to the libs.
+	econf \
+		--disable-static \
+		$(use_enable qt4 qv4l2) \
+		$(use_with udev libudev) \
+		--with-udevdir="$(get_udevdir)" \
+		--without-jpeg
+}
+
+src_install() {
+	emake -C utils DESTDIR="${D}" install
+	emake -C contrib DESTDIR="${D}" install
+
+	dodoc README
+	newdoc utils/libv4l2util/TODO TODO.libv4l2util
+	newdoc utils/libmedia_dev/README README.libmedia_dev
+	newdoc utils/dvb/README README.dvb
+	newdoc utils/xc3028-firmware/README README.xc3028-firmware
+	newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
+}
diff --git a/media-tv/w_scan/Manifest b/media-tv/w_scan/Manifest
new file mode 100644
index 000000000000..86e295e94a17
--- /dev/null
+++ b/media-tv/w_scan/Manifest
@@ -0,0 +1,5 @@
+DIST w_scan-20141122.tar.bz2 239277 SHA256 b6d7c9ab997c53a0b0d92e8390f313cc3b82ee8ece1756b4e526119fd5ba09b4 SHA512 64d8d92dd84a5c3cfae4531fbba683602e70597f83ec28c314ccce8810fed70685f03d3e4861d586c52764573e17e0b15881bbdb2f6c60db9d3686d554f1ee6d WHIRLPOOL daef8ec1b007d5060c2175b8e9dcac2f9a37e43189e5bd4e9df923a05d07f1e639709bcbb904de23034d3c3edff954cccf4bc7ab51205fdddd8ccd980e68c4f7
+EBUILD w_scan-20141122.ebuild 677 SHA256 a9fa367102c4164912181e928ce665003d4ca68a7fec126c95671d5288978d4a SHA512 85f5c1fd201ddee888461a6faf9439fffdd571018ee65bd00612d4f42e5a045e68112c29d9db9bf4f89cced66ed36c0f102b43eb199b910ab59a8073ff3fca7e WHIRLPOOL b58ff2d346d93c9a7bd9e152abeafdb08c484dffd28b397740a5e2475210acf199900c29672e71df094f4dbfba758e21cf1e7928b4d6377210a2126b401cd96d
+MISC ChangeLog 3223 SHA256 e0228d99fdb06c6b14b0ac19fb2c09b66faabfb0ec6fce58c2deed8fc23df19e SHA512 daa622547d64348730a64f0844bbfacac62513c28f54f3de88e3e0749f655623616eac7df897007ec6671d475f4648f8b1b279763aa0cbb986e0191ec4c4fb32 WHIRLPOOL 5805d543a713771390f5135d6eaee3dc2f8e143c2af2933d0777a4a7b3ca894b103784e55965eb9358eb41a452a337171ec1844c92cff87afc2fa365e8220276
+MISC ChangeLog-2015 6480 SHA256 8164004668f5e8564075a2cdea05825a00be1dcd0ca297e8d0477d9d74a7d76c SHA512 0453e2d963b010d1f0b725852d233f069976873f9edbcd72f376b6406aa3ed2eeec7e5ff26ef2f2323706124740344a72b725fa657a273b7a71a11a2604249d2 WHIRLPOOL 4e1a6f716bbc1499875b9f657de9868b256b56a86296d2237cabe3878dbf1ce87539f9bfac3d902eef7acb2f4992c0581eb7370153a0542e6253aa7b15d49467
+MISC metadata.xml 220 SHA256 0ce06b644be576c5f489db1862d553a3c0e9612895d2e81d1d5651feffe169f6 SHA512 2939a4c533ffc96ee1ac98cf1d6e8c7a11814ad7db85a5abedeea86424f37385ced1339080dfd71aa5447acbc0b78244b41dbdc0f794b23104ae56a1502d34bb WHIRLPOOL 029ff5a80f187a7c1c07d194bcdc7ca66fafb475413d9934859cac3e269f9f6ddc00c6f3fe9549cd2bc920ec004f083969ca49b8e26353b0f4c118ec2ecbe2ff
diff --git a/media-tv/w_scan/metadata.xml b/media-tv/w_scan/metadata.xml
new file mode 100644
index 000000000000..49fd40c5abac
--- /dev/null
+++ b/media-tv/w_scan/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hd_brummy@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-tv/w_scan/w_scan-20141122.ebuild b/media-tv/w_scan/w_scan-20141122.ebuild
new file mode 100644
index 000000000000..9ae1c209b90d
--- /dev/null
+++ b/media-tv/w_scan/w_scan-20141122.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Scan for DVB-C/DVB-T/DVB-S channels without prior knowledge of frequencies and modulations"
+HOMEPAGE="http://wirbel.htpc-forum.de/w_scan/index2.html"
+SRC_URI="http://wirbel.htpc-forum.de/w_scan/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+DEPEND=">=virtual/linuxtv-dvb-headers-5.8"
+RDEPEND=""
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc ChangeLog README
+
+	if use doc; then
+		dodoc doc/README.file_formats doc/README_VLC_DVB
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/rotor.conf
+	fi
+}
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
new file mode 100644
index 000000000000..bb57d6a5c12a
--- /dev/null
+++ b/media-tv/xmltv/Manifest
@@ -0,0 +1,10 @@
+AUX xmltv-0.5.68-perl526-1.patch 2066 SHA256 142b00b0011acc685acb4b2f04eb09eff2a93253466ebd836bc144574546334e SHA512 3dd149163cb6e0eb1077bf742cef4857869a7b4318732c084e30b402ab2db1b5760cac5bad9125fde7f5142f2a0b4b6c4d2c1aeed40abb9dc9a263af08c03290 WHIRLPOOL d4f47b247c5d33e274f5ede2a25e5ceec52a56edcf685609a68e6c743ebe6b3b181c5bcd02e917c314cc7eae2c772e93ac56640be7da3a97ad88201c160f4257
+DIST xmltv-0.5.57.tar.bz2 778254 SHA256 4a42a1d239caa988fc6d25414ff0104aa831ffa273d4a571cff8c76c05e0afd3 SHA512 78e79b75b23cd8815403a0a5835036c67c80ff45fba79fae68e50a041ae384f427e18717d6122ea2d5eb57163370acac115946e24a8934a94b1cc72cb24314cc WHIRLPOOL 86624127ed922886d3c291358acdbd29a0b70d591baff83ed491345d5ec119de8ef486e0341499e1fa985fa38b85da9a6989e7e4159675da8876ec870b6cc433
+DIST xmltv-0.5.67.tar.bz2 1188778 SHA256 f5ee784961be2a35035d55ef39bcba0ccfd7aecfa5359c1a890cb411c1c7a694 SHA512 2451634bf63ed8f5ee1ef4eff23fa5cfe2a98422e8ae75bf055951d5139d8b7ff03ece6aeee9b3ae81abba5a3edd66e64bd9ae8f610f92cb97ec017b839eee1f WHIRLPOOL c500e8b61a59fd0507c66fbdd0401304321cfae837255085cd373ea0bb26133ebf16b2854cb0715ddd2783ed44c603dc7bb61d40a30552cea3691315c1bfc2eb
+DIST xmltv-0.5.68.tar.bz2 1200116 SHA256 ed6589118943f1028b318dea2cd30c395c41b8abc9bbf106b3787f095d79919d SHA512 bf21837d3804058c6cbfeb0e75af57e5d6e3cd35da40c96291c951bdadc3b4dbfa64c8145a4e2129713b65e7540e1d5da08fe6fbab4c7561ec448f2ce07acbd5 WHIRLPOOL 50ca08aaa414cab036d19cd6ff42de31c44abd53baed357a518c2888553d4ef3c9f4e524aaa9ab50912e247803efafe987c3de3d299b91ebb30bd7ed45b74848
+EBUILD xmltv-0.5.57.ebuild 5401 SHA256 6e8e353e0da638f80abe045ce8f68af0212a5854aa2080a503e66c072491d76c SHA512 881ec922d61a10fe6911e0fd9f6d3dcc15e58ba4ed480cf6eb79dddaf73d5b46fda6c0e084e83681a9ab4ea544bfc3c97722e9de2b8bd225008c50abe3b24e35 WHIRLPOOL 149a2c6f4073788c668a94908ed4a7ff44e043b5e497575676ab9f58a296130c71b284793ddf7d1c4a68eaccf84df424b771f4250cdbc1a49c12705e35952562
+EBUILD xmltv-0.5.67.ebuild 6412 SHA256 28481a55781f917fe41c3e20adcddb8275795f71e83d797be9a9e5840e67244e SHA512 dff1d33659be05a6aa2a02db20df66ceac10ac2d6f14f29a071e700be59ad93fd2af5cbcd561387af88e43b77a97f24660365e878dac8cc25ec37b226a1de004 WHIRLPOOL 116ead3baa3bd985566195cfe48bf5d04b34cd6a05b06ac907f767fd81b75c3b353f4ecfbdb4ce4b42057ad1d0b2d5e25351b17755477e7e0ca8a17a90672fbf
+EBUILD xmltv-0.5.68.ebuild 6719 SHA256 669a01165b6481e762805a2c610c5f70746eb92849b8bbd6f286c7f56aa79228 SHA512 44b24f18ce10ef1a6c578045a134b90abbcfbcfcc9af5381dd84047c2a87f2ce57b0a696096ed3d4402cf8b20769dd36e1bddb7f73cfca6da37f808c6f98eda5 WHIRLPOOL 7da5f5d84d5f3a6ff652f11f2b001812d0d8b5ffe8236d110469412a7c8d81277a40a759c0f4fd91ff438489ac2e419dd254451bae5e6a406d8ef367d4b52cda
+MISC ChangeLog 3144 SHA256 ae9b335b0930b9b63942f9c01892c49d960685c2a7dfab797e0b76410e741874 SHA512 b05a78068c2b465907f40ce83cc6725434473c1d5aad18a0b4c40e2703dd570366915b9ed65f7431d19b33dcbd13bf6d6d174e249eed37e28a6a36ee4465e335 WHIRLPOOL 887bb23055d3cdd81c3d8f581ec0c25edbac23577c68c8f3645b39c914723f6609ff3cb771c8856f2d3183dd23de8089e7df5c67284cc4869fb2192c31ad5dc1
+MISC ChangeLog-2015 17125 SHA256 339936cf083760ae16d72729719ce2dd7c459a3d6142d535962e4c54d5dba8ac SHA512 7970316fbb87fb3131f7f84178649abe2dc82dfae5ebdee96fa6302b5c25e00679728706b52002809c60b140a1fb60bb306d830af705a55543dac2517722f7a1 WHIRLPOOL c1a6648f0b5035134f597e3f32f0789dd5c253aec18fcbe9c39d5e836e2d9eff5315324e7f240970b062822c9f9720a8aa87ff7cae5a434aff2356a553b713a0
+MISC metadata.xml 3194 SHA256 20253da48e02a32d65e6a84852a67d412b880015a05f852b6aa66e8b3336ce25 SHA512 8234e2ccdc2740be4d75b008049c70b196351e0ba91142305b1621043daff40f6275221975642619eb9e706ad42a7b522a54e786d80715be9cbb4aac9edf6e69 WHIRLPOOL 51be92a3621654f9c3d00b6e3d8ac9cdddf3e18a51a21b049282e5d1230a78287890b50f6cce505969b040d3b2d8da4a9e402aad5689d6bdebfc2150a7695a9a
diff --git a/media-tv/xmltv/files/xmltv-0.5.68-perl526-1.patch b/media-tv/xmltv/files/xmltv-0.5.68-perl526-1.patch
new file mode 100644
index 000000000000..6f92c07bf2a4
--- /dev/null
+++ b/media-tv/xmltv/files/xmltv-0.5.68-perl526-1.patch
@@ -0,0 +1,68 @@
+From 97893e7a8121d5cb384e079f6d63702993785896 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric@gmail.com>
+Date: Thu, 14 Sep 2017 08:32:21 +1200
+Subject: Fix configure+compile failing under Perl 5.26 without '.' in @INC
+
+Bug: https://bugs.gentoo.org/630474
+---
+ Makefile.PL           | 2 +-
+ filter/tv_grep.PL     | 2 +-
+ grab/it/tv_grab_it.PL | 2 +-
+ lib/XMLTV.pm.PL       | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index e068e20..0a0179c 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -251,7 +251,7 @@ elsif ($opt_default) {
+     *ask = sub { print "$_[0] $_[2]\n"; $_[2] };
+ }
+ else {
+-    require 'lib/Ask/Term.pm';
++    require './lib/Ask/Term.pm';
+     *ask = \&XMLTV::Ask::Term::ask_boolean;
+ }
+ 
+diff --git a/filter/tv_grep.PL b/filter/tv_grep.PL
+index afc86b8..3f343b6 100644
+--- a/filter/tv_grep.PL
++++ b/filter/tv_grep.PL
+@@ -12,7 +12,7 @@
+ 
+ use IO::File;
+ use XMLTV;
+-require 'filter/Grep.pm';
++require './filter/Grep.pm';
+ 
+ my $out = shift @ARGV; die "no output file given" if not defined $out;
+ my $in = 'filter/tv_grep.in';
+diff --git a/grab/it/tv_grab_it.PL b/grab/it/tv_grab_it.PL
+index d337941..aee5554 100644
+--- a/grab/it/tv_grab_it.PL
++++ b/grab/it/tv_grab_it.PL
+@@ -354,7 +354,7 @@ close IN_FH or die "cannot close $in: $!";
+ 
+ # stuff for setting share dir
+ die "usage: $_ output_file share_dir" if @ARGV != 2;
+-require 'lib/set_share_dir.pl';
++require './lib/set_share_dir.pl';
+ #warn "faccio $ARGV[0] $ARGV[1]\n";
+ #set_share_dir('grab/it/tv_grab_it.in2', $ARGV[0], $ARGV[1]);
+ copy( 'grab/it/tv_grab_it.in2', $ARGV[0] );
+diff --git a/lib/XMLTV.pm.PL b/lib/XMLTV.pm.PL
+index 270ed56..460bb4e 100644
+--- a/lib/XMLTV.pm.PL
++++ b/lib/XMLTV.pm.PL
+@@ -8,7 +8,7 @@ use strict;
+ sub print_list( $$ );
+ 
+ my $out = shift @ARGV; die "no output file given" if not defined $out;
+-my $in = 'lib/XMLTV.pm.in';
++my $in = './lib/XMLTV.pm.in';
+ require $in;
+ open(IN_FH, $in) or die "cannot read $in: $!";
+ die if not @XMLTV::Channel_Handlers; die if not @XMLTV::Programme_Handlers;
+-- 
+2.14.1
+
diff --git a/media-tv/xmltv/metadata.xml b/media-tv/xmltv/metadata.xml
new file mode 100644
index 000000000000..2e6c749e564e
--- /dev/null
+++ b/media-tv/xmltv/metadata.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>proxy-mintainers</name>
+  </maintainer>
+  <maintainer type="person">
+	<email>Aidenn0@geocities.com</email>
+    <name>Jason Miller</name>
+    <description>Proxied maintainer; set to assignee in all bugs</description>
+  </maintainer>
+  <use>
+    <flag name="ar">Argentina tv listing grabber</flag>
+    <flag name="ch">Switzerland bluewin tv listing grabber</flag>
+    <flag name="ch_search">Grabber for Switzerland</flag>
+    <flag name="dk">Denmark tv listing grabber</flag>
+    <flag name="dtvla">Latin America digital tv listing grabber</flag>
+    <flag name="ee">Estonia tv listing grabber</flag>
+    <flag name="es_laguiatv">Spain alternative grabber</flag>
+    <flag name="es_miguiatv">Spain alternative grabber</flag>
+    <flag name="eu_dotmedia">Grabber for Europe (xmltv.se / dotmedia)</flag>
+    <flag name="eu_egon">Grabber for german speaking area (Egon zappt)</flag>
+    <flag name="eu_epg">EPG grabber for some European countries.</flag>
+    <flag name="fi">Finland tv listing grabber</flag>
+    <flag name="fi_sv">Grabber for Finland (Swedish)</flag>
+    <flag name="fr">France tv listing grabber</flag>
+    <flag name="fr_kazer">France (Kazer) tv listing grabber</flag>
+    <flag name="hr">Croatia tv listing grabber</flag>
+    <flag name="huro">Hungarian tv listing grabber</flag>
+    <flag name="in">India tv listing grabber</flag>
+    <flag name="il">Israel tv listing grabber</flag>
+    <flag name="is">Iceland tv listing grabber</flag>
+    <flag name="it">Italy tv listing grabber</flag>
+    <flag name="na_dd">North America tv listing grabber</flag>
+    <flag name="na_dtv">North America Direct TV grabber</flag>
+    <flag name="na_tvmedia">Grabber for North America (TVMedia)</flag>
+    <flag name="na_icons">option for na_dd to download icons</flag>
+    <flag name="nl">Netherlands tv listing grabber</flag>
+    <flag name="no_gf">Norway Gfeed tv listing grabber</flag>
+    <flag name="pt">Portugal tv listing grabber</flag>
+    <flag name="pt_meo">Grabber for Portugal (MEO)</flag>
+    <flag name="re">Reunion Island (France) tv listing grabber</flag>
+    <flag name="se_swedb">Sweden tv listing grabber</flag>
+    <flag name="se_tvzon">Sweden (tvzon.se) tv listing grabber</flag>
+    <flag name="tr">Turkey (Digiturk) tv listing grabber</flag>
+    <flag name="tv_check">enable GUI checking</flag>
+    <flag name="tv_combiner">enable grabbers combiner</flag>
+    <flag name="tv_pick_cgi">enable CGI support</flag>
+    <flag name="uk_atlas">Fast UK and Ireland tv listing grabber</flag>
+    <flag name="uk_bleb">Britain tv listing grabber</flag>
+    <flag name="uk_rt">Britain alternative tv listing grabber</flag>
+    <flag name="uk_tvguide">UK and Ireland tv listing grabber using TV Guide website</flag>
+    <flag name="sd_json">Grabber for schedulesDirect.org SD-JSON service (many countries)</flag>
+    <flag name="za">South Africa tv listing grabber</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">xmltv</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-tv/xmltv/xmltv-0.5.57.ebuild b/media-tv/xmltv/xmltv-0.5.57.ebuild
new file mode 100644
index 000000000000..513878220974
--- /dev/null
+++ b/media-tv/xmltv/xmltv-0.5.57.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils perl-module
+
+DESCRIPTION="Set of utilities to manage TV listings stored in the XMLTV format"
+HOMEPAGE="http://xmltv.org"
+SRC_URI="mirror://sourceforge/xmltv/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-linux"
+
+IUSE="ar ch dtvla uk_rt uk_bleb is it na_dd na_icons fi es_laguiatv es_miguiatv ee re huro dk se_swedb hr no_gf fr pt eu_epg tv_combiner tv_pick_cgi tv_check na_dtv
+za nl in il"
+
+# NOTE: you can customize the xmltv installation by
+#       defining USE FLAGS (custom ones in
+#	/etc/portage/package.use for example).
+#
+#	Do "equery u media-tv/xmltv" for the complete
+#	list of the flags you can set, with description.
+
+# EXAMPLES:
+# enable just North American grabber
+#  in /etc/portage/package.use : media-tv/xmltv na_dd
+#
+# enable graphical front-end, Italy grabber
+#  in /etc/portage/package.use : media-tv/xmltv tv_check it
+
+RDEPEND=">=dev-perl/libwww-perl-5.65
+	>=dev-perl/XML-Parser-2.34
+	>=dev-perl/XML-Twig-3.10
+	>=dev-perl/Date-Manip-5.42
+	>=dev-perl/XML-Writer-0.6
+	virtual/perl-Memoize
+	virtual/perl-Storable
+	>=dev-perl/Lingua-Preferred-0.2.4
+	>=dev-perl/Term-ProgressBar-2.03
+	virtual/perl-IO-Compress
+	dev-perl/Unicode-String
+	dev-perl/TermReadKey
+	dev-perl/File-Slurp
+	>=dev-lang/perl-5.6.1
+	dev-perl/XML-LibXML"
+DEPEND="${RDEPEND}
+	nl? ( dev-perl/HTML-Tree )
+	na_icons? ( dev-perl/HTML-TableExtract >=dev-perl/WWW-Mechanize-1.02 )
+	dk? ( dev-perl/HTML-Tree dev-perl/DateTime dev-perl/Parse-RecDescent )
+	fi? ( dev-perl/HTML-Tree )
+	fr? ( >=dev-perl/HTML-Parser-3.34 dev-perl/HTML-Tree )
+	huro? ( dev-perl/HTML-Tree )
+	it? ( dev-perl/XML-Simple )
+	is? ( dev-perl/XML-LibXSLT )
+	na_dd? ( dev-perl/SOAP-Lite dev-perl/TermReadKey )
+	no_gf? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy dev-perl/XML-LibXML )
+	pt? ( dev-perl/HTML-Tree dev-perl/Unicode-UTF8simple )
+	eu_epg? ( dev-perl/Archive-Zip )
+	se_swedb? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy dev-perl/XML-LibXML )
+	hr? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy dev-perl/XML-LibXML )
+	uk_rt? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy )
+	uk_bleb? ( dev-perl/Archive-Zip dev-perl/IO-stringy )
+	ee? ( dev-perl/IO-stringy )
+	re? ( dev-perl/Lingua-EN-Numbers-Ordinate )
+	tv_combiner? ( dev-perl/XML-LibXML )
+	tv_check? ( dev-perl/Tk dev-perl/Tk-TableMatrix )
+	tv_pick_cgi? ( dev-perl/CGI dev-perl/Lingua-EN-Numbers-Ordinate )
+	na_dtv? ( >=dev-perl/WWW-Mechanize-1.02 dev-perl/TimeDate dev-perl/IO-stringy dev-perl/XML-LibXML )
+	"
+
+REQUIRED_USE="na_icons? ( na_dd )"
+
+PREFIX="/usr"
+
+src_prepare() {
+	sed -i \
+		-e "s:\$VERSION = '${PV}':\$VERSION = '${PVR}':" \
+		-e "/^@docs/s:doc/COPYING ::" \
+		Makefile.PL || die
+
+	epatch_user
+}
+
+src_configure() {
+	make_config() {
+		# Never except default configuration
+		echo "no"
+
+		# Enable Australian
+		#use au && echo "yes" || echo "no"
+		# Enable Agentina
+		usex ar
+		# Enable Brazil
+		#use br && echo "yes" || echo "no"
+		# Enable Brazil Cable
+		#use brnet && echo "yes" || echo "no"
+		# Enable Switzerland Search
+		usex ch
+		# Enable Latin America
+		usex dtvla
+		# Enable Alternate Brittain
+		usex uk_rt
+		# Enable Alternate Brittain 2
+		usex uk_bleb
+		# Enable Belgium and Luxemburg
+		#use be && echo "yes" || echo "no"
+		#Enable Iceland
+		usex is
+		# Enable Italy
+		usex it
+		# Enable Italy from DVB-S stream
+		echo "no" # missing Linux::DVB
+		# Enable India (experimental)
+		usex in
+		# Enable North America using DataDirect
+		usex na_dd
+		# Enable North America channel icons
+		usex na_icons
+		# Enable Finland
+		usex fi
+		# Enable Israel
+		usex il
+		# Enable Spain
+		#use es  && echo "yes" || echo "no"
+		# Enable Spain Digital
+		# use es_digital && echo "yes" || echo "no"
+		# Israel Temporary Disabled
+		# use il && echo "yes" || echo "no"
+		#echo "no"
+		# Enable Spain Alternatives
+		usex es_laguiatv
+		usex es_miguiatv
+		# Enable Netherlands
+		usex nl
+		# Enable Alternate Netherlands
+		#use nl_wolf  && echo "yes" || echo "no"
+		# Enable Hungary and Romania
+		usex huro
+		# Enable Denmark
+		usex dk
+		# Enable Japan
+		#use jp  && echo "yes" || echo "no"
+		# Enable Sweden
+		usex se_swedb
+		# Enable Croatia
+		usex hr
+		# Enable Norway Gfeed
+		usex no_gf
+		# Enable France
+		usex fr
+		# Enable Norway
+		#use no  && echo "yes" || echo "no"
+		# Enable Portugal
+		usex pt
+		# Enable South Africa
+		usex za
+		# Enable Europe epg
+		usex eu_epg
+		# Enable combiner
+		usex tv_combiner
+		# Enable GUI checking.
+		usex tv_check
+		# Enable CGI support
+		usex tv_pick_cgi
+		# Enable Estonia
+		usex ee
+		# Enable Reunion Island
+		usex re
+		# Enable Caledonie Island
+		#use nc && echo "yes" || echo "no"
+		# Enable North America DirecTV
+		usex na_dtv
+	}
+
+	pm_echovar=`make_config`
+	perl-module_src_configure
+}
+
+src_install() {
+	# actually make test should be unneede, but if non na grabbers
+	# start to not install remove comment below
+	#make test
+	#make
+
+	# to bypass build issue
+	#make DESTDIR=${D} install || die "error installing"
+
+	perl-module_src_install
+
+	for i in `grep -rl "${D}" "${D}"` ; do
+		sed -e "s:${D}::g" -i "${i}"
+	done
+
+	if use tv_pick_cgi ; then
+		dobin choose/tv_pick/tv_pick_cgi
+	fi
+}
+
+pkg_postinst() {
+	if use tv_pick_cgi ; then
+		elog "To use tv_pick_cgi, please link it from /usr/bin/tv_pick_cgi"
+		elog "to where the ScriptAlias directive is configured."
+	fi
+}
diff --git a/media-tv/xmltv/xmltv-0.5.67.ebuild b/media-tv/xmltv/xmltv-0.5.67.ebuild
new file mode 100644
index 000000000000..88c25a36cb27
--- /dev/null
+++ b/media-tv/xmltv/xmltv-0.5.67.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils perl-module
+
+DESCRIPTION="Set of utilities to manage TV listings stored in the XMLTV format"
+HOMEPAGE="http://xmltv.org"
+SRC_URI="mirror://sourceforge/xmltv/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux"
+
+IUSE="ar ch_search dk dtvla es_laguiatv eu_dotmedia eu_egon eu_epg fi fi_sv
+fr fr_kazer hr huro il is it na_dd na_dtv na_tvmedia nl no_gf pt pt_meo se_swedb
+se_tvzon tr uk_atlas uk_bleb uk_rt uk_tvguide tv_check tv_combiner tv_pick_cgi"
+
+# NOTE: you can customize the xmltv installation by
+#       defining USE FLAGS (custom ones in
+#	/etc/portage/package.use for example).
+#
+#	Do "equery u media-tv/xmltv" for the complete
+#	list of the flags you can set, with description.
+
+# EXAMPLES:
+# enable just North American grabber
+#  in /etc/portage/package.use : media-tv/xmltv na_dd
+#
+# enable graphical front-end, Italy grabber
+#  in /etc/portage/package.use : media-tv/xmltv tv_check it
+
+RDEPEND=">=dev-perl/libwww-perl-5.65
+	>=dev-perl/XML-Parser-2.34
+	>=dev-perl/XML-Twig-3.10
+	>=dev-perl/Date-Manip-5.42
+	>=dev-perl/XML-Writer-0.6
+	virtual/perl-Memoize
+	virtual/perl-Storable
+	>=dev-perl/Lingua-Preferred-0.2.4
+	>=dev-perl/Term-ProgressBar-2.03
+	virtual/perl-IO-Compress
+	dev-perl/Unicode-String
+	dev-perl/TermReadKey
+	dev-perl/File-Slurp
+	>=dev-lang/perl-5.6.1
+	dev-perl/XML-LibXML"
+DEPEND="${RDEPEND}
+	ar? ( dev-perl/HTML-Tree >=dev-perl/HTML-Parser-3.34 dev-perl/HTTP-Cookies dev-perl/TimeDate )
+	ch_search? ( dev-perl/HTML-Tree >=dev-perl/HTML-Parser-3.34 )
+	dk? ( dev-perl/JSON dev-perl/IO-stringy dev-perl/DateTime )
+	dtvla? ( dev-perl/HTML-Tree dev-perl/HTTP-Cookies dev-perl/TimeDate )
+	es_laguiatv? ( dev-perl/HTML-Tree )
+	eu_dotmedia? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+	eu_egon? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+	eu_epg? ( dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime >=dev-perl/HTML-Parser-3.34 )
+	fi? ( dev-perl/HTML-Tree )
+	fi_sv? ( dev-perl/IO-stringy dev-perl/HTML-Tree dev-perl/DateTime )
+	fr? ( dev-perl/DateTime-TimeZone dev-perl/HTML-Tree dev-perl/DateTime >=dev-perl/HTML-Parser-3.34 )
+	hr? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+	huro? ( dev-perl/HTML-Tree )
+	is? ( dev-perl/XML-DOM dev-perl/XML-LibXSLT )
+	na_dd? ( dev-perl/SOAP-Lite )
+	na_dtv? ( >=dev-perl/HTML-Parser-3.34 dev-perl/DateTime dev-perl/HTTP-Cookies )
+	na_tvmedia? ( dev-perl/XML-LibXML )
+	nl? ( dev-perl/HTTP-Cache-Transparent dev-perl/HTML-Tree dev-perl/DateTime >=dev-perl/HTML-Parser-3.34 dev-perl/TimeDate )
+	no_gf? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+	pt? ( dev-perl/HTML-Tree dev-perl/HTTP-Cache-Transparent >=dev-perl/HTML-Parser-3.34 dev-perl/DateTime )
+	pt_meo? ( dev-perl/XML-LibXML dev-perl/DateTime )
+	se_swedb? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+	se_tvzon? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+	tr? ( dev-perl/URI dev-perl/HTTP-Cache-Transparent dev-perl/DateTime dev-perl/HTTP-Cookies dev-perl/TimeDate )
+	uk_atlas? ( dev-perl/URI dev-perl/HTTP-Cache-Transparent dev-perl/DateTime dev-perl/HTTP-Cookies dev-perl/TimeDate )
+	uk_bleb? ( dev-perl/IO-stringy dev-perl/Archive-Zip )
+	uk_rt? ( dev-perl/DateTime-TimeZone dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent dev-perl/DateTime >=dev-perl/HTML-Parser-3.34 )
+	uk_tvguide? ( dev-perl/URI dev-perl/HTTP-Cache-Transparent dev-perl/DateTime dev-perl/TimeDate )
+	tv_check? ( dev-perl/Tk dev-perl/Tk-TableMatrix )
+	tv_combiner? ( dev-perl/XML-LibXML )
+"
+
+PREFIX="/usr"
+
+src_prepare() {
+	sed -i \
+		-e "s:\$VERSION = '${PV}':\$VERSION = '${PVR}':" \
+		-e "/^@docs/s:doc/COPYING ::" \
+		Makefile.PL || die
+
+	epatch_user
+}
+
+src_configure() {
+	make_config() {
+		# Never except default configuration
+		echo "no"
+
+		# Enable Australian
+		#use au && echo "yes" || echo "no"
+		# Enable Agentina
+		usex ar
+		# Enable Brazil
+		#use br && echo "yes" || echo "no"
+		# Enable Brazil Cable
+		#use brnet && echo "yes" || echo "no"
+		# Enable Switzerland Search
+		usex ch_search
+		# Enable Denmark
+		usex dk
+		# Enable Latin America
+		usex dtvla
+		# Enable Spain
+		usex es_laguiatv
+		# Enable EU xmltv.se
+		usex eu_dotmedia
+		# Enable EU German speaking area
+		usex eu_egon
+		# Enable EU epgdata.com
+		usex eu_epg
+		# Enable Finland
+		usex fi
+		# Enable Swedish listings in Finland
+		usex fi_sv
+		# Enable France
+		usex fr
+		# Enable France EPG from kazer.org
+		usex fr_kazer
+		# Enable Belgium and Luxemburg
+		#use be && echo "yes" || echo "no"
+		#Enable Croatia
+		usex hr
+		# Enable Hungary and Romania
+		usex huro
+		# Enable Israel
+		usex il
+		# Enable Norway Gfeed
+		usex is
+		# Enable Italy
+		usex it
+		# Enable Italy from DVB-S stream
+		echo "no" # missing Linux::DVB
+		# Enable India (experimental)
+		# Disabled upstream
+		# usex in
+		# Enable North America using DataDirect
+		usex na_dd
+		# Enable North America from directv.com
+		usex na_dtv
+		# Enable North America XMLTVListings.com
+		usex na_tvmedia
+		# Enable Netherlands
+		usex nl
+		# Enable Norway
+		usex no_gf
+		# Enable Portugal
+		usex pt
+		# Enable Portugal EPG from sappo.pt
+		usex pt_meo
+		# Enable Sweden
+		usex se_swedb
+		# Enable Sweeden Alternative
+		usex se_tvzon
+		# Enable Turkey
+		usex tr
+		# Enable UK/Ireland Fast grabber
+		usex uk_atlas
+		# Enable UK fast alternative grabber
+		usex uk_bleb
+		# Enable UK/Ireland Radio Times
+		usex uk_rt
+		# Enable UK/Ireland TV Guide
+		usex uk_tvguide
+		# Enable GUI checking.
+		usex tv_check
+		# Enable combiner
+		usex tv_combiner
+		# Enable CGI support
+		usex tv_pick_cgi
+	}
+
+	pm_echovar=`make_config`
+	perl-module_src_configure
+}
+
+src_install() {
+	# actually make test should be unneeded, but if non na grabbers
+	# start to not install remove comment below
+	#make test
+	#make
+
+	# to bypass build issue
+	#make DESTDIR=${D} install || die "error installing"
+
+	perl-module_src_install
+
+	for i in `grep -rl "${D}" "${D}"` ; do
+		sed -e "s:${D}::g" -i "${i}" || die
+	done
+
+	if use tv_pick_cgi ; then
+		dobin choose/tv_pick/tv_pick_cgi
+	fi
+}
+
+pkg_postinst() {
+	if use tv_pick_cgi ; then
+		elog "To use tv_pick_cgi, please link it from /usr/bin/tv_pick_cgi"
+		elog "to where the ScriptAlias directive is configured."
+	fi
+}
diff --git a/media-tv/xmltv/xmltv-0.5.68.ebuild b/media-tv/xmltv/xmltv-0.5.68.ebuild
new file mode 100644
index 000000000000..083ccfa8de93
--- /dev/null
+++ b/media-tv/xmltv/xmltv-0.5.68.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils perl-module
+
+DESCRIPTION="Set of utilities to manage TV listings stored in the XMLTV format"
+HOMEPAGE="http://xmltv.org"
+SRC_URI="mirror://sourceforge/xmltv/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux"
+
+IUSE="ar ch_search dk dtvla es_laguiatv eu_dotmedia eu_egon eu_epg fi fi_sv
+fr fr_kazer hr huro il is it na_dd na_dtv na_tvmedia nl no_gf pt pt_meo se_swedb
+se_tvzon tr uk_atlas uk_bleb uk_rt uk_tvguide sd_json tv_check tv_combiner tv_pick_cgi"
+
+# NOTE: you can customize the xmltv installation by
+#       defining USE FLAGS (custom ones in
+#	/etc/portage/package.use for example).
+#
+#	Do "equery u media-tv/xmltv" for the complete
+#	list of the flags you can set, with description.
+
+# EXAMPLES:
+# enable just North American grabber
+#  in /etc/portage/package.use : media-tv/xmltv na_dd
+#
+# enable graphical front-end, Italy grabber
+#  in /etc/portage/package.use : media-tv/xmltv tv_check it
+
+RDEPEND=">=dev-perl/libwww-perl-5.65
+	>=dev-perl/XML-Parser-2.34
+	>=dev-perl/XML-Twig-3.10
+	>=dev-perl/Date-Manip-5.42
+	>=dev-perl/XML-Writer-0.6
+	virtual/perl-Memoize
+	virtual/perl-Storable
+	>=dev-perl/Lingua-Preferred-0.2.4
+	>=dev-perl/Term-ProgressBar-2.03
+	virtual/perl-IO-Compress
+	dev-perl/Unicode-String
+	dev-perl/TermReadKey
+	dev-perl/File-Slurp
+	>=dev-lang/perl-5.6.1
+	dev-perl/XML-LibXML"
+DEPEND="${RDEPEND}
+	ar? ( dev-perl/HTML-Tree >=dev-perl/HTML-Parser-3.34 dev-perl/HTTP-Cookies dev-perl/TimeDate )
+	ch_search? ( dev-perl/HTML-Tree >=dev-perl/HTML-Parser-3.34 )
+	dk? ( dev-perl/JSON dev-perl/IO-stringy dev-perl/DateTime )
+	dtvla? ( dev-perl/HTML-Tree dev-perl/HTTP-Cookies dev-perl/TimeDate )
+	es_laguiatv? ( dev-perl/HTML-Tree )
+	eu_dotmedia? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+	eu_egon? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+	eu_epg? ( dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime >=dev-perl/HTML-Parser-3.34 )
+	fi? ( dev-perl/HTML-Tree )
+	fi_sv? ( dev-perl/IO-stringy dev-perl/HTML-Tree dev-perl/DateTime )
+	fr? ( dev-perl/DateTime-TimeZone dev-perl/HTML-Tree dev-perl/DateTime >=dev-perl/HTML-Parser-3.34 )
+	hr? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+	huro? ( dev-perl/HTML-Tree )
+	is? ( dev-perl/XML-DOM dev-perl/XML-LibXSLT )
+	na_dd? ( dev-perl/SOAP-Lite )
+	na_dtv? ( >=dev-perl/HTML-Parser-3.34 dev-perl/DateTime dev-perl/HTTP-Cookies )
+	na_tvmedia? ( dev-perl/XML-LibXML )
+	nl? ( dev-perl/HTTP-Cache-Transparent dev-perl/HTML-Tree dev-perl/DateTime >=dev-perl/HTML-Parser-3.34 dev-perl/TimeDate )
+	pt? ( dev-perl/HTML-Tree dev-perl/HTTP-Cache-Transparent >=dev-perl/HTML-Parser-3.34 dev-perl/DateTime )
+	pt_meo? ( dev-perl/XML-LibXML dev-perl/DateTime )
+	se_swedb? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+	se_tvzon? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+	tr? ( dev-perl/URI dev-perl/HTTP-Cache-Transparent dev-perl/DateTime dev-perl/HTTP-Cookies dev-perl/TimeDate )
+	uk_atlas? ( dev-perl/URI dev-perl/HTTP-Cache-Transparent dev-perl/DateTime dev-perl/HTTP-Cookies dev-perl/TimeDate )
+	uk_bleb? ( dev-perl/IO-stringy dev-perl/Archive-Zip )
+	uk_rt? ( dev-perl/DateTime-TimeZone dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent dev-perl/DateTime >=dev-perl/HTML-Parser-3.34 )
+	uk_tvguide? ( dev-perl/URI dev-perl/HTTP-Cache-Transparent dev-perl/DateTime dev-perl/TimeDate )
+	sd_json? ( dev-perl/DateTime-Format-ISO8601 virtual/perl-Digest-SHA dev-perl/JSON dev-perl/List-MoreUtils dev-perl/libwww-perl virtual/perl-Storable dev-perl/Try-Tiny )
+	tv_check? ( dev-perl/Tk dev-perl/Tk-TableMatrix )
+	tv_combiner? ( dev-perl/XML-LibXML )
+"
+
+PREFIX="/usr"
+
+pkg_setup() {
+	# Uses Data::Manip in various places which can fail
+	# if TZ is still set to Factory as it is in stock gentoo
+	# install media
+	export TZ=UTC
+}
+src_prepare() {
+	sed -i \
+		-e "s:\$VERSION = '${PV}':\$VERSION = '${PVR}':" \
+		-e "/^@docs/s:doc/COPYING ::" \
+		Makefile.PL || die
+
+	epatch "${FILESDIR}/${P}-perl526-1.patch"
+
+	epatch_user
+}
+
+src_configure() {
+	make_config() {
+		# Never except default configuration
+		echo "no"
+
+		# Enable Australian
+		#use au && echo "yes" || echo "no"
+		# Enable Agentina
+		usex ar
+		# Enable Brazil
+		#use br && echo "yes" || echo "no"
+		# Enable Brazil Cable
+		#use brnet && echo "yes" || echo "no"
+		# Enable Switzerland Search
+		usex ch_search
+		# Enable Denmark
+		usex dk
+		# Enable Latin America
+		usex dtvla
+		# Enable Spain
+		usex es_laguiatv
+		# Enable EU xmltv.se
+		usex eu_dotmedia
+		# Enable EU German speaking area
+		usex eu_egon
+		# Enable EU epgdata.com
+		usex eu_epg
+		# Enable Finland
+		usex fi
+		# Enable Swedish listings in Finland
+		usex fi_sv
+		# Enable France
+		usex fr
+		# Enable France EPG from kazer.org
+		usex fr_kazer
+		# Enable Belgium and Luxemburg
+		#use be && echo "yes" || echo "no"
+		#Enable Croatia
+		usex hr
+		# Enable Hungary and Romania
+		usex huro
+		# Enable Israel
+		usex il
+		# Enable Iceland
+		usex is
+		# Enable Italy
+		usex it
+		# Enable Italy from DVB-S stream
+		echo "no" # missing Linux::DVB
+		# Enable India (experimental)
+		# Disabled upstream
+		# usex in
+		# Enable North America using DataDirect
+		usex na_dd
+		# Enable North America from directv.com
+		usex na_dtv
+		# Enable North America XMLTVListings.com
+		usex na_tvmedia
+		# Enable Netherlands
+		usex nl
+		# Enable Portugal
+		usex pt
+		# Enable Portugal EPG from sappo.pt
+		usex pt_meo
+		# Enable Sweden
+		usex se_swedb
+		# Enable Sweeden Alternative
+		usex se_tvzon
+		# Enable Turkey
+		usex tr
+		# Enable UK/Ireland Fast grabber
+		usex uk_atlas
+		# Enable UK fast alternative grabber
+		usex uk_bleb
+		# Enable UK/Ireland Radio Times
+		usex uk_rt
+		# Enable UK/Ireland TV Guide
+		usex uk_tvguide
+		# Enable Schedules Direct JSON
+		usex sd_json
+		# Enable GUI checking.
+		usex tv_check
+		# Enable combiner
+		usex tv_combiner
+		# Enable CGI support
+		usex tv_pick_cgi
+	}
+
+	pm_echovar=`make_config`
+	perl-module_src_configure
+}
+
+src_install() {
+	# actually make test should be unneeded, but if non na grabbers
+	# start to not install remove comment below
+	#make test
+	#make
+
+	# to bypass build issue
+	#make DESTDIR=${D} install || die "error installing"
+
+	perl-module_src_install
+
+	for i in $(grep -rl "${D}" "${D}"); do
+		sed -e "s:${D}::g" -i "${i}" || die
+	done
+
+	if use tv_pick_cgi; then
+		dobin choose/tv_pick/tv_pick_cgi
+	fi
+}
+
+pkg_postinst() {
+	if use tv_pick_cgi; then
+		elog "To use tv_pick_cgi, please link it from /usr/bin/tv_pick_cgi"
+		elog "to where the ScriptAlias directive is configured."
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /media-tv