gentoo resync : 30.04.2018

21 files changed, 141 insertions, 611 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 1c00a51e30f8..8ef07ba9b66d 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 42e446255733..9ff08a838a2c 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -7,9 +7,9 @@ DIST alsa-plugins-1.1.1.tar.bz2 366193 BLAKE2B 02892b0c241cf34d3bfce6cf580dbb6be
 DIST alsa-plugins-1.1.4.tar.bz2 366931 BLAKE2B a0a2d91b86be612e830513d08fe34e1f785f772bd698069e002e3eec48236a4ab63d042be0ebaa6b3890d6d6f3ca75500d241542b89b717532eea59188e1aa0c SHA512 edbc9dd762e2500ce6f820d81fcd8d2577506afcea0b33a32cece95f8d6651840f4f8a55664f274d735ab3effa13cdbfc0331690c37a64a9ad050c15dc77cac6
 DIST alsa-plugins-1.1.5.tar.bz2 366999 BLAKE2B 299a21586018788b511d7c9dec588182cc39132aa4f1840eca57e3125f6bbdbcdeabbe4b55a93ed107eab2653a85328aec1c9e6f70c302bb224b3fa50a474c75 SHA512 50a79d9dbcca72b2133aba7dca594302dcd5816eb71afc311a4c2a96aac7632a0a034875faf3100f2c8a44f3fbbede264e5cd9beacf2a07f2fa6786f66edae39
 DIST alsa-plugins-1.1.6.tar.bz2 367485 BLAKE2B efe8b8447db4f68761060e4f48c86c76f821fd7795d8edec0c8f5a03f7406a422f630f012433ac12c3af3222b7b587820a92e937c80dba6bb8766deb854b9706 SHA512 f01633cd7166a2fba4c5b4d5d786b5a2122f6a810f5b5b7209c42033759d116a4515174e7ee57973d5de716be88a246d733dc5a2daf92b72377c274b04db401b
