media-plugins/vdr-vcd: remove old, use HTTPs, fix download link, add EAPI6 ebuild

diff --git a/media-plugins/vdr-vcd/vdr-vcd-0.9-r1.ebuild b/media-plugins/vdr-vcd/vdr-vcd-0.9-r1.ebuild
deleted file mode 100644 (file)
index d31f5da..0000000
--- a/media-plugins/vdr-vcd/vdr-vcd-0.9-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR plugin: play video cds"
-
-HOMEPAGE="http://www.heiligenmann.de/"
-SRC_URI=" http://www.heiligenmann.de/vdr/download/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.5.9"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}_xgettext.diff"
-               "${FILESDIR}/${P}_vdr-1.7.2.diff" )
-
-src_prepare() {
-       vdr-plugin-2_src_prepare
-
-       # Patch Makefile, as VDRDIR is no well known variable name
-       # to stop spare -I in gcc cmdline
-       sed -e 's:$(VDRINC):$(VDRDIR)/include:' -i Makefile
-}

diff --git a/media-plugins/vdr-vcd/vdr-vcd-0.9-r3.ebuild b/media-plugins/vdr-vcd/vdr-vcd-0.9-r3.ebuild
index 64dfed857f61fbab636b6415d5ac9fc7bb53fb41..9d42ec0aedf1ad7b54f34d3369b61ec725328264 100644 (file)
--- a/media-plugins/vdr-vcd/vdr-vcd-0.9-r3.ebuild
+++ b/media-plugins/vdr-vcd/vdr-vcd-0.9-r3.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=5
@@ -7,8 +7,8 @@ inherit vdr-plugin-2
 
 DESCRIPTION="VDR plugin: play video cds"
 
-HOMEPAGE="http://www.heiligenmann.de/"
-SRC_URI=" http://www.heiligenmann.de/vdr/download/${P}.tgz"
+HOMEPAGE="https://www.heiligenmann.de/"
+SRC_URI=" http://www.vdr.heiligenmann.de/download/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"

diff --git a/media-plugins/vdr-vcd/vdr-vcd-0.9-r2.ebuild b/media-plugins/vdr-vcd/vdr-vcd-0.9-r4.ebuild
similarity index 62%
rename from media-plugins/vdr-vcd/vdr-vcd-0.9-r2.ebuild
rename to media-plugins/vdr-vcd/vdr-vcd-0.9-r4.ebuild
index 09c9d99f43196b99fc351c72931f1a4282be75ec..fc35fd6c45a3bee7a74b47e208d186be91ae24de 100644 (file)
--- a/media-plugins/vdr-vcd/vdr-vcd-0.9-r2.ebuild
+++ b/media-plugins/vdr-vcd/vdr-vcd-0.9-r4.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit vdr-plugin-2
 
 DESCRIPTION="VDR plugin: play video cds"
 
-HOMEPAGE="http://www.heiligenmann.de/"
-SRC_URI=" http://www.heiligenmann.de/vdr/download/${P}.tgz"
+HOMEPAGE="https://www.heiligenmann.de/"
+SRC_URI="http://www.vdr.heiligenmann.de/download/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -20,12 +20,13 @@ RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}_xgettext.diff"
                "${FILESDIR}/${P}_vdr-1.7.2.diff"
-               "${FILESDIR}/${P}_devicetrickspeed.patch" )
+               "${FILESDIR}/${P}_devicetrickspeed.patch"
+               "${FILESDIR}/${P}_gcc-6.patch" )
 
 src_prepare() {
        vdr-plugin-2_src_prepare
 
        # Patch Makefile, as VDRDIR is no well known variable name
        # to stop spare -I in gcc cmdline
-       sed -e 's:$(VDRINC):$(VDRDIR)/include:' -i Makefile
+       sed -e 's:$(VDRINC):$(VDRDIR)/include:' -i Makefile || die
 }