Gentoo Archives: gentoo-commits

From: "Jörg Bornkessel" <hd_brummy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-skinelchi/
Date: Sun, 12 Jan 2020 18:38:33
Message-Id: 1578854289.dccd86f374944867109921c7e327e9c3ca198b72.hd_brummy@gentoo
1 commit: dccd86f374944867109921c7e327e9c3ca198b72
2 Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 12 18:26:29 2020 +0000
4 Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 12 18:38:09 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dccd86f3
7
8 media-plugins/vdr-skinelchi: missing die's added
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
12
13 media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild | 10 +++++-----
14 media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild | 8 ++++----
15 2 files changed, 9 insertions(+), 9 deletions(-)
16
17 diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild
18 index bdaa4315a20..81062648c1c 100644
19 --- a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild
20 +++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2019 Gentoo Authors
23 +# Copyright 1999-2020 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=7
27 @@ -24,16 +24,16 @@ src_prepare() {
28
29 # disable imagemagick support, broken ...
30 sed -i "${S}"/Makefile -e \
31 - "s:SKINELCHI_HAVE_IMAGEMAGICK = 1:SKINELCHI_HAVE_IMAGEMAGICK = 0:"
32 + "s:SKINELCHI_HAVE_IMAGEMAGICK = 1:SKINELCHI_HAVE_IMAGEMAGICK = 0:" || die
33
34 sed -i "${S}"/DisplayChannel.c \
35 -e "s:/hqlogos::" \
36 - -e "s:/logos::"
37 + -e "s:/logos::" || die
38
39 # wrong sed in vdr-plugin-2.eclass?
40 sed -e "s:INCLUDES += -I\$(VDRINCDIR):INCLUDES += -I\$(VDRINCDIR)/include:" \
41 - -i Makefile
42 + -i Makefile || die
43
44 # gcc-6 warnings
45 - sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h
46 + sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h || die
47 }
48
49 diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild
50 index 0f5afd25994..2dbe08a9b7b 100644
51 --- a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild
52 +++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild
53 @@ -23,18 +23,18 @@ src_prepare() {
54
55 # disable imagemagick support, broken ...
56 sed -i "${S}"/Makefile -e \
57 - "s:SKINELCHI_HAVE_IMAGEMAGICK = 1:SKINELCHI_HAVE_IMAGEMAGICK = 0:"
58 + "s:SKINELCHI_HAVE_IMAGEMAGICK = 1:SKINELCHI_HAVE_IMAGEMAGICK = 0:" || die
59
60 sed -i "${S}"/DisplayChannel.c \
61 -e "s:/hqlogos::" \
62 - -e "s:/logos::"
63 + -e "s:/logos::" || die
64
65 # wrong sed in vdr-plugin-2.eclass?
66 sed -e "s:INCLUDES += -I\$(VDRINCDIR):INCLUDES += -I\$(VDRINCDIR)/include:" \
67 - -i Makefile
68 + -i Makefile || die
69
70 # gcc-6 warnings
71 - sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h
72 + sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h || die
73
74 # wrt bug 703994
75 eapply "${FILESDIR}/${P}_min_max_from_stl.patch"