gentoo resync : 03.07.2021

13 files changed, 116 insertions, 24 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index bc16e67b563c..8ca7f62a19dc 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index 509b52dadd91..4c126e4d3de6 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,6 +1,6 @@
 AUX eom-1.24.0-add-gdk-includes.patch 798 BLAKE2B db2156dadd2458100624a01e0724f7520529ace1aeabf78544aa780d91fe57d8db7aee8934401ede46810a8ee8f53f26d0e7304605386fd6fba080825c70abae SHA512 3a487cbbbfd94240858cb0a7221b9515720aeaab7adea3e7dd8be2d05d0369f5d3ecd5e3afc4ceb1cda0e2aecc0c72d0cae796f70ed181a90944e3d5d76a31f2
-DIST eom-1.24.0.tar.xz 2433420 BLAKE2B 58f99ba3cf0df3594c459af691cc6ab281657facb49bc3b6101bec1718b165b72b882aabd9abac3c4981b547157aa64d2f24f174fccae06cdaa685728e49740c SHA512 17d26a9341cde0a86f8d8b65008f554398111d80f5d131441654bd9e907df9c9d696038e678aca8d7f4bd2923ff593f626735a3cc30451118818cdbebceb87ab
 DIST eom-1.24.1.tar.xz 2408284 BLAKE2B 70d660896dff42d5a91ea651697b50d4c90ced92023d5df48dfbed374c3777676f1f2dc99a0cb071a4eaa13353f31b11346136b963cf723397632cceafa64301 SHA512 70654b99f474d1b214cbbf8e799f82f3c38f47938df34cb5c8227c116b412364c568ae989b96d7082fb0d2fa319b3dba9b8dd499d19140a4d421bd09a46bffc0
-EBUILD eom-1.24.0-r2.ebuild 1666 BLAKE2B 7c8b1982b350e085321620d4e155526336e3e05b0c662e4c1547e335883f2919e4192c5836ea5b0121dc8fb64e471c3b1c26493e8cc82526b16092e71029bd5e SHA512 a88659a60d9382a6d3db22ffdb7dcf633bece393ab7d56905ef11f071487933cef476ea6af36fd1d79ed61007520e6fce38837105708f791baec892144f6a2b9
-EBUILD eom-1.24.1.ebuild 1666 BLAKE2B 6229dc67a7a2b6056387c2082e00ac37017e01b5c128f2661c1b551134f492f42a54ea18db0417cb5f170b6999b14ce277ff923ee6995ba26aa5c677696ebd77 SHA512 644cbd982fc0dedb92b03f206b416ae1b517a72540155f23117441cc61f0ef178907d13fed3c5b3c93e48c34b45c80c20b6aa740f6382aedf67f18816421ecc6
+DIST eom-1.24.2.tar.xz 2428972 BLAKE2B 871cb98c4a308dbc4821e67bae41522dbebae446e64777d764d30ded2f0637bae33cb9090e813fd7e43206ba1a436f7795684c4c5e850a242e9db96804b08e81 SHA512 38497dc5fc42340ca1b356f40eab8c14c21b1467f82ec64024d633cfb7ebfc598020b35c02eedce4f73f7a5ecb9050b0f0af4ea00279a1a5e7a627e542f34951
+EBUILD eom-1.24.1.ebuild 1664 BLAKE2B f69a83f6925e9643f21c2ea2422cb994cbf72d1b7c7150c8df82889333226da23bbece1e3bd0ce6696dfc0ad06d725417e16a67776d8a1a605002431e8725830 SHA512 07bbb77b395b797a7927d74747335c5078f8c48a6ff6ab6abcbd372ebc445a0652d95a79c2a432bb3a8c2ad97f3a104943078d7aab3eef5351e71b99bad936f1
+EBUILD eom-1.24.2.ebuild 1666 BLAKE2B 7b5622c708251e07260badd3eab440c83d185103d02c1df1d5de33fd79540086227341052681ff28201e8141f6ea0e05d9acfe74caf901071c269fc181f81e47 SHA512 bba633b98f4e2a7489ce4541dda1a384afa36c972a86c1ab5f67096286ee8174615ea2b4cc9d73328f4b20a2fc9fe9e57877e5abe2c63712ce29243d9e6441ee
 MISC metadata.xml 467 BLAKE2B 5314ab156ff29533e419e8d6b82d634bd3ffd7898e8125525d2d45460dfa464c8c9a7311f3fb69e33172b523e85816d6ecaba0487087dacafd42e31cb261e3d7 SHA512 d21cd9729f0f8bde3caec98e3a7f75de8075b129651b7c25d386cbd1cf9f4a41972f48a6addb7180ae40a0c2a626a5508dab5736ed71d60b56bdd2132d479854
