]> Liquid.me.uk: Repositories - local/commitdiff
Changes to be committed:
authorroot <root@admin.liquid.me.uk>
Wed, 22 Jan 2025 19:35:19 +0000 (19:35 +0000)
committerroot <root@admin.liquid.me.uk>
Wed, 22 Jan 2025 19:35:19 +0000 (19:35 +0000)
deleted:    app-office/libreoffice/Manifest
deleted:    media-gfx/freecad/Manifest
deleted:    sci-libs/vtk/Manifest

28 files changed:
app-office/libreoffice/Manifest [deleted file]
app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch [deleted file]
app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch [deleted file]
app-office/libreoffice/files/libreoffice-7.0.3.1-qt5detect.patch [deleted file]
app-office/libreoffice/files/libreoffice-7.1.3.2-bashism.patch [deleted file]
app-office/libreoffice/libreoffice-7.1.9999.ebuild [deleted file]
app-office/libreoffice/metadata.xml [deleted file]
media-gfx/freecad/Manifest [deleted file]
media-gfx/freecad/files/99freecad [deleted file]
media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch [deleted file]
media-gfx/freecad/files/freecad-0.19.2-0001-fix-failing-test-workbench-testcase.patch [deleted file]
media-gfx/freecad/files/freecad-0.19.2-0002-fix-femtest-failure-with-yaml-load.patch [deleted file]
media-gfx/freecad/files/freecad-0.19.2-0003-fix-test-when-built-without-GUI.patch [deleted file]
media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch [deleted file]
media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch [deleted file]
media-gfx/freecad/freecad-0.19.1.ebuild [deleted file]
media-gfx/freecad/freecad-9999.ebuild [deleted file]
media-gfx/freecad/metadata.xml [deleted file]
sci-libs/vtk/Manifest [deleted file]
sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch [deleted file]
sci-libs/vtk/files/vtk-8.2.0-fno-common.patch [deleted file]
sci-libs/vtk/files/vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch [deleted file]
sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch [deleted file]
sci-libs/vtk/files/vtk-8.2.0-pugixml.patch [deleted file]
sci-libs/vtk/files/vtk-8.2.0-py38.patch [deleted file]
sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch [deleted file]
sci-libs/vtk/metadata.xml [deleted file]
sci-libs/vtk/vtk-8.2.0.ebuild [deleted file]

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
deleted file mode 100644 (file)
index 42de130..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6
-AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083
-AUX libreoffice-7.0.3.1-qt5detect.patch 1065 BLAKE2B bce0bb8d36f903516f437520e0b1a99080984933173ac30686136632a795f16b8e82f7bfb9dfe77b048154cf3616b3c6c96fd7c563284212ce4b3f9a4490f368 SHA512 e4273fcb2140c50c9030ef3ffeb451169c2e04fcf7e43650ad1d0928fa18ebe77dd482e2686fbaf9660aebfc17b9ce22b3dfa76f2248ae4af9bc51826e2785c2
-AUX libreoffice-7.1.3.2-bashism.patch 1092 BLAKE2B 0c14e7a282cafe030a39b15551695e61bd9fd70090589e4b94b0839a31b28e634f927b7a21e73de74ea890fc575ab23923a14ad9e226a626dec331db9014391f SHA512 abafcf90b93078c1ec8cc8bf807ec089fc0f79a3eb0823a1da4026a40281369998b72a2c894dc268c56af586476d39991099b99a2f9a74d03fac98b856d4e84d
-DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
-DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
-DIST 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 1180582 BLAKE2B b2b91f608cccdc823c11ce946ecf12b8cb7b1218fa8763ed7b64cf2567114f0703b4103a4eb2369874a4006112396470d1a0a72e6f186c9fac629cbca0fe18d6 SHA512 9fe106bbdb55365f589246e5a0d10bbe9b35224132b66a1823dc6361633a67f2acc0e8c393dc7ed70d086858d16d242b8806b8b2184c98e3d20d0be85bed9c44
-DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
-DIST 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip 153157 BLAKE2B e02fced286aab6f6597b04bba37186e6f7d0793ef807c4530e15da5464e9302880278472fdc79dc27a9be15600127bebe30651a6027ef1b0a7cfc40ce56a395a SHA512 a7c3044a0a7c67881f78eddc4b3faf05e29b20755a59cdbb9a0a49bd21be5aaa95d4ea5eaabdd6f005a421981fb7c55fee590d4c9592fe363ba27ae590652bd4
-DIST 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip 5750610 BLAKE2B b9f3ef8baa6fe11b2aef25ee6ebe36d7f4c0e688022f27c6a0186a94d909c4c2166ffe5d70644207f56971888e2478e57cd1e76a252abf3825987350c4c7de45 SHA512 8eaa9eed3bff16a16483d0754756c181089eb705ea34ded7f9f6db90a591cbce3f0551f28d097bd2f44de813cb818720c430e79e516939e0398b72bf4614f4cd
-DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
-DIST 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip 762419 BLAKE2B 9cbcda7d7644ede32a19b7bd5e29cae348229b9396a205809db480ed67bf12d243652d4ec3bf817f6d369e594a6d6ac3ebebfd03a80ed94f3106f78421d00077 SHA512 12ab17a4db3f7c834b21e59ff6f6f6456630d8626db7fb908867b20204295d4fba8969e79a3694ca66cb24e9f0e5a0fa4b9d2d3f748691b7f93985f9e666ce5f
-DIST 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip 2938721 BLAKE2B 86cf869561f653e449611ca2f014b340d7d0cba46b7d37a9455cbbc184b6a5c7e0e26ac84909aef08ae8639a402cef3bfc93ec901de018060f16413eaff0f748 SHA512 17ba9d2c0376fb7326d53bb1e3796610176a1af426d1b9073b5f7cf06c93d865e585c495e75c52fb8e426d7c453e751356a9ca9a54dc821ddadb6c8160ed5ba6
-DIST QR-Code-generator-1.4.0.tar.gz 146339 BLAKE2B b2cb329877426861e0245747ac1e8f1275ca7428b3c6768af60dec5c9bb46e93a3fee81fc77257e151604b5f6748c9f29582e9fccc2a4088747c95fe5f673124 SHA512 314a757bfdf9a38bcf07fd7a0103d28a2d1dd7311b8234761304efeef7bfdb740db78ab01e6b67e99a28d523cc2be9c1073b2de9d65e853d191c3dad19af56d0
-DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
-DIST ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip 2929311 BLAKE2B 02f59a60592d92f97f1098b501617d1408cabeab7b5a85b2f20ade584536e71823c392ce86084a944cada86310d48afb475535b47420f9b54eff582ce1d77d85 SHA512 58c1aa3965bf3a5f5d0facb67a5e42cec04e3f74e59cd7348ea2a9f6d9cafdce5552677c6b6d9c4cf2b31f52751695f2e53b2cee658e5f2eacb1393534a53c0e
-DIST ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip 743031 BLAKE2B 85ddb6e24475f32e4fa105add3ace0afa686b739e34958e8a47653668153d1bebcec77dbdeeb83bef566453e624fd7ebb0595f7d429005dac1c9af30f861e708 SHA512 654d2408c11349c90ae7d80b0c1997ee831004bc4ee36a706a0d8a84617fd0f82a97c5b45ab2388d60085afaec59a02eada007a8a1e14c3b366cabd36b7607ec
-DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
-DIST d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip 207563 BLAKE2B 0b7bb7b801a553950644ea1cdd522b43744ed6e2f5c71df0360e6e93f3f04eb33d9585c977783b0572a63f47017ba12becc5255a8aba9255c3e64ff7ae7eaef7 SHA512 71164f5e052db4fc16d1eb6ceb66d2b483d4912d874e371399047761e1d82e95d14288be5a7952c40f0ce39366f0706e726720e6e7171a00ce7bb55632cbf10c
-DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 BLAKE2B 8012d5c740b74b589f435d59934397111b9e645e965b2c6fd5c12bdc20fd6a9dc93410b40e61fd1dfd058747803bc113cfd6c73fc9e777e5f074cb6b750f93c0 SHA512 4476024e7f307617719714fbf0999409aa11d730bc316f833bb6627d1b83abb42460417be588c193ecb49d6b926dd1f411934d8a8abebe00a3e85c0047dad0a6
-DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
-DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743
-DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
-DIST libreoffice-7.0.6.2.tar.xz 236877536 BLAKE2B f752899e124f4671d6e68f601d5b7c2feaf0478aaa688c6a2767848ee05e672f54dc8f44ba032687172234fdc680d59c7227acb35867f07ed6ccb7e7686a1df1 SHA512 c9e1cc8fec2a23a35c179b81f47cc62a4eed4634c0a2ba8a0ca0bdd9f2a0c35e548a27524162cdd126ab5fb87b53996c401dbba2f1c1d3030fbbd9e53d0f786b
-DIST libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72
-DIST libreoffice-7.1.4.2.tar.xz 244336900 BLAKE2B 97374216593edb0b33fda80b19686bd95f517c36e9b2a347854af915be169b4d22963f765dbfa48ded75f64e94212e6d5cc862809ac775dc25c6b6bf1c1cc2c0 SHA512 b6c0d5ed91cd69e20e70b2fd5e6f53f05eb0fbd73c41208c317116c636b2ee8cfd848370389dd61d3c243b259ae66b9bd5de9341cd9009279ccfd299015c88c8
-DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-7.0.6.2.tar.xz 110758000 BLAKE2B 8247efb3d2f7db96243e231855104c15c7609b1266b707d62d5848394e80a3fc523dc5fb09eb9c2a331f3d2dbabca8bf2527c11aded713228fb52e65c8fac42e SHA512 6d2374d897daf5bbcbe74dc508bdd66ad60a8475caca97b6bfce849cd34637c8299398e6ad8bfe07b11547bf4b7e4f9f38c57bece4131b16c6f93af3568e32c1
-DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb
-DIST libreoffice-help-7.1.4.2.tar.xz 111785284 BLAKE2B 66b7da9d986a6abbc314dbb33be8297e7241f98983c4a864c26e3b6984d10d79f36a5307e11ed549289f2ab5e15ab05e7e81c9fad3d2ccd43dff114b327d266f SHA512 7730a17cd171d126b3b094abde1797524ff7250a5895d6d80b10b30944225d318001cbc66bdff06019be69434278dfd864aec71b0b9572c6385639620b416268
-DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
-EBUILD libreoffice-7.0.6.2.ebuild 19594 BLAKE2B 68734dbbe2e376125cbb67bac306710bd9f8702e0878154d691239d54db6f91f0b034fe80110373923bab859713dd230198a0bae3993ac05445a177a2950a443 SHA512 446260b36380a09e642d99e7fae5c4e9896882ff90ea5307ecb1caa99cceb54ed818903f8c2600d5c2fc4caca1f3e56b0885d29b7140048ab6a812c9413b40fb
-EBUILD libreoffice-7.1.3.2.ebuild 19593 BLAKE2B 0ad7019e0cef8ab019f5993897ba2641c95258cf21251b0b86266a1c9af92e01153895be1198b234ad4381546366642412739ba79d9aee1cb258ae2bcd48f717 SHA512 909cf68a3d06c287feac0b104a9f3e262e5216b11722029f486e2e982f99d07d259db4e04125c9016d19c350d7599f5e6b72ffbae59c9bb070d4569136bda740
-EBUILD libreoffice-7.1.4.2.ebuild 19604 BLAKE2B 5cfcaeb55d88132f18c70f268d0ca070a041a00c071dc46bca6b0bbac064841c5ce902c452ec9ca27e8d946f9c3fa1b8d9807279d11671130a253700ab62dc78 SHA512 653d02dd4736e98dd1584b9dc906381476d00476bc44a45ad575d5547ec93420bd4aaa8a414699831fe09d2b7b8a63460f9af219b9e0dd6a7bb2ea5e5933ebd7
-EBUILD libreoffice-7.1.9999.ebuild 19525 BLAKE2B afead95ec1eb53d7b769b78e330b6a48fcf8174fca52aa078f21cf08a2b82815a8fd1fc42e38030dd02f727b6d15a893f2e092f8a81d3120e9f21746608a5694 SHA512 226e1ced83acdef1a9ac7e7153dd59995970a4783bbab4a8c93542394d185659be78ce57f53adbb3953252aaf9fed42419707fa82525df1d7d524ddae37d03aa
-EBUILD libreoffice-9999.ebuild 19509 BLAKE2B 3306034bb07d8256824521859744e8dd4e952c8f2fbfd9243890f092a1005b51afceefd74f9c44a1bc5aeb4a041adba2f1ac1fda6ea01ce3cfd454cce99f7f02 SHA512 36607691f05133d7d3a3c1c4a5dea36bb553e7f7e1020eb70a1dc02b7a7344fe57682e5feb1b7b022a2888d9f0d55d5e29160ce09fdd8b58fa4cd5f2d89d9a46
-MISC metadata.xml 1221 BLAKE2B 2cc713dbc6d112ac21f8846f9dad48c09972c0d6846a253773280564cf9370934ec798a1579d894d7679c591045542cf2c8cb8a308bf097ce5eac64f40fda3f0 SHA512 c1ab6a23d6fa4ed6b2d77b08c895f653890998a8ed7fb2fa69251adacc9a96e32c0d1298a2b7c287efe85d37a2707e740b6b036174b7b6e39d37a25e3866e957
diff --git a/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch b/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch
deleted file mode 100644 (file)
index a6e732f..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/shell/source/unix/misc/senddoc.sh        2017-06-15 15:44:22.000000000 +0200
-+++ b/shell/source/unix/misc/senddoc.sh        2017-06-25 01:00:08.525435930 +0200
-@@ -389,6 +389,8 @@
-         elif [ -n "$DESKTOP_LAUNCH" ]; then
-             # http://lists.freedesktop.org/pipermail/xdg/2004-August/002873.html
-             MAILER=${DESKTOP_LAUNCH}
-+        elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open5 ] ; then
-+            MAILER=/usr/bin/kde-open5
-         elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open ] ; then
-             MAILER=/usr/bin/kde-open
-         elif [ -x /usr/bin/xdg-open ] ; then
diff --git a/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch b/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch
deleted file mode 100644 (file)
index ea6eb8b..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/bin/distro-install-desktop-integration   2018-10-29 20:55:29.000000000 +0100
-+++ b/bin/distro-install-desktop-integration   2018-11-22 02:03:36.464866894 +0100
-@@ -39,22 +39,20 @@
- create_man_link()
- {
--    echo "Install $MANDIR/man1/$1.1.gz"
-+    echo "Install $MANDIR/man1/$1.1"
-     mkdir -p $DESTDIR$MANDIR/man1
-     echo ".so man1/$2.1" >| $DESTDIR$MANDIR/man1/$1.1
--    gzip -f $DESTDIR$MANDIR/man1/$1.1
--    test -f "$DESTDIR/$3" && echo "$MANDIR/man1/$1.1.gz" >>"$DESTDIR/$3"
-+    test -f "$DESTDIR/$3" && echo "$MANDIR/man1/$1.1" >>"$DESTDIR/$3"
- }
- install_man()
- {
--    echo "Install $MANDIR/man1/$1.1.gz"
-+    echo "Install $MANDIR/man1/$1.1"
-     mkdir -p $DESTDIR$MANDIR/man1
-     cp "${SRCDIR?}"/sysui/desktop/man/$1.1 $DESTDIR$MANDIR/man1 || exit 1;
--    gzip -f $DESTDIR$MANDIR/man1/$1.1
--    test -f "$DESTDIR/$2" && echo "$MANDIR/man1/$1.1.gz" >>"$DESTDIR/$2"
-+    test -f "$DESTDIR/$2" && echo "$MANDIR/man1/$1.1" >>"$DESTDIR/$2"
- }
diff --git a/app-office/libreoffice/files/libreoffice-7.0.3.1-qt5detect.patch b/app-office/libreoffice/files/libreoffice-7.0.3.1-qt5detect.patch
deleted file mode 100644 (file)
index cc4e8e4..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-Don't let PATH get in the way of proper Qt5 detection.
-It could lead to broken configure due to mismanaged qtchooser config.
-
---- a/configure.ac     2020-11-21 16:35:58.433794709 +0100
-+++ b/configure.ac     2020-11-21 18:02:41.835207197 +0100
-@@ -11819,7 +11819,7 @@
-     qt5_test_library="libQt5Widgets.so"
-     dnl Check for qmake5
--    AC_PATH_PROGS( QMAKE5, [qmake-qt5 qmake], no, [$QT5DIR/bin:$PATH])
-+    AC_PATH_PROGS( QMAKE5, [qmake-qt5 qmake], no, [$QT5DIR/bin])
-     if test "$QMAKE5" = "no"; then
-         AC_MSG_ERROR([Qmake not found.  Please specify the root of your Qt5 installation by exporting QT5DIR before running "configure".])
-     else
-@@ -11886,7 +11886,7 @@
-     dnl Check for Meta Object Compiler
--    AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [`dirname $qt5_libdir`/bin:$QT5DIR/bin:$PATH])
-+    AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [$QT5DIR/bin])
-     if test "$MOC5" = "no"; then
-         AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
- the root of your Qt installation by exporting QT5DIR before running "configure".])
diff --git a/app-office/libreoffice/files/libreoffice-7.1.3.2-bashism.patch b/app-office/libreoffice/files/libreoffice-7.1.3.2-bashism.patch
deleted file mode 100644 (file)
index 36d43f2..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2c4dd73c4c9f471fa2083f9f99dd27a7148f3175 Mon Sep 17 00:00:00 2001
-From: Julien Nabet <serval2412@yahoo.fr>
-Date: Mon, 17 May 2021 18:43:48 +0200
-Subject: tdf#142335: fix bashism in configure.ac
-
-Thanks to Matt Whitlock!
-
-(also reported in https://bugs.gentoo.org/show_bug.cgi?id=780432)
-
-Change-Id: I38fec6faf9a929adf1f300b8c369ec6c16a91ed8
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115716
-Tested-by: Jenkins
-Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d7b831435713..3d14c5e4258c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2682,7 +2682,7 @@ AC_SUBST(ENABLE_RELEASE_BUILD)
- AC_SUBST(GET_TASK_ALLOW_ENTITLEMENT)
- AC_MSG_CHECKING([whether to build a Community flavor])
--if test -z "$enable_community_flavor" -o "$enable_community_flavor" == "yes"; then
-+if test -z "$enable_community_flavor" -o "$enable_community_flavor" = "yes"; then
-     AC_DEFINE(HAVE_FEATURE_COMMUNITY_FLAVOR)
-     AC_MSG_RESULT([yes])
- else
--- 
-cgit v1.2.1
-
diff --git a/app-office/libreoffice/libreoffice-7.1.9999.ebuild b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
deleted file mode 100644 (file)
index a2da468..0000000
+++ /dev/null
@@ -1,661 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
-       https://dev-builds.libreoffice.org/pre-releases/src
-       https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
-       https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
-       for i in ${DEV_URI}; do
-               SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
-               SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
-       done
-       unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
-       # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
-       "${ADDONS_URI}/dtoa-20180411.tgz"
-       # not packaged in Gentoo, https://skia.org/
-       "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
-       # QR code generating library for >=libreoffice-6.4, bug #691740
-       "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
-       "base? (
-               ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
-               ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-               ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-               ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-               ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-               ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-               ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-               ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-               ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-               ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-               ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-               ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-       )"
-       "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-       # no release for 8 years, should we package it?
-       "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-       # Does not build with 1.6 rhino at all
-       "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-       # requirement of rhino
-       "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-       # not packageable
-       "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-       base? ( firebird java )
-       bluetooth? ( dbus )
-       gtk? ( dbus )
-       libreoffice_extensions_nlpsolver? ( java )
-       libreoffice_extensions_scripting-beanshell? ( java )
-       libreoffice_extensions_scripting-javascript? ( java )
-       libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
-
-BDEPEND="
-       dev-util/intltool
-       sys-devel/bison
-       sys-devel/flex
-       sys-devel/gettext
-       virtual/pkgconfig
-       odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-       app-arch/unzip
-       app-arch/zip
-       app-crypt/gpgme[cxx]
-       app-text/hunspell:=
-       >=app-text/libabw-0.1.0
-       >=app-text/libebook-0.1
-       app-text/libepubgen
-       >=app-text/libetonyek-0.1
-       app-text/libexttextcat
-       app-text/liblangtag
-       >=app-text/libmspub-0.1.0
-       >=app-text/libmwaw-0.3.1
-       >=app-text/libnumbertext-1.0.6
-       >=app-text/libodfgen-0.1.0
-       app-text/libqxp
-       app-text/libstaroffice
-       app-text/libwpd:0.10[tools]
-       app-text/libwpg:0.3
-       >=app-text/libwps-0.4
-       app-text/mythes
-       >=dev-cpp/clucene-2.3.3.4-r2
-       >=dev-cpp/libcmis-0.5.2
-       dev-db/unixODBC
-       >=games-engines/box2d-2.4.1:0
-       dev-lang/perl
-       >=dev-libs/boost-1.72.0:=[nls]
-       dev-libs/expat
-       dev-libs/hyphen
-       dev-libs/icu:=
-       dev-libs/libassuan
-       dev-libs/libgpg-error
-       dev-libs/liborcus:0/0.16
-       dev-libs/librevenge
-       dev-libs/libxml2
-       dev-libs/libxslt
-       dev-libs/nspr
-       dev-libs/nss
-       >=dev-libs/redland-1.0.16
-       >=dev-libs/xmlsec-1.2.28[nss]
-       media-gfx/fontforge
-       media-gfx/graphite2
-       media-libs/fontconfig
-       media-libs/freetype:2
-       >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-       media-libs/lcms:2
-       >=media-libs/libcdr-0.1.0
-       >=media-libs/libepoxy-1.3.1[X]
-       >=media-libs/libfreehand-0.1.0
-       media-libs/libpagemaker
-       >=media-libs/libpng-1.4:0=
-       >=media-libs/libvisio-0.1.0
-       media-libs/libzmf
-       >=net-libs/neon-0.31.1:=
-       net-misc/curl
-       sci-mathematics/lpsolve
-       sys-libs/zlib
-       virtual/glu
-       virtual/jpeg:0
-       virtual/opengl
-       x11-libs/cairo[X]
-       x11-libs/libXinerama
-       x11-libs/libXrandr
-       x11-libs/libXrender
-       accessibility? (
-               $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-       )
-       bluetooth? (
-               dev-libs/glib:2
-               net-wireless/bluez
-       )
-       clang? (
-               || (
-                       (       sys-devel/clang:12
-                               sys-devel/llvm:12
-                               =sys-devel/lld-12*      )
-                       (       sys-devel/clang:11
-                               sys-devel/llvm:11
-                               =sys-devel/lld-11*      )
-                       (       sys-devel/clang:10
-                               sys-devel/llvm:10
-                               =sys-devel/lld-10*      )
-               )
-       )
-       coinmp? ( sci-libs/coinor-mp )
-       cups? ( net-print/cups )
-       dbus? ( sys-apps/dbus[X] )
-       eds? (
-               dev-libs/glib:2
-               gnome-base/dconf
-               gnome-extra/evolution-data-server
-       )
-       firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
-       gstreamer? (
-               media-libs/gstreamer:1.0
-               media-libs/gst-plugins-base:1.0
-       )
-       gtk? (
-               dev-libs/glib:2
-               dev-libs/gobject-introspection
-               gnome-base/dconf
-               media-libs/mesa[egl]
-               x11-libs/gtk+:3[X]
-               x11-libs/pango
-       )
-       kde? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtwidgets:5
-               dev-qt/qtx11extras:5
-               kde-frameworks/kconfig:5
-               kde-frameworks/kcoreaddons:5
-               kde-frameworks/ki18n:5
-               kde-frameworks/kio:5
-               kde-frameworks/kwindowsystem:5
-       )
-       ldap? ( net-nds/openldap )
-       libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-       libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-       mariadb? ( dev-db/mariadb-connector-c )
-       !mariadb? ( dev-db/mysql-connector-c )
-       pdfimport? ( app-text/poppler:=[cxx] )
-       postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-#        tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
-       >=dev-libs/libatomic_ops-7.2d
-       dev-perl/Archive-Zip
-       >=dev-util/cppunit-1.14.0
-       >=dev-util/gperf-3.1
-       dev-util/mdds:1/1.5
-       media-libs/glm
-       sys-devel/ucpp
-       x11-base/xorg-proto
-       x11-libs/libXt
-       x11-libs/libXtst
-       java? (
-               dev-java/ant-core
-               || (
-                       dev-java/openjdk:11
-                       dev-java/openjdk-bin:11
-               )
-       )
-       test? (
-               app-crypt/gnupg
-               dev-util/cppunit
-               media-fonts/dejavu
-               media-fonts/liberation-fonts
-       )
-"
-RDEPEND="${COMMON_DEPEND}
-       !app-office/libreoffice-bin
-       !app-office/libreoffice-bin-debug
-       media-fonts/liberation-fonts
-       || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-       java? ( || (
-               dev-java/openjdk:11
-               dev-java/openjdk-jre-bin:11
-               >=virtual/jre-1.8
-       ) )
-       kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
-       PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
-       # Translations are not reliable on live ebuilds
-       # rather force people to use english only.
-       PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
-       # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
-       # not upstreamable stuff
-       "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-       "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-       "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
-       CHECKREQS_MEMORY="512M"
-       if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-               CHECKREQS_DISK_BUILD="22G"
-       else
-               CHECKREQS_DISK_BUILD="6G"
-       fi
-       check-reqs_$1
-}
-
-pkg_pretend() {
-       if use x86; then
-               elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
-               elog "most notably Report Builder in LibreOffice Base, will not be available."
-               elog "See also: https://bugs.gentoo.org/785640"
-       else
-               use base ||
-                       ewarn "If you plan to use Base application you must enable USE base."
-               use java ||
-                       ewarn "Without USE java, several wizards are not going to be available."
-       fi
-
-       [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
-       java-pkg-opt-2_pkg_setup
-       python-single-r1_pkg_setup
-       xdg_environment_reset
-
-       [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
-       default
-
-       if [[ ${MY_PV} = *9999* ]]; then
-               local base_uri branch mypv
-               base_uri="https://anongit.freedesktop.org/git"
-               branch="master"
-               mypv=${MY_PV/.9999}
-               [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
-               git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
-               git-r3_checkout "${base_uri}/${PN}/core"
-               LOCOREGIT_VERSION=${EGIT_VERSION}
-
-               git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
-               git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
-       fi
-}
-
-src_prepare() {
-       default
-
-       # sandbox violations on many systems, we don't need it. Bug #646406
-       sed -i \
-               -e "/KF5_CONFIG/s/kf5-config/no/" \
-               configure.ac || die "Failed to disable kf5-config"
-
-       AT_M4DIR="m4" eautoreconf
-       # hack in the autogen.sh
-       touch autogen.lastrun
-
-       # sed in the tests
-       sed -i \
-               -e "s#all : build unitcheck#all : build#g" \
-               solenv/gbuild/Module.mk || die
-       sed -i \
-               -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
-               -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
-               Makefile.in || die
-
-       sed -i \
-               -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
-               -e "s,\$INSTALLDIRNAME.sh,${PN}," \
-               bin/distro-install-desktop-integration || die
-
-       if use branding; then
-               # hack...
-               mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
-       fi
-
-       # Don't list pdfimport support in desktop when built with none, bug # 605464
-       if ! use pdfimport; then
-               sed -i \
-                       -e ":MimeType: s:application/pdf;::" \
-                       -e ":Keywords: s:pdf;::" \
-                       sysui/desktop/menus/draw.desktop || die
-       fi
-}
-
-src_configure() {
-       # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
-       # Note: these are for Gentoo use ONLY. For your own distribution, please get
-       # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
-       local google_default_client_id="329227923882.apps.googleusercontent.com"
-       local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
-       # Show flags set at the beginning
-       einfo "Preset CFLAGS:    ${CFLAGS}"
-       einfo "Preset LDFLAGS:   ${LDFLAGS}"
-
-       if use clang ; then
-               # Force clang
-               einfo "Enforcing the use of clang due to USE=clang ..."
-               AR=llvm-ar
-               CC=${CHOST}-clang
-               CXX=${CHOST}-clang++
-               NM=llvm-nm
-               RANLIB=llvm-ranlib
-               LDFLAGS+=" -fuse-ld=lld"
-       else
-               # Force gcc
-               einfo "Enforcing the use of gcc due to USE=-clang ..."
-               AR=gcc-ar
-               CC=${CHOST}-gcc
-               CXX=${CHOST}-g++
-               NM=gcc-nm
-               RANLIB=gcc-ranlib
-       fi
-
-       if use custom-cflags ; then
-               elog "USE=custom-cflags has been selected. You are on your own to make sure that"
-               elog "the build succeeds. Good luck!"
-       else
-               strip-flags
-       fi
-
-       export LO_CLANG_CC=${CC}
-       export LO_CLANG_CXX=${CXX}
-
-       # Show flags set at the end
-       einfo "  Used CFLAGS:    ${CFLAGS}"
-       einfo "  Used LDFLAGS:   ${LDFLAGS}"
-
-       # Ensure we use correct toolchain
-       tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-       if use vulkan && ! use clang ; then
-               ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
-       fi
-
-       # optimization flags
-       export GMAKE_OPTIONS="${MAKEOPTS}"
-       # System python enablement:
-       export PYTHON_CFLAGS=$(python_get_CFLAGS)
-       export PYTHON_LIBS=$(python_get_LIBS)
-
-       use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
-       local gentoo_buildid="Gentoo official package"
-       if [[ -n ${LOCOREGIT_VERSION} ]]; then
-               gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
-       fi
-
-       # system headers/libs/...: enforce using system packages
-       # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
-       # --enable-cairo: ensure that cairo is always required
-       # --enable-*-link: link to the library rather than just dlopen on runtime
-       # --enable-release-build: build the libreoffice as release
-       # --disable-fetch-external: prevent dowloading during compile phase
-       # --enable-extension-integration: enable any extension integration support
-       # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-       # --disable-report-builder: too much java packages pulled in without pkgs
-       # --without-system-sane: just sane.h header that is used for scan in writer,
-       #   not linked or anything else, worthless to depend on
-       # --disable-pdfium: not yet packaged
-       # --without-system-qrcodegen: has no real build system and LO is the only user
-       local myeconfargs=(
-               --with-system-dicts
-               --with-system-epoxy
-               --with-system-headers
-               --with-system-jars
-               --with-system-libs
-               --enable-build-opensymbol
-               --enable-cairo-canvas
-               --enable-largefile
-               --enable-mergelibs
-               --enable-neon
-               --enable-python=system
-               --enable-randr
-               --enable-release-build
-               --disable-breakpad
-               --disable-bundle-mariadb
-               --disable-ccache
-               --disable-epm
-               --disable-fetch-external
-               --disable-gtk3-kde5
-               --disable-online-update
-               --disable-openssl
-               --disable-pdfium
-               --disable-vlc
-               --with-extra-buildid="${gentoo_buildid}"
-               --enable-extension-integration
-               --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
-               --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
-               --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
-               --with-external-tar="${DISTDIR}"
-               --with-lang=""
-               --with-parallelism=$(makeopts_jobs)
-               --with-system-ucpp
-               --with-tls=nss
-               --with-vendor="Gentoo Foundation"
-               --with-x
-               --without-fonts
-               --without-myspell-dicts
-               --with-help="html"
-               --without-helppack-integration
-               --with-system-gpgmepp
-               --without-system-jfreereport
-               --without-system_apache_commons
-               --without-system-sane
-               --without-system-qrcodegen
-               $(use_enable base report-builder)
-               $(use_enable bluetooth sdremote-bluetooth)
-               $(use_enable coinmp)
-               $(use_enable cups)
-               $(use_enable dbus)
-               $(use_enable debug)
-               $(use_enable eds evolution2)
-               $(use_enable firebird firebird-sdbc)
-               $(use_enable gstreamer gstreamer-1-0)
-               $(use_enable gtk gtk3)
-               $(use_enable kde kf5)
-               $(use_enable kde qt5)
-               $(use_enable ldap)
-               $(use_enable odk)
-               $(use_enable pdfimport)
-               $(use_enable postgres postgresql-sdbc)
-               $(use_enable vulkan skia)
-               $(use_with accessibility lxml)
-               $(use_with coinmp system-coinmp)
-               $(use_with googledrive gdrive-client-id ${google_default_client_id})
-               $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
-               $(use_with java)
-               $(use_with odk doxygen)
-       )
-
-       if use eds || use gtk; then
-               myeconfargs+=( --enable-dconf --enable-gio )
-       else
-               myeconfargs+=( --disable-dconf --disable-gio )
-       fi
-
-       # libreoffice extensions handling
-       for lo_xt in ${LO_EXTS}; do
-               if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
-                       myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
-               else
-                       myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
-               fi
-       done
-
-       if use java; then
-               # hsqldb: system one is too new
-               myeconfargs+=(
-                       --without-junit
-                       --without-system-hsqldb
-                       --with-ant-home="${ANT_HOME}"
-               )
-               if has_version "dev-java/openjdk:11"; then
-                       myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
-               elif has_version "dev-java/openjdk-bin:11"; then
-                       myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
-               fi
-
-               use libreoffice_extensions_scripting-beanshell && \
-                       myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
-               use libreoffice_extensions_scripting-javascript && \
-                       myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
-       fi
-
-       is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
-       MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
-       econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-       # more and more LO stuff tries to use OpenGL, including tests during build
-       # bug 501508, bug 540624, bug 545974 and probably more
-       addpredict /dev/dri
-       addpredict /dev/ati
-       addpredict /dev/nvidiactl
-
-       local target
-       use test && target="build" || target="build-nocheck"
-
-       # this is not a proper make script
-       make ${target} || die
-}
-
-src_test() {
-       make unitcheck || die
-       make slowcheck || die
-}
-
-src_install() {
-       # This is not Makefile so no buildserver
-       emake DESTDIR="${D}" distro-pack-install -o build -o check
-
-       # bug 593514
-       if use gtk; then
-               dosym libreoffice/program/liblibreofficekitgtk.so \
-                       /usr/$(get_libdir)/liblibreofficekitgtk.so
-       fi
-
-       # bash completion aliases
-       bashcomp_alias \
-               libreoffice \
-               unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
-       if use branding; then
-               insinto /usr/$(get_libdir)/${PN}/program
-               newins "${WORKDIR}/branding-sofficerc" sofficerc
-               dodir /etc/env.d
-               echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
-       fi
-
-       # bug 703474
-       insinto /usr/include
-       doins -r include/LibreOfficeKit
-
-       local lodir=/usr/$(get_libdir)/libreoffice
-       # patching this would break tests
-       cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
-       sed -e "/^import sys/d" -e "/^import os/d" \
-               -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
-       cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
-       cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
-       # more system pyuno mess
-       sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
-               -i "${D}"${lodir}/program/officehelper.py || die
-
-       python_optimize "${D}"${lodir}/program
-       # link python bridge in site-packages, bug 667802
-       local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
-       for py in uno.py unohelper.py officehelper.py; do
-               dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
-               while IFS="" read -d $'\0' -r pyc; do
-                       pyc=${pyc//*\/}
-                       dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
-               done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
-       done
-}
-
-pkg_postinst() {
-       xdg_icon_cache_update
-       xdg_desktop_database_update
-       xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-       xdg_icon_cache_update
-       xdg_desktop_database_update
-       xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
deleted file mode 100644 (file)
index 4ac9743..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>office@gentoo.org</email>
-    <name>Gentoo Office project</name>
-  </maintainer>
-  <longdescription>LibreOffice is the successor of OpenOffice.org. 
-This ebuild allows you to compile it yourself. Unfortunately this 
-compilation can take up to a day depending on the speed of your 
-computer. It will however make a snappier LibreOffice than the binary 
-version</longdescription>
-  <use>
-    <flag name="base">Enable full support for LibreOffice Base databases (involves additional bundled libs)</flag>
-    <flag name="clang">Use Clang compiler instead of GCC</flag>
-    <flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
-    <flag name="googledrive">Enable support for remote files on Google Drive</flag>
-    <flag name="mariadb">Prefer mariadb connector over mysql connector</flag>
-    <flag name="odk">Build the Office Development Kit</flag>
-    <flag name="pdfimport">Enable PDF import via the Poppler library</flag>
-    <flag name="vulkan">Enable Vulkan usage via the skia library (clang recommended)</flag>
-  </use>
-</pkgmetadata>
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
deleted file mode 100644 (file)
index 6fb748c..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-AUX 99freecad 82 BLAKE2B b0b4f8f9013952f686cd1e626efe221f3efa127c1417f8ce77fc640da439ac2bcd07a1b73f97ae52ee1fa1b77a21812f534b710d1ace63ca7e8093e76b6f5049 SHA512 c78d71004f103785ffe1133fea71c0baf5f1bad1037051e1c3a279b9fc8a346c7ec578b1508c1608470de8c199f7fd46378f2e851b01834e7749738c8eb70598
-AUX freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch 797 BLAKE2B 1bd09caaa265e370b70efe9dd23171a61a98920d659c2f19bb3ec07bf77b1d59712c135f421bbc3164bec6c2b19ac0886185bb6200c45cefaaaea94d5cf54222 SHA512 b449fc466a22300c8a4b0a5b223d68b0ef4437512abcdf875580efc364570b157a55e283faa0ddaad5fd4ce98585bf6dd043b4e7a2a7aa86e98bdb9e8a846a30
-AUX freecad-0.19.2-0001-fix-failing-test-workbench-testcase.patch 896 BLAKE2B f733e1bc8a95c87f0a831aba37616a36937909931005e5759f9ea63c84daaa5c742d43c9fe50023387a390bee69071f004faec2f4b081629e22a31ebc84c366c SHA512 0f30a2cc6a9fad0fdc94b90170ff6c0ef3817cb1f3b9d2c2bd3a9d7fdbd4ccfc22093b68ba9831682a5592d3bf2d064de94a81429be2ab71e041aa1561cab46d
-AUX freecad-0.19.2-0002-fix-femtest-failure-with-yaml-load.patch 907 BLAKE2B 154e46d923aa54f88d528eb460fc5b2caa16e536b66a126c7a2baf8c2227519bec2c831f5b0cc9bf9f7966e0c4be8edd807bbe0fb5a9019ac1d2da22f32d29a0 SHA512 a5e361bff8477e84f80837416635a3951d8b71f3cfcdb138d19bc7dd4c18961af6092a13c7a1925c7fc1e2ae1944fc7861ae2797050a7f5385987d2be8191ee2
-AUX freecad-0.19.2-0003-fix-test-when-built-without-GUI.patch 842 BLAKE2B d1eef077e3290bb469786a62c36d66f46f5016b2ed34065c0c3aa20a82cb451bb8a7242c3504113d924de2564b03fb1c581684d4b9da1325228ad2d82704a116 SHA512 2df1ad94c735c5f38eec0bcc24bf11a1d1814e991539082259983601352603273ae502856e41c0c737d65f9a488a676894d2f4d4d93cf8e2cbb1c3752f99aa7b
-AUX freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch 861 BLAKE2B 305d1e7110e72c0b7e1f4398283816ca8ca01e1fe8460fee9fc002401c5937414d11ee46f0875d0859e57c94b03a67ccb7b4bed1b4935b1032e6db41b9e64a85 SHA512 0eaa8b23a92237648e128304bcb84a227cfb081826266efad9b3afd8a63444a61930dfba465b2d1e205cb43fc616e0a63c1f8bbb1618a462d8a0cff04e764ea0
-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 9123 BLAKE2B fe5aef3628a6f9f15881b0f172c3922c339ba915c3e12363324b8a075a9a37a0d372d0ecb6a77388b8976b7f0ba10399a51c72a1b712660534ed76f10a8cfcbd SHA512 4cf13438b11768f803074d8f5949222388caaf2ad22225bb2d2897bf81bb13401a3c7402aea8fb8b19e9904515dee0e4008080719a81a2233994086a64b1c74d
-EBUILD freecad-0.19.2.ebuild 10467 BLAKE2B 38ce51174f2df87bff4c745db02f67015b185f75a36b8c42ebb63e9d85f7616eb3a55b05c220c41c40c7399fb5e887418f9b3b469ae8bdcf3e5e3cd06e10a664 SHA512 0f3e2775d80ffba5f2c581fa671467ef2bb4bba92efac969bc90e920a07a65e74660cad8ee9fd6c1beaa04e4700d1aec4c24eb454f8eb2861850e4f62ea33e9f
-EBUILD freecad-9999.ebuild 9169 BLAKE2B 3cfb1daf332adfc30fc97dcf25dd2e6c136027cfbed54d3911ae4f829a10b9437230206dcf9fbd62daa9a3c59e8a681f5a41cb56685dcf17590e1b0947605af8 SHA512 204bb6426e888e03d3f23f33b35a7be138efdd12f614315d9faff13639da2f9bc7491ba9305409d5c28b5f91204a9185809b4ad5b5ab16b6b00664d83d0365e6
-MISC metadata.xml 3728 BLAKE2B dfe01a38234955bbea4ebc4d561fa15d06548f80338ace10091b8c8e5ab485532e462ad8ea35d52552fb87d18be05bc10953d100389cd4302e07adbb2cbc8a9a SHA512 c1c6693f824aaf9ace443bd5001a581187a4dbbb134a18454ef96d5dbd674b98284136d021f04316de0e0d8400bdb3e7f0dab5722e1ed0d45b33f0263c8ae6d3
diff --git a/media-gfx/freecad/files/99freecad b/media-gfx/freecad/files/99freecad
deleted file mode 100644 (file)
index 8110410..0000000
+++ /dev/null
@@ -1 +0,0 @@
-PYTHONPATH=/usr/lib64/freecad/Ext:/usr/lib64/freecad/Mod:/usr/lib64/freecad/lib64
diff --git a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
deleted file mode 100644 (file)
index c8772fe..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From 74664bf8c9142320be335ab91dca53cb1a1187a2 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Fri, 12 Mar 2021 23:55:09 +0100
-Subject: [PATCH] [Gentoo specific] Remove ccache usage
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- CMakeLists.txt | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b17736..38e482a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,11 +8,6 @@ if (POLICY CMP0072)
-     cmake_policy(SET CMP0072 OLD)
- endif(POLICY CMP0072)
--find_program(CCACHE_PROGRAM ccache)  #This check should occur before project()
--if(CCACHE_PROGRAM)
--    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
--endif()
--
- project(FreeCAD)
- set(PACKAGE_VERSION_NAME "Vulcan")
--- 
-2.30.1
-
diff --git a/media-gfx/freecad/files/freecad-0.19.2-0001-fix-failing-test-workbench-testcase.patch b/media-gfx/freecad/files/freecad-0.19.2-0001-fix-failing-test-workbench-testcase.patch
deleted file mode 100644 (file)
index 58107fb..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From dc04c745ea1e7dc277ab06fab69a2b91fbf543c5 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sun, 25 Apr 2021 23:02:39 +0200
-Subject: [PATCH] fix failing test workbench testcase
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- src/Mod/Test/Document.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Mod/Test/Document.py b/src/Mod/Test/Document.py
-index e41375c..fd5eb15 100644
---- a/src/Mod/Test/Document.py
-+++ b/src/Mod/Test/Document.py
-@@ -1307,7 +1307,7 @@ class DocumentFileIncludeCases(unittest.TestCase):
-     # copy file from L5 which is in the same directory\r
-     L7 = doc2.addObject("App::DocumentObjectFileIncluded","FileObject3")\r
-     L7.File = (L5.File,"Copy.txt")\r
--    self.failUnless(os.path.exists(L5.File))\r
-+    self.failUnless(os.path.exists(L7.File))\r
-     FreeCAD.closeDocument("Doc2")\r
\r
\r
--- 
-2.31.1
-
diff --git a/media-gfx/freecad/files/freecad-0.19.2-0002-fix-femtest-failure-with-yaml-load.patch b/media-gfx/freecad/files/freecad-0.19.2-0002-fix-femtest-failure-with-yaml-load.patch
deleted file mode 100644 (file)
index 17da18c..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From a8314fdc56bb39f5af85e1678a03d613bfb9ee03 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Mon, 26 Apr 2021 19:32:54 +0200
-Subject: [PATCH] fix femtest failure with yaml load
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- src/Mod/Fem/feminout/importYamlJsonMesh.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Mod/Fem/feminout/importYamlJsonMesh.py b/src/Mod/Fem/feminout/importYamlJsonMesh.py
-index 9886248..aff83a5 100644
---- a/src/Mod/Fem/feminout/importYamlJsonMesh.py
-+++ b/src/Mod/Fem/feminout/importYamlJsonMesh.py
-@@ -162,7 +162,7 @@ def read(
-             or fileExtension.lower() == ".yml"
-     ) and has_yaml:
-         fp = pyopen(fileString, "rt")
--        raw_mesh_data = yaml.load(fp)
-+        raw_mesh_data = yaml.load(fp, Loader=yaml.SafeLoader)
-         fp.close()
-     else:
-         Console.PrintError(
--- 
-2.31.1
-
diff --git a/media-gfx/freecad/files/freecad-0.19.2-0003-fix-test-when-built-without-GUI.patch b/media-gfx/freecad/files/freecad-0.19.2-0003-fix-test-when-built-without-GUI.patch
deleted file mode 100644 (file)
index 33892ad..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-From d7ea5a0f20888a2ddae3eb48e508e9067662cdc7 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Wed, 28 Apr 2021 08:57:53 +0200
-Subject: [PATCH] fix test when built without GUI
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- src/Mod/Arch/ArchRoof.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Mod/Arch/ArchRoof.py b/src/Mod/Arch/ArchRoof.py
-index 99130d0..e2c2955 100644
---- a/src/Mod/Arch/ArchRoof.py
-+++ b/src/Mod/Arch/ArchRoof.py
-@@ -22,7 +22,6 @@
- import math
- import ArchComponent
--import Arch_rc
- import Draft
- import DraftGeomUtils
- import DraftVecUtils
-@@ -32,6 +31,7 @@ import Part
- from FreeCAD import Vector
- if FreeCAD.GuiUp:
-+    import Arch_rc
-     import FreeCADGui
-     from PySide import QtCore, QtGui
-     from DraftTools import translate
--- 
-2.31.1
-
diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
deleted file mode 100644 (file)
index 9f4131f..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From e08aec1344e753cd338a61c3584230741e00b23f Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Thu, 31 Dec 2020 13:26:44 +0100
-Subject: [PATCH 1/2] FindCoin3DDoc.cmake: fix patch for coin docs
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- cMake/FindCoin3DDoc.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cMake/FindCoin3DDoc.cmake b/cMake/FindCoin3DDoc.cmake
-index c6c92f2..1af53c2 100644
---- a/cMake/FindCoin3DDoc.cmake
-+++ b/cMake/FindCoin3DDoc.cmake
-@@ -22,7 +22,7 @@ IF (COIN3D_FOUND)
-       # Unix systems\r
-       find_path(COIN3D_DOC_PATH index.html \r
-                 /usr/share/doc/libcoin80-doc/html\r
--                /usr/share/doc/coin/html\r
-+                /usr/share/doc/coin-4.0.0/html\r
-                 /usr/share/doc/Coin/html\r
-       )\r
-       IF( EXISTS ${COIN3D_DOC_PATH})\r
--- 
-2.30.0
-
diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
deleted file mode 100644 (file)
index ac8d194..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From acc8a26b73a87ae024bce30e9f1531610b6e0e5f Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 13 Feb 2021 14:54:28 +0100
-Subject: [PATCH] [Gentoo specific] don't check vcs
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- src/Tools/SubWCRev.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Tools/SubWCRev.py b/src/Tools/SubWCRev.py
-index 9795450..59938bd 100644
---- a/src/Tools/SubWCRev.py
-+++ b/src/Tools/SubWCRev.py
-@@ -455,7 +455,7 @@ def main():
-         if o in ("-b", "--bindir"):\r
-             bindir = a\r
\r
--    vcs=[GitControl(), DebianGitHub(), BazaarControl(), Subversion(), MercurialControl(), DebianChangelog(), UnknownControl()]\r
-+    vcs=[UnknownControl()]\r
-     for i in vcs:\r
-         if i.extractInfo(srcdir, bindir):\r
-             # Open the template file and the version file\r
--- 
-2.30.1
-
diff --git a/media-gfx/freecad/freecad-0.19.1.ebuild b/media-gfx/freecad/freecad-0.19.1.ebuild
deleted file mode 100644 (file)
index cb34867..0000000
+++ /dev/null
@@ -1,283 +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_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"
-
-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/vtk-9[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
-       mesh? ( sci-libs/hdf5:=[fortran,zlib] )
-       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-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"
-
-               -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-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
deleted file mode 100644 (file)
index 90acff5..0000000
+++ /dev/null
@@ -1,285 +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/vtk-9[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
-       mesh? ( sci-libs/hdf5:=[fortran,zlib] )
-       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-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}"/${PN}-0.19.1-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"
-
-               -DPython3_EXECUTABLE=${PYTHON}
-
-               -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/metadata.xml b/media-gfx/freecad/metadata.xml
deleted file mode 100644 (file)
index 5721169..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-       <maintainer type="person" proxied="yes">
-               <email>waebbl-gentoo@posteo.net</email>
-               <name>Bernd Waibel</name>
-       </maintainer>
-       <maintainer type="project" proxied="proxy">
-               <email>proxy-maint@gentoo.org</email>
-               <name>Gentoo Proxy Maintainers</name>
-       </maintainer>
-       <use>
-               <flag name="addonmgr">
-                       Build the addon manager module for automatic handling of 3rd 
-                       party addons
-               </flag>
-               <flag name="arch">
-                       Build the architecture workbench for working with architectural 
-                       elements
-               </flag>
-               <flag name="cloud">
-                       Build the Cloud workbench, to access cloud providers (mostly
-                       Amazon S3).
-               </flag>
-               <flag name="drawing">
-                       Build the drawing module and workbench to display 3D work on a 
-                       2D sheet
-               </flag>
-               <flag name="fem">
-                       Build the FEM module and workbench which provides Finite Element 
-                       Analysis (FEA) workflows
-               </flag>
-               <flag name="headless">
-                       Build FreeCAD without a GUI, usable for server-side instances.
-                       The Python modules are still available, without their GUI parts though.
-               </flag>
-               <flag name="idf">
-                       Build the IDF module to provide file exchange capabilities with
-                       IDF files
-               </flag>
-               <flag name="image">
-                       Build the image module and workbench for working with bitmap
-                       images
-               </flag>
-               <flag name="inspection">
-                       Build the inspection workbench which gives you specific tools
-                       for examination of shapes (experimental)
-               </flag>
-               <flag name="material">
-                       Build the material module and workbench to work with materials
-               </flag>
-               <flag name="mesh">
-                       Build the mesh module and workbench to work with triangulated 
-                       meshes
-               </flag>
-               <flag name="openscad">
-                       Build the OpenSCAD module for interoperability with OpenSCAD 
-                       and repairing Constructive Solid Geometry (CSG) history
-               </flag>
-               <flag name="part-design">
-                       Build the part design module and workbench for build part shapes
-                       from sketches
-               </flag>
-               <flag name="path"><!-- FIXME: auto-enable through robot? -->
-                       Build the path module and workbench to procude G-Code instructions 
-                       for CNC
-               </flag>
-               <flag name="pcl">
-                       Use external <pkg>sci-libs/pcl</pkg> for point clouds support.
-               </flag>
-               <flag name="plot">
-                       Build the internal plot workbench. NOTE: This conflicts with the
-                       external plot workbench, which you can add via the Addon Manager!
-               </flag>
-               <flag name="points">
-                       Build the points module and workbench for working with point clouds
-               </flag>
-               <flag name="raytracing">
-                       Build the raytracing module and workbench for raytracing and rendering
-               </flag>
-               <flag name="robot">
-                       Build the robot module and workbench for studying robot movements
-               </flag>
-               <flag name="ship">
-                       Build the ship module and workbench which works over ship entities, 
-                       that must be created on top of provided geometry. NOTE: This conflicts
-                       with the external ship workbench, which you can add via the Addon Manager!
-               </flag>
-               <flag name="show">
-                       Build the show module, a helper module for visibility automation
-               </flag>
-               <flag name="spreadsheet">
-                       Build the spreadsheet module and workbench to create and manipulate 
-                       spreadsheet data
-               </flag>
-               <flag name="surface">
-                       Build the surface module and workbench
-               </flag>
-               <flag name="techdraw">
-                       Build the techdraw module and workbench, a more advanced and 
-                       feature-rich successor of the drawing workbench
-               </flag>
-               <flag name="tux">
-                       Build the Tux module
-               </flag>
-       </use>
-       <upstream>
-               <bugs-to>https://www.freecadweb.org/tracker/</bugs-to>
-               <remote-id type="github">FreeCAD/FreeCAD</remote-id>
-               <doc lang="en">https://www.freecadweb.org/wiki/MainPage</doc>
-       </upstream>
-</pkgmetadata>
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
deleted file mode 100644 (file)
index 95bfdae..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX vtk-8.1.0-openmpi-4-compatibility.patch 473 BLAKE2B 2f4994b5c745746b0c1391666d155e8ff79f6c57969177862e3f64956cc370b2b12a0ba223bd344734a7700c5eb728ccaf1ac7188d0fd049815b7b22c7648203 SHA512 6a2e25263070747657aa319d80b333375b2c10bbbd58fc98a1ab6cdb563e996afe9af8d4ae28d4aab24a437508993cfa3cacfc9284562d7af8a9e29fded73837
-AUX vtk-8.2.0-fno-common.patch 1694 BLAKE2B 7fe15b8ea0fc358360e06be2fcc6634005cbb294fdcfea87028ef67fd018085c33448a70babd0e3e6997767b801e69853381c7bd02926d9657ea3233a8bcd065 SHA512 fbccb357649cf0dc7c5a5123db05b87e26c6095c89005adcb9e799cc68531fac87f4f588d12f0ee2728517a60436192011a04885e06ef4975fc8b81ba54ba1ea
-AUX vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch 634 BLAKE2B c143e943cfc8130e4d1a72776639e49212d9efa66db71fba6a9469381aaf35f526f316e4a6e5bd144dc8054f857b3a3f7a179eb1875c9ad0859ba669c5d63215 SHA512 28fd381693a1ed9584be3d1acc3d3de20be3cb23a3605f3f66470cf9ec0bc66ef0e3f574fc760fbbd4aeca75ea3aa96c0e22b37fbdb54a22073fee179e4a26cb
-AUX vtk-8.2.0-gcc-10.patch 739 BLAKE2B 8b9ae179c5af17f5d0173674ffd616f5473bcc0830487343150b778cf143d762fc77c7212ee4e7f8f725878e85a7c1ccaa320393164212b276703e0b86e61e7f SHA512 7a2a8ea7ac3f6d3a5fd7d6553764eb5396ee4d89cc259bbf772493953125982b4cc8a43dc7b7a5e5c1ab6783eba6dd0d6edc791465985fd1f4b1ac9eb99062eb
-AUX vtk-8.2.0-pugixml.patch 599 BLAKE2B 4dc03d18d15acb351e817a4916a60c2dc76f97165f8a440e56399cc968e33a40575b5c3fc9fa35b5dd1af3dbf7e75b6330066d2fddfadefb48722884896663d4 SHA512 d72ed9d36b4e4ffd63d877ecdc17e5773f563dc1be1e3ab4888d6b6bac7308447bcafd8b0ee65d02ac83be20256f8c05dc36d1f077ace79a2d30b869073302fc
-AUX vtk-8.2.0-py38.patch 8467 BLAKE2B ea624989f3f0a4900fa692fc271d47d1d10cc047043e464f8b6ae9ea6713a63c4f0ec75c84a70d7fc2523b29b1c24ada4b77e90e9016690868c62217dbe69a8b SHA512 9922b24551c4716bdd95d398b2ea9d48f5c098350821a16767128a97180e4e1575414755545dd71e40dec88b0a7a61fc63ba2e598bedfc07620b15b0efd02cf4
-AUX vtk-8.2.0-qt-5.15.patch 1153 BLAKE2B 2e0d041d15f547845c07d46da4f641df7a57c0df8d5f9d5290c44a91d403b58f4627ae713169696383afa1d9edd85c59606782b169238d08a5df0b7e28ac79b7 SHA512 d1460117738b33074fbd92ffc54a838452c5b2cdd668767295dced7a39c845cb58664f0ea91726015facf4e3b752a53f2a32e52c85dc187a815c95e0935d0f03
-DIST VTK-8.2.0.tar.gz 35511819 BLAKE2B 908ed9377d75da6d0bd84de0078ba90a1e9396fcc906ca2981102e2c79d9d3ba4b1297f98682cd2802c7c04f9dbec32ee70740e645c44180befd765f7cda34a6 SHA512 521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286
-DIST VTKData-8.2.0.tar.gz 304287875 BLAKE2B 0292d84be40e11203326dcb1bf45f4a6ad2a785968130d4868a230f1cfbdcb600d0c03d4dae3519e2737dc7a964f29c51500c91b3da4291069608dd80a2bce45 SHA512 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b
-DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d26599b48208b4104f41eaa90f99483689cd928cb00e3a7def396d65db2f03c9294d132854a27af74f66eb118c8319c4ce SHA512 8a7ea3d5870b1e4ccb31c77b4c270d00208349da1b2938e957210db3ec1449b678c66edc2faee1d4514aca6d725f642abc91e10ab0c151f6743cad1c53485588
-DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317
-EBUILD vtk-8.2.0-r1.ebuild 9710 BLAKE2B 59dfbbe995b47089c13cdf71c3f8650a5c2dafa38b39c47d4ca517eaf10d349110df2c5e8307d54f1a89ad4ae14a1cc6577bb70a1c6ebe9541ce82b9e2c600db SHA512 6c074e23f2126091aa1d303d89473a0c90087a82937596bde65069dfe078fa7e936afa2914742de046d144e27279f95a2c19337df6dcce6399f2f1cec5c5ede0
-EBUILD vtk-8.2.0.ebuild 9415 BLAKE2B f1784bad98faef85b698e73889943c1177783bd2b356baac8b7024f536c7f64e7343a0d26c003a948fa9917f8946a7482bcddf836a0334927185f38d6d98a37a SHA512 f4c5d23f72f69994241337e0bc20a936c64d3c0d5fb785b3da72d7e6612de4f35f98dbc2e4b6e670388051952cacc1d4827a0b0ea92ce909123a35606e9dc1c7
-MISC metadata.xml 988 BLAKE2B 2533eda3936361d835dba2e30f1b1a19484facc289603d82b6c2012ee242e7778b1080d7136584c08113d7a82e0742d7bb2373984667301a4c7d52b4dbd8b087 SHA512 f4e29e15a05cfb49b24f4a8e24a6e43ac72ac0fa21ed640a70e5017263f23e21e514dedc489d963acd803407df8ee2bd2d6006c83eece795f91b4809d2ec2ff4
diff --git a/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch b/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch
deleted file mode 100644 (file)
index 267c1d9..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h b/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h
-index 3173831..e8ee74b 100644
---- a/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h
-+++ b/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h
-@@ -141,4 +141,9 @@
- #endif
-+ #if OMPI_NUMVERSION >= 40000
-+ #undef  PyMPI_HAVE_MPI_LB
-+ #undef  PyMPI_HAVE_MPI_UB
-+ #endif /* OMPI >= 4.0.0 */
-+
- #endif /* !PyMPI_CONFIG_OPENMPI_H */
diff --git a/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch b/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch
deleted file mode 100644 (file)
index d7268ef..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From a9079bdccbb2165583d6773a5ed848427e2a38a8 Mon Sep 17 00:00:00 2001
-From: Seacas Upstream <kwrobot@kitware.com>
-Date: Tue, 28 Jan 2020 09:13:38 -0500
-Subject: [PATCH] exodusII 2020-01-28 (d97eb08d)
-
-Code extracted from:
-
-    https://gitlab.kitware.com/third-party/seacas.git
-
-at commit d97eb08d79e87c82facfae39bc75deb60c0a2d83 (for/vtk-20200128-7.24f-v2019-12-18).
----
- ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c | 2 +-
- ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c b/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c
-index 8d5d6734f0..ef439618da 100644
---- a/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c
-+++ b/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c
-@@ -216,5 +216,5 @@ int ex_create_par_int(const char *path, int cmode, int *comp_ws, int *io_ws, MPI
-  * Prevent warning in some versions of ranlib(1) because the object
-  * file has no symbols.
-  */
--const char exodus_unused_symbol_dummy_1;
-+const char exodus_unused_symbol_dummy_ex_create_par;
- #endif
-diff --git a/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c b/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c
-index b2faa22c29..9df4818767 100644
---- a/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c
-+++ b/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c
-@@ -459,5 +459,5 @@ int ex_open_par_int(const char *path, int mode, int *comp_ws, int *io_ws, float
-  * Prevent warning in some versions of ranlib(1) because the object
-  * file has no symbols.
-  */
--const char exodus_unused_symbol_dummy_1;
-+const char exodus_unused_symbol_dummy_ex_open_par;
- #endif
--- 
-2.26.2
-
diff --git a/sci-libs/vtk/files/vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/sci-libs/vtk/files/vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
deleted file mode 100644 (file)
index b467487..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
---- VTK-8.2.0/ThirdParty/freetype/vtk_freetype.h.in.orig       2019-01-30 18:15:13.000000000 +0100
-+++ VTK-8.2.0/ThirdParty/freetype/vtk_freetype.h.in    2020-10-17 00:03:32.730820908 +0200
-@@ -20,6 +20,15 @@
- #ifdef VTK_USE_SYSTEM_FREETYPE
- # include <ft2build.h>
-+/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
-+/* has been moved to <freetype/internal/compiler-macros.h> */
-+# ifndef FT_CALLBACK_DEF
-+#  ifdef __cplusplus
-+#   define FT_CALLBACK_DEF( x )  extern "C"  x
-+#  else
-+#   define FT_CALLBACK_DEF( x )  static  x
-+#  endif
-+# endif /* FT_CALLBACK_DEF */
- #else
- # include <vtkfreetype/include/ft2build.h>
- #endif
diff --git a/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch b/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch
deleted file mode 100644 (file)
index a903b03..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/CMake/VTKGenerateExportHeader.cmake  2020-05-24 14:33:12.154603698 -0600
-+++ b/CMake/VTKGenerateExportHeader.cmake  2020-05-24 14:33:34.864603776 -0600
-@@ -174,8 +174,12 @@
-     execute_process(COMMAND ${CMAKE_C_COMPILER} --version
-       OUTPUT_VARIABLE _gcc_version_info
-       ERROR_VARIABLE _gcc_version_info)
--    string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
-+    string(REGEX MATCH "[1-9][0-9]\\.[0-9]\\.[0-9]*"
-       _gcc_version "${_gcc_version_info}")
-+    if(NOT _gcc_version)
-+      string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
-+        _gcc_version "${_gcc_version_info}")
-+    endif()
-     # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
-     # patch level, handle this here:
-     if(NOT _gcc_version)
\ No newline at end of file
diff --git a/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch b/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch
deleted file mode 100644 (file)
index d890f69..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/758611
---- a/IO/CityGML/CMakeLists.txt
-+++ b/IO/CityGML/CMakeLists.txt
-@@ -5,7 +5,4 @@ vtk_module_library(vtkIOCityGML ${Module_SRCS})
- if(VTK_USE_SYSTEM_PUGIXML AND NOT pugixml_INCLUDE_DIRS)
-   find_package(pugixml REQUIRED)
--  get_target_property(pugixml_INCLUDE_DIRS pugixml INTERFACE_INCLUDE_DIRECTORIES)
--  get_target_property(pugixml_LIBRARIES pugixml LOCATION)
--  include_directories(${pugixml_INCLUDE_DIRS})
--  vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE ${pugixml_LIBRARIES})
-+  vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE pugixml::pugixml)
- endif()
diff --git a/sci-libs/vtk/files/vtk-8.2.0-py38.patch b/sci-libs/vtk/files/vtk-8.2.0-py38.patch
deleted file mode 100644 (file)
index c4c235d..0000000
+++ /dev/null
@@ -1,175 +0,0 @@
-From 257b9d7b18d5f3db3fe099dc18f230e23f7dfbab Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Tue, 20 Aug 2019 17:02:24 -0600
-Subject: [PATCH] Compatibility for Python 3.8
-
-The PyTypeObject struct was modified in Python 3.8, this change is
-required to avoid compile errors.
----
- .../PythonInterpreter/vtkPythonStdStreamCaptureHelper.h   | 6 ++++++
- Wrapping/PythonCore/PyVTKMethodDescriptor.cxx             | 2 +-
- Wrapping/PythonCore/PyVTKNamespace.cxx                    | 2 +-
- Wrapping/PythonCore/PyVTKReference.cxx                    | 8 ++++----
- Wrapping/PythonCore/PyVTKTemplate.cxx                     | 2 +-
- Wrapping/PythonCore/vtkPythonCompatibility.h              | 8 +++++++-
- Wrapping/Tools/vtkWrapPythonClass.c                       | 2 +-
- Wrapping/Tools/vtkWrapPythonEnum.c                        | 2 +-
- Wrapping/Tools/vtkWrapPythonType.c                        | 2 +-
- 9 files changed, 23 insertions(+), 11 deletions(-)
-
-diff --git a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
-index b1c12c83de..14ccfbe928 100644
---- a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
-+++ b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
-@@ -140,6 +140,12 @@ static PyTypeObject vtkPythonStdStreamCaptureHelperType = {
- #if PY_VERSION_HEX >= 0x03040000
-   0, // tp_finalize
- #endif
-+#if PY_VERSION_HEX >= 0x03080000
-+  0, // tp_vectorcall
-+#if PY_VERSION_HEX < 0x03090000
-+  0, // tp_print
-+#endif
-+#endif
- };
- static PyObject* vtkWrite(PyObject* self, PyObject* args)
-diff --git a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
-index 2b0d443537..3840038498 100644
---- a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
-+++ b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
-@@ -186,7 +186,7 @@ PyTypeObject PyVTKMethodDescriptor_Type = {
-   sizeof(PyMethodDescrObject),           // tp_basicsize
-   0,                                     // tp_itemsize
-   PyVTKMethodDescriptor_Delete,          // tp_dealloc
--  nullptr,                               // tp_print
-+  0,                                     // tp_vectorcall_offset
-   nullptr,                               // tp_getattr
-   nullptr,                               // tp_setattr
-   nullptr,                               // tp_compare
-diff --git a/Wrapping/PythonCore/PyVTKNamespace.cxx b/Wrapping/PythonCore/PyVTKNamespace.cxx
-index 71ee2a3516..5cf5bfbe6b 100644
---- a/Wrapping/PythonCore/PyVTKNamespace.cxx
-+++ b/Wrapping/PythonCore/PyVTKNamespace.cxx
-@@ -49,7 +49,7 @@ PyTypeObject PyVTKNamespace_Type = {
-   0,                                     // tp_basicsize
-   0,                                     // tp_itemsize
-   PyVTKNamespace_Delete,                 // tp_dealloc
--  nullptr,                               // tp_print
-+  0,                                     // tp_vectorcall_offset
-   nullptr,                               // tp_getattr
-   nullptr,                               // tp_setattr
-   nullptr,                               // tp_compare
-diff --git a/Wrapping/PythonCore/PyVTKReference.cxx b/Wrapping/PythonCore/PyVTKReference.cxx
-index 943ac71080..b7104091c0 100644
---- a/Wrapping/PythonCore/PyVTKReference.cxx
-+++ b/Wrapping/PythonCore/PyVTKReference.cxx
-@@ -1010,7 +1010,7 @@ PyTypeObject PyVTKReference_Type = {
-   sizeof(PyVTKReference),                // tp_basicsize
-   0,                                     // tp_itemsize
-   PyVTKReference_Delete,                 // tp_dealloc
--  nullptr,                               // tp_print
-+  0,                                     // tp_vectorcall_offset
-   nullptr,                               // tp_getattr
-   nullptr,                               // tp_setattr
-   nullptr,                               // tp_compare
-@@ -1067,7 +1067,7 @@ PyTypeObject PyVTKNumberReference_Type = {
-   sizeof(PyVTKReference),                // tp_basicsize
-   0,                                     // tp_itemsize
-   PyVTKReference_Delete,                 // tp_dealloc
--  nullptr,                               // tp_print
-+  0,                                     // tp_vectorcall_offset
-   nullptr,                               // tp_getattr
-   nullptr,                               // tp_setattr
-   nullptr,                               // tp_compare
-@@ -1124,7 +1124,7 @@ PyTypeObject PyVTKStringReference_Type = {
-   sizeof(PyVTKReference),                // tp_basicsize
-   0,                                     // tp_itemsize
-   PyVTKReference_Delete,                 // tp_dealloc
--  nullptr,                               // tp_print
-+  0,                                     // tp_vectorcall_offset
-   nullptr,                               // tp_getattr
-   nullptr,                               // tp_setattr
-   nullptr,                               // tp_compare
-@@ -1181,7 +1181,7 @@ PyTypeObject PyVTKTupleReference_Type = {
-   sizeof(PyVTKReference),                // tp_basicsize
-   0,                                     // tp_itemsize
-   PyVTKReference_Delete,                 // tp_dealloc
--  nullptr,                               // tp_print
-+  0,                                     // tp_vectorcall_offset
-   nullptr,                               // tp_getattr
-   nullptr,                               // tp_setattr
-   nullptr,                               // tp_compare
-diff --git a/Wrapping/PythonCore/PyVTKTemplate.cxx b/Wrapping/PythonCore/PyVTKTemplate.cxx
-index be200985b3..340fe7953b 100644
---- a/Wrapping/PythonCore/PyVTKTemplate.cxx
-+++ b/Wrapping/PythonCore/PyVTKTemplate.cxx
-@@ -268,7 +268,7 @@ PyTypeObject PyVTKTemplate_Type = {
-   0,                                     // tp_basicsize
-   0,                                     // tp_itemsize
-   nullptr,                               // tp_dealloc
--  nullptr,                               // tp_print
-+  0,                                     // tp_vectorcall_offset
-   nullptr,                               // tp_getattr
-   nullptr,                               // tp_setattr
-   nullptr,                               // tp_compare
-diff --git a/Wrapping/PythonCore/vtkPythonCompatibility.h b/Wrapping/PythonCore/vtkPythonCompatibility.h
-index 4a767844a6..be208faeef 100644
---- a/Wrapping/PythonCore/vtkPythonCompatibility.h
-+++ b/Wrapping/PythonCore/vtkPythonCompatibility.h
-@@ -64,7 +64,13 @@
- #endif
- // PyTypeObject compatibility
--#if PY_VERSION_HEX >= 0x03040000
-+#if PY_VERSION_HEX >= 0x03090000
-+#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
-+  0, 0, 0, 0,
-+#elif PY_VERSION_HEX >= 0x03080000
-+#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
-+  0, 0, 0, 0, 0,
-+#elif PY_VERSION_HEX >= 0x03040000
- #define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
-   0, 0, 0,
- #else
-diff --git a/Wrapping/Tools/vtkWrapPythonClass.c b/Wrapping/Tools/vtkWrapPythonClass.c
-index b1e45f8e80..4d558ea081 100644
---- a/Wrapping/Tools/vtkWrapPythonClass.c
-+++ b/Wrapping/Tools/vtkWrapPythonClass.c
-@@ -521,7 +521,7 @@ void vtkWrapPython_GenerateObjectType(
-     "  sizeof(PyVTKObject), // tp_basicsize\n"
-     "  0, // tp_itemsize\n"
-     "  PyVTKObject_Delete, // tp_dealloc\n"
--    "  nullptr, // tp_print\n"
-+    "  0, // tp_vectorcall_offset\n"
-     "  nullptr, // tp_getattr\n"
-     "  nullptr, // tp_setattr\n"
-     "  nullptr, // tp_compare\n"
-diff --git a/Wrapping/Tools/vtkWrapPythonEnum.c b/Wrapping/Tools/vtkWrapPythonEnum.c
-index b933702242..1249362854 100644
---- a/Wrapping/Tools/vtkWrapPythonEnum.c
-+++ b/Wrapping/Tools/vtkWrapPythonEnum.c
-@@ -145,7 +145,7 @@ void vtkWrapPython_GenerateEnumType(
-     "  sizeof(PyIntObject), // tp_basicsize\n"
-     "  0, // tp_itemsize\n"
-     "  nullptr, // tp_dealloc\n"
--    "  nullptr, // tp_print\n"
-+    "  0, // tp_vectorcall_offset\n"
-     "  nullptr, // tp_getattr\n"
-     "  nullptr, // tp_setattr\n"
-     "  nullptr, // tp_compare\n"
-diff --git a/Wrapping/Tools/vtkWrapPythonType.c b/Wrapping/Tools/vtkWrapPythonType.c
-index 744cb1b9d3..0a1375e541 100644
---- a/Wrapping/Tools/vtkWrapPythonType.c
-+++ b/Wrapping/Tools/vtkWrapPythonType.c
-@@ -709,7 +709,7 @@ void vtkWrapPython_GenerateSpecialType(
-     "  sizeof(PyVTKSpecialObject), // tp_basicsize\n"
-     "  0, // tp_itemsize\n"
-     "  Py%s_Delete, // tp_dealloc\n"
--    "  nullptr, // tp_print\n"
-+    "  0, // tp_vectorcall_offset\n"
-     "  nullptr, // tp_getattr\n"
-     "  nullptr, // tp_setattr\n"
-     "  nullptr, // tp_compare\n"
--- 
-2.21.0
diff --git a/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch b/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch
deleted file mode 100644 (file)
index d5a02ca..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From 797f28697d5ba50c1fa2bc5596af626a3c277826 Mon Sep 17 00:00:00 2001
-From: "Andrew J. P. Maclean" <andrew.amaclean@gmail.com>
-Date: Wed, 27 May 2020 15:27:15 +1000
-Subject: [PATCH] Qt 5.15 needs the include file QPainterPath
-
----
- Rendering/Qt/vtkQtLabelRenderStrategy.cxx | 1 +
- Rendering/Qt/vtkQtStringToImage.cxx       | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/Rendering/Qt/vtkQtLabelRenderStrategy.cxx b/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
-index afda585cca..eca65c64cd 100644
---- a/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
-+++ b/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
-@@ -41,6 +41,7 @@
- #include <QImage>
- #include <QMap>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPair>
- #include <QPixmap>
- #include <QTextDocument>
-diff --git a/Rendering/Qt/vtkQtStringToImage.cxx b/Rendering/Qt/vtkQtStringToImage.cxx
-index 659c71570e..fbb9b78f05 100644
---- a/Rendering/Qt/vtkQtStringToImage.cxx
-+++ b/Rendering/Qt/vtkQtStringToImage.cxx
-@@ -30,6 +30,7 @@
- #include <QFontMetrics>
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QString>
- #include <QTextDocument>
--- 
-2.26.2
-
diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml
deleted file mode 100644 (file)
index 6c1a962..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <use>
-    <flag name="all-modules">Build all modules</flag>
-    <flag name="boost">Add support for boost</flag>
-    <flag name="gdal">Support for gdal formated data</flag>
-    <flag name="imaging">Building Imaging modules</flag>
-    <flag name="json">Support for json formatted data</flag>
-    <flag name="offscreen">Offscreen rendering through OSMesa</flag>
-    <flag name="rendering">Building Redering modules</flag>
-    <flag name="tbb">Use <pkg>dev-cpp/tbb</pkg> to handle smp support</flag>
-    <flag name="views">Building Views modules</flag>
-    <flag name="web">Install web component</flag>
-    <flag name="xdmf2">Support for xdmf2 formatted data</flag>
-    <flag name="R">Enable support for dev-lang/R</flag>
-  </use>
-</pkgmetadata>
diff --git a/sci-libs/vtk/vtk-8.2.0.ebuild b/sci-libs/vtk/vtk-8.2.0.ebuild
deleted file mode 100644 (file)
index 0eab965..0000000
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-WEBAPP_OPTIONAL=yes
-WEBAPP_MANUAL_SLOT=yes
-
-# Short package version
-SPV="$(ver_cut 1-2)"
-inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils toolchain-funcs cmake virtualx webapp
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="https://www.vtk.org/"
-SRC_URI="
-       https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz
-       doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz )
-       examples? (
-               https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz
-               https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
-       )"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="all-modules aqua boost doc examples ffmpeg gdal imaging java json mpi
-       odbc offscreen postgres python qt5 R rendering tbb tcl theora tk
-       video_cards_nvidia views web +X xdmf2"
-
-REQUIRED_USE="
-       all-modules? ( python xdmf2 boost )
-       java? ( qt5 )
-       python? ( ${PYTHON_REQUIRED_USE} )
-       tcl? ( rendering )
-       examples? ( python )
-       tk? ( tcl )
-       web? ( python )
-       ^^ ( X aqua offscreen )"
-
-RDEPEND="
-       app-arch/lz4
-       dev-cpp/eigen
-       dev-db/sqlite
-       dev-libs/double-conversion:0=
-       dev-libs/expat
-       dev-libs/jsoncpp:=
-       dev-libs/libxml2:2
-       dev-libs/pugixml
-       >=media-libs/freetype-2.5.4
-       media-libs/glew:0=
-       >=media-libs/libharu-2.3.0-r2
-       media-libs/libpng:0=
-       media-libs/libtheora
-       media-libs/mesa
-       media-libs/tiff:0
-       sci-libs/exodusii
-       sci-libs/hdf5:=
-       sci-libs/netcdf:0=
-       sci-libs/netcdf-cxx:3
-       sys-libs/zlib
-       virtual/jpeg:0
-       virtual/opengl
-       x11-libs/libX11
-       x11-libs/libXmu
-       x11-libs/libXt
-       boost? ( dev-libs/boost:=[mpi?] )
-       examples? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-       )
-       ffmpeg? ( media-video/ffmpeg )
-       gdal? ( sci-libs/gdal )
-       java? ( >=virtual/jdk-1.7:* )
-       mpi? (
-               virtual/mpi[cxx,romio]
-               $(python_gen_cond_dep '
-                       python? ( dev-python/mpi4py[${PYTHON_MULTI_USEDEP}] )
-               ')
-       )
-       odbc? ( dev-db/unixODBC )
-       offscreen? ( media-libs/mesa[osmesa] )
-       postgres? ( dev-db/postgresql:= )
-       python? (
-               ${PYTHON_DEPS}
-               $(python_gen_cond_dep '
-                       dev-python/sip[${PYTHON_MULTI_USEDEP}]
-               ')
-       )
-       qt5? (
-               dev-qt/designer:5
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtopengl:5
-               dev-qt/qtsql:5
-               dev-qt/qtx11extras:5
-               $(python_gen_cond_dep '
-                       python? ( dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] )
-               ')
-       )
-       R? ( dev-lang/R )
-       tbb? ( dev-cpp/tbb )
-       tcl? ( dev-lang/tcl:0= )
-       tk? ( dev-lang/tk:0= )
-       video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-       web? (
-               ${WEBAPP_DEPEND}
-               $(python_gen_cond_dep '
-                       dev-python/autobahn[${PYTHON_MULTI_USEDEP}]
-                       dev-python/constantly[${PYTHON_MULTI_USEDEP}]
-                       dev-python/hyperlink[${PYTHON_MULTI_USEDEP}]
-                       dev-python/incremental[${PYTHON_MULTI_USEDEP}]
-                       dev-python/six[${PYTHON_MULTI_USEDEP}]
-                       dev-python/twisted[${PYTHON_MULTI_USEDEP}]
-                       dev-python/txaio[${PYTHON_MULTI_USEDEP}]
-                       dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
-               ')
-       )
-       xdmf2? ( sci-libs/xdmf2 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/VTK-${PV}
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-8.1.0-openmpi-4-compatibility.patch
-       "${FILESDIR}"/${P}-qt-5.15.patch # bug 726960
-       "${FILESDIR}"/${P}-gcc-10.patch # bug 723374
-       "${FILESDIR}"/${P}-fno-common.patch # bug 721048
-       "${FILESDIR}"/${P}-py38.patch
-       "${FILESDIR}"/${P}-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch # bug #751088
-)
-
-RESTRICT="test"
-
-pkg_setup() {
-       use java && java-pkg-opt-2_pkg_setup
-       use python && python-single-r1_pkg_setup
-       use web && webapp_pkg_setup
-}
-
-src_prepare() {
-       cmake_src_prepare
-
-       local x
-       # missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
-       for x in expat freetype hdf5 jpeg jsoncpp libharu libxml2 lz4 netcdf png tiff zlib; do
-               ebegin "Dropping bundled ${x}"
-               rm -r ThirdParty/${x}/vtk${x} || die
-               eend $?
-       done
-
-       if use doc; then
-               einfo "Removing .md5 files from documents."
-               rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
-               sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
-                       -i Utilities/Doxygen/CMakeLists.txt || die
-       fi
-}
-
-src_configure() {
-       # general configuration
-       local mycmakeargs=(
-               -Wno-dev
-               -DVTK_DIR="${S}"
-               -DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
-               -DVTK_INSTALL_PACKAGE_DIR="$(get_libdir)/cmake/${PN}-${SPV}"
-               -DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-               -DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data"
-               -DVTK_CUSTOM_LIBRARY_SUFFIX=""
-               -DBUILD_SHARED_LIBS=ON
-               -DVTK_USE_SYSTEM_AUTOBAHN=ON
-               -DVTK_USE_SYSTEM_EXPAT=ON
-               -DVTK_USE_SYSTEM_FREETYPE=ON
-               -DVTK_USE_SYSTEM_FreeType=ON
-               # Use bundled gl2ps (bundled version is a patched version of 1.3.9. Post 1.3.9 versions should be compatible)
-               -DVTK_USE_SYSTEM_GL2PS=OFF
-               -DVTK_USE_SYSTEM_HDF5=ON
-               -DVTK_USE_SYSTEM_JPEG=ON
-               -DVTK_USE_SYSTEM_LIBPROJ=OFF
-               -DVTK_USE_SYSTEM_LIBXML2=ON
-               -DVTK_USE_SYSTEM_LibXml2=ON
-               -DVTK_USE_SYSTEM_NETCDF=ON
-               -DVTK_USE_SYSTEM_OGGTHEORA=ON
-               -DVTK_USE_SYSTEM_PNG=ON
-               -DVTK_USE_SYSTEM_TIFF=ON
-               -DVTK_USE_SYSTEM_TWISTED=ON
-               -DVTK_USE_SYSTEM_XDMF2=OFF
-               -DVTK_USE_SYSTEM_XDMF3=OFF
-               -DVTK_USE_SYSTEM_ZLIB=ON
-               -DVTK_USE_SYSTEM_ZOPE=ON
-               -DVTK_USE_SYSTEM_LIBRARIES=ON
-               # Use bundled diy2 (no gentoo package / upstream does not provide a Finddiy2.cmake or diy2Config.cmake / diy2-config.cmake)
-               -DVTK_USE_SYSTEM_DIY2=OFF
-               -DVTK_USE_GL2PS=ON
-               -DVTK_USE_LARGE_DATA=ON
-               -DVTK_USE_PARALLEL=ON
-               -DVTK_EXTRA_COMPILER_WARNINGS=ON
-               -DVTK_Group_StandAlone=ON
-               -DBUILD_DOCUMENTATION=$(usex doc)
-               -DBUILD_EXAMPLES=$(usex examples)
-               -DBUILD_VTK_BUILD_ALL_MODULES_FOR_TESTS=off
-               -DVTK_BUILD_ALL_MODULES=$(usex all-modules)
-               -DUSE_DOCUMENTATION_HTML_HELP=$(usex doc)
-               -DVTK_Group_Imaging=$(usex imaging)
-               -DVTK_Group_MPI=$(usex mpi)
-               -DVTK_Group_Rendering=$(usex rendering)
-               -DVTK_Group_Tk=$(usex tk)
-               -DVTK_Group_Views=$(usex views)
-               -DVTK_Group_Web=$(usex web)
-               -DVTK_SMP_IMPLEMENTATION_TYPE="$(usex tbb TBB Sequential)"
-               -DVTK_WWW_DIR="${ED}/${MY_HTDOCSDIR}"
-               -DVTK_WRAP_JAVA=$(usex java)
-               -DVTK_WRAP_PYTHON=$(usex python)
-               -DVTK_WRAP_PYTHON_SIP=$(usex python)
-               -DVTK_WRAP_TCL=$(usex tcl)
-               -DVTK_USE_BOOST=$(usex boost)
-               -DUSE_VTK_USE_BOOST=$(usex boost)
-               -DModule_vtkInfovisBoost=$(usex boost)
-               -DModule_vtkInfovisBoostGraphAlgorithms=$(usex boost)
-               -DVTK_USE_ODBC=$(usex odbc)
-               -DModule_vtkIOODBC=$(usex odbc)
-               -DVTK_USE_OFFSCREEN=$(usex offscreen)
-               -DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
-               -DVTK_USE_OGGTHEORA_ENCODER=$(usex theora)
-               -DVTK_USE_NVCONTROL=$(usex video_cards_nvidia)
-               -DModule_vtkFiltersStatisticsGnuR=$(usex R)
-               -DVTK_USE_X=$(usex X)
-       # IO
-               -DVTK_USE_FFMPEG_ENCODER=$(usex ffmpeg)
-               -DModule_vtkIOGDAL=$(usex gdal)
-               -DModule_vtkIOGeoJSON=$(usex json)
-               -DModule_vtkIOXdmf2=$(usex xdmf2)
-               -DBUILD_TESTING=$(usex examples)
-       # Apple stuff, does it really work?
-               -DVTK_USE_COCOA=$(usex aqua)
-       )
-
-       if use java; then
-               local javacargs=$(java-pkg_javac-args)
-               mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} )
-       fi
-
-       if use mpi; then
-               mycmakeargs+=( -DVTK_USE_SYSTEM_MPI4PY=ON )
-       fi
-
-       if use python; then
-               mycmakeargs+=(
-                       -DVTK_INSTALL_PYTHON_MODULES_DIR="$(python_get_sitedir)"
-                       -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-                       -DPYTHON_LIBRARY="$(python_get_library_path)"
-                       -DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
-                       -DSIP_INCLUDE_DIR="$(python_get_includedir)"
-                       -DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
-                       -DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
-                       -DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX} --root=${D}"
-                       -DVTK_USE_SYSTEM_SIX=ON
-               )
-       fi
-
-       if use qt5; then
-               mycmakeargs+=(
-                       -DVTK_USE_QVTK=ON
-                       -DVTK_USE_QVTK_OPENGL=ON
-                       -DVTK_USE_QVTK_QTOPENGL=ON
-                       -DQT_WRAP_CPP=ON
-                       -DQT_WRAP_UI=ON
-                       -DVTK_INSTALL_QT_DIR="$(basename $(qt5_get_libdir))/qt5/plugins/designer"
-                       -DDESIRED_QT_VERSION=5
-                       -DVTK_QT_VERSION=5
-                       -DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
-                       -DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
-                       -DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5"
-                       -DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
-                       -DVTK_Group_Qt:BOOL=ON
-                       -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
-               )
-       fi
-
-       if use R; then
-               mycmakeargs+=(
-                       -DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
-                       -DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
-               )
-       fi
-
-       append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
-
-       use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
-
-       if use mpi; then
-               export CC=mpicc
-               export CXX=mpicxx
-               export FC=mpif90
-               export F90=mpif90
-               export F77=mpif77
-       fi
-
-       cmake_src_configure
-}
-
-src_install() {
-       use web && webapp_src_preinst
-
-       cmake_src_install
-
-       use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar
-
-       # Stop web page images from being compressed
-       use doc && docompress -x /usr/share/doc/${PF}/doxygen
-
-       if use tcl; then
-               # install Tcl docs
-               docinto vtk_tcl
-               docinto .
-       fi
-
-       # install examples
-       if use examples; then
-               einfo "Installing examples"
-               mv -v {E,e}xamples || die
-               dodoc -r examples
-               docompress -x /usr/share/doc/${PF}/examples
-       fi
-
-       # environment
-       cat >> "${T}"/40${PN} <<- EOF || die
-               VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
-               VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
-               VTKHOME=${EPREFIX}/usr
-               EOF
-       doenvd "${T}"/40${PN}
-
-       use web && webapp_src_install
-}
-
-# webapp.eclass exports these but we want it optional #534036
-pkg_postinst() {
-       use web && webapp_pkg_postinst
-}
-
-pkg_prerm() {
-       use web && webapp_pkg_prerm
-}