diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
| commit | d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch) | |
| tree | 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /media-gfx/freecad | |
| parent | e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff) | |
gentoo resync : 15.06.2021
Diffstat (limited to 'media-gfx/freecad')
| -rw-r--r-- | media-gfx/freecad/Manifest | 6 | ||||
| -rw-r--r-- | media-gfx/freecad/freecad-0.19.1.ebuild | 5 | ||||
| -rw-r--r-- | media-gfx/freecad/freecad-0.19.2.ebuild | 6 | ||||
| -rw-r--r-- | media-gfx/freecad/freecad-9999.ebuild | 6 |
4 files changed, 17 insertions, 6 deletions
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index 1e99ae91ab70..bf8360050d3c 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 9127 BLAKE2B cf69851b05e27f24c98381faf0c6c2f93d6d37054de040d0e57a1ec18d03366ebf493fd82d3d8772a877b694f6407f566b29d15380032025623cb4c6a9f34955 SHA512 7017c98834efe6f77cc1829a8e2c8ddcf6d9cd3cec8a87a9e3772ddcdacef0eb7e580796025bf27eb4bcc2f8ddf0e0cca188283970aafa66d417448dfe3d034e -EBUILD freecad-0.19.2.ebuild 10911 BLAKE2B b362b77de9951f3677e5630f1b2003584e994415cf6b174a921d0248e934468eb5482784782c777d5cef63d36827ea4a79b3ac2d0c20b31eec024363848ffb01 SHA512 1b9bf200a7b1f5842cf8613385f4afe3cefdb184651a137263d8854be35c97e5e1b0c581c5378e113410b2fa7d713b0a9b80fac744ed32a0158e0f9880c60373 -EBUILD freecad-9999.ebuild 10865 BLAKE2B d1b8847121b361ef3bc8029889f41167507817ed31b3da398946b0cbaa5bf4c666d76d5f6c0c77ce4226fcd2fead9e2e7af0fd63ca1a24468b9123abce65b43c SHA512 eaebf90283467263aab13341993c300ff70aeb8c9b697e502f114fd3bb55838115bee227892c8bd0c124a5afee12c8ef1f77e329633742274111fe547954ddfa +EBUILD freecad-0.19.1.ebuild 9240 BLAKE2B f8dd7d7a0a04699a2fef44fbb204f5ba95b304aa851743aba899a1a80228bd8896c8ca9d20fe85ea4ebaf6e38fab5c94db619aa12c1cecb7b8534514b138ecca SHA512 2a9a5edc12a38413043f57762d6e1d8b622abbaa594f27db7711388b055f02b247854e56d2a92612165e35360f82e285cf924947c6bbf675b9dd95063012338f +EBUILD freecad-0.19.2.ebuild 11045 BLAKE2B ea1dff90bb4e9aaaaf16d8d67db8f1076003105f771ce2ee0101b87443f7e1d9414a44dc302d2b6ad3881378ed99dea84dc8731d97dc94da318252b2f8f66bab SHA512 d5aaef2a1d591a4f4c1bf419f2cdec029129e017ce6ae3bfe937b8250eea9c7741c459ba848ea5580151e417b5e08b46d18ddefdacc1bb49b7b86f3dd392bff1 +EBUILD freecad-9999.ebuild 10999 BLAKE2B 5599d2539df1c00804d441d0b1ba0a8b4860194585e573395dcc051e21e2685a47303a4b947b8c32978de16cb9ec52eb25e29bde5269b60deac035257ee307a0 SHA512 ba5e260db5d825e803906551accec9b6407aa91979c11c687932488bf1625953ab5dcfb6b1702e19b89b70ec7f1b58312e0ea681a6ca9eaf82d2549ce1bd54d3 MISC metadata.xml 3728 BLAKE2B dfe01a38234955bbea4ebc4d561fa15d06548f80338ace10091b8c8e5ab485532e462ad8ea35d52552fb87d18be05bc10953d100389cd4302e07adbb2cbc8a9a SHA512 c1c6693f824aaf9ace443bd5001a581187a4dbbb134a18454ef96d5dbd674b98284136d021f04316de0e0d8400bdb3e7f0dab5722e1ed0d45b33f0263c8ae6d3 diff --git a/media-gfx/freecad/freecad-0.19.1.ebuild b/media-gfx/freecad/freecad-0.19.1.ebuild index 5ffecf7de50a..0589fef979f4 100644 --- a/media-gfx/freecad/freecad-0.19.1.ebuild +++ b/media-gfx/freecad/freecad-0.19.1.ebuild @@ -39,7 +39,7 @@ for module in ${FREECAD_STABLE_MODULES}; do IUSE="${IUSE} +${module}" done for module in ${FREECAD_EXPERIMENTAL_MODULES}; do - IUSE="${IUSE} -${module}" + IUSE="${IUSE} ${module}" done unset module @@ -214,6 +214,9 @@ src_configure() { -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 diff --git a/media-gfx/freecad/freecad-0.19.2.ebuild b/media-gfx/freecad/freecad-0.19.2.ebuild index 4719298feb3b..dcceebb859a0 100644 --- a/media-gfx/freecad/freecad-0.19.2.ebuild +++ b/media-gfx/freecad/freecad-0.19.2.ebuild @@ -41,7 +41,7 @@ for module in ${FREECAD_STABLE_MODULES}; do IUSE="${IUSE} +${module}" done for module in ${FREECAD_EXPERIMENTAL_MODULES}; do - IUSE="${IUSE} -${module}" + IUSE="${IUSE} ${module}" done unset module @@ -227,6 +227,9 @@ src_configure() { -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 @@ -238,6 +241,7 @@ src_configure() { # 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} diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index 8b29013224e1..490b29d07939 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -41,7 +41,7 @@ for module in ${FREECAD_STABLE_MODULES}; do IUSE="${IUSE} +${module}" done for module in ${FREECAD_EXPERIMENTAL_MODULES}; do - IUSE="${IUSE} -${module}" + IUSE="${IUSE} ${module}" done unset module @@ -224,6 +224,9 @@ src_configure() { -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 @@ -236,6 +239,7 @@ src_configure() { # 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} |