gentoo resync : 15.01.2020

4 files changed, 5 insertions, 72 deletions

diff --git a/media-plugins/vdr-wapd/Manifest b/media-plugins/vdr-wapd/Manifest
index ec556b04e440..0b5ae9d967e0 100644
--- a/media-plugins/vdr-wapd/Manifest
+++ b/media-plugins/vdr-wapd/Manifest
@@ -8,7 +8,5 @@ AUX wapd.mk 2560 BLAKE2B d366cdef89b377bf82888758d77077c69bbc41413b33072922bf602
 AUX waphosts 234 BLAKE2B f5cb2d56b83508fdae9991a002f2d44b92a0a0332a931eab5b0c817ff79bfaa3a0547a022f5bfd794f8fbc26d2b187be159c73a59da3416aa3aff2817e348103 SHA512 f71b863e68a81f7e89c8fbf1b7cb96486f7a9d46d35b18a7b25cb59c931905a26cc279b23df7fbc869e6a335886e64ddcf58e45fdd41c6336727414af7aa2533
 DIST vdr-wapd-0.9.tgz 31975 BLAKE2B 5cef88fb6ea7582cfcdd76cb43c469aa99f10bec6db16abbcbdf596c889e41912dfe9c5344720a5e26634e50df0a4d3214e823e4fb97c4a3129419ecc99feec4 SHA512 787bc433896e01efb482507251f4a6cb878ce40b869625ff5b7177f64f4dba4b4dcffa648c39d1d8c1930da5fb98db9155ebc40ed349bf2093a5e10f7314f1dd
 DIST wapd-0.9-patch1.diff.gz 3091 BLAKE2B 53f9e0bf88a479cd7c3f09cdca4a87aa0988f02fdb2a0dc87a3745fd7d6230685d0c4796ddaafcaa2614efce5f6e8b07c6bbfa11aff93c0e1b2ad0006ca24357 SHA512 16dd9225bd0f40f668317ee8a957c0b113a261fe779931b546634fa8e09de3431359d7b8d3846b4781021438bcc660fc714bf17699dacc94af1fd16885a00450
-EBUILD vdr-wapd-0.9.ebuild 677 BLAKE2B be15349062f65a679f937ec431401380c308b8841618cc68adbc4761cca6fba19fcfc0ece50591c229a734944c4af8ef1e1b150dcdc5700b1b72fd1d4394e291 SHA512 fcb11aca660878111e54cd3f6a16b7928975672489ff40e30798c9e8b33af9d5fcc962624a0862b1ae5a481d8c29a90055496ecf46e663030d1e52293d0901f1
-EBUILD vdr-wapd-0.9_p1-r1.ebuild 1028 BLAKE2B 48490caad4ff631faf79803454d676af5aa3485a05cd0a298bd9d0c3665ad7b12cf8cad6770d3b5d01f5e859f8419f767cac11bedc1e672b0fc214ea082e2920 SHA512 92fc2c2afa12bac35e52c8a4c54d4a92320edcce78c57ec1209586338db8a9269f22a34fe48d445a01a099b8fd705c69519c3bbdcb4beaa983071170bf650570
-EBUILD vdr-wapd-0.9_p1.ebuild 886 BLAKE2B ac35cbc2d5807650fb98bc019e0ad6bea173f86be26f4b9d9ea19820826cd4e9f3115fced61d8ae7093842d569d711fd3c61956cc35b9606e719c330a8abf8b1 SHA512 8945548bcadf33f5285380e4ffefb75c5e30cd2c8f2aff2aa7ae71539e4801d9d17ccfbc309fa03f8c10690a4041e3c96e4de6f075589818ab7b2f2206b4bd8c
+EBUILD vdr-wapd-0.9_p1-r1.ebuild 980 BLAKE2B 88c53fe7c7c07dbd4b864581e8f490c416ecf979f7bdd4837f46f63982b0c9f0b475884830f4003b44dabe8c8504c7c434f59206d7353e0d1aa19ee30692e4f1 SHA512 79ef0f21d07f5e9bcba37355b495b50c3bab99fa15b8ce7e94cc92c71a49be46cb08b4050b0e818e08e8973d3cdb5ed478348608e5f4efde9d2df212f9013bfe
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-wapd/vdr-wapd-0.9.ebuild b/media-plugins/vdr-wapd/vdr-wapd-0.9.ebuild
deleted file mode 100644
index 7e7fd274897d..000000000000
--- a/media-plugins/vdr-wapd/vdr-wapd-0.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR plugin: lets VDR listen to WAP requests to allow remote control by WML enabled browsers"
-HOMEPAGE="http://www.heiligenmann.de/vdr/vdr/plugins/wapd.html"
-SRC_URI="http://www.heiligenmann.de/vdr/download/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.44"
-
-PATCHES=("${FILESDIR}/${P}_gcc-4.1.x.diff"
-	"${FILESDIR}/${P}-gentoo.diff")
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	dobin "${S}/wappasswd"
-
-	insinto /etc/vdr/plugins/wapd
-	doins "${FILESDIR}"/{waphosts,wapaccess}
-}
diff --git a/media-plugins/vdr-wapd/vdr-wapd-0.9_p1-r1.ebuild b/media-plugins/vdr-wapd/vdr-wapd-0.9_p1-r1.ebuild
index 56be4b687941..73a058020cfa 100644
--- a/media-plugins/vdr-wapd/vdr-wapd-0.9_p1-r1.ebuild
+++ b/media-plugins/vdr-wapd/vdr-wapd-0.9_p1-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
 MY_P="${PN}-${PV%_p*}"
 
-DESCRIPTION="VDR plugin: lets VDR listen to WAP requests to allow remote control by WML enabled browsers"
-HOMEPAGE="http://www.heiligenmann.de/vdr/vdr/plugins/wapd.html"
+DESCRIPTION="VDR plugin: lets VDR listen to WAP requests on WML enabled browsers"
+HOMEPAGE="http://www.heiligenmann.de/"
 SRC_URI="http://www.heiligenmann.de/vdr/download/${MY_P}.tgz
-	http://www.heiligenmann.de/vdr/download/${MY_P#vdr-}-patch1.diff.gz"
+		http://www.heiligenmann.de/vdr/download/${MY_P#vdr-}-patch1.diff.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-plugins/vdr-wapd/vdr-wapd-0.9_p1.ebuild b/media-plugins/vdr-wapd/vdr-wapd-0.9_p1.ebuild
deleted file mode 100644
index ad62d5d100d2..000000000000
--- a/media-plugins/vdr-wapd/vdr-wapd-0.9_p1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-MY_P="${PN}-${PV%_p*}"
-
-DESCRIPTION="VDR plugin: lets VDR listen to WAP requests to allow remote control by WML enabled browsers"
-HOMEPAGE="http://www.heiligenmann.de/vdr/vdr/plugins/wapd.html"
-SRC_URI="http://www.heiligenmann.de/vdr/download/${MY_P}.tgz
-	http://www.heiligenmann.de/vdr/download/${MY_P#vdr-}-patch1.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.44"
-
-PATCHES=("${FILESDIR}/${MY_P}_gcc-4.1.x.diff"
-	"${FILESDIR}/${MY_P}-gentoo.diff"
-	"${WORKDIR}/${MY_P#vdr-}-patch1.diff"
-	"${FILESDIR}/${MY_P}-as-needed.patch")
-
-S="${WORKDIR}/${MY_P#vdr-}"
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	dobin "${S}/wappasswd"
-
-	insinto /etc/vdr/plugins/wapd
-	doins "${FILESDIR}"/{waphosts,wapaccess}
-}