media-plugins/vdr-wapd: fixed HOMEPAGE, SRC_URI

Bug: https://bugs.gentoo.org/638458
Package-Manager: Portage-2.3.81, Repoman-2.3.18
Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org>

3 files changed, 5 insertions, 72 deletions

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..54c7f8daf852 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,14 @@
 # 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"
-SRC_URI="http://www.heiligenmann.de/vdr/download/${MY_P}.tgz
-	http://www.heiligenmann.de/vdr/download/${MY_P#vdr-}-patch1.diff.gz"
+DESCRIPTION="VDR plugin: lets VDR listen to WAP requests on WML enabled browsers"
+HOMEPAGE="http://www.heiligenmann.de/"
+SRC_URI="http://www.vdr.heiligenmann.de/download/${PN}-0.9.tgz
+		http://www.vdr.heiligenmann.de/download/wapd-0.9-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}
-}