diff --git a/media-gfx/eom/eom-1.24.1.ebuild b/media-gfx/eom/eom-1.24.1.ebuild
index c7ad21aa5f6f..2b3913815ccf 100644
--- a/media-gfx/eom/eom-1.24.1.ebuild
+++ b/media-gfx/eom/eom-1.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="The MATE image viewer"
diff --git a/media-gfx/eom/eom-1.24.0-r2.ebuild b/media-gfx/eom/eom-1.24.2.ebuild
index 0eaa2620b201..dc911dbc38d0 100644
--- a/media-gfx/eom/eom-1.24.0-r2.ebuild
+++ b/media-gfx/eom/eom-1.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="The MATE image viewer"
@@ -50,7 +50,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/glib-utils
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.8:*
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
 
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 4d6c3821725e..2f0560367592 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -3,13 +3,13 @@ AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941
 AUX test-exitcode.patch 1077 BLAKE2B 7e270c939a421d8c709d7e24b9628c69ec03f72431b6d783043e904ea92bba1938207d08d9275ac1b90825149c92ed48d466fd5edc03fa694fc57465ef474db7 SHA512 703fc73ea3829a8d5c6f64d0573439570300635d3543437983359afea0522c95da6c8b0f2cba3736d0f22f939aad72b4b27c648d166feed96ec6447a68f33b75
 AUX upnpc.patch 1032 BLAKE2B ffbd89511731d5e71a9568fb9578888152af50d18e443871ffde0eb0cad65a98c7561587cc4c9b288c6de158263ef4f172477ee836ab07c4a72d419521872f20 SHA512 7dec34031545e238388134166dd11ca1bf65975caab46ea308a9e36daaf1eeda71c70d260409ed3a64f277a2d65c9f1441c5af02fefa33e263906c386482e98e
 AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467
-DIST hydrus-441.tar.gz 38807432 BLAKE2B e8294a8eb4d808792f2ff50ad4776f078ba1003962b065883ec22fd68f46dc250b2bccf47005731fcc964b75e07977aed45023da1c7e4513fcfcc29d1b4d1a97 SHA512 81eeb59006644b9b33c33c8da3e003640116488509ce2e1426d2a5c0161adf208e31a45c2a5efc2902769bf91e3db56aabc6384f77e8354e0e113bcc6df3a131
 DIST hydrus-442.tar.gz 38818985 BLAKE2B 955f5d9969bd46184fbf5fb11b1bc17257d184acd34a9533a20bc35e20ff5cabcc3715ebbb39f42b926b8b00f570c7f483eed3b11472c78f82b9ceeafc3dc765 SHA512 5a78338426127b276b067b52f590e275e132ea2676a4933162183e183a015556351e13e55271240059a145627d8a2ce1f6fe1a07ef267580604e998328c5c4f6
 DIST hydrus-443.tar.gz 38823767 BLAKE2B 100b2c0650d3230b1c18e58417b731bd661fecde50ac43010bcffe3f8f5be5e0416156523a2c3b5bcc4d739a54f3c6cf21559a2be2ba1dd6fe38131d91d00bee SHA512 d18f32c2cb05ab73dcff83d1a7bad63519b84640cce2991f00623da86197ecf72ac4f3c1e064515980a56d2c415dcb90e19edeb35646701bca0f3fc0d149be1d
 DIST hydrus-444.tar.gz 38817103 BLAKE2B f9eb3dc346a1a7b8d45558ee69b0b9d2a7dbbb7018734680e9953f20ebd56209cc1874213ecf5515835f1022bf571a99543154843f7dc2b9375116db8ba080a0 SHA512 f5bc28e43a5218fce15bc9d197ebcc1f4eb47856a741ad79f59d1da2413a3e7e220381a4d8208fe880fa507e023f9c03050e46ab5214ef310d105df0d85a9682
