gentoo resync : 18.11.2018

3 files changed, 12 insertions, 108 deletions

diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index a40652e99642..8573c867abfe 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -4,10 +4,8 @@ AUX slic3r-1.2.9-c++11.patch 1102 BLAKE2B 3cb6c1ab196a73da820190e2f00f65654a1e3a
 AUX slic3r-1.3.0-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
 AUX slic3r-9999-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
 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
 EBUILD slic3r-1.1.7.ebuild 2909 BLAKE2B e27ded00dbfe3869bd08b5a7d969f78d23c96c34611e50997a57f9331a0b142de3e984e5a15eea219414b39c97fcd99633014bce2df072117ea334db2d41a868 SHA512 03a2ffd9a3290b582da0feb1eaff5445ec1baa991faa5dde9899f68d557bd234c2f20cca24a5660093e0695ef5ca47ed76059688da48d2561b92b45d17ece834
-EBUILD slic3r-1.2.9-r2.ebuild 2472 BLAKE2B 60a07b07348bec52717fa7476286030dd0ff9bda794c634e054386d67a46d3a640429eb8d301b356cf8e01d08f0b73777ae33944a2a65a7882618bca5ef16a95 SHA512 9937794276d490f75476fa39208f7726d0ad83534acb84ab5818cd1849c580cf3ce2c9f01b9eeaaee9ed9d4f49cc24bb9c4b95c4b45bbd70fd304678e0246795
-EBUILD slic3r-1.3.0.ebuild 2602 BLAKE2B e4f9a4e793ee552d839a563427ba4ffc4458736b114dfb13f0d99ea0c34d70d1bcc247f4679a436672b1259a4e1d4caa83e652ff6f6c942229c12af734058982 SHA512 7884576a45326e4ac368f3780595ac95ab90005d1d3abe9101fb7a45a16dfb56908b787e5deca39ac0f7e47f7e8390793dd514226fd4171c5abcbcd25d5b0bf8
+EBUILD slic3r-1.3.0-r1.ebuild 2818 BLAKE2B 7c80a347937b464e5234f2823d927247c3faf577c558e6f8eae79d2e082394419f23904576e58380a43f4eb50c5f76ad29a3fbf691dc6cb18b4fdbf81c2f1c00 SHA512 e57b93f76eedfd4df9e4b7a00b81dd84fca6e31f1cc95abcaa75d970b47dfd2ec4f98a50419349a549a5a8044cde3a504f449446265107e2a681af0ccea6f4a6
 EBUILD slic3r-9999.ebuild 2621 BLAKE2B ac3c5a2f2790214a68522edae4b4e93958bd866bc236c0435ca535733a209ee05b96cee6ba1a470420ca1a9a3f66454c09b38eeb0e44d683a38977b797853626 SHA512 bfff6a690433fdd85398d841c738578e44569eb58df43b602502c062419a77b3786288944414b3114538cbc278ccb029fa074ce44e4f2fc919209052888dacdc
 MISC metadata.xml 861 BLAKE2B 91af33b7f79333028a2c77b24a4e910b93693a8aeec0e260405df9930489e4cadd3a4cf12f66e1b3b90a84113deb1c30108a7cdc000ef2097559871552385cfb SHA512 203b7d367c4eb6ff4b88fc304dac879277a2b515ed349d495d4231bbd3b097172f20a98fe4bb396b92114a78e7db3e56c2bfb3256e7ff94dfaded9e36696c6a8
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 21f227284727..000000000000
--- 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
index 52dbf45085be..a94b46f01a75 100644
--- a/media-gfx/slic3r/slic3r-1.3.0.ebuild
+++ b/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils perl-module
+inherit eutils flag-o-matic perl-module
 
 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
 HOMEPAGE="http://slic3r.org"
@@ -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() {