gentoo resync 08.09.2018

5 files changed, 3 insertions, 136 deletions

diff --git a/media-plugins/vdr-image/Manifest b/media-plugins/vdr-image/Manifest
index d1f7198fba81..9951ba5d30d3 100644
--- a/media-plugins/vdr-image/Manifest
+++ b/media-plugins/vdr-image/Manifest
@@ -1,10 +1,6 @@
 AUX rc-addon-0.3.0.sh 587 BLAKE2B 8529a8f5050aa82234bcf3475cf46e13f833d9df130e6c0cead893fb1c2a299d9eb60fc19cffb97e6bd2e5bfcf9af7ab62ff0bbe0aa0a1cd313862645c63a9f8 SHA512 b11ddcb1640d3edbd8b381e20189f259280c9439d02739b91b27ed5dbc98b178400fb9d0ec74a6b66b62d7f2315aa76916c8694e16ef50728f059d53d0c1c275
-AUX vdr-image-0.3.1-ffmpeg-1.patch 1307 BLAKE2B f4daf4560806a565312df6d5596118ee5ab7e3a82e2b00bd856ed6446ce670470348a4462999c4b96fb6800cf6d8d7ee03cda85cd36a70b755c09646a871ff4a SHA512 ffc0e3f130f0f30b5ac2f5055ba9fbc91d9f67ae855da3ff8c26408ae24ee55e0027d7c086f24d94fe341c0f3764c24e1980a4f5408ffad927621c3697e5c825
-AUX vdr-image-0.3.1-gentoo.diff 2348 BLAKE2B 69667df82f111b27aecd93b67629b9a0d3ad8037af4c1c5a72f1c4ddc97009aa26725aac833cdf570750de40c2d5b07a10a75170a1d0d53f378eaa501745dca6 SHA512 ca6932ae0da10bf1037297dfe4eb1b667ecf78d660479fe332e474746cc1b2afcb6d1a048c511735d5e354dbd8867ee68be75a010eb31fd132382869dd98025c
 AUX vdr-image-0.4.0-ffmpeg3.patch 1798 BLAKE2B 4ae377fc2bff971b15b51c8324d6376c1f7067c9bbd0364ff832045f78b49086dcf1909cf9f73a8227840bc1b825d1ba5fb88ad12befa84fabc460439b21dc62 SHA512 470b853bd8c33b04f743e51bdeafa80f4cfc6defbc6485c356462fc8cf8f7de39fd39379ed9063a87d269103c3130c998d9d1856757aa52783b3e85dbb910a9d
 AUX vdr-image-0.4.0-gentoo.diff 2348 BLAKE2B 69667df82f111b27aecd93b67629b9a0d3ad8037af4c1c5a72f1c4ddc97009aa26725aac833cdf570750de40c2d5b07a10a75170a1d0d53f378eaa501745dca6 SHA512 ca6932ae0da10bf1037297dfe4eb1b667ecf78d660479fe332e474746cc1b2afcb6d1a048c511735d5e354dbd8867ee68be75a010eb31fd132382869dd98025c
-DIST vdr-image-0.3.1.tar.gz 124587 BLAKE2B d086844b7b596b55d2609e0e41b01b41c5f4f20beb1b505dfb29e2a9d38aa9357375ea2ceb950557df2ab0449aefc4b55278c705c15d26bc7226a6e781ce958c SHA512 a5a3b9d29958abc486d5fce4a6423d574894a604f792fe6e73b49daf3c02fe2df1ec7d7538db2a950482a77c7d47ebd8dd498ae55f265a0a7ef013b607dd0efb
 DIST vdr-image-0.4.0.tgz 129200 BLAKE2B efcbb1bd724a2dcd0b787a4d768fb1148b91f05112aaf773704fb2d7eab9f64d67dcf4538bfa169176f3f7d18d15fc7decffd96626290e841a827a0f592e9094 SHA512 d66bb7ff48ed622ec21a7d828985229b6aaf908123c12b870e531f09dfe85e792afafa096cd5c4580296139275e2f7171d30f21fe1f8d88978e19c1eb36ab169