-EBUILD hydrus-441-r1.ebuild 4177 BLAKE2B e9cd3c47b98d404239d2ea9095c99ab29ff71f4ef6b40c524e4168001b88b189d6a0d18c25362227dc179db005b2259284cadf34bbff7e4b62ef074cda9ef1ea SHA512 e39f3fb27da87c77685fc6123f7280ae7cc911c8b725d51aa2bcd78832b7ad979ff3b441d43b58dcfe39f2a8aec08fa0ddb9d9279a0e06f1c1115a0b3dbe3ec7
+DIST hydrus-445.tar.gz 38823389 BLAKE2B 3cd07a3e30e60bd8507fd58c027e5c5a96745163bd5982198448a65b957ff8f4308c9bc0ee73b883fa275689c900dff07f497634c07f4b2f7fe579e1e3d6f378 SHA512 6735468bd531786fef9a861a81ee1e34595c362450027a0c011593465ed77dc85a304a314dcb7031e30b2e90548b2497bb4f01932dc1f04e814b7dd5ae70617c
 EBUILD hydrus-442.ebuild 4177 BLAKE2B e9cd3c47b98d404239d2ea9095c99ab29ff71f4ef6b40c524e4168001b88b189d6a0d18c25362227dc179db005b2259284cadf34bbff7e4b62ef074cda9ef1ea SHA512 e39f3fb27da87c77685fc6123f7280ae7cc911c8b725d51aa2bcd78832b7ad979ff3b441d43b58dcfe39f2a8aec08fa0ddb9d9279a0e06f1c1115a0b3dbe3ec7
