From: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Date: Wed, 13 Jun 2018 19:04:36 +0000 (+0200)
Subject: media-plugins/vdr-vcd: remove old, use HTTPs, fix download link, add EAPI6 ebuild
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d703ade3601279a4ff9a8612103fb669f5ebb1fd;p=gentoo.git

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
index d31f5da54e0f..000000000000
--- 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 64dfed857f61..9d42ec0aedf1 100644
--- 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 09c9d99f4319..fc35fd6c45a3 100644
--- 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
 }