media-plugins/vdr-mp3ng: calls g++ directly fixed

cleanup old

Closes: https://bugs.gentoo.org/789687
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org>

3 files changed, 3 insertions, 143 deletions

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-r3.ebuild
deleted file mode 100644
index 83b20cf1dcee..000000000000
--- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r3.ebuild
+++ /dev/null
@@ -1,73 +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
-	use oss && sed -i "s:#WITH_OSS_OUTPUT:WITH_OSS_OUTPUT:" Makefile
-
-	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
-
-	#wrt bug 705372
-	eapply "${FILESDIR}/${P}_gcc-9.patch"
-}
-
-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-r4.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r5.ebuild
index ba684b7d6a6b..f7836ebf4e8a 100644
--- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r4.ebuild
+++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r5.ebuild
@@ -46,6 +46,9 @@ src_prepare() {
 	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"