-EBUILD hydrus-443.ebuild 4298 BLAKE2B a60befc0402b22dcc747941da208a4a8913b217dffcd73c112f84b6085ca2723232f6d489c6a4c4aeada98f3f504b89db5eb9a82e2bc760a9787efc95c611cd9 SHA512 9b1b2bcc765bc64c9c7acc5b79ff6c982d6aa7407ace736f5179c55eb3b936456fea99b4861d97e94949c15daf0cd4d338f6ac562cf027bbecf94d20648b0602
-EBUILD hydrus-444.ebuild 4298 BLAKE2B a60befc0402b22dcc747941da208a4a8913b217dffcd73c112f84b6085ca2723232f6d489c6a4c4aeada98f3f504b89db5eb9a82e2bc760a9787efc95c611cd9 SHA512 9b1b2bcc765bc64c9c7acc5b79ff6c982d6aa7407ace736f5179c55eb3b936456fea99b4861d97e94949c15daf0cd4d338f6ac562cf027bbecf94d20648b0602
-EBUILD hydrus-9999.ebuild 4298 BLAKE2B a60befc0402b22dcc747941da208a4a8913b217dffcd73c112f84b6085ca2723232f6d489c6a4c4aeada98f3f504b89db5eb9a82e2bc760a9787efc95c611cd9 SHA512 9b1b2bcc765bc64c9c7acc5b79ff6c982d6aa7407ace736f5179c55eb3b936456fea99b4861d97e94949c15daf0cd4d338f6ac562cf027bbecf94d20648b0602
+EBUILD hydrus-443.ebuild 4300 BLAKE2B 8ff4f1287b487a1681df742f1b6ce60c9ab618a875c2b3f6cff9dbf72952c1b2ce3fcb182bc4ec082a545e17cebd74cbd3acbe53f769d2db87bd1623fc6e530b SHA512 250345b2a58b942179a2cf0dd1b2b4dab3ad1d30e73bc10eccbc33902045e5763a3cc431b49093f9e3132805058105a8458fd4020899c7b68e7a14df7687ada2
+EBUILD hydrus-444.ebuild 4300 BLAKE2B 8ff4f1287b487a1681df742f1b6ce60c9ab618a875c2b3f6cff9dbf72952c1b2ce3fcb182bc4ec082a545e17cebd74cbd3acbe53f769d2db87bd1623fc6e530b SHA512 250345b2a58b942179a2cf0dd1b2b4dab3ad1d30e73bc10eccbc33902045e5763a3cc431b49093f9e3132805058105a8458fd4020899c7b68e7a14df7687ada2
+EBUILD hydrus-445.ebuild 4238 BLAKE2B 8cd83c2af95d034e27ea5a40fad4f6d3b40d1843927642dc32df81df271ef1ba8f6383603b1ab42b21a8f9492f83837170a581838960188dd4d838ac65a28cae SHA512 e8b9f40e0069fcfa03704b6bc58091e6d2a544d009f93c2e7c5f11486a6b6ee578d5f5b058688f7c18c58338ff93e5463c8c68bc8a99aa8d7dc6d0ed0e2224f2
+EBUILD hydrus-9999.ebuild 4238 BLAKE2B 8cd83c2af95d034e27ea5a40fad4f6d3b40d1843927642dc32df81df271ef1ba8f6383603b1ab42b21a8f9492f83837170a581838960188dd4d838ac65a28cae SHA512 e8b9f40e0069fcfa03704b6bc58091e6d2a544d009f93c2e7c5f11486a6b6ee578d5f5b058688f7c18c58338ff93e5463c8c68bc8a99aa8d7dc6d0ed0e2224f2
 MISC metadata.xml 1168 BLAKE2B 6480f7938566059342a4b8eef89ee26e4f3843faab9b8c937f74e71a1a27b63630bc6e64482b7ff5ebc647c1247a030e62635a4c3a5bc42d6df87209e35ffb53 SHA512 9bb31694a8d1ce56741340431e82b0e7f35866d90dd1359062703809be331192e5ba4acca94b8c0fc146cbb6199335e724345924687c904795c3c2d0d917acb3
diff --git a/media-gfx/hydrus/hydrus-443.ebuild b/media-gfx/hydrus/hydrus-443.ebuild
index d51d23e32a5c..3ea6657aaeae 100644
--- a/media-gfx/hydrus/hydrus-443.ebuild
+++ b/media-gfx/hydrus/hydrus-443.ebuild
@@ -11,7 +11,7 @@ inherit python-single-r1 desktop optfeature
 DESCRIPTION="A booru-like media organizer for the desktop"
 HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
 
-if [ "${PV}" == "9999" ]; then
+if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
diff --git a/media-gfx/hydrus/hydrus-444.ebuild b/media-gfx/hydrus/hydrus-444.ebuild
index d51d23e32a5c..3ea6657aaeae 100644
--- a/media-gfx/hydrus/hydrus-444.ebuild
+++ b/media-gfx/hydrus/hydrus-444.ebuild
@@ -11,7 +11,7 @@ inherit python-single-r1 desktop optfeature
 DESCRIPTION="A booru-like media organizer for the desktop"
 HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
 
-if [ "${PV}" == "9999" ]; then
+if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
diff --git a/media-gfx/hydrus/hydrus-441-r1.ebuild b/media-gfx/hydrus/hydrus-445.ebuild
index 5ce5c4bdf642..2c52c2dc47e1 100644
--- a/media-gfx/hydrus/hydrus-441-r1.ebuild
+++ b/media-gfx/hydrus/hydrus-445.ebuild
@@ -10,13 +10,21 @@ inherit python-single-r1 desktop optfeature
 
 DESCRIPTION="A booru-like media organizer for the desktop"
 HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
 
 # hydrus itself is WTFPL
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-KEYWORDS="~amd64"
 IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -70,9 +78,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/upnpc.patch"
 	"${FILESDIR}/userpath-in-local-share.patch"