-EBUILD vdr-image-0.3.1.ebuild 1600 BLAKE2B bdfc93a20db65d24dab27fca650173675a827ebee6870e94e56da83be23ad206fe1eb4763f2143bde4e86476d550618183f40426b150ce0802c32aad044b33c4 SHA512 ec47d7b638bc6df4b1c93841657774995861248c2fc0a00c018ca8cc3fefae72825916b6923df56b45cfa33bbacc5138ba26e3410242a49ef2fdfdf92e356170
-EBUILD vdr-image-0.4.0.ebuild 1518 BLAKE2B 07b53c4175668aa828297fd04c8cad9f0155277965a20452a39ea0c0561f23e0712f53ce4e224effb83a5ea188e8f26855ce58e1d8b5522268f862e383f9c8a1 SHA512 9e0a6fbbda5f0e7d8c9007c7db35795b44086954720ca10495448ce8dd2e15b29708c5fa82fab67dc77e28e072d0048d052e0c8cc487a5bf23b13f1c9a281b2f
+EBUILD vdr-image-0.4.0.ebuild 1518 BLAKE2B 2838a191d859c59e88494929d5b603a6f875375b86094d729a44400abb316afa95de938bb58f1e16aa5d735ae903e3c2870c8453bcf98f110873c6f351c12fcc SHA512 b37130a9919b4a71eadba2e9ade8633f568e6562eed26940badf6f111e8262965e0b6b99fd0d44204cdb8b580999c42d27b49ec9d9d1aaf8d4e170b3179672ed
 MISC metadata.xml 415 BLAKE2B 63c8ab3cd7b4d06bf7cfe5b1d43874e63f8e60cdd7776f515297827f11b97cc2bfbef25ecf746a27c3b902d217510b835c47cbba43cc9d026312868dbb7996bc SHA512 08fd11797252a87665f1459523990d0e30f92103309a7f6243a56c1d1091f1176392efef5ebd51f754ca99286d8daf6506571d65bf6623f0c561a3fd3b4c87e5
