gentoo resync : 02.08.2019

3 files changed, 2 insertions, 35 deletions

diff --git a/media-plugins/vdr-fritzbox/Manifest b/media-plugins/vdr-fritzbox/Manifest
index c7a180802557..908c334ef312 100644
--- a/media-plugins/vdr-fritzbox/Manifest
+++ b/media-plugins/vdr-fritzbox/Manifest
@@ -1,5 +1,4 @@
 AUX vdr-fritzbox-1.5.3-boost-1.67.patch 597 BLAKE2B 8efc4aa1ff4418bf9d627032a89d3975d264446266f92a823ccf467dfa8a593ff3c99768e9ae3a8421fb9bfc72145ec5b114997c4f653f5fc786cff45375d13c SHA512 97ab8e2e572be18dea596a6b66eae5d1929c7178bc5027abd6035240fab0fa76afe26170007e7c84776f11d4c452fa39fc8140a21adcba5eb78912984809098a
 DIST vdr-fritzbox-1.5.3.tgz 132207 BLAKE2B c9a93e922eeb2126279409e3948c44cb1fc3348d44fbcc2c1116038d66fc77a707d3885a6d587c8996138fcaff134bb78db4dab2d122caf0293d2d8d8770e985 SHA512 d396bb1386ffc4b53867c735d4ffc710c4266067e011e17f2d4aa597ecceeb502d2c6e23a1df69f929503b2cd5d07f4d57869c890040b1ae9af1742c044541be
-EBUILD vdr-fritzbox-1.5.3-r1.ebuild 1005 BLAKE2B 6aab7bf9f70f0ca7d88711e4f391824131ac0a9582d84cebf06dccb44cfe904f545b3c3c7c6452fceee88d7dd509c9fadc32a6193b5c3cf5c0832ddb9b2ddceb SHA512 ce345543bc5c04245858badd208607ba4529746221789a1746554611af724db52588f50249ec0ec7530f4e8c271a4c3b7363bd0bca82e306f513ce771ab7520a
-EBUILD vdr-fritzbox-1.5.3.ebuild 968 BLAKE2B 2e8313392be56bafbf092c188c344db693cc0679432b02466fdd7c31cc1f36c44e3f31ee065e240ad85d1bf8f61c7a42d0fe46cbeef9083042019aaa5cf15b60 SHA512 182f0f127cb3982a70f0d88143dee964b554e43a485a8acb51d60099fce64e73158d8701385cbae94172e8b64fc2b704b90d8f10eccad31ab91ebf8bfed2e9cb
+EBUILD vdr-fritzbox-1.5.3-r1.ebuild 1003 BLAKE2B f92a48063e1c4ee3460f6b1519bc425ffcfa3171a0c6325b449104cd2e0cc1ddea2bd6e64ec6892455dd48b71e5ed5b205c185a14166543c5dd80efa8161ec94 SHA512 a0a4f5a44a82fe8999ac744f2faa1dab9a4086be09191fbb549a380a18476c37b4f0899b8813251be399f51518d21f077e2c2b3b87793b41ac51da5013e3b439
 MISC metadata.xml 330 BLAKE2B 6f2fc336e9406fcc2413210e07d2396d1fe4faff1e8be1ae7d16428e5df9c46f7c00b2f183fb9e6e973014e6ce46379d12774e3597f3caf901f812f5c90b5360 SHA512 b0521cb557fc56b09d61f9dded16f511d306151642b7a45cb243132d216531459d519a5abd9b38c23c7799b03bbaea8f8e2122a9b28ae200940fdc8a194cf0f5
diff --git a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r1.ebuild b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r1.ebuild
index eaa4abe5e236..9722986e6a33 100644
--- a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r1.ebuild
+++ b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jowi24/vdr-fritz/releases/download/1.5.3/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3.ebuild b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3.ebuild
deleted file mode 100644
index 1916317801ce..000000000000
--- a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: Inform about incoming phone-calls and use the fritz!box phonebook"
-HOMEPAGE="https://github.com/jowi24/vdr-fritz"
-SRC_URI="https://github.com/jowi24/vdr-fritz/releases/download/1.5.3/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.7.34
-		dev-libs/libgcrypt:0
-		dev-libs/boost[threads]"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
-	echo
-	elog "It is recommend to update your firmware release to the latest."
-	echo
-	elog "The integrated call monitor (available in Fritz!Box official"
-	elog "firmware releases >= *.04.29) has to be enabled in order to"
-	elog "have the vdr-fritzbox plugin display anything on your tv. To"
-	elog "enable it call #96*5* from your telephone. If that doesn't"
-	elog "work for you, read the documentation for further instructions."
-	echo
-}