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 6D18E138334 for ; Mon, 12 Nov 2018 15:40:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECF2BE0B46; Mon, 12 Nov 2018 15:40:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ABE12E0B46 for ; Mon, 12 Nov 2018 15:40:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 A9DA7335D09 for ; Mon, 12 Nov 2018 15:40:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 993133CF for ; Mon, 12 Nov 2018 15:40:06 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: <1542037107.ee0c1189775ad6a1854fc90fa4a4b144a990c791.alexxy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/slic3r/Manifest media-gfx/slic3r/slic3r-1.2.9-r2.ebuild media-gfx/slic3r/slic3r-1.3.0-r1.ebuild media-gfx/slic3r/slic3r-1.3.0.ebuild X-VCS-Directories: media-gfx/slic3r/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: ee0c1189775ad6a1854fc90fa4a4b144a990c791 X-VCS-Branch: master Date: Mon, 12 Nov 2018 15:40:06 +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: b439ec4c-57c8-4e99-b480-75f691134f7c X-Archives-Hash: 9559e4fdc8efbb56a9934f37988f2329 commit: ee0c1189775ad6a1854fc90fa4a4b144a990c791 Author: Alexey Shvetsov gentoo org> AuthorDate: Mon Nov 12 15:38:27 2018 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Mon Nov 12 15:38:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee0c1189 media-gfx/slic3r: Fix abi mismatch when built with gcc8 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Alexey Shvetsov gentoo.org> media-gfx/slic3r/Manifest | 1 - media-gfx/slic3r/slic3r-1.2.9-r2.ebuild | 103 --------------------- ...{slic3r-1.3.0.ebuild => slic3r-1.3.0-r1.ebuild} | 11 ++- 3 files changed, 10 insertions(+), 105 deletions(-) diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest index bc22f8bc00b..8cd8345ac18 100644 --- a/media-gfx/slic3r/Manifest +++ b/media-gfx/slic3r/Manifest @@ -1,3 +1,2 @@ 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/slic3r-1.2.9-r2.ebuild b/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild deleted file mode 100644 index 21f22728472..00000000000 --- a/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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="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 "${FILESDIR}/${P}-c++11.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.3.0.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild similarity index 91% rename from media-gfx/slic3r/slic3r-1.3.0.ebuild rename to media-gfx/slic3r/slic3r-1.3.0-r1.ebuild index 52dbf45085b..99bb42f016a 100644 --- a/media-gfx/slic3r/slic3r-1.3.0.ebuild +++ b/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -65,12 +65,21 @@ DEPEND="${RDEPEND} S="${WORKDIR}/Slic3r-${PV}/xs" +pkg_pretend() { + einfo "Checking for -std=c++11 support in compiler" + test-flags-CXX -std=c++11 > /dev/null || die +} + 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_user popd || die + # drop std=c++11 to compiler defaults... + sed \ + -e '/c++11/d' \ + -i Build.PL || die } src_configure() {