-	"${FILESDIR}/test-exitcode.patch"
 )
 
 src_prepare() {
diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index d51d23e32a5c..2c52c2dc47e1 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -11,7 +11,7 @@ inherit python-single-r1 desktop optfeature
 DESCRIPTION="A booru-like media organizer for the desktop"
 HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
 
-if [ "${PV}" == "9999" ]; then
+if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
@@ -78,9 +78,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/upnpc.patch"
 	"${FILESDIR}/userpath-in-local-share.patch"
-	"${FILESDIR}/test-exitcode.patch"
 )
 
 src_prepare() {
diff --git a/media-gfx/solvespace/Manifest b/media-gfx/solvespace/Manifest
index 62c2ae13bf76..9f024a5190ed 100644
--- a/media-gfx/solvespace/Manifest
+++ b/media-gfx/solvespace/Manifest
@@ -1,5 +1,9 @@
 AUX solvespace-2.3-gcc11-missing-limits-inc.patch 490 BLAKE2B f06ccd75f0973a782c01fa3f4c61c0fa8512471ee9f04140040ebf7552424c0a67d602b39a72449cb00ee7019bd6f47f8c25b7d27cf098e8c6670ec18105a3c2 SHA512 d56d529956ec37f4e84924b570cc90082f7d806ddb35297ad8e9854a50b19e15ab5d62e9a18cfdcfef2f90ca6ac669b96ee32be265a9fba79f3cfc34e186bf78
+DIST libdxfrw-0.6.3-0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz 691804 BLAKE2B 84c90a591fac71144e9e13aace7c1a00dfc1bd6f27b0bcde6b60541f5b5d3ccc04ae1c759f60cb467445cc884840d04bf4613b5cc553fbbf6951cac33a084d50 SHA512 9ab498aa7f369be79d800e8ca5ec55fa54be79d0778937b81d4c8da776b3419cb8a75400b54b205efc338da32e2e781afd0bed1bd8efed1a0b212dc8682a2615
 DIST libdxfrw-0.6.3-87ff1082f49b1286a033ac8f38fe8dde0975bb8b.tar.gz 691867 BLAKE2B bd3414930efe8cc1185a20f889dda3ec8ea46e40d3a1a4c24975683fc444161acdff576a1f40c34203e523e88bacf3841c50928340e7865650a113e65375f930 SHA512 0f8e2561887fbc5101787f0d7818328864b5c4a679ef539fcdbda8c124ab4a808663f9ba645d397f154596eab1eb7c6f0bdf3883bf6975392863e01bada3a1f0
+DIST mimalloc-2.0.1-dc6bce256d4f3ce87761f9337977dff3d8b1776c.tar.gz 912721 BLAKE2B 0129b7650303be9bd82e9a99f6a81cc5aacf93c4e2d36813520d59b61410c00c2b84979b9aa901dc9f67a88110115882987b4eceebe880c548adbab4a328c415 SHA512 bf1770ae0225207aa072a103cb13671ac8a759aeb8e81dec6b1bf4192dc87c927153c34a4d6c42075d021cdb4a294a2863e9f70eed386912ccc0699120bd967e
 DIST solvespace-2.3.tar.gz 2115940 BLAKE2B 67e2d81e0a609d0344a6f28d33a78609b01c7105785f93aa1124f0592fe0e31d4846e6dd406339b2ef2c5f3961f91302a73c5391fe2e0f435e78c3a97ed67612 SHA512 9d22e467337591cd9a4935124d18733b8337f5785ab5738f4a94300f283ffe7d313569e379ae77e509d14182ffde8c9db7beaebb46ea7c0507c6b05010fe1a56
+DIST solvespace-3.0.tar.gz 2734860 BLAKE2B 2efc9d98723c60abdb1c76ac086c40ff2f9b8bc9c315978731493d115fa55a080176ef48d930e3b503c0de0604dbfd2bc3bd99a581f359eb07a23034d09f84bf SHA512 b07b41fac1d67c5350082600a2f09e3fa611a1273e0c93ff93d11a7a1dbf550ff33465686eaff04fdb8350d1fe854ab0301d8723ef31cc65c687ba59cb89187f
 EBUILD solvespace-2.3.ebuild 1628 BLAKE2B 2763c9e29f727a538d7a3260579002e9ec9f572722c325e474a8404781173b31f69268f886d146d658ebcc62a2ce54e2cc6e35b03eec45e74c200c97ee6901f2 SHA512 57c8916c7a47cba610c7d31f94bce30e399945246c663f9341bf0bd6649488f631676b900f6ea5ab64643a4860d682166f369c52aa91e9f4a0f0901e95f63c18
+EBUILD solvespace-3.0.ebuild 2270 BLAKE2B b81c6f7a928eba221c9fa70a4ce8906593a1e21bdd72e4c12d57c1aee075e84967243746bb85f4d553227c95fb7c218a5d40b6d22ee3d5571496686b76dbaf43 SHA512 8da0d687b1393fec5c0e36cf8fc9910974370eed29eaf846477d5f65396b746869b006e7f0425fe4cdba85791156227fad3c24a28bb3477b1ce002b1cb2c8ea5
 MISC metadata.xml 1285 BLAKE2B 334458d57d900cc6ceff7f5f45452eed1a501ca0b4349f6b12a9b3ffcead7e82ba7af35e5afaf262858f95deaafce6d011f6e94e8848a5d9a82ada0699643d11 SHA512 eabafc95662dfc2f842ed84b909fcb547630ddb5cbcb3fca12cc73a3eaa120e6292c105c7aff7a7d32fc2582161f39b11070122cd83f9296d211f02e389ad4e1
diff --git a/media-gfx/solvespace/solvespace-3.0.ebuild b/media-gfx/solvespace/solvespace-3.0.ebuild
new file mode 100644
index 000000000000..3aec8b3130f2
--- /dev/null
+++ b/media-gfx/solvespace/solvespace-3.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DXFRW_COMMIT="0b7b7b709d9299565db603f878214656ef5e9ddf"
+#DXFRW_COMMIT="87ff1082f49b1286a033ac8f38fe8dde0975bb8b"
+DXFRW_PV="0.6.3"
+DXFRW_P="libdxfrw-${DXFRW_PV}-${DXFRW_COMMIT}"
+
+MIMALLOC_COMMIT="dc6bce256d4f3ce87761f9337977dff3d8b1776c"
+MIMALLOC_PV="2.0.1"
+MIMALLOC_P="mimalloc-${MIMALLOC_PV}-${MIMALLOC_COMMIT}"
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Parametric 2d/3d CAD"
+HOMEPAGE="http://solvespace.com"
+SRC_URI="https://github.com/solvespace/solvespace/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/solvespace/libdxfrw/archive/${DXFRW_COMMIT}.tar.gz -> ${DXFRW_P}.tar.gz
+	https://github.com/microsoft/mimalloc/archive/${MIMALLOC_COMMIT}.tar.gz -> ${MIMALLOC_P}.tar.gz"
+
+IUSE="openmp"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="dev-cpp/atkmm:=
+	dev-cpp/glibmm:=
+	dev-cpp/gtkmm:3.0=
+	dev-cpp/pangomm:1.4
+	dev-libs/glib:2
+	dev-libs/json-c:=
+	dev-libs/libsigc++:=
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libglvnd
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/cairo
+	x11-libs/gtk+:3"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+# NOTE: please keep commit hash actually when version up
+GIT_COMMIT_HASH="0e0b0252e23dd5bd4ae82ababcc54c44aee036d6"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	rm -r "extlib/libdxfrw" || die  "rm extlib/libdxfrw failed"
+	mv "${WORKDIR}/libdxfrw-${DXFRW_COMMIT}" "extlib/libdxfrw" || die "move libdxfrw-${DXFRW_COMMIT} failed"
+	rm -rf "extlib/mimalloc" || die  "rm extlib/mimalloc failed"
+	mv "${WORKDIR}/mimalloc-${MIMALLOC_COMMIT}" "extlib/mimalloc" || die "move mimalloc-${MIMALLOC_COMMIT} failed"
+	sed -i '/include(GetGitCommitHash)/d' CMakeLists.txt || die 'remove GetGitCommitHash by sed failed'
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}"
+	)
+	if ! use openmp ; then
+		mycmakeargs+=("-DENABLE_OPENMP=OFF")
+	else
+		mycmakeargs+=("-DENABLE_OPENMP=ON")
+	fi
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index 11ab37fb4811..451abc1e5470 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -2,5 +2,5 @@ AUX xsane-0.999-lcms2.patch 11788 BLAKE2B 2a7f40e1d430b74f29c201e850ee5520395a6a
 DIST xsane-0.998-patches-2.tar.xz 54804 BLAKE2B d5eb339f5d5d9eb61d213ca37e31e8b36df03f271f86a0c5f924286b39c9d2f47416512243ff3ad07e2f9d0ac4e3f0a73346ced1ce74ac17dbb0c9aaf6ae3c89 SHA512 973ccac2fe3b6089049c1c5ba3e4cb0db29fdc79de372f8a7b461ee108e5bfc3f4a84997552fc3d3b651bbe9f98d247a5974d90e8949089b2ea52118eab6ad1f
 DIST xsane-0.999.tar.gz 2950621 BLAKE2B a8490981b7da497934f0334874fb65d2d3f2a7d9153825544672a39780bd8c4bfabee6bda134bd7b37b07947d1f01f283fb7242552b0e6342cab5a70484a5488 SHA512 73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed
 DIST xsane-256x256.png 18478 BLAKE2B 5661d68fab2c5f7219f0de9e2c2c811ef5fba6f5472e85d98f6f3a10bb058c1d26597d15c2aa8ab59c52060a62b571aafc2daafcef4bb8edd0445cf875ec0ca3 SHA512 7bd63a701a4776b395689799ad98b7619917a9b40367c980bebaa116e6c5c2bfeffb8b996a8295b07f3483aa689c9040d8a68bb21376af65b1c0e8f69294f2e5
