From 34dea8e38f88007799629d0a56b12dec480b1d21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Jun 2021 14:45:01 +0100 Subject: gentoo resync : 20.06.2021 --- media-gfx/Manifest.gz | Bin 37837 -> 37828 bytes media-gfx/digikam/Manifest | 2 +- media-gfx/digikam/digikam-7.2.0-r1.ebuild | 149 +++++++++ media-gfx/digikam/digikam-7.2.0.ebuild | 149 --------- media-gfx/fbida/Manifest | 2 +- media-gfx/fbida/fbida-2.14-r2.ebuild | 2 +- media-gfx/freecad/Manifest | 6 +- media-gfx/freecad/freecad-0.19.1-r1.ebuild | 286 ++++++++++++++++++ media-gfx/freecad/freecad-0.19.1.ebuild | 286 ------------------ media-gfx/freecad/freecad-0.19.2-r1.ebuild | 335 +++++++++++++++++++++ media-gfx/freecad/freecad-0.19.2.ebuild | 335 --------------------- media-gfx/freecad/freecad-9999.ebuild | 4 +- media-gfx/krita/Manifest | 3 + .../files/krita-4.4.5-pykrita-crash-on-exit.patch | 55 ++++ media-gfx/krita/krita-4.4.5.ebuild | 129 ++++++++ media-gfx/prusaslicer/Manifest | 2 +- media-gfx/prusaslicer/prusaslicer-2.3.1-r1.ebuild | 87 ++++++ media-gfx/prusaslicer/prusaslicer-2.3.1.ebuild | 87 ------ media-gfx/slic3r/Manifest | 6 +- media-gfx/slic3r/slic3r-1.3.0-r3.ebuild | 114 ------- media-gfx/slic3r/slic3r-1.3.0-r4.ebuild | 114 +++++++ .../slic3r/slic3r-1.3.1_pre20200824-r1.ebuild | 114 +++++++ media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild | 114 ------- media-gfx/slic3r/slic3r-9999.ebuild | 2 +- media-gfx/tachyon/Manifest | 2 +- media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild | 23 +- 26 files changed, 1298 insertions(+), 1110 deletions(-) create mode 100644 media-gfx/digikam/digikam-7.2.0-r1.ebuild delete mode 100644 media-gfx/digikam/digikam-7.2.0.ebuild create mode 100644 media-gfx/freecad/freecad-0.19.1-r1.ebuild delete mode 100644 media-gfx/freecad/freecad-0.19.1.ebuild create mode 100644 media-gfx/freecad/freecad-0.19.2-r1.ebuild delete mode 100644 media-gfx/freecad/freecad-0.19.2.ebuild create mode 100644 media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch create mode 100644 media-gfx/krita/krita-4.4.5.ebuild create mode 100644 media-gfx/prusaslicer/prusaslicer-2.3.1-r1.ebuild delete mode 100644 media-gfx/prusaslicer/prusaslicer-2.3.1.ebuild delete mode 100644 media-gfx/slic3r/slic3r-1.3.0-r3.ebuild create mode 100644 media-gfx/slic3r/slic3r-1.3.0-r4.ebuild create mode 100644 media-gfx/slic3r/slic3r-1.3.1_pre20200824-r1.ebuild delete mode 100644 media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index c38316006767..ed307662dd36 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 22af407af180..7da8a3f91e44 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,4 +1,4 @@ AUX digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch 1560 BLAKE2B dd2d9995787593f736f406566131af29573df097801f2c9b9eec12947838bf748c697bf6ab75d69f72359a1783d18fde994b4899861065d4d10dab100e0edf44 SHA512 eb1d1c4bff3dcc7e1d03069591ad8d48a3947ee962757baccf70e2e6c7577f6d52a4ae527af20d88aa24b66c0b1705367f67b7e3da70b19825a57def7371420a DIST digikam-7.2.0.tar.xz 255278796 BLAKE2B 5ccc6c6d1f3ce8d83746a1022dcf22b11b87af354f93f0b872a713f438d1bd2ee3f8e59d6206cd83dbbcaf1a8f2568ad0920d887b11d65864802f7eb2b02ba90 SHA512 2908a802fda84caf6b398a5dc328d2e9c00ab68776bde4620db1cb981995879e89d590520bf855471c968f065951280f863620641ccf945c43704e6cf3c0abd7 -EBUILD digikam-7.2.0.ebuild 4062 BLAKE2B 5badb6043df3445d528d1a732b493225b0448ffcf4591adafe6dc4bba876f064b56a2d94b59b9cbef768c8c93f2ba7b248f01c8bf918835fd7856825802c4b2b SHA512 324af3b2328b65f0ec72cdcfe2c459d151997b674f8b7754cb63f7126f876c7a7e5e4bc3cd8071c4ec32bfbdc14603e7548051ac5d7c4dbc137df9139b98c47a +EBUILD digikam-7.2.0-r1.ebuild 4065 BLAKE2B 034fc3c95d581820b0df33dd88a98a80dc781d156d339ad0afa360f1add02fe42fb571d45039a0f408a514d128aab0ef2e57dd38e24ca43513146e6dacd2de32 SHA512 b7d9e49414c02e40c9f0c66e74f4a4830653b499e5d29a84018e7a3df1acdbcc3969a79c08c5c00bd1e91c1ca4311408d8e669752accf95874d8a30ba73a71ed MISC metadata.xml 1097 BLAKE2B 1870f4bef0643db48fa2e6241f25d33c718010556b79bb54339f4ff9a13d7d005cea8e358e83d54ee94860b191969c834b9e5fd8152a17d7a5cc464a6813000e SHA512 25c2fcb533b644cf4aa376518a77f35bab0676c6f8853998f50e1eebbb2de20ca49e02fc110b1d6f55d2502f4e353803f12a2b336b98d85321b891a42ba16ccd diff --git a/media-gfx/digikam/digikam-7.2.0-r1.ebuild b/media-gfx/digikam/digikam-7.2.0-r1.ebuild new file mode 100644 index 000000000000..93f92877fffe --- /dev/null +++ b/media-gfx/digikam/digikam-7.2.0-r1.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KFMIN=5.74.0 +QTMIN=5.15.2 +inherit ecm kde.org toolchain-funcs + +if [[ ${KDE_BUILD_TYPE} != live ]]; then + MY_P=${PN}-${PV/_/-} + if [[ ${PV} =~ rc[0-9]*$ ]]; then + SRC_URI="mirror://kde/unstable/${PN}/" + else + SRC_URI="mirror://kde/stable/${PN}/${PV}/" + fi + SRC_URI+="${MY_P}.tar.xz" + KEYWORDS="amd64 x86" + S="${WORKDIR}/${MY_P}" +fi + +DESCRIPTION="Digital photo management application" +HOMEPAGE="https://www.digikam.org/" + +LICENSE="GPL-2" +SLOT="5" +IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X" + +# bug 366505 +RESTRICT+=" test" + +BDEPEND=" + >=dev-util/cmake-3.14.3 + sys-devel/gettext + panorama? ( + sys-devel/bison + sys-devel/flex + ) +" +COMMON_DEPEND=" + dev-libs/expat + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5[-gles2-only] + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5[mysql?] + >=dev-qt/qtwebengine-${QTMIN}:5[widgets] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=dev-qt/qtxmlpatterns-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + >=media-gfx/exiv2-0.27:= + media-libs/lcms:2 + media-libs/liblqr + media-libs/libpng:0= + >=media-libs/opencv-3.3.0:=[contrib,contribdnn] + media-libs/tiff:0 + virtual/jpeg:0 + addressbook? ( + >=kde-apps/akonadi-contacts-19.04.3:5 + >=kde-frameworks/kcontacts-${KFMIN}:5 + ) + calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 ) + gphoto2? ( media-libs/libgphoto2:= ) + heif? ( media-libs/x265:= ) + imagemagick? ( media-gfx/imagemagick:= ) + lensfun? ( media-libs/lensfun ) + marble? ( + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=kde-apps/marble-19.04.3:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + ) + mediaplayer? ( + media-libs/qtav[opengl(+)] + media-video/ffmpeg:= + ) + opengl? ( + >=dev-qt/qtopengl-${QTMIN}:5 + virtual/opengl + ) + panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) + scanner? ( >=kde-apps/libksane-19.04.3:5 ) + semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 ) + X? ( + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libX11 + ) +" +DEPEND="${COMMON_DEPEND} + dev-cpp/eigen:3 + dev-libs/boost[threads(+)] +" +RDEPEND="${COMMON_DEPEND} + mysql? ( virtual/mysql[server(+)] ) + panorama? ( media-gfx/hugin ) +" + +PATCHES=( "${FILESDIR}"/${P}-qt-5.15.2-after-f8ad329f.patch ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + ecm_pkg_pretend +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + ecm_pkg_setup +} + +# FIXME: Unbundle libraw (libs/rawengine/libraw) +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=OFF # bug 698192 + -DENABLE_APPSTYLES=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON + -DENABLE_QWEBENGINE=ON + -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) + $(cmake_use_find_package calendar KF5CalendarCore) + $(cmake_use_find_package gphoto2 Gphoto2) + $(cmake_use_find_package heif X265) + $(cmake_use_find_package imagemagick ImageMagick) + $(cmake_use_find_package lensfun LensFun) + $(cmake_use_find_package marble Marble) + -DENABLE_MEDIAPLAYER=$(usex mediaplayer) + $(cmake_use_find_package mediaplayer QtAV) + -DENABLE_MYSQLSUPPORT=$(usex mysql) + -DENABLE_INTERNALMYSQL=$(usex mysql) + $(cmake_use_find_package opengl OpenGL) + $(cmake_use_find_package panorama KF5ThreadWeaver) + $(cmake_use_find_package scanner KF5Sane) + $(cmake_use_find_package semantic-desktop KF5FileMetaData) + $(cmake_use_find_package X X11) + ) + + ecm_src_configure +} diff --git a/media-gfx/digikam/digikam-7.2.0.ebuild b/media-gfx/digikam/digikam-7.2.0.ebuild deleted file mode 100644 index 84cafa4714eb..000000000000 --- a/media-gfx/digikam/digikam-7.2.0.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.74.0 -QTMIN=5.15.2 -inherit ecm kde.org toolchain-funcs - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - MY_P=${PN}-${PV/_/-} - if [[ ${PV} =~ rc[0-9]*$ ]]; then - SRC_URI="mirror://kde/unstable/${PN}/" - else - SRC_URI="mirror://kde/stable/${PN}/${PV}/" - fi - SRC_URI+="${MY_P}.tar.xz" - KEYWORDS="amd64 x86" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Digital photo management application" -HOMEPAGE="https://www.digikam.org/" - -LICENSE="GPL-2" -SLOT="5" -IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X" - -# bug 366505 -RESTRICT+=" test" - -BDEPEND=" - >=dev-util/cmake-3.14.3 - sys-devel/gettext - panorama? ( - sys-devel/bison - sys-devel/flex - ) -" -COMMON_DEPEND=" - dev-libs/expat - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[-gles2-only] - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5[mysql?] - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=dev-qt/qtxmlpatterns-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=media-gfx/exiv2-0.27:= - media-libs/lcms:2 - media-libs/liblqr - media-libs/libpng:0= - >=media-libs/opencv-3.3.0:=[contrib,contribdnn] - media-libs/tiff:0 - virtual/jpeg:0 - addressbook? ( - >=kde-apps/akonadi-contacts-19.04.3:5 - >=kde-frameworks/kcontacts-${KFMIN}:5 - ) - calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 ) - gphoto2? ( media-libs/libgphoto2:= ) - heif? ( media-libs/x265:= ) - imagemagick? ( media-gfx/imagemagick:= ) - lensfun? ( media-libs/lensfun ) - marble? ( - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=kde-apps/marble-19.04.3:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - ) - mediaplayer? ( - media-libs/qtav[opengl(+)] - media-video/ffmpeg:= - ) - opengl? ( - >=dev-qt/qtopengl-${QTMIN}:5 - virtual/opengl - ) - panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) - scanner? ( >=kde-apps/libksane-19.04.3:5 ) - semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - ) -" -DEPEND="${COMMON_DEPEND} - dev-cpp/eigen:3 - dev-libs/boost[threads] -" -RDEPEND="${COMMON_DEPEND} - mysql? ( virtual/mysql[server(+)] ) - panorama? ( media-gfx/hugin ) -" - -PATCHES=( "${FILESDIR}"/${P}-qt-5.15.2-after-f8ad329f.patch ) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - ecm_pkg_pretend -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - ecm_pkg_setup -} - -# FIXME: Unbundle libraw (libs/rawengine/libraw) -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=OFF # bug 698192 - -DENABLE_APPSTYLES=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON - -DENABLE_QWEBENGINE=ON - -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) - $(cmake_use_find_package calendar KF5CalendarCore) - $(cmake_use_find_package gphoto2 Gphoto2) - $(cmake_use_find_package heif X265) - $(cmake_use_find_package imagemagick ImageMagick) - $(cmake_use_find_package lensfun LensFun) - $(cmake_use_find_package marble Marble) - -DENABLE_MEDIAPLAYER=$(usex mediaplayer) - $(cmake_use_find_package mediaplayer QtAV) - -DENABLE_MYSQLSUPPORT=$(usex mysql) - -DENABLE_INTERNALMYSQL=$(usex mysql) - $(cmake_use_find_package opengl OpenGL) - $(cmake_use_find_package panorama KF5ThreadWeaver) - $(cmake_use_find_package scanner KF5Sane) - $(cmake_use_find_package semantic-desktop KF5FileMetaData) - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -} diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest index 70232401be92..ae7e9276f6ea 100644 --- a/media-gfx/fbida/Manifest +++ b/media-gfx/fbida/Manifest @@ -5,6 +5,6 @@ AUX fbida-2.14-fno-common.patch 1148 BLAKE2B 108c21e732afaebe6183835732341b814b1 AUX ida-desktop.patch 384 BLAKE2B 627319b163e62af11acc2c0957254cc671145b9df22f27af8988e5f0bcdf383f7cf2ad4fa7b7c97acfbba3181081ee1c025c4b3c82e99bfd7fe4efe69edd59c0 SHA512 0e14a3b848774d1538e309a9c8a8f0445a870db21723d11d0c39d86760ccb9c6f9a5f08ec75016875b2867c2d2075b59aad0fa810621f2c2afcccd14fef26737 DIST fbida-2.14.tar.gz 296826 BLAKE2B 0015b426c5deaf72737a52bddb065e7d0cb804ea97157dded522061d8fabb5c632d5e66b1ef1b4e75b355537ef4f4e603f3a877e2ef92d1581eaa4791ab5be99 SHA512 8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc819e53f904c90beef821ecf3539236563644c28e3ad3c7dbf861b140c820be649305a658b3613433 SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3 -EBUILD fbida-2.14-r2.ebuild 2497 BLAKE2B b59b1db3a8372c464fb47af583256d587a854c1dc0c2edef8c53d0b539b797c0a68be9e6b594c0b059642af4bb9a9f828c18b537f81f7d35272e67631f00dc2f SHA512 6214d851d61a7a91d31f5fced8b4e8094edcbae3fd9a5b8159678651312f071b0b9789221d012b637bf3cc66a3406c0e406d832d1c9fc2f2c142bd6a82713b73 +EBUILD fbida-2.14-r2.ebuild 2503 BLAKE2B a234de029f42c658501d7745e08fe5972ff237a9d83dd491b62758c1895684da41262e417fb0a3b929e3389d0fe711ad4552d95902abb16cd203291e8e859a2a SHA512 de7bb3bf09313c66fa5616d451cea3f4d37feb3ce86111886baed2cb575437526d3d9ee1906d00c2694aba1008a14abc299633aee2b3512f11966f11951d6314 EBUILD fbida-9999.ebuild 1349 BLAKE2B b011518d4f9816d0440b1bfd853fe97514e236fa20fb5eee942924b7e30751b981e0eb13a9e819627dff1af7b866b10c3712cbe0554d30e96e3bf5e7fddaa285 SHA512 10d5b89d83f020f3c14a9a68c622a96cd864ef8081b8163967938bacf592d1594ee8c09ff248515de246835a0a4e4fb78a768590f459bf53883011bede177ca0 MISC metadata.xml 395 BLAKE2B c51bbf0a7dc30596e65875c667f819332a547600b256f8ce75defd435677a36a0a3b0ede7cc4f9abf983890e34116ad11fa202f2b491b95605432a9f934e9fd7 SHA512 a8408235a641c85cb2c3e0fe141b7a590d52b5000888e1f753f6155257f669219cab6ddedf690a66ac5fc11d500fe8d270cdde36bbae31e2637e0c6ae413728a diff --git a/media-gfx/fbida/fbida-2.14-r2.ebuild b/media-gfx/fbida/fbida-2.14-r2.ebuild index 0a911ca59a57..89a36b7d618f 100644 --- a/media-gfx/fbida/fbida-2.14-r2.ebuild +++ b/media-gfx/fbida/fbida-2.14-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI=" " LICENSE="GPL-2 IJG" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp" REQUIRED_USE=" ghostscript? ( tiff ) diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index ff916287a1e2..b5cfcf8fd671 100644 --- a/media-gfx/freecad/Manifest +++ b/media-gfx/freecad/Manifest @@ -7,7 +7,7 @@ AUX freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.pa AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088 DIST freecad-0.19.1.tar.gz 296983463 BLAKE2B de6592474c34c5643ba7f63d6223bf7b2fcee87ebf226727e242ff3f56f363562dd0bae8cb6b3203d978d998b70985777ca93b938c0fc01822e8927cd79f6118 SHA512 5134fba99448c509f0761d62b07f1bbd3183108761f41178b38f24d5ba26558608d7d7b00009d03ba097a50cc6fe047bbd57872b32a1d55b3526d18c19ae6393 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf SHA512 420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72 -EBUILD freecad-0.19.1.ebuild 9240 BLAKE2B f8dd7d7a0a04699a2fef44fbb204f5ba95b304aa851743aba899a1a80228bd8896c8ca9d20fe85ea4ebaf6e38fab5c94db619aa12c1cecb7b8534514b138ecca SHA512 2a9a5edc12a38413043f57762d6e1d8b622abbaa594f27db7711388b055f02b247854e56d2a92612165e35360f82e285cf924947c6bbf675b9dd95063012338f -EBUILD freecad-0.19.2.ebuild 11022 BLAKE2B bebf8ded5e6a01c7ecf6fbfccd7fd6021515c635bccee5cdb6cdbfb816f1760acc2d456acd7cda5250f67a5e1bad1eb9b0ba99e0ff33ccdbbbd868f4856a6b23 SHA512 ba650e428be060f07252cfa7b96772a072841ceae2db29dc26f5600926eb40470f7f34f78fb537d7de851bdc5a6d76f8128fe23259ffe44466b614f529d08c02 -EBUILD freecad-9999.ebuild 10976 BLAKE2B e6e2b1dcd160d1c8c43d7525c87f2e4f19da7d0e531625db52d23920fbb037b4a0f913c1183a1830eb03e998ee8a5da40facdb26e398252e98829c26b843ae7f SHA512 bc6917cb9c6c739e25575b23b5fecde0fbada03f34a072f10cdde0bd1ebaf7a16f1fcdf767513956f240b3d539c44e2c88728e66dfaaddd3247ba954b53b6832 +EBUILD freecad-0.19.1-r1.ebuild 9245 BLAKE2B 882d13a380200fa0e366203f6c3278e2117044461bd4023f1c7effba670476b50507bd153f108e9d0e586960a4a4324bac580674e7fbf001d565dc0013224b62 SHA512 e034af0baf4885d3e9ddc013851f7d2f0debd93b74fca3ec04482364317e24034e853cc727eb0d47b4e83ebcd804ccf468413399c61b2c444719de22330676a1 +EBUILD freecad-0.19.2-r1.ebuild 11027 BLAKE2B 9918728707242994694f58e391501b0971487211a392df7eb00d05501e328a3216117643d1c02c75a3404e11e9a97563704ea38e3b2455ea975e1300745c3065 SHA512 7d8ef879b92364aa5c1db878b9f6a159074d9b95c642e9a194faabf06365a1b0711dc5e534d0c3e3159790d80bd182daa1c99a0388f8886bf24dd3ac39930e85 +EBUILD freecad-9999.ebuild 10981 BLAKE2B 224900d8ca24f2a1875e6075ae3d39b8f3d9b1e5207d5f1ac0540a0b360931ad539b46210a58ca23b052db7726d2c45bc67f0ca4b47a2b6f000bf57eedae6e70 SHA512 e82b798ff1699389e5711e71f64f324de74c24db9ea30d7fb0f41e271f50d50b95cac8ffe0031649d1e506a35baabca74217cecc8320e502c15d6884f93e46a9 MISC metadata.xml 3728 BLAKE2B dfe01a38234955bbea4ebc4d561fa15d06548f80338ace10091b8c8e5ab485532e462ad8ea35d52552fb87d18be05bc10953d100389cd4302e07adbb2cbc8a9a SHA512 c1c6693f824aaf9ace443bd5001a581187a4dbbb134a18454ef96d5dbd674b98284136d021f04316de0e0d8400bdb3e7f0dab5722e1ed0d45b33f0263c8ae6d3 diff --git a/media-gfx/freecad/freecad-0.19.1-r1.ebuild b/media-gfx/freecad/freecad-0.19.1-r1.ebuild new file mode 100644 index 000000000000..95e44586e4c4 --- /dev/null +++ b/media-gfx/freecad/freecad-0.19.1-r1.ebuild @@ -0,0 +1,286 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# vtk needs updating to use 3.9 +PYTHON_COMPAT=( python3_{7,8} ) + +inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg + +DESCRIPTION="QT based Computer Aided Design application" +HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD" + +if [[ ${PV} = *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git" + S="${WORKDIR}/freecad-${PV}" +else + MY_PV=$(ver_cut 1-2) + MY_PV=$(ver_rs 1 '_' ${MY_PV}) + SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/FreeCAD-${PV}" +fi + +# code is licensed LGPL-2 +# 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 )" + +FREECAD_EXPERIMENTAL_MODULES="cloud plot ship" +FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image + inspection material mesh openscad part-design path points + raytracing robot show spreadsheet surface techdraw tux" + +for module in ${FREECAD_STABLE_MODULES}; do + IUSE="${IUSE} +${module}" +done +for module in ${FREECAD_EXPERIMENTAL_MODULES}; do + IUSE="${IUSE} ${module}" +done +unset module + +RDEPEND=" + ${PYTHON_DEPS} + >=dev-cpp/eigen-3.3.1:3 + dev-libs/OpenNI2[opengl(+)] + dev-libs/libspnav[X] + dev-libs/xerces-c + dev-qt/designer:5 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + >=media-libs/coin-4.0.0 + media-libs/freetype + media-libs/qhull:= + sci-libs/flann[openmp] + >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}] + sci-libs/opencascade:=[vtk(+)] + sci-libs/orocos_kdl:= + sys-libs/zlib + virtual/glu + virtual/libusb:1 + virtual/opengl + cloud? ( + dev-libs/openssl:= + net-misc/curl + ) + fem? ( =sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) + $(python_gen_cond_dep ' + dev-libs/boost:=[python,threads(+),${PYTHON_MULTI_USEDEP}] + dev-python/matplotlib[${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + >=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}] + dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}] + dev-python/shiboken2[${PYTHON_MULTI_USEDEP}] + addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] ) + mesh? ( dev-python/pybind11[${PYTHON_MULTI_USEDEP}] ) + ') +" +DEPEND="${RDEPEND}" +BDEPEND="dev-lang/swig" + +# To get required dependencies: +# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake' +# We set the following requirements by default: +# draft, import, part, qt5, sketcher, start, web. +# +# Additionally if mesh is set, we auto-enable mesh_part, flat_mesh and smesh +# Fem actually needs smesh, but as long as we don't have a smesh package, we enable +# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't +# reflected by the REQUIRES_MODS macro, but at +# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187. +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + arch? ( mesh ) + debug? ( mesh ) + drawing? ( spreadsheet ) + fem? ( mesh ) + inspection? ( mesh points ) + openscad? ( mesh ) + path? ( mesh robot ) + ship? ( image plot ) + techdraw? ( spreadsheet drawing ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch + "${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch + "${FILESDIR}"/${P}-0001-Gentoo-specific-Remove-ccache-usage.patch +) + +DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md ) + +CHECKREQS_DISK_BUILD="3G" + +pkg_setup() { + check-reqs_pkg_setup + python-single-r1_pkg_setup + [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade" +} + +src_prepare() { + # the upstream provided file doesn't find the coin doc tag file, + # but cmake ships a working one, so we use this. + rm "${S}/cMake/FindCoin3D.cmake" || die + + # Fix OpenCASCADE lookup + sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \ + -e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \ + -i cMake/FindOpenCasCade.cmake || die + + # Fix desktop file + sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_ADDONMGR=$(usex addonmgr) + -DBUILD_ARCH=$(usex arch) + -DBUILD_ASSEMBLY=OFF + -DBUILD_CLOUD=$(usex cloud) + -DBUILD_COMPLETE=OFF # deprecated + -DBUILD_DRAFT=ON # basic workspace, enable it by default + -DBUILD_DRAWING=$(usex drawing) + -DBUILD_ENABLE_CXX_STD:STRING="C++14" # needed for >=boost-1.75.0 + -DBUILD_FEM=$(usex fem) + -DBUILD_FEM_NETGEN=OFF + -DBUILD_FLAT_MESH=$(usex mesh) + -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory + -DBUILD_FREETYPE=ON # automagic dep + -DBUILD_GUI=$(usex !headless) + -DBUILD_IDF=$(usex idf) + -DBUILD_IMAGE=$(usex image) + -DBUILD_IMPORT=ON # import module for various file formats + -DBUILD_INSPECTION=$(usex inspection) + -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there + -DBUILD_MATERIAL=$(usex material) + -DBUILD_MESH=$(usex mesh) + -DBUILD_MESH_PART=$(usex mesh) + -DBUILD_OPENSCAD=$(usex openscad) + -DBUILD_PART=ON # basic workspace, enable it by default + -DBUILD_PART_DESIGN=$(usex part-design) + -DBUILD_PATH=$(usex path) + -DBUILD_PLOT=$(usex plot) # conflicts with possible external workbench + -DBUILD_POINTS=$(usex points) + -DBUILD_QT5=ON # OFF means to use Qt4 + -DBUILD_RAYTRACING=$(usex raytracing) + -DBUILD_REVERSEENGINEERING=OFF # currently only an empty sandbox + -DBUILD_ROBOT=$(usex robot) + -DBUILD_SHIP=$(usex ship) # conflicts with possible external workbench + -DBUILD_SHOW=$(usex show) + -DBUILD_SKETCHER=ON # needed by draft workspace + -DBUILD_SMESH=$(usex mesh) + -DBUILD_SPREADSHEET=$(usex spreadsheet) + -DBUILD_START=ON # basic workspace, enable it by default + -DBUILD_SURFACE=$(usex surface) + -DBUILD_TECHDRAW=$(usex techdraw) + -DBUILD_TUX=$(usex tux) + -DBUILD_VR=OFF + -DBUILD_WEB=ON # needed by start workspace + -DBUILD_WITH_CONDA=OFF + + -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN} + -DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN} + + -DFREECAD_BUILD_DEBIAN=OFF + + -DFREECAD_USE_CCACHE=OFF + -DFREECAD_USE_EXTERNAL_KDL=ON + -DFREECAD_USE_EXTERNAL_SMESH=OFF # no package in Gentoo + -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in Gentoo tree + -DFREECAD_USE_FREETYPE=ON + -DFREECAD_USE_OCC_VARIANT:STRING="Official Version" + -DFREECAD_USE_PCL=$(usex pcl) + -DFREECAD_USE_PYBIND11=$(usex mesh) + -DFREECAD_USE_QT_FILEDIALOG=ON + -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" + + # Use the version of shiboken2 that matches the selected python version + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + + -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade + -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir) + -DOCCT_CMAKE_FALLBACK=ON # don't use occt-config which isn't included in opencascade for Gentoo + ) + + if use debug; then + mycmakeargs+=( + # sandbox needs mesh support + -DBUILD_SANDBOX=$(usex mesh) + -DBUILD_TEMPLATE=ON + -DBUILD_TEST=ON + ) + else + mycmakeargs+=( + -DBUILD_SANDBOX=OFF + -DBUILD_TEMPLATE=OFF + -DBUILD_TEST=OFF + ) + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if ! use headless; then + dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad + mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources" + fi + dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd + + python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ +} + +pkg_postinst() { + xdg_pkg_postinst + + if use plot; then + einfo "Note: You are enabling the 'plot' USE flag." + einfo "This conflicts with the plot workbench that can be loaded" + einfo "via the addon manager! You can only install one of those." + fi + + if use ship; then + einfo "Note: You are enabling the 'ship' USE flag." + einfo "This conflicts with the ship workbench that can be loaded" + einfo "via the addon manager! You can only install one of those." + fi + + einfo "You can load a lot of additional workbenches using the integrated" + einfo "AddonManager." + + einfo "There are a lot of additional tools, for which FreeCAD has builtin" + einfo "support. Some of them are available in Gentoo. Take a look at" + einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD" + optfeature "interact with git repositories" dev-python/GitPython + optfeature "work with COLLADA documents" dev-python/pycollada + optfeature "dependency graphs" media-gfx/graphviz + optfeature "PBR Rendering" media-gfx/povray + optfeature "FEM mesh generator" sci-libs/gmsh + optfeature "importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/media-gfx/freecad/freecad-0.19.1.ebuild b/media-gfx/freecad/freecad-0.19.1.ebuild deleted file mode 100644 index 0589fef979f4..000000000000 --- a/media-gfx/freecad/freecad-0.19.1.ebuild +++ /dev/null @@ -1,286 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# vtk needs updating to use 3.9 -PYTHON_COMPAT=( python3_{7,8} ) - -inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg - -DESCRIPTION="QT based Computer Aided Design application" -HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD" - -if [[ ${PV} = *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git" - S="${WORKDIR}/freecad-${PV}" -else - MY_PV=$(ver_cut 1-2) - MY_PV=$(ver_rs 1 '_' ${MY_PV}) - SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/FreeCAD-${PV}" -fi - -# code is licensed LGPL-2 -# 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 )" - -FREECAD_EXPERIMENTAL_MODULES="cloud plot ship" -FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image - inspection material mesh openscad part-design path points - raytracing robot show spreadsheet surface techdraw tux" - -for module in ${FREECAD_STABLE_MODULES}; do - IUSE="${IUSE} +${module}" -done -for module in ${FREECAD_EXPERIMENTAL_MODULES}; do - IUSE="${IUSE} ${module}" -done -unset module - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-cpp/eigen-3.3.1:3 - dev-libs/OpenNI2[opengl(+)] - dev-libs/libspnav[X] - dev-libs/xerces-c - dev-qt/designer:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - >=media-libs/coin-4.0.0 - media-libs/freetype - media-libs/qhull - sci-libs/flann[openmp] - >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}] - sci-libs/opencascade:=[vtk(+)] - sci-libs/orocos_kdl:= - sys-libs/zlib - virtual/glu - virtual/libusb:1 - virtual/opengl - cloud? ( - dev-libs/openssl:= - net-misc/curl - ) - fem? ( =sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) - $(python_gen_cond_dep ' - dev-libs/boost:=[python,threads,${PYTHON_MULTI_USEDEP}] - dev-python/matplotlib[${PYTHON_MULTI_USEDEP}] - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - >=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}] - dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}] - dev-python/shiboken2[${PYTHON_MULTI_USEDEP}] - addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] ) - mesh? ( dev-python/pybind11[${PYTHON_MULTI_USEDEP}] ) - ') -" -DEPEND="${RDEPEND}" -BDEPEND="dev-lang/swig" - -# To get required dependencies: -# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake' -# We set the following requirements by default: -# draft, import, part, qt5, sketcher, start, web. -# -# Additionally if mesh is set, we auto-enable mesh_part, flat_mesh and smesh -# Fem actually needs smesh, but as long as we don't have a smesh package, we enable -# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't -# reflected by the REQUIRES_MODS macro, but at -# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187. -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - arch? ( mesh ) - debug? ( mesh ) - drawing? ( spreadsheet ) - fem? ( mesh ) - inspection? ( mesh points ) - openscad? ( mesh ) - path? ( mesh robot ) - ship? ( image plot ) - techdraw? ( spreadsheet drawing ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch - "${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch - "${FILESDIR}"/${P}-0001-Gentoo-specific-Remove-ccache-usage.patch -) - -DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md ) - -CHECKREQS_DISK_BUILD="3G" - -pkg_setup() { - check-reqs_pkg_setup - python-single-r1_pkg_setup - [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade" -} - -src_prepare() { - # the upstream provided file doesn't find the coin doc tag file, - # but cmake ships a working one, so we use this. - rm "${S}/cMake/FindCoin3D.cmake" || die - - # Fix OpenCASCADE lookup - sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \ - -e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \ - -i cMake/FindOpenCasCade.cmake || die - - # Fix desktop file - sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_ADDONMGR=$(usex addonmgr) - -DBUILD_ARCH=$(usex arch) - -DBUILD_ASSEMBLY=OFF - -DBUILD_CLOUD=$(usex cloud) - -DBUILD_COMPLETE=OFF # deprecated - -DBUILD_DRAFT=ON # basic workspace, enable it by default - -DBUILD_DRAWING=$(usex drawing) - -DBUILD_ENABLE_CXX_STD:STRING="C++14" # needed for >=boost-1.75.0 - -DBUILD_FEM=$(usex fem) - -DBUILD_FEM_NETGEN=OFF - -DBUILD_FLAT_MESH=$(usex mesh) - -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory - -DBUILD_FREETYPE=ON # automagic dep - -DBUILD_GUI=$(usex !headless) - -DBUILD_IDF=$(usex idf) - -DBUILD_IMAGE=$(usex image) - -DBUILD_IMPORT=ON # import module for various file formats - -DBUILD_INSPECTION=$(usex inspection) - -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there - -DBUILD_MATERIAL=$(usex material) - -DBUILD_MESH=$(usex mesh) - -DBUILD_MESH_PART=$(usex mesh) - -DBUILD_OPENSCAD=$(usex openscad) - -DBUILD_PART=ON # basic workspace, enable it by default - -DBUILD_PART_DESIGN=$(usex part-design) - -DBUILD_PATH=$(usex path) - -DBUILD_PLOT=$(usex plot) # conflicts with possible external workbench - -DBUILD_POINTS=$(usex points) - -DBUILD_QT5=ON # OFF means to use Qt4 - -DBUILD_RAYTRACING=$(usex raytracing) - -DBUILD_REVERSEENGINEERING=OFF # currently only an empty sandbox - -DBUILD_ROBOT=$(usex robot) - -DBUILD_SHIP=$(usex ship) # conflicts with possible external workbench - -DBUILD_SHOW=$(usex show) - -DBUILD_SKETCHER=ON # needed by draft workspace - -DBUILD_SMESH=$(usex mesh) - -DBUILD_SPREADSHEET=$(usex spreadsheet) - -DBUILD_START=ON # basic workspace, enable it by default - -DBUILD_SURFACE=$(usex surface) - -DBUILD_TECHDRAW=$(usex techdraw) - -DBUILD_TUX=$(usex tux) - -DBUILD_VR=OFF - -DBUILD_WEB=ON # needed by start workspace - -DBUILD_WITH_CONDA=OFF - - -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN} - -DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN} - - -DFREECAD_BUILD_DEBIAN=OFF - - -DFREECAD_USE_CCACHE=OFF - -DFREECAD_USE_EXTERNAL_KDL=ON - -DFREECAD_USE_EXTERNAL_SMESH=OFF # no package in Gentoo - -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in Gentoo tree - -DFREECAD_USE_FREETYPE=ON - -DFREECAD_USE_OCC_VARIANT:STRING="Official Version" - -DFREECAD_USE_PCL=$(usex pcl) - -DFREECAD_USE_PYBIND11=$(usex mesh) - -DFREECAD_USE_QT_FILEDIALOG=ON - -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" - - # Use the version of shiboken2 that matches the selected python version - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - - -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir) - -DOCCT_CMAKE_FALLBACK=ON # don't use occt-config which isn't included in opencascade for Gentoo - ) - - if use debug; then - mycmakeargs+=( - # sandbox needs mesh support - -DBUILD_SANDBOX=$(usex mesh) - -DBUILD_TEMPLATE=ON - -DBUILD_TEST=ON - ) - else - mycmakeargs+=( - -DBUILD_SANDBOX=OFF - -DBUILD_TEMPLATE=OFF - -DBUILD_TEST=OFF - ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if ! use headless; then - dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad - mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources" - fi - dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd - - python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ -} - -pkg_postinst() { - xdg_pkg_postinst - - if use plot; then - einfo "Note: You are enabling the 'plot' USE flag." - einfo "This conflicts with the plot workbench that can be loaded" - einfo "via the addon manager! You can only install one of those." - fi - - if use ship; then - einfo "Note: You are enabling the 'ship' USE flag." - einfo "This conflicts with the ship workbench that can be loaded" - einfo "via the addon manager! You can only install one of those." - fi - - einfo "You can load a lot of additional workbenches using the integrated" - einfo "AddonManager." - - einfo "There are a lot of additional tools, for which FreeCAD has builtin" - einfo "support. Some of them are available in Gentoo. Take a look at" - einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD" - optfeature "interact with git repositories" dev-python/GitPython - optfeature "work with COLLADA documents" dev-python/pycollada - optfeature "dependency graphs" media-gfx/graphviz - optfeature "PBR Rendering" media-gfx/povray - optfeature "FEM mesh generator" sci-libs/gmsh - optfeature "importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/media-gfx/freecad/freecad-0.19.2-r1.ebuild b/media-gfx/freecad/freecad-0.19.2-r1.ebuild new file mode 100644 index 000000000000..d15c588e8c35 --- /dev/null +++ b/media-gfx/freecad/freecad-0.19.2-r1.ebuild @@ -0,0 +1,335 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg + +DESCRIPTION="QT based Computer Aided Design application" +HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD" + +MY_PN=FreeCAD + +if [[ ${PV} = *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" + S="${WORKDIR}/freecad-${PV}" +else + MY_PV=$(ver_cut 1-2) + MY_PV=$(ver_rs 1 '_' ${MY_PV}) + SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/FreeCAD-${PV}" +fi + +# code is licensed LGPL-2 +# 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 )" + +FREECAD_EXPERIMENTAL_MODULES="cloud plot ship" +FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material + openscad part-design path points raytracing robot show surface + techdraw tux" + +for module in ${FREECAD_STABLE_MODULES}; do + IUSE="${IUSE} +${module}" +done +for module in ${FREECAD_EXPERIMENTAL_MODULES}; do + IUSE="${IUSE} ${module}" +done +unset module + +RDEPEND=" + ${PYTHON_DEPS} + >=dev-cpp/eigen-3.3.1:3 + dev-libs/OpenNI2[opengl(+)] + dev-libs/libspnav[X] + dev-libs/xerces-c[icu] + dev-qt/designer:5 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + >=media-libs/coin-4.0.0 + media-libs/freetype + media-libs/qhull:= + sci-libs/flann[openmp] + sci-libs/hdf5:=[fortran,zlib] + >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}] + =sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) + $(python_gen_cond_dep ' + dev-libs/boost:=[python,threads(+),${PYTHON_MULTI_USEDEP}] + dev-python/matplotlib[${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + >=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}] + dev-python/pybind11[${PYTHON_MULTI_USEDEP}] + dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}] + dev-python/shiboken2[${PYTHON_MULTI_USEDEP}] + addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] ) + fem? ( dev-python/ply[${PYTHON_MULTI_USEDEP}] ) + ') +" +DEPEND="${RDEPEND}" +BDEPEND="dev-lang/swig" + +# To get required dependencies: +# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake' +# We set the following requirements by default: +# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, web. +# +# Additionally, we auto-enable mesh_part, flat_mesh and smesh +# Fem actually needs smesh, but as long as we don't have a smesh package, we enable +# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't +# reflected by the REQUIRES_MODS macro, but at +# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187. +# +# The increase in auto-enabled workbenches is due to their need in parts of the +# test suite when compiled with a minimal set of USE flags. +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + inspection? ( points ) + path? ( robot ) + ship? ( image plot ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch + "${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch + "${FILESDIR}"/${P}-0001-fix-failing-test-workbench-testcase.patch + "${FILESDIR}"/${P}-0002-fix-femtest-failure-with-yaml-load.patch + "${FILESDIR}"/${P}-0003-fix-test-when-built-without-GUI.patch +) + +DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md ) + +CHECKREQS_DISK_BUILD="2G" + +pkg_setup() { + check-reqs_pkg_setup + python-single-r1_pkg_setup + [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade" +} + +src_prepare() { + # the upstream provided file doesn't find the coin doc tag file, + # but cmake ships a working one, so we use this. + rm "${S}/cMake/FindCoin3D.cmake" || die + + # Fix OpenCASCADE lookup + local OCC_P=$(best_version sci-libs/opencascade[vtk]) + OCC_P=${OCC_P#sci-libs/} + local OCC_PV=${OCC_P#opencascade-} + OCC_PV=$(ver_cut 1-2 ${OCC_PV}) + # check for CASROOT needed to ensure occ-7.5 is eselected and profile resourced + if [[ ${OCC_PV} = 7.5 && ${CASROOT} = "/usr" ]]; then + sed -e 's|/usr/include/opencascade|'${CASROOT}'/include/'${OCC_P}'|' \ + -e 's|/usr/lib|'${CASROOT}'/'$(get_libdir)'/'${OCC_P}' NO_DEFAULT_PATH|' \ + -i cMake/FindOpenCasCade.cmake || die + else + sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \ + -e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \ + -i cMake/FindOpenCasCade.cmake || die + fi + + # Fix desktop file + sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_ADDONMGR=$(usex addonmgr) + -DBUILD_ARCH=ON + -DBUILD_ASSEMBLY=OFF # deprecated + -DBUILD_CLOUD=$(usex cloud) + -DBUILD_COMPLETE=OFF # deprecated + -DBUILD_DRAFT=ON + -DBUILD_DRAWING=ON + -DBUILD_ENABLE_CXX_STD:STRING="C++14" # needed for >=boost-1.75.0 + -DBUILD_FEM=$(usex fem) + -DBUILD_FEM_NETGEN=OFF + -DBUILD_FLAT_MESH=ON + -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory + -DBUILD_FREETYPE=ON # automagic dep + -DBUILD_GUI=$(usex !headless) + -DBUILD_IDF=$(usex idf) + -DBUILD_IMAGE=$(usex image) + -DBUILD_IMPORT=ON # import module for various file formats + -DBUILD_INSPECTION=$(usex inspection) + -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there + -DBUILD_MATERIAL=$(usex material) + -DBUILD_MESH=ON + -DBUILD_MESH_PART=ON + -DBUILD_OPENSCAD=$(usex openscad) + -DBUILD_PART=ON + -DBUILD_PART_DESIGN=$(usex part-design) + -DBUILD_PATH=$(usex path) + -DBUILD_PLOT=$(usex plot) # conflicts with possible external workbench + -DBUILD_POINTS=$(usex points) + -DBUILD_QT5=ON # OFF means to use Qt4 + -DBUILD_RAYTRACING=$(usex raytracing) + -DBUILD_REVERSEENGINEERING=OFF # currently only an empty sandbox + -DBUILD_ROBOT=$(usex robot) + -DBUILD_SHIP=$(usex ship) # conflicts with possible external workbench + -DBUILD_SHOW=$(usex show) + -DBUILD_SKETCHER=ON # needed by draft workspace + -DBUILD_SMESH=ON + -DBUILD_SPREADSHEET=ON + -DBUILD_START=ON + -DBUILD_SURFACE=$(usex surface) + -DBUILD_TECHDRAW=$(usex techdraw) + -DBUILD_TEST=ON # always build test workbench for run-time testing + -DBUILD_TUX=$(usex tux) + -DBUILD_VR=OFF + -DBUILD_WEB=ON # needed by start workspace + -DBUILD_WITH_CONDA=OFF + + -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN} + -DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN} + + -DFREECAD_BUILD_DEBIAN=OFF + + -DFREECAD_USE_EXTERNAL_KDL=ON + -DFREECAD_USE_EXTERNAL_SMESH=OFF # no package in Gentoo + -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in Gentoo tree + -DFREECAD_USE_FREETYPE=ON + -DFREECAD_USE_OCC_VARIANT:STRING="Official Version" + -DFREECAD_USE_PCL=$(usex pcl) + -DFREECAD_USE_PYBIND11=ON + -DFREECAD_USE_QT_FILEDIALOG=ON + -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" + + # Use the version of shiboken2 that matches the selected python version + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + + # install python modules to site-packages' dir. True only for the main package, + # sub-packages will still be installed inside /usr/lib64/freecad + -DINSTALL_TO_SITEPACKAGES=ON + + -DOCCT_CMAKE_FALLBACK=ON # don't use occt-config which isn't included in opencascade for Gentoo + ) + + if has_version ">=sci-libs/opencascade-7.5"; then + # bug https://bugs.gentoo.org/788274 + local OCC_P=$(best_version sci-libs/opencascade[vtk]) + OCC_P=${OCC_P#sci-libs/} + OCC_P=${OCC_P%-r*} + mycmakeargs+=( + -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P} + -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P} + ) + else + # /dev/null || die + export FREECAD_USER_HOME="${HOME}" + export FREECAD_USER_DATA="${T}" + export FREECAD_USER_TEMP="${T}" + nonfatal ./bin/FreeCADCmd --run-test 0 + popd > /dev/null || die +} + +src_install() { + cmake_src_install + + if ! use headless; then + dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad + mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources" + fi + dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd + + python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ + # compile main package in python site-packages as well + python_optimize + + doenvd "${FILESDIR}/99${PN}" +} + +pkg_postinst() { + xdg_pkg_postinst + + if use plot; then + einfo "Note: You are enabling the 'plot' USE flag." + einfo "This conflicts with the plot workbench that can be loaded" + einfo "via the addon manager! You can only install one of those." + fi + + if use ship; then + einfo "Note: You are enabling the 'ship' USE flag." + einfo "This conflicts with the ship workbench that can be loaded" + einfo "via the addon manager! You can only install one of those." + fi + + einfo "You can load a lot of additional workbenches using the integrated" + einfo "AddonManager." + + einfo "There are a lot of additional tools, for which FreeCAD has builtin" + einfo "support. Some of them are available in Gentoo. Take a look at" + einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD" + optfeature "interact with git repositories" dev-python/GitPython + optfeature "work with COLLADA documents" dev-python/pycollada + optfeature "dependency graphs" media-gfx/graphviz + optfeature "PBR Rendering" media-gfx/povray + optfeature "FEM mesh generator" sci-libs/gmsh + optfeature "importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/media-gfx/freecad/freecad-0.19.2.ebuild b/media-gfx/freecad/freecad-0.19.2.ebuild deleted file mode 100644 index a2a32823f67d..000000000000 --- a/media-gfx/freecad/freecad-0.19.2.ebuild +++ /dev/null @@ -1,335 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg - -DESCRIPTION="QT based Computer Aided Design application" -HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD" - -MY_PN=FreeCAD - -if [[ ${PV} = *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" - S="${WORKDIR}/freecad-${PV}" -else - MY_PV=$(ver_cut 1-2) - MY_PV=$(ver_rs 1 '_' ${MY_PV}) - SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/FreeCAD-${PV}" -fi - -# code is licensed LGPL-2 -# 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 )" - -FREECAD_EXPERIMENTAL_MODULES="cloud plot ship" -FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material - openscad part-design path points raytracing robot show surface - techdraw tux" - -for module in ${FREECAD_STABLE_MODULES}; do - IUSE="${IUSE} +${module}" -done -for module in ${FREECAD_EXPERIMENTAL_MODULES}; do - IUSE="${IUSE} ${module}" -done -unset module - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-cpp/eigen-3.3.1:3 - dev-libs/OpenNI2[opengl(+)] - dev-libs/libspnav[X] - dev-libs/xerces-c[icu] - dev-qt/designer:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - >=media-libs/coin-4.0.0 - media-libs/freetype - media-libs/qhull - sci-libs/flann[openmp] - sci-libs/hdf5:=[fortran,zlib] - >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}] - =sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) - $(python_gen_cond_dep ' - dev-libs/boost:=[python,threads,${PYTHON_MULTI_USEDEP}] - dev-python/matplotlib[${PYTHON_MULTI_USEDEP}] - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - >=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}] - dev-python/pybind11[${PYTHON_MULTI_USEDEP}] - dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}] - dev-python/shiboken2[${PYTHON_MULTI_USEDEP}] - addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] ) - fem? ( dev-python/ply[${PYTHON_MULTI_USEDEP}] ) - ') -" -DEPEND="${RDEPEND}" -BDEPEND="dev-lang/swig" - -# To get required dependencies: -# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake' -# We set the following requirements by default: -# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, web. -# -# Additionally, we auto-enable mesh_part, flat_mesh and smesh -# Fem actually needs smesh, but as long as we don't have a smesh package, we enable -# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't -# reflected by the REQUIRES_MODS macro, but at -# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187. -# -# The increase in auto-enabled workbenches is due to their need in parts of the -# test suite when compiled with a minimal set of USE flags. -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - inspection? ( points ) - path? ( robot ) - ship? ( image plot ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch - "${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch - "${FILESDIR}"/${P}-0001-fix-failing-test-workbench-testcase.patch - "${FILESDIR}"/${P}-0002-fix-femtest-failure-with-yaml-load.patch - "${FILESDIR}"/${P}-0003-fix-test-when-built-without-GUI.patch -) - -DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md ) - -CHECKREQS_DISK_BUILD="2G" - -pkg_setup() { - check-reqs_pkg_setup - python-single-r1_pkg_setup - [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade" -} - -src_prepare() { - # the upstream provided file doesn't find the coin doc tag file, - # but cmake ships a working one, so we use this. - rm "${S}/cMake/FindCoin3D.cmake" || die - - # Fix OpenCASCADE lookup - local OCC_P=$(best_version sci-libs/opencascade[vtk]) - OCC_P=${OCC_P#sci-libs/} - local OCC_PV=${OCC_P#opencascade-} - OCC_PV=$(ver_cut 1-2 ${OCC_PV}) - # check for CASROOT needed to ensure occ-7.5 is eselected and profile resourced - if [[ ${OCC_PV} = 7.5 && ${CASROOT} = "/usr" ]]; then - sed -e 's|/usr/include/opencascade|'${CASROOT}'/include/'${OCC_P}'|' \ - -e 's|/usr/lib|'${CASROOT}'/'$(get_libdir)'/'${OCC_P}' NO_DEFAULT_PATH|' \ - -i cMake/FindOpenCasCade.cmake || die - else - sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \ - -e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \ - -i cMake/FindOpenCasCade.cmake || die - fi - - # Fix desktop file - sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_ADDONMGR=$(usex addonmgr) - -DBUILD_ARCH=ON - -DBUILD_ASSEMBLY=OFF # deprecated - -DBUILD_CLOUD=$(usex cloud) - -DBUILD_COMPLETE=OFF # deprecated - -DBUILD_DRAFT=ON - -DBUILD_DRAWING=ON - -DBUILD_ENABLE_CXX_STD:STRING="C++14" # needed for >=boost-1.75.0 - -DBUILD_FEM=$(usex fem) - -DBUILD_FEM_NETGEN=OFF - -DBUILD_FLAT_MESH=ON - -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory - -DBUILD_FREETYPE=ON # automagic dep - -DBUILD_GUI=$(usex !headless) - -DBUILD_IDF=$(usex idf) - -DBUILD_IMAGE=$(usex image) - -DBUILD_IMPORT=ON # import module for various file formats - -DBUILD_INSPECTION=$(usex inspection) - -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there - -DBUILD_MATERIAL=$(usex material) - -DBUILD_MESH=ON - -DBUILD_MESH_PART=ON - -DBUILD_OPENSCAD=$(usex openscad) - -DBUILD_PART=ON - -DBUILD_PART_DESIGN=$(usex part-design) - -DBUILD_PATH=$(usex path) - -DBUILD_PLOT=$(usex plot) # conflicts with possible external workbench - -DBUILD_POINTS=$(usex points) - -DBUILD_QT5=ON # OFF means to use Qt4 - -DBUILD_RAYTRACING=$(usex raytracing) - -DBUILD_REVERSEENGINEERING=OFF # currently only an empty sandbox - -DBUILD_ROBOT=$(usex robot) - -DBUILD_SHIP=$(usex ship) # conflicts with possible external workbench - -DBUILD_SHOW=$(usex show) - -DBUILD_SKETCHER=ON # needed by draft workspace - -DBUILD_SMESH=ON - -DBUILD_SPREADSHEET=ON - -DBUILD_START=ON - -DBUILD_SURFACE=$(usex surface) - -DBUILD_TECHDRAW=$(usex techdraw) - -DBUILD_TEST=ON # always build test workbench for run-time testing - -DBUILD_TUX=$(usex tux) - -DBUILD_VR=OFF - -DBUILD_WEB=ON # needed by start workspace - -DBUILD_WITH_CONDA=OFF - - -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN} - -DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN} - - -DFREECAD_BUILD_DEBIAN=OFF - - -DFREECAD_USE_EXTERNAL_KDL=ON - -DFREECAD_USE_EXTERNAL_SMESH=OFF # no package in Gentoo - -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in Gentoo tree - -DFREECAD_USE_FREETYPE=ON - -DFREECAD_USE_OCC_VARIANT:STRING="Official Version" - -DFREECAD_USE_PCL=$(usex pcl) - -DFREECAD_USE_PYBIND11=ON - -DFREECAD_USE_QT_FILEDIALOG=ON - -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" - - # Use the version of shiboken2 that matches the selected python version - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - - # install python modules to site-packages' dir. True only for the main package, - # sub-packages will still be installed inside /usr/lib64/freecad - -DINSTALL_TO_SITEPACKAGES=ON - - -DOCCT_CMAKE_FALLBACK=ON # don't use occt-config which isn't included in opencascade for Gentoo - ) - - if has_version ">=sci-libs/opencascade-7.5"; then - # bug https://bugs.gentoo.org/788274 - local OCC_P=$(best_version sci-libs/opencascade[vtk]) - OCC_P=${OCC_P#sci-libs/} - OCC_P=${OCC_P%-r*} - mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P} - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P} - ) - else - # /dev/null || die - export FREECAD_USER_HOME="${HOME}" - export FREECAD_USER_DATA="${T}" - export FREECAD_USER_TEMP="${T}" - nonfatal ./bin/FreeCADCmd --run-test 0 - popd > /dev/null || die -} - -src_install() { - cmake_src_install - - if ! use headless; then - dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad - mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources" - fi - dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd - - python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ - # compile main package in python site-packages as well - python_optimize - - doenvd "${FILESDIR}/99${PN}" -} - -pkg_postinst() { - xdg_pkg_postinst - - if use plot; then - einfo "Note: You are enabling the 'plot' USE flag." - einfo "This conflicts with the plot workbench that can be loaded" - einfo "via the addon manager! You can only install one of those." - fi - - if use ship; then - einfo "Note: You are enabling the 'ship' USE flag." - einfo "This conflicts with the ship workbench that can be loaded" - einfo "via the addon manager! You can only install one of those." - fi - - einfo "You can load a lot of additional workbenches using the integrated" - einfo "AddonManager." - - einfo "There are a lot of additional tools, for which FreeCAD has builtin" - einfo "support. Some of them are available in Gentoo. Take a look at" - einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD" - optfeature "interact with git repositories" dev-python/GitPython - optfeature "work with COLLADA documents" dev-python/pycollada - optfeature "dependency graphs" media-gfx/graphviz - optfeature "PBR Rendering" media-gfx/povray - optfeature "FEM mesh generator" sci-libs/gmsh - optfeature "importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index 3f5de2fa3a1e..b96f2771615e 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -64,7 +64,7 @@ RDEPEND=" dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype - media-libs/qhull + media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}] @@ -82,7 +82,7 @@ RDEPEND=" openscad? ( media-gfx/openscad ) pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) $(python_gen_cond_dep ' - dev-libs/boost:=[python,threads,${PYTHON_MULTI_USEDEP}] + dev-libs/boost:=[python,threads(+),${PYTHON_MULTI_USEDEP}] dev-python/matplotlib[${PYTHON_MULTI_USEDEP}] dev-python/numpy[${PYTHON_MULTI_USEDEP}] >=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}] diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index 2cb58ec49239..d1de3719d446 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,6 +1,9 @@ AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c AUX krita-4.4.2-quazip1.patch 1422 BLAKE2B 917bf30f1dc702276b524713b1ec01a4807f967bc974c0c9896e6972fc56554a4da954c690a0743a4d92d86e57d32028c809418cbf10b30294bf1412a1a08beb SHA512 7c55e371f4c6a5e6d3d275298bf22810b58cb845bf4abcdd3cecdd84cb228499c59e8f7e9902319009dc52ea4dde575de77668ab2d1e9cf076e8ffa6fba582b5 +AUX krita-4.4.5-pykrita-crash-on-exit.patch 2029 BLAKE2B 82b5146f25165416ac6e3f2ea46315e87bf53f5b34a3c3820bddd2e975f782e945db6f985a5fa347a8a2f644e15ea7f60854ea0874f1a71e213819aaea70c454 SHA512 9848301759c51724c3bd2f9c67f38073e6043d3bbeb8c557fe7ab6261c9664f97215ab602808f6c495cf7a23c6e91f19823b3d3cdac8f135ff878dc0fd63a653 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59 DIST krita-4.4.3.tar.gz 254855083 BLAKE2B 5ffc5d7c887d409c2669a2c75f2dae3d6b1c6e83f30d330c37c6e8eb96e590c4abb7b26aea82a18f13b01ed2f053d2a4ddca780cab2995c10c9c0c07d67ee689 SHA512 44052f5bc02c31b8e5eb7990192c1b1d6a4ca9d91117b0b8e9ddf794df83cfdde233754064ad6692516bc8d756871bf4b34190653f04956cb851333b8d15645f +DIST krita-4.4.5.tar.gz 254879190 BLAKE2B 6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc SHA512 9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4 EBUILD krita-4.4.3.ebuild 3427 BLAKE2B b02c9502a4ed0989d99d1514fbee3564fed36b6c79f92c6d2d6fc6a9eb8e487f9b718290e03aa230836f6c23a9f783bf52b4bc5e7a8489f4aa8d33e138d7d0ea SHA512 c4d69ca2b75531c84f4769049d2cc3148fec6536f11e51bbbdb8a8f1fa24a140af0a17bc01d70f4d0af13686ddbaee004592c84a4342852481ee2b439180de73 +EBUILD krita-4.4.5.ebuild 3501 BLAKE2B 002c26ccbc6553d491b9e5d37a1e69bd5cee13ea445c6af977f4cbf7880e07dc23a16d575a132e2e678e70d30ad56b4135e2689cf07f87f27382adba4f5c3cfc SHA512 e518f87e8e1afb990fb0b3602bd156c55daf54316a88ead052525a94c9cf44df7f850dada5fd99b90c05ab6e306c5c4d61e6abc04cdcc7b0610b941447dbf52b MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd diff --git a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch new file mode 100644 index 000000000000..1939c962815e --- /dev/null +++ b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch @@ -0,0 +1,55 @@ +From a0c29913114164ff3f2ba4e255ccee1c52cb3e86 Mon Sep 17 00:00:00 2001 +From: Alvin Wong +Date: Sat, 19 Jun 2021 16:29:45 +0800 +Subject: [PATCH] Fix PyKrita cleanup using qApp::aboutToQuit to prevent crash + +Suspecting that we can't have Python clean up its QObject's inside +QCoreApplication's destructor, but must be done before it. + +BUG: 417465 + +* asturm 2021-06-20: mangled w/ a6296beb25c98d9a4b5a136e0088959bf51d550a +--- + plugins/extensions/pykrita/plugin/plugin.cpp | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +diff --git a/plugins/extensions/pykrita/plugin/plugin.cpp b/plugins/extensions/pykrita/plugin/plugin.cpp +index ef0e27eb65..66f552b007 100644 +--- a/plugins/extensions/pykrita/plugin/plugin.cpp ++++ b/plugins/extensions/pykrita/plugin/plugin.cpp +@@ -13,6 +13,8 @@ + #include + #include "pyqtpluginsettings.h" + ++#include ++ + #include + + K_PLUGIN_FACTORY_WITH_JSON(KritaPyQtPluginFactory, "kritapykrita.json", registerPlugin();) +@@ -74,15 +76,18 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &) + Q_FOREACH (Extension *extension, Krita::instance()->extensions()) { + extension->setup(); + } ++ ++ // This ensures that QObject's owned by Python are destructed before ++ // the destructor of QCoreApplication is called, in order to prevent ++ // a crash on exit. ++ // See https://bugs.kde.org/show_bug.cgi?id=417465 ++ connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this, []() { PyKrita::finalize(); }); + } + + KritaPyQtPlugin::~KritaPyQtPlugin() + { +- // XXX: With Qt 5.14, this crashes Krita on exit. See https://bugs.kde.org/show_bug.cgi?id=417465 +- // So, for now, we just don't call finalize... +-#if QT_VERSION < QT_VERSION_CHECK(5,14,0) +- PyKrita::finalize(); +-#endif ++ // Don't call PyKrita::finalize here, because that can result in a crash ++ // deep inside Qt. + } + + #include "plugin.moc" +-- +GitLab + diff --git a/media-gfx/krita/krita-4.4.5.ebuild b/media-gfx/krita/krita-4.4.5.ebuild new file mode 100644 index 000000000000..9b1b2c73a5e0 --- /dev/null +++ b/media-gfx/krita/krita-4.4.5.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="forceoptional" +PYTHON_COMPAT=( python3_{8,9,10} ) +KFMIN=5.74.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org python-single-r1 + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz + https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +fi + +DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" +HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/" + +LICENSE="GPL-3" +SLOT="5" +IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# bug 630508 +RESTRICT+=" test" + +RDEPEND="${PYTHON_DEPS} + dev-libs/boost:= + dev-libs/quazip:0= + $(python_gen_cond_dep ' + dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] + dev-python/sip:=[${PYTHON_MULTI_USEDEP}] + ') + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only] + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + media-gfx/exiv2:= + media-libs/lcms + media-libs/libpng:0= + sys-libs/zlib + virtual/opengl + x11-libs/libX11 + x11-libs/libXi + color-management? ( =media-libs/opencolorio-1* ) + fftw? ( sci-libs/fftw:3.0= ) + gif? ( media-libs/giflib ) + gsl? ( sci-libs/gsl:= ) + jpeg? ( virtual/jpeg:0 ) + heif? ( media-libs/libheif:= ) + openexr? ( + media-libs/ilmbase:= + media-libs/openexr + ) + pdf? ( app-text/poppler[qt5] ) + qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 ) + raw? ( media-libs/libraw:= ) + tiff? ( media-libs/tiff:0 ) +" +DEPEND="${RDEPEND} + vc? ( >=dev-libs/vc-1.1.0 ) +" +BDEPEND=" + dev-cpp/eigen:3 + dev-lang/perl + sys-devel/gettext +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch + "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch + "${FILESDIR}"/${PN}-4.4.2-quazip1.patch + "${FILESDIR}"/${P}-pykrita-crash-on-exit.patch # KDE-Bug #417465 +) + +pkg_setup() { + python-single-r1_pkg_setup + ecm_pkg_setup +} + +src_prepare() { + ecm_src_prepare + sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die +} + +src_configure() { + # Prevent sandbox violation from FindPyQt5.py module + # See Gentoo-bug 655918 + addpredict /dev/dri + + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged + $(cmake_use_find_package color-management OCIO) + $(cmake_use_find_package fftw FFTW3) + $(cmake_use_find_package gif GIF) + $(cmake_use_find_package gsl GSL) + $(cmake_use_find_package heif HEIF) + $(cmake_use_find_package jpeg JPEG) + $(cmake_use_find_package openexr OpenEXR) + $(cmake_use_find_package pdf Poppler) + $(cmake_use_find_package qtmedia Qt5Multimedia) + $(cmake_use_find_package raw LibRaw) + $(cmake_use_find_package tiff TIFF) + $(cmake_use_find_package vc Vc) + ) + + ecm_src_configure +} diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest index e054b43a8541..3ab0d39e6b5f 100644 --- a/media-gfx/prusaslicer/Manifest +++ b/media-gfx/prusaslicer/Manifest @@ -1,5 +1,5 @@ AUX prusaslicer-2.3.0-miniz-zip-header.patch 284 BLAKE2B f73db5727dd6bffc39c658a291602ee6d86609244e9cd55a9eeb92a376cc4a579a94ef9f423e3072dbd01295b173c9291d615a56d5fb512cdccc93b205f665d0 SHA512 36e3c1e5d35f6cda26d8f74db3862cc5206478f7f79f35b28b3b3749291150764d1d907a3ccb67b4dcd1872fa5d0ac612791653dc67f3a56aeb98b68dc873f27 AUX prusaslicer-2.3.1-gcc11-missing-include.patch 740 BLAKE2B 162981c4ddf74bf55f27adebc8603892da97e60eecc085649d508abf06731969643d0a043e275f8978318b9e2c2603557e03529f8017030da4503a71f5c60171 SHA512 bb7067b20ad07ca4aaa5a20583e8399d61f4e7ca2e9a04fda7bd8929e0b51aa908bfe7a546e82f1d688f2853d14f3c961c65296608aa2e14ccfa6c5e4d8f6a19 DIST prusaslicer-2.3.1.tar.gz 39583385 BLAKE2B 0d0fa11d21ec3cc0decb2708a1b1866bbe0ec5719236433ef87807541ada8abc67091f219392a1ae21b4f35c3821dde94bfd6dac72ec6617c40b7fda05cfc082 SHA512 2722ee9d5331fe03423ce179cec68196320b48c65bd3c6795b93469268956fb309609462cc62bf3e2b4f30d2fe720d0a28a16c010993737c045d82956493a1e3 -EBUILD prusaslicer-2.3.1.ebuild 1874 BLAKE2B cc4ad8722898304d4ae600bcea5b2b9475da8b551bc2128a28e60782fc43d5f097cb068a12cbfef32066ecdaf1bfff75c0b5b2bce515c328c8e03101904439d4 SHA512 dfddeb8cb85d2deb6c4726ba1b7b4a10b9ee4bedd3846eaf8d5bca52b08f91aaf49481c728af6b9ae6b4c622bba67fb9cb3479a32c34492d249cc3c29f64af09 +EBUILD prusaslicer-2.3.1-r1.ebuild 1877 BLAKE2B 7a0cb2b523c099df7897d98731e3af3382307909579ea317fbd9866d25dbebeded59847e4e2596e59213074f081cecb662b65352a44497078ec0f72af20da5ca SHA512 7b1e130b1d9ff7f33a1d3571ebdadd6503a7af5d4b2ae00cb2b73eac73aa15f3a9155d68cd948d2b475dc533fabca03a64297513043359f9449cf0944b4d2819 MISC metadata.xml 1027 BLAKE2B 8a247ceabac85b67484df3c9853225f1cb7d1dcff13c2069a4d37578a741f3cb0d4c181d05eb910147a79e969f3042eeb7de9dec03a9a8f69ffe9e5975c55656 SHA512 e9d281340a7aeeb0e5f0e8fef26e71a1abaac2033322a3e0a778d0852dc0aa8ea01bd34dba653c5f143a8259ce36ad968f9969d57c86ee3546f8c3c37802bf51 diff --git a/media-gfx/prusaslicer/prusaslicer-2.3.1-r1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.3.1-r1.ebuild new file mode 100644 index 000000000000..a023437a8056 --- /dev/null +++ b/media-gfx/prusaslicer/prusaslicer-2.3.1-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +WX_GTK_VER="3.0-gtk3" + +inherit xdg cmake desktop wxwidgets + +MY_PN="PrusaSlicer" + +DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" +HOMEPAGE="https://www.prusa3d.com/prusaslicer/" +SRC_URI="https://github.com/prusa3d/${MY_PN}/archive/version_${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gui test" + +# tests fail to link with USE=-gui, bug #760096 +REQUIRED_USE="test? ( gui )" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-cpp/eigen:3 + dev-cpp/tbb + >=dev-libs/boost-1.73.0:=[nls,threads(+)] + dev-libs/cereal + dev-libs/expat + dev-libs/gmp:= + >=dev-libs/miniz-2.1.0-r2 + dev-libs/mpfr:= + >=media-gfx/openvdb-5.0.0 + media-libs/ilmbase:= + media-libs/libpng:0= + media-libs/qhull:= + sci-libs/libigl + sci-libs/nlopt + >=sci-mathematics/cgal-5.0:= + sys-apps/dbus + sys-libs/zlib:= + gui? ( + dev-libs/glib:2 + media-libs/glew:0= + net-misc/curl + virtual/glu + virtual/opengl + x11-libs/gtk+:3 + x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] + ) +" +DEPEND="${RDEPEND} + media-libs/qhull[static-libs] +" + +S="${WORKDIR}/${MY_PN}-version_${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-2.3.0-miniz-zip-header.patch" + "${FILESDIR}/${PN}-2.3.1-gcc11-missing-include.patch" +) + +src_configure() { + use gui && setup-wxwidgets + + local mycmakeargs=( + -DSLIC3R_BUILD_TESTS=$(usex test) + -DSLIC3R_FHS=ON + -DSLIC3R_GTK=3 + -DSLIC3R_GUI=$(usex gui) + -DSLIC3R_PCH=OFF + -DSLIC3R_WX_STABLE=ON + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use gui; then + newicon -s 128 resources/icons/PrusaSlicer_128px.png PrusaSlicer.png + newicon -s 128 resources/icons/PrusaSlicer-gcodeviewer_128px.png PrusaSlicer-gcodeviewer.png + domenu src/platform/unix/Prusa{Slicer,Gcodeviewer}.desktop + fi +} diff --git a/media-gfx/prusaslicer/prusaslicer-2.3.1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.3.1.ebuild deleted file mode 100644 index cc29c97ae4a3..000000000000 --- a/media-gfx/prusaslicer/prusaslicer-2.3.1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0-gtk3" - -inherit xdg cmake desktop wxwidgets - -MY_PN="PrusaSlicer" - -DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" -HOMEPAGE="https://www.prusa3d.com/prusaslicer/" -SRC_URI="https://github.com/prusa3d/${MY_PN}/archive/version_${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gui test" - -# tests fail to link with USE=-gui, bug #760096 -REQUIRED_USE="test? ( gui )" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-cpp/eigen:3 - dev-cpp/tbb - >=dev-libs/boost-1.73.0:=[nls,threads] - dev-libs/cereal - dev-libs/expat - dev-libs/gmp:= - >=dev-libs/miniz-2.1.0-r2 - dev-libs/mpfr:= - >=media-gfx/openvdb-5.0.0 - media-libs/ilmbase:= - media-libs/libpng:0= - media-libs/qhull:= - sci-libs/libigl - sci-libs/nlopt - >=sci-mathematics/cgal-5.0:= - sys-apps/dbus - sys-libs/zlib:= - gui? ( - dev-libs/glib:2 - media-libs/glew:0= - net-misc/curl - virtual/glu - virtual/opengl - x11-libs/gtk+:3 - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] - ) -" -DEPEND="${RDEPEND} - media-libs/qhull[static-libs] -" - -S="${WORKDIR}/${MY_PN}-version_${PV}" - -PATCHES=( - "${FILESDIR}/${PN}-2.3.0-miniz-zip-header.patch" - "${FILESDIR}/${PN}-2.3.1-gcc11-missing-include.patch" -) - -src_configure() { - use gui && setup-wxwidgets - - local mycmakeargs=( - -DSLIC3R_BUILD_TESTS=$(usex test) - -DSLIC3R_FHS=ON - -DSLIC3R_GTK=3 - -DSLIC3R_GUI=$(usex gui) - -DSLIC3R_PCH=OFF - -DSLIC3R_WX_STABLE=ON - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use gui; then - newicon -s 128 resources/icons/PrusaSlicer_128px.png PrusaSlicer.png - newicon -s 128 resources/icons/PrusaSlicer-gcodeviewer_128px.png PrusaSlicer-gcodeviewer.png - domenu src/platform/unix/Prusa{Slicer,Gcodeviewer}.desktop - fi -} diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest index 154d70d2da8b..1dae4a6c50ef 100644 --- a/media-gfx/slic3r/Manifest +++ b/media-gfx/slic3r/Manifest @@ -5,7 +5,7 @@ AUX slic3r-1.3.0-wayland.patch 224 BLAKE2B 71395194aed291387897eae5e5af8d58bee0e 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-r3.ebuild 2741 BLAKE2B be0b9946dfcefc79bd0ead2db2dc7d684a81cb1f6c5af82f57347006a2f155cdb9276eff6e47b16bbfea8c0a64d6c89455f39faa010686393df211bf9569a6e9 SHA512 b0f97a438154a387d8e0d6245328abd9e3cce85ea6f80ff2c41b9a22d77c9345e023ab44b8bf521ed223b6c201481f52d9130b4abb37938af46456c4061a1fb1 -EBUILD slic3r-1.3.1_pre20200824.ebuild 2777 BLAKE2B 15ef5c7e7a21769ce90e52953536673e3658acdb9674d504c35ca42732b44688c23ee44ac7c845d6b73a7aa52f6fe23363bf6cd25d2a5f2193586ea3dd12e928 SHA512 b7d0ca2b4f9c449088240f332d95125288a73dc3a0ab591ecf476c0d3cec1d2378f0ec5c1e27fb628ff616fe0895d9ec2dc586a82afe37dcb9cd19a293648b68 -EBUILD slic3r-9999.ebuild 2688 BLAKE2B 4b9af5d0085ba6d6632ede733a6fade66dff9d50c4230762c56920cf1c226a3962d6c33432cece0e26d65fdff9764c7255dbabaf98bd0d09cc0dd2bef6385534 SHA512 b871d0d53023b9e6c5caaedea1c121063da47f4cb9fccab328af6e40deefc36c52057dd803ce7aed7846ca61504dab8be8b341fad1a8332467e1a2c387bdf3e2 +EBUILD slic3r-1.3.0-r4.ebuild 2744 BLAKE2B b6bf1e8b964ef877d3b11e02bc636265820a36dcacfa84a912fe5533511feb205e1ee91657da46ce73160279fb6cdc9a44c054edbbb2e6bf485c94382f80cd3f SHA512 353b0cb79919ad64ef7dd90d29372e9d7e796102b9759adf80bf7bd8f3bef82e2e4260083448d6568e07643f3e0c47f800f69996db231f58e99c83461756ae36 +EBUILD slic3r-1.3.1_pre20200824-r1.ebuild 2780 BLAKE2B 8f41a258bdbd10da0fd8479ca2752e45240a47f6b69c70825fda69f7ec938f4a1b28878041e548d095d541ce71ae506f7f0318b10fe8f359745aff157949a615 SHA512 da9e0ff4cf0207c5150d1d668390e4a6be172a090397f18d64acf2ae4579682cc4d7a2b43a2bd2c7110ef8fb44fc53a321a620ae487c0c1de257d50730787223 +EBUILD slic3r-9999.ebuild 2691 BLAKE2B b14a5b90f76f4fbad343e58c4e021aa9aa7cbc24266b186af3498fc11819f171fb113a96bc181163181e54afcd22e2468b44a2a55e215f5c832974a0e07ebe6f SHA512 0d369a847ba58c9f6cd732c3694974e6901a16c2cc05e793fe3c01f586fdc216117ca88168ce18e2a93fd98bf006245276c96814f6497a738d2647f3c3ba69e5 MISC metadata.xml 976 BLAKE2B 5283df869a4c21b2d99b78aa43aff2f273d868989749952b0a9302396eca8d2677cca72bcb877afb9b2b7a9f02d8b7f723ae7a8ed209ff734555a76f2b43c296 SHA512 4b241f369f20a6af6496784a3e0a5b5885476d213758615bac8a960bb18e92a4383bb3d5e9edd4863edf2061b0c85ec7a9b4e7f58a1c3ebc226c4ee5d5179c76 diff --git a/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild deleted file mode 100644 index f0ea0fd4ed27..000000000000 --- a/media-gfx/slic3r/slic3r-1.3.0-r3.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.0-r4.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r4.ebuild new file mode 100644 index 000000000000..d11cc8ac32fd --- /dev/null +++ b/media-gfx/slic3r/slic3r-1.3.0-r4.ebuild @@ -0,0 +1,114 @@ +# 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 new file mode 100644 index 000000000000..a437470e7df1 --- /dev/null +++ b/media-gfx/slic3r/slic3r-1.3.1_pre20200824-r1.ebuild @@ -0,0 +1,114 @@ +# 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/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-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-1.3.1_pre20200824.ebuild b/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild deleted file mode 100644 index 3d5a2d5dbff2..000000000000 --- a/media-gfx/slic3r/slic3r-1.3.1_pre20200824.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 - -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/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-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 index c492bce9fc3b..16f8d66dac36 100644 --- a/media-gfx/slic3r/slic3r-9999.ebuild +++ b/media-gfx/slic3r/slic3r-9999.ebuild @@ -18,7 +18,7 @@ RESTRICT="!test? ( test )" # check Build.PL for dependencies RDEPEND=" !=dev-lang/perl-5.16* - >=dev-libs/boost-1.55[threads] + >=dev-libs/boost-1.55[threads(+)] dev-perl/Class-XSAccessor dev-perl/Devel-CheckLib dev-perl/Devel-Size diff --git a/media-gfx/tachyon/Manifest b/media-gfx/tachyon/Manifest index 73a9943d5a40..d1c7f1f0b72d 100644 --- a/media-gfx/tachyon/Manifest +++ b/media-gfx/tachyon/Manifest @@ -1,5 +1,5 @@ AUX tachyon-0.99_beta6-r2-ldflags.patch 856 BLAKE2B 5d8587eac987a66758f0314afb5bba620fbbb99b32d295e4deb649a929ac19afd52c835f375d72bd2284b3cd4d9185c272090d2a27d06ea0220d1c59b03bb995 SHA512 2807689e3bad156d3d54a0f4dce5e6aaf7555750c6650aa3957bd3ae51922ed3f8489534528de45c22d75db85450340d674a621e608668cde972df12c03a63b0 AUX tachyon-0.99_beta6-r2-shared.patch 8043 BLAKE2B 6d559c22477de0e3148e374a8db2faa1e8249d0599409f9d8cfc843d06c1960639f74797414328c40a7fa46c9143cefb208ab68f4d47e3c0b8fd0dbde1ea951d SHA512 eb9c2e43c679030b410d5f9077e85969ee9ec3926f7c44eb9047c902f5834dd4734af3f07105f116b4dc23c0d420f87d67193a759d329810ca168ac4a28f95ad DIST tachyon-0.99b6.tar.gz 2981568 BLAKE2B 69e96362d5914db7cfeaf36a7c0fc57ebe2bff07c6c2c4b13107edb17146577df73ad7dbf740d402e322f1fb2df9cde79e634170ecd9d49037beb678de42df83 SHA512 4d0d707bf46528b87bfe1a05f490f40bcbee8f21271c5212247d4fd25956a27ad8a40b4621817a3f1c03495f1ba9eeb99b152929fdcd92c7118a35ef116f3f33 -EBUILD tachyon-0.99_beta6-r2.ebuild 2533 BLAKE2B 0b7ab33bba057b75b772dcacb5a6122526ed1e0a09b92f7e256755ece2374894667dd8fb6844dc5a8aafaf3e95e6943a2a9af534655991a37a0e543fc45f46a1 SHA512 4236ae35aff704933cb75a603eeb9b103754deb38a250d96532c8913106e93fc878b1867d5db57d7a300ee677b865b7e738fca14401e4925b05950591285e990 +EBUILD tachyon-0.99_beta6-r2.ebuild 2516 BLAKE2B 43687d7eaa3efb9ab3e660dc4b5e8641b13b16cdbbf3bbc78f56353e73b8100d78823266a038a6768e73969cd2d2d462f6bdbc818294361b0e51c35f14f1ec7e SHA512 c615c029a717d1421eefea0eeacecd13814ff7d0d9417cd4cc634e56755d56d8ea81e26f8ca5037d7c034d3cf21476a6e252e1801d052a000141519ba27bcd7f MISC metadata.xml 339 BLAKE2B 342dd48842a409d4be459fcfd339f485ed05f838cf9dfe4d3f5695cee5ca0dc3f09623c4b4adddc1661b02ae5f066e11b97551ec0ef0771269fd89972ebda7ad SHA512 ceba0ae3ec140c4efe0d1708243954fb3bc9804109727610079712a5ce91f5133197e61a2c3bb4dcfd6f743dcfcbc829cc68f5def0b2aa023e3eeb5dfa09a68a diff --git a/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild b/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild index 73976dc2018e..ab7037d8bf25 100644 --- a/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild +++ b/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild @@ -11,16 +11,14 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="A portable, high performance parallel ray tracing system" HOMEPAGE="http://jedi.ks.uiuc.edu/~johns/raytracer/" SRC_URI="http://jedi.ks.uiuc.edu/~johns/raytracer/files/${MY_PV}/${MY_P}.tar.gz" +S="${WORKDIR}/${PN}/unix" -SLOT="0" LICENSE="BSD" +SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~x64-macos" IUSE="doc examples jpeg mpi +opengl openmp png threads" -PATCHES=( "${FILESDIR}/${PF}-ldflags.patch" - "${FILESDIR}/${PF}-shared.patch" ) - -CDEPEND=" +DEPEND=" jpeg? ( virtual/jpeg:0= ) mpi? ( virtual/mpi ) opengl? ( @@ -28,14 +26,17 @@ CDEPEND=" virtual/opengl ) png? ( media-libs/libpng:0= )" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND}" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/${PN}/unix" +PATCHES=( + "${FILESDIR}/${PF}-ldflags.patch" + "${FILESDIR}/${PF}-shared.patch" +) src_prepare() { emakeconf=() + use jpeg && \ emakeconf+=( USEJPEG=-DUSEJPEG @@ -47,7 +48,7 @@ src_prepare() { USEPNG=-DUSEPNG PNGINC="$($(tc-getPKG_CONFIG) --cflags libpng)" PNGLIB="$($(tc-getPKG_CONFIG) --libs libpng)" - ) + ) if use mpi ; then sed \ @@ -96,7 +97,7 @@ src_install() { cd .. || die dodoc Changes README - insinto "/usr/include/${PN}" + insinto /usr/include/${PN} doins src/*.h use doc && docinto html && dodoc -r docs/tachyon/. -- cgit v1.2.3