gentoo resync : 20.03.2022

7 files changed, 168 insertions, 88 deletions

diff --git a/media-gfx/solvespace/Manifest b/media-gfx/solvespace/Manifest
index 6603861e83da..d44e67f03d32 100644
--- a/media-gfx/solvespace/Manifest
+++ b/media-gfx/solvespace/Manifest
@@ -1,9 +1,7 @@
-AUX solvespace-2.3-gcc11-missing-limits-inc.patch 490 BLAKE2B f06ccd75f0973a782c01fa3f4c61c0fa8512471ee9f04140040ebf7552424c0a67d602b39a72449cb00ee7019bd6f47f8c25b7d27cf098e8c6670ec18105a3c2 SHA512 d56d529956ec37f4e84924b570cc90082f7d806ddb35297ad8e9854a50b19e15ab5d62e9a18cfdcfef2f90ca6ac669b96ee32be265a9fba79f3cfc34e186bf78
+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 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 2330 BLAKE2B a75e5bbe011ae3f4a6a835b54c0211ea2ee18fce7c47777bd842b79b66a0558ce450e80f0bb92ad31effcd6763304a69d4581c600227f5ce2a3bbe8aed497a90 SHA512 c89ce7412a40b0c91b13a34e461c7754f335ce5a45c7f8890b08de6bee67e60bea2f5de993f98b071e765d1762ce2c512438e8d647c2cb9b1a711bf674b52f80
-MISC metadata.xml 1286 BLAKE2B daef7a13ee9a34ffddfc1faf94210260d62c87c520e00ca510ee2970a05ad4fdda2c09d5b50fee275436db430ed7157aca8e335b3d94c8020d530aeb5a18d3cc SHA512 5ad429d9405de73e01659919586155c5869eee2f1439787d7b43be54283e5c551dd4a759584030ffa72eae16d3261c236365e4d45fb45e52640a27b645cbbea5
+EBUILD solvespace-3.0-r1.ebuild 1786 BLAKE2B 303a7d12a3ef91fc0520417d6ced7a21bdcfac79a2ef8e3e2d1a942809eea4dafa3cfd6b76a2e81e3f2debf0b5eeabc8aaecf41aae6dd21442b2b71b5a12412c SHA512 87e7e999c21d3817abc917803fdafd4e4a6724859d6cd3453a3a55c111c8435b4f57524aea844fe191ad21a522b9a00be4cbad288fa9ffe21154acde81e0ea64
+EBUILD solvespace-3.0.ebuild 2469 BLAKE2B f8d06068c8f416024b405da6211997f96cf1bda775d5babbfa56037f3464f6f89734ed0d1d390d07790e82afedd69a22f7d6c47eb7f848414c3ef3de0cea73af SHA512 365c4c221b45fe1c1a89752b3a27b8569fc9dd532c263861b18b5e7df1140e3f856b8f99a4da9095367ea11ef8d374595f38ec54bf456eeb9b0b0632b974c4b9
+MISC metadata.xml 1412 BLAKE2B 9e8d28887adc01031dcda861ff81f3305ccec16dac607507e5bf6709224a8a5ce386747aac79a3751f7f53705be33df437dca0a537e6c9ba0ac7970ec0d387c6 SHA512 3a45ceecede799ac90d01444561fb204e4f0b44fe9d5a309c00373e970b42a9f776a50fd5f54af744fb94fe28507b91686b5e9e3dda6175c93a8971710b7af1d
diff --git a/media-gfx/solvespace/files/solvespace-2.3-gcc11-missing-limits-inc.patch b/media-gfx/solvespace/files/solvespace-2.3-gcc11-missing-limits-inc.patch
deleted file mode 100644
index ecf02fc5c01e..000000000000
--- a/media-gfx/solvespace/files/solvespace-2.3-gcc11-missing-limits-inc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/790776
---- a/src/exportvector.cpp
-+++ b/src/exportvector.cpp
-@@ -4,6 +4,7 @@
- // Copyright 2008-2013 Jonathan Westhues.
- //-----------------------------------------------------------------------------
- #include <libdxfrw.h>
-+#include <limits>
- #include "solvespace.h"
- 
- VectorFileWriter::~VectorFileWriter() {
---- a/src/importdxf.cpp
-+++ b/src/importdxf.cpp
-@@ -1,3 +1,5 @@
-+#include <limits>
-+
- #include "solvespace.h"
- #include "libdxfrw.h"
- #include "libdwgr.h"
diff --git a/media-gfx/solvespace/files/solvespace-3.0-use-system-mimalloc.patch b/media-gfx/solvespace/files/solvespace-3.0-use-system-mimalloc.patch
new file mode 100644
index 000000000000..485a870449b2
--- /dev/null
+++ b/media-gfx/solvespace/files/solvespace-3.0-use-system-mimalloc.patch
@@ -0,0 +1,74 @@
+From eb8cd7a379503a0206d6ff43a2ce0749a32f2a37 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matthew@gentoo.org>
+Date: Fri, 11 Mar 2022 18:11:27 +0000
+Subject: [PATCH] build: Use system mimalloc
+
+---
+ CMakeLists.txt     |  8 --------
+ src/CMakeLists.txt | 12 +++---------
+ 2 files changed, 3 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bdd3670..93485d7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -173,14 +173,6 @@ endif()
+ message(STATUS "Using in-tree libdxfrw")
+ add_subdirectory(extlib/libdxfrw)
+ 
+-message(STATUS "Using in-tree mimalloc")
+-set(MI_OVERRIDE OFF CACHE BOOL "")
+-set(MI_BUILD_SHARED OFF CACHE BOOL "")
+-set(MI_BUILD_OBJECT OFF CACHE BOOL "")
+-set(MI_BUILD_TESTS OFF CACHE BOOL "")
+-add_subdirectory(extlib/mimalloc EXCLUDE_FROM_ALL)
+-set(MIMALLOC_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/extlib/mimalloc/include)
+-
+ if(WIN32 OR APPLE)
+     # On Win32 and macOS we use vendored packages, since there is little to no benefit
+     # to trying to find system versions. In particular, trying to link to libraries from
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5ac7b41..9f4e2f7 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -55,10 +55,7 @@ target_include_directories(slvs
+ 
+ target_link_libraries(slvs
+     ${util_LIBRARIES}
+-    mimalloc-static)
+-
+-add_dependencies(slvs
+-    mimalloc-static)
++    mimalloc)
+ 
+ set_target_properties(slvs PROPERTIES
+     PUBLIC_HEADER ${CMAKE_SOURCE_DIR}/include/slvs.h
+@@ -213,9 +210,6 @@ add_library(solvespace-core STATIC
+     ${solvespace_core_HEADERS}
+     ${solvespace_core_SOURCES})
+ 
+-add_dependencies(solvespace-core
+-    mimalloc-static)
+-
+ target_link_libraries(solvespace-core
+     ${OpenMP_CXX_LIBRARIES}
+     dxfrw
+@@ -223,7 +217,7 @@ target_link_libraries(solvespace-core
+     ${ZLIB_LIBRARY}
+     ${PNG_LIBRARY}
+     ${FREETYPE_LIBRARY}
+-    mimalloc-static)
++    mimalloc)
+ 
+ if(Backtrace_FOUND)
+     target_link_libraries(solvespace-core
+@@ -430,4 +424,4 @@ if(APPLE)
+             COMMENT "Bundling executable solvespace-cli"
+             VERBATIM)
+     endif()
+-endif()
+\ No newline at end of file
++endif()
+-- 
+2.35.1
+
diff --git a/media-gfx/solvespace/metadata.xml b/media-gfx/solvespace/metadata.xml
index 854484aea793..b4f0df25e5ad 100644
--- a/media-gfx/solvespace/metadata.xml
+++ b/media-gfx/solvespace/metadata.xml
@@ -5,6 +5,10 @@
         <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>
diff --git a/media-gfx/solvespace/solvespace-2.3.ebuild b/media-gfx/solvespace/solvespace-2.3.ebuild
deleted file mode 100644
index 25975546f2b6..000000000000
--- a/media-gfx/solvespace/solvespace-2.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DXFRW_COMMIT="87ff1082f49b1286a033ac8f38fe8dde0975bb8b"
-DXFRW_PV="0.6.3"
-DXFRW_P="libdxfrw-${DXFRW_PV}-${DXFRW_COMMIT}"
-
-inherit cmake-utils gnome2-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-cpp/gtkmm:2.4=
-	dev-cpp/pangomm:1.4
-	dev-libs/json-c:=
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# NOTE: please keep commit hash actually when version up
-GIT_COMMIT_HASH="4d1e1341d926ac356b295d5cc3d61c7a6cd7d07d"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3-gcc11-missing-limits-inc.patch
-)
-
-src_prepare() {
-	rm -r "extlib/libdxfrw" || die  "rm extlib/libdxfrw failed"
-	mv "${WORKDIR}/libdxfrw-${DXFRW_COMMIT}" "extlib/libdxfrw" || die "move libdxfrw-${DXFRW_COMMIT} failed"
-	sed -i '/include(GetGitCommitHash)/d' CMakeLists.txt || die 'remove GetGitCommitHash by sed failed'
-	# fixed in master already
-	sed -i -e 's/CHAR_WIDTH/CHAR_WIDTH_/' src/textwin.cpp src/toolbar.cpp src/win32/w32main.cpp src/ui.h || die 'sed failed'
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/solvespace/solvespace-3.0-r1.ebuild b/media-gfx/solvespace/solvespace-3.0-r1.ebuild
new file mode 100644
index 000000000000..73b691667314
--- /dev/null
+++ b/media-gfx/solvespace/solvespace-3.0-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# solvespace's libdxfrw is quite heavily modified and incompatible with
+# the upstream libdxfrw.
+DXFRW_COMMIT="0b7b7b709d9299565db603f878214656ef5e9ddf"
+DXFRW_PV="0.6.3"
+DXFRW_P="libdxfrw-${DXFRW_PV}-${DXFRW_COMMIT}"
+
+inherit cmake toolchain-funcs xdg
+
+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"
+
+# licenses
+# + SolveSpace (GPL-3+)
+# |- Bitstream Vera (BitstreamVera)
+# + libdxfrw (GPL-2+)
+
+IUSE="openmp"
+KEYWORDS="~amd64"
+LICENSE="BitstreamVera GPL-2+ GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	dev-cpp/atkmm:0
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:3.0
+	dev-cpp/pangomm:1.4
+	dev-libs/glib:2
+	dev-libs/json-c:=
+	dev-libs/libsigc++:2
+	dev-libs/libspnav
+	dev-libs/mimalloc:=
+	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}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.0-use-system-mimalloc.patch )
+
+# This is shown to the user in the UI and --version.
+MY_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
+	mv "${WORKDIR}"/libdxfrw-${DXFRW_COMMIT} extlib/libdxfrw || die
+
+	sed -i '/include(GetGitCommitHash)/d' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_OPENMP=$(usex openmp)
+		-DGIT_COMMIT_HASH=${MY_HASH}
+	)
+
+	cmake_src_configure
+}
diff --git a/media-gfx/solvespace/solvespace-3.0.ebuild b/media-gfx/solvespace/solvespace-3.0.ebuild
index 81b40ddc7973..071b43161fe7 100644
--- a/media-gfx/solvespace/solvespace-3.0.ebuild
+++ b/media-gfx/solvespace/solvespace-3.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=7
@@ -19,9 +19,15 @@ SRC_URI="https://github.com/solvespace/solvespace/archive/v${PV}.tar.gz -> ${P}.
 	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"
 
+# licenses
+# + SolveSpace (GPL-3+)
+# |- Bitstream Vera (BitstreamVera)
+# + libdxfrw (GPL-2+)
+# + mimalloc (MIT)
+
 IUSE="openmp"
 KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
+LICENSE="BitstreamVera GPL-2+ GPL-3+ MIT"
 SLOT="0"
 
 RDEPEND="dev-cpp/atkmm:=