-EBUILD alsa-plugins-1.1.1-r1.ebuild 2809 BLAKE2B 5af39eeaaf95733b81decdb857388eaca0bcc06bca21510c8357e06857a117b142fc60367a5b7e30af518f83fa517b7d24d1581d3d74c1b8ff5baa67b298995e SHA512 9a69ff136d03d28aedf1e82522653e2276f705a04e538e8ac226031c4439f3646ace3b72eb3a757841d988ba92e2ea0beaac0b97cf629d3105b838d84cc52fa4
-EBUILD alsa-plugins-1.1.4-r1.ebuild 2783 BLAKE2B 19244ad5860ca6ccff6c1d05dadc0f4d50889938d0ec1fced11f474ed66318d5120fb915bcd074ca918508790719c110993fa7d8fbcee4fc42276204b0700820 SHA512 1650dbeb541884554a00f17d84bd88659944c4c32cd018a3858ce8674b3f7db6c87d22771dadf93677f528e6171463118265a2054caeef2b3a4b1ff2d6efb245
-EBUILD alsa-plugins-1.1.5-r1.ebuild 2963 BLAKE2B e840cd33c976b33d3476206507d73a1a2525b7fda9f3870ed4af6eff85636d7176fdcd53489ab40dc5639033daff9fc0c89a3867da066329ac95490b2ce5d7e2 SHA512 0907b58d7b309e0e63d3aec62240678f925749bdf2c4fac14499f34478f1d6b59319dac03ae5f3d448d543ddeae79c1963c9a351f1c050bd5268cc9d388f5001
-EBUILD alsa-plugins-1.1.5.ebuild 2783 BLAKE2B 19244ad5860ca6ccff6c1d05dadc0f4d50889938d0ec1fced11f474ed66318d5120fb915bcd074ca918508790719c110993fa7d8fbcee4fc42276204b0700820 SHA512 1650dbeb541884554a00f17d84bd88659944c4c32cd018a3858ce8674b3f7db6c87d22771dadf93677f528e6171463118265a2054caeef2b3a4b1ff2d6efb245
-EBUILD alsa-plugins-1.1.6.ebuild 2991 BLAKE2B 6f499c415215cfb68a1f0d6a2558783eed9d47153f4ca5114305ec1117da3f9114ec5912d83bbdba55368aaea8ea92cdd10881404706ff2ccc8e215ac5859d8c SHA512 67efaae51adbee6053d673a40f23a21d4c0b9c563a2cf846ac322adf1836c42aba3d0bbba902ec35ff53ef3136e42fcf9a86b91bf8783db199f79cf6bf2939ef
+EBUILD alsa-plugins-1.1.1-r1.ebuild 2698 BLAKE2B 3fac1377af069760efcc93fe6daa55a3d821742e7ffd5c0976dc0f3a066151ff087d20a65803aa59f253f27f8077d20345da879f92fd3dc28398440e31b3d148 SHA512 9df4f03ae71fe97423bdb37cd28755873a915f210ce92f5f394e15bcecd6662f321acff20b9f212fdb06b63337a7f58d2fb25a6c18eac2be3c5820bc21394860
+EBUILD alsa-plugins-1.1.4-r1.ebuild 2672 BLAKE2B 1a21d319ae4efadb001ea123896b05cdddc7473d2766e85592fc479553e37b70d73a46fefc7652312d061d41c168c5f5d0a7650b25d2fb5abfbb4450bb9a3677 SHA512 49ee6bc2648318263162eae7a5c2b8247714854324f256e354e50a5cd432ed73846cc5192964f551d139e74d81477ba2ce9bfe817eb43c687519e2a5fee6e03d
+EBUILD alsa-plugins-1.1.5-r1.ebuild 2852 BLAKE2B cbaa192f598748b9ae5da84ebd214c82c084f6217d703cc0bf28be6d2ac47b169c30ebe955c0a7008f697cdb8f7116ba9c7c74dc1bc6d0aac5d384ed68f5fbc9 SHA512 245c77ff61ae5076a4409cd8cd89eb6a60584dff64b3008e485a43ae778d3a49e52c942d0411c64559e5399f4a957965294099586110c8fb63bf24fc6b7c1279
+EBUILD alsa-plugins-1.1.5.ebuild 2672 BLAKE2B 1a21d319ae4efadb001ea123896b05cdddc7473d2766e85592fc479553e37b70d73a46fefc7652312d061d41c168c5f5d0a7650b25d2fb5abfbb4450bb9a3677 SHA512 49ee6bc2648318263162eae7a5c2b8247714854324f256e354e50a5cd432ed73846cc5192964f551d139e74d81477ba2ce9bfe817eb43c687519e2a5fee6e03d
+EBUILD alsa-plugins-1.1.6.ebuild 2880 BLAKE2B 6f3e65dafd10a4c8a24bf67ecce6433d2cd0a3376fd66a112a47b3105f3fda3cbd725f9d9be71fd3a5b844ae23d86305bb36dda28205cb3501534232b892d6e6 SHA512 2be039b830a150ff0876ac7b3a2668f67784ebd8a6d3ab8e693b412d0ad16d4a646f21f506c4b5631c152988b58f7757b3049cfe90d54a08c3e34b9160f3f615
 MISC metadata.xml 512 BLAKE2B 2fa80544d70890c99164643bc1706b8c2e5f3d50c991e781e68441072366b1b89d0082507bf1c27d11d95bcd1c7d508f09ce0b193bd7d4ca77f27a2bdf9e24c8 SHA512 fce90766306d36d97ae40cbebf7b788f6f11766afc6d9680f563271ea184373ae20480b99b6e60edc74d9bfb222acd1d11c50163a31520f073a00bba9050e361
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.1-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.1-r1.ebuild
index 85833223c065..ed55cfe009ea 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.1-r1.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,14 +23,8 @@ RDEPEND="
 	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	speex? (
-		|| (
-			(
-				>=media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-				media-libs/speexdsp[${MULTILIB_USEDEP}]
-			)
-			<media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-		)
-		media-libs/speex:=[${MULTILIB_USEDEP}]
+		>=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
+		media-libs/speexdsp[${MULTILIB_USEDEP}]
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.4-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.4-r1.ebuild
index 28a0efe54381..5389657ac9c5 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.4-r1.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,14 +23,8 @@ RDEPEND="
 	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	speex? (
-		|| (
-			(
-				>=media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-				media-libs/speexdsp[${MULTILIB_USEDEP}]
-			)
-			<media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-		)
-		media-libs/speex:=[${MULTILIB_USEDEP}]
+		>=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
+		media-libs/speexdsp[${MULTILIB_USEDEP}]
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.5-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.5-r1.ebuild
index a575c75b6a2c..3dd0a0e7a970 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.5-r1.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.5-r1.ebuild
@@ -23,14 +23,8 @@ RDEPEND="
 	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	speex? (
-		|| (
-			(
-				>=media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-				media-libs/speexdsp[${MULTILIB_USEDEP}]
-			)
-			<media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-		)
-		media-libs/speex:=[${MULTILIB_USEDEP}]
+		>=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
+		media-libs/speexdsp[${MULTILIB_USEDEP}]
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.5.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.5.ebuild
index 28a0efe54381..5389657ac9c5 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.5.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,14 +23,8 @@ RDEPEND="
 	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	speex? (
-		|| (
-			(
-				>=media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-				media-libs/speexdsp[${MULTILIB_USEDEP}]
-			)
-			<media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-		)
-		media-libs/speex:=[${MULTILIB_USEDEP}]
+		>=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
+		media-libs/speexdsp[${MULTILIB_USEDEP}]
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild
index d7a9bd8fa2e2..c6fe98a09771 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild
@@ -23,14 +23,8 @@ RDEPEND="
 	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	speex? (
-		|| (
-			(
-				>=media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-				media-libs/speexdsp[${MULTILIB_USEDEP}]
-			)
-			<media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
-		)
-		media-libs/speex:=[${MULTILIB_USEDEP}]
+		>=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
+		media-libs/speexdsp[${MULTILIB_USEDEP}]
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/media-plugins/vdr-dvbapi/Manifest b/media-plugins/vdr-dvbapi/Manifest
index b263adff6a90..c35efd747e50 100644
--- a/media-plugins/vdr-dvbapi/Manifest
+++ b/media-plugins/vdr-dvbapi/Manifest
@@ -1,5 +1,8 @@
+AUX kernel-4.14-fix.diff 398 BLAKE2B b431d027c62f709ed4cd7ed663c10fb42a91390fe5b3bdcc4600f1e8593b2c5031912981aec0333ec2c87c3c924aa624e7ffef7ca216d340f04ea5ee13581e16 SHA512 c8f2662cb82dcd1686d3809b75ad0f3dfe67fe6e781dacb3a907d65b68061e993d7fba075319a3ad97b56454bdc12e713030181a1a43b692052de2383bcf3c77
 DIST vdr-dvbapi-2.1.1.tar.gz 82813 BLAKE2B 2dd2b4aa11a645b4168ebbae962371f94a6e70ff905b06230048a69921f31521468506f2959ce5d5327b4cf61edc620686210520239e751e142e524751640e0d SHA512 fb632e66c9e477663eb1edf5e630a20b2165495c89d5bd6294d74d6a28c8386021d90914c9c6b958ea3c5c1d0958cc69efa5c65ef72c510c224d676f1eca39ae
 DIST vdr-dvbapi-2.2.2.tar.gz 83995 BLAKE2B 6ddd9cc4e3edbd504505b7bbb9c40e203d53faab43b3d1afe9b9834cf3d751ba469536b5f27c24cfb04afeba1378ee3ac8dc0885db8a4576ce7a275233c88ca6 SHA512 01d3a6368e0233a7b96b6ea57b28884a004a130d63da2b2958b1616a1108e83389b68cbe32ec7fc6be65d6741912c4f46621b659fb13dba56e594a1a18af2c63
+DIST vdr-plugin-dvbapi-2.2.4.tar.gz 94419 BLAKE2B 326346b418ece22674aa0d84efd798a9eb8e958586d24385b4e468c11478f63ed89e94c742c57c5b1e955dc598db29a39e3730d71c93005aa6dcda262545e4e2 SHA512 d1313e927978fcf150ae14e570c16059caeeec07992066b03282295147872da3bdb191209408539c2a70c2ada868f731e9e5504a8dd737143f86e33a85fdf0c7
 EBUILD vdr-dvbapi-2.1.1.ebuild 2530 BLAKE2B c89a4b7a4c2c87fcf92b0e110bc6af3e9b4419a198d3f93b57aa269d3c85908e96a2f199126d49a0d1047096a071304bb158964771fdda275192eb2bffc4ee5e SHA512 7016fab9b4d196415afb2b3fe3351e968a85e7a1a45c0b32616933e21938f56567b8254cc8eda89c25e551c55ff4b8f3b6b6dbef034753b3cb8b7e7303699c44
 EBUILD vdr-dvbapi-2.2.2.ebuild 2574 BLAKE2B 9e31c575bbf54c7c2372e7f94a449e903cad6d444e49332339b627e1587e61f7bf8e6a7c70a6c5b7d9540246b584d8d9b53480af512b4a301aa177ad7de35d5b SHA512 f709f31b511f7ab778b311b6cffd43d79c80897d830fbbab3dfde52ef6bc54800b3245a4bc3e17d10b1ded000ef45ea3ce9c8f7f08600d4c11972de6dce60e39
-MISC metadata.xml 340 BLAKE2B a7b844cc65e96e24bb6cceb86f9238095ffca8a6cd47a619628b3067d7ce8207a57c4ba5c7ad4f2a8219e27ac54307cd76ca49d175df4b75dc5bb03599190027 SHA512 e6fdc579dd3a03d90f96e0a5cf4413ee380eeb9a44edb48e117cb347bb1f564bccec4de0da9d70dceef3fc59d9f698ce912639e4599136896fd3715f36ad71a1
+EBUILD vdr-dvbapi-2.2.4.ebuild 2949 BLAKE2B 395a2c3121e979d66c8a3660ac6d48eaf06dc4de971eb3a9a36633d0fca99c710d6c036303eb12b8103ffae7772ee6392e5bca87d32e285d4f16ddaea33f9bd1 SHA512 97ea158101db128c72f5a338cf3c9d2ec5d36322754c8d4672bb8abcfbcf8d2e0222f28f4d54ddffa05c5afcbc9f9f09f8d1cf4c4796728a784777f239327975
+MISC metadata.xml 707 BLAKE2B 0256470ad919b7c1ad7d09b3a4c14c66ea38902227ad1ec858e87925a759e62e9e98faeecb5db0745d4a24ad30e3c3dbf6d1a65b93689743580404f415cfe5da SHA512 7273c05a6f55b571a1f7ee46143ec3fe72eff8b1b736b76edaa83fa2ef04206bdba1d17437e00baf3832616ac47fd89d677713288d7645421ccaf7844337a43f
diff --git a/media-plugins/vdr-dvbapi/files/kernel-4.14-fix.diff b/media-plugins/vdr-dvbapi/files/kernel-4.14-fix.diff
new file mode 100644
index 000000000000..07644ab418ca
--- /dev/null
+++ b/media-plugins/vdr-dvbapi/files/kernel-4.14-fix.diff
@@ -0,0 +1,15 @@
+--- a/CA.h	2017-03-28 11:14:07.000000000 +0200
++++ b/CA.h	2018-03-27 00:47:51.231750662 +0200
+@@ -9,4 +9,12 @@
+   unsigned char cw[16];
+ } ca_descr_aes_t;
+ 
++#ifndef CA_SET_PID /* removed in kernel 4.14 */
++typedef struct ca_pid {
++        unsigned int pid;
++        int index;          /* -1 == disable */
++} ca_pid_t;
++#define CA_SET_PID _IOW('o', 135, struct ca_pid)
+ #endif
++
++#endif // __CA_H
diff --git a/media-plugins/vdr-dvbapi/metadata.xml b/media-plugins/vdr-dvbapi/metadata.xml
index 9e2a4b763c8e..e82c63acca54 100644
--- a/media-plugins/vdr-dvbapi/metadata.xml
+++ b/media-plugins/vdr-dvbapi/metadata.xml
@@ -5,6 +5,17 @@
 		<email>hd_brummy@gentoo.org</email>
 		<name>Joerg Bornkessel</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="dvbcsa">use <pkg>media-libs/libdvbcsa</pkg> free implementation of the DVB Common Scrambling Algorithm</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">manio/vdr-plugin-dvbapi</remote-id>
 	</upstream>
diff --git a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.4.ebuild b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.4.ebuild
new file mode 100644
index 000000000000..8f22cdaedc30
--- /dev/null
+++ b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vdr-plugin-2
+
+MY_P="vdr-plugin-dvbapi-${PV}"
+
+DESCRIPTION="VDR Plugin: allows connect VDR to OScam"
+HOMEPAGE="https://github.com/manio/vdr-plugin-dvbapi"
+SRC_URI="https://github.com/manio/vdr-plugin-dvbapi/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2+"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 dvbcsa"
+
+DEPEND=">=media-video/vdr-2.1.4
+	dvbcsa? ( media-libs/libdvbcsa )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( "FAQ" "HISTORY" "INSTALL" "README" "FFdecsa/docs" )
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	if use dvbcsa; then
+		sed -e "/PLUGIN = dvbapi/a LIBDVBCSA = 1" -i Makefile || die "modifying Makefile"
+	fi
+
+	# respect the system CXXFLAGS
+	sed -e "s:FLAGS:CXXFLAGS:" -i FFdecsa/Makefile || die "modifying FFdecsa/Makefile"
+
+	# Prepare flags for FFdeCSA
+	if [[ -n "${VDR_DVBAPI_PARALLEL}" ]]; then
+		PARALLEL="${VDR_DVBAPI_PARALLEL}"
+	else
+		# [32/64] Core2 (SSSE3) achieves best results with SSE2 & SSE
+		# [64] Athlon64 (SSE2) does much better with 64_LONG
+		# [32] Athlon64 (SSE2) does best with MMX
+		# [32] Pentium4 & Atom (SSE2) work best with SSE2 & SSE
+		# [32] AthlonXP (SSE) has MMX faster
+
+		# To avoid parsing -march=, we use ugly assumption that Intels don't
+		# have 3dnow and AMDs do. SSE achieves good results only on Intel CPUs,
+		# and LONG is best on 64-bit AMD CPUs.
+
+		if ! use cpu_flags_x86_3dnow && use cpu_flags_x86_sse2; then
+			PARALLEL=PARALLEL_128_SSE2
+		elif ! use cpu_flags_x86_3dnow && use cpu_flags_x86_sse; then
+			PARALLEL=PARALLEL_128_SSE
+		elif use amd64; then
+			PARALLEL=PARALLEL_64_LONG
+		elif use cpu_flags_x86_mmx; then
+			PARALLEL=PARALLEL_64_MMX
+		else
+			# fallback values:
+			# PARALLEL_32_INT fails with gcc4.4 on x86&amd64
+			# PARALLEL_64_2INT fails with gcc4.4 on x86
+			# PARALLEL_128_4INT seems to be the fastest non-failing fallback
+			PARALLEL=PARALLEL_128_4INT
+		fi
+
+		ewarn "VDR_DVBAPI_PARALLEL in your system make.conf is not set, guessing"
+		ewarn "value from CPU_FLAGS_X86 USEflags, result: ${PARALLEL}"
+		ewarn "This setting may be suboptimal, so you'll probably want to tweak"
+		ewarn "it yourself."
+		ewarn
+		ewarn "To do this, unpack the source and run the script in"
+		ewarn "\t<unpackdir>/${MY_P}/extra/FFdecsa-benchmark.sh"
+		ewarn "and add the output value from  PARALLEL_MODE= to your system make.conf as"
+		ewarn "\tVDR_DVBAPI_PARALLEL=<your parameter>"
+		ewarn
+	fi
+
+	export PARALLEL
+
+	eapply "${FILESDIR}/kernel-4.14-fix.diff"
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	elog "This software might be illegal in some countries or violate"
+	elog "rules of your DVB provider. Please respect these rules."
+	elog
+	elog "We do not offer support of any kind."
+	elog "Asking for keys or for installation help will be ignored by gentoo developers!"
+	elog
+}
diff --git a/media-plugins/vdr-graphtft/Manifest b/media-plugins/vdr-graphtft/Manifest
deleted file mode 100644
index ec2c5e3e7c03..000000000000
--- a/media-plugins/vdr-graphtft/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX confd 1117 BLAKE2B 45753da33efe0b148ed5f0568b6fb9e76b410c05cf5d02559f19043a6745bc3d2c808868ea2695fd8ff409cbff3d1e5014cf868b5225810b3a1a17b0014067dd SHA512 16e98702d8488c644b7f278bb0fbaab54fb1cd568dc85d886192b8947a203b7237cd99f6966787dc9abb96f4220930203f3e55faabed751d8e84dbcf587ec80e
-AUX graphtft-fe 996 BLAKE2B 69f9f338fcd4f02ef83624a69e201484f2f844f1336fd69a4028624030f79b1a3c0ccde89fc1232110d636d42c698629e4d7ffd319633322e16e0a560e29d2fd SHA512 3d1cecca32d6e34a6f23a16ac5fd2e07ed0f98256933ea4fd4ca944beb0ad75984daa8f5a865b6e3d6f74cd9f8a9af9204ee7d1719b973d908daa49af68115f5
-AUX rc-addon.sh 225 BLAKE2B ed6d93f601f0b1f0393fa4623afc2d924cb2ee51aa50b309c3a16085d16a25b8c2a5258cea80ec410d9161fb960caa7e32a70635d8fa3a99fc3e53713bfde4fb SHA512 96e6226b37fe63b992257ae82970ebd1141477eef20c70d755d28a0c89b540a0a010903793511b249a0cec3e19771b60fb6a279ca1b134f655e6a7c636ff74a6
-AUX vdr-graphtft-0.3.7_gcc-4.4.x.diff 764 BLAKE2B d6c17555315e75c2bb96f13e31ac4d95c93199123d7b2d40ce11cf7c898d89e280b2a5552833d6b08bc653634622097b82ecef92dc1c91bd7e0eef6bc1246ea7 SHA512 bff4b655a4eeee4c4ecdf0f5e4efc259bd2e740a4ee64b8536ad668b2e1be5b607279173c01b1dc36a0636011d0d774fd3b3f28a40efa779efb342ef2c081619
-AUX vdr-graphtft-0.3.7_gentoo.diff 4673 BLAKE2B dc664130ed9d5f0f0380292c0f12e70f794e59fbe549a07c4a1917a1def1257718dd2293e586e0d605af907181f4bb412cbd17cbb91b1f0cf59f785fd3a747e9 SHA512 1828a1e463eef00eb0097188988b8ab620c766b27c44fbfedbd4209d1c668b6c6e6b0b86c4d16c485fdc5e16300e2c03c323f6dc2e941c9338e5a866b6d47a6a
-AUX vdr-graphtft-0.3.7_makefile.diff 2202 BLAKE2B 71fe295bf283defd9b6b73177f3a117778b97edf21f53a21f9a29ed8742c597a769d4188ea2b5384c548a2b7f589794499b284c7bad32bb0092ac40b04a89306 SHA512 9c8138658a18162436cf80173436c05967c4626decb640d0c304706e30b7771d1784b436dbf281ca934c7fe41b8b1edc102d05bd3d2ddd3875aefe5c33bc2ece
-DIST vdr-graphtft-0.3.7.tar.bz2 147486 BLAKE2B 22766d498cbb4f5bb950e1d74c73a42350c2adb96148dba5622785cdff4a1528451afdd6c839aa3c2de7ea373269620f8ebfc672ded1596032988f1a6685eaff SHA512 9f5d8ea490c95bde42071d5010bf4dd339ee99271f9596d2d14575882f8f4101f0877c52373268a9d04d52be328018b2a7be1685c088742b252de44b9c3a387d
-EBUILD vdr-graphtft-0.3.7-r1.ebuild 2701 BLAKE2B 82d8846df757d209aa43e9facbdb8ef16bfd957c26fea1b0ad09452af5fe836d0f3223af189c4690ae5b13cb2f6bfb331fb08cfdc3f78c0bde5c0244eebae270 SHA512 07df98b7de7605b272cf3d6408aa28b7e75c679677909d14a2c86aae3a0d16617e8760ec0d93cdc532ab2e8d77966a01f1caefb1a27514d0c163eeda55a3ab5d
-EBUILD vdr-graphtft-0.3.7.ebuild 2505 BLAKE2B acd8848f75f2492097be490cc04860a331b929ee9c5bc0c637b89a86bcff874121b2abc483738e116b4f08a74daa49080ec466c750dd7554b257ab9cc0c9531b SHA512 1d45855912fbf54caec9df0d9b26e107e8f6937d2baef44d87ff85176ad3e27523ab2bae7cd8772cd50b98a7a99d1ace31b25bf1a15de6d15a579adb04d9766d
-MISC metadata.xml 646 BLAKE2B 51274ec5c1d62ae28dd88341944f38d54325b54fef50e5fbb0ebfb925b7f7ae619600c095bb63f0ee3260266b8c959ecdd7f1b28f6889cf1e8a32e4818dc9ebb SHA512 39066ebaf80f460712ae210de55e5b5eb67778265f6cf6de2ff11db03ab3d239cf06b7e6d72912c6d98473117cfeb904bf755343218c32aa22af9e12d689ac40
diff --git a/media-plugins/vdr-graphtft/files/confd b/media-plugins/vdr-graphtft/files/confd
deleted file mode 100644
index 56d4b4627f12..000000000000
--- a/media-plugins/vdr-graphtft/files/confd
+++ /dev/null
@@ -1,54 +0,0 @@
-# /etc/conf.d/vdr.graphtft
-
-####### Global config for Graphtft ####################
-
-#
-# set the DIR of the Framebuffer Device
-#   allowed values: device_names directFB none
-#   default: /dev/fb0
-#GRAPHTFT_DEVICE=/dev/fb0 
-
-
-###### Configuration for graphtft-fe ##################
-#
-# set GRAPHTFT_DEVICE="" to none 
-
-# set your tft display 
-#	no default values
-#	default: not set, exemple
-#GRAPHTFT_DISPLAY=":0.1" 
-
-# switch to user 
-#	default user root ; depand on your x configuration
-#
-#GRAPHTFT_USER="root"
-
-# set the width of your display
-#	allowed values: 
-#	default: 800
-#GRAPHTFT_SCREEN_WIDTH="800"
-
-# set the height of your display
-#	allowed values:
-#	default: 480
-#GRAPHTFT_SCREEN_HEIGHT="480"
-
-# run output without windowsframe
-#	allowed values: yes no
-#	default: yes
-#GRAPHTFT_NO_FRAME="yes"
-
-# set the IP to your X Display
-#	allowed values: ip address
-#	default: localhost IP
-#GRAPHTFT_HOST="127.0.0.1"
-
-# set the port to your X Display
-#	allowed values: portnumber
-#	default: 2039
-#GRAPHTFT_PORT="2039"
-
-# set the logevel for graphtft-fe
-#	allowed values: 0 1 2 3
-# 	default: 0
-#GRAPHTFT_LOG_LEVEL="0"
diff --git a/media-plugins/vdr-graphtft/files/graphtft-fe b/media-plugins/vdr-graphtft/files/graphtft-fe
deleted file mode 100644
index 5803b5728ed9..000000000000
--- a/media-plugins/vdr-graphtft/files/graphtft-fe
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-. /etc/conf.d/vdr.graphtft
-
-export DISPLAY=${GRAPHTFT_DISPLAY}
-
-:   ${GRAPHTFT_USER:=root}
-
-OPTIONS="-h ${GRAPHTFT_HOST:=127.0.0.1}"
-OPTIONS="${OPTIONS} -p ${GRAPHTFT_PORT:=2039}"
-OPTIONS="${OPTIONS} -e ${GRAPHTFT_LOG_LEVEL:=0}"
-OPTIONS="${OPTIONS} -W ${GRAPHTFT_SCREEN_WIDTH:=800}"
-OPTIONS="${OPTIONS} -H ${GRAPHTFT_SCREEN_HEIGHT:=480}"
-[ "${GRAPHTFT_NO_FRAME}" = "yes" ] && OPTIONS="${OPTIONS} -n"
-[ "${GRAPHTFT_RESIZE_IMAGE}" = "yes" ] && OPTIONS="${OPTIONS} -r"
-
-# -d <file>       dump each image to file (default off)
-
-start() {
-		ebegin "starting graphtft-fe ..."
-		start-stop-daemon --make-pidfile --background --pidfile /var/run/graphtft-fe.pid \
-        --chuid ${GRAPHTFT_USER} --start --exec /usr/bin/graphtft-fe  -- ${OPTIONS}
-		eend $?
-}
-
-stop() {
-		ebegin "stopping graphtft ..."
-		start-stop-daemon --stop --pidfile /var/run/graphtft-fe.pid
-		eend $?
-}
-
diff --git a/media-plugins/vdr-graphtft/files/rc-addon.sh b/media-plugins/vdr-graphtft/files/rc-addon.sh
deleted file mode 100644
index 03fa4efc55be..000000000000
--- a/media-plugins/vdr-graphtft/files/rc-addon.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# rc-addon-script for plugin graphtft & graphtft-fe
-#
-# Joerg Bornkessel <hd_brummy@g.o>
-
-. /etc/conf.d/vdr.graphtft
-
-plugin_pre_vdr_start() {
-
-		: ${GRAPHTFT_DEVICE:=/dev/fb0}
-
-		add_plugin_param "-d ${GRAPHTFT_DEVICE}"
-}
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_gcc-4.4.x.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_gcc-4.4.x.diff
deleted file mode 100644
index 4e32c187ac10..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_gcc-4.4.x.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur graphtft-30.orig/graphtft-fe/common.cc graphtft-30/graphtft-fe/common.cc
---- graphtft-30.orig/graphtft-fe/common.cc	2012-03-12 02:10:38.000000000 +0100
-+++ graphtft-30/graphtft-fe/common.cc	2012-03-12 02:30:16.000000000 +0100
-@@ -11,6 +11,7 @@
- #include <time.h>
- #include <stdio.h>
- #include <string.h>
-+#include <stdint.h>
- 
- #include <graphtft.hpp>
- 
-diff -Naur graphtft-30.orig/graphtft-fe/graphtft.hpp graphtft-30/graphtft-fe/graphtft.hpp
---- graphtft-30.orig/graphtft-fe/graphtft.hpp	2012-03-12 02:10:38.000000000 +0100
-+++ graphtft-30/graphtft-fe/graphtft.hpp	2012-03-12 02:30:57.000000000 +0100
-@@ -16,6 +16,7 @@
- #include <X11/Xlib.h>
- #include <Imlib2.h>
- #include <string.h>
-+#include <stdint.h>
- 
- #define __FRONTEND
- #include <../common.h>
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_gentoo.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_gentoo.diff
deleted file mode 100644
index ea0e7ad3d748..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_gentoo.diff
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -Naur graphtft-30.orig/dfbrenderer/dfbrenderer.c graphtft-30/dfbrenderer/dfbrenderer.c
---- graphtft-30.orig/dfbrenderer/dfbrenderer.c	2012-03-12 03:27:38.000000000 +0100
-+++ graphtft-30/dfbrenderer/dfbrenderer.c	2012-03-12 03:29:35.000000000 +0100
-@@ -257,7 +257,7 @@
-       {
-          // make path relative to the themes directory
- 
--         asprintf(&path, "%s/graphTFT/themes/%s/%s", 
-+         asprintf(&path, "%s/themes/%s/%s", 
-                   confPath.c_str(), themePath.c_str(), p.c_str());
-       }
-       else
-@@ -281,7 +281,7 @@
-    
-    // at least add the default path
- 
--   asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str());
-+   asprintf(&path, "%s/fonts/", confPath.c_str());
-    tell(0, "Info: Adding font path '%s'", path);
-    fontPaths[count] = path;
-    free(path);
-@@ -483,7 +483,7 @@
-    else
-    {
-       const char* tmp = themePath.c_str();
--      asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname);
-+      asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname);
-    }
- 
-    tell(4,"creating imageprovider for %s", fpath);
-@@ -561,7 +561,7 @@
-    else
-    {
-       const char* tmp = themePath.c_str();
--      asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname);
-+      asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname);
-    }
- 
-    tell(4,"creating imageprovider for %s", fpath);
-diff -Naur graphtft-30.orig/dspitems.c graphtft-30/dspitems.c
---- graphtft-30.orig/dspitems.c	2012-03-12 03:27:38.000000000 +0100
-+++ graphtft-30/dspitems.c	2012-03-12 03:30:16.000000000 +0100
-@@ -107,7 +107,7 @@
-       if (p[0] != '/')
-       {
-          p = string(GraphTFTSetup.PluginConfPath) 
--            + "/graphTFT/themes/" 
-+            + "/themes/" 
-             + string(Thms::theTheme->getDir()) 
-             + "/" + p;
-       }
-diff -Naur graphtft-30.orig/graphtft.c graphtft-30/graphtft.c
---- graphtft-30.orig/graphtft.c	2012-03-12 03:27:38.000000000 +0100
-+++ graphtft-30/graphtft.c	2012-03-12 03:32:48.000000000 +0100
-@@ -22,6 +22,8 @@
- #include <graphtft.h>
- #include <span.h>
- 
-+#define DATA_DIR "/usr/share/vdr/graphTFT"
-+
- //***************************************************************************
- // cGraphTFTMenu
- //***************************************************************************
-@@ -300,13 +302,13 @@
- 
-    // try to get the config dir
- 
--   if (!ConfigDirectory())
--      return false;
-+//   if (!ConfigDirectory())
-+//      return false;
- 
-    // init 
- 
-    GraphTFTSetup.setClient(this);
--   GraphTFTSetup.PluginConfPath = strdup(ConfigDirectory());
-+   GraphTFTSetup.PluginConfPath = strdup(DATA_DIR);
- 
- #if APIVERSNUM < 10507
-    RegisterI18n(Phrases);
-@@ -322,7 +324,7 @@
-    if (loadThemes() != 0)
-       return false;
- 
--   if (display->Init(_dev, ConfigDirectory(), port) != success)
-+   if (display->Init(_dev, DATA_DIR, port) != success)
-    {
-       tell(0, "Error: Initializing graphTFT device faild, aborting!");
- 
-@@ -355,8 +357,8 @@
- 
-    // look for the themes in the config directory
- 
--   asprintf(&buffer, "find %s/graphTFT/themes -follow -type f -name '*.theme' | sort", 
--            ConfigDirectory());
-+   asprintf(&buffer, "find %s/themes -follow -type f -name '*.theme' | sort", 
-+            DATA_DIR);
- 
-    p = popen(buffer, "r");
- 
-diff -Naur graphtft-30.orig/imlibrenderer/imlibrenderer.c graphtft-30/imlibrenderer/imlibrenderer.c
---- graphtft-30.orig/imlibrenderer/imlibrenderer.c	2012-03-12 03:27:38.000000000 +0100
-+++ graphtft-30/imlibrenderer/imlibrenderer.c	2012-03-12 03:33:54.000000000 +0100
-@@ -123,7 +123,7 @@
-       {
-          // make path relative to the themes directory
- 
--         asprintf(&path, "%s/graphTFT/themes/%s/%s", 
-+         asprintf(&path, "%s/themes/%s/%s", 
-                   confPath.c_str(), themePath.c_str(), p.c_str());
-       }
-       else
-@@ -146,7 +146,7 @@
-    
-    // at least add the default path
- 
--   asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str());
-+   asprintf(&path, "%s/fonts/", confPath.c_str());
-    tell(0, "Info: Adding font path '%s'", path);
-    imlib_add_path_to_font_path(path);
-    free(path);
-@@ -217,7 +217,7 @@
-    if (fname[0] == '/')
-       path << fname;
-    else
--      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
-+      path << confPath << "/themes/" << themePath << "/" << fname; 
- 
-    if (!fileExists(path.str().c_str()))
-    { 
-@@ -291,7 +291,7 @@
-    if (fname[0] == '/')
-       path << fname;
-    else
--      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
-+      path << confPath << "/themes/" << themePath << "/" << fname; 
- 
-    if (!fileExists(path.str().c_str()))
-    { 
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_makefile.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_makefile.diff
deleted file mode 100644
index f638be630069..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_makefile.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-Joerg Bornkessel <hd_brummy@g.o> 22 Okt 2009
-Matthias Schwarzott <zzam@g.o> 23 Okt 2009
-diff -Naur graphtft-24.orig/Makefile graphtft-24/Makefile
---- graphtft-24.orig/Makefile	2009-10-21 21:53:56.000000000 +0200
-+++ graphtft-24/Makefile	2009-10-21 21:57:24.000000000 +0200
-@@ -158,10 +158,10 @@
- DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
- 
- ifdef HAVE_IMLIB
--  LIBS += `imlib2-config --libs`
-+  LIBS += $(shell imlib2-config --libs)
- 
-   ifdef HAVE_IMAGE_MAGICK
--    LIBS += `Magick++-config --libs`
-+    LIBS += $(shell Magick++-config --libs)
-     DEFINES += -DHAVE_IMAGE_MAGICK
-   endif
- 
-@@ -170,8 +170,8 @@
- endif
- 
- ifdef HAVE_GTOP
--  GTOP_INC = `pkg-config libgtop-2.0 --cflags`
--  GTOP_LIB = `pkg-config libgtop-2.0 --libs`
-+  GTOP_INC = $(shell pkg-config libgtop-2.0 --cflags)
-+  GTOP_LIB = $(shell pkg-config libgtop-2.0 --libs)
- 
-   DEFINES += -DWITH_SYSINFO
-   LIBS += $(GTOP_LIB)
-@@ -186,8 +186,8 @@
- endif
- 
- ifdef HAVE_DFB
--  INCLUDES += `directfb-config --cflags`
--  LIBS += `directfb-config --libs`
-+  INCLUDES += $(shell directfb-config --cflags)
-+  LIBS += $(shell directfb-config --libs)
-   DEFINES += -DHAVE_DFB
- endif
- 
-diff -Naur graphtft-24.orig/graphtft-fe/Makefile graphtft-24/graphtft-fe/Makefile
---- graphtft-24.orig/graphtft-fe/Makefile	2009-10-22 17:39:55.000000000 +0200
-+++ graphtft-24/graphtft-fe/Makefile	2009-10-22 17:41:29.000000000 +0200
-@@ -1,9 +1,9 @@
- 
- CXX           = g++
- CXXFLAGS      = -pipe -ggdb -O2 -Wall -W -D_REENTRANT -fPIC
--INCPATH       = -I. `Magick++-config --cppflags`
-+INCPATH       = -I. $(shell Magick++-config --cppflags)
- LFLAGS        = -Wl,--no-undefined
--LIBS          = -lpthread `imlib2-config --libs` `Magick++-config --libs`
-+LIBS          = -lpthread $(shell imlib2-config --libs) $(shell Magick++-config --libs)
- AR            = ar
- 
- TARGET = graphtft-fe
-diff -Naur graphtft-24.orig/graphtft-fe/Makefile graphtft-24/graphtft-fe/Makefile
---- graphtft-24.orig/graphtft-fe/Makefile	2009-10-23 16:20:43.000000000 +0200
-+++ graphtft-24/graphtft-fe/Makefile	2009-10-23 16:21:20.000000000 +0200
-@@ -17,7 +17,7 @@
- 
- all: 
- 	echo Build graphTFT Frontend
--	@(make $(TARGET))
-+	@$(MAKE) $(TARGET)
- 
- 
- $(TARGET): $(OBJECTS)
diff --git a/media-plugins/vdr-graphtft/metadata.xml b/media-plugins/vdr-graphtft/metadata.xml
deleted file mode 100644
index 572dd1039e77..000000000000
--- a/media-plugins/vdr-graphtft/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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="graphtft-fe">Install external x11 remote frontend</flag>
-		<flag name="theme_avp">graphTFT Alien vs. Predato theme</flag>
-		<flag name="theme_deepblue">graphTFT default theme</flag>
-		<flag name="theme_deeppurple">graphTFT Deep Purple theme</flag>
-		<flag name="theme_poetter">graphTFT Poetter theme</flag>
-		<flag name="touchscreen">Enable Touchscreen support</flag>
-	</use>
-</pkgmetadata>
diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.7-r1.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.7-r1.ebuild
deleted file mode 100644
index 7a006e12d58a..000000000000
--- a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.7-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2 flag-o-matic
-
-RESTRICT="test"
-
-DESCRIPTION="VDR plugin: GraphTFT"
-HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin"
-SRC_URI="http://www.jwendel.de/vdr/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-
-IUSE_THEMES="+theme_deepblue theme_avp theme_deeppurple theme_poetter"
-IUSE="${IUSE_THEMES} directfb graphtft-fe imagemagick touchscreen"
-
-DEPEND=">=media-video/vdr-1.7.27[graphtft]
-		media-libs/imlib2[png,jpeg]
-		gnome-base/libgtop
-		>=virtual/ffmpeg-0.4.8_p20090201
-		imagemagick? ( media-gfx/imagemagick[png,jpeg,cxx] )
-		directfb? ( dev-libs/DirectFB )
-		graphtft-fe? ( media-libs/imlib2[png,jpeg,X] )"
-
-RDEPEND="${DEPEND}"
-
-PDEPEND="theme_deepblue? ( =x11-themes/vdrgraphtft-deepblue-0.3.1 )
-		theme_avp? ( =x11-themes/vdrgraphtft-avp-0.3.1 )
-		theme_deeppurple? ( =x11-themes/vdrgraphtft-deeppurple-0.3.2 )
-		theme_poetter? ( =x11-themes/vdrgraphtft-poetter-0.3.2 )"
-
-PATCHES=("${FILESDIR}/${P}_gentoo.diff"
-		"${FILESDIR}/${P}_makefile.diff"
-		"${FILESDIR}/${P}_gcc-4.4.x.diff")
-
-src_prepare() {
-
-	# remove untranslated Language
-	rm "${S}"/po/{ca_ES,cs_CZ,da_DK,el_GR,es_ES,et_EE,fr_FR,hr_HR,hu_HU,nl_NL,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
-
-	sed -i Makefile -e "s:  WITH_X_COMM = 1:#WITH_X_COMM = 1:"
-
-	! use touchscreen && sed -i Makefile  \
-		-e "s:WITH_TOUCH = 1:#WITH_TOUCH = 1:"
-
-	use graphtft-fe && sed -i Makefile \
-		-e "s:#WITH_X_COMM:WITH_X_COMM:"
-
-	# libav9 support
-	sed -i \
-		-e 's:avcodec.h>:avcodec.h>\n#include <libavutil/mem.h>:' \
-		imlibrenderer/dvbrenderer/mpeg2encoder.c || die
-
-	# libav10 support, wrt bug 519448
-	sed -i \
-		-e "s:CODEC_ID_MPEG1VIDEO:AV_CODEC_ID_MPEG1VIDEO:" \
-		-e "s:avcodec_alloc_frame:av_frame_alloc:" \
-		imlibrenderer/dvbrenderer/mpeg2encoder.c || die
-
-	vdr-plugin-2_src_prepare
-
-	vdr_remove_i18n_include graphtft.h setup.h
-
-	# UINT64_C is needed by ffmpeg headers
-	append-cxxflags -D__STDC_CONSTANT_MACROS
-
-	if has_version ">=media-video/vdr-1.7.33"; then
-		sed -i dspitems.c \
-			-e "s:int timerMatch = 0:eTimerMatch timerMatch = tmNone:"
-	fi
-}
-
-src_compile() {
-	vdr-plugin-2_src_compile
-
-	if use graphtft-fe; then
-		cd "${S}"/graphtft-fe
-		emake
-	fi
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	dodoc "${S}"/documents/{README,HISTORY,HOWTO.Themes,INSTALL}
-
-	if use graphtft-fe; then
-		cd "${S}"/graphtft-fe && dobin graphtft-fe
-		doinit graphtft-fe
-	fi
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	if use graphtft-fe; then
-		echo
-		elog "Graphtft-fe user:"
-		elog "Edit /etc/conf.d/vdr.graphtft"
-		elog "/etc/init.d/graphtft-fe start"
-		echo
-	fi
-}
diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.7.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.7.ebuild
deleted file mode 100644
index 654ec763257c..000000000000
--- a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.7.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vdr-plugin-2 flag-o-matic
-
-RESTRICT="test"
-
-DESCRIPTION="VDR plugin: GraphTFT"
-HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin"
-SRC_URI="http://www.jwendel.de/vdr/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-
-IUSE_THEMES="+theme_deepblue theme_avp theme_deeppurple theme_poetter"
-IUSE="${IUSE_THEMES} directfb graphtft-fe imagemagick touchscreen"
-
-DEPEND=">=media-video/vdr-1.7.27[graphtft]
-		media-libs/imlib2[png,jpeg]
-		gnome-base/libgtop
-		>=virtual/ffmpeg-0.4.8_p20090201
-		imagemagick? ( media-gfx/imagemagick[png,jpeg,cxx] )
-		directfb? ( dev-libs/DirectFB )
-		graphtft-fe? ( media-libs/imlib2[png,jpeg,X] )"
-
-RDEPEND="${DEPEND}"
-
-PDEPEND="theme_deepblue? ( =x11-themes/vdrgraphtft-deepblue-0.3.1 )
-		theme_avp? ( =x11-themes/vdrgraphtft-avp-0.3.1 )
-		theme_deeppurple? ( =x11-themes/vdrgraphtft-deeppurple-0.3.2 )
-		theme_poetter? ( =x11-themes/vdrgraphtft-poetter-0.3.2 )"
-
-PATCHES=("${FILESDIR}/${P}_gentoo.diff"
-		"${FILESDIR}/${P}_makefile.diff"
-		"${FILESDIR}/${P}_gcc-4.4.x.diff")
-
-src_prepare() {
-
-	# remove untranslated Language
-	rm "${S}"/po/{ca_ES,cs_CZ,da_DK,el_GR,es_ES,et_EE,fr_FR,hr_HR,hu_HU,nl_NL,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
-
-	sed -i Makefile -e "s:  WITH_X_COMM = 1:#WITH_X_COMM = 1:"
-
-	! use touchscreen && sed -i Makefile  \
-		-e "s:WITH_TOUCH = 1:#WITH_TOUCH = 1:"
-
-	use graphtft-fe && sed -i Makefile \
-		-e "s:#WITH_X_COMM:WITH_X_COMM:"
-
-	# libav9 support
-	sed -i \
-		-e 's:avcodec.h>:avcodec.h>\n#include <libavutil/mem.h>:' \
-		imlibrenderer/dvbrenderer/mpeg2encoder.c || die
-
-	vdr-plugin-2_src_prepare
-
-	vdr_remove_i18n_include graphtft.h setup.h
-
-	# UINT64_C is needed by ffmpeg headers
-	append-cxxflags -D__STDC_CONSTANT_MACROS
-
-	if has_version ">=media-video/vdr-1.7.33"; then
-		sed -i dspitems.c \
-			-e "s:int timerMatch = 0:eTimerMatch timerMatch = tmNone:"
-	fi
-}
-
-src_compile() {
-	vdr-plugin-2_src_compile
-
-	if use graphtft-fe; then
-		cd "${S}"/graphtft-fe
-		emake
-	fi
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	dodoc "${S}"/documents/{README,HISTORY,HOWTO.Themes,INSTALL}
-
-	if use graphtft-fe; then
-		cd "${S}"/graphtft-fe && dobin graphtft-fe
-		doinit graphtft-fe
-	fi
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	if use graphtft-fe; then
-		echo
-		elog "Graphtft-fe user:"
-		elog "Edit /etc/conf.d/vdr.graphtft"
-		elog "/etc/init.d/graphtft-fe start"
-		echo
-	fi
-}