claws-mail / slic3r

2020-09-03 14:11:29 +02:00 · 2020-09-03 14:11:29 +02:00 · 8393bc309d
parent 4f2e133d1c
commit 8393bc309d
5 changed files with 839 additions and 10 deletions
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@ -8,6 +8,7 @@ DIST claws-mail-3.17.1.tar.xz 4746940 BLAKE2B fdaa5ae36893a9089277f59a97d3026ab3
 DIST claws-mail-3.17.3.tar.xz 6164392 BLAKE2B ac0781c4c7e4423f4a8b494a9bd007d62443e8c540feaeef089ca65f641da5ecabfa2c5c0662750d6f58c8913c1d95750a3dfb6b4628e573b0105f8f526bc066 SHA512 b562d785eaedbdec408c4a3db8f4d9326183266fe314509a189c9e1220f15b4f41ccd9d8c58c5194c0267842e8efe900e88eb17c0d17d6069e2543870efa5ef8
 DIST claws-mail-3.17.4.tar.xz 6280252 BLAKE2B 8ddce2e5dfb3ae0ddb646c4f5a81d7e4c3834d2fa7a7f7a7326bf6e160291db4ba5954737bb61a4ae86ebaaab72a695d2e351fe2cf89b187eba4341f5d9b0cd9 SHA512 4fc3b04d89c84b068654902d3d4f8ba66ec86c4ea9c4bd145fb3169dd26a2fcfc26adc8367b0ed90c69d095f6b1717ba3a9a52cc6d3e310a9dad1c3f733d8012
 DIST claws-mail-3.17.5.tar.xz 6290944 BLAKE2B b060d4513ecd61ba8589d701970c733b683d93b03beb22e37669e9856797f6d0d404c09a49f0a1d9c8a576807806ec22959079c9ff79786d226ea6b6f3817904 SHA512 a1d3576eba70b83a6fe70aafead3d80681e6372d146b573f5d43fee63bdcf84b5350d4dc8a4290b11d11320381417253d893daee8169c110e294178d10ea542f
+DIST claws-mail-3.17.6.tar.xz 6400692 BLAKE2B ce5fc914db89835a2a678e68da950d7487e8df919847f3d69baabc73012908f3853dcb274ae4c0e1a4f0f46fb38903b77fe7a2aa7e5b9169bd8eb597035d2ce5 SHA512 07fdf7fce722ee1e50aa155bca720323a58842b372d8295bed33c7245fce5790a1bd3ed7462130664a218a804ab6bd1ba3663ee3e53fbbac6a4a477dd676ede0
 EBUILD claws-mail-3.15.0-r1.ebuild 5792 BLAKE2B 3223768beeeaa4c2799942d007a43dee42137ae3025f3093674969175e4630bcd10eb735be510a2a561b1a1c3543144493ec410378cbc4e5603ad01f295bc75f SHA512 87f97b2209b5addd9b0ef2f168dc2bdfa139d6fc9741aab37eca5d25b0ee38bf9564160e4e4a5fd986d8904c08e67684d61b9b1da0785c6f3b17595a522515e9
 EBUILD claws-mail-3.15.0.ebuild 5660 BLAKE2B e2edb1f3e2bb6367ea8d49a07329ca5a67ca59913b3b397b02c93f6ffc8cac346eb2c0d9952128ad5225c5e42fe2e0950b44912d55ba873c3fd6c3f668465e88 SHA512 e67a28cdd5df9dc1578f90995ddc5a21db74aaab743d589fef6f2b19faff649afe2b271255d772aa4ca80d901fb5fa434d75c228e3e2e1851c676b37c6edf28b
 EBUILD claws-mail-3.15.1.ebuild 5793 BLAKE2B 0c68b066725d265c045d637fd291a7b15cc4c9b1e7faabcc3dc738d48af4fd6af444b8e0b2cce505d7dae8e22c03b6ec6c5f799d66487059a4ba91def88c30f5 SHA512 56559d610f98d956b294456c1d174ab41ddb4445576a533d1578f5476a2c5ba217839a9dfb90dd4eaef81b83296aa494c049433a79fc9c9e5f4ff7a6143820bf
