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 8AF98139694 for ; Sat, 6 May 2017 15:11:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1EAA4E0CE3; Sat, 6 May 2017 15:11:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC4B9E0CE3 for ; Sat, 6 May 2017 15:11:46 +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 71BB93416D1 for ; Sat, 6 May 2017 15:11:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB3747436 for ; Sat, 6 May 2017 15:11:40 +0000 (UTC) From: "Amy Liffey" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amy Liffey" Message-ID: <1494083463.6443f68173b24e1901d133757f5a369f821fc2eb.amynka@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch media-gfx/slic3r/slic3r-9999.ebuild X-VCS-Directories: media-gfx/slic3r/ media-gfx/slic3r/files/ X-VCS-Committer: amynka X-VCS-Committer-Name: Amy Liffey X-VCS-Revision: 6443f68173b24e1901d133757f5a369f821fc2eb X-VCS-Branch: master Date: Sat, 6 May 2017 15:11:40 +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-Archives-Salt: be4cb359-24f8-44a3-9576-e5d187e2323a X-Archives-Hash: 2b6b76670360b04926d8236c449a3761 commit: 6443f68173b24e1901d133757f5a369f821fc2eb Author: Amy Liffey gentoo org> AuthorDate: Sat May 6 14:42:37 2017 +0000 Commit: Amy Liffey gentoo org> CommitDate: Sat May 6 15:11:03 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6443f681 media-gfx/slic3r: fix patching bug #617640 Submitted-by: Philipp Psurek gmail.com> Package-Manager: portage-2.3.3 media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch | 11 ----------- media-gfx/slic3r/slic3r-9999.ebuild | 4 ++-- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch b/media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch deleted file mode 100644 index ff22b24e227..00000000000 --- a/media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/lib/Slic3r.pm 2016-12-18 15:24:37.520000000 +0100 -+++ b/lib/Slic3r.pm 2016-12-18 15:25:23.430000000 +0100 -@@ -42,7 +42,7 @@ - - use FindBin; - # Path to the images. --our $var = sub { decode_path($FindBin::Bin) . "/var/" . $_[0] }; -+our $var = sub { decode_path($FindBin::RealBin) . "/var/" . $_[0] }; - - use Moo 1.003001; - diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild index 3d54436739e..4c89cffa525 100644 --- a/media-gfx/slic3r/slic3r-9999.ebuild +++ b/media-gfx/slic3r/slic3r-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -71,7 +71,7 @@ src_unpack() { src_prepare() { pushd "${WORKDIR}/slic3r-${PV}" || die - eapply "${FILESDIR}/${P}-adjust_var_path.patch" + sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die eapply_user popd || die }