From 70b82ae359a5538711e103b0e8dfb92654296644 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Oct 2018 12:48:57 +0100 Subject: gentoo resync : 27.10.2018 --- sci-libs/Manifest.gz | Bin 42185 -> 42190 bytes sci-libs/linux-gpib/Manifest | 2 +- sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild | 4 +- sci-libs/lmfit/Manifest | 5 +- sci-libs/lmfit/files/lmfit-8.0-cmake.patch | 59 +++++++++ sci-libs/lmfit/lmfit-7.0.ebuild | 6 +- sci-libs/lmfit/lmfit-8.0.ebuild | 25 ++++ sci-libs/opencascade/Manifest | 6 +- .../files/opencascade-7.3.0-fixed-DESTDIR.patch | 31 +++++ .../files/opencascade-7.3.0-vtk-compat.patch | 13 ++ sci-libs/opencascade/metadata.xml | 1 + sci-libs/opencascade/opencascade-7.3.0.ebuild | 140 +++++++++++++++++++++ 12 files changed, 284 insertions(+), 8 deletions(-) create mode 100644 sci-libs/lmfit/files/lmfit-8.0-cmake.patch create mode 100644 sci-libs/lmfit/lmfit-8.0.ebuild create mode 100644 sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch create mode 100644 sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch create mode 100644 sci-libs/opencascade/opencascade-7.3.0.ebuild (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index f0b29cb729aa..855abf45ecfa 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest index e1e4c01e9bb1..6db4b9ac95a9 100644 --- a/sci-libs/linux-gpib/Manifest +++ b/sci-libs/linux-gpib/Manifest @@ -6,5 +6,5 @@ DIST gpib_firmware-2006-11-12.tar.gz 169357 BLAKE2B 05f1be78545e025d76e2b9819a5d DIST linux-gpib-4.1.0.tar.gz 1529480 BLAKE2B b49df07f15d0f91b9d475052993421979d6776ef15aaa9b7e49632db9018f0cbd9ff38d12e2afa9e8027202e450dfc487ac9e2e6ab719086646d983cc41b3482 SHA512 037ed9e484a83caccb15d2d142eef6f1eec356ae972480ca7a676a318d3e9f844fc1911c1b30869b4bb14ef0b4cd10587a803426df9145966bafe22ca7316bd8 DIST linux-gpib-user-4.2.0_rc1.tar.gz 1098181 BLAKE2B 3f35eacfcffe04598322af6faed921b20b49959433b6e3c3a4bb2c0b9e3f71a2c00a13d7dec6b4e0bc415f1f8635945419805d5c9dec4ddcddb18fc7e8c5e7b4 SHA512 69d8b3059eab8d1d09006b4da13dbf3479c9a9d45e464767a13a2b1d6d32705e91e2800ca79015d302ea05e4fcbddb433dd817d208d751b6af8ac3867b7cee78 EBUILD linux-gpib-4.1.0.ebuild 6110 BLAKE2B 354731c55d29f49b1aaca808c45128f7826b322555d5340fa9fd11481a9ec171bfa8cd365c5329f033e46f49d677c1a2a9f56cb8bc02e911224025de51505563 SHA512 29592c5c05b72e8a4263781636aa9a68b3d4e38743f5c7228a9ed449ab1e877141c5f238789e2942dbaa8c883439086c87321e55a7f8be653b91056b9f677656 -EBUILD linux-gpib-4.2.0_rc1.ebuild 4564 BLAKE2B 2ef4a9d177727d993e5aa30163a055b01463cc8f161b8f23f3a1c2b56be18b03dbbc5c24fddadf755232a106392284447fae97541539776060bfafbc11008c2e SHA512 82188aa008de95105189777f0c47f2379eec67951698ffb60b096f02ace16d288f765678d03f801ca94e8e89dc9ad82a9d2653d42f36d78cef02c7210b23ee53 +EBUILD linux-gpib-4.2.0_rc1.ebuild 4552 BLAKE2B 5093b74f8d80489aa357b994d23bd4dae39fc1f979674db0e6e5bca9a5e40899f066347d244581550153e9189bbca504ae806114014534cefe5c2bb841bad871 SHA512 7a48a2016ebafad6e9d5e45e95673ae536d814348447b0fb691e72bbf117940d388d7f8e5c33d736ee30c0bdea20d9f6dbee22e60ac5819b460a048567ba8e5a MISC metadata.xml 688 BLAKE2B 405c816eb10feec819da0e5994c2ebe1e73ae4882cecf9f619bf30674b9ff499ae044cca42bad687d97cf3aef2a70eb826d5b07695cbde0c164a00cbac576e0a SHA512 d5af868c802d6c01b8267038cc5bdffc61677403ecb88cdfaf97f31d6b80d1e9318bcd507199d6a850df221cda2baf2869a1de4d732cde75a4aea2ec54f944b8 diff --git a/sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild b/sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild index 5bb251f06487..daf645239b60 100644 --- a/sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild +++ b/sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild @@ -70,7 +70,7 @@ src_compile() { INSTALL_MOD_PATH="${D}" \ HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \ UDEV_RULES_DIR="$(get_udevdir)"/rules.d \ - USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \ + USB_FIRMWARE_DIR=${FIRM_DIR} \ docdir=/usr/share/doc/${PF}/html } @@ -81,7 +81,7 @@ src_install() { INSTALL_MOD_PATH="${D}" \ HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \ UDEV_RULES_DIR="$(get_udevdir)"/rules.d \ - USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \ + USB_FIRMWARE_DIR=${FIRM_DIR} \ docdir=/usr/share/doc/${PF}/html install if use perl; then diff --git a/sci-libs/lmfit/Manifest b/sci-libs/lmfit/Manifest index 08aa24a94f1f..50b129ff04ef 100644 --- a/sci-libs/lmfit/Manifest +++ b/sci-libs/lmfit/Manifest @@ -1,8 +1,11 @@ AUX lmfit-7.0-cmake.patch 2226 BLAKE2B 317d232718c8172508d67de527161b074676bf62ff4da45d21a9444626fb2e84150c0b3fb099a6a9c5247ea2ec9b53c89b4b0f6d64f8b3d6352629e440e89ad4 SHA512 a9e95299baac18818a131ac67c82d49777e7cae6629d9f6bedc2e7f175f2d6a416888d973064df13d79315a5445d95c0e9a2e3d5fc1ac476fdb2b688dbe601e3 +AUX lmfit-8.0-cmake.patch 2251 BLAKE2B 4549bfb77187c0bc1040a3d3e4e3233445536d039b0d185e4a2d160fcf4d7c0ba2584bd0d943f9527c4af141688a0940763f7c23893263f7af1e294337710e65 SHA512 d3bcb2a9aa882c8240c873a65cc4b8d198ca26990d64d87988ea09e8398b10f83aedd4367bf65cb949091a6a4c3b4d70911658e46808d852cc26c3af2f6e032f DIST lmfit-5.1.tgz 345077 BLAKE2B df27621745601ffacd2110b28f3e3ea2b06d4c8c3c8fad5dda13bb4d6c2bd9f2a793ff88fab4f6d8c78075278bb26f3f424bd0074095e67ab1780a9d57b72b4b SHA512 1df6ed51d7f2137529793948f6c57ef3658932c9198776925a9f6e1d586352651c93aa053a064db7a201dbb848a7108f284223feff45171d142087539d834b29 DIST lmfit-6.4.tgz 388809 BLAKE2B 48aa619642ac3fd009ec6a8f8b44ee4c800fc3f33e2603b557218cdf37c789159dc3947a648d560b9e2dd7fef08a6644fd25ac61505859dc3b1d151eeea58c27 SHA512 2bd0f24dd4638345b8b1ce6803ddcf45ca3ef888eb285e99f9f158c2e30b0f96016d9d84a112cdbf28f2ba98470e54fe773416179a65264426043c9a5186757d DIST lmfit-7.0.tgz 37950 BLAKE2B a509110f70e7e863d1172b8d91f7439763f0434702f265751e9955494f4982b4c17f0baaa080af86e5cae7f535555e27b98b45ba6a529061d107e53bdb9fd698 SHA512 78f479786c6e5c417781c6d629f5a517335fac70df049fafdefd511485da4e542c988d69c998f96eaab4306160de4bb09a631ca6ffff74bba70c51428d734fc3 +DIST lmfit-8.0.tgz 42833 BLAKE2B d2ad9f5cd35997c8ce6827148e9ca748f3d14044f515a927442e9e5f57508cdfb729cd7172987a0e94284d7e93f7aafc0cb572137f201994c8d3ad9a9fb64c9b SHA512 3b4e4af6c70269f8752428d416e014d4e69df3f73b25e9ba16dd07afc03598a1dca08050cecba29a3b2651e003e703ba4412716100b1bb55b1830f74f16da676 EBUILD lmfit-5.1.ebuild 516 BLAKE2B 51a6715eeca7a7c3b6172530af4d6c908bdbcb3b3a5339e60c1af9bf60277b4275f49cfbf68eb3072f7f3f7864f9890ab486093253c72f0988673ea764b2513f SHA512 3ff7c3bb21bf2c95ce466f3168c2362a5fd3a0e8085621e0bae0d6b28191bc5d7368f4e09afc87ffe0720ac4740cdfeb27ee4bdc5cd83006f6837c2ac46775f9 EBUILD lmfit-6.4.ebuild 516 BLAKE2B 51a6715eeca7a7c3b6172530af4d6c908bdbcb3b3a5339e60c1af9bf60277b4275f49cfbf68eb3072f7f3f7864f9890ab486093253c72f0988673ea764b2513f SHA512 3ff7c3bb21bf2c95ce466f3168c2362a5fd3a0e8085621e0bae0d6b28191bc5d7368f4e09afc87ffe0720ac4740cdfeb27ee4bdc5cd83006f6837c2ac46775f9 -EBUILD lmfit-7.0.ebuild 536 BLAKE2B 29221f8196319bc8ff31d0ca6989ec50136e074b2bfcf5df90c012d21d416222ae9c83de1fa8f5d92129ee548960f7da1d0a580936df04d62036cc4ae8ad3d90 SHA512 7887abc5f96ed37a81d61c392829a9bfd7027dd7092387b2b20e812187c63d3c0379dc578b7d27129fc9701066f4b9ae04dbce11d166d2267227a4f423ed5e28 +EBUILD lmfit-7.0.ebuild 547 BLAKE2B ca24a9539256e249cb06d88ae1077a13a0c3ff62257d9eaa0751b3b56ecb6e4fd6bba4d8fa8553493eeefbd361b10e4fa056d807f151fce0077084d9220400e2 SHA512 1c4440f1d2a3a9ab910a740b731ae83645d7a62a38417639080cf5845880c5e498be08ac8a5a58545f6daeec963f9f784d19ed03054952ad4230ffdb7f5e1c86 +EBUILD lmfit-8.0.ebuild 543 BLAKE2B b77c765248184b82012abb73e17143784f6bacd85e72ee2d77585098294b5dcd9de00e9420d955f5ef4c32e27e93509748dcd7643b06f167c446d35fd47acd61 SHA512 5e0476aac93c71fc62c78e25e0b17b25dee340268857984c8e130bf698a5c232fbe70abfeac016e8f26e207b3f7f3ad6ab0a0baf9b4778c1559a85826e52f4cc MISC metadata.xml 328 BLAKE2B fe29c76e5725821e31de0e2b14e0b975d5b8838e9907bf9ddacdb40cddc0529550fe83468226bf045fcf7ad95b2e56d31dc564dcf7e6d9a0401317313e2f0f27 SHA512 e6cf20d6c9130a16ce37c44890f928cb5dca1bb67425d8cdcc1ab7db22f7c8e2ac513b11c33b0f0495e25dd389ac926f2099d0253288eb1ed290f30e655a1c4f diff --git a/sci-libs/lmfit/files/lmfit-8.0-cmake.patch b/sci-libs/lmfit/files/lmfit-8.0-cmake.patch new file mode 100644 index 000000000000..367aa2147ae4 --- /dev/null +++ b/sci-libs/lmfit/files/lmfit-8.0-cmake.patch @@ -0,0 +1,59 @@ +from: christoph junghans +date: mon, 22 oct 2018 21:00:00 -0600 +subject: [patch] cmake: minor distribution tweaks + +- use gnuinstalldirs to allow to configure install dirs +- allow to disable injecting c flags + +signed-off-by: christoph junghans +--- + cmakelists.txt | 7 +++++-- + lib/cmakelists.txt | 4 ++-- + man/cmakelists.txt | 2 +- + 3 files changed, 8 insertions(+), 5 deletions(-) + +diff -Naur lmfit-8.0.orig/CMakeLists.txt lmfit-8.0/CMakeLists.txt +--- lmfit-8.0.orig/CMakeLists.txt 2018-10-22 20:54:43.452888191 -0600 ++++ lmfit-8.0/CMakeLists.txt 2018-10-22 20:56:00.573905982 -0600 +@@ -13,9 +13,12 @@ + # --- Declare project-wide user flags, and set default values --- + option(FITTEST "Build with FitTest" OFF) + +-set(destination ${CMAKE_INSTALL_PREFIX}) ++include(GNUInstallDirs) + +-set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses -Wno-unknown-pragmas") ++option(INJECT_C_FLAGS "Inject a bunch of useful c flags" ON) ++if (INJECT_C_FLAGS) ++ set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses -Wno-unknown-pragmas") ++endif() + + add_subdirectory(lib) + add_subdirectory(demo) +diff -Naur lmfit-8.0.orig/lib/CMakeLists.txt lmfit-8.0/lib/CMakeLists.txt +--- lmfit-8.0.orig/lib/CMakeLists.txt 2018-10-22 20:54:43.452888191 -0600 ++++ lmfit-8.0/lib/CMakeLists.txt 2018-10-22 20:55:08.073213116 -0600 +@@ -17,9 +17,9 @@ + + install( + TARGETS ${library_name} LIBRARY +- DESTINATION ${destination}/lib ++ DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT Libraries) + install( + FILES ${inc_files} +- DESTINATION ${destination}/include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT Headers) +diff -Naur lmfit-8.0.orig/man/CMakeLists.txt lmfit-8.0/man/CMakeLists.txt +--- lmfit-8.0.orig/man/CMakeLists.txt 2018-10-22 20:54:43.452888191 -0600 ++++ lmfit-8.0/man/CMakeLists.txt 2018-10-22 20:55:08.073213116 -0600 +@@ -15,7 +15,7 @@ + ) + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section} +- DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man${section}" ++ DESTINATION "${CMAKE_INSTALL_MANDIR}/man${section}" + ) + endfunction() + diff --git a/sci-libs/lmfit/lmfit-7.0.ebuild b/sci-libs/lmfit/lmfit-7.0.ebuild index e895f1f06889..e4258a74110a 100644 --- a/sci-libs/lmfit/lmfit-7.0.ebuild +++ b/sci-libs/lmfit/lmfit-7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,11 +7,11 @@ inherit cmake-utils DESCRIPTION="library for Levenberg-Marquardt least-squares minimization and curve fitting" HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/lmfit" -SRC_URI="http://apps.jcns.fz-juelich.de/src/lmfit/${P}.tgz" +SRC_URI="http://apps.jcns.fz-juelich.de/src/lmfit/old/${P}.tgz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm ~x86" IUSE="" PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) diff --git a/sci-libs/lmfit/lmfit-8.0.ebuild b/sci-libs/lmfit/lmfit-8.0.ebuild new file mode 100644 index 000000000000..db342f68909e --- /dev/null +++ b/sci-libs/lmfit/lmfit-8.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils + +DESCRIPTION="library for Levenberg-Marquardt least-squares minimization and curve fitting" +HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/lmfit" +SRC_URI="http://apps.jcns.fz-juelich.de/src/lmfit/${P}.tgz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) + +src_configure() { + local mycmakeargs=( + -DINJECT_C_FLAGS=OFF + ) + + cmake-utils_src_configure +} diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest index cd5e1e550c3f..b9dfdd42dc97 100644 --- a/sci-libs/opencascade/Manifest +++ b/sci-libs/opencascade/Manifest @@ -2,6 +2,10 @@ AUX opencascade-6.8.0-fixed-DESTDIR.patch 2344 BLAKE2B 6e98f59e0209213937648828e AUX opencascade-6.9.1-vtk-6.3.patch 3686 BLAKE2B b91ca85b21aa154e467570b698bc4136c2e8fa4978f2b6ae459d8b4d2f5133d67d0bb5b8cedd158ab2a9539e9122eb9e0e50b6f8dfd45a1921ff7a14ed566b6b SHA512 8793d1384b7183a0d60dfae8c267358567e4dd16d3fcf4ade310fb63a63a2b82504f921a9700ea7d7b171b6a2b3bbcc891ed4405ea5e16579557a85301f17bf7 AUX opencascade-6.9.1-vtk-8.1.patch 2184 BLAKE2B eac2c546e909ccd5781a5f1230c0b8e2fd8c4bd857d3bb3108253d587975e31170adfa029b3087d325a1a6124ceda408c92b5579fa67c1b3ee311e2389d87c8a SHA512 6559060e4ffd8d409d9f939aa63f109343c8f60aac9e742505bbf7e68a728c68b61983a878ab4c008ffb5f09f1f359e523192dcba459e929bf202c0c15ee4e25 AUX opencascade-6.9.1-vtk-configure.patch 834 BLAKE2B 00475895b462d0396c4ab96bd645ad81f1180d04aad26e673b77d2363824740b5a0efe3bf75a587bea06a65b37a4ae2e41ceadad471eb4eb232783e3836450c0 SHA512 dbd6d3d2e520137a378dc437c37045f652d2dcf257b44647f9bc99397fde3fdecb88feaa010e1a893a6acdbe60d0e0e3ab9982b9fcd75dab95210069587445f7 +AUX opencascade-7.3.0-fixed-DESTDIR.patch 2272 BLAKE2B 30b0e045d872673ff65f00b471d9b7e5239f451329d8a0d3f0f367c811a387ef76c368eeddc3fe8d6684d7012190ae09aac66f2f91fdec7b2b4f4134b3a1463a SHA512 57e5195516d8f282c0ecd5de88e7e29f00a3748ae9ac82c74eca3b4f577dd4f4e6286e1deda424590a8c8b30cb1cd326d5c4f1634d0f7dba5bcb6ce88758a9f5 +AUX opencascade-7.3.0-vtk-compat.patch 431 BLAKE2B 468a804ed906555637110b0d7cb7a4ef994fae9130e7317e525d21598cc19b67e8c7bfaaaffea82ee8fb94a20c14b42e6ec02e2541ddfc54fc288c8d0f68fc7c SHA512 026ed3451c1c36e1f187be390773329ad011c9ebdb766b730ee04f9f9a844a307c4fefc6669c81187fd34d8264bea233680c7ee43afb566e695c3d64c37438a4 DIST opencascade-6.9.1.tgz 209589289 BLAKE2B 266d68042dbbb8c9bc5f167b9aefaf84b3f1568c25530acb36271443429e67972aae913ebcea09c9ea27164e2e3f007eb287350d7ad69486755cdcb713fdb1af SHA512 92f0fffb110344feebaba9dd4a3427419ea9e6db7b09556b7dcdb1248f2a868e3337587abf9921392435031431f3876cea4d4709fd9926604dcebbd6d26f8963 +DIST opencascade-7.3.0.tar.gz 48576720 BLAKE2B bf63ba77aabc8a8c92d694f78f24bab71c07e68e7ba4b8d5d90966733dbd9c0c83a76e35f059e798d4a60640d663330cd13a828b19ec02a5372053ab39a74aa6 SHA512 17eb1810b43a8b001867563f97801ceb38a7878fa53d9b39b46a5cf3dd676310fa80e83e90668a99ec6aff9d4f09733fb6c7be83c1e3ab4eaa9fda55888050da EBUILD opencascade-6.9.1-r2.ebuild 5774 BLAKE2B 4f2d3cdb9b50d3941fc4c1e4348571e048f056b80f6c9da8435069a5228b234470abcfc72193bf8b75e60bffbb8dd5473bfd640ac1a33ca6179364dd1bc3a434 SHA512 6016b22ea4b1255244d4f3b62ee886278e2ce8733c57488ed4192f4aee178ef50d32179a2e03ecd510aadba8d41f108f7ce56e00e3dd2715f262314900dfc49d -MISC metadata.xml 580 BLAKE2B 5a7b243a89950444f8c2f8115c60deabca6c4b53129dda885911e3d87125dc2e3e67f5821c95e5bd191f42b77dcbce2e0f289414dc98d90b8593932a71b15919 SHA512 5483b31f271b1492f499aec837b18dd4e5abe4e0b4ac8a4e3de17be6bd9467faa0629bd7423c9fad3a6c827eb74ecddaedf61f795a2c05757b69400ad0b68311 +EBUILD opencascade-7.3.0.ebuild 4365 BLAKE2B 23f295c3a85d8895da4d394de91a321ececece7bd3bd7d276c1170e3279b57059b88575395894b9b1ac920926efb951d8e5e66235df0915da9589ca16db729b0 SHA512 5f4cff9f0d304206aff60e4b682a8f1c9f0e0748cd10f300adda98375151f0cd28d2a3f33cb861471804d75fceef6bece50641f5f8bd961ac9f8ed53b19ff218 +MISC metadata.xml 628 BLAKE2B 890c96f583be59e59536e947e81e0c8161fafa25741dfcea265c4fa95248878b518684934c169a1c113b569b10ef9e0685e0747145f26ffaa8c045c83aa6923d SHA512 8aef8d8994a018f7351c7fb7c234dfbeccc0a46d76cd7ecd76687d42fa186d4e6b069c799584d1162b417d07ddb502bbd65349e71283927a4dea3504b79d85c3 diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch new file mode 100644 index 000000000000..c0a6363e19fd --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch @@ -0,0 +1,31 @@ +--- a/CMakeLists.txt 2016-11-25 11:50:18.000000000 +0100 ++++ b/CMakeLists.txt 2017-03-18 08:44:10.406668714 +0100 +@@ -885,7 +885,7 @@ if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}") + + set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}") + +- file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}") ++ file (WRITE \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}\" "${CUSTOM_CONTENT}") + else() + OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}") + endif() +@@ -906,7 +906,7 @@ + endforeach() + # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration + install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)") +-install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)") ++install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"\$ENV{DESTDIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)") + + foreach (OCCT_MODULE ${OCCT_MODULES}) + if (BUILD_MODULE_${OCCT_MODULE}) +--- a/adm/cmake/occt_macros.cmake 2016-11-25 11:50:18.000000000 +0100 ++++ b/adm/cmake/occt_macros.cmake 2017-03-18 08:44:10.406668714 +0100 +@@ -558,7 +558,7 @@ + "cmake_policy(PUSH) + cmake_policy(SET CMP0007 NEW) + string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE) +- file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\") ++ file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\") + foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES}) + file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT) + file (REMOVE \"\${TARGET_FILENAME}\") diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch b/sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch new file mode 100644 index 000000000000..71700a57f1dc --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch @@ -0,0 +1,13 @@ +--- a/src/IVtkVTK/IVtkVTK_ShapeData.cxx 2018-09-15 01:57:25.086783255 +0300 ++++ b/src/IVtkVTK/IVtkVTK_ShapeData.cxx 2018-09-15 01:58:20.877779839 +0300 +@@ -29,6 +29,10 @@ + #pragma warning(pop) + #endif + ++#ifdef vtkGenericDataArray_h ++#define InsertNextTupleValue InsertNextTypedTuple ++#endif ++ + IMPLEMENT_STANDARD_RTTIEXT(IVtkVTK_ShapeData,IVtk_IShapeData) + + //================================================================ diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml index 0dc2b1db4c13..7a267cb2e3be 100644 --- a/sci-libs/opencascade/metadata.xml +++ b/sci-libs/opencascade/metadata.xml @@ -8,6 +8,7 @@ Enable support for image i/o via media-libs/freeimage Use gl2ps PostScript printing library + Use OpenGL ES 2.0 Enable multithreading with the Intel Threads Building Block dev-cpp/tbb Enable Virtualisation Toolkit diff --git a/sci-libs/opencascade/opencascade-7.3.0.ebuild b/sci-libs/opencascade/opencascade-7.3.0.ebuild new file mode 100644 index 000000000000..48f4c0775e4d --- /dev/null +++ b/sci-libs/opencascade/opencascade-7.3.0.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit check-reqs cmake-utils eapi7-ver java-pkg-opt-2 + +MY_PV="$(ver_rs 1- '_')" + +DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange" +HOMEPAGE="http://www.opencascade.com/" +SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz" + +LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )" +SLOT="${PV}" +KEYWORDS="~amd64 ~x86" + +IUSE="debug doc examples ffmpeg freeimage gl2ps gles2 java +tbb +vtk" + +RDEPEND="app-eselect/eselect-opencascade + dev-lang/tcl:0= + dev-lang/tk:0= + dev-tcltk/itcl + dev-tcltk/itk + dev-tcltk/tix + media-libs/freetype:2 + media-libs/ftgl + virtual/glu + virtual/opengl + x11-libs/libXmu + ffmpeg? ( virtual/ffmpeg ) + freeimage? ( media-libs/freeimage ) + gl2ps? ( x11-libs/gl2ps ) + java? ( >=virtual/jdk-0:= ) + tbb? ( dev-cpp/tbb ) + vtk? ( sci-libs/vtk[rendering] ) +" + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) +" + +CHECKREQS_MEMORY="256M" +CHECKREQS_DISK_BUILD="3584M" + +CMAKE_BUILD_TYPE=Release + +S="${WORKDIR}/occt-V${MY_PV}" + +PATCHES=( + "${FILESDIR}/${P}-vtk-compat.patch" + "${FILESDIR}/${P}-fixed-DESTDIR.patch" +) + +pkg_setup() { + check-reqs_pkg_setup + use java && java-pkg-opt-2_pkg_setup +} + +src_prepare() { + cmake-utils_src_prepare + use java && java-pkg-opt-2_src_prepare + + # Do not pre-strip files + sed -i 's/_FLAGS_RELEASE} -s/_FLAGS_RELEASE}/g' adm/cmake/occt_defs_flags.cmake || die + + # Prepare environment variables used by Opencascade + echo "CASROOT=${EROOT}usr/$(get_libdir)/${P} +PATH=${EROOT}usr/$(get_libdir)/${P}/bin +LDPATH=${EROOT}usr/$(get_libdir)/${P}/lib + +CSF_EXCEPTION_PROMPT=1 +CSF_GraphicShr=${EROOT}usr/$(get_libdir)/${P}/lib/libTKOpenGl.so +CSF_IGESDefaults=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/XSTEPResource +CSF_LANGUAGE=us +CSF_MDTVTexturesDirectory=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/Textures +CSF_MIGRATION_TYPES=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/StdResource/MigrationSheet.txt +CSF_PluginDefaults=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/StdResource +CSF_ShadersDirectory=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/Shaders +CSF_SHMessage=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/SHMessage +CSF_StandardDefaults=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/StdResource +CSF_StandardLiteDefaults=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/StdResource +CSF_STEPDefaults=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/XSTEPResource +CSF_UnitsDefinition=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/UnitsAPI/Units.dat +CSF_XCAFDefaults=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/StdResource +CSF_XmlOcafResource=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/XmlOcafResource +CSF_XSMessage=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/XSMessage + +MMGT_CLEAR=1 +# use TBB for memory allocation optimizations +MMGT_OPT=2 +# The next MMGT_* variables are at their default values. +# They are here for documentation, so you can change them if needed +#MMGT_MMAP=1 +#MMGT_CELLSIZE=200 +#MMGT_NBPAGES=10000 +#MMGT_THRESHOLD=40000 +" > "${S}/${PV}" + +} + +src_configure() { + local mycmakeargs=( + -DBUILD_DOC_Overview=$(usex doc) + -DBUILD_WITH_DEBUG=$(usex debug) + -DCMAKE_INSTALL_PREFIX="/usr/$(get_libdir)/${P}" + -DINSTALL_DIR_CMAKE="/usr/$(get_libdir)/cmake" + -DINSTALL_DIR_DOC="/usr/share/doc/${P}" + -DINSTALL_SAMPLES=$(usex examples) + -DUSE_FFMPEG=$(usex ffmpeg) + -DUSE_FREEIMAGE=$(usex freeimage) + -DUSE_GL2PS=$(usex gl2ps) + -DUSE_GLES2=$(usex gles2) + -DUSE_TBB=$(usex tbb) + -DUSE_VTK=$(usex vtk) + ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + fperms go-w "/usr/$(get_libdir)/${P}/bin/draw.sh" + + if ! use examples; then + rm -rf "${ED%/}/usr/$(get_libdir)/${P}/share/${PN}/samples" || die + fi + + insinto "/etc/env.d/${PN}" + doins "${S}/${PV}" +} + +pkg_postinst() { + eselect ${PN} set ${PV} + elog "You can switch between available ${PN} implementations using eselect ${PN}." + elog "After upgrading OpenCASCADE you may have to rebuild packages depending on it." + elog "You get a list by running \"equery depends sci-libs/opencascade\"" + elog "revdep-rebuild does NOT suffice." +} -- cgit v1.2.3