@ -16,4 +17,5 @@ EBUILD claws-mail-3.17.1.ebuild 6006 BLAKE2B c04db0772c72749ca305063517709c350ba
 EBUILD claws-mail-3.17.3-r1.ebuild 5966 BLAKE2B a384281495ac0b4e856748aa61a3e1c54fa50ad86083af05f8a10f53fd41f31855ddfd139f9db0b80b5ae81573901d9222b6df744700306d3ff2b087b1e50fc6 SHA512 d67ea2ce9cfb326e402cd257e2368c09311ac5fc9c62c0dfbdf9f38e6063c3481e0047d192f672e421d225ae75d3e8d97ae54d16b9d6e6264700307282e06671
 EBUILD claws-mail-3.17.4.ebuild 6045 BLAKE2B b1c54bdc80845231e847837c2d308d9e18c2a51c268fc5b3324dfb9ab5ab328e2b9e04f3b682d14334e8cd57dd6b2a574fb364b9a810db471fce0797ea28a5f0 SHA512 f40cca227a879c94ec0c4c52ecd03f6545d3ff1d6cda9d99a41a39484dfe44e4a05e94f04407f94cd19c23a5c0628db6f465065be548e6d73498055f615eb1db
 EBUILD claws-mail-3.17.5-r1.ebuild 6143 BLAKE2B 5d12733b241ea4b72267464945b521dc20a8c566719da4d5913d29a990b6fb9b0de4f536c62f9ed6d1b39886b7a4e5e84abfc1e6f56d2b4c75c87425fa17b25e SHA512 9e48c3ac36de8f9350712df60fe8791b872878aab50217fe1f6092d163df981c7ec4c551d08599356c375034cbb6273b7fc46daeb3ca4061132bb2000fdd53d6
+EBUILD claws-mail-3.17.6-r1.ebuild 5894 BLAKE2B 16b69d72739a5ef7ba82932840f9154dd0a884c1913dc827252c5bcd8a60dc9970c520a5db201d860a0b5d44fe5bdc931da76e7d159dffe40955f1f60905534f SHA512 98234278e37dbe6a72db8fe47fd5fa55f9104bbc87c79cef3fedc5493482a554d8ffdde4ff1708d38bb687458a4a7e2811605069d7951536736a573e710f10aa
 MISC metadata.xml 1661 BLAKE2B ce48032773773b29728b3a6a177c43572e4c6df0f50df4e17935df77a317f1107527a82fd576765fca018edd73bb31e165029258e49640ed84ff9061f6f1a53f SHA512 5e297601a56a53db9e2463da1e785b0d8e7a358b9df68689c1a3da4efc5d3ffccc92af7ee2202d67e4c6226b298bb562fa0f590fd36a425749e21b1c15516076
