From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- media-gfx/solvespace/Manifest | 4 +- media-gfx/solvespace/solvespace-3.0-r1.ebuild | 78 ----------------------- media-gfx/solvespace/solvespace-3.0-r2.ebuild | 77 ++++++++++++++++++++++ media-gfx/solvespace/solvespace-3.0.ebuild | 92 --------------------------- 4 files changed, 78 insertions(+), 173 deletions(-) delete mode 100644 media-gfx/solvespace/solvespace-3.0-r1.ebuild create mode 100644 media-gfx/solvespace/solvespace-3.0-r2.ebuild delete mode 100644 media-gfx/solvespace/solvespace-3.0.ebuild (limited to 'media-gfx/solvespace') diff --git a/media-gfx/solvespace/Manifest b/media-gfx/solvespace/Manifest index d44e67f03d32..a729ae9c9dd7 100644 --- a/media-gfx/solvespace/Manifest +++ b/media-gfx/solvespace/Manifest @@ -1,7 +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 mimalloc-2.0.1-dc6bce256d4f3ce87761f9337977dff3d8b1776c.tar.gz 912721 BLAKE2B 0129b7650303be9bd82e9a99f6a81cc5aacf93c4e2d36813520d59b61410c00c2b84979b9aa901dc9f67a88110115882987b4eceebe880c548adbab4a328c415 SHA512 bf1770ae0225207aa072a103cb13671ac8a759aeb8e81dec6b1bf4192dc87c927153c34a4d6c42075d021cdb4a294a2863e9f70eed386912ccc0699120bd967e DIST solvespace-3.0.tar.gz 2734860 BLAKE2B 2efc9d98723c60abdb1c76ac086c40ff2f9b8bc9c315978731493d115fa55a080176ef48d930e3b503c0de0604dbfd2bc3bd99a581f359eb07a23034d09f84bf SHA512 b07b41fac1d67c5350082600a2f09e3fa611a1273e0c93ff93d11a7a1dbf550ff33465686eaff04fdb8350d1fe854ab0301d8723ef31cc65c687ba59cb89187f -EBUILD solvespace-3.0-r1.ebuild 1786 BLAKE2B 303a7d12a3ef91fc0520417d6ced7a21bdcfac79a2ef8e3e2d1a942809eea4dafa3cfd6b76a2e81e3f2debf0b5eeabc8aaecf41aae6dd21442b2b71b5a12412c SHA512 87e7e999c21d3817abc917803fdafd4e4a6724859d6cd3453a3a55c111c8435b4f57524aea844fe191ad21a522b9a00be4cbad288fa9ffe21154acde81e0ea64 -EBUILD solvespace-3.0.ebuild 2469 BLAKE2B f8d06068c8f416024b405da6211997f96cf1bda775d5babbfa56037f3464f6f89734ed0d1d390d07790e82afedd69a22f7d6c47eb7f848414c3ef3de0cea73af SHA512 365c4c221b45fe1c1a89752b3a27b8569fc9dd532c263861b18b5e7df1140e3f856b8f99a4da9095367ea11ef8d374595f38ec54bf456eeb9b0b0632b974c4b9 +EBUILD solvespace-3.0-r2.ebuild 1779 BLAKE2B 9ac561521b7855fcba7b38927dc2462d0fd8d0c57b0b2a83bf70d23cb931acff0c0aa2d58dc2d8aae3a191ef94630e3d460d4e4b0508b73af86df37667532ec0 SHA512 efc9140670390479eaed870dd8692e22971fde34ec237dc8103ffe83bbf51d3c75eee56f68fdcd5c14bd55a72a4b81150613e75b45d5242954b8284c08af448e MISC metadata.xml 1412 BLAKE2B 9e8d28887adc01031dcda861ff81f3305ccec16dac607507e5bf6709224a8a5ce386747aac79a3751f7f53705be33df437dca0a537e6c9ba0ac7970ec0d387c6 SHA512 3a45ceecede799ac90d01444561fb204e4f0b44fe9d5a309c00373e970b42a9f776a50fd5f54af744fb94fe28507b91686b5e9e3dda6175c93a8971710b7af1d diff --git a/media-gfx/solvespace/solvespace-3.0-r1.ebuild b/media-gfx/solvespace/solvespace-3.0-r1.ebuild deleted file mode 100644 index 73b691667314..000000000000 --- a/media-gfx/solvespace/solvespace-3.0-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# 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-r2.ebuild b/media-gfx/solvespace/solvespace-3.0-r2.ebuild new file mode 100644 index 000000000000..e9fa8cb53fc6 --- /dev/null +++ b/media-gfx/solvespace/solvespace-3.0-r2.ebuild @@ -0,0 +1,77 @@ +# 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[X] + dev-cpp/pangomm:1.4 + dev-libs/glib:2 + dev-libs/json-c:= + dev-libs/libsigc++:2 + dev-libs/libspnav[X] + dev-libs/mimalloc:= + media-libs/fontconfig + media-libs/freetype:2[X] + media-libs/libpng:0= + sys-libs/zlib + virtual/opengl + x11-libs/cairo[X] + x11-libs/gtk+:3[X] +" +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 deleted file mode 100644 index 071b43161fe7..000000000000 --- a/media-gfx/solvespace/solvespace-3.0.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2022 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" - -# licenses -# + SolveSpace (GPL-3+) -# |- Bitstream Vera (BitstreamVera) -# + libdxfrw (GPL-2+) -# + mimalloc (MIT) - -IUSE="openmp" -KEYWORDS="~amd64 ~x86" -LICENSE="BitstreamVera GPL-2+ GPL-3+ MIT" -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 - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} -- cgit v1.2.3