From 4608f65ed9ded046449c96dcae978a8395ef7109 Mon Sep 17 00:00:00 2001
From: Joerg Bornkessel <hd_brummy@gentoo.org>
Date: Thu, 27 Aug 2020 14:20:58 +0200
Subject: media-video/vdr2jpeg: does not respect CFLAGS

added QA_FLAGS_IGNORED as the Makefile is not
designed CFLAGS directly

Close: https://bugs.gentoo.org/731212
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org>
---
 media-video/vdr2jpeg/Manifest                 |  1 -
 media-video/vdr2jpeg/vdr2jpeg-0.1.9-r2.ebuild | 43 -------------------------
 media-video/vdr2jpeg/vdr2jpeg-0.2.0-r4.ebuild | 43 -------------------------
 media-video/vdr2jpeg/vdr2jpeg-0.2.0-r5.ebuild | 46 +++++++++++++++++++++++++++
 4 files changed, 46 insertions(+), 87 deletions(-)
 delete mode 100644 media-video/vdr2jpeg/vdr2jpeg-0.1.9-r2.ebuild
 delete mode 100644 media-video/vdr2jpeg/vdr2jpeg-0.2.0-r4.ebuild
 create mode 100644 media-video/vdr2jpeg/vdr2jpeg-0.2.0-r5.ebuild

(limited to 'media-video')

diff --git a/media-video/vdr2jpeg/Manifest b/media-video/vdr2jpeg/Manifest
index 6b02599ea96d..3bdc5eb9b9a2 100644
--- a/media-video/vdr2jpeg/Manifest
+++ b/media-video/vdr2jpeg/Manifest
@@ -1,2 +1 @@
-DIST vdr2jpeg-0.1.9.tgz 31160 BLAKE2B 6f84e82167f45b8fe3c2a00e72ed5ad660b7a895e1c33110ce47e1cbb2d6f5fc979454761e693f1793f1fae0c1f1694af77a0f47b4483bb6359840ffcc88e6e9 SHA512 e2309fd08591d5efa08246c2ecde70811036ea293e21f7e5ae989af5acef5e795216cbc31455d2f0b65de575a876863efe55ddf4397ab4eadf3d67a627579d99
 DIST vdr2jpeg-0.2.0.tgz 20027 BLAKE2B c79a84c6e7010eae762fb31bdd9771dcdae1e78761afd07c536a55e834b0271fb55dcd4bb49f87a2d28695496d37f94c90350dd70b50229bb6248026422faee0 SHA512 65f3e0acb2ecd3a5341e527c45fafd454266841f1369c89b10750fce86f2326fba76329abd17a05d67aea3b43a7b1299a49cfa9eee9a784bb99c940253ca5952
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r2.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r2.ebuild
deleted file mode 100644
index 1966f4a0dae8..000000000000
--- a/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-VERSION="717" # every bump, new version
-
-RESTRICT="strip"
-
-DESCRIPTION="Addon needed for XXV - WWW Admin for the Video Disk Recorder"
-HOMEPAGE="https://projects.vdr-developer.org/projects/xxv"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
-		mirror://gentoo/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-video/ffmpeg"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e "s:usr/local:usr:" \
-		-e "s:-o vdr2jpeg:\$(LDFLAGS) -o vdr2jpeg:" \
-		Makefile || die
-	epatch "${FILESDIR}/${P}-ffmpeg.patch" \
-		"${FILESDIR}/${P}-ffmpeg1.patch" \
-		"${FILESDIR}/${P}-libav9.patch"
-
-	if has_version ">=media-video/ffmpeg-2"; then
-		sed -e "s:CodecID:AVCodecID:" -i ffm.cpp
-	fi
-}
-
-src_install() {
-	dobin vdr2jpeg
-	dodoc README LIESMICH
-}
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r4.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r4.ebuild
deleted file mode 100644
index 0e099a60c244..000000000000
--- a/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-VERSION="1911" # every bump, new version
-
-RESTRICT="strip"
-
-DESCRIPTION="Addon needed for XXV - WWW Admin for the Video Disk Recorder"
-HOMEPAGE="https://projects.vdr-developer.org/projects/xxv"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="media-video/ffmpeg:0"
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( README LIESMICH )
-
-src_prepare() {
-	sed -i Makefile \
-		-e "s:usr/local:usr:" \
-		-e "s:-o vdr2jpeg:\$(LDFLAGS) -shared -o vdr2jpeg:" || die
-
-	# bug 727640, 727804 do not call strip directly
-	export  STRIP="$(tc-getSTRIP)"
-	sed -i Makefile -e "s:-s vdr2jpeg:vdr2jpeg:" || die
-
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install FFMPEG_BIN=/usr/bin/ffmpeg
-
-	einstalldocs
-}
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r5.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r5.ebuild
new file mode 100644
index 000000000000..5352e19c60ab
--- /dev/null
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+VERSION="1911" # every bump, new version
+
+RESTRICT="strip"
+
+DESCRIPTION="Addon needed for XXV - WWW Admin for the Video Disk Recorder"
+HOMEPAGE="https://projects.vdr-developer.org/projects/xxv"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-video/ffmpeg:0"
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+# bug 731212
+QA_FLAGS_IGNORED="usr/bin/vdr2jpeg"
+
+DOCS=( README LIESMICH )
+
+src_prepare() {
+	sed -i Makefile \
+		-e "s:usr/local:usr:" \
+		-e "s:-o vdr2jpeg:\$(LDFLAGS) -shared -o vdr2jpeg:" || die
+
+	# bug 727640, 727804 do not call strip directly
+	export  STRIP="$(tc-getSTRIP)"
+	sed -i Makefile -e "s:-s vdr2jpeg:vdr2jpeg:" || die
+
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install FFMPEG_BIN=/usr/bin/ffmpeg
+
+	einstalldocs
+}
-- 
cgit v1.2.3-65-gdbad