--- a/mail-client/claws-mail/claws-mail-3.17.6-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.17.6-r1.ebuild
@ -0,0 +1,217 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop xdg
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="https://www.claws-mail.org/"
+
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
+else
+	SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
+fi
+
+SLOT="0"
+LICENSE="GPL-3"
+
+IUSE="+appindicator archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface"
+
+REQUIRED_USE="
+	appindicator? ( notification )
+	libcanberra? ( notification )
+	libnotify? ( notification )
+	networkmanager? ( dbus )
+	smime? ( pgp )
+"
+
+COMMONDEPEND="
+	dev-libs/nettle:=
+	net-mail/ytnef
+	sys-libs/zlib:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2[jpeg]
+	>=x11-libs/gtk+-2.24:2
+	x11-libs/libX11
+	x11-libs/pango
+	archive? (
+		app-arch/libarchive
+		>=net-misc/curl-7.9.7
+	)
+	bogofilter? ( mail-filter/bogofilter )
+	calendar? (
+		>=dev-libs/libical-2.0.0:=
+		>=net-misc/curl-7.9.7
+	)
+	dbus? (
+		>=dev-libs/dbus-glib-0.60
+		sys-apps/dbus
+	)
+	gdata? ( >=dev-libs/libgdata-0.17.2 )
+	dillo? ( www-client/dillo )
+	gnutls? ( >=net-libs/gnutls-3.0 )
+	imap? ( >=net-libs/libetpan-0.57 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	litehtml? (
+		>=dev-libs/glib-2.36:2
+		>=dev-libs/gumbo-0.10
+		net-misc/curl
+		media-libs/fontconfig
+	)
+	nls? ( >=sys-devel/gettext-0.18 )
+	nntp? ( >=net-libs/libetpan-0.57 )
+	notification? (
+		dev-libs/glib:2
+		appindicator? ( dev-libs/libindicate:3[gtk] )
+		libcanberra? (  media-libs/libcanberra[gtk] )
+		libnotify? ( x11-libs/libnotify )
+	)
+	pdf? ( app-text/poppler[cairo] )
+	pgp? ( >=app-crypt/gpgme-1.0.0 )
+	session? (
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	smime? ( >=app-crypt/gpgme-1.0.0 )
+	spam-report? ( >=net-misc/curl-7.9.7 )
+	spell? ( >=app-text/enchant-2.0.0:2= )
+	startup-notification? ( x11-libs/startup-notification )
+	svg? ( >=gnome-base/librsvg-2.40.5 )
+	valgrind? ( dev-util/valgrind )
+	webkit? ( net-libs/webkit-gtk:2 )
+"
+
+DEPEND="${COMMONDEPEND}
+	xface? ( >=media-libs/compface-1.4 )
+"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+RDEPEND="${COMMONDEPEND}
+	app-misc/mime-types
+	x11-misc/shared-mime-info
+	clamav? ( app-antivirus/clamav )
+	networkmanager? ( net-misc/networkmanager )
+	pdf? ( app-text/ghostscript-gpl )
+	perl? ( dev-lang/perl:= )
+	rss? (
+		dev-libs/libxml2
+		net-misc/curl
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch"
+)
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	# Don't use libsoup-gnome (bug #565924)
+	export HAVE_LIBSOUP_GNOME=no
+
+	local myeconfargs=(
+		--disable-bsfilter-plugin
+		--disable-fancy-plugin
+		--disable-generic-umpc
+		--disable-jpilot #735118
+		--enable-acpi_notifier-plugin
+		--enable-address_keeper-plugin
+		--enable-alternate-addressbook
+		--enable-att_remover-plugin
+		--enable-attachwarner-plugin
+		--enable-fetchinfo-plugin
+		--enable-mailmbox-plugin
+		--enable-newmail-plugin
+		--enable-tnef_parse-plugin
+		--with-password-encryption=$(usex gnutls gnutls old)
+		$(use_enable archive archive-plugin)
+		$(use_enable bogofilter bogofilter-plugin)
+		$(use_enable calendar vcalendar-plugin)
+		$(use_enable clamav clamd-plugin)
+		$(use_enable dbus)
+		$(use_enable debug crash-dialog)
+		$(use_enable dillo dillo-plugin)
+		$(use_enable doc manual)
+		$(use_enable gdata gdata-plugin)
+		$(use_enable gnutls)
+		$(use_enable ipv6)
+		$(use_enable ldap)
+		$(use_enable litehtml litehtml_viewer-plugin)
+		$(use_enable networkmanager)
+		$(use_enable nls)
+		$(use_enable notification notification-plugin)
+		$(use_enable pdf pdf_viewer-plugin)
+		$(use_enable perl perl-plugin)
+		$(use_enable pgp pgpcore-plugin)
+		$(use_enable pgp pgpinline-plugin)
+		$(use_enable pgp pgpmime-plugin)
+		--disable-python-plugin
+		$(use_enable rss rssyl-plugin)
+		$(use_enable session libsm)
+		$(use_enable sieve managesieve-plugin)
+		$(use_enable smime smime-plugin)
+		$(use_enable spam-report spam_report-plugin)
+		$(use_enable spamassassin spamassassin-plugin)
+		$(use_enable spell enchant)
+		$(use_enable startup-notification)
+		$(use_enable svg)
+		$(use_enable valgrind valgrind)
+		$(use_enable webkit fancy-plugin)
+		$(use_enable xface compface)
+	)
+
+	# libetpan is needed if user wants nntp or imap functionality
+	if use imap || use nntp ; then
+		myeconfargs+=( --enable-libetpan )
+	else
+		myeconfargs+=( --disable-libetpan )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
+	default
+
+	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
+	# => also install it in /usr/share/pixmaps for other desktop envs
+	# => also install higher resolution icons in /usr/share/icons/hicolor/...
+	insinto /usr/share/pixmaps
+	doins ${PN}.png
+	local size
+	for size in 64 128 ; do
+		newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
+	done
+
+	docinto tools
+	dodoc tools/README*
+
+	domenu ${PN}.desktop
+
+	einfo "Installing extra tools"
+	cd "${S}"/tools || die
+	exeinto /usr/$(get_libdir)/${PN}/tools
+	doexe *.pl *.py *.conf *.sh
+	doexe tb2claws-mail update-po uudec uuooffice
+
+	# kill useless files
+	rm -f "${ED}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
+
+pkg_postinst() {
+	ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
+	ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
+	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
+	ewarn "- The gtkhtml2 and trayicon plugins have been dropped entirely"
+	xdg_pkg_postinst
+}
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@ -1,3 +1,4 @@
-AUX slic3r-9999-adjust_var_path.patch 477 SHA256 dfcc6880c8785b70bf3fe28a32ecb9041d6c38b238ca36bc4aed08be664b429d SHA512 ffe841707eca3a312b31a9ae6618f2d41004100547176e092436fb02d6d17f6bafe431e61f72f426f3c4894da208d8043d6b1f0e46fe6beffe90ee33d4f49894 WHIRLPOOL 4d3640a2fb3803ad610e3439e617a4dc4d690115b6c835d46bf54870aa78f0fbf21d18132609439dac034c4103a2d7942067c877552e47de88be48f67e6d61e1
-EBUILD slic3r-9999.ebuild 2580 SHA256 efc6a34cbda561ec0967e242ef247145c797fb177be010dafb07d362a6baa0dc SHA512 babd3c3b916d53e36aa4b405f5ba2eb024c33f71cdff245de83c9296f792134b355dd75e5aa0a9c48cdefb20846259cf894fcffd3f202a3e5d41b1f396aee8fe WHIRLPOOL fce907ba3fd569547b48340ca6fa68e8d2a43dd1dd9b616b3e3c93f87a44606ad41dc2a566d9c38864f4f664662b38011036185c87eedc7b27791c62f2769de5
-MISC metadata.xml 1166 SHA256 f9ead7e79da319295791a454378ef319bc215d647af78ce0c1ee50d0b9272cfc SHA512 8fa8adf81c468d72253218f1e5c4c42e8546a89166c3a3158db17b7504c13920abe7bc4ce3efadb4e6fa035d23d3a509c844699ac80b417dd16b570a6f6f213e WHIRLPOOL ff18b28867a43a0094fa59739f2ea72fb5297cda6ba4f40e43fd006e13c3c4f4e7a6baadd6dcb816103d39a59b16f90bf75b5ededd23f220cd3c6260e393448f
+AUX slic3r-9999-adjust_var_path.patch 477 BLAKE2B 0e0590aac466f4e2e6972144c5e12cd1f0d3eb85d33350d8b35ace9cacaa934338821274e9a227b44572adc6a89fce2d7a75e762aacbd9e6368cc2a0cbafd10a SHA512 ffe841707eca3a312b31a9ae6618f2d41004100547176e092436fb02d6d17f6bafe431e61f72f426f3c4894da208d8043d6b1f0e46fe6beffe90ee33d4f49894
+AUX slic3r-9999-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
+EBUILD slic3r-9999.ebuild 2649 BLAKE2B faed6176499179fe628a1c89ae307eb1be9fedcde4f043b72456abcee58ce0fe6eec42412cd47a40858d451bee34822c871d1e28064bff2f4622fae3227a513f SHA512 92c37abf84356ff3d547ded93a881464bc1f84e729c2c9a095bac48aad0b70e1a38738b3481e388d2eab3f70032566d1d7a7fd11a2e95b9b13e3b23214dd6541
+MISC metadata.xml 1166 BLAKE2B c5ccfe10e50fef8d5729e4c5887a66a524ede1262acc8934e393dd0d3c4bae24cce2b34bd8cb5a1063bf5b8950ee6837e74a48caa6100bf7cbe25e41716914bb SHA512 8fa8adf81c468d72253218f1e5c4c42e8546a89166c3a3158db17b7504c13920abe7bc4ce3efadb4e6fa035d23d3a509c844699ac80b417dd16b570a6f6f213e
--- a/media-gfx/slic3r/files/slic3r-9999-no-locallib.patch
+++ b/media-gfx/slic3r/files/slic3r-9999-no-locallib.patch
@ -0,0 +1,609 @@
+commit 6f7e42a4707788d079d865800d9fdb65ed7d5f1f
+Author: Ian Stakenvicius <axs@gentoo.org>
+Date:   Wed Sep 27 12:22:14 2017 -0400
+
+    Revert "Use --local-lib when calling cpanm"
+    
+    This reverts commit e5412b5d69dc4d5415c92a7daaa47fb4860ca4ea and others
+    that add local::lib dependency
+
+diff --git a/Build.PL b/Build.PL
+index 2dd18435..18befbf8 100644
+--- a/Build.PL
+++ b/Build.PL
+@@ -109,16 +109,7 @@ EOF
+         if !$cpanm;
+     my @cpanm_args = ();
+     push @cpanm_args, "--sudo" if $sudo;
+-    
+-    # install local::lib without --local-lib otherwise it's not usable afterwards
+-    if (!eval "use local::lib qw(local-lib); 1") {
+-        my $res = system $cpanm, @cpanm_args, 'local::lib';
+-        warn "Warning: local::lib is required. You might need to run the `cpanm --sudo local::lib` command in order to install it.\n"
+-            if $res != 0;
+-    }
+-    
+-    push @cpanm_args, ('--local-lib', 'local-lib');
+-    
+
+     # make sure our cpanm is updated (old ones don't support the ~ syntax)
+     system $cpanm, @cpanm_args, 'App::cpanminus';
+     
+diff --git a/slic3r.pl b/slic3r.pl
+index 11dc2fad..76885c90 100755
+--- a/slic3r.pl
+++ b/slic3r.pl
+@@ -6,7 +6,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/lib";
+-    use local::lib '--no-create', "$FindBin::Bin/local-lib";
+ }
+ 
+ use File::Basename qw(basename);
+diff --git a/t/adaptive_slicing.t b/t/adaptive_slicing.t
+index 64c3769f..5ab631fe 100644
+--- a/t/adaptive_slicing.t
+++ b/t/adaptive_slicing.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum);
+diff --git a/t/adaptive_width.t b/t/adaptive_width.t
+index 7a0baa75..c200f844 100644
+--- a/t/adaptive_width.t
+++ b/t/adaptive_width.t
+@@ -7,7 +7,6 @@ plan tests => 32;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/angles.t b/t/angles.t
+index 2ae00b4e..1e1a6c9c 100644
+--- a/t/angles.t
+++ b/t/angles.t
+@@ -7,9 +7,6 @@ plan tests => 34;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use lib "$FindBin::Bin/../lib";
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/arcs.t b/t/arcs.t
+index ec85dfbc..65b83de4 100644
+--- a/t/arcs.t
+++ b/t/arcs.t
+@@ -7,7 +7,6 @@ plan tests => 24;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/avoid_crossing_perimeters.t b/t/avoid_crossing_perimeters.t
+index 7cd04e50..dd6c3e7b 100644
+--- a/t/avoid_crossing_perimeters.t
+++ b/t/avoid_crossing_perimeters.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum);
+diff --git a/t/bridges.t b/t/bridges.t
+index 677115b8..3dc6b84a 100644
+--- a/t/bridges.t
+++ b/t/bridges.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum);
+diff --git a/t/clean_polylines.t b/t/clean_polylines.t
+index 50c6f5bb..4526bd60 100644
+--- a/t/clean_polylines.t
+++ b/t/clean_polylines.t
+@@ -7,7 +7,6 @@ plan tests => 6;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/clipper.t b/t/clipper.t
+index 3c983814..a898a53f 100644
+--- a/t/clipper.t
+++ b/t/clipper.t
+@@ -7,7 +7,6 @@ plan tests => 6;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(sum);
+diff --git a/t/collinear.t b/t/collinear.t
+index b28a3602..9dee7770 100644
+--- a/t/collinear.t
+++ b/t/collinear.t
+@@ -7,7 +7,6 @@ plan tests => 11;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/combineinfill.t b/t/combineinfill.t
+index 66e461d4..6661cdd6 100644
+--- a/t/combineinfill.t
+++ b/t/combineinfill.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/config.t b/t/config.t
+index 829ef5f3..7f85dae8 100644
+--- a/t/config.t
+++ b/t/config.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/cooling.t b/t/cooling.t
+index 80819bdc..5b2d4b4c 100644
+--- a/t/cooling.t
+++ b/t/cooling.t
+@@ -7,7 +7,6 @@ plan tests => 13;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(none all);
+diff --git a/t/custom_gcode.t b/t/custom_gcode.t
+index 9b58344e..3ff7c35d 100644
+--- a/t/custom_gcode.t
+++ b/t/custom_gcode.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/fill.t b/t/fill.t
+index 765cfd47..d422d27a 100644
+--- a/t/fill.t
+++ b/t/fill.t
+@@ -7,7 +7,6 @@ plan tests => 95;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum max);
+diff --git a/t/flow.t b/t/flow.t
+index 37e9deaf..071d290c 100644
+--- a/t/flow.t
+++ b/t/flow.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum);
+diff --git a/t/gaps.t b/t/gaps.t
+index 01ec1b4e..16baa036 100644
+--- a/t/gaps.t
+++ b/t/gaps.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/gcode.t b/t/gcode.t
+index ec9b7bb2..525356df 100644
+--- a/t/gcode.t
+++ b/t/gcode.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/geometry.t b/t/geometry.t
+index 9c6eef55..4e6e7097 100644
+--- a/t/geometry.t
+++ b/t/geometry.t
+@@ -7,7 +7,6 @@ plan tests => 44;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/layers.t b/t/layers.t
+index a8599807..57fd2576 100644
+--- a/t/layers.t
+++ b/t/layers.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/loops.t b/t/loops.t
+index d2bf7717..725154c9 100644
+--- a/t/loops.t
+++ b/t/loops.t
+@@ -7,7 +7,6 @@ plan tests => 4;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/multi.t b/t/multi.t
+index fb8cad81..4d6f8193 100644
+--- a/t/multi.t
+++ b/t/multi.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/perimeters.t b/t/perimeters.t
+index 513c76ef..3ddde0b8 100644
+--- a/t/perimeters.t
+++ b/t/perimeters.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r::ExtrusionLoop ':roles';
+diff --git a/t/polyclip.t b/t/polyclip.t
+index 0808c7be..1292d321 100644
+--- a/t/polyclip.t
+++ b/t/polyclip.t
+@@ -7,7 +7,6 @@ plan tests => 18;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/pressure.t b/t/pressure.t
+index dde23695..6bbb81d8 100644
+--- a/t/pressure.t
+++ b/t/pressure.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw();
+diff --git a/t/print.t b/t/print.t
+index b78739e4..28cf1ee4 100644
+--- a/t/print.t
+++ b/t/print.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/retraction.t b/t/retraction.t
+index 237af3ab..37dcb64b 100644
+--- a/t/retraction.t
+++ b/t/retraction.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(any);
+diff --git a/t/shells.t b/t/shells.t
+index 2347ff36..d64eb28c 100644
+--- a/t/shells.t
+++ b/t/shells.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first sum);
+diff --git a/t/skirt_brim.t b/t/skirt_brim.t
+index d6181ba2..cfa0698e 100644
+--- a/t/skirt_brim.t
+++ b/t/skirt_brim.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/slice.t b/t/slice.t
+index 51b52163..301ae164 100644
+--- a/t/slice.t
+++ b/t/slice.t
+@@ -8,7 +8,6 @@ plan tests => 16;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ # temporarily disable compilation errors due to constant not being exported anymore
+diff --git a/t/speed.t b/t/speed.t
+index 5d9fb54c..3deab75b 100644
+--- a/t/speed.t
+++ b/t/speed.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(none);
+diff --git a/t/support.t b/t/support.t
+index 8d4655b3..b4f9ce04 100644
+--- a/t/support.t
+++ b/t/support.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/svg.t b/t/svg.t
+index 6092efe2..9299eeef 100644
+--- a/t/svg.t
+++ b/t/svg.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/thin.t b/t/thin.t
+index 2d256d28..51461480 100644
+--- a/t/thin.t
+++ b/t/thin.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/t/threads.t b/t/threads.t
+index 7fcd86f0..106a68af 100644
+--- a/t/threads.t
+++ b/t/threads.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use List::Util qw(first);
+diff --git a/t/vibrationlimit.t b/t/vibrationlimit.t
+index 1a5488a6..7bfa27ac 100644
+--- a/t/vibrationlimit.t
+++ b/t/vibrationlimit.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/utils/amf-to-stl.pl b/utils/amf-to-stl.pl
+index 56df2e23..7edc1460 100755
+--- a/utils/amf-to-stl.pl
+++ b/utils/amf-to-stl.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use File::Basename qw(basename);
+diff --git a/utils/config-bundle-to-config.pl b/utils/config-bundle-to-config.pl
+index e1d7f614..beecd666 100755
+--- a/utils/config-bundle-to-config.pl
+++ b/utils/config-bundle-to-config.pl
+@@ -9,7 +9,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/dump-stl.pl b/utils/dump-stl.pl
+index 6da275ab..4df94268 100644
+--- a/utils/dump-stl.pl
+++ b/utils/dump-stl.pl
+@@ -8,7 +8,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/utils/estimate-gcode-time.pl b/utils/estimate-gcode-time.pl
+index 43c558b6..eab4f6da 100755
+--- a/utils/estimate-gcode-time.pl
+++ b/utils/estimate-gcode-time.pl
+@@ -6,7 +6,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/utils/gcode_sectioncut.pl b/utils/gcode_sectioncut.pl
+index b94a2fc4..4d9619e4 100644
+--- a/utils/gcode_sectioncut.pl
+++ b/utils/gcode_sectioncut.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/pdf-slices.pl b/utils/pdf-slices.pl
+index 30c41ae4..fa7612bb 100755
+--- a/utils/pdf-slices.pl
+++ b/utils/pdf-slices.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/send-gcode.pl b/utils/send-gcode.pl
+index d87e6826..6f529b90 100644
+--- a/utils/send-gcode.pl
+++ b/utils/send-gcode.pl
+@@ -6,7 +6,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Slic3r;
+diff --git a/utils/split_stl.pl b/utils/split_stl.pl
+index eb659b9c..16cf5a9d 100755
+--- a/utils/split_stl.pl
+++ b/utils/split_stl.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use File::Basename qw(basename);
+diff --git a/utils/stl-to-amf.pl b/utils/stl-to-amf.pl
+index cb041893..81648b8e 100755
+--- a/utils/stl-to-amf.pl
+++ b/utils/stl-to-amf.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use File::Basename qw(basename);
+diff --git a/utils/view-mesh.pl b/utils/view-mesh.pl
+index 91cd20a2..b122faed 100644
+--- a/utils/view-mesh.pl
+++ b/utils/view-mesh.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/view-toolpaths.pl b/utils/view-toolpaths.pl
+index d4c47f07..4bbbaab4 100755
+--- a/utils/view-toolpaths.pl
+++ b/utils/view-toolpaths.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/wireframe.pl b/utils/wireframe.pl
+index f49b66e5..053581de 100644
+--- a/utils/wireframe.pl
+++ b/utils/wireframe.pl
+@@ -8,7 +8,6 @@ use warnings;
+ BEGIN {
+     use FindBin;
+     use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.ebuild
@ -1,30 +1,29 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$

 EAPI=6

 inherit eutils git-r3 perl-module

 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
-HOMEPAGE="http://slic3r.org"
+HOMEPAGE="https://slic3r.org"
 SRC_URI=""
-EGIT_REPO_URI="https://github.com/alexrj/Slic3r.git"
-EGIT_BRANCH="master"
+EGIT_REPO_URI="https://github.com/Slic3r/Slic3r.git"

 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*
 	>=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
@ -74,7 +73,8 @@ src_unpack() {

 src_prepare() {
 	pushd "${WORKDIR}/slic3r-${PV}" || die
-	eapply "${FILESDIR}/${P}-adjust_var_path.patch"
+	sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
+	eapply "${FILESDIR}"/${P}-no-locallib.patch
 	eapply_user
 	popd || die
 }