diff --git a/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch b/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch
deleted file mode 100644
index 78fd1d384435..000000000000
--- a/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -urN image-0.3.1.old/liboutput/encode.c image-0.3.1/liboutput/encode.c
---- image-0.3.1.old/liboutput/encode.c	2013-06-17 21:23:23.308430203 +0200
-+++ image-0.3.1/liboutput/encode.c	2013-06-17 21:27:37.126421173 +0200
-@@ -49,7 +49,6 @@
- 
- bool cEncode::Register()
- {
--    avcodec_init();
- #if 0 
-     // XXX to resolv: dosen't work with osdpip
-     register_avcodec(&mpeg2video_encoder);
-@@ -100,7 +99,7 @@
-     AVCodecContext  *pAVCC = NULL;
-     AVFrame         *pAVF = NULL;
- 
--    pAVCC = avcodec_alloc_context();
-+    pAVCC = avcodec_alloc_context3(NULL);
-     if (! pAVCC) 
-     {
-         esyslog("imageplugin: Failed to alloc memory for AVCodecContext.");
-@@ -116,7 +115,7 @@
-         {
-             SetupEncodingParameters(pAVCC);
- 
--            if (avcodec_open(pAVCC, m_pavCodec) < 0) 
-+            if (avcodec_open2(pAVCC, m_pavCodec, NULL) < 0) 
-             {
-                 esyslog("imageplugin: Couldn't open Codec.");
-             }
-diff -urN image-0.3.1.old/liboutput/encode.h image-0.3.1/liboutput/encode.h
---- image-0.3.1.old/liboutput/encode.h	2013-06-17 21:23:23.308430203 +0200
-+++ image-0.3.1/liboutput/encode.h	2013-06-17 21:27:37.127421173 +0200
-@@ -14,6 +14,7 @@
- 
- extern "C" {
- #include <libavcodec/avcodec.h>
-+#include <libavutil/mem.h>
- }
- 
- #include "../setup-image.h"
diff --git a/media-plugins/vdr-image/files/vdr-image-0.3.1-gentoo.diff b/media-plugins/vdr-image/files/vdr-image-0.3.1-gentoo.diff
deleted file mode 100644
index 11479f2fc8a2..000000000000
--- a/media-plugins/vdr-image/files/vdr-image-0.3.1-gentoo.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur image-0.2.7.26.orig/examples/imagecmds.conf image-0.2.7.26/examples/imagecmds.conf
---- image-0.2.7.26.orig/examples/imagecmds.conf	2008-10-25 23:48:18.000000000 +0200
-+++ image-0.2.7.26/examples/imagecmds.conf	2008-10-25 23:50:53.000000000 +0200
-@@ -20,3 +20,5 @@
- Rotate JPEG picture lossless by 90 degrees to the right  : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
- Rotate JPEG picture lossless by 90 degrees to the left   : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
- Delete picture                                          ?: rm -f %s
-+Change burn template									 : echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash
-+Change burn template ( Button )							 : echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash
-\ Kein Zeilenumbruch am Dateiende.
-diff -Naur image-0.2.7.26.orig/examples/imagecmds.conf.DE image-0.2.7.26/examples/imagecmds.conf.DE
---- image-0.2.7.26.orig/examples/imagecmds.conf.DE	2008-10-25 23:48:18.000000000 +0200
-+++ image-0.2.7.26/examples/imagecmds.conf.DE	2008-10-25 23:55:49.000000000 +0200
-@@ -11,6 +11,8 @@
- Informationen über das Bild                              : identify -verbose
- Größe des Bildes                                         : du -chs %s
- Exif Informationen des JPEG-Bildes ausgeben              : jpegtopnm -dumpexif %s >/dev/null 2> $CONVERT_TEMPDIR/exif.tmp && cat $CONVERT_TEMPDIR/exif.tmp && rm -f $CONVERT_TEMPDIR/exif.tmp
--Rotatiere JPEG Bildes verlustlos um 90° nach Rechts      : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
--Rotatiere JPEG Bildes verlustlos um 90° nach Links       : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
-+Rotiere JPEG Bildes verlustlos um 90° nach Rechts      : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
-+Rotiere JPEG Bildes verlustlos um 90° nach Links       : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
- Lösche Bild                                             ?: rm -f %s
-+Hintergrund vdr-burn ändern								: echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash
-+Button vdr-burn ändern								: echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash
diff --git a/media-plugins/vdr-image/vdr-image-0.3.1.ebuild b/media-plugins/vdr-image/vdr-image-0.3.1.ebuild
deleted file mode 100644
index 8343d9a7fa91..000000000000
--- a/media-plugins/vdr-image/vdr-image-0.3.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vdr-plugin-2 flag-o-matic
-
-VERSION="679" #every bump, new version
-
-DESCRIPTION="VDR plugin: display of digital images, like jpeg, tiff, png, bmp"
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-image"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="exif"
-
-COMMON_DEPEND=">=media-video/vdr-1.5.8
-	>=virtual/ffmpeg-0.10
-	>=media-libs/netpbm-10.0
-	exif? ( media-libs/libexif )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=media-tv/gentoo-vdr-scripts-0.2.2"
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.3.0.sh"
-BUILD_PARAMS="-j1"
-
-src_prepare() {
-	# remove empty translation file
-	rm "${S}"/po/{cs_CZ,da_DK,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,ro_RO}.po
-
-	vdr-plugin-2_src_prepare
-
-	epatch "${FILESDIR}/${P}-gentoo.diff" \
-		"${FILESDIR}/${P}-ffmpeg-1.patch"
-
-	use !exif && sed -i "s:#WITHOUT_LIBEXIF:WITHOUT_LIBEXIF:" Makefile
-
-	if has_version "<=virtual/ffmpeg-0.4.9_p20061016"; then
-		BUILD_PARAMS="${BUILD_PARAMS} WITHOUT_SWSCALER=1"
-	fi
-
-	# UINT64_C is needed by ffmpeg headers
-	append-cppflags -D__STDC_CONSTANT_MACROS
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /etc/vdr/imagecmds
-	newins examples/imagecmds.conf imagecmds.example.conf
-	newins examples/imagecmds.conf.DE imagecmds.example.conf.de
-
-	insinto /etc/vdr/plugins/image
-	doins examples/imagesources.conf
-
-	into /usr/share/vdr/image
-	dobin scripts/imageplugin.sh
-	newbin scripts/mount.sh mount-image.sh
-}
diff --git a/media-plugins/vdr-image/vdr-image-0.4.0.ebuild b/media-plugins/vdr-image/vdr-image-0.4.0.ebuild
index d00933099fff..15aba0b5a4c8 100644
--- a/media-plugins/vdr-image/vdr-image-0.4.0.ebuild
+++ b/media-plugins/vdr-image/vdr-image-0.4.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
@@ -39,7 +39,7 @@ src_prepare() {
 	# dangerous warning
 	sed -e "s:mktemp:mkstemp:" -i data-image.c
 
-	epatch "${FILESDIR}/${P}-gentoo.diff" \
+	eapply "${FILESDIR}/${P}-gentoo.diff" \
 		"${FILESDIR}/${P}-ffmpeg3.patch"
 
 	# ffmpeg-2.2.12, libav10