gentoo resync : 22.05.2021

3 files changed, 14 insertions, 79 deletions

diff --git a/media-plugins/vdr-mp3ng/Manifest b/media-plugins/vdr-mp3ng/Manifest
index bb96b0c71ebc..8dafe84de5e2 100644
--- a/media-plugins/vdr-mp3ng/Manifest
+++ b/media-plugins/vdr-mp3ng/Manifest
@@ -10,6 +10,5 @@ AUX vdr-mp3ng-0.0.1_pre5_gcc-9.patch 781 BLAKE2B b0086d4491a87616c1784a1376f5988
 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-r2.ebuild 2030 BLAKE2B a6f2c82dc78d842d19b62c5342918773e77c53e604d288e0ede65d2fdea9f3befb45b195237197f8e7a0c9cda3d354252e9b971fdc91a04384c2fb8b1bcca38b SHA512 a2e808ae917a05fe038211e9f949370694d8e9c3dda8ae0d7d74c4d4b9ed72a79f945fadc8f6fe1504e55147e0863e738c8a483c9b749f329afee17ac5586bc7
-EBUILD vdr-mp3ng-0.0.1_pre5-r3.ebuild 2066 BLAKE2B 84aa6ae4ab8c18fb8e87f6d3dec7604a9b9bc70a04c3ef607f6ec2c9c48adcf4a5d2e76b8c2bfad74dbe65ce8a0251211a26fd870db8cad55ff46ad7d5ab6d4d SHA512 dfe038a754627c2da1858ada483a0247013e2293c00a56efbc2265c1e4d65b16706812c268ff03acb7015666e48acc3a63e72502b10182611022b4cd5c73a0f0
+EBUILD vdr-mp3ng-0.0.1_pre5-r5.ebuild 2256 BLAKE2B 74df4615741039d18ff6dd765ba28e1c08061de8c93399643db3f26b3598d9f1baea6e2c41211cac73e3ed0cf548c5c23caeebfe4136fc15dd7d4930d8268568 SHA512 d719908522ea589de257d79aff0b34fcddd46fee9fc342bc4df0c768b03a8dae7c4736a9740703ad9c637f9768e588d0b2f6bbcae6e0fca93e18b1e98abadc37
 MISC metadata.xml 500 BLAKE2B 049f10f9ae0dd1befdc0cfefe08a2b60e7bc489a360aac42d0109a66dfe955cdfc1ba061dc8d7634467d67eab76ece31be03b4bbd8de7a2592bccb3fbb95f671 SHA512 44e2c20557a743c548ff93782e55d96f10a56643cf8e60173ed182aba496506f53ccd007d234d06d99b5d266515135df4e0a25ad9c40b75adff0a489954926d4
diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r2.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r2.ebuild
deleted file mode 100644
index e3887df119ec..000000000000
--- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vdr-plugin-2 flag-o-matic
-
-MY_PV=0.9.13-MKIV-pre3
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="VDR Plugin: play mp3 and ogg on VDR"
-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="oss vorbis"
-
-DEPEND="media-libs/imlib2
-	media-libs/libmad
-	media-libs/libid3tag
-	media-libs/libsndfile
-	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
-
-	# wrt bug 595248
-	append-cxxflags $(test-flags-CXX -std=gnu++03) -std=gnu++03
-
-	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 || die
-	use oss && sed -i "s:#WITH_OSS_OUTPUT:WITH_OSS_OUTPUT:" Makefile || die
-
-	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:" || die
-
-	if has_version ">=media-video/vdr-2.1.2"; then
-		sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" -i decoder.c || die
-	fi
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /etc/vdr/plugins/mp3ng
-	doins	"${FILESDIR}/mp3ngsources"
-
-	insinto /usr/share/vdr/mp3ng
-	doins "${WORKDIR}/${PN}-pictures-0.0.1"/*.jpg
-	doins "${S}/images/mp3MKIV-spectrum-analyzer-bg.png"
-
-	newbin examples/mount.sh.example mount-mp3ng.sh
-}
diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r3.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r5.ebuild
index 83b20cf1dcee..f7836ebf4e8a 100644
--- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r3.ebuild
+++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit vdr-plugin-2 flag-o-matic
+inherit vdr-plugin-2
 
 MY_PV=0.9.13-MKIV-pre3
 MY_P=${PN}-${MY_PV}
@@ -43,20 +43,26 @@ src_prepare() {
 	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 !vorbis && sed -e "s:#WITHOUT_LIBVORBISFILE:WITHOUT_LIBVORBISFILE:" -i Makefile
+	use oss && sed -e "s:#WITH_OSS_OUTPUT:WITH_OSS_OUTPUT:" -i Makefile
+
+	#wrt bug 789687
+	sed -e "s:MAKEDEP = g++:MAKEDEP = \$(CXX):" -i Makefile || die
 
 	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:" || die
 
-	if has_version ">=media-video/vdr-2.1.2"; then
-		sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" -i decoder.c
-	fi
+	# >=vdr-2.1.2
+	sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" -i decoder.c || die
 
 	#wrt bug 705372
 	eapply "${FILESDIR}/${P}_gcc-9.patch"
+
+	#wrt bug 740247, 786240
+	sed -e "s:while(fgets(buffer,sizeof(buffer),f)>0:while(fgets(buffer,sizeof(buffer),f)> (char *)0:" \
+		-i data-mp3.c || die
 }
 
 src_install() {