gentoo resync : 15.12.2019

3 files changed, 17 insertions, 15 deletions

diff --git a/media-plugins/vdr-burn/Manifest b/media-plugins/vdr-burn/Manifest
index 5995cda9f203..15aaa089b44f 100644
--- a/media-plugins/vdr-burn/Manifest
+++ b/media-plugins/vdr-burn/Manifest
@@ -2,8 +2,8 @@ AUX confd 615 BLAKE2B 0da02deefbdd9c1fbc7409560345b3608c2c044d1ff0cc3b11fe8a5e2b
 AUX rc-addon.sh 633 BLAKE2B db1e5cc9901916d8d0dba6eb4598fea86f9f9a8c1f99ce512ce3badb799433c6bc7cc4188f55d2e8514a216b11be4a7fc1aa541abdb32565b66ec6a00ac8d1c7 SHA512 cb5366a000dc943e3db22677f628eb9bdb839b03758bb77d50b2bce96fc57035a0d11e7e0669cc1f53a1c21b436595ce1f25f043e96d100ac75a8535607e17a6
 AUX vdr-burn-0.2.2-missing-include-for-function-setpriority.patch 257 BLAKE2B fe6385de01a0aac208868be4505db92533b3dcbea35759ade7ce765d58dafb52047f3d43dc244d0f4385fa7cdcfe0c91b17caf957a1c3839230fdd0b4250c307 SHA512 b83929373c369be157eef087be44e3f6928813e56caea15e9a00f82c0bd50e5d65d84c0bf4a1a29e5687618949b36444430489a14e839bd61ece419088971e23
 AUX vdr-burn-0.2.2-r1_gentoo-path.diff 1785 BLAKE2B bf3d30e237ffdbfc646c1164f29c1502929ba239abe3e68f4f65b59bfcf35ad722060974f28b2b2dc5d85af16f9648dd04c3975b812ab84b55e172453b39a113 SHA512 dc0de52eaca3cb2cca328ed5e43347ccdfee4ee7e788d1da5f9bd3c0b2b4eed2945bd270dccd726a6d3170e019c91faaa6b80cda55e9a56dc6bad438fadaf41b
-AUX vdr-burn-0.2.2_makefile.diff 525 BLAKE2B d3879acad34fcdb0c98b589e398f91d1daa31cf5b2ce72abf2a58653db395a6bee25e1c1dab296df4ab8b541ef3e1a6479068b0b2e08103ffb430d3a0f9e8b59 SHA512 a9c11acb17940c2c3f9e5774888c4597cd8c5408f7dff63e697ee5d444b0c2051e5f877cc871c2114a418ead89376c3fbe55562f0b44d2b0c05a91359c717228
+AUX vdr-burn-0.2.2_makefile.diff 563 BLAKE2B f10f9a5b1fd1033c142d0e805fadde5e9819989749380ef51deadf2e42231c5423e8c8d72fbab2148d6af6f3f07654d990abac48451bfe8565b0021a0fa7f41c SHA512 50afaabe343ef97625776b8bfcaef8c85a11af9fb285e997c6b4c297dc0ec0079454c9d05b1e904b858704e0738aaee7e5a70b406600861fc8c1ce9887b7dd95
 AUX vdr-burn-0.2.2_setdefaults.diff 1899 BLAKE2B f0635ba1234acea63cdd70737b1310fcf09b824671cbc1451a357b44e90e000366313ef49ec5748cde5601d20ebab4e3c29c2379e732bcb4a308a6eab65289a2 SHA512 29107da7b0dd0a1b149ff326dd4e593a59a9203aabcee7ac5f0bfa204d35e863ba6d296f4f804baab8f68cc42f09649e90814e65c90578b712c38e624ae819a7
 DIST vdr-burn-0.2.2.tgz 253570 BLAKE2B ac31f5d056e5fc92a43f12d506b7d91fc2063cd32f4dc591dd3c71003a98d1dd117c1869c954ac32ff85efea56429473f11429738d4d475f52c46bab1788c05a SHA512 06e490ff238f35122c2bcb7b2d98500a183409c8e855748609fa43dab661cd4ef5bf492cd17ccf5c7b9b26373cb994b3e35dd20edafccfa8bf186318c8fcc346
