gentoo resync : 28.04.2021

4 files changed, 19 insertions, 17 deletions

diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 7ceae0241b3e..b5c776dcb635 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -5,7 +5,7 @@ AUX slic3r-1.3.0-wayland.patch 224 BLAKE2B 71395194aed291387897eae5e5af8d58bee0e
 AUX slic3r-1.3.1_pre20200824-boost-1.73.patch 3928 BLAKE2B 24c2e497a7dd80fa4212e21652abd85b439917a1d4c84866591be2c2fb4d6acc999468edc4a50ed065b64611ffe3b3f11415f383e2298904986d585b0acd0f67 SHA512 9100c93537a8a40ccd17fc8486797b02e426d853d443ec40b85feaf92bba38d26c97bd4b3aa66609ab3cb8116d7ce94588302761e337153e2f37006770698875
 DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d
 DIST slic3r-1.3.1_pre20200824.tar.gz 2432288 BLAKE2B 37e767b6cb12909ea3a6411532103ea30500903cf3d6a221c2fa3d3109fb733db5d0cb0e9d0eec5033dad9acec2f89258242cdab316ea26392a8386097d9dd38 SHA512 fd7198f7c4a60911b2009f617d37485bf73964a626a53d02bd13baae963d28e74dc2f8314888e7c0fcacb389e0b481f3357c6ea595ac8f92d99f7a228c5cc2b7
-EBUILD slic3r-1.3.0-r3.ebuild 2748 BLAKE2B 823f3341684d705f34faa66ee361c91f0ca1b8916ca9773e5dd6817d06d5b0a4b048abd60f747670531969ca63a673ff228156f6e05f1a1b2c9d85d7e21fb7d3 SHA512 6937adaab0083e646c74fbf4b1c0a7daab521c37c160d5220ef6fb7cdaff44815388a7e449460bd56ab05b80c3714cb0f69e7452fe2ee1460344f4b58f69ecc5
-EBUILD slic3r-1.3.1_pre20200824.ebuild 2784 BLAKE2B d3bee26847f0640e90e5df95c8c0f56976e220a3c5fc2c92b94eaf401da28ba14c0c19e04e68509b6e352b6aa6884061ac56feb0c9f42cd82c8d7030d69438cc SHA512 726a2f7f87652a160fbdfa437ab42001c13ea27361cc8818a5a725e2af8bef2a3099f836fa4cd4679eed6c0c0487f9781501b8433d3bd24b980165b44e77d139
-EBUILD slic3r-9999.ebuild 2758 BLAKE2B 2c49616aff2a3964f43d00f74aa014adfb364ee100b4f1dc6c7f86fe4469fa80e9f7eb311f4d9f27fe66a3de84d13c95a966acd7e29e7833a7a72882831f0a41 SHA512 0a77983538340eebcc19d9c3054104a8b4cfae18ac6f3eebe478b9ae99297b8ca5207b16699048b861f0f812892877850224f7b55f343c79ad683040cfd33920
+EBUILD slic3r-1.3.0-r3.ebuild 2741 BLAKE2B be0b9946dfcefc79bd0ead2db2dc7d684a81cb1f6c5af82f57347006a2f155cdb9276eff6e47b16bbfea8c0a64d6c89455f39faa010686393df211bf9569a6e9 SHA512 b0f97a438154a387d8e0d6245328abd9e3cce85ea6f80ff2c41b9a22d77c9345e023ab44b8bf521ed223b6c201481f52d9130b4abb37938af46456c4061a1fb1
+EBUILD slic3r-1.3.1_pre20200824.ebuild 2777 BLAKE2B 15ef5c7e7a21769ce90e52953536673e3658acdb9674d504c35ca42732b44688c23ee44ac7c845d6b73a7aa52f6fe23363bf6cd25d2a5f2193586ea3dd12e928 SHA512 b7d0ca2b4f9c449088240f332d95125288a73dc3a0ab591ecf476c0d3cec1d2378f0ec5c1e27fb628ff616fe0895d9ec2dc586a82afe37dcb9cd19a293648b68
+EBUILD slic3r-9999.ebuild 2688 BLAKE2B 4b9af5d0085ba6d6632ede733a6fade66dff9d50c4230762c56920cf1c226a3962d6c33432cece0e26d65fdff9764c7255dbabaf98bd0d09cc0dd2bef6385534 SHA512 b871d0d53023b9e6c5caaedea1c121063da47f4cb9fccab328af6e40deefc36c52057dd803ce7aed7846ca61504dab8be8b341fad1a8332467e1a2c387bdf3e2
 MISC metadata.xml 910 BLAKE2B 037c38babeaf484e00175fa577897939965d4b0c9246ae43cea6099eb9c80c64b150b58598bd4d9b6b4cea3c3d660d50d75a83a4dcc75c23bc52619ea42d2e35 SHA512 60ddcbb15c781478becc5779ff884d92b735d87b7c97f8305641b3a98db3f07a35d02c86c2b1e032fd05fa351a6f343e7c4f09aff31c5d2844bf34930dbcc316
diff --git a/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild
index 5917a9210b8d..f0ea0fd4ed27 100644
--- a/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild
+++ b/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop eutils perl-module
+inherit desktop perl-module
 
 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
 HOMEPAGE="https://slic3r.org"
diff --git a/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild b/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild
index c9c2ba374c52..3d5a2d5dbff2 100644
--- a/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild
+++ b/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop eutils perl-module
+inherit desktop perl-module
 
 COMMIT="92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d"
 
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
index 6c8f1b5b6d9e..c492bce9fc3b 100644
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils git-r3 perl-module
+inherit desktop git-r3 perl-module
 
 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
 HOMEPAGE="https://slic3r.org"
-SRC_URI=""
 EGIT_REPO_URI="https://github.com/Slic3r/Slic3r.git"
+S="${WORKDIR}/slic3r-${PV}"
 
 LICENSE="AGPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS=""
 IUSE="+gui test"
 RESTRICT="!test? ( test )"
 
 # check Build.PL for dependencies
-RDEPEND="!=dev-lang/perl-5.16*
+RDEPEND="
+	!=dev-lang/perl-5.16*
 	>=dev-libs/boost-1.55[threads]
 	dev-perl/Class-XSAccessor
 	dev-perl/Devel-CheckLib
@@ -53,7 +53,8 @@ RDEPEND="!=dev-lang/perl-5.16*
 		>=virtual/perl-Socket-2.16.0
 		x11-libs/libXmu
 	)"
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-libs/clipper
 	dev-perl/Devel-CheckLib
 	>=dev-perl/ExtUtils-CppGuess-0.70.0
@@ -63,14 +64,15 @@ DEPEND="${RDEPEND}
 	>=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 )"
+	test? (
+		virtual/perl-Test-Harness
+		virtual/perl-Test-Simple
+	)
+"
 
-S="${WORKDIR}/slic3r-${PV}"
 PERL_S="${S}/xs"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.3.1_pre20200824-boost-1.73.patch"
 	"${FILESDIR}/${PN}-1.3.0-no-locallib.patch"
 	"${FILESDIR}/${PN}-1.3.0-use-system-clipper.patch"
 )