From 91fdee6efa5a28c056f36f83c24db2487ffa86c3 Mon Sep 17 00:00:00 2001 From: Ian Stakenvicius Date: Tue, 3 May 2016 11:42:11 -0400 Subject: media-gfx/slic3r: revbump to fix a couple of dependencies dev-perl/Encode-Locale had a typo in PV, fixed; also dropped the dependency of dev-lang/perl-5.22 since (A) it's not a real dependency and (B) it inhibits mixed-~arch installs if the user overlays perl-core/threads and perl-core/Socket to provide the necessary versions of those modules. Package-Manager: portage-2.2.26 --- media-gfx/slic3r/slic3r-1.2.9-r1.ebuild | 106 -------------------------------- media-gfx/slic3r/slic3r-1.2.9-r2.ebuild | 103 +++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 106 deletions(-) delete mode 100644 media-gfx/slic3r/slic3r-1.2.9-r1.ebuild create mode 100644 media-gfx/slic3r/slic3r-1.2.9-r2.ebuild (limited to 'media-gfx/slic3r') diff --git a/media-gfx/slic3r/slic3r-1.2.9-r1.ebuild b/media-gfx/slic3r/slic3r-1.2.9-r1.ebuild deleted file mode 100644 index 244eb2e707ab..000000000000 --- a/media-gfx/slic3r/slic3r-1.2.9-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# 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" - -# Slic3r is a fragile application. -# In order to produce reasonably good results we require -# latest dependencies. -RDEPEND=">=dev-lang/perl-5.22 - >=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 "${VENDOR_LIB}" - doins -r lib/Slic3r.pm lib/Slic3r - - insinto "${VENDOR_LIB}"/Slic3r - doins -r var - - exeinto "${VENDOR_LIB}"/Slic3r - doexe slic3r.pl - - dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl - - make_desktop_entry slic3r.pl \ - Slic3r \ - "${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \ - "Graphics;3DGraphics;Engineering;Development" - popd || die -} diff --git a/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild b/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild new file mode 100644 index 000000000000..f0ce2dd93944 --- /dev/null +++ b/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild @@ -0,0 +1,103 @@ +# 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" + +RDEPEND="!=dev-lang/perl-5.16* + >=dev-libs/boost-1.55[threads] + dev-perl/Class-XSAccessor + >=dev-perl/Encode-Locale-1.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 "${VENDOR_LIB}" + doins -r lib/Slic3r.pm lib/Slic3r + + insinto "${VENDOR_LIB}"/Slic3r + doins -r var + + exeinto "${VENDOR_LIB}"/Slic3r + doexe slic3r.pl + + dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl + + make_desktop_entry slic3r.pl \ + Slic3r \ + "${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \ + "Graphics;3DGraphics;Engineering;Development" + popd || die +} -- cgit v1.2.3-65-gdbad