summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/Manifest.gzbin38487 -> 38334 bytes
-rw-r--r--media-gfx/darktable/Manifest5
-rw-r--r--media-gfx/darktable/darktable-3.6.1-r2.ebuild166
-rw-r--r--media-gfx/darktable/darktable-3.8.1.ebuild3
-rw-r--r--media-gfx/fbgrab/Manifest2
-rw-r--r--media-gfx/fbgrab/fbgrab-1.5.ebuild2
-rw-r--r--media-gfx/freecad/Manifest4
-rw-r--r--media-gfx/freecad/freecad-9999.ebuild8
-rw-r--r--media-gfx/freecad/metadata.xml4
-rw-r--r--media-gfx/graphviz/Manifest6
-rw-r--r--media-gfx/graphviz/graphviz-2.49.0-r1.ebuild (renamed from media-gfx/graphviz/graphviz-2.49.0.ebuild)18
-rw-r--r--media-gfx/graphviz/graphviz-2.50.0.ebuild274
-rw-r--r--media-gfx/graphviz/metadata.xml2
-rw-r--r--media-gfx/hydrus/Manifest6
-rw-r--r--media-gfx/hydrus/hydrus-479.ebuild (renamed from media-gfx/hydrus/hydrus-473.ebuild)28
-rw-r--r--media-gfx/hydrus/hydrus-9999.ebuild1
-rw-r--r--media-gfx/lximage-qt/Manifest2
-rw-r--r--media-gfx/lximage-qt/lximage-qt-1.0.0.ebuild4
-rw-r--r--media-gfx/openscad/Manifest3
-rw-r--r--media-gfx/openscad/files/openscad-9999-fix-pkg-config-name-and-include-directory-search.patch31
-rw-r--r--media-gfx/openscad/openscad-9999.ebuild5
-rw-r--r--media-gfx/plantuml/Manifest6
-rw-r--r--media-gfx/plantuml/plantuml-1.2022.2.ebuild2
-rw-r--r--media-gfx/plantuml/plantuml-1.2022.4.ebuild (renamed from media-gfx/plantuml/plantuml-1.2022.1.ebuild)2
-rw-r--r--media-gfx/renderdoc/Manifest4
-rw-r--r--media-gfx/renderdoc/renderdoc-1.19.ebuild (renamed from media-gfx/renderdoc/renderdoc-1.18-r1.ebuild)27
-rw-r--r--media-gfx/slic3r/Manifest11
-rw-r--r--media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch146
-rw-r--r--media-gfx/slic3r/files/slic3r-1.3.0-no-locallib.patch609
-rw-r--r--media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch44
-rw-r--r--media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch10
-rw-r--r--media-gfx/slic3r/files/slic3r-1.3.1_pre20200824-boost-1.73.patch133
-rw-r--r--media-gfx/slic3r/metadata.xml21
-rw-r--r--media-gfx/slic3r/slic3r-1.3.0-r4.ebuild114
-rw-r--r--media-gfx/slic3r/slic3r-1.3.1_pre20200824-r1.ebuild115
-rw-r--r--media-gfx/slic3r/slic3r-9999.ebuild123
-rw-r--r--media-gfx/solvespace/Manifest4
-rw-r--r--media-gfx/solvespace/metadata.xml8
-rw-r--r--media-gfx/solvespace/solvespace-3.0-r2.ebuild2
-rw-r--r--media-gfx/zbar/Manifest2
-rw-r--r--media-gfx/zbar/zbar-0.23.90.ebuild2
41 files changed, 367 insertions, 1592 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 71c23ffaac15..10b47b1ab46e 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 2d76ccb83084..5cf7c09cd8ee 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -4,16 +4,13 @@ AUX darktable-3.4.0_jsonschema-automagic.patch 891 BLAKE2B b0abdd7ea80a446e2556d
AUX darktable-3.4.1_libxcf-cmake.patch 788 BLAKE2B b6ecb84de804b0bf16f907f825d93d00a62c1d996077514b3e55f370347f47e561707cb8da6a270aa42c3320142437691cc8b132718c485b5b7df40068d41ee5 SHA512 d94247c4f2c3b4894bd6455cd036a62ef5edb90a77bf8f930efc3e540d00712000fe8eeb7d4c937fa826aef1dd129448223c8696ff094e823894b17ef2669a4e
AUX darktable-3.6.1_openexr.patch 1806 BLAKE2B 3f05c8fbb4dd5a76e98ef3d9a9432fb2c3d98818b5773d0fc007d5203d32b43fea25ec7286f396b4fcb23e02b32ab911ca0c504e8d01c299899e729b02a81d94 SHA512 a782116aa340bd8fd8c1fd98094bee943100f85c1194010b7a92b3aa532ff658f07cddccacdf06b902b74ac86ef1ab3cd07c694c072312e51ddc058caefcb944
AUX darktable-3.8.0_libs-deps-automagic.patch 1034 BLAKE2B faac12e0c8459f7d5d3291b128a5d43e468a1c0a94d45b1c5c0d0e3fcfc6b740e5522c0c26515fc510f91061ab3aafd861465470b37d053e9d5cbee83989a8b9 SHA512 d59c6f11bcec1480eaee488e48a34b99ebfb9a30c65b9111f6a6241f9264b3602f47fbffef17315cf103bc104a135a0c951dc8ab8fbe7419dd8faaa456c8c4a6
-DIST darktable-3.6.1.tar.xz 4685928 BLAKE2B 8ff6224e21b44f9e881adb8f020a2ea5ff5abb2c38da1aeaed312f89e548918c6d3bba210dbb4fb6901fbf0872c6e14c2e12c5b5b27932914a00428a709e8965 SHA512 d53eb8472531c62ceebe97769c6e53f7c9ed6efb404905295f00b5bf547fd0f0c395b8b926ccafc78d6cf9fed0745da655a77eeb84d92fce5d6a7a576f277416
DIST darktable-3.8.0.tar.xz 5415532 BLAKE2B a2295d9145806720c702d30a334f4d1c483fc651dfda8a39617daed4a71a436bfaa5b6b379f5ec0ee4bbec5f6f5eabbcb589b63644b5698100dd1672710d1531 SHA512 ce95983cbe3ca899103b4f5ee560fdbeeb441dccd453ac4d858b14a25050229e1e780595c66bfb491c88db35c128054f649b365d701ef4b19cf252bd847ffa59
DIST darktable-3.8.1.tar.xz 5514756 BLAKE2B e17bf4cc8f8d3f3fd6649c66c56777aa1e946a91cec1bc3b4c59ba1285aa16c608f725f549622b740417a8040a7bb5d63b2378997a05c2095f1b6814c05815de SHA512 8b1b0c9e1a0bd9b327d34d28fe33dd1a2c7255864f6fa0c15af364a029aaa3cff5e039ff6461e48d3b4327b7656efe70ad9da12245d3a01d7566545d191448ba
-DIST darktable-usermanual-3.6.pdf 34290182 BLAKE2B 407223f6dfc25e53e2de31a05b0468a3d50ec5ccf836fa4cca61b16d43e91827c0276027ea73dd543750f240889b7325538eb474e19df86eeff4d380bf0b8829 SHA512 62c2723e5fc0434703f21bc4f5efdb997db1c0cfb800a9df217d6682325949ce18ab458a179bd20a888b73a7bd384bbbb2ea8888cba26278510abaab1e0cc335
DIST darktable-usermanual-3.8.de.pdf 32795040 BLAKE2B f8669e1982be19bc739add60d125a5818894a7a4a6414ba15aae5e5df41ec6729c99f907e3008c42acbd6f60bc4a5d33e20d7180621d135f9fd342e6190ae6a5 SHA512 ff77afcc9a20fec36891d4487d167e40d30a1deef6418dc6bb73c94d8171b42e5edc5420457c96e08ab8581175e691f8adf91ef5259367edba55f1441d4a86d3
DIST darktable-usermanual-3.8.en.pdf 33484632 BLAKE2B 90a4e1021917f5fad7a5a9a58e2fec95af14119ca4b48325f3e5b55e96b89f9d82b8aaa676268a255fa97cf834a109b410004a549d16742a1b33db880c46fb67 SHA512 b21683f200daca3d0ed7c3364d0c6703d976fd800d1d2ffe51df1c6cfcf2188de681cdddbf92962629a3866e18014377a58ea0e54a9fa727b663972b7f1de79a
DIST darktable-usermanual-3.8.fr.pdf 33479509 BLAKE2B 988824b60277ea0264fec61a1157a1de048cd512a172bc86276a043c06da3a684e971cef04c31122a78b3e7305157331e6cb86cfce7a4dc4dd9dc8697eddf743 SHA512 1383bb54face948bbbad895be2470c1b13ece71c325edf40402b3416a5d9653d2e1f8c4dbfa30edd10f02c1df8b8243c9e86948c5da8d2033e28ee3c6e04bbcc
DIST darktable-usermanual-3.8.pt_br.pdf 33648057 BLAKE2B afb6d3c1ea6b709e535e10ae2a491fb6a87c84dcfe17823a518931bda0cd8595cda72905cffc01698e60c3df991451a5cccbfcdea82966a506b2d29d61298f09 SHA512 8734a9e6c57ba37f32966873b85584c50968c1c895fa4e9d953e129bb5834f254ca46e20741d5664429ef7d6379e5a35e59f8ecb517ca88ff536b49a8216b603
DIST darktable-usermanual-3.8.uk.pdf 33663424 BLAKE2B abeb7a04b58e7ef508b415fe11073396c78964e91fbd3face8481cd6b09cf88525b1b6bdd2988bd57d25112cd59c8c05e209931f94004349cf5b8a7a3ca59e39 SHA512 e1a81771006f5d6b7e4088455b6b444ea87b27a788cc196c2bc0b0b5d0afde241ea9e2bdbd3ffe79871f39d756d710d8e16c082a21b1194efb71f78e8724af9a
-EBUILD darktable-3.6.1-r2.ebuild 4367 BLAKE2B 0b4f52fc619ef862d439e36c99ffd57b76d1417cd757e2ab00fcc3a436d523da090f2808cc1860478d9406908da52a2d509d1510c8fb1f371c6c0b311ca32b35 SHA512 af92a55cb0a5668bb107b06d8915aedad20d7ffb07e6a3d18a14280cf55caf09b2c0f8fdb6325c222dfc61b9667561b11e011b706ca7ef1e7bf65be58744c709
EBUILD darktable-3.8.0-r2.ebuild 5157 BLAKE2B 02f49ff54e774848d4d4b3dc81db1559f66b1550e8fe590ae15ea6859c938ed0e27f21619fc3652eb3ca465b2cbc49a56ea8453c5b002d3cd2e1da5b2b5b2899 SHA512 5d8acf4c1c7d5ce1d17e3c737c63417b766c7dbef73c8766841502ae0bce48b35eb0fd1ff39780a6e72f1eaaed3ec6fc8cb0d2c35157a966d26045deb9e319f9
-EBUILD darktable-3.8.1.ebuild 5158 BLAKE2B 312674fc0b736dfaa1d64aaaa4cf0ff723a9c4650a812bca1a414cdb33cf1be27bbf81298e66cfce40d862cdb586a1903d6b6bacee71bb06ec3920257d2a9ca9 SHA512 a1ec0c26617efec5ae48d40e3c3aa125da021999f937804f076fe0f7f334ebda0f604004bb8579ee82038aae6e73af1a28def9d88761836acbed4b572d4face8
+EBUILD darktable-3.8.1.ebuild 5173 BLAKE2B f46b2bc8db594b896d10127a7f4d1535b6c4d5b17d09502a93d8717e8ff5c7c833152a51d5178b0e78eaa118774f0f1e75006ab0784d732884d7c6e21a85efb8 SHA512 5a7d928b92d08d5f48e9f362aa1e65bddff5eabeb97924182a5ab075189a9052538d3124b29e2ad23a8ad3651603133958611dd53e88ff1bb6cc16d5f3f06d89
MISC metadata.xml 1378 BLAKE2B 7373550c5362c32832830bd94dbd712f963246805af5119214a43cfe4dfb1aac9e7bb03d4af6f4f1dfae3cc44e09d6ba8baff53d67b5ddd96115c460b5e19ad9 SHA512 ffdc1ff8eb068372b1f24691bb0832d5a845e49b41adf211dec1c2faf0d1a573a0e4c62c38e97758a8f87de15569ce6f3cd2c7a768c95eb0d2b166e30b20ae3a
diff --git a/media-gfx/darktable/darktable-3.6.1-r2.ebuild b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
deleted file mode 100644
index 1ade290e81bc..000000000000
--- a/media-gfx/darktable/darktable-3.6.1-r2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-3 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/"
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
-
- LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
-else
- DOC_PV="3.6"
- MY_PV="${PV/_/}"
- MY_P="${P/_/.}"
-
- SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
- doc? ( https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
- KEYWORDS="amd64 arm64 -x86"
- LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"
-fi
-
-IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
- lto lua nls opencl openmp openexr test tools webp
- ${LANGS// / l10n_}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-util/intltool
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( >=dev-python/jsonschema-3.2.0 )"
-DEPEND="dev-db/sqlite:3
- dev-libs/json-glib
- dev-libs/libxml2:2
- >=dev-libs/pugixml-1.8:0=
- gnome-base/librsvg:2
- >=media-gfx/exiv2-0.25-r2:0=[xmp]
- media-libs/lcms:2
- >=media-libs/lensfun-0.2.3:0=
- media-libs/libpng:0=
- media-libs/tiff:0
- net-libs/libsoup:2.4
- net-misc/curl
- sys-libs/zlib:=
- virtual/jpeg:0
- x11-libs/cairo
- >=x11-libs/gtk+-3.22:3
- x11-libs/pango
- avif? ( >=media-libs/libavif-0.8.2:= )
- colord? ( x11-libs/colord-gtk:0= )
- cups? ( net-print/cups )
- flickr? ( media-libs/flickcurl )
- geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
- gmic? ( media-gfx/gmic )
- gnome-keyring? ( >=app-crypt/libsecret-0.18 )
- gphoto2? ( media-libs/libgphoto2:= )
- graphicsmagick? ( media-gfx/graphicsmagick )
- jpeg2k? ( media-libs/openjpeg:2= )
- lua? ( ${LUA_DEPS} )
- opencl? ( virtual/opencl )
- openexr? ( media-libs/openexr:= )
- webp? ( media-libs/libwebp:0= )"
-RDEPEND="${DEPEND}
- kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.0_find-opencl-header.patch
- "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
- "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
- "${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
- "${FILESDIR}"/${PN}-3.6.1_openexr.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- # Bug #695658
- if tc-is-gcc; then
- test-flags-CC -floop-block &> /dev/null || \
- die "Please switch to a gcc version built with USE=graphite"
- fi
-
- use openmp && tc-check-openmp
- fi
-}
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
- use cpu_flags_x86_sse3 && append-flags -msse3
-
- sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_CURVE_TOOLS=$(usex tools)
- -DBUILD_NOISE_TOOLS=$(usex tools)
- -DBUILD_PRINT=$(usex cups)
- -DCUSTOM_CFLAGS=ON
- -DDONT_USE_INTERNAL_LUA=ON
- -DRAWSPEED_ENABLE_LTO=$(usex lto)
- -DTESTBUILD_OPENCL_PROGRAMS=OFF
- -DUSE_AVIF=$(usex avif)
- -DUSE_CAMERA_SUPPORT=$(usex gphoto2)
- -DUSE_COLORD=$(usex colord)
- -DUSE_FLICKR=$(usex flickr)
- -DUSE_GMIC=$(usex gmic)
- -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
- -DUSE_KWALLET=$(usex kwallet)
- -DUSE_LIBSECRET=$(usex gnome-keyring)
- -DUSE_LUA=$(usex lua)
- -DUSE_MAP=$(usex geolocation)
- -DUSE_NLS=$(usex nls)
- -DUSE_OPENCL=$(usex opencl)
- -DUSE_OPENEXR=$(usex openexr)
- -DUSE_OPENJPEG=$(usex jpeg2k)
- -DUSE_OPENMP=$(usex openmp)
- -DUSE_WEBP=$(usex webp)
- -DWANT_JSON_VALIDATION=$(usex test)
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- # This USE flag is masked for -9999
- use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
-
- if use nls; then
- for lang in ${LANGS} ; do
- if ! use l10n_${lang}; then
- rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
- fi
- done
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- elog
- elog "When updating a major version,"
- elog "please bear in mind that your edits will be preserved during this process,"
- elog "but it will not be possible to downgrade any more."
- elog
- ewarn "It will not be possible to downgrade!"
- ewarn
-}
diff --git a/media-gfx/darktable/darktable-3.8.1.ebuild b/media-gfx/darktable/darktable-3.8.1.ebuild
index 67728867df09..74c68cfeb38d 100644
--- a/media-gfx/darktable/darktable-3.8.1.ebuild
+++ b/media-gfx/darktable/darktable-3.8.1.ebuild
@@ -31,7 +31,7 @@ else
l10n_uk? ( https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.uk.pdf )
)"
- KEYWORDS="~amd64 ~arm64 -x86"
+ KEYWORDS="amd64 ~arm64 -x86"
LANGS=" de eo es fi fr he hu it ja pl pt-BR sl uk zh-CN"
fi
@@ -47,6 +47,7 @@ BDEPEND="dev-util/intltool
nls? ( sys-devel/gettext )
test? ( >=dev-python/jsonschema-3.2.0 )"
DEPEND="dev-db/sqlite:3
+ dev-libs/icu:=
dev-libs/json-glib
dev-libs/libxml2:2
>=dev-libs/pugixml-1.8:0=
diff --git a/media-gfx/fbgrab/Manifest b/media-gfx/fbgrab/Manifest
index e30a9bc7f8af..e0ef3ccddbda 100644
--- a/media-gfx/fbgrab/Manifest
+++ b/media-gfx/fbgrab/Manifest
@@ -3,5 +3,5 @@ DIST fbgrab-1.3.tar.gz 13027 BLAKE2B 57acd93432b01befd99c73e45337bd2eecfdb18b9b5
DIST fbgrab-1.5.tar.gz 37010 BLAKE2B aff706ef46664216ac1846d0e8fe37646fcb900cce1d451560d024edf3aab4c1817739cb26cae4d9491ae98c5e2d3fda96509f539514b701b7c7ae54ee9a8d02 SHA512 475d377480b9e67f618e19967d4bae5890a78aa00236583914b4ac81f468d8282e1767d85009101f6b03ddc091da8416dcbae451b191a79013e1632d91155c23
EBUILD fbgrab-1.3.3.ebuild 653 BLAKE2B b808aa1924511be53daa83a5f811b0470d7693cdf6a95c9df5dc6e5a164914d4bc6008ab40fbc3b7d6c00f14c9e3d573a28bed90af077a66f46e03096896e0ec SHA512 80736c5ff941a3d26e800b8f7c21c6f1dce453563c6042f6a9d50fb9a3b7b61b5dfcf05756d5df7cf9a353a2e516096be8af27898a69bc14afb2ad1c5806be36
EBUILD fbgrab-1.3.ebuild 619 BLAKE2B 512daf5643daf2c76c6a58ad9b2cc49a14687613ce05a08a2884900e76cddcc672c1a7436ed958badd8c18bfb588c23261299a0f3fa14702e67c6780f57c76ba SHA512 2b82b7264791fe99fbdff9a526b6aa7408927bb8faefb38817f9da6402d62dd046ba47487f26f2b15a677c50f746eb293f984b5e8f1b3f1cb0ac5db1eb55fa22
-EBUILD fbgrab-1.5.ebuild 686 BLAKE2B 776e465f10d99c5418e3c3feeeeca7951cdd2495b7e6dde3418e1bdafd8028f37541a5326893e5d10459ea1eb9b298722d4ac9b1a24d75e35e269f6f5671787d SHA512 d78c7af0553120e1e3f97c5927cee63002a775f8b8f16dcdfe5cc41068178b165ba61b355764f727702c852336b9117d06f49a3aee54af36dac3b371b6a3b6fb
+EBUILD fbgrab-1.5.ebuild 683 BLAKE2B d2280a66f3e8979db87cee25917df2e3044ba38f06990f7c04f9ca9fea0d4a573e3362b6a20be187af7f8c08653e06e8e259cc18c0ad95e6b85d809cc813cdf9 SHA512 ff100a73d3f376185ce01c718fb6762d968b2985b300a159325ce32c18b23afdb7c638098e55b254111330b0672eb51edee9525a46b75b34bfb7c6854e4c142f
MISC metadata.xml 332 BLAKE2B eee086fa03c81d056e03024567d5366d725700a123679232e9744988de43d204264128ec137c16c8c703e83d8e33274e6d6a734df45cf1c4aac2e96c123f94d7 SHA512 16647590f31884456ecee7d36858de57c848f1706e06877bb484f5eca0669788a1bfceb98f5233827f07bdf2fec832d94e13d94f5fcaf4f9dca07a47ad19150f
diff --git a/media-gfx/fbgrab/fbgrab-1.5.ebuild b/media-gfx/fbgrab/fbgrab-1.5.ebuild
index 47eccaee6389..e4c33cbfbc43 100644
--- a/media-gfx/fbgrab/fbgrab-1.5.ebuild
+++ b/media-gfx/fbgrab/fbgrab-1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/GunnarMonell/fbgrab/archive/${PV}.tar.gz -> ${P}.tar
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 ~s390 ~sparc x86"
RDEPEND="media-libs/libpng:=
sys-libs/zlib"
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 3be7126c3ce6..f97e7d267b6d 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -6,5 +6,5 @@ AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAK
DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2 SHA512 66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
DIST freecad-0.19.4.tar.gz 296990652 BLAKE2B 6b252198616f7731144d000307a7f186eb2b24e07b85e008d0aae0f60a732fef5598c06c5c66b70fa44114f05afbc7d81b15c71bbb147bc2e458ea90cc81ee45 SHA512 58e5e6bb4ed40ce7f3a0b653cdb0371208189b9ca266f1c29a8f9077c4e56861b3925f695718fba34781254220f8a8919a2e2a501d43573b2c733f8b21c12c1f
EBUILD freecad-0.19.4.ebuild 10737 BLAKE2B 765a570400a39d1ce90acbc3636a17ea0e9084e4eb47b21ec28495f3836af62c09f8c7c0e573940c7bdf982764d6513cc0b63d5dbc7090473bfc90ac8cfc70ba SHA512 74e7e8bf1d38e0ac587575750ca6d6d9cd818f96a8b4ef9b1120956025ac620500a14ab96f145b95e7d5ecc8ba4554f3927f9c0a8082f912461a7fe3f9559ef6
-EBUILD freecad-9999.ebuild 10634 BLAKE2B c343733a33ee15ec992a681da104308d5526a81fa51aa1bbe42e0d4b616f05252850fdbe0e6ee9d093fa63810d3dec224e078ba57e7587f61eb935f5a4cf482a SHA512 ff0348ba1c3cdd7acf45e2c62c391762adbb28afe91e0303676dbb8a8cce2001bb63d380de63f5f78475be190062e79bbb700cb5d4e7bc78716f4a8266572e04
-MISC metadata.xml 3572 BLAKE2B 308315ae5d33f9d041aad9f5bc8dd8b9aa337a57849ca02408c3907c55775a039b229d6f67fc3921623d2efd366f38672fbcaa4c73785493a7c13c88379b680d SHA512 ecb435d74013ad1b14d3a7134c89b0f0a9364c98b61aad5559d4812abadb4330520122b82a2f843977a985dc342963f5712c6e537e0740a80a08a725d2d26614
+EBUILD freecad-9999.ebuild 10687 BLAKE2B 8750d9f805c932ded40a10403889b3b3f0c54fed0f1f2609a2c32c5dbbd93da0646baea52f4afb870d997a452106a36790c0e603b32e71b6f46e29ac64fb8d2a SHA512 d8c3a3b98d69df0513710955e5667326bc9c5b7b130bf9deccdac4c9bbf9dd80dd9196a1eb0b562c8e54dcc03edc06aee295fb2312e301a04a63a700a49e3373
+MISC metadata.xml 3712 BLAKE2B 1ad9603f7dd92dbbd8bfc77cb345c907c3e19a4a6cedfa3aab64abf5b8131de33c11adbc1cee7e2351f4da3046bfe5a2964a32262bc3e28706ac2704065b3fd1 SHA512 f9a47de41d6082d7e06795398161a79e88077bacae4d8d2006a24357a48624fcbb7afe8f69eff4ca17c7cb57dad5c5a609791967bbd689069b0a5a42059606f7
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index f977510288c5..d10e47f1f6e1 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -29,10 +29,9 @@ fi
# examples are licensed CC-BY-SA (without note of specific version)
LICENSE="LGPL-2 CC-BY-SA-4.0"
SLOT="0"
-IUSE="debug headless pcl test"
-RESTRICT="!test? ( test )"
+IUSE="debug designer headless test"
-FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
+FREECAD_EXPERIMENTAL_MODULES="cloud pcl plot ship"
FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
openscad part-design path points raytracing robot show surface
techdraw tux"
@@ -45,6 +44,8 @@ for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
done
unset module
+RESTRICT="!test? ( test )"
+
RDEPEND="
${PYTHON_DEPS}
dev-libs/OpenNI2[opengl(+)]
@@ -156,6 +157,7 @@ src_configure() {
-DBUILD_CLOUD=$(usex cloud)
-DBUILD_COMPLETE=OFF # deprecated
-DBUILD_DRAFT=ON
+ -DBUILD_DESIGNER_PLUGIN=$(usex designer)
-DBUILD_DRAWING=ON
-DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for current git master
-DBUILD_FEM=$(usex fem)
diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index 44899f008bc0..0cb44cbdecb5 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -18,6 +18,10 @@
Build the Cloud workbench, to access cloud providers (mostly
Amazon S3).
</flag>
+ <flag name="designer">
+ Build and install the Qt designer plugin, so the FreeCAD widgets
+ can be used from within designer.
+ </flag>
<flag name="drawing">
Build the Drawing workbench, a predecessor to the TechDraw workbench.
Users are encouraged to learn how to use the TechDraw workbench and
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 279bb69de9d1..01d0363c44c6 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,3 +1,5 @@
DIST graphviz-2.49.0.tar.xz 23040392 BLAKE2B 74bc90e433c29662b292c0f086777648db4cded69b7640586647f46e3df46137044fa287d170a780e58f552289fec2d65e10def9ed68095bd4ec8efe9208f929 SHA512 5396b6cb4615ba509233a5a079956aef014245cac64635f01467dcb26e9d6e4b1d044110bc3a85132c747ba410597fa289bef3e503e84fa000c845e1e75c89b0
-EBUILD graphviz-2.49.0.ebuild 7612 BLAKE2B 4ff4591e9ab9b0201c1eaa3f684e41dcfaa798f4acb14a2da38a81dd0e0e12263fa5b1e63083996fa62e3cd7fb611fc0ce846223af9a07789659e7e6fd09cca2 SHA512 9b1d0840d5b7b99dc42f8d2c809d8ddb1c351392db521c6714776afec4781476b6ce8a67f374e52890ac9a36dad19e8a38ef94b85c298af438dcd8fcef8aa4fd
-MISC metadata.xml 2381 BLAKE2B 97971708021091d2d53c49f2f83751cea0aa7e2e0d4c5c9f09fc6e4c187bd23d1bf29b79b953e40601492365b2e592b2481946c53d15190c64a80aeeeffc3992 SHA512 6baa00b4838adda1093799bd773f242258bf0900c9b211336888c94a0c6d4f58d5749552cf0acea79329e0ebcf2f0cf63ae933fa13ed6497d94ea63f961b812f
+DIST graphviz-2.50.0.tar.xz 23031008 BLAKE2B a1789368a77384366bf813466d4a733765ffc0a04660cfcc002c643264780425b449087306b143cfddd70d2feabb67e82b6c04217684aba175824c3e83062085 SHA512 2b035559da20bad35e046bfa1b2c8ce1b395ff9b812f33bcf612d7f7c65ff9a226c9b209553b4283825330683fb925516563943de7922c2f6434baaf3c3b5ee2
+EBUILD graphviz-2.49.0-r1.ebuild 7693 BLAKE2B 9546f55b0386d441def488ec76f917e40a7763f081ed86a53a3266c9e007a647b56f2cb50b4541c5022a3a0e56f24bb68a018108d800c16f63f81bebb3771a75 SHA512 560d01fef054fbc674ff4211a8f79af17afee7fa317f2a83996ab479f7299b328710110d3a19de60e85a0d22466d2746f0eaf1d2f98502113cd1b03c6a729981
+EBUILD graphviz-2.50.0.ebuild 7701 BLAKE2B dbf8c08697f62e0dad53ab137de5fd90314f6ece5bdfe1b4f88defbefcad6b771120b46b02fe2c17158532a28f165071fd0216d265f54b4bfb936d3c97c31ab2 SHA512 ff1bc159d397c86622a45278ed04e1228be8879206530874d12f9a7b5cb79ba23863d1cd205d2cf5cb7543bfc2184a75b6a27f081d1cf31fa48657e52a875a36
+MISC metadata.xml 2382 BLAKE2B 13310cf58d645ff3cff906d226e2da1bce6cb747b8629b1972cf7904126f3fa36a0904b5dea2507b94a3662b7ec2d9cc245c873c57dcb2ecc7411cac1f87e84f SHA512 3b1d625519a62f2679da1c36487782272238aaa6ecd87fbc39ebfb3b5c41b074fe5c27455f5a75d7d9a16c55e072156bdba81d458342fae116e5f7673ff66215
diff --git a/media-gfx/graphviz/graphviz-2.49.0.ebuild b/media-gfx/graphviz/graphviz-2.49.0-r1.ebuild
index f4eaa25110c0..a909b34a3d40 100644
--- a/media-gfx/graphviz/graphviz-2.49.0.ebuild
+++ b/media-gfx/graphviz/graphviz-2.49.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,10 +15,10 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re
LICENSE="CPL-1.0"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gtk gts guile java lasi lefty nls pdf perl postscript python qt5 ruby svg tcl webp X"
+IUSE="+cairo devil doc examples gtk2 gts guile java lasi lefty nls pdf perl postscript python qt5 ruby svg tcl webp X"
REQUIRED_USE="
- !cairo? ( !X !gtk !postscript !lasi )
+ !cairo? ( !X !gtk2 !postscript !lasi )
pdf? ( cairo )
python? ( ${PYTHON_REQUIRED_USE} )"
@@ -41,7 +41,10 @@ RDEPEND="
>=x11-libs/pango-1.12
)
devil? ( media-libs/devil[png,jpeg] )
- gtk? ( x11-libs/gtk+:2 )
+ gtk2? (
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:2
+ )
gts? ( sci-libs/gts )
guile? ( dev-scheme/guile )
java? ( >=virtual/jre-1.8:* )
@@ -71,7 +74,6 @@ DEPEND="${RDEPEND}
BDEPEND="
sys-devel/flex
sys-devel/libtool
- x11-libs/gdk-pixbuf:2
virtual/pkgconfig
doc? (
app-text/ghostscript-gpl
@@ -101,7 +103,7 @@ BDEPEND="
# needs 'pangocairo' enabled in graphviz configuration
# gtk-2 depends on pango, cairo and libX11 directly.
# - gdk-pixbuf
-# Disabled, GTK-1 junk.
+# Directly depends on gtk-2 and gdk-pixbuf.
# - glitz
# Disabled, no particular reason
# needs 'pangocairo' enabled in graphviz configuration
@@ -190,7 +192,9 @@ src_configure() {
--enable-ltdl
$(use_with cairo pangocairo)
$(use_with devil)
- $(use_with gtk)
+ $(use_with gtk2 gdk)
+ $(use_with gtk2 gdk-pixbuf)
+ $(use_with gtk2)
$(use_with gts)
$(use_with qt5 qt)
$(use_with lasi)
diff --git a/media-gfx/graphviz/graphviz-2.50.0.ebuild b/media-gfx/graphviz/graphviz-2.50.0.ebuild
new file mode 100644
index 000000000000..88c2794ba6ff
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.50.0.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
+
+DESCRIPTION="Open Source Graph Visualization Software"
+HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
+# unfortunately upstream uses an "artifact" store for the pre-generated
+# tarball now, which makes predictable URLs impossible.
+SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="+cairo devil doc examples gtk2 gts guile java lasi lefty nls pdf perl postscript python qt5 ruby svg tcl webp X"
+
+REQUIRED_USE="
+ !cairo? ( !X !gtk2 !postscript !lasi )
+ pdf? ( cairo )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Requires ksh, tests against installed package, missing files and directory
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-libs/expat-2
+ >=dev-libs/glib-2.11.1:2
+ dev-libs/libltdl:0
+ >=media-libs/fontconfig-2.3.95
+ >=media-libs/freetype-2.1.10
+ >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
+ >=media-libs/libpng-1.2:0=
+ sys-libs/zlib
+ virtual/jpeg:0
+ virtual/libiconv
+ cairo? (
+ >=x11-libs/cairo-1.1.10[svg]
+ >=x11-libs/pango-1.12
+ )
+ devil? ( media-libs/devil[png,jpeg] )
+ gtk2? (
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:2
+ )
+ gts? ( sci-libs/gts )
+ guile? ( dev-scheme/guile )
+ java? ( >=virtual/jre-1.8:* )
+ lasi? ( media-libs/lasi )
+ lefty? (
+ x11-libs/libXaw
+ x11-libs/libXmu
+ )
+ pdf? ( app-text/poppler )
+ perl? ( dev-lang/perl:= )
+ postscript? ( app-text/ghostscript-gpl )
+ python? ( ${PYTHON_DEPS} )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ )
+ ruby? ( dev-lang/ruby:* )
+ svg? ( gnome-base/librsvg )
+ tcl? ( >=dev-lang/tcl-8.3:0= )
+ webp? ( media-libs/libwebp:= )
+ X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+ lefty? ( x11-base/xorg-proto )
+ X? ( x11-base/xorg-proto )"
+BDEPEND="
+ sys-devel/flex
+ sys-devel/libtool
+ virtual/pkgconfig
+ doc? (
+ app-text/ghostscript-gpl
+ sys-apps/groff
+ )
+ guile? (
+ dev-lang/swig
+ dev-scheme/guile
+ )
+ java? (
+ dev-lang/swig
+ >=virtual/jdk-1.8:*
+ )
+ nls? ( >=sys-devel/gettext-0.14.5 )
+ perl? ( dev-lang/swig )
+ python? ( dev-lang/swig )
+ ruby? ( dev-lang/swig )
+ tcl? ( dev-lang/swig )"
+
+# Dependency description / Maintainer-Info:
+
+# Rendering is done via the following plugins (/plugins):
+# - core, dot_layout, neato_layout, gd , dot
+# the ones which are always compiled in, depend on zlib, gd
+# - gtk
+# Directly depends on gtk-2.
+# needs 'pangocairo' enabled in graphviz configuration
+# gtk-2 depends on pango, cairo and libX11 directly.
+# - gdk-pixbuf
+# Directly depends on gtk-2 and gdk-pixbuf.
+# - glitz
+# Disabled, no particular reason
+# needs 'pangocairo' enabled in graphviz configuration
+# - ming
+# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
+# incomplete.
+# - cairo/pango:
+# Needs pango for text layout, uses cairo methods to draw stuff
+# - xlib:
+# needs cairo+pango,
+# can make use of gnomeui and inotify support (??? unsure),
+# needs libXaw for UI
+# UI also links directly against libX11, libXmu, and libXt
+# and uses libXpm if available so we make sure it always is
+
+# There can be swig-generated bindings for the following languages (/tclpkg/gv):
+# - c-sharp (disabled)
+# - scheme (enabled via guile) ... no longer broken on ~x86
+# - go (disabled)
+# - io (disabled)
+# - java (enabled via java) *2
+# - lua (enabled via lua)
+# - ocaml (enabled via ocaml)
+# - perl (enabled via perl) *1
+# - php (enabled via php) *2
+# - python (enabled via python) *1
+# - ruby (enabled via ruby) *1
+# - tcl (enabled via tcl)
+# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
+# *2 = Those bindings don't build because the paths for the headers/libs aren't
+# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
+
+# There are several other tools in /tclpkg:
+# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
+# tkspline, tkstubs ; enabled with: --with-tk
+
+# And the commands (/cmd):
+# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
+# sci-libs/gts can be used for some of these
+# - lefty:
+# needs Xaw and X to build
+# - gvedit (via 'qt5'):
+# based on ./configure it needs qt-core and qt-gui only
+# - smyrna : experimental opengl front-end (via 'smyrna')
+# currently disabled -- it segfaults a lot
+# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
+# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png'
+# with flags enabled at configure time
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # ToDo: Do the same thing for examples and/or
+ # write a patch for a configuration-option
+ # and send it to upstream
+ # note - the longer sed expression removes multi-line assignments that are extended via '\'
+ if ! use doc ; then
+ find . -iname Makefile.am \
+ | xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
+ -e '/^\(html\|pdf\)_DATA/d' || die
+ fi
+
+ # Nuke the dead symlinks for the bindings
+ sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
+
+ # replace the whitespace with tabs
+ sed -i -e 's: :\t:g' doc/info/Makefile.am || die
+
+ # use correct version of qmake. bug #567236
+ sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt5_get_bindir)/qmake)" configure.ac || die
+
+ use java && append-cppflags $(java-pkg_get-jni-cflags)
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ --disable-static
+ --enable-ltdl
+ $(use_with cairo pangocairo)
+ $(use_with devil)
+ $(use_with gtk2 gdk)
+ $(use_with gtk2 gdk-pixbuf)
+ $(use_with gtk2)
+ $(use_with gts)
+ $(use_with qt5 qt)
+ $(use_with lasi)
+ $(use_with pdf poppler)
+ $(use_with postscript ghostscript)
+ $(use_with svg rsvg)
+ $(use_with webp)
+ $(use_with X x)
+ $(use_enable lefty)
+ --with-digcola
+ --with-fontconfig
+ --with-freetype2
+ --with-ipsepcola
+ --with-libgd
+ --with-sfdp
+ --without-ming
+ # new/experimental features, to be tested, disable for now
+ --without-glitz
+ --without-ipsepcola
+ --without-smyrna
+ --without-visio
+ # Bindings:
+ $(use_enable guile)
+ $(use_enable java)
+ $(use_enable perl)
+ $(use_enable python python3)
+ $(use_enable ruby)
+ $(use_enable tcl)
+ --disable-go
+ --disable-io
+ --disable-lua
+ --disable-ocaml
+ --disable-php
+ --disable-python
+ --disable-r
+ --disable-sharp
+ # libtool file collision, bug #276609
+ --without-included-ltdl
+ --disable-ltdl-install
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
+
+ emake DESTDIR="${D}" \
+ txtdir="${EPREFIX}"/usr/share/doc/${PF} \
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
+ pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
+ pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
+ install
+
+ if ! use examples; then
+ rm -rf "${ED}"/usr/share/graphviz/demo || die
+ fi
+
+ find "${ED}" -name '*.la' -delete || die
+
+ einstalldocs
+
+ use python && python_optimize \
+ "${D}"$(python_get_sitedir) \
+ "${ED}"/usr/$(get_libdir)/graphviz/python3
+}
+
+pkg_postinst() {
+ # This actually works if --enable-ltdl is passed
+ # to configure
+ dot -c || die
+}
+
+pkg_postrm() {
+ # Remove cruft, bug #547344
+ rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die
+}
diff --git a/media-gfx/graphviz/metadata.xml b/media-gfx/graphviz/metadata.xml
index af88452031aa..fafa9aa44163 100644
--- a/media-gfx/graphviz/metadata.xml
+++ b/media-gfx/graphviz/metadata.xml
@@ -36,7 +36,7 @@
</longdescription>
<use>
<flag name="devil">Enables DevIL output plugin -Tdevil</flag>
- <flag name="gtk">Enables gtk+ output plugin -Tgtk (needs cairo)</flag>
+ <flag name="gtk2">Enables gtk+ output plugin -Tgtk (needs cairo)</flag>
<flag name="gts">Enables support for GNU Triangulated Surface Library (required for sfdp to work)</flag>
<flag name="lasi">Enables PostScript output via <pkg>media-libs/lasi</pkg>, for plugin -Tlasi (needs cairo)</flag>
<flag name="lefty">Builds lefty front-end, requires <pkg>x11-libs/libXmu</pkg> and <pkg>x11-libs/libXaw</pkg></flag>
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index e388f3955050..c384232180b5 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,13 +1,13 @@
AUX hydrus-client 98 BLAKE2B c08af22c2ee9ea3d5c95ed3196ceb9b74b9c886bfa9b91141584f7ea884830fbdd300c948af199ac82a016e1a9dd7314e9c7fdfa8f47f07a9336eff9e2bd2ce1 SHA512 453ac6f9685325b6510c7f833b658491f01e92be213ae26da0d86490033951d3a825f9b15fd33d8a0727992cd83bf7ed491b88f0808674d6fdc23af90c7911a5
AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941325eb67149064c1276f462732e62db294acce75d111f948599698615e9fa15be43fe74ce444cd SHA512 5b7f9ca4b364ff529e5f4feb6fb11c91aff9cf1ad3ae6c12ff301915fa1d7b9920d51028b820000635d071a049a4e98a0e4e815ffa6ca31d2e67bec5a78afdea
AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467
-DIST hydrus-473.tar.gz 40044270 BLAKE2B 1aecc84aa60318fadffcf3ad3d8358fa4f537ca1ca55ae7ce02aade0e44b266f42ae94c423854874c471e1d8dc0988e232d19f2e5dd4e2d12834055b75814e9a SHA512 372e813deaef82fe02686e4d7fe5f9ab15476a954b53da8b3560a4cf45ad44209b22b727c32510714ff937b0e6116dae403b3a69954e51c5e62b67bea4eda808
DIST hydrus-474.tar.gz 40052948 BLAKE2B 7d323caf6dee2dc8a1dcf792a5c3383b395374d0e5a8fd88489b08a5b4ad295317cd5ae1da95d5435fb44ea8d4bbe4038d821c037c156e11d8b8c8a8582d67be SHA512 b73f5823ff84cf84710dd1fd9f9bfedffb6ce9ffaba8e4b23a7eda4a6a206aeaa8993632858fab9a5934f4c279fc23955cf045cd38af7ccf78b1eb73a0940bdb
DIST hydrus-476.tar.gz 40139397 BLAKE2B 68a3f31a8f250b2c129a9f2562624ec98994e338112eba4f0953aa96dd95abdb97fc60f6a8f28efb5a660f543f596a344a13fe234b3ffb11e6a158b795b0a11c SHA512 5aa59cc2e4d72219d24de10eaeb99ad5b13c0de3af8d9c7e55e3ccea3b897077596401d4d034aac05c018a969f84507618f95ef70d422ac57075bf2d64a692c5
DIST hydrus-478.tar.gz 40150962 BLAKE2B d654d2c12de8c8af6212679ed719892bcb6172d0b2120718e1bca7159ea3ab0f509dd01bf7c6f57f7da4d5e711c7b85cd0ce467ebc5fe0b08214085e3ca13cc5 SHA512 eb92071e0c9a0c3d04ef72336feaa55e47d28c523916484090220f30fa137c7d6b09b1d97e214fd191212a54e5d653eba08cfa1fe3f242a488d22cc331279e9b
-EBUILD hydrus-473.ebuild 4103 BLAKE2B 0d16586f4b28806e5d074c5b235b443825e5f053512d1eba67f7f16f40c0429e5b87bc26e873d87acb9518f9e6243a13e5b7f017d0ba571285c2d383d6f14fdb SHA512 42cdf6377c3e6468b667c0a556ca892690c28722500e0cb21c921d58184f4318a25bdaa8d0ff957dec7b90113d41bfbd56f4a4ae338b11b023e4250b0e4d0626
+DIST hydrus-479.tar.gz 40164261 BLAKE2B 9c9b60c831a84414632a6ddbe51ece66d036aaa1f98cc74f112ee668583fb4ad95572a25e98cfc8d5c9d6886b55110b373534addb27bf9bec5f9bec53b69e8f7 SHA512 7f08fa62c7bcae17a80aca47dc5fcaf1641622590b08fecd3f38749467e7c595d5b49672145df00f480e99e3270e8bb4d98a21053d9eaeed0f0950956e3026ae
EBUILD hydrus-474.ebuild 4103 BLAKE2B 30df6e6ffc773581481785c1515c42a2b93a3cb40238a2a72ce5a8a7b6b4a2d6de0816a81df801f1a7b9939a61a0611704d8eccc65be73b9c9f513f5f8b1bffe SHA512 1687bc474795a96137c8883237cf59157f00edc9d9e2c131d84b7f510d95d60ae1f63bcde1727f810f0f4f4d55faf5c813f07849815f194f47637fc3564a66b6
EBUILD hydrus-476.ebuild 4426 BLAKE2B 9ab0625fa36a19dfbf75292f80c59905f79c7cbe79e5ca0349f44030e9ac90f08c87d7a4685ff6fcc29c46dd8ed2e3e7537cc013d556ef77f5c5598e4181f4a2 SHA512 55f3d3b3459947003c5914342ab18381a4cc2268ee659a8c610385f84db42b9ef6f5f50af1747e9735f208993782522ea64f90cc1e20ec2e2517416a1df8ac04
EBUILD hydrus-478.ebuild 4463 BLAKE2B b510bb557193669bc1d09a11ab66902f1f474878d8b740f9dff8746508264f225ad781f6e0058b0ef6d7fa2377da151734ff1cbae608e7587c46114b6c81bca5 SHA512 791eaac87779f9abe34fca92baad624b7c87dfa43fd1507cce6acad47c53e1acabe2f38e3e5cfba658ca5b3a013696db166fe66d332cb1ed63e69f3bd778cabd
-EBUILD hydrus-9999.ebuild 4426 BLAKE2B 9ab0625fa36a19dfbf75292f80c59905f79c7cbe79e5ca0349f44030e9ac90f08c87d7a4685ff6fcc29c46dd8ed2e3e7537cc013d556ef77f5c5598e4181f4a2 SHA512 55f3d3b3459947003c5914342ab18381a4cc2268ee659a8c610385f84db42b9ef6f5f50af1747e9735f208993782522ea64f90cc1e20ec2e2517416a1df8ac04
+EBUILD hydrus-479.ebuild 4463 BLAKE2B b510bb557193669bc1d09a11ab66902f1f474878d8b740f9dff8746508264f225ad781f6e0058b0ef6d7fa2377da151734ff1cbae608e7587c46114b6c81bca5 SHA512 791eaac87779f9abe34fca92baad624b7c87dfa43fd1507cce6acad47c53e1acabe2f38e3e5cfba658ca5b3a013696db166fe66d332cb1ed63e69f3bd778cabd
+EBUILD hydrus-9999.ebuild 4463 BLAKE2B b510bb557193669bc1d09a11ab66902f1f474878d8b740f9dff8746508264f225ad781f6e0058b0ef6d7fa2377da151734ff1cbae608e7587c46114b6c81bca5 SHA512 791eaac87779f9abe34fca92baad624b7c87dfa43fd1507cce6acad47c53e1acabe2f38e3e5cfba658ca5b3a013696db166fe66d332cb1ed63e69f3bd778cabd
MISC metadata.xml 751 BLAKE2B 05dfcd30440ca7bc1375206469123c5bb93ff7fbb7612191faabee7abe87334bfb4f25db3291cd3a989264516c315eeb489eaac2c83c95b2436446966ba27880 SHA512 f2e7c839e4567355bb6ff1cdbf1355ab7a2fbf166a3f87ac7a8af92fc80efa7833010376317a38e2594a203be66bfcb3e0df9dc7346ac3d37d8466bb0368b50e
diff --git a/media-gfx/hydrus/hydrus-473.ebuild b/media-gfx/hydrus/hydrus-479.ebuild
index aa080605c68f..eeb2fa504f8a 100644
--- a/media-gfx/hydrus/hydrus-473.ebuild
+++ b/media-gfx/hydrus/hydrus-479.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,10 @@ EAPI=7
PYTHON_COMPAT=( python3_{8..9} )
PYTHON_REQ_USE="sqlite"
-inherit python-single-r1 desktop optfeature
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material"
+
+inherit python-single-r1 desktop docs optfeature
DESCRIPTION="A booru-like media organizer for the desktop"
HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
@@ -36,6 +39,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
${PYTHON_DEPS}
$(python_gen_cond_dep '
+ dev-python/cbor2[${PYTHON_USEDEP}]
dev-python/chardet[${PYTHON_USEDEP}]
dev-python/cloudscraper[${PYTHON_USEDEP}]
dev-python/html5lib[${PYTHON_USEDEP}]
@@ -82,14 +86,13 @@ src_prepare() {
rm -r bin/ || die
# Build files used for CI, not actually needed
rm -r static/build_files || die
- # Duplicate license file, not needed
- rm license.txt || die
# Python requirements files, not needed
rm requirements_*.txt || die
}
src_compile() {
python_optimize "${S}"
+ docs_compile
}
src_test() {
@@ -107,18 +110,23 @@ src_install() {
mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
- local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
- local HTML_DOCS=("${S}"/help/)
+ local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
einstalldocs
# Files only needed for testing
rm test.py hydrus/hydrus_test.py || die
rm -r hydrus/test/ static/testing/ || die
- # These files are copied into doc
- rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
- # The program expects to find documentation here, so add a symlink to doc
- dosym "${doc}/html/help" /opt/hydrus/help
+ # ${DOCS[@]} files are copied into doc
+ # ${S}/docs/ is the markdown source code for documentation
+ # .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+ rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+ if use doc; then
+ # ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+ rm -r "${S}/_build" || die
+ # The program expects to find documentation here, so add a symlink to doc
+ dosym "${doc}/html" /opt/hydrus/help
+ fi
insinto /opt/hydrus
doins -r "${S}"/.
diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index 74762f9de40f..eeb2fa504f8a 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -39,6 +39,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
${PYTHON_DEPS}
$(python_gen_cond_dep '
+ dev-python/cbor2[${PYTHON_USEDEP}]
dev-python/chardet[${PYTHON_USEDEP}]
dev-python/cloudscraper[${PYTHON_USEDEP}]
dev-python/html5lib[${PYTHON_USEDEP}]
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index a1cf4356b351..38f4a6932c61 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,5 +1,5 @@
DIST lximage-qt-0.17.0.tar.xz 109772 BLAKE2B e49c6fb2b3db9b5ff829f7003862ab8124773d82a540019f2ba64c48fa4fffff0eb5f317b8222be95b1b030b5d64a961d4c96298275a835f56816dc857cc6e27 SHA512 fb7867f5589fa45f3e2d37dcd0733c49fb5439206b11d2a43020305c5c7d222796aa0cf2dbf19d5fc7829a34d3877241cb4bb36ea2883a41503eadd39deaf8e0
DIST lximage-qt-1.0.0.tar.xz 819396 BLAKE2B b4445145319f755b6c6303fac98e3941c22aae66883bbb4d7c1b8f5d5a552c8b3242ef1ca701d01c930afaf97cf59bbff8b15a5481543945c6abccd0241abbe2 SHA512 b78ef64316978a91ab350ab4588b0e5a7d1cfd2cda90ceac739ed8e1668cd6e34a164bb1cd818ca8175a5677d8bff8a50cd7c6aa2cd99ad87116a6da969534cb
EBUILD lximage-qt-0.17.0.ebuild 943 BLAKE2B 7df4a44f76b273986f3dedcd7ddc9dee2cbbd04d337cb87611336dcb1b9e2991220446b589fb33caf4e4abeb6defb172c16a342a43f5c1e247a68acc55e23bcc SHA512 f2bd743477b7fac27d2224bec1c37e20c7733367a0b3a9ab09ae60efda553feb867a7cf5fd64225690963fbeab9703701b8141c3c300f130f500290061361ea6
-EBUILD lximage-qt-1.0.0.ebuild 1083 BLAKE2B 734ee0618a450e4db9859a6e6f87a4bf145fb62491696beed58d9612a6f3ed55b9ab88991c0ac2421a3e3c16915e747f04d5622854ab68e488745942b60049de SHA512 8e6605755582803fc18347cbb0a6488ded731b1c7124baace16004ace9e19948d2714e94bccb2128020c8f1887c0fc91b17707acfd71cb213fefdc9c689c1404
+EBUILD lximage-qt-1.0.0.ebuild 1080 BLAKE2B 46622e51316f8a5e81b6b06c18ec7221f5855320f0739d15448ec32d541018f9468c03884ec7bf09f5b781363393390eb5efc1239e9c29c5b70ca5dd90b6a0f2 SHA512 307214d0616d26eafe697c36bc046930de6b22fd82fcdf317a80d92f0781aeca757e76143908083638e248c40cf34975d3192c2c0650cf1ae53817c2735a14d0
MISC metadata.xml 317 BLAKE2B f63e3e91e5dc9fcc6113bf1ae9c9bb5680d2b7cf40359eaa058dcbc247f3b2f43f540ffa6525935220d52c3e8b94ee3629ce237c788c8e4f0946dddbf610680e SHA512 74c882b00f38c28d8546d31c59636252b2627053143a1bea3551c4bc507a63361c88bc555ea15760395f995c6d20dd6fe6adf65f11d42cc90ffd8378aae03f1f
diff --git a/media-gfx/lximage-qt/lximage-qt-1.0.0.ebuild b/media-gfx/lximage-qt/lximage-qt-1.0.0.ebuild
index bff81bd1d821..c5337b656cc7 100644
--- a/media-gfx/lximage-qt/lximage-qt-1.0.0.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
else
SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
fi
LICENSE="GPL-2 GPL-2+"
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 1dcfe044167d..79cd1e18c589 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,8 +1,7 @@
AUX 50openscad-gentoo.el 167 BLAKE2B 36292439057e2b9a5993c73cf5d46e5b6b0b56695f46307114fcfffa79990be0b0622ec3a6918726d4a5f7e4343525b9e67f785996ec4eb7abb938b6df1cb2f7 SHA512 ce669eba45ab90e9dbcd770a7470ca9ed7088b1acabbc876fe4d31dc7a6edd36076063e4bd417d348c3e073113e3ad2bc2dd0ac89e02d3d8aeca7627ad7d2a1e
AUX openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch 790 BLAKE2B b08a024f81a29d7fb4e0860977b814d2ec6ce6dcbf8ab87655f5d36f51ea3bbce6559369363c33ca7593cbc3284de920f71be3c38e3ab7b5efa83d3466132b79 SHA512 2af887d7b085c49203e72ad41cb5c0e32b772a8abd35843485434cb11b263ba8a727a0ebc34c7138bff1e6852245f2bdaf7d91711184a5f16ed22603578a0892
AUX openscad-2021.01-0002-fix-to-find-lib3mf-2.patch 1396 BLAKE2B a43872dd83427f28a48528fbac534924796db769bd0213ba1b6fca41a65c766aa3355aa9ee3f7d68dcbbf3d578cee984f2ad61f599fdf9551ef55724f460f4db SHA512 ffbf402976054c1e7294a0d661e0648bdb359cf57e676d818cf1140644b7a0d0943f5adf1d2f511ad17ca45a35e31785aae584dc7607f13bfc9d94795fc3812b
-AUX openscad-9999-fix-pkg-config-name-and-include-directory-search.patch 1053 BLAKE2B ebe8641b3506e01b62d7e311a1c1b139ae499a7ecb9f61dd0ed3d7a6d7eeccd15ed75b7591f4eda032c053bef46023b83146128f81d5d300f5b147a9396fa574 SHA512 a3107b69dbd2a74751c44368e60aff8ce25933a5dd8ff3ecd7fa4b8afaa0a9de2e5acf06ecce223cd42b334ef7b74b5879ae6b68135366b227fe0aded9e955c6
DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128
EBUILD openscad-2021.01.ebuild 2318 BLAKE2B 7d474960f76029b745bbcb26e6e4a6f2511f364bf10c85bcab9cf9ef4fc7bdc4b97402a602b59682e612af3cdb080e79abe24d06431c0a30c55c62daca9bbfaa SHA512 31a5481da0a65d589b0d4bbd41d76b77affcc2d1cf83fb1de91ea4766ac9ce74ba8a40e12ec7abadc823a7f30e51a93ac8b0871358adace7e9020003424a4a98
-EBUILD openscad-9999.ebuild 2576 BLAKE2B c2c4e2c37ef8ed682863ade96a355cc7d7b17ceaa9904274f296be0576dddbf7815f51630bae8be2fe9906869bc95b85b68316a71e0df429d3aaf153e9b2693e SHA512 9685776a32dd69fcfa0563b0439be0a2610556278fa65d3f781683aa1b421d03e01270f6c7f98c6a8d0e66eb5b793c04bf795ca4052761bcabe213cc85a02bb5
+EBUILD openscad-9999.ebuild 2506 BLAKE2B c9d1862b31eb6c82feaa038e0d3e13f1eb04f8b8567c2a7d8f4ccfded8aad77efdc4cac38d7e429e9c06acf1f0f17e8ffe9b45d65f37b354f715cfda3bc2807f SHA512 a8c53089c3c0ecbe0b53452dfe854477bd7bcb66d841f051b35d0d07401cd9dbad66ce3c6b1ace55e12f17bc2b613ba614c266ef0ea737ceba03003bc36b39ed
MISC metadata.xml 1348 BLAKE2B b15a74a20ef94a6a47de57826c5279a4e8c388a52bf9d1058a1ba0b347fcd77e0c8b79a42515f5411d0991fb8fb71c604f792dd2a2addaaca78bc85dbfc7a611 SHA512 fea109a00324f0bdcaae855e18fba456a449bb8192e633cfd5806fa1040fe3bba24f75493e0012d54afe8828073fc4d02ae01533b45648e05c575777b23572d1
diff --git a/media-gfx/openscad/files/openscad-9999-fix-pkg-config-name-and-include-directory-search.patch b/media-gfx/openscad/files/openscad-9999-fix-pkg-config-name-and-include-directory-search.patch
deleted file mode 100644
index a448deec37da..000000000000
--- a/media-gfx/openscad/files/openscad-9999-fix-pkg-config-name-and-include-directory-search.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2483ee56960c99c35036273fc9fc2877eac772fc Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Wed, 20 Oct 2021 19:46:08 +0200
-Subject: [PATCH] fix pkg-config name and include directory search
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- cmake/Modules/FindLib3MF.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/Modules/FindLib3MF.cmake b/cmake/Modules/FindLib3MF.cmake
-index 44858364..ad2f01ca 100644
---- a/cmake/Modules/FindLib3MF.cmake
-+++ b/cmake/Modules/FindLib3MF.cmake
-@@ -14,11 +14,11 @@
- # Travis CI Ubuntu Trusty environment has some issue with pkg-config
- # not finding the version.
- find_package(PkgConfig REQUIRED QUIET)
--pkg_check_modules(PC_LIB3MF lib3MF)
-+pkg_check_modules(PC_LIB3MF lib3mf)
- set(LIB3MF_VERSION ${PC_LIB3MF_VERSION})
-
- find_path(LIB3MF_INCLUDE_DIRS
-- NAMES Model/COM/NMR_DLLInterfaces.h
-+ NAMES lib3mf_implicit.hpp
- HINTS $ENV{LIB3MF_INCLUDEDIR}
- ${PC_LIB3MF_INCLUDEDIR}
- ${PC_LIB3MF_INCLUDE_DIRS}
---
-2.33.1
-
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index f7e74169b9ec..996bf04653fb 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -47,6 +47,7 @@ RDEPEND="
dev-qt/qtmultimedia:5
dev-qt/qtnetwork:5
dev-qt/qtopengl:5
+ dev-qt/qtsvg:5
dev-qt/qtwidgets:5
x11-libs/qscintilla:=
dbus? ( dev-qt/qtdbus:5 )
@@ -71,8 +72,6 @@ DOCS=(
doc/testing.txt
)
-PATCHES=( "${FILESDIR}"/${P}-fix-pkg-config-name-and-include-directory-search.patch )
-
src_configure() {
local mycmakeargs=(
-DCLANG_TIDY=OFF
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index a98fc76949bf..4183a28a6d1d 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,7 +1,7 @@
-DIST plantuml-1.2022.1.tar.gz 5395748 BLAKE2B 394280c9abf739f35ecf7e0ac84ccb1dba770ab0eff566a46c2e141227e556c17578ed3f5ccffffe7df82d7b7f3cd2d8a86c9d214d16557fe8e8b789a66acd7e SHA512 c510c1291dca58ef81626d3b416db5aeb5060958698cf37a6552a6eea820ce332d00f2b21cd382dadd18035b5f83a305973cfbe1137b09313ec63babeaad5660
DIST plantuml-1.2022.2.tar.gz 5396602 BLAKE2B 5919495af6d15805ef379ae1a4630fa739620abe48ebef65ae034d16a9811233ae98d60e5ae2cc5e1b4a9d682bef34d70fd0ae42a0d16b5a6f44821df86ae63a SHA512 f61d7dbed7d7b6771d172ae8fb2a7af0c111a986330fddf5b8fbb36e7ebed8f598ff748d6f35b1c1ffa289b24fb699c572172316001bc571628ceeb8d0595d70
DIST plantuml-1.2022.3.tar.gz 5399905 BLAKE2B 6dc48de057850a797de779c02e039abb3070239f2e7a907a1447b0a95ef3a869424e10fe5efd3e130f0f8042b40f07209e844677299363a010b0d7ee5727a7d2 SHA512 c90cc11686bff42f56ed35de90eb29a5bcb662c4d0003132b64f9913dff3caa52aed39ca269e2f42b45945a9cbe4713f8717c89af6a6ccd163fcbdf887e275fa
-EBUILD plantuml-1.2022.1.ebuild 750 BLAKE2B fc8574f91fddc1a1c4643bcef80049a129bd3462c5d42a2eef297c5f7dfe45eca37b0db569a8c31899e4d296348710595ecbdc4ceb3e594b2ee9442e5b86565f SHA512 ec030e822f381dbf1b0fe822826afc3849ee56aeaada5429cf87192f0059d7f68f1ffb949a404f59c52f899e4d3b3d6b8959ef4f633c97c5661a90b4bfb6c77d
-EBUILD plantuml-1.2022.2.ebuild 751 BLAKE2B 118992e67563dedca5375ec285461a8826ab41fe337d69cd75e31edbc2999f8f0c1ec5ad101c856f25aa99810c7181a3037a10f4a38113542f7a53edb1957316 SHA512 2783b88dd3367bbae9d5c4ed3a93b647592822d9cde253fd3e23fb6ee351af15d221d7918876e582231b8b2a266941ac016c1c115fffa24db9012b5c74acbfd6
+DIST plantuml-1.2022.4.tar.gz 5400187 BLAKE2B 4fba7454c0e3f757afa757b4be27bd4878a516f981209c69350adaeb21b7e051323477da496aff18b41f001fc0f2ebc2368daf14aa55957fd5ae426275494371 SHA512 b4520d304b2d4893687d18438af38bd8c2639b3dde5cd5cf3bd6c2426efa4e022081e02d396dde96253ddafd48f488676ca76e2d124b00e61435b8d3ea9f16a2
+EBUILD plantuml-1.2022.2.ebuild 750 BLAKE2B fc8574f91fddc1a1c4643bcef80049a129bd3462c5d42a2eef297c5f7dfe45eca37b0db569a8c31899e4d296348710595ecbdc4ceb3e594b2ee9442e5b86565f SHA512 ec030e822f381dbf1b0fe822826afc3849ee56aeaada5429cf87192f0059d7f68f1ffb949a404f59c52f899e4d3b3d6b8959ef4f633c97c5661a90b4bfb6c77d
EBUILD plantuml-1.2022.3.ebuild 751 BLAKE2B 118992e67563dedca5375ec285461a8826ab41fe337d69cd75e31edbc2999f8f0c1ec5ad101c856f25aa99810c7181a3037a10f4a38113542f7a53edb1957316 SHA512 2783b88dd3367bbae9d5c4ed3a93b647592822d9cde253fd3e23fb6ee351af15d221d7918876e582231b8b2a266941ac016c1c115fffa24db9012b5c74acbfd6
+EBUILD plantuml-1.2022.4.ebuild 751 BLAKE2B 118992e67563dedca5375ec285461a8826ab41fe337d69cd75e31edbc2999f8f0c1ec5ad101c856f25aa99810c7181a3037a10f4a38113542f7a53edb1957316 SHA512 2783b88dd3367bbae9d5c4ed3a93b647592822d9cde253fd3e23fb6ee351af15d221d7918876e582231b8b2a266941ac016c1c115fffa24db9012b5c74acbfd6
MISC metadata.xml 879 BLAKE2B b711489e5c713d9b6ee8489e7ca080b9af19965e10ce3795e3dd16e3cabd0b9284bb1a75646baf2c0134cce31189a9e7dea499129750e20f4971f53aee66feaf SHA512 cfde5b9a2e44e38bc2eca2d7e32e6d4a18d0413325e41b0823091fdefcd15b035f32572397c27173887d370b2cca7673638ccf32690447dcab91ff31bc309c76
diff --git a/media-gfx/plantuml/plantuml-1.2022.2.ebuild b/media-gfx/plantuml/plantuml-1.2022.2.ebuild
index c1ad0e0aaa4f..8ba5d39fd289 100644
--- a/media-gfx/plantuml/plantuml-1.2022.2.ebuild
+++ b/media-gfx/plantuml/plantuml-1.2022.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://plantuml.com"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/media-gfx/plantuml/plantuml-1.2022.1.ebuild b/media-gfx/plantuml/plantuml-1.2022.4.ebuild
index 8ba5d39fd289..c1ad0e0aaa4f 100644
--- a/media-gfx/plantuml/plantuml-1.2022.1.ebuild
+++ b/media-gfx/plantuml/plantuml-1.2022.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://plantuml.com"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest
index f3ead259b9cf..3db43d41ebf2 100644
--- a/media-gfx/renderdoc/Manifest
+++ b/media-gfx/renderdoc/Manifest
@@ -6,7 +6,9 @@ AUX renderdoc-1.18-system-compress.patch 4699 BLAKE2B 4f37058deef1773a4a35b64415
AUX renderdoc-1.18-system-flags.patch 845 BLAKE2B 0d4aae31af353b2d199ae66ec999beefa04e2105e6368305bb89359806fa99f4b7048c3d6c30a2787a3125718d3cbd7c97d3381f61f4f98a2e08730b5a22db02 SHA512 bd2692f14729360983f5ca4fb8af87085ab5bd209d82f3cfd99e7753d0dd406905a6280051aa5d1476b863566b385cdc28fbe9120d0d6f5efd78411af15b68ef
AUX renderdoc-1.18-system-glslang.patch 9100 BLAKE2B a033377083705bbbccaa56657eccf632bcc5093bc86f319d3d30e94eed41bf849fe8e983dd9085b1628ecaed9ab0b358a487b40c8672239d4b32ee83e24ab1df SHA512 a0eea5b3c24092f30b2ec5c9fde327b4683839a34a5f11a64fb85b54d645f50b8e87f8fc59cb87450566caa3ad87aadc6baa7c8843256726cb8bd71fb0444dd0
DIST renderdoc-1.18.tar.gz 46372788 BLAKE2B 3f07e29770e033d96f202fa143c7dd2e422750b28f33d14736c43f667fd45ec1b899e66136e415a2b947fbba7cdf0f822fe1dc6978c5146ae5432b44ed497a75 SHA512 4f7baba39ee8e346d00c2d80b5bf7370adebe0200ea2a95a339b3d207fc58f42bff109ffe922604ad49bcd3b5ff8d1ef2a282dd4aa16f09fd6b57aba06aa493d
+DIST renderdoc-1.19.tar.gz 46514201 BLAKE2B 32027b743afd75797b393194f1c0a1864985ce4a7eb419d47bd3665000b77e3460d5501b555d4206f332db9894d2697a00bae79d831d7f7724737d889a85ff64 SHA512 d3a3d0ec9e5782dea27e00f8eb26e9fbcb764e9ccfca230846fad229ce7f2db48d442365d530ebb4e1f50eb44d596a5c18f269ef635c9d5ae4b9275e676a92eb
+DIST renderdoc-1.19.tar.gz.asc 833 BLAKE2B 809e1db20625ad26f2d4b1d13e1bce67133311072ca314a1f662f2fa46b28e5ced976513f1d7b112266cfe2dbe59cec82e1cc556116b1cb5f47d31e834df8073 SHA512 4897b041dbf697d3255986eb58d5142ead52afeff1761185d13fdfbbb0caee077bb7d485a0527a4d921e141ad8eaf414d9d2db38bdd157937620bb15da2320ec
DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86
-EBUILD renderdoc-1.18-r1.ebuild 4806 BLAKE2B 37bafc11732e9930f1477ae614eb4e8be68394df82240cf2cdf68194aee393fe446a98d8e06578f7315205d07b2d39460e16541d5870b15dd657eee40bf05a88 SHA512 12813b7e5636f9c7b86f3022361a1c5fd44e075d633af4903f21b95cf0e74f169b1f7a2a2f316d24544f8d214f1d673cf8106dfd4cdeeb3cbd998d119519fce2
EBUILD renderdoc-1.18-r2.ebuild 5060 BLAKE2B ae86523a747f334c2167f82dd79edbd379b324f2575126243d1f5d282a8f147eb8a8c58413ce066965bf697bf6b1abf19607ca643cd45227dd4b16d4e5dce803 SHA512 747b1ca95cdeb3f7c93b3a3e488ba964fcf215d1bad15c36cf94442f00697dbca527fc5b31936f8d0432b213f1985490e7e650d7e84e88658e96f5950bcd5f73
+EBUILD renderdoc-1.19.ebuild 5230 BLAKE2B 49ab8ae3173f623eef60b9b0b488f7f8827771b865fbbb9c56a4acbb43c8ffd2bc684311240a698e05c3ee1779086b50e94a95f9c3ae08c82c788c72fa67ef09 SHA512 d0d600f5814553a0fb62cc15f1f75825d6286bb5ddcfcb3a0f9e5bf2334efdbca04e8ca142b30742aedfec7dc880fb8adbb8fbd2d87b271436f01737c55316a5
MISC metadata.xml 551 BLAKE2B 6b04ab731ce0f9c836b958914e25fcd4a4b76032fd97ba41f6bda742e99a4b7404de51acac99fe4736ba87e488300e94dc1ef7621a780d0a8e453d0fde0430f2 SHA512 a1c2b5260d0265efe2e1294cb88aa1c43618654c7d989cd8f4bd6e919082ea1d37fed4df8a601a702b5b120d5fb5f6658d3e155c5346dacb17249fed629c04d0
diff --git a/media-gfx/renderdoc/renderdoc-1.18-r1.ebuild b/media-gfx/renderdoc/renderdoc-1.19.ebuild
index f669767e6d38..000168350417 100644
--- a/media-gfx/renderdoc/renderdoc-1.18-r1.ebuild
+++ b/media-gfx/renderdoc/renderdoc-1.19.ebuild
@@ -13,13 +13,14 @@ AUTOTOOLS_AUTO_DEPEND="no"
DOCS_BUILDER="sphinx"
DOCS_DIR="docs"
PYTHON_COMPAT=( python3_{9,10} )
-inherit autotools cmake optfeature python-single-r1 docs xdg
+inherit autotools cmake optfeature python-single-r1 docs qmake-utils verify-sig xdg
DESCRIPTION="A stand-alone graphics debugging tool"
HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc"
SRC_URI="
https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz )
+ verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v${PV}/v${PV}.tar.gz.asc -> ${P}.tar.gz.asc )
"
# renderdoc: MIT
@@ -38,14 +39,14 @@ SRC_URI="
# swig: GPL-3+ BSD BSD-2
LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
IUSE="pyside2 qt5"
REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
app-arch/lz4:=
app-arch/zstd:=
- dev-libs/miniz
+ dev-libs/miniz:=
dev-util/glslang
x11-libs/libX11
x11-libs/libxcb:=
@@ -78,6 +79,7 @@ BDEPEND="
dev-qt/qtcore:5
sys-devel/bison
)
+ verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson )
"
PATCHES=(
@@ -99,19 +101,21 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.18-system-glslang.patch
"${FILESDIR}"/${PN}-1.18-system-compress.patch
-
- # Check physical device API version and supported extensions. Fixes
- # segfault on some GPU/driver combinations. Will be in release 1.19
- "${FILESDIR}"/${PN}-1.18-check-api-ver.patch
)
DOCS=( util/LINUX_DIST_README )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/baldurkarlsson.gpg
+
pkg_setup() {
use qt5 && python-single-r1_pkg_setup
}
src_unpack() {
+ if use verify-sig; then
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+ fi
+
# Do not unpack the swig sources here. CMake will do that if
# required.
unpack ${P}.tar.gz
@@ -130,6 +134,11 @@ src_prepare() {
sed -i "s|../build/lib|${BUILD_DIR}/lib|" \
"${S}"/docs/conf.py \
|| die 'sed patch doc sys.path failed'
+
+ # Bug #836235
+ sed -i '/#include <stdarg/i #include <time.h>' \
+ "${S}"/renderdoc/os/os_specific.h \
+ || die 'sed include time.h failed'
}
src_configure() {
@@ -162,6 +171,10 @@ src_configure() {
use qt5 && mycmakeargs+=(
-DPython3_EXECUTABLE="${PYTHON}"
-DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz
+
+ # Needed after qtchooser removal, bug #836474.
+ -DQMAKE_QT5_COMMAND="$(qt5_get_bindir)"/qmake
+
-DQRENDERDOC_ENABLE_PYSIDE2=$(usex pyside2)
)
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
deleted file mode 100644
index a98e2469b295..000000000000
--- a/media-gfx/slic3r/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX slic3r-1.3.0-boost-1.73.patch 3740 BLAKE2B d4327b262928a13ea05cc9edd3db647f35f4216e801a557cdebc76638fd3c7c3c6d20a91e5081a629b3c2e18ea8bf9bdba08db05a64fa05e3153ebd7ccea92b5 SHA512 ea45b30181a91576b9a4b23d45dd0bf39c3c18d80579b28d8dcf54af29daa9d8fef7ec59cfed30f2278da070c965943740255508cf1bbd910a1b3ac7b08b0461
-AUX slic3r-1.3.0-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
-AUX slic3r-1.3.0-use-system-clipper.patch 1047 BLAKE2B ee3948e20db610d67c4132732037a1769a620a975b58cf54d02f9a3aae2b7d09a5d9bd5d9ae4ee24d0150b6dec7d13183838116877591adcc08436a2793e186c SHA512 b6a6ed07d57ef6b0f71c2f267543018cd3460fa03fc8ed8f5a9b8cdcd782edd191f35c73ed1829d4bb32da9460d076574f49af0b2e1cd19bc195c0ac3c0fdd25
-AUX slic3r-1.3.0-wayland.patch 224 BLAKE2B 71395194aed291387897eae5e5af8d58bee0e4af45075588fc456b733710716e5dc743ea2e734c816e32b2593f395dc7c7a23c92c75e466e54f49e1fbb4a6d9e SHA512 17f662af318c23dab656c8ae320ef9823bfc6cf71f9b33bdfebeaf9c53fec299062bf76b89b7422628072cc055b4790083491300a5d205f06cd1e6625654463e
-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-r4.ebuild 2744 BLAKE2B b6bf1e8b964ef877d3b11e02bc636265820a36dcacfa84a912fe5533511feb205e1ee91657da46ce73160279fb6cdc9a44c054edbbb2e6bf485c94382f80cd3f SHA512 353b0cb79919ad64ef7dd90d29372e9d7e796102b9759adf80bf7bd8f3bef82e2e4260083448d6568e07643f3e0c47f800f69996db231f58e99c83461756ae36
-EBUILD slic3r-1.3.1_pre20200824-r1.ebuild 2790 BLAKE2B f5e2c5025897e11c2bc2461cbff0e2def7048e14d5c4ccca2d2f339fbfd6496ac1656eb4e73288a829610a3a46a33975b9756ce7bcd67ba206457b55a75e85c4 SHA512 95adcb2ac4c75c4c3f355b95011b5f91e37021f1ed22616388aaf8209948c54de4316cc76c1ed556a6b08aa8ac1cbb8e06f4e83e8d352fd7cf30a9814d1f1845
-EBUILD slic3r-9999.ebuild 2735 BLAKE2B 894915ab09547a131f4435a786202d06b30c039c88dcee170c0cbbe2409a213079c1b10bf8d9e4aaca69b4bc69e2aa95b0aff0cd5eb251fdd7d91c74c5e530b8 SHA512 9c825dc76c78a3aa48f7dbbffdd974cef17077b37558209daa3512aa0957abd1748a1e61a8e6b253835be2ccfdb166ffa93e5b1f64852d5956b15a200d9c9152
-MISC metadata.xml 977 BLAKE2B bc737e1255bc2204a44b1aee62c3e342a8ac0c4844279c5cf404f52f6f052c6da1fcd490fc12cfa5d2158f79dd921c9c6bd29a4b99d7c62ff77a55d4073666fe SHA512 f09ea6f44124ebc24aa0d009d48af8d40190fa0d1fd9c2935341ac84f4ae900619b9557718fc38f399fcbdbe42924afc4ff6fb4676e19b3a3bfec6a7e9f6d1a6
diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch b/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch
deleted file mode 100644
index 6b710a18f3af..000000000000
--- a/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- a/xs/src/boost/nowide/cstdlib.hpp
-+++ b/xs/src/boost/nowide/cstdlib.hpp
-@@ -8,7 +8,7 @@
- #ifndef BOOST_NOWIDE_CSTDLIB_HPP_INCLUDED
- #define BOOST_NOWIDE_CSTDLIB_HPP_INCLUDED
-
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/system.hpp>
-
- #endif
---- a/xs/src/admesh/stl.h
-+++ b/xs/src/admesh/stl.h
-@@ -26,11 +26,6 @@
- #include <stdio.h>
- #include <stdint.h>
- #include <stddef.h>
--#include <boost/detail/endian.hpp>
--
--#ifndef BOOST_LITTLE_ENDIAN
--#error "admesh works correctly on little endian machines only!"
--#endif
-
- #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
- #include "windows.h"
-
---- a/xs/src/libslic3r/PrintObject.cpp
-+++ b/xs/src/libslic3r/PrintObject.cpp
-@@ -2,11 +2,14 @@
- #include "BoundingBox.hpp"
- #include "ClipperUtils.hpp"
- #include "Geometry.hpp"
-+#include <boost/bind/bind.hpp>
- #include <algorithm>
- #include <vector>
-
- namespace Slic3r {
-
-+using boost::placeholders::_1;
-+
- PrintObject::PrintObject(Print* print, ModelObject* model_object, const BoundingBoxf3 &modobj_bbox)
- : layer_height_spline(model_object->layer_height_spline),
- typed_slices(false),
---- a/xs/src/libslic3r/GCodeSender.hpp
-+++ b/xs/src/libslic3r/GCodeSender.hpp
-@@ -7,13 +7,17 @@
- #include <string>
- #include <vector>
- #include <boost/asio.hpp>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
-+#include <boost/core/noncopyable.hpp>
- #include <boost/thread.hpp>
-
- namespace Slic3r {
-
- namespace asio = boost::asio;
-
-+using boost::placeholders::_1;
-+using boost::placeholders::_2;
-+
- class GCodeSender : private boost::noncopyable {
- public:
- GCodeSender();
---- a/xs/src/libslic3r/TriangleMesh.cpp
-+++ b/xs/src/libslic3r/TriangleMesh.cpp
-@@ -14,6 +14,7 @@
- #include <stdexcept>
- #include <boost/config.hpp>
- #include <boost/nowide/convert.hpp>
-+#include <boost/bind/bind.hpp>
-
- #ifdef SLIC3R_DEBUG
- #include "SVG.hpp"
-@@ -21,6 +22,8 @@
-
- namespace Slic3r {
-
-+using boost::placeholders::_1;
-+
- TriangleMesh::TriangleMesh()
- : repaired(false)
- {
---- a/xs/src/libslic3r/Config.cpp
-+++ b/xs/src/libslic3r/Config.cpp
-@@ -14,6 +14,7 @@
- #include <boost/foreach.hpp>
- #include <boost/lexical_cast.hpp>
- #include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/property_tree/ini_parser.hpp>
- #include <boost/property_tree/ptree.hpp>
---- a/xs/src/libslic3r/SLAPrint.cpp
-+++ b/xs/src/libslic3r/SLAPrint.cpp
-@@ -7,9 +7,12 @@
- #include <iostream>
- #include <complex>
- #include <cstdio>
-+#include <boost/bind/bind.hpp>
-
- namespace Slic3r {
-
-+using boost::placeholders::_1;
-+
- void
- SLAPrint::slice()
- {
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -22,7 +22,7 @@
- set(Boost_USE_STATIC_LIBS ON)
- set(Boost_USE_STATIC_RUNTIME ON)
- set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
--find_package(Boost COMPONENTS system thread filesystem)
-+find_package(Boost MODULE REQUIRED)
-
- set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/../xs/src/)
-
---- a/xs/src/libslic3r/GCodeTimeEstimator.cpp
-+++ b/xs/src/libslic3r/GCodeTimeEstimator.cpp
-@@ -1,9 +1,12 @@
- #include "GCodeTimeEstimator.hpp"
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include <cmath>
-
- namespace Slic3r {
-
-+using boost::placeholders::_1;
-+using boost::placeholders::_2;
-+
- void
- GCodeTimeEstimator::parse(const std::string &gcode)
- {
---- a/xs/Build.PL
-+++ b/xs/Build.PL
-@@ -142,7 +142,7 @@
- }
- # In order to generate the -l switches we need to know how Boost libraries are named
- my $have_boost = 0;
--my @boost_libraries = qw(system thread filesystem); # we need these
-+my @boost_libraries = qw(system thread filesystem nowide); # we need these
- # check without explicit lib path (works on Linux)
- if (! $mswin) {
- $have_boost = 1
diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-no-locallib.patch b/media-gfx/slic3r/files/slic3r-1.3.0-no-locallib.patch
deleted file mode 100644
index 8cb7fd6d16dc..000000000000
--- a/media-gfx/slic3r/files/slic3r-1.3.0-no-locallib.patch
+++ /dev/null
@@ -1,609 +0,0 @@
-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);
diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch b/media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch
deleted file mode 100644
index 9f9a5ef2fbd0..000000000000
--- a/media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/xs/src/libslic3r/ClipperUtils.hpp
-+++ b/xs/src/libslic3r/ClipperUtils.hpp
-@@ -2,7 +2,7 @@
- #define slic3r_ClipperUtils_hpp_
-
- #include <libslic3r.h>
--#include "clipper.hpp"
-+#include <polyclipping/clipper.hpp>
- #include "ExPolygon.hpp"
- #include "Polygon.hpp"
- #include "Surface.hpp"
---- a/xs/src/libslic3r/Geometry.cpp
-+++ b/xs/src/libslic3r/Geometry.cpp
-@@ -3,7 +3,7 @@
- #include "ExPolygon.hpp"
- #include "Line.hpp"
- #include "PolylineCollection.hpp"
--#include "clipper.hpp"
-+#include <polyclipping/clipper.hpp>
- #include <algorithm>
- #include <cassert>
- #include <cmath>
---- a/xs/src/libslic3r/SVG.hpp
-+++ b/xs/src/libslic3r/SVG.hpp
-@@ -2,7 +2,7 @@
- #define slic3r_SVG_hpp_
-
- #include "libslic3r.h"
--#include "clipper.hpp"
-+#include <polyclipping/clipper.hpp>
- #include "ExPolygon.hpp"
- #include "Line.hpp"
- #include "TriangleMesh.hpp"
---- a/xs/xsp/Clipper.xsp
-+++ b/xs/xsp/Clipper.xsp
-@@ -2,7 +2,7 @@
-
- %{
- #include <xsinit.h>
--#include "clipper.hpp"
-+#include <polyclipping/clipper.hpp>
- #include "libslic3r/ClipperUtils.hpp"
- %}
-
diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch b/media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch
deleted file mode 100644
index d2dea0208d86..000000000000
--- a/media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/slic3r.pl
-+++ b/slic3r.pl
-@@ -20,6 +20,7 @@ use Time::HiRes qw(gettimeofday tv_interval);
- $|++;
- binmode STDOUT, ':utf8';
- binmode STDERR, ':utf8';
-+$ENV{GDK_BACKEND} = 'x11';
-
- our %opt = ();
- my %cli_options = ();
diff --git a/media-gfx/slic3r/files/slic3r-1.3.1_pre20200824-boost-1.73.patch b/media-gfx/slic3r/files/slic3r-1.3.1_pre20200824-boost-1.73.patch
deleted file mode 100644
index d2aafecdb1e9..000000000000
--- a/media-gfx/slic3r/files/slic3r-1.3.1_pre20200824-boost-1.73.patch
+++ /dev/null
@@ -1,133 +0,0 @@
---- a/xs/src/libslic3r/TriangleMesh.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
-+++ b/xs/src/libslic3r/TriangleMesh.cpp (date 1607117258000)
-@@ -22,6 +22,8 @@
-
- namespace Slic3r {
-
-+using boost::placeholders::_1;
-+
- TriangleMesh::TriangleMesh()
- : repaired(false)
- {
-
---- a/src/CMakeLists.txt (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
-+++ b/src/CMakeLists.txt (date 1607117046000)
-@@ -115,7 +115,7 @@
- find_package(Threads REQUIRED)
-
- set(Boost_NO_BOOST_CMAKE ON)
--find_package(Boost REQUIRED COMPONENTS system thread filesystem)
-+find_package(Boost REQUIRED COMPONENTS system thread filesystem nowide)
-
- set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/../xs/src/)
- set(GUI_LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/GUI/)
-
---- a/xs/src/libslic3r/PrintObject.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
-+++ b/xs/src/libslic3r/PrintObject.cpp (date 1607117227000)
-@@ -4,12 +4,15 @@
- #include "Geometry.hpp"
- #include "Log.hpp"
- #include "TransformationMatrix.hpp"
-+#include <boost/bind/bind.hpp>
- #include <algorithm>
- #include <vector>
- #include <limits>
-
- namespace Slic3r {
-
-+using boost::placeholders::_1;
-+
- PrintObject::PrintObject(Print* print, ModelObject* model_object, const BoundingBoxf3 &modobj_bbox)
- : layer_height_spline(model_object->layer_height_spline),
- typed_slices(false),
-
---- a/xs/src/libslic3r/GCodeSender.hpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
-+++ b/xs/src/libslic3r/GCodeSender.hpp (date 1607117162000)
-@@ -7,7 +7,7 @@
- #include <string>
- #include <vector>
- #include <boost/asio.hpp>
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include <boost/thread.hpp>
- #include <boost/core/noncopyable.hpp>
-
-@@ -15,6 +15,9 @@
-
- namespace asio = boost::asio;
-
-+using boost::placeholders::_1;
-+using boost::placeholders::_2;
-+
- class GCodeSender : private boost::noncopyable {
- public:
- GCodeSender();
-
---- a/xs/src/libslic3r/SLAPrint.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
-+++ b/xs/src/libslic3r/SLAPrint.cpp (date 1607117248000)
-@@ -7,9 +7,12 @@
- #include <iostream>
- #include <complex>
- #include <cstdio>
-+#include <boost/bind/bind.hpp>
-
- namespace Slic3r {
-
-+using boost::placeholders::_1;
-+
- void
- SLAPrint::slice()
- {
-
---- a/xs/src/libslic3r/ConfigBase.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
-+++ b/xs/src/libslic3r/ConfigBase.cpp (date 1607117107000)
-@@ -16,7 +16,7 @@
- #include <boost/config.hpp>
- #include <boost/foreach.hpp>
- #include <boost/lexical_cast.hpp>
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/property_tree/ini_parser.hpp>
- #include <boost/property_tree/ptree.hpp>
-
---- a/xs/src/libslic3r/GCodeTimeEstimator.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
-+++ b/xs/src/libslic3r/GCodeTimeEstimator.cpp (date 1607117194000)
-@@ -1,9 +1,12 @@
- #include "GCodeTimeEstimator.hpp"
--#include <boost/bind.hpp>
-+#include <boost/bind/bind.hpp>
- #include <cmath>
-
- namespace Slic3r {
-
-+using boost::placeholders::_1;
-+using boost::placeholders::_2;
-+
- void
- GCodeTimeEstimator::parse(const std::string &gcode)
- {
-
---- a/xs/Build.PL (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
-+++ b/xs/Build.PL (date 1607117077000)
-@@ -151,7 +151,7 @@
- }
- # In order to generate the -l switches we need to know how Boost libraries are named
- my $have_boost = 0;
--my @boost_libraries = qw(system thread filesystem); # we need these
-+my @boost_libraries = qw(system thread filesystem nowide); # we need these
- # check without explicit lib path (works on Linux)
- if (! $mswin) {
- $have_boost = 1
-
---- a/xs/src/libslic3r/SupportMaterial.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
-+++ b/xs/src/libslic3r/SupportMaterial.cpp (date 1607118181000)
-@@ -4,6 +4,8 @@
- namespace Slic3r
- {
-
-+using boost::placeholders::_1;
-+
- PolylineCollection _fill_surface(Fill *fill, Surface *surface)
- {
- PolylineCollection ps;
diff --git a/media-gfx/slic3r/metadata.xml b/media-gfx/slic3r/metadata.xml
deleted file mode 100644
index b3782764dd77..000000000000
--- a/media-gfx/slic3r/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>3dprint@gentoo.org</email>
- <name>Gentoo 3D Printer Project</name>
- </maintainer>
- <maintainer type="project">
- <email>perl@gentoo.org</email>
- <name>Gentoo Perl Project</name>
- </maintainer>
- <longdescription lang="en">
- Slic3r is the tool you need to convert a 3D model into printing instructions for your 3D printer. It cuts the model into horizontal slices (layers), generates toolpaths to fill them and calculates the amount of material to be extruded.
- </longdescription>
- <upstream>
- <bugs-to>https://github.com/slic3r/Slic3r/issues</bugs-to>
- <doc>https://manual.slic3r.org/</doc>
- <remote-id type="cpe">cpe:/a:slic3r:libslic3r</remote-id>
- <remote-id type="github">slic3r/Slic3r</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-gfx/slic3r/slic3r-1.3.0-r4.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r4.ebuild
deleted file mode 100644
index d11cc8ac32fd..000000000000
--- a/media-gfx/slic3r/slic3r-1.3.0-r4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop perl-module
-
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
-HOMEPAGE="https://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"
-RESTRICT="!test? ( test )"
-
-# check Build.PL for dependencies
-RDEPEND="!=dev-lang/perl-5.16*
- >=dev-libs/boost-1.73[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/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-libs/clipper
- 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-${PV}"
-PERL_S="${S}/xs"
-
-PATCHES=(
- "${FILESDIR}/${P}-boost-1.73.patch"
- "${FILESDIR}/${P}-no-locallib.patch"
- "${FILESDIR}/${P}-use-system-clipper.patch"
- "${FILESDIR}/${P}-wayland.patch"
-)
-
-src_prepare() {
- sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
- perl-module_src_prepare
-}
-
-src_configure() {
- cd "${PERL_S}" || die
- SLIC3R_NO_AUTO=1 perl-module_src_configure
-}
-
-src_test() {
- cd "${PERL_S}" || die
- perl-module_src_test
-}
-
-src_install() {
- cd "${PERL_S}" || die
- 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" "${EPREFIX}/usr/bin/slic3r.pl"
-
- make_desktop_entry "slic3r.pl --gui %F" \
- Slic3r \
- "${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \
- "Graphics;3DGraphics;Engineering;Development"
- popd || die
-}
diff --git a/media-gfx/slic3r/slic3r-1.3.1_pre20200824-r1.ebuild b/media-gfx/slic3r/slic3r-1.3.1_pre20200824-r1.ebuild
deleted file mode 100644
index 9353f8c2f830..000000000000
--- a/media-gfx/slic3r/slic3r-1.3.1_pre20200824-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop perl-module
-
-COMMIT="92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d"
-
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
-HOMEPAGE="https://slic3r.org"
-SRC_URI="https://github.com/slic3r/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gui test"
-RESTRICT="!test? ( test )"
-
-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/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-libs/clipper
- >=dev-perl/ExtUtils-CppGuess-0.70.0
- >=dev-perl/ExtUtils-Typemaps-Default-1.50.0
- >=dev-perl/ExtUtils-XSpp-0.170.0
- >=virtual/perl-ExtUtils-MakeMaker-6.800.0
- >=virtual/perl-ExtUtils-ParseXS-3.220.0
- test? ( virtual/perl-Test-Harness
- virtual/perl-Test-Simple )"
-
-BDEPEND=">=dev-perl/Module-Build-0.380.0
- >=dev-perl/Module-Build-WithXSpp-0.140.0
- dev-perl/Devel-CheckLib"
-
-S="${WORKDIR}/Slic3r-92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d"
-PERL_S="${S}/xs"
-
-PATCHES=(
- "${FILESDIR}/${P}-boost-1.73.patch"
- "${FILESDIR}/${PN}-1.3.0-no-locallib.patch"
- "${FILESDIR}/${PN}-1.3.0-use-system-clipper.patch"
-)
-
-src_prepare() {
- sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
- perl-module_src_prepare
-}
-
-src_configure() {
- cd "${PERL_S}" || die
- SLIC3R_NO_AUTO=1 perl-module_src_configure
-}
-
-src_test() {
- cd "${PERL_S}" || die
- perl-module_src_test
-}
-
-src_install() {
- cd "${PERL_S}" || die
- 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" "${EPREFIX}/usr/bin/slic3r.pl"
-
- make_desktop_entry "slic3r.pl --gui %F" \
- Slic3r \
- "${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \
- "Graphics;3DGraphics;Engineering;Development"
- popd || die
-}
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
deleted file mode 100644
index 3d418fb61e12..000000000000
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop git-r3 perl-module
-
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
-HOMEPAGE="https://slic3r.org"
-EGIT_REPO_URI="https://github.com/Slic3r/Slic3r.git"
-S="${WORKDIR}/slic3r-${PV}"
-
-LICENSE="AGPL-3 CC-BY-3.0"
-SLOT="0"
-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/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-libs/clipper
- 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
- )
-"
-BDEPEND="${DEPEND}
- dev-perl/Module-Build
-"
-
-PERL_S="${S}/xs"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.3.0-no-locallib.patch"
- "${FILESDIR}/${PN}-1.3.0-use-system-clipper.patch"
-)
-
-src_unpack() {
- git-r3_src_unpack
-}
-
-src_prepare() {
- sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
- perl-module_src_prepare
-}
-
-src_configure() {
- cd "${PERL_S}" || die
- SLIC3R_NO_AUTO=1 perl-module_src_configure
-}
-
-src_test() {
- cd "${PERL_S}" || die
- perl-module_src_test
-}
-
-src_install() {
- cd "${PERL_S}" || die
- 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" "${EPREFIX}/usr/bin/slic3r.pl"
-
- make_desktop_entry "slic3r.pl --gui %F" \
- Slic3r \
- "${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \
- "Graphics;3DGraphics;Engineering;Development"
- popd || die
-}
diff --git a/media-gfx/solvespace/Manifest b/media-gfx/solvespace/Manifest
index a729ae9c9dd7..6f96c45aed2e 100644
--- a/media-gfx/solvespace/Manifest
+++ b/media-gfx/solvespace/Manifest
@@ -1,5 +1,5 @@
AUX solvespace-3.0-use-system-mimalloc.patch 2152 BLAKE2B 242a4aefcf2ebf985503b6574218ea01fa5b8e79c7e1c7f34e42ebbf5d01611d8b46fc27cf59e6cffc61c466bcba7f593686a4bed08dd90b96dcfe9a73ae5191 SHA512 460a94a41b8517e8ced27edde6a456b4d5bce03b72887a89022866fecc7e18930c81549542850a2b184a7f6282b754e3ab8292b542684dbde5986e3c36b29ef2
DIST libdxfrw-0.6.3-0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz 691804 BLAKE2B 84c90a591fac71144e9e13aace7c1a00dfc1bd6f27b0bcde6b60541f5b5d3ccc04ae1c759f60cb467445cc884840d04bf4613b5cc553fbbf6951cac33a084d50 SHA512 9ab498aa7f369be79d800e8ca5ec55fa54be79d0778937b81d4c8da776b3419cb8a75400b54b205efc338da32e2e781afd0bed1bd8efed1a0b212dc8682a2615
DIST solvespace-3.0.tar.gz 2734860 BLAKE2B 2efc9d98723c60abdb1c76ac086c40ff2f9b8bc9c315978731493d115fa55a080176ef48d930e3b503c0de0604dbfd2bc3bd99a581f359eb07a23034d09f84bf SHA512 b07b41fac1d67c5350082600a2f09e3fa611a1273e0c93ff93d11a7a1dbf550ff33465686eaff04fdb8350d1fe854ab0301d8723ef31cc65c687ba59cb89187f
-EBUILD solvespace-3.0-r2.ebuild 1779 BLAKE2B 9ac561521b7855fcba7b38927dc2462d0fd8d0c57b0b2a83bf70d23cb931acff0c0aa2d58dc2d8aae3a191ef94630e3d460d4e4b0508b73af86df37667532ec0 SHA512 efc9140670390479eaed870dd8692e22971fde34ec237dc8103ffe83bbf51d3c75eee56f68fdcd5c14bd55a72a4b81150613e75b45d5242954b8284c08af448e
-MISC metadata.xml 1412 BLAKE2B 9e8d28887adc01031dcda861ff81f3305ccec16dac607507e5bf6709224a8a5ce386747aac79a3751f7f53705be33df437dca0a537e6c9ba0ac7970ec0d387c6 SHA512 3a45ceecede799ac90d01444561fb204e4f0b44fe9d5a309c00373e970b42a9f776a50fd5f54af744fb94fe28507b91686b5e9e3dda6175c93a8971710b7af1d
+EBUILD solvespace-3.0-r2.ebuild 1784 BLAKE2B 63e353dded404bd4da4cb553b814ed796f23b84ded26b8dd8b73cdb7ed728c2b2d001327a26796b6202524e816ca3dae4828e25cf7cddee0a9c03a02eddd7360 SHA512 920222da69909c7f04e52527cff1147f1b1a285ad8a42174a1d875e34adcbd3951d5b2eecf4be126382cabb422d997f4e8844e676c2f5847de2ad3730cd0cf5b
+MISC metadata.xml 1123 BLAKE2B e9b80ae49c4d1861fac55a6a933563cb8b532fb8ccbdc3a4becb37e1150d2a100614dab283a9cf6b8476bf19a57f690849ca4e1cf0be2e7f59cbb33e598ae61c SHA512 cdb9bbea6e382fb18bd604a2816884c6f8d6c03f899689626b428610e62367931f2cdbd5d8e3a8f44f6ae7a39f23323d1057bcb2f17a478386b08d28d20795d7
diff --git a/media-gfx/solvespace/metadata.xml b/media-gfx/solvespace/metadata.xml
index b4f0df25e5ad..d39d759d5cca 100644
--- a/media-gfx/solvespace/metadata.xml
+++ b/media-gfx/solvespace/metadata.xml
@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>ktrace@yandex.ru</email>
- <name>Victor Kustov</name>
- </maintainer>
<maintainer type="person">
<email>matthew@gentoo.org</email>
<name>Matthew Smith</name>
</maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
<longdescription lang="en">
Solvespace is a parametric 2D/3D CAD tool. Applications include:
- modeling 3d parts — draw with extrudes, revolves, and Boolean (union / difference) operations
diff --git a/media-gfx/solvespace/solvespace-3.0-r2.ebuild b/media-gfx/solvespace/solvespace-3.0-r2.ebuild
index e9fa8cb53fc6..c05f7413d643 100644
--- a/media-gfx/solvespace/solvespace-3.0-r2.ebuild
+++ b/media-gfx/solvespace/solvespace-3.0-r2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/solvespace/solvespace/archive/v${PV}.tar.gz -> ${P}.
# + libdxfrw (GPL-2+)
IUSE="openmp"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~x86"
LICENSE="BitstreamVera GPL-2+ GPL-3+"
SLOT="0"
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index c5d511f87561..80ae9334b4bd 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -11,5 +11,5 @@ AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a65571
DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18f07e8af778a63d46b94c894d9e827ed71bd89060898ecbdaebc5b4bb6e638939d7bc0dede390f7137770049f SHA512 ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b
DIST zbar-0.23.90.tar.gz 1005314 BLAKE2B 5d0c193509602dfb55741b421e1d28f1424ecec50aa3be584912544a587922c053284c41cf14ff0b4824095d0d376381ed055e7faf9ff394bd8d44fd9ed2971d SHA512 d73d71873bec68ee021997512a9edbd223f5f5fe43c66c4dd3502224ba6009be2e5e1714766cb8e1056244673e87e0939ed0319116f61d7371b5ab79fb5e04eb
EBUILD zbar-0.23.1.ebuild 5372 BLAKE2B f9dc36d7e2418baf676c04b565581800750d3da8aaf830a21b1445358522b391f7a22a8b06c76c171402a79ef3a94763316c134cdf6d8fdf5d02d3f34833677b SHA512 41142df60af20c0a6e83731f029c2e77f8b9b2a046f1ac9f52a0c97209fb35441101182a1f18d122ec6a7185681470a8327cba0efd5b8993339a3028494d4275
-EBUILD zbar-0.23.90.ebuild 5283 BLAKE2B 690468149ecd353a0477ff874215621f86be0468cd2c38624f5a52c672950be6a535d0e8f70cf04ec3afac0f464b742806196fb8a42e171dc078d3b184179044 SHA512 3974e1eccd6c2c2cf80c635c5d4fa2002f886d619ae1dc31cdfe326d62b4f89b1cc871a6060f11fd48d609971920125c2d8ad9da87f6d482ed87b628e2e7ad87
+EBUILD zbar-0.23.90.ebuild 5281 BLAKE2B 34bd1339b94f540bbcb53581fad678514437d6e9f60da233a6ab8e06a61035358641913062e61c81ebad7960aa86e018da0338c8d080fbadf5c4738c5ef91208 SHA512 aa351ab9b6dac1787e8dd21cd0406a6e3fb64e36e30c773c2d06a95dfa52b52d9f477fef2be40a28e7f1a7747230ed6f456365e1c266b0a637f2b53de7710b17
MISC metadata.xml 738 BLAKE2B a5f5f0f157f7339f3dd39dde18b79427b35c6ce0b079b1ed03a0f2de821bc14f3a9c76fbd68bfd836444a4750a604be0012e4501207e75dfe4fc39aef7e65827 SHA512 334a091fc54d950a8b3e7572af7ae9766d20fd0d49aaa9fd18f5ea75966b45a53a861e290bcf9ca0fd8cc160cba669185aa01a9c8e77a585f2cb84d10f3b1e80
diff --git a/media-gfx/zbar/zbar-0.23.90.ebuild b/media-gfx/zbar/zbar-0.23.90.ebuild
index 91cdcabb9f33..46b85c382176 100644
--- a/media-gfx/zbar/zbar-0.23.90.ebuild
+++ b/media-gfx/zbar/zbar-0.23.90.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mchehab/zbar/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg nls python qt5 static-libs test +threads v4l X xv"
REQUIRED_USE="