-EBUILD vdr-burn-0.2.2-r1.ebuild 2950 BLAKE2B 33b59cff495be4c74723e385c8bf8992615b090d8d37b5d63624b1a5612e38ba56eccef0dee8b745529541cc58bfcbf0ca484f57b577069d3a5d18f1892a1683 SHA512 be0f33f1c0a770582697c27595862c480463dbfc82b43869413a4335ccb1db3ed1e4b419714f910424ec0c2b354aeb1dab8f079bc76bf9346af8421661cd5657
+EBUILD vdr-burn-0.2.2-r1.ebuild 2951 BLAKE2B 62e3b33b145b9b5b6bd42002a7c98382f20de42b8ac5aef9adf79c49e6a70515d06effcbdf06d1470e5cefe09bdfc21365e938965224eccecb5eb7450456cee9 SHA512 ca0c9322166a8b335cd6e4d72cfb2568c3dbd23a805d17ee7f0a5746739659b26cdc0080e39ea9b07f5263e90794ad0a031ad92b1a23a86ca911c88e932a8403
 MISC metadata.xml 400 BLAKE2B 0683406aa4dc53b7f5eb0f98f0d93ac693776fcbdad8082b651f47e2a67b15b740918c26a62bb20648124573352b3d1ad1b04e381b40e981099b6579bfda5d02 SHA512 8f042c060eb2358756e19aa592dadfb351b26f9db2f4cb8c4538f0d60a84794b74d2ef1d4bf982e1bf035f4d33fac48df71db72a8a33adcaf39d89d1beb77e05
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.2_makefile.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.2_makefile.diff
index 837321ef6874..0612ec9292ab 100644
--- a/media-plugins/vdr-burn/files/vdr-burn-0.2.2_makefile.diff
+++ b/media-plugins/vdr-burn/files/vdr-burn-0.2.2_makefile.diff
@@ -1,10 +1,11 @@
-Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (12 Feb 2012)
+support for DMH_ARCHIVE in makefile
 
-diff -Naur burn-0.2.0.orig/Makefile burn-0.2.0/Makefile
---- burn-0.2.0.orig/Makefile	2012-02-12 20:21:08.000000000 +0100
-+++ burn-0.2.0/Makefile	2012-02-12 20:24:33.000000000 +0100
-@@ -9,6 +9,9 @@
- #
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (12 Dec 2019)
+diff -Naur burn-0.2.2.orig/Makefile burn-0.2.2/Makefile
+--- burn-0.2.2.orig/Makefile	2019-12-12 21:01:38.000000000 +0100
++++ burn-0.2.2/Makefile	2019-12-12 21:02:43.000000000 +0100
+@@ -12,6 +12,9 @@
+ 
  PLUGIN = burn
  
 +# Enable DMH Archive
diff --git a/media-plugins/vdr-burn/vdr-burn-0.2.2-r1.ebuild b/media-plugins/vdr-burn/vdr-burn-0.2.2-r1.ebuild
index 97384f749450..603aa97fc3dc 100644
--- a/media-plugins/vdr-burn/vdr-burn-0.2.2-r1.ebuild
+++ b/media-plugins/vdr-burn/vdr-burn-0.2.2-r1.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit vdr-plugin-2
 
 VERSION="1252" # every bump, new version!
 
+RESTRICT="test"
+
 DESCRIPTION="VDR Plugin: burn records on DVD"
 HOMEPAGE="https://projects.vdr-developer.org/projects/plg-burn"
 SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
@@ -16,7 +18,7 @@ SLOT="0"
 LICENSE="GPL-2"
 IUSE="dvdarchive"
 
-DEPEND=">=media-video/vdr-1.7.36-r1
+DEPEND="media-video/vdr
 		media-libs/gd[png,truetype,jpeg]"
 RDEPEND="${DEPEND}
 		>=dev-libs/libcdio-0.71
@@ -38,11 +40,11 @@ S="${WORKDIR}/${P#vdr-}"
 src_prepare() {
 	vdr-plugin-2_src_prepare
 
-	epatch \
+	eapply \
 		"${FILESDIR}"/${P}-r1_gentoo-path.diff \
 		"${FILESDIR}"/${P}_setdefaults.diff \
-		"${FILESDIR}"/${P}_makefile.diff \
-		"${FILESDIR}"/${P}-missing-include-for-function-setpriority.patch
+		"${FILESDIR}"/${P}_makefile.diff
+	eapply -p0 "${FILESDIR}"/${P}-missing-include-for-function-setpriority.patch
 
 	use dvdarchive && sed -i Makefile \
 		-e "s:#ENABLE_DMH_ARCHIVE:ENABLE_DMH_ARCHIVE:"
@@ -102,7 +104,6 @@ pkg_postinst() {
 
 	vdr-plugin-2_pkg_postinst
 
-	einfo
 	einfo "This ebuild comes only with the standard template"
 	einfo "'emerge vdr-burn-templates' for more templates"
 	einfo "To change the templates, use the vdr-image plugin"