gentoo resync : 15.12.2019

2 files changed, 21 insertions, 25 deletions

diff --git a/media-plugins/vdr-mp3ng/Manifest b/media-plugins/vdr-mp3ng/Manifest
index 232ec74e70e7..792a98c82ab2 100644
--- a/media-plugins/vdr-mp3ng/Manifest
+++ b/media-plugins/vdr-mp3ng/Manifest
@@ -9,5 +9,5 @@ AUX vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff 1768 BLAKE2B 1feadeb440d2d616237b4bf9f65
 DIST vdr-mp3ng-0.0.1_pre4-span-0.0.3.diff.tar.gz 6726 BLAKE2B e7fc0d039a97070cde24b13360862062bd7f65522ed4bf39eac039918e58b7389d84787492e5282115d62d6bd5a6654c73fc821e94438c762de94326378174f0 SHA512 537b876cf5ecdfe34969a79ec556196e48b4de1a411d7b1a50ad95c5534d5027b0d1548fb42c02cccf922f0ef961b99b1d23863b2048f12e79e0beafcd7e571f
 DIST vdr-mp3ng-0.9.13-MKIV-pre3.tar.gz 128289 BLAKE2B 11fa1d6e41704c45b2ea8effeb6800df84e86ac24150e0d4da91f398ec2711947c71bb60ada4a3c697520fb0c35282bccee5908466e294b7564ace7863f2a1bc SHA512 56bd73ab66276ff49670e3e7195a50b1f6560a53e88662e45d24e3bd1ffb6a7493dca3eade6ccecb887302dd4da2eb8ccc6b231ba45fbb315ace7ca3232fff99
 DIST vdr-mp3ng-pictures-0.0.1.tar.gz 170089 BLAKE2B ec1afec76ccc3401ce0f6c49a44a64e4f729fbc801e2cfc33acbad01e366accc20ea75cc7d96727a78c6aa9128dec91aa0d1c0a1a30bb4b8e297507aed283c29 SHA512 f9b2e683db67f1a72b92e3a73b0f1e72132907568ec196f37f9484e076ca90bec6bd58b79438b70a3fb630badcd79b8ae1401fc911c60e5256131355c783392e
-EBUILD vdr-mp3ng-0.0.1_pre5-r1.ebuild 2221 BLAKE2B 92beb0b6f28a473effd873226cedc952a7b66e1deb048a57d772d88d7ef94becaec5eb704a015e97362cf3b569c055f9c5437a5f8644f17fd9cbb7b51e707430 SHA512 5dfd55551dbbcf90f2d625e49009b37b3c94fa8b3749a95b8f9793948675f974495697c4798859ec415a5952848ba4fc941720bb2a442e74df9b2d6eadc8f620
+EBUILD vdr-mp3ng-0.0.1_pre5-r2.ebuild 2002 BLAKE2B 75543eb9c14008cbef8358bee3f2b126143a3cf25bee0e899acbac74a046932939510648492f05a33fcc9e60ed425a0222b2e1a01d7ea005f58100a51b144a6f SHA512 cd0edcd7feda99617a4ed82336a2963eddf37c8ddd5f6dc50feb6e7a60c8619c2080ed050f96b68d8d19c00363bcc75a7bc5a5dbd25071921a1006de02278b6e
 MISC metadata.xml 500 BLAKE2B 049f10f9ae0dd1befdc0cfefe08a2b60e7bc489a360aac42d0109a66dfe955cdfc1ba061dc8d7634467d67eab76ece31be03b4bbd8de7a2592bccb3fbb95f671 SHA512 44e2c20557a743c548ff93782e55d96f10a56643cf8e60173ed182aba496506f53ccd007d234d06d99b5d266515135df4e0a25ad9c40b75adff0a489954926d4
diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r1.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r2.ebuild
index da4eb768f836..c64dcd95e6b9 100644
--- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r1.ebuild
+++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r2.ebuild
@@ -1,34 +1,35 @@
-# Copyright 1999-2017 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 flag-o-matic
 
 MY_PV=0.9.13-MKIV-pre3
 MY_P=${PN}-${MY_PV}
 
