gentoo resync : 14.07.2018

4 files changed, 12 insertions, 42 deletions

diff --git a/media-plugins/vdr-vcd/Manifest b/media-plugins/vdr-vcd/Manifest
index 0ccaa0b386ce..d6164cb3657d 100644
--- a/media-plugins/vdr-vcd/Manifest
+++ b/media-plugins/vdr-vcd/Manifest
@@ -5,7 +5,6 @@ AUX vdr-vcd-0.9_gcc-6.patch 681 BLAKE2B a3b1c5b26056c5dc77384ce1e4475273ec432d7e
 AUX vdr-vcd-0.9_vdr-1.7.2.diff 504 BLAKE2B 0a64d3ad808bbfbd643c55204fafff9a96504c9ec48430cb98689c3fef752099babad005d31f9155f8124d958a9115df93a1dd7b9b9e658b52382457834f5564 SHA512 51dffde0b098db7bdc5f0cfa8f7a77c37add76075968c9c02553d3214055495041afabadc8754479678648bd968aa4928cb35a3735f34fa0f006f37d82b344ab
 AUX vdr-vcd-0.9_xgettext.diff 7167 BLAKE2B b861b3cdd4f87dc27b7f9dcb155714752b3990ee2c2deb5dacc85566dbf950dd60981988326dff962eb453d6c172316ccf0930a2f6d22831134c3416c843729f SHA512 7e54813e5a685cd95bb9f274946e155f00dc5e9f1b1c6c317d10a3ab796bca1a505cd67eedbbf635477b83ba7066c980be66e2e8cb10e49a5fd802e7fd82b548
 DIST vdr-vcd-0.9.tgz 33687 BLAKE2B e3631e9556fa16351fe336fc71da0b7ed385b39ecef722a92a98648ffd8a0f0767531b92af8888ef408dc1d56860d17860fa24c7c18cfc62b91cb2de60977a01 SHA512 d1d58a5395877da38ee16f6b338e957781a4369497b9a3f92b80ce8b3577eb4a2387108d1da8889c3195b49c3b0f0e6baebc9c1868a35d7727de0c2b6e81469b
-EBUILD vdr-vcd-0.9-r1.ebuild 667 BLAKE2B 28d1e8bd0c80da1b586cfa2880f03ceec5003060b8519991ddc970f6be4211ccb2f1aab18e523ac3203787a339e4be29d81563ea8e70a24e6dff7c3f74f1a5e9 SHA512 96f9ac3fda69c368ecd50052b3fb8465c61ae2c61ab303aabce73915e5a06ece384908b282a0adbba1451b4a3ad999c5164a6418f6ed224aaaed15ef61bb314d
-EBUILD vdr-vcd-0.9-r2.ebuild 710 BLAKE2B 912be5d1502601d0b8c28a4b24328e3b80b59cfbc85c64afa38e3410cd9f62caa8a776f8cb04bec8e2983df120b95b27e1bcdd6230e660948cbfaaf053be973a SHA512 18b15b53b93921136f0c5433a92adb447c87d23a0f5956d0dcce19682f63b65264e34e3f432caebc5cba340b9d89c44f36b013476f2ed23cb20fb1e0144a0701
-EBUILD vdr-vcd-0.9-r3.ebuild 742 BLAKE2B e711d6213c0aef46e40db58b325863ba8d2ab7d9fac02855e6b8c8bee7d332fc4f965c0a05a845da42b1e28877e60d47b9badbfb43b661258582fa390ddb77d5 SHA512 ce05b1db012743515bb96b4a4eb8b7706fdccac3e39f150e6d1dfa03ca5a4179bbffe0a4e7b557ca19a975bba1a8efa9c04cc9669edb293543e63627c66ee021
+EBUILD vdr-vcd-0.9-r3.ebuild 743 BLAKE2B 2728cdb7877b089941eb262ea3488f96a35cf7738d23d8951001089fa2d5ef3d64dfd408e3afaf7220ead74a54129eadd8ca40fd1b3409afc0025df0f6bb6c5c SHA512 9ebff5bd269ec28054317418b8fbf6d2d7f1441e656b71de42bdbb8d36c88e4aa4bdd990563d103b33368fb71f1a567fc4b10ec9476f9672e90b135164aff854
+EBUILD vdr-vcd-0.9-r4.ebuild 750 BLAKE2B 4b38e8b4c6ce66be0e877cf92230dd26b6448aab618bd6cf2f2e4df262a668d14a62868735013839a1d902c7dff5f66a6b94f7f1babc6d6312382096599c5117 SHA512 ffd5ca1c8b7d00fb75686a8887fff543afa15f6fd643dee4afcea5ae48d813e5e0319f857bed29e6ae22d0e49ea70367ee3b08ab1b82aa96d5b4741c96d703dd
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
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
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
 }