commit: 6fab23c5f1c93060e7ef11490476664edff29465
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 12 21:39:36 2015 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Feb 12 21:39:36 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=dev/axs.git;a=commit;h=6fab23c5
fixed paths issue with Slic3r icons and permissions with Slic3r-bin's binary
---
media-gfx/Slic3r-bin/Manifest | 2 +-
media-gfx/Slic3r-bin/Slic3r-bin-1.2.6.ebuild | 2 ++
media-gfx/Slic3r/Manifest | 3 ++-
media-gfx/Slic3r/Slic3r-9999.ebuild | 9 +++++++--
media-gfx/Slic3r/files/Slic3r-adjust_var_path.patch | 11 +++++++++++
5 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/media-gfx/Slic3r-bin/Manifest b/media-gfx/Slic3r-bin/Manifest
index 96e561f..a36130a 100644
--- a/media-gfx/Slic3r-bin/Manifest
+++ b/media-gfx/Slic3r-bin/Manifest
@@ -3,4 +3,4 @@ DIST slic3r-linux-x86-1-2-6-experimental.tar.gz 16189245 SHA256
476254c334616159
DIST slic3r-linux-x86_64-1-1-7-stable.tar.gz 15760223 SHA256
01c84fddfd8dbcfe2fe6a3ebf67ec6fde4a7b93495e571fddc8c95d1551d0a1e SHA512
5403506b4721f8f3ef6f8f9b89d5ed041bfe424de2fc0d3a67990e60f3dbdccec61136a24c1577d434d611310f1ec06ab17f75cc128792caa4d7ee331ca348d8
WHIRLPOOL
87ec01769118b13bb0461bb76c412b4e3bd90c5be12293b2d1a4c86c5b99b4be14d9a4eed5cb32e38931cb42997b5f11da40f68350b48e65321ee7940e8903d2
DIST slic3r-linux-x86_64-1-2-6-experimental.tar.gz 16596867 SHA256
a46b9ffb8d98d9010238a3545cdf45502248e98548def18de216bbca8703e655 SHA512
6fe354502452102945d9ec3e88be21712fd04dedef12db72bfb28a531aeb359d972e47db803b888730a6eeb0ce7bb7b06651b1c221c004eb2cca8c8f9c4c5535
WHIRLPOOL
4eec97af882c0205b39b19345249f0c7367ae6b374b5e1b7f8ec785fada24174b6c1b712be74539ff82d5ebbdd30d3469f9aa39e46d580889942e214a28cf507
EBUILD Slic3r-bin-1.1.7.ebuild 754 SHA256
e8beda59168c93ada49fa82f5f3d19f432e1ef3528e7a853aa5cef1fe21043ef SHA512
3c5b3e21782851a203820d05a1a3e95ef9e014546eef96de66a822173b1f20db90d60d6fd06fc19a009631b949c6f68b51e1e575a5db3cfd557e859dc012b418
WHIRLPOOL
216dc8e2a6c55d4a03a0a86d65a05c00280d910838fc991918cbea4fc8218531f1a6747fc70e2e531f7637e8afeec7585f16a1d30d3c85d42668d7f3f9d7f6fc
-EBUILD Slic3r-bin-1.2.6.ebuild 712 SHA256
ca59e60a6f8dcc982c8a6c58f7eb0e97b724493450b618a7e6111304b6d8a7a4 SHA512
11bca9b720b47ada63448619da83b9b01d0186e0103b5feaae3d035850e673bd613dbbe5bf01d5ad32d5fdbc5c1e8d21daa31326d8a75e65c6dabce71aeace9e
WHIRLPOOL
56d1c9304c482d2ec1d70e5f107c69f711a3fca500ef487c8186adc4953601e455040b30eb237fc4c1402678cb15cd8a0992221ac8faeb95de6dbf07ce551ae4
+EBUILD Slic3r-bin-1.2.6.ebuild 766 SHA256
5e55c6d33fa6b21e8d812309e166188aa136998795bd19995c1145ebe5e61309 SHA512
90734a4e5290ca1ba596fc339500385a38663492c6272e141040a11d7fafaa3b3d93da89a0d0c9930140b5744bafce11c2dbf0751813e333daff1354851922da
WHIRLPOOL
0e0cec0562a7a336dbd6a49cc131a7c65ca269e8bf1ad257f1d6d393c02f84526f8640e1ff272203593d640a5c99da50403cc2099d9f03a3457585db97d2507d
diff --git a/media-gfx/Slic3r-bin/Slic3r-bin-1.2.6.ebuild
b/media-gfx/Slic3r-bin/Slic3r-bin-1.2.6.ebuild
index 3974150..839dc99 100644
--- a/media-gfx/Slic3r-bin/Slic3r-bin-1.2.6.ebuild
+++ b/media-gfx/Slic3r-bin/Slic3r-bin-1.2.6.ebuild
@@ -23,5 +23,7 @@ S=${WORKDIR}
src_install() {
insinto /usr/lib
doins -r Slic3r
+ exeinto /usr/lib/Slic3r/bin
+ doexe Slic3r/bin/slic3r
dosym /usr/lib/Slic3r/bin/slic3r /usr/bin/slic3r
}
diff --git a/media-gfx/Slic3r/Manifest b/media-gfx/Slic3r/Manifest
index dd6c7bd..ee8ce5c 100644
--- a/media-gfx/Slic3r/Manifest
+++ b/media-gfx/Slic3r/Manifest
@@ -1 +1,2 @@
-EBUILD Slic3r-9999.ebuild 2586 SHA256
30e34458f29680f0b119b92cb191c2857a3158731b09450a5bf98be193cd74a0 SHA512
a035863b97986aa7d62d0e88aa5223649592678fb3c2969325d33b54487c81faf340bae8fa1c906a189e5e6afb5f22ab9701a220d580d1ca903ffaa6052c11ac
WHIRLPOOL
fc5d46c5af43deb14a06293c86a1dd067ba6a6193892ea2a08ac45577da4a6b18918ae3fe242926e16557d351753a4b33e750d28f047994ebb885c4062e7d63a
+AUX Slic3r-adjust_var_path.patch 274 SHA256
e32798a894bfb112bf1e87f94e76a1170f34ae40456ca33c684c1bf26f719661 SHA512
83802247efb5c450fc4b9dfbe407b6ff09f25599852287e6cc2a6ddc3f1dd04648ea8194cbd60dbed882dba5cd4a56a3b15992052659a7ec13a80f44c9d151cc
WHIRLPOOL
2c3fca71c01ba9817d24e8f062cba40a40c3d5d6f7d88eddb1d4934cdba9e9716a07a5c9e421d44d637d186a363ac072f570a022a0d32017565bfb861a638172
+EBUILD Slic3r-9999.ebuild 2736 SHA256
61566047cd609abe209fda56075c3738587ffd53ea55f7e565b21e04a91845dd SHA512
ef17c0b57edea9aef4e7f5805b626864b45d99292e4fec2dc78ad88213a40eef3de6b5c8e62bbe20efbb7d6754cd36ce3ca63d22ca06f566e0c1a5771c920d18
WHIRLPOOL
8572c2b82c5bfb0322852bc4eaca31c861334ff1d752825b72469dd219c39894c7445b77a8ab07d03ce800b632af8eb9eb1c7d3c2867bd841600c1007e4555ea
diff --git a/media-gfx/Slic3r/Slic3r-9999.ebuild
b/media-gfx/Slic3r/Slic3r-9999.ebuild
index d729fac..fa1eaf8 100644
--- a/media-gfx/Slic3r/Slic3r-9999.ebuild
+++ b/media-gfx/Slic3r/Slic3r-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit git-r3 perl-module
+inherit git-r3 eutils perl-module
EGIT_REPO_URI="https://github.com/alexrj/Slic3r.git";
DESCRIPTION="A mesh slicer to generate gcode for 3D fused-filament-fabrication"
@@ -81,6 +81,8 @@ src_unpack() {
}
src_prepare() {
+ epatch "${FILESDIR}"/${PN}-adjust_var_path.patch
+
pushd xs &>/dev/null
perl-module_src_prepare
popd &>/dev/null
@@ -121,5 +123,8 @@ src_install() {
insinto "${VENDOR_LIB}"/Slic3r
doins -r var
- dobin slic3r.pl
+ exeinto "${VENDOR_LIB}"/Slic3r
+ doexe slic3r.pl
+
+ dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
}
diff --git a/media-gfx/Slic3r/files/Slic3r-adjust_var_path.patch
b/media-gfx/Slic3r/files/Slic3r-adjust_var_path.patch
new file mode 100644
index 0000000..6bf6498
--- /dev/null
+++ b/media-gfx/Slic3r/files/Slic3r-adjust_var_path.patch
@@ -0,0 +1,11 @@
+--- a/lib/Slic3r.pm 2015-02-12 16:29:59.304970375 -0500
++++ b/lib/Slic3r.pm 2015-02-12 16:35:14.824976135 -0500
+@@ -30,7 +30,7 @@
+ if $^V == v5.16;
+
+ use FindBin;
+-our $var = "$FindBin::Bin/var";
++our $var = "$FindBin::RealBin/var";
+
+ use Encode;
+ use Encode::Locale;
