commit: 6443f68173b24e1901d133757f5a369f821fc2eb
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat May 6 14:42:37 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> 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 <philipp.psurek+gentoo <AT> 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
}
