From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8CAEA138350 for ; Sun, 12 Jan 2020 18:38:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E847E0866; Sun, 12 Jan 2020 18:38:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D9CA6E0866 for ; Sun, 12 Jan 2020 18:38:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C816334DFD5 for ; Sun, 12 Jan 2020 18:38:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB9A4A1 for ; Sun, 12 Jan 2020 18:38:27 +0000 (UTC) From: "Jörg Bornkessel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jörg Bornkessel" Message-ID: <1578854289.dccd86f374944867109921c7e327e9c3ca198b72.hd_brummy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-skinelchi/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild X-VCS-Directories: media-plugins/vdr-skinelchi/ X-VCS-Committer: hd_brummy X-VCS-Committer-Name: Jörg Bornkessel X-VCS-Revision: dccd86f374944867109921c7e327e9c3ca198b72 X-VCS-Branch: master Date: Sun, 12 Jan 2020 18:38:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1a87e349-f02d-4a3d-93f5-a147c55ec06d X-Archives-Hash: 194d6cf40d8a9549dd3b380df3e61d74 commit: dccd86f374944867109921c7e327e9c3ca198b72 Author: Joerg Bornkessel gentoo org> AuthorDate: Sun Jan 12 18:26:29 2020 +0000 Commit: Jörg Bornkessel gentoo org> CommitDate: Sun Jan 12 18:38:09 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dccd86f3 media-plugins/vdr-skinelchi: missing die's added Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Joerg Bornkessel gentoo.org> media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild | 10 +++++----- media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) 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 index bdaa4315a20..81062648c1c 100644 --- a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild +++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,16 +24,16 @@ src_prepare() { # disable imagemagick support, broken ... sed -i "${S}"/Makefile -e \ - "s:SKINELCHI_HAVE_IMAGEMAGICK = 1:SKINELCHI_HAVE_IMAGEMAGICK = 0:" + "s:SKINELCHI_HAVE_IMAGEMAGICK = 1:SKINELCHI_HAVE_IMAGEMAGICK = 0:" || die sed -i "${S}"/DisplayChannel.c \ -e "s:/hqlogos::" \ - -e "s:/logos::" + -e "s:/logos::" || die # wrong sed in vdr-plugin-2.eclass? sed -e "s:INCLUDES += -I\$(VDRINCDIR):INCLUDES += -I\$(VDRINCDIR)/include:" \ - -i Makefile + -i Makefile || die # gcc-6 warnings - sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h + sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h || die } 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 index 0f5afd25994..2dbe08a9b7b 100644 --- a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild +++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild @@ -23,18 +23,18 @@ src_prepare() { # disable imagemagick support, broken ... sed -i "${S}"/Makefile -e \ - "s:SKINELCHI_HAVE_IMAGEMAGICK = 1:SKINELCHI_HAVE_IMAGEMAGICK = 0:" + "s:SKINELCHI_HAVE_IMAGEMAGICK = 1:SKINELCHI_HAVE_IMAGEMAGICK = 0:" || die sed -i "${S}"/DisplayChannel.c \ -e "s:/hqlogos::" \ - -e "s:/logos::" + -e "s:/logos::" || die # wrong sed in vdr-plugin-2.eclass? sed -e "s:INCLUDES += -I\$(VDRINCDIR):INCLUDES += -I\$(VDRINCDIR)/include:" \ - -i Makefile + -i Makefile || die # gcc-6 warnings - sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h + sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h || die # wrt bug 703994 eapply "${FILESDIR}/${P}_min_max_from_stl.patch"