-S=${WORKDIR}/mp3ng-0.9.13-MKIV-pre3
-
 DESCRIPTION="VDR Plugin: play mp3 and ogg on VDR"
-HOMEPAGE="http://www.glaserei-franz.de/VDR/Moronimo2/vdrplugins.htm"
-SRC_URI="http://www.glaserei-franz.de/VDR/Moronimo2/downloads/${MY_P}.tar.gz
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${PN}-0.9.13-MKIV-pre3.tar.gz
 		mirror://gentoo/${PN}-pictures-0.0.1.tar.gz
 		mirror://gentoo/${PN}-0.0.1_pre4-span-0.0.3.diff.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="vorbis oss imagemagick"
+IUSE="oss vorbis"
 
-DEPEND=">=media-video/vdr-1.6
+DEPEND="media-libs/imlib2
 	media-libs/libmad
 	media-libs/libid3tag
-	sys-libs/zlib
 	media-libs/libsndfile
-	vorbis? ( media-libs/libvorbis )
-	imagemagick? ( virtual/imagemagick-tools )
-	!imagemagick? ( media-libs/imlib2 )"
+	media-video/vdr
+	sys-libs/zlib
+	vorbis? ( media-libs/libvorbis )"
+
+DOCS=(HISTORY MANUAL README README-MORONIMO examples/network.sh.example)
+
+S=${WORKDIR}/mp3ng-0.9.13-MKIV-pre3
 
 src_prepare() {
 	vdr-plugin-2_src_prepare
@@ -36,20 +37,17 @@ src_prepare() {
 	# wrt bug 595248
 	append-cxxflags $(test-flags-CXX -std=gnu++03) -std=gnu++03
 
-	epatch "${FILESDIR}/${PN}-0.0.1_pre4-gentoo.diff"
-	epatch "${FILESDIR}/${PN}-0.0.1_pre4-gcc4.diff"
-	epatch "${DISTDIR}/${PN}-0.0.1_pre4-span-0.0.3.diff.tar.gz"
-	epatch "${FILESDIR}/${PN}-0.0.1_pre4-vdr-1.5.1.diff"
-	epatch "${FILESDIR}/${PN}-0.0.1_pre4-glibc-2.10.patch"
+	eapply -p0 "${FILESDIR}/${PN}-0.0.1_pre4-gentoo.diff"
+	eapply "${FILESDIR}/${PN}-0.0.1_pre4-gcc4.diff"
+	eapply "${WORKDIR}/${PN}-0.0.1_pre4-span.diff"
+	eapply "${FILESDIR}/${PN}-0.0.1_pre4-vdr-1.5.1.diff"
+	eapply "${FILESDIR}/${PN}-0.0.1_pre4-glibc-2.10.patch"
 
 	use !vorbis && sed -i "s:#WITHOUT_LIBVORBISFILE:WITHOUT_LIBVORBISFILE:" Makefile
 	use oss && sed -i "s:#WITH_OSS_OUTPUT:WITH_OSS_OUTPUT:" Makefile
-	use imagemagick && sed -i Makefile \
-		-e "s:HAVE_IMLIB2:#HAVE_IMLIB2:" \
-		-e "s:#HAVE_MAGICK:HAVE_MAGICK:"
 
-	has_version ">=media-video/vdr-1.3.37" && epatch "${FILESDIR}/${PN}-0.0.1_pre4-1.3.37.diff"
-	has_version ">=media-gfx/imagemagick-6.4" && epatch "${FILESDIR}/imagemagick-6.4.x.diff"
+	has_version ">=media-video/vdr-1.3.37" && eapply "${FILESDIR}/${PN}-0.0.1_pre4-1.3.37.diff"
+	has_version ">=media-gfx/imagemagick-6.4" && eapply "${FILESDIR}/imagemagick-6.4.x.diff"
 
 	sed -i mp3ng.c -e "s:RegisterI18n:// RegisterI18n:"
 
@@ -69,6 +67,4 @@ src_install() {
 	doins "${S}/images/mp3MKIV-spectrum-analyzer-bg.png"
 
 	newbin examples/mount.sh.example mount-mp3ng.sh
-
-	dodoc HISTORY MANUAL README README-MORONIMO examples/network.sh.example
 }