-EBUILD xsane-0.999-r3.ebuild 2221 BLAKE2B c232d21f6edcf1ba2449b60a519692b7b24044e7dc104b2b45e9b258390f255e81eeadd473ebb53dbd974d6519292f8f7890845732e54cd20b103d6d28b93c90 SHA512 ad59eb75376b490b7a73c4059d1b48e9aaf32d3e6afe6be4d6fea75bf090ed287aca0115c4eab1643c49c10cf7baa8a83ecacff512453bb368a2dc271dc69186
+EBUILD xsane-0.999-r3.ebuild 2230 BLAKE2B 3f551b4c5f4fe40c7c131ccdabcb78af3578c78ccd4d7e2c3b3f0418d1c1c562976725d8caccf005e829ca9e07c3bbb932e674eb7329108191609e5b3d0b28a6 SHA512 c9ffdc873aedb507595b5b3d239101d9690c3a5020f13608d1c66b833a46fa90dd4175ee172ff746ff2df21581841f2d4b55eea045a86bb4822f2c3d4b9e5d4e
 MISC metadata.xml 370 BLAKE2B 800a5ac17360397771b4021cdd36777cd546b8f32132f5edc380cec9c1aa41d10daa1d67da06230b447f5115c6296e36aa1ca881f923d3238ace1f8a48584891 SHA512 c00b90634545ce757206fa7d23b345e11afe409813f16312bb4dea494f8d0342996f994623dec0939bc40e13395a1be8a40b014064dcc039f669efcd7fd7b19f
diff --git a/media-gfx/xsane/xsane-0.999-r3.ebuild b/media-gfx/xsane/xsane-0.999-r3.ebuild
index f6c406558796..a6324b3b8c28 100644
--- a/media-gfx/xsane/xsane-0.999-r3.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools desktop epatch l10n toolchain-funcs
+inherit autotools desktop epatch strip-linguas toolchain-funcs
 
 DESCRIPTION="Graphical scanning frontend"
 HOMEPAGE="http://www.xsane.org/"