[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/

2020-12-06 Thread Dennis Lamm 
commit: 2af1afdd76734d65c950a5ead00e81674fb95cca
Author: Dennis Lamm  gentoo  org>
AuthorDate: Fri Dec  4 21:41:40 2020 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Sun Dec  6 12:32:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2af1afdd

media-gfx/slic3r-1.3.0: fixed boost 1.73 build

also use system clipper

Bug: https://bugs.gentoo.org/722308
Signed-off-by: Dennis Lamm  gentoo.org>

 .../slic3r/files/slic3r-1.3.0-boost-1.73.patch | 146 +
 .../files/slic3r-1.3.0-use-system-clipper.patch|  44 +++
 media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch  |  10 ++
 ...ic3r-1.3.0-r2.ebuild => slic3r-1.3.0-r3.ebuild} |  38 +++---
 4 files changed, 217 insertions(+), 21 deletions(-)

diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch 
b/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch
new file mode 100644
index 000..6b710a18f3a
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch
@@ -0,0 +1,146 @@
+--- a/xs/src/boost/nowide/cstdlib.hpp
 b/xs/src/boost/nowide/cstdlib.hpp
+@@ -8,7 +8,7 @@
+ #ifndef BOOST_NOWIDE_CSTDLIB_HPP_INCLUDED
+ #define BOOST_NOWIDE_CSTDLIB_HPP_INCLUDED
+
+-#include 
++#include 
+ #include 
+
+ #endif
+--- a/xs/src/admesh/stl.h
 b/xs/src/admesh/stl.h
+@@ -26,11 +26,6 @@
+ #include 
+ #include 
+ #include 
+-#include 
+-
+-#ifndef BOOST_LITTLE_ENDIAN
+-#error "admesh works correctly on little endian machines only!"
+-#endif
+
+ #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+ #include "windows.h"
+
+--- a/xs/src/libslic3r/PrintObject.cpp
 b/xs/src/libslic3r/PrintObject.cpp
+@@ -2,11 +2,14 @@
+ #include "BoundingBox.hpp"
+ #include "ClipperUtils.hpp"
+ #include "Geometry.hpp"
++#include 
+ #include 
+ #include 
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++
+ PrintObject::PrintObject(Print* print, ModelObject* model_object, const 
BoundingBoxf3 _bbox)
+ :   layer_height_spline(model_object->layer_height_spline),
+ typed_slices(false),
+--- a/xs/src/libslic3r/GCodeSender.hpp
 b/xs/src/libslic3r/GCodeSender.hpp
+@@ -7,13 +7,17 @@
+ #include 
+ #include 
+ #include 
+-#include 
++#include 
++#include 
+ #include 
+
+ namespace Slic3r {
+
+ namespace asio = boost::asio;
+
++using boost::placeholders::_1;
++using boost::placeholders::_2;
++
+ class GCodeSender : private boost::noncopyable {
+ public:
+ GCodeSender();
+--- a/xs/src/libslic3r/TriangleMesh.cpp
 b/xs/src/libslic3r/TriangleMesh.cpp
+@@ -14,6 +14,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+
+ #ifdef SLIC3R_DEBUG
+ #include "SVG.hpp"
+@@ -21,6 +22,8 @@
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++
+ TriangleMesh::TriangleMesh()
+ : repaired(false)
+ {
+--- a/xs/src/libslic3r/Config.cpp
 b/xs/src/libslic3r/Config.cpp
+@@ -14,6 +14,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+--- a/xs/src/libslic3r/SLAPrint.cpp
 b/xs/src/libslic3r/SLAPrint.cpp
+@@ -7,9 +7,12 @@
+ #include 
+ #include 
+ #include 
++#include 
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++
+ void
+ SLAPrint::slice()
+ {
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -22,7 +22,7 @@
+ set(Boost_USE_STATIC_LIBS ON)
+ set(Boost_USE_STATIC_RUNTIME ON)
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+-find_package(Boost COMPONENTS system thread filesystem)
++find_package(Boost MODULE REQUIRED)
+
+ set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/../xs/src/)
+
+--- a/xs/src/libslic3r/GCodeTimeEstimator.cpp
 b/xs/src/libslic3r/GCodeTimeEstimator.cpp
+@@ -1,9 +1,12 @@
+ #include "GCodeTimeEstimator.hpp"
+-#include 
++#include 
+ #include 
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++using boost::placeholders::_2;
++
+ void
+ GCodeTimeEstimator::parse(const std::string )
+ {
+--- a/xs/Build.PL
 b/xs/Build.PL
+@@ -142,7 +142,7 @@
+ }
+ # In order to generate the -l switches we need to know how Boost libraries 
are named
+ my $have_boost = 0;
+-my @boost_libraries = qw(system thread filesystem);  # we need these
++my @boost_libraries = qw(system thread filesystem nowide);  # we need these
+ # check without explicit lib path (works on Linux)
+ if (! $mswin) {
+ $have_boost = 1

diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch 
b/media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch
new file mode 100644
index 000..9f9a5ef2fbd
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch
@@ -0,0 +1,44 @@
+--- a/xs/src/libslic3r/ClipperUtils.hpp
 b/xs/src/libslic3r/ClipperUtils.hpp
+@@ -2,7 +2,7 @@
+ #define slic3r_ClipperUtils_hpp_
+ 
+ #include 
+-#include "clipper.hpp"
++#include 
+ #include "ExPolygon.hpp"
+ #include "Polygon.hpp"
+ #include "Surface.hpp"
+--- a/xs/src/libslic3r/Geometry.cpp
 b/xs/src/libslic3r/Geometry.cpp
+@@ -3,7 +3,7 @@
+ #include "ExPolygon.hpp"
+ #include "Line.hpp"
+ #include "PolylineCollection.hpp"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/, profiles/

2020-12-06 Thread Dennis Lamm 
commit: 88d4115cf751dbf9f67ce2d64af9926207b7a3c9
Author: Dennis Lamm  gentoo  org>
AuthorDate: Thu Dec  3 05:04:59 2020 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Sun Dec  6 12:32:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88d4115c

media-gfx/slic3r: drop old

Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/slic3r/Manifest  |   1 -
 .../files/slic3r-1.1.7-adjust_var_path.patch   |  11 --
 media-gfx/slic3r/files/slic3r-1.3.0-boost.patch|  10 --
 media-gfx/slic3r/slic3r-1.1.7.ebuild   | 115 
 media-gfx/slic3r/slic3r-1.3.0-r1.ebuild| 118 -
 profiles/package.mask  |   8 --
 6 files changed, 263 deletions(-)

diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 8cd8345ac18..1a6d2e82c5b 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -1,2 +1 @@
-DIST slic3r-1.1.7.tar.gz 2079200 BLAKE2B 
b3aa45741bb92a75dd09be783cb9a8cd551c7736f04022905d11587d8b2a533db85c1f88a9d0185b2b6414ba56d44e0feb104bcfcaf52a0a35a1db912c6976db
 SHA512 
0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650
 DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 
74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41
 SHA512 
ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d

diff --git a/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch 
b/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch
deleted file mode 100644
index ee4d75d0122..000
--- a/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/lib/Slic3r.pm2016-03-31 13:27:59.431548980 +0200
-+++ b/lib/Slic3r.pm2016-03-31 13:28:21.658675137 +0200
-@@ -29,7 +29,7 @@
- if $^V >= v5.16;
- 
- use FindBin;
--our $var = "$FindBin::Bin/var";
-+our $var = "$FindBin::RealBin/var";
- 
- use Encode;
- use Encode::Locale;

diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch 
b/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch
deleted file mode 100644
index e77e50b3c99..000
--- a/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 Slic3r-1.3.0/xs/src/libslic3r/GCodeSender.hpp.old  2019-11-04 
19:31:05.714869400 -0800
-+++ Slic3r-1.3.0/xs/src/libslic3r/GCodeSender.hpp  2019-11-04 
19:34:10.656330929 -0800
-@@ -9,6 +9,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- namespace Slic3r {
- 

diff --git a/media-gfx/slic3r/slic3r-1.1.7.ebuild 
b/media-gfx/slic3r/slic3r-1.1.7.ebuild
deleted file mode 100644
index f144a2980de..000
--- a/media-gfx/slic3r/slic3r-1.1.7.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils perl-module
-
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication 
(3D printers)"
-HOMEPAGE="https://slic3r.org;
-SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gui test"
-RESTRICT="!test? ( test )"
-
-# check Build.PL for dependencies
-RDEPEND="!=dev-lang/perl-5.16*
-   >=dev-libs/boost-1.55[threads]
-   dev-perl/Class-XSAccessor
-   dev-perl/Encode-Locale
-   dev-perl/IO-stringy
-   >=dev-perl/Math-PlanePath-53.0.0
-   >=dev-perl/Moo-1.3.1
-   dev-perl/XML-SAX-ExpatXS
-   virtual/perl-Carp
-   virtual/perl-File-Spec
-   virtual/perl-Getopt-Long
-   virtual/perl-parent
-   virtual/perl-Scalar-List-Utils
-   virtual/perl-Test-Simple
-   virtual/perl-Thread-Semaphore
-   >=virtual/perl-threads-1.960.0
-   virtual/perl-Time-HiRes
-   virtual/perl-XSLoader
-   gui? ( dev-perl/Class-Accessor
-   dev-perl/Growl-GNTP
-   dev-perl/libwww-perl
-   dev-perl/Module-Pluggable
-   dev-perl/Net-Bonjour
-   dev-perl/Net-DBus
-   dev-perl/OpenGL
-   >=dev-perl/Wx-0.991.800
-   dev-perl/Wx-GLCanvas
-   >=media-libs/freeglut-3
-   virtual/perl-Math-Complex
-   >=virtual/perl-Socket-2.16.0
-   x11-libs/libXmu
-   )"
-DEPEND="${RDEPEND}
-   >=dev-perl/ExtUtils-CppGuess-0.70.0
-   >=dev-perl/ExtUtils-Typemaps-Default-1.50.0
-   >=dev-perl/ExtUtils-XSpp-0.170.0
-   >=dev-perl/Module-Build-0.380.0
-   >=dev-perl/Module-Build-WithXSpp-0.140.0
-   >=virtual/perl-ExtUtils-MakeMaker-6.800.0
-   >=virtual/perl-ExtUtils-ParseXS-3.220.0
-   test? ( virtual/perl-Test-Harness
-   virtual/perl-Test-Simple )"
-
-DIST_TEST="do"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/

2019-11-07 Thread Andreas K. Hüttel 
commit: f614b0c825c26ee8e1900fa5e3cf8883d09cd274
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Thu Nov  7 22:11:26 2019 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Thu Nov  7 22:11:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f614b0c8

media-gfx/slic3r: Add patch by Chris Mansfield for recent boost

Closes: https://bugs.gentoo.org/689804
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 media-gfx/slic3r/files/slic3r-1.3.0-boost.patch | 10 ++
 media-gfx/slic3r/slic3r-1.3.0-r1.ebuild |  1 +
 2 files changed, 11 insertions(+)

diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch 
b/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch
new file mode 100644
index 000..e77e50b3c99
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch
@@ -0,0 +1,10 @@
+--- Slic3r-1.3.0/xs/src/libslic3r/GCodeSender.hpp.old  2019-11-04 
19:31:05.714869400 -0800
 Slic3r-1.3.0/xs/src/libslic3r/GCodeSender.hpp  2019-11-04 
19:34:10.656330929 -0800
+@@ -9,6 +9,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ namespace Slic3r {
+ 

diff --git a/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild 
b/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild
index 64cc0c14bc9..556d06e6628 100644
--- a/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild
+++ b/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild
@@ -74,6 +74,7 @@ src_prepare() {
pushd "${WORKDIR}/Slic3r-${PV}" || die
sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
eapply "${FILESDIR}"/${P}-no-locallib.patch
+   eapply "${FILESDIR}"/${P}-boost.patch
eapply_user
popd || die
# drop std=c++11 to compiler defaults...

[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/

2018-06-06 Thread Alexey Shvetsov 
commit: 36d17be523b54b0baae627121f4b7b085f49eb61
Author: Alexey Shvetsov  gentoo  org>
AuthorDate: Wed Jun  6 13:21:39 2018 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Wed Jun  6 13:22:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36d17be5

media-gfx/slic3r: Version bump

New version of slic3r

Closes: https://bugs.gentoo.org/617640
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-gfx/slic3r/Manifest  |   1 +
 .../slic3r/files/slic3r-1.3.0-no-locallib.patch| 609 +
 media-gfx/slic3r/slic3r-1.3.0.ebuild   | 107 
 3 files changed, 717 insertions(+)

diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index b41d2036880..bc22f8bc00b 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -1,2 +1,3 @@
 DIST slic3r-1.1.7.tar.gz 2079200 BLAKE2B 
b3aa45741bb92a75dd09be783cb9a8cd551c7736f04022905d11587d8b2a533db85c1f88a9d0185b2b6414ba56d44e0feb104bcfcaf52a0a35a1db912c6976db
 SHA512 
0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650
 DIST slic3r-1.2.9.tar.gz 2165322 BLAKE2B 
49643284520e6c85ff0e32fada165c8d4c75c15e484555aac1004bc9527bacd552c6aa4916cbb56e304553a47ef6c2db703f6e9d705a585cfbac909c2e84bb79
 SHA512 
c0284f40de43c54e775baccdb2a67813a6ca4b69db78a788f2023b3f34127e780e6d0160144b9df1e17a2992b3255ef9a372b61a594f503b21efad7334387a51
+DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 
74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41
 SHA512 
ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d

diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-no-locallib.patch 
b/media-gfx/slic3r/files/slic3r-1.3.0-no-locallib.patch
new file mode 100644
index 000..8cb7fd6d16d
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.3.0-no-locallib.patch
@@ -0,0 +1,609 @@
+commit 6f7e42a4707788d079d865800d9fdb65ed7d5f1f
+Author: Ian Stakenvicius 
+Date:   Wed Sep 27 12:22:14 2017 -0400
+
+Revert "Use --local-lib when calling cpanm"
+
+This reverts commit e5412b5d69dc4d5415c92a7daaa47fb4860ca4ea and others
+that add local::lib dependency
+
+diff --git a/Build.PL b/Build.PL
+index 2dd18435..18befbf8 100644
+--- a/Build.PL
 b/Build.PL
+@@ -109,16 +109,7 @@ EOF
+ if !$cpanm;
+ my @cpanm_args = ();
+ push @cpanm_args, "--sudo" if $sudo;
+-
+-# install local::lib without --local-lib otherwise it's not usable 
afterwards
+-if (!eval "use local::lib qw(local-lib); 1") {
+-my $res = system $cpanm, @cpanm_args, 'local::lib';
+-warn "Warning: local::lib is required. You might need to run the 
`cpanm --sudo local::lib` command in order to install it.\n"
+-if $res != 0;
+-}
+-
+-push @cpanm_args, ('--local-lib', 'local-lib');
+-
++
+ # make sure our cpanm is updated (old ones don't support the ~ syntax)
+ system $cpanm, @cpanm_args, 'App::cpanminus';
+ 
+diff --git a/slic3r.pl b/slic3r.pl
+index 11dc2fad..76885c90 100755
+--- a/slic3r.pl
 b/slic3r.pl
+@@ -6,7 +6,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/lib";
+-use local::lib '--no-create', "$FindBin::Bin/local-lib";
+ }
+ 
+ use File::Basename qw(basename);
+diff --git a/t/adaptive_slicing.t b/t/adaptive_slicing.t
+index 64c3769f..5ab631fe 100644
+--- a/t/adaptive_slicing.t
 b/t/adaptive_slicing.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+-use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum);
+diff --git a/t/adaptive_width.t b/t/adaptive_width.t
+index 7a0baa75..c200f844 100644
+--- a/t/adaptive_width.t
 b/t/adaptive_width.t
+@@ -7,7 +7,6 @@ plan tests => 32;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+-use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/angles.t b/t/angles.t
+index 2ae00b4e..1e1a6c9c 100644
+--- a/t/angles.t
 b/t/angles.t
+@@ -7,9 +7,6 @@ plan tests => 34;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+-use lib "$FindBin::Bin/../lib";
+-use lib "$FindBin::Bin/../lib";
+-use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/arcs.t b/t/arcs.t
+index ec85dfbc..65b83de4 100644
+--- a/t/arcs.t
 b/t/arcs.t
+@@ -7,7 +7,6 @@ plan tests => 24;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+-use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/avoid_crossing_perimeters.t b/t/avoid_crossing_perimeters.t
+index 7cd04e50..dd6c3e7b 100644
+--- a/t/avoid_crossing_perimeters.t
 b/t/avoid_crossing_perimeters.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/

2017-09-27 Thread Ian Stakenvicius 
commit: b99d82cf2ca7b57d411e8008b85b731b03dc08c0
Author: Ian Stakenvicius  gentoo  org>
AuthorDate: Wed Sep 27 17:17:14 2017 +
Commit: Ian Stakenvicius  gentoo  org>
CommitDate: Wed Sep 27 17:17:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b99d82cf

media-gfx/slic3r-: add missing dep, strip local::lib

local::lib is a workaround to help with the cpan-minus based
build system the package comes with, which we are circumventing
in order to perform a proper system installation.  This commit
includes a patch that reverts the upstream addition of local::lib.

Also adds dev-perl/Devel-CheckLib to the dependency list

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 .../slic3r/files/slic3r--no-locallib.patch | 609 +
 media-gfx/slic3r/slic3r-.ebuild|   2 +
 2 files changed, 611 insertions(+)

diff --git a/media-gfx/slic3r/files/slic3r--no-locallib.patch 
b/media-gfx/slic3r/files/slic3r--no-locallib.patch
new file mode 100644
index 000..8cb7fd6d16d
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r--no-locallib.patch
@@ -0,0 +1,609 @@
+commit 6f7e42a4707788d079d865800d9fdb65ed7d5f1f
+Author: Ian Stakenvicius 
+Date:   Wed Sep 27 12:22:14 2017 -0400
+
+Revert "Use --local-lib when calling cpanm"
+
+This reverts commit e5412b5d69dc4d5415c92a7daaa47fb4860ca4ea and others
+that add local::lib dependency
+
+diff --git a/Build.PL b/Build.PL
+index 2dd18435..18befbf8 100644
+--- a/Build.PL
 b/Build.PL
+@@ -109,16 +109,7 @@ EOF
+ if !$cpanm;
+ my @cpanm_args = ();
+ push @cpanm_args, "--sudo" if $sudo;
+-
+-# install local::lib without --local-lib otherwise it's not usable 
afterwards
+-if (!eval "use local::lib qw(local-lib); 1") {
+-my $res = system $cpanm, @cpanm_args, 'local::lib';
+-warn "Warning: local::lib is required. You might need to run the 
`cpanm --sudo local::lib` command in order to install it.\n"
+-if $res != 0;
+-}
+-
+-push @cpanm_args, ('--local-lib', 'local-lib');
+-
++
+ # make sure our cpanm is updated (old ones don't support the ~ syntax)
+ system $cpanm, @cpanm_args, 'App::cpanminus';
+ 
+diff --git a/slic3r.pl b/slic3r.pl
+index 11dc2fad..76885c90 100755
+--- a/slic3r.pl
 b/slic3r.pl
+@@ -6,7 +6,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/lib";
+-use local::lib '--no-create', "$FindBin::Bin/local-lib";
+ }
+ 
+ use File::Basename qw(basename);
+diff --git a/t/adaptive_slicing.t b/t/adaptive_slicing.t
+index 64c3769f..5ab631fe 100644
+--- a/t/adaptive_slicing.t
 b/t/adaptive_slicing.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+-use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum);
+diff --git a/t/adaptive_width.t b/t/adaptive_width.t
+index 7a0baa75..c200f844 100644
+--- a/t/adaptive_width.t
 b/t/adaptive_width.t
+@@ -7,7 +7,6 @@ plan tests => 32;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+-use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/angles.t b/t/angles.t
+index 2ae00b4e..1e1a6c9c 100644
+--- a/t/angles.t
 b/t/angles.t
+@@ -7,9 +7,6 @@ plan tests => 34;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+-use lib "$FindBin::Bin/../lib";
+-use lib "$FindBin::Bin/../lib";
+-use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/arcs.t b/t/arcs.t
+index ec85dfbc..65b83de4 100644
+--- a/t/arcs.t
 b/t/arcs.t
+@@ -7,7 +7,6 @@ plan tests => 24;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+-use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/avoid_crossing_perimeters.t b/t/avoid_crossing_perimeters.t
+index 7cd04e50..dd6c3e7b 100644
+--- a/t/avoid_crossing_perimeters.t
 b/t/avoid_crossing_perimeters.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+-use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum);
+diff --git a/t/bridges.t b/t/bridges.t
+index 677115b8..3dc6b84a 100644
+--- a/t/bridges.t
 b/t/bridges.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+-use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum);
+diff --git a/t/clean_polylines.t b/t/clean_polylines.t
+index 50c6f5bb..4526bd60 100644
+--- a/t/clean_polylines.t
 b/t/clean_polylines.t
+@@ -7,7 +7,6 @@ plan tests => 6;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+-use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/clipper.t b/t/clipper.t
+index 3c983814..a898a53f 100644
+--- a/t/clipper.t
 b/t/clipper.t
+@@ -7,7 +7,6 @@ plan tests => 6;
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/

2017-05-06 Thread Amy Liffey 
commit: 6443f68173b24e1901d133757f5a369f821fc2eb
Author: Amy Liffey  gentoo  org>
AuthorDate: Sat May  6 14:42:37 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sat May  6 15:11:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6443f681

media-gfx/slic3r: fix patching bug #617640

Submitted-by: Philipp Psurek 
Package-Manager: portage-2.3.3

 media-gfx/slic3r/files/slic3r--adjust_var_path.patch | 11 ---
 media-gfx/slic3r/slic3r-.ebuild  |  4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/media-gfx/slic3r/files/slic3r--adjust_var_path.patch 
b/media-gfx/slic3r/files/slic3r--adjust_var_path.patch
deleted file mode 100644
index ff22b24e227..000
--- a/media-gfx/slic3r/files/slic3r--adjust_var_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/lib/Slic3r.pm2016-12-18 15:24:37.52000 +0100
-+++ b/lib/Slic3r.pm2016-12-18 15:25:23.43000 +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-.ebuild 
b/media-gfx/slic3r/slic3r-.ebuild
index 3d54436739e..4c89cffa525 100644
--- a/media-gfx/slic3r/slic3r-.ebuild
+++ b/media-gfx/slic3r/slic3r-.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
 }

[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/

2016-04-03 Thread Andreas Hüttel 
commit: 0ce6a1fe206c370b256d55b217a2c64783ecf9e5
Author: Matthew Brewer  sina  cn>
AuthorDate: Fri Apr  1 18:38:26 2016 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sun Apr  3 21:23:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ce6a1fe

media-gfx/slic3r: Add version 1.2.9

Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches

 media-gfx/slic3r/Manifest  |   1 +
 .../files/slic3r-1.2.9-adjust_var_path.patch   |  11 +++
 media-gfx/slic3r/slic3r-1.2.9.ebuild   | 104 +
 3 files changed, 116 insertions(+)

diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 4253099..e08cfb4 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -1 +1,2 @@
 DIST slic3r-1.1.7.tar.gz 2079200 SHA256 
8e1f68a71d78686cf6957ee7665757a4e7d14646bdee262cef76cba47b3f0d50 SHA512 
0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650
 WHIRLPOOL 
18c95a59acff51891251852d59d4bf33b9c1ad8721f581e3c9f55b56bb62e087d030ecb701d16b07cca4567f142ea3b0693c0ab436f1c25b28d02b4a1ce351cd
+DIST slic3r-1.2.9.tar.gz 2165322 SHA256 
f1c231ae56039ccd4ecf624e288c1362cab49b0f751a4663857b916b7fa51f2f SHA512 
c0284f40de43c54e775baccdb2a67813a6ca4b69db78a788f2023b3f34127e780e6d0160144b9df1e17a2992b3255ef9a372b61a594f503b21efad7334387a51
 WHIRLPOOL 
fc3bee0188ab7bd54ac19f3d874acb20dd8614594b79a8539001fd9a682f10c3436ef477d60458c49c7028c8b4bb7bf8585b4b53e73ac3a411d1a18720820eb0

diff --git a/media-gfx/slic3r/files/slic3r-1.2.9-adjust_var_path.patch 
b/media-gfx/slic3r/files/slic3r-1.2.9-adjust_var_path.patch
new file mode 100644
index 000..9dc93a5
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.2.9-adjust_var_path.patch
@@ -0,0 +1,11 @@
+--- a/lib/Slic3r.pm2015-06-17 04:38:28.0 -0400
 b/lib/Slic3r.pm2015-06-19 11:56:07.005873299 -0400
+@@ -30,7 +30,7 @@
+ if $^V == v5.16;
+ 
+ use FindBin;
+-our $var = decode_path($FindBin::Bin) . "/var";
++our $var = decode_path($FindBin::RealBin) . "/var";
+ 
+ use Moo 1.003001;
+ 

diff --git a/media-gfx/slic3r/slic3r-1.2.9.ebuild 
b/media-gfx/slic3r/slic3r-1.2.9.ebuild
new file mode 100644
index 000..85be0f2
--- /dev/null
+++ b/media-gfx/slic3r/slic3r-1.2.9.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils perl-module
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication 
(3D printers)"
+HOMEPAGE="http://slic3r.org;
+SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gui test"
+
+# check Build.PL for dependencies
+RDEPEND="!=dev-lang/perl-5.16*
+   >=dev-libs/boost-1.55[threads]
+   dev-perl/Class-XSAccessor
+   >=dev-perl/Encode-Locale-0.50.0
+   dev-perl/IO-stringy
+   >=dev-perl/Math-PlanePath-53.0.0
+   >=dev-perl/Moo-1.3.1
+   dev-perl/XML-SAX-ExpatXS
+   virtual/perl-Carp
+   virtual/perl-Encode
+   virtual/perl-File-Spec
+   virtual/perl-Getopt-Long
+   virtual/perl-parent
+   virtual/perl-Scalar-List-Utils
+   virtual/perl-Test-Simple
+   virtual/perl-Thread-Semaphore
+   >=virtual/perl-threads-1.960.0
+   virtual/perl-Time-HiRes
+   virtual/perl-Unicode-Normalize
+   virtual/perl-XSLoader
+   gui? ( dev-perl/Class-Accessor
+   dev-perl/Growl-GNTP
+   dev-perl/libwww-perl
+   dev-perl/Module-Pluggable
+   dev-perl/Net-Bonjour
+   dev-perl/Net-DBus
+   dev-perl/OpenGL
+   >=dev-perl/Wx-0.991.800
+   dev-perl/Wx-GLCanvas
+   >=media-libs/freeglut-3
+   virtual/perl-Math-Complex
+   >=virtual/perl-Socket-2.16.0
+   x11-libs/libXmu
+   )"
+DEPEND="${RDEPEND}
+   >=dev-perl/ExtUtils-CppGuess-0.70.0
+   >=dev-perl/ExtUtils-Typemaps-Default-1.50.0
+   >=dev-perl/ExtUtils-XSpp-0.170.0
+   >=dev-perl/Module-Build-0.380.0
+   >=dev-perl/Module-Build-WithXSpp-0.140.0
+   >=virtual/perl-ExtUtils-MakeMaker-6.800.0
+   >=virtual/perl-ExtUtils-ParseXS-3.220.0
+   test? ( virtual/perl-Test-Harness
+   virtual/perl-Test-Simple )"
+
+S="${WORKDIR}/Slic3r-${PV}/xs"
+
+src_prepare() {
+   pushd "${WORKDIR}/Slic3r-${PV}" || die
+   eapply "${FILESDIR}/${P}-adjust_var_path.patch"
+   eapply_user
+   popd || die
+}
+
+src_configure() {
+   SLIC3R_NO_AUTO=1 perl-module_src_configure
+}
+
+src_test() {
+   perl-module_src_test
+   pushd .. || die
+   prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed"
+   popd || die
+}
+
+src_install() {
+   perl-module_src_install
+
+   pushd .. || die
+   insinto

[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/, profiles/

2016-04-03 Thread Andreas Hüttel 
commit: 345fdc3f776082a6fe4d5df6488ebd46427f20d9
Author: Matthew Brewer  sina  cn>
AuthorDate: Fri Apr  1 18:39:36 2016 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sun Apr  3 21:23:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=345fdc3f

media-gfx/slic3r: Initial addition to tree at 1.1.7 (package masked)

Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches

 media-gfx/slic3r/Manifest  |   1 +
 .../files/slic3r-1.1.7-adjust_var_path.patch   |  11 ++
 media-gfx/slic3r/metadata.xml  |  29 ++
 media-gfx/slic3r/slic3r-1.1.7.ebuild   | 115 +
 profiles/package.mask  |   6 ++
 5 files changed, 162 insertions(+)

diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
new file mode 100644
index 000..4253099
--- /dev/null
+++ b/media-gfx/slic3r/Manifest
@@ -0,0 +1 @@
+DIST slic3r-1.1.7.tar.gz 2079200 SHA256 
8e1f68a71d78686cf6957ee7665757a4e7d14646bdee262cef76cba47b3f0d50 SHA512 
0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650
 WHIRLPOOL 
18c95a59acff51891251852d59d4bf33b9c1ad8721f581e3c9f55b56bb62e087d030ecb701d16b07cca4567f142ea3b0693c0ab436f1c25b28d02b4a1ce351cd

diff --git a/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch 
b/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch
new file mode 100644
index 000..ee4d75d
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch
@@ -0,0 +1,11 @@
+--- a/lib/Slic3r.pm2016-03-31 13:27:59.431548980 +0200
 b/lib/Slic3r.pm2016-03-31 13:28:21.658675137 +0200
+@@ -29,7 +29,7 @@
+ if $^V >= v5.16;
+ 
+ use FindBin;
+-our $var = "$FindBin::Bin/var";
++our $var = "$FindBin::RealBin/var";
+ 
+ use Encode;
+ use Encode::Locale;

diff --git a/media-gfx/slic3r/metadata.xml b/media-gfx/slic3r/metadata.xml
new file mode 100644
index 000..c0f39d3
--- /dev/null
+++ b/media-gfx/slic3r/metadata.xml
@@ -0,0 +1,29 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+tombo...@sina.cn
+Proxy-Maintainer; please assign him to bugs.
+
+
+proxy-ma...@gentoo.org
+Gentoo Proxy Maintainers Project
+
+
+3dpr...@gentoo.org
+Gentoo 3D Printer Project
+
+
+p...@gentoo.org
+Gentoo Perl Project
+
+
+Enable GUI
+
+
+Slic3r is the tool you need to convert a 3D model into printing 
instructions for your 3D printer. It cuts the model into horizontal slices 
(layers), generates toolpaths to fill them and calculates the amount of 
material to be extruded.
+
+
+alexrj/Slic3r
+
+

diff --git a/media-gfx/slic3r/slic3r-1.1.7.ebuild 
b/media-gfx/slic3r/slic3r-1.1.7.ebuild
new file mode 100644
index 000..81c710b
--- /dev/null
+++ b/media-gfx/slic3r/slic3r-1.1.7.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils perl-module
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication 
(3D printers)"
+HOMEPAGE="http://slic3r.org;
+SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gui test"
+
+# check Build.PL for dependencies
+RDEPEND="!=dev-lang/perl-5.16*
+   >=dev-libs/boost-1.55[threads]
+   dev-perl/Class-XSAccessor
+   dev-perl/Encode-Locale
+   dev-perl/IO-stringy
+   >=dev-perl/Math-PlanePath-53.0.0
+   >=dev-perl/Moo-1.3.1
+   dev-perl/XML-SAX-ExpatXS
+   virtual/perl-Carp
+   virtual/perl-File-Spec
+   virtual/perl-Getopt-Long
+   virtual/perl-parent
+   virtual/perl-Scalar-List-Utils
+   virtual/perl-Test-Simple
+   virtual/perl-Thread-Semaphore
+   >=virtual/perl-threads-1.960.0
+   virtual/perl-Time-HiRes
+   virtual/perl-XSLoader
+   gui? ( dev-perl/Class-Accessor
+   dev-perl/Growl-GNTP
+   dev-perl/libwww-perl
+   dev-perl/Module-Pluggable
+   dev-perl/Net-Bonjour
+   dev-perl/Net-DBus
+   dev-perl/OpenGL
+   >=dev-perl/Wx-0.991.800
+   dev-perl/Wx-GLCanvas
+   >=media-libs/freeglut-3
+   virtual/perl-Math-Complex
+   >=virtual/perl-Socket-2.16.0
+   x11-libs/libXmu
+   )"
+DEPEND="${RDEPEND}
+   >=dev-perl/ExtUtils-CppGuess-0.70.0
+   >=dev-perl/ExtUtils-Typemaps-Default-1.50.0
+   >=dev-perl/ExtUtils-XSpp-0.170.0
+   >=dev-perl/Module-Build-0.380.0
+   >=dev-perl/Module-Build-WithXSpp-0.140.0
+   >=virtual/perl-ExtUtils-MakeMaker-6.800.0
+   >=virtual/perl-ExtUtils-ParseXS-3.220.0
+   test? ( virtual/perl-Test-Harness
+