Some Slic3r improvements and drop old

Signed-off-by: haarp <main.haarp@gmail.com>

3 files changed, 8 insertions, 129 deletions

diff --git a/media-gfx/slic3r-prusa3d/Manifest b/media-gfx/slic3r-prusa3d/Manifest
index 1cb04bc..fa99201 100644
--- a/media-gfx/slic3r-prusa3d/Manifest
+++ b/media-gfx/slic3r-prusa3d/Manifest
@@ -1,3 +1,2 @@
-EBUILD slic3r-prusa3d-1.40.0.ebuild 2978 BLAKE2B 698eb597aaf6ff1fec31634214513166cfbb27df5f34154566c8b5607918f8b277a8681c98e1e126c35331cbad60a8b91d14f258fae7124501cdc958add753ae SHA512 347eede8f8c8aa94f977372668528cc8a1c3f28a6395f424615b0c21e203cd8bd45b0d8195650fc34d5375be36e3ef40b42f620ff68f8d9590f3007e03241641
-EBUILD slic3r-prusa3d-1.41.2.ebuild 2951 BLAKE2B eb425b43257f0ba8338ee6595810cbf9b15a54fa5dd16551e10a4fa4907e5a3d874023368b42a5c448762531314020694bfd6bdea9499ad0bde64f350175de00 SHA512 be81839598147a4c57e8ae1b503cde02a5f23be9061ba7fd24a792d93439b8bcaf9542bef88ba9daa6c0cf42fade81533bd228e40d2c9163cb1f8cb659ba4fbb
+EBUILD slic3r-prusa3d-1.41.2.ebuild 2816 BLAKE2B 424e0e71c4774ace96085794d5a72caa1f0d9f8e25493eb0e731b03c8cbfd21207d68a08b2c3dbc19ffb3198dbd7c7c968811d942db53ec60c3bc79530044839 SHA512 8a64a283cdd57e6bb460114864bf425ff3cfe2b03d6fa7ba89d8089dd40d653e7b41f072417d68ef3ebbfe8ea1633291bcbc5add2f47dd7d1ee3c14398411ba7
 MISC metadata.xml 203 BLAKE2B c6e21b67977c25397c014c8a709a0568bef0d455dbad7aa9787c63895c9dac8e1405522bc1dc82745b18d37f48d01a822ca29880ea374c895446dfba5c33d9cc SHA512 05b7902daead1819658dd3c1b9539056a410ed454703125399504ef2816dced3dfb606894ada0ca325da3e149f845078fefa21af4fb24e9d224d93813d66e68e
diff --git a/media-gfx/slic3r-prusa3d/slic3r-prusa3d-1.40.0.ebuild b/media-gfx/slic3r-prusa3d/slic3r-prusa3d-1.40.0.ebuild
deleted file mode 100644
index ae536ce..0000000
--- a/media-gfx/slic3r-prusa3d/slic3r-prusa3d-1.40.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# https://bugs.gentoo.org/652100
-
-EAPI=6
-
-inherit eutils git-r3 perl-module cmake-utils
-
-DESCRIPTION="Improved G-code generator for Prusa 3D printers"
-HOMEPAGE="https://www.prusa3d.com/slic3r-prusa-edition/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/prusa3d/Slic3r.git"
-EGIT_COMMIT="303ed0e"
-
-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*
-	!media-gfx/slic3r
-	dev-cpp/tbb
-	>=dev-libs/boost-1.55[threads]
-	dev-perl/Class-XSAccessor
-	dev-perl/Devel-CheckLib
-	dev-perl/Devel-Size
-	>=dev-perl/Encode-Locale-1.50.0
-	dev-perl/IO-stringy
-	dev-perl/local-lib
-	>=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/Devel-CheckLib
-	>=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-prusa3d-${PV}"
-
-src_unpack() {
-	git-r3_src_unpack
-}
-
-src_prepare() {
-	pushd "${S}" || die
-	sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
-	eapply_user
-	popd || die
-}
-
-src_configure() {
-	SLIC3R_NO_AUTO=1 perl-module_src_configure
-	cmake-utils_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
-	insinto "${VENDOR_LIB}"
-	doins -r lib/Slic3r.pm lib/Slic3r
-	insinto "${VENDOR_LIB}"/Slic3r
-	doins -r resources
-
-	exeinto "${VENDOR_LIB}"/Slic3r
-	doexe slic3r.pl
-
-	dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
-	dosym "${VENDOR_LIB}"/Slic3r/resources/icons/Slic3r_128px.png \
-		/usr/share/pixmaps/slic3r.png
-
-	make_desktop_entry "slic3r.pl --gui" \
-		"Slic3r Prusa Edition" \
-		"slic3r.png" \
-		"Graphics;3DGraphics;Engineering;Development"
-	# xfce4-panel skips files with multiple dots
-	mv "${D}/usr/share/applications/slic3r.pl-slic3r-prusa3d.desktop" \
-		"${D}/usr/share/applications/slic3r-prusa3d.desktop"
-
-	cmake-utils_src_install
-}
diff --git a/media-gfx/slic3r-prusa3d/slic3r-prusa3d-1.41.2.ebuild b/media-gfx/slic3r-prusa3d/slic3r-prusa3d-1.41.2.ebuild
index ae29ceb..c8f9f35 100644
--- a/media-gfx/slic3r-prusa3d/slic3r-prusa3d-1.41.2.ebuild
+++ b/media-gfx/slic3r-prusa3d/slic3r-prusa3d-1.41.2.ebuild
@@ -103,17 +103,17 @@ src_install() {
 	exeinto "${VENDOR_LIB}"/Slic3r
 	doexe slic3r.pl
 
-	dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
+	cmake-utils_src_install
+
+	dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r
 	dosym "${VENDOR_LIB}"/Slic3r/resources/icons/Slic3r_128px.png \
 		/usr/share/pixmaps/slic3r.png
 
-	make_desktop_entry "slic3r.pl --gui" \
+	make_desktop_entry "slic3r --gui" \
 		"Slic3r Prusa Edition" \
-		"slic3r.png" \
+		"slic3r" \
 		"Graphics;3DGraphics;Engineering;Development"
-	# xfce4-panel skips files with multiple dots
-	mv "${D}/usr/share/applications/slic3r.pl-slic3r-prusa3d.desktop" \
-		"${D}/usr/share/applications/slic3r-prusa3d.desktop"
 
-	cmake-utils_src_install
+	# broken
+	rm "${D}/usr/bin/slic3r-prusa3d"
 }