diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2021-01-20 12:34:54 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2021-01-20 12:34:54 +0000 |
| commit | ab643ca5c0af4deda50955f4fba51895880cec9a (patch) | |
| tree | cf66b2fd14ceca2b123c52db58c7112b0c64b5d5 | |
| parent | 055e176323cd62e223b6416d76fc55f9728168db (diff) | |
| download | baldeagleos-repo-ab643ca5c0af4deda50955f4fba51895880cec9a.tar.gz baldeagleos-repo-ab643ca5c0af4deda50955f4fba51895880cec9a.tar.xz baldeagleos-repo-ab643ca5c0af4deda50955f4fba51895880cec9a.zip | |
Updating liguros repo
336 files changed, 3661 insertions, 11635 deletions
diff --git a/acct-group/tpm/metadata.xml b/acct-group/tpm/metadata.xml new file mode 100644 index 000000000000..3d4429370ed8 --- /dev/null +++ b/acct-group/tpm/metadata.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-needed --> + <origin>gentoo-staging</origin> +</pkgmetadata> diff --git a/acct-group/tpm/tpm-0.ebuild b/acct-group/tpm/tpm-0.ebuild new file mode 100644 index 000000000000..78bf604298a0 --- /dev/null +++ b/acct-group/tpm/tpm-0.ebuild @@ -0,0 +1,8 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-group + +ACCT_GROUP_ID=347 diff --git a/acct-user/tpm/metadata.xml b/acct-user/tpm/metadata.xml new file mode 100644 index 000000000000..3d4429370ed8 --- /dev/null +++ b/acct-user/tpm/metadata.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-needed --> + <origin>gentoo-staging</origin> +</pkgmetadata> diff --git a/acct-user/tpm/tpm-0.ebuild b/acct-user/tpm/tpm-0.ebuild new file mode 100644 index 000000000000..6a4401d03020 --- /dev/null +++ b/acct-user/tpm/tpm-0.ebuild @@ -0,0 +1,12 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-user + +ACCT_USER_ID=347 +ACCT_USER_GROUPS=( "${PN}" ) +ACCT_USER_HOME=/var/lib/${PN} + +acct-user_add_deps diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest index e2650d133084..e85342fe8601 100644 --- a/app-admin/gopass/Manifest +++ b/app-admin/gopass/Manifest @@ -14,6 +14,7 @@ DIST github.com%2Fcaspr-io%2Fyamlpath%2F@v%2Fv0.0.0-20200722075116-502e8d113a9b. DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod 35 BLAKE2B 6b99dc9054d6616c7f66e1f0a76a11cadf095b8661aa92aaa97aaac4c2fd943a972f9947fa64167241747f633ca9f2a74e9ddd122dc39a083223912886e04b24 SHA512 b21cab6683819e3029097ac203e35963aa69e47c32cd88017f640f976da0fb64dae5a62d9c76f64868618be6df14603c9a72f24333d1639e654eedb5125421ab DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip 14190 BLAKE2B 068cbd85a43c03d801420e794a87bca8d06aac5650cbd8597eff929bb3634edf85f33342b9b111626f995a340f77c76f60aa436c25654f47b3ed5c87af847c17 SHA512 cba946a17b3237fc696dcf45a7d2ab8e08795aa9a6b6a2dc9bf032cc26b15933d5b2d799a30e6631dbf6b2913c8cbf4f1833c6eedfe45b954a6cc1b6703a1b4a DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4 +DIST github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.mod 212 BLAKE2B 96a3430ed3030a25f9264f4eadce7424c385a031932829b4975143af2ec4ea64af9119f6cdfe5242b1ac83c5d6f3b577516c36e9ba534e768ba1fe48b907b3dd SHA512 cd34cadb035275e861d1ce0c1abe3c49ed4a1300b3467767f4106cebf001ac36c33a48036ba6135748d887e7bda4a81afeaa70e18e2ac695c53ccc7e0c41d41b DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2 DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip 5802 BLAKE2B 7e7b32a77adacd47318e42255dbbb59c85b38dbd3f80adf2795ed3b2d01ed714e8c6f1139b91c6ce19066414acd53eed14762806f28b6978bddb918fe756414b SHA512 4021b26f08a3fb25b71a3191445c9be56424f3f118f5a4839ee8957a9cabeeb33f8d5e4735ffdbccc20b84b45e4a61d3da9c2ecb6cceef6638901143bb6ea339 DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d @@ -65,11 +66,15 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod 105 BLAKE2B ffd22df03c1b351f DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.zip 125740 BLAKE2B 53846b62364384c96a4a1038e7c04213e5623fc97365708174ba705781fa07760fe7726615901bc18a2fa099e90b7e4a5f9023daa5c5a3db8c421360a730e97e SHA512 6ad2ac900d1a8812eb6dd037a2ad5342ef74a339eeb490f23acc207819b8ba9e0c53185364908dfb65e57510146084c7e35e75de0a9fa4bf0898112f8ca8f551 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.zip 126991 BLAKE2B df3a677c6b6838cab5de9c42768cc05193561ce6a5d38c1d090b31d79e9e7a31ba4b256bce05c29436e3fc10e5eb8f7157d6ff35d93562e8259a28b8678bbbde SHA512 9dec7c9cf1317ebd2e4dae9fb3dffe62a077473e2969b7c70b97c332a3e9d713d2047ea929ea01253fc7e2636fcb3851b6cc0cbe1ae16db26ae0ff99bc96d8ba +DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713 +DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip 127156 BLAKE2B 1d06924d2e9fadaefa1a506c16830c88e983c3d14b3bb9a82c216879531ffb664dc90de8fbf3b6025ae8b5e7cee1a9ecb900a7eabb85f6144d304fab7cacf21f SHA512 365bb5271fded39749a69bdfaee6e29740b26b84e0a737fedab3e50cc0416a098f0ed0a14704dc1ec9bc1eb81b8827de4a151024f5ea3e6c75a9fb9abfc14d62 DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod 35 BLAKE2B 87a5884f51a766419a5bfaca4d6b317f2e86680e7347d29dba287e4c2004db6b8a8afcb2b2b8145cc3f9a502b768105eab89ba0f3e99db44427fd3eab9d3ac8c SHA512 6d285a58dc91fb57f990b76b3c2634247bee990ec1bb3e0f11b19fe1edb3b9b1998030def12b20a6f05c574965ddcefda6883121f5aae70c695e031e72425178 DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip 347066 BLAKE2B 5ef49f931c987f9a24880afbd3ca231093bb43f0c059df9110c38ffe3ad54c4de3851cc36cc9af15b49112462cc164b0812c8872d5fb2d61d0cf751040213762 SHA512 3a24fd40eec7d23c69143355338019544fcc935b01f63f604419a5d7b5f1222e89de7e28dc86454e57e262f9bee5e4333395f3b8d7392c6e87b7e8c442e05709 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip 9151 BLAKE2B 853a982f1c3b2b60fb44e3da969f7cdbeb6e5214c549e47dee57329a9c93c8786bcb2af6e3aab5f7aacf0bf0c70beb26f95c42b796cc2cff5b9b825040cf5a11 SHA512 e13c7622fe1c4ba73fe147255c02d6828f5d5deaea74ee14a97dd689819547b913caef4721838a68490991c710156307cf0487866d200021cf9d774a4600e52e DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee +DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba +DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 21279 BLAKE2B d8013c686f7cd497091f4c7d782b283eb95faa7617d68ec7f8cf937c5925d677d8552c662291e41cf2c137fce163d45fb62dfcde88088225c13e0980fcde3d7e SHA512 f28071ffb6515262fb73276725181a806740688fea8de8d9484e1204fcfe6e5fd437e38a3299acec6bb545deb31373d910a09d92937308176b2043ccc9f5397f DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 257755 BLAKE2B 13d505a73dd179828fd3dbcbc1dfb90f6bdf8a888bb7ab160713a566472adf63d45491fa29928853d76725c2ffa5ada33e802cf857376c83cd8085a31acb48b5 SHA512 5bb0e61c8622e09cecc099c80cd97cdefbc497d4ad0e88984b2936e7731991e972883eb639be1cc3f56249a97b4f14c6820cda6b1c08e4a2323aaca22b840dea DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d @@ -111,12 +116,16 @@ DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip 7430 BLAKE2B becaf402e397202c86c156c3a5b7ee8f785290ca134d87cb36106a9496d18b1b45e97d306c6280c7186976a18307a7ef04d6ffa29a2e6cc2a3dd378fb400ff44 SHA512 1a7efd886840455b37b44b4d0c048b457eae14e509a740455db995e84c98f8fe94449e7dd11c544ff241e784ebeedf0f60c87838adca21fed08146fa3adeeecd +DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475 DIST github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod 90 BLAKE2B e375688bb7c11de48d29d17c72a3e7675fd36d4c214bc39acd6d73386b007b51c34ff050b1b6ebf251f1f1cb98ce0022246ce7280a91f14d2136ee3e226f05c4 SHA512 aa292d2eb3045fa595c28c69fa87c329e6bfe29f2e88d5424b28a5b6270a869cc8455a88a6c076cdc5e6c76e36dd7d2d820ea7a8f3995c0af6374ab5c02ec735 DIST github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip 106445 BLAKE2B 5aa2489ac1b0c4dd5c1c633731c7db35a0e84afcfff3d4317025d16e6c7f62e9a06ee1c56072a26ad45716f90fece953dca9b0831bc004c4081eda012d32944f SHA512 431bfd66971e8936204d8bd9b02aafa25e4300b3a3d8d78f63dc8f6e5dd0b436e1987074b5bd52e856759477f6d154625b5f1c565146fad909ce510322721b79 DIST github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.57.mod 518 BLAKE2B cab9e78c6c835ffe72bb26db0b47da1b364d93c1bc450ceef0d25fc7ba39e1cc5330d6e38dc955c0237e04c781e968569697ebe81867030407b7bc6efaab5e96 SHA512 d0e4dcf05a6ef0bae5c79290669ed2bb6d5ba6d1a2f99b03fd95f966197ba013da352f35a62348f315793f77d6ae1a23e5de7c2f69f6bacef4ac516aca8dfae8 DIST github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.57.zip 388879 BLAKE2B 97d2cdf5100314a456fd292e040e9d4071bbf3f64794dfc27b2cb0d5dff1360575f78dc459e098a71665fff1d3809c0e841bf99b0fe50f5dd4f68c9d52b35552 SHA512 e07e47f7f3cfb442ba28bef49030622c4393a11e9f848ed527e9d07378aeca3669560523e871c503fa5465341a5c80688e60b9206cc2874254897f2cf320a6f0 +DIST github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.mod 1133 BLAKE2B ae723eb106864062919adeaa26c981e85e57fcdcba61f7ea95cdf26b64fc330070777118e73d93b5474b51f0f382fc29f39709488f8e730d126bbdfd707c7bea SHA512 6e0354cb2561eb6ee326351bf6151cb64edea4abdb15776415b2267795ec3b7fe67540a748c11b351e5f71f0d1e6a802ecca86335b444e52cf23d0c9b9f608ed +DIST github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.zip 411371 BLAKE2B 165a91e85c3fe439913174a24dd2e8ee59bbd2578413ea323cd711eb040d4ab7dfdf766544333bc545a1ad7e11436df4d4718d4b5610cbe62632ad2efac0bfb8 SHA512 f0bcddccda3c58cbff5aa8b344edb708083cbc097c8ef0ce4ae3bcd4e758884d99f062baf9acdb3acd79346f2f3e7de88bfe894ba9bc51a43cb691673fa69401 DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod 45 BLAKE2B 4868e4a4afda265cf4dd2e7c5a25657237687b3b1ba21d24f280174a05dece76ba902c1447586a7c632a961b8454a1d1c8a0e7d523fabcbf98dddee26d26e341 SHA512 2341ff459cb2432feff920048aac90868260d97c5ff68724b0b7e22c8e5c65da2b4055026d74578983020e24506d2f064e47e3fa247a4560a37951e205cd0a15 DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip 84306 BLAKE2B a22f077e8a63a951ca47f6d62a6de017245ae81ad57f788996c9efc722a5df7bf3ef9cda993ac8c524d75a95a2218732471d46d21e8bfc56f324ed8b126ba1ff SHA512 7732e181c4a620e81e77d261addf74c7d7edaa50fe41f13512124650a572ec258ebac8a4144bffa3107115f9c65968cc67a3aa5de8c8dbfffbcffceecfccbc63 +DIST github.com%2Fminio%2Fsio%2F@v%2Fv0.2.1.mod 159 BLAKE2B 1df4da30bba4bec94231b2f822fe0b545d28d17c5bf75dc3b812b32f2c19a7b4bc9ca88dded2ef18db9fd2c1dbd3343901571afa6c615ef22895c201336d1bea SHA512 ca2e78af641abb84d7bca56ff00e03ceb3a5105d98cd1187ebaede80fb8572279b233c1159c292a4b5b9942ce9005797eeb04700b53707b03c80f91a5c492452 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2 DIST github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.mod 43 BLAKE2B b6996dd7e1e75268f4018828d23802d360e28d700e6be0c0fecc9a17fd4ba79e00e81aff04166b461295b95f7225f12a1fc22bc5462ffe6a0f7eeb35e58aee5c SHA512 eb0cee04d26b4a0acf1b45504ab73931c10f98ebd41a6d96788aad477178f8172da402757c1fb8853ac513fff0aadbe3a9a4f74134c88cf9e26928896af55785 @@ -141,6 +150,8 @@ DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6 +DIST github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod 25 BLAKE2B 23b4d575cda8259ac3498731524edc19e21e56ca2881d58ab40adad9469eb97d94036eaecd4fa5e78558e852f4c8f4242f830c962843d14779fbef470f3f8f2b SHA512 18a8e8a8b69974b2112578bd8995f31235bcfe49c218b2d0affd6fd5d6b7938687d9f5405d4a228a2ee2960de7960496319a92a26e8b29f6076983c0d07ee66c +DIST github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.zip 12755 BLAKE2B 3ed8de4c779bec9c9b6bfe63e2d70cd86a73f390bbd46c1da03c2d7d5e0073152c273b44a903314be7fa7a65db702cb4055e0545541a3f3a5c1b62a296748968 SHA512 0911d9b0fbf3c775aa2c1507973bfefda027364ee298ad02a1e52f86c480f4592a7e6fc84f9864030b70b9121a552ef3011437b5deddb1e7faf8ae6271741093 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d DIST github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.mod 39 BLAKE2B 1fe1086bdd2304d771c53f56cb46df742a3e49d6bcd3dfb6f10fd81cd70ff372a34ac31088ef79e51a211068ee248437f5e6dfe4edd739a5719f783fed79b478 SHA512 3e1d6747fa7a97d9ee969060130b0e5bdcf162274f9c5faf66f1974cb7d34e59f569bfe1a2339a71047cc86db2422ce486aaf5d7d47feb61f89b5e6e429c8075 @@ -150,6 +161,7 @@ DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip 55374 BLAKE2B 39f93770143cb7 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.5.0.mod 301 BLAKE2B 8898fe7003c9143aa51d94430241d950aa22446ba5b7fd087844593db1c99701dcbc9cb2dde3356d22867e72c654bb3e0b30ff2d9c376cb3ef434f70e788ea97 SHA512 7c1f73f33624409363131d5765917cdc40a8666c1d462d72a7206ce4cca74c9fe61738df4f4a48265a9d89faa0b04c3aa49b0e87d8a37ac4f53310fd04913bd9 +DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod 242 BLAKE2B 68986e3744d3ae593a16a24b6ce79876723d93cdf96c978c185b14e4fb8d73d379d4ba05e138b412973b465a76a98a458c6606137b0affdd085dbcf20851471e SHA512 ba06d3386a03812f2ce65f0597b932beb62b70b4da92974c5f5ed81c150fb71ce0285a2d9779ec8a40916870b0e4da5c2c8c5591c3687f3b8e829652a01ec1f6 DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.mod 43 BLAKE2B 7190cd8561b8a4ec93fe2c1512a3207a5d0d81553ad9705b5c91eac8a72ba52d69ef728c3202134787f60b29bff5b9231bba009cb1cf116b1e86bce6e051e441 SHA512 f40e45d730137deb85788b5b5f63140d6e02b5af6892a10352e14599f9eaaf6315b10c8497568f965253b995fe7fa454101db5cd4a8378f0ad3eb10bad9e51ce DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.zip 47370 BLAKE2B 7c9d7c015d07c664f15e50b5f84add0149ac2ef72cf4a0aacb46aa5edf15f40b3d61efc95f4bba001bf67f8042a2a29da3a740888b55fad7581738e660435bca SHA512 fcab30f5f11cadfc0e443520d4fb01c567da10048d840588c90fd1f29a9b3adbc28a53beeb0675dd14cf1da0b70553f24b44f5790f98e3f7f4a9f4efeb6782d6 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d @@ -177,8 +189,11 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BL DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06 +DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.zip 1876304 BLAKE2B fa57b9b35fbd6fc1e9c64a15e5f3545be4affa2bf773e375dc3658b4384a501de6e480e0b268d1f2c4eaebdd8f0cda71d42e7642472b4b89106bee11e58138d0 SHA512 cbffe21e7836f45412e5c7b2d07fb820b1c2f79e4708d1a3974eab3840460231083069fff4850499f2305326c4c5097b6b16754ba7ab3c39655ccf2218bad259 +DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200930160638-afb6bcd081ae.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06 +DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200930160638-afb6bcd081ae.zip 1876107 BLAKE2B 26a90e5dcfe05fac82496bac10442319680f5ab9f7f8e0f48f3994b677d2187f9cf735bb7da92ec74ce280f5c4bbf24893aefe4c859137c198118a3ebfc5557e SHA512 fd50b978909b5b2259da0cc5d4db8fe582b003f4b9c2e387a9491f2648521475c640a21a80d375ba006f0892595cd14c4e1c130a31e7da5a2cbd8b8673feec87 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04 @@ -191,6 +206,8 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAK DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip 1503811 BLAKE2B c8cfe6b14a455a6ad71c42ce03235c650b7efe842131874cf99570716907e02c9fbe42df586e69332189518cbdcf6e2e417caebec84ce928e7ba959b66ab869c SHA512 bc3772a7ae7cd2b50f61ec8d07e7f7e1af9f24e0b737131da375a525be44dc993ee740ce0a11e0baaf0cbd81e819e3ecad889c0c7ece95086cb428e52b10a785 +DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230 +DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.zip 1503642 BLAKE2B 459cd4c9e103f489e029f1d7a4073b9af288c7feb34a7290a4b2c430d7cef6d8d8f85904d13e2549dc64ce47b9b3741c3082c46827988f085d3b32fa44eb81a3 SHA512 3f81ba470596bf5801cb9c80cb3ad84b61ae8d9b7a43d43b6c81bad14a2f7c9f08609a3205811ef7b4bf67d06f3474a7cacf6b42c06b5c9c88082f68082db67d DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 @@ -204,8 +221,13 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200808120158-1030fc2bf1d9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200808120158-1030fc2bf1d9.zip 1484367 BLAKE2B a512590e02d5d2282e07b9385bb15d1285d529f0ade14159e6b2ff6b0a8e7a2ab01d2acc1a3b7308e4e937162a04b25a7efbddaeb3ac2449d574a4cb7f60d75e SHA512 46daf2fbf8c5d70abc5d6f4044865999004208adfb15f7db924d603980ccac5f87dd4264628dd65087837eec6c34c57528ad5376e019545523af4260f1c3b792 +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.zip 1488130 BLAKE2B 970a205f60773754e7d1768884216cff6b00cc16c63d90182531f4fcd9e60f4b58b6a9e143a18217a2d844d51f63ecb1f08b63ae9a6da83cee109352d1116d3d SHA512 80c5ab291a4d1614136f168b813b5d2cd75d781319b6f7aed3c37f645554c3f8283f7488578490e4d8acf3c24ca514323a0c4649b64dd556613dbf87ced11d61 +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.zip 1496293 BLAKE2B 5e4cd198d7a461db0dff9b387afd229472214ab6d204c4d55c6bf36ee851a07cd73b61a249603d7f1e7d917097bd9e118ff78b94f45f9d15834ba5b6df897c58 SHA512 167e2b6faac57e06c420b9c7bb7d16db9c30811337176488893807e5ff88aa0b24e90e1ec10ab6e282f1b4fa2e91f2e3d72d12b276da8a85bcf29b7e2df4e25d DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b @@ -217,6 +239,7 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLA DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b +DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.zip 2717809 BLAKE2B 829658f02a7bc0dc7b648120cb74e537cb615a54f89d1c0681fd67b06b6ce56cdf3484e61f66c9e90b3c0e6216dd4049ea110ef3d6c6ca4012639edb72b31c64 SHA512 a39312a4be21d0910ba46e26165b3c2c30b1be0b0cdbeeae98b8fbe1914217778e47bad1b227928ed1fa91bbd9399d737a9b2b870098ee4db5d7e7e4963b5c83 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05 @@ -241,7 +264,9 @@ DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.m DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip 1543881 BLAKE2B 2f556bdf8ed16bde9e6ecc8fc7339578c719ed0ec73ee426caa75b672ff5fcc442ea7dfed7f737900c98d5a5afc014b9e44b1b7f0f8147edb4627f3b390814c2 SHA512 29073698d91f0bd9d37cba38102b19e6223ea362f6eb331bb186670a0549391eaf856855d2978f70861e775af0a1f678a7669754862c9247edb0a682992debc7 DIST gopass-1.10.1.tar.gz 475921 BLAKE2B 5f62c099c36b0222ba0764a0b8290522201373b80141c8f5b90c17c979269d99d756a72aa04525d31641dab247b4e5a8ae6fe4f94e3c0489d27389c0d48a7060 SHA512 9bbaefe8642cd1eea94c5b4d582835c636ad511ab4e315997f5f2b0b74d9d0f3cd430182f84ce2cc36080f14b8cbf03c71a8f4a84f6365a6cdd5e6aaac90f7fc +DIST gopass-1.11.0.tar.gz 486905 BLAKE2B 406bd0e136963ff20bc1fcc3823b683f06dcb69dfb95eac689197b8572e9ebd735c89f08ec36d1007920970de0cb982bb63780ad5c21a02c5d34a34e30e2fa6f SHA512 0e971ba04cfc81071d44a2d57acbbe11e7e7706ac04774a7e5c0db6c940a30e64f5ef158e873f912b0d6f4c91a33c2aef4c9cf6b8158f714924c972ade34fb11 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 +DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip 41484 BLAKE2B 34fbdc1525bbea7fc6b7f74e74ab407ed03d3b58e25e9b3b79ec35945acce36b7c4be54388c1244d508c7cf67ac6e4f1ff7c9eb5245f01ff27dec82cfe87bdb8 SHA512 713c79551d48a99cc9feed3bcf71b7f1fe95270701787dfb114237bd358ad104d18ce7ca412f65d1ce6b7f94ffb6c01afe28c9b821e1a5378b05c93340aa8a49 @@ -249,9 +274,12 @@ DIST gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307 DIST gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.zip 48918 BLAKE2B aca803aaefb327d186b7f703ca85ce70caabd200938d8fdaae4a0c8fb41e73adc0a3a9fafc15483a2e6f13d5854a79a2753b8a67a3e33b39a351016856297bd4 SHA512 653c33136dadca777b3c9863cf7fd3f71d6fd51346cd1b812f30c901298728aeeceb03b48a87becca5eb3e980ca2b26ca374cb713d92d017e4d8e8873f3a6c98 DIST gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73 DIST gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.zip 64742 BLAKE2B 55c7f791bb3ba2d1af24dd0791ae53153550b4c53aeb446dc1b549cf366409738957e41798eb879beff02b5748e670a75f1e7eac31eb8a7ac0ae047cd4e9e598 SHA512 46f6bbb5f44ab422ecd68254f559b1eb07c9bcaaa6bc08c966cf6aacfba8f8dfcfc6ba6cb928d16fa112d97600c56ebe78832fa234f4a4c19b96abd579faa61a +DIST gopkg.in%2Fini.v1%2F@v%2Fv1.60.1.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73 +DIST gopkg.in%2Fini.v1%2F@v%2Fv1.60.1.zip 65711 BLAKE2B edf2b80b00e6b50c1ff3f695f6bde73fa9d6adfe1234e9068cf6119813d1048fffe780ff74914ab6b5a28352a3a7fa7c4f49d7fcfd2da7f7b19775531e5c70a4 SHA512 fbc7524fa5c8e2277282881d2bc599776f0a3b8553ed617904890ef43f7a7a6d14d90ce7fd9957eff9c540c37307940087289154a19ba5bde5cb787cc613c634 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 +DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip 80765 BLAKE2B d6d8bfba5082aabb1a247add43b21ffa058b58fef60e8efbf973b724273cda2496ef0c9b226ad14bfea17f141f077d3bd98dfe3dbcf3c2938fd64570abd662b2 SHA512 2a89b2bce856cc11f3b71edec9e538048acf07f6aabbe27236b663b284c086c5862f086734e58727e9db8912a113fea51f72dad1a45a9e85860764f9c27b19d2 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d diff --git a/app-admin/gopass/gopass-1.11.0.ebuild b/app-admin/gopass/gopass-1.11.0.ebuild new file mode 100644 index 000000000000..391b3ef6c3f3 --- /dev/null +++ b/app-admin/gopass/gopass-1.11.0.ebuild @@ -0,0 +1,242 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit go-module + +EGO_SUM=( + "filippo.io/age v1.0.0-beta4" + "filippo.io/age v1.0.0-beta4/go.mod" + "github.com/BurntSushi/toml v0.3.1" + "github.com/BurntSushi/toml v0.3.1/go.mod" + "github.com/atotto/clipboard v0.1.2" + "github.com/atotto/clipboard v0.1.2/go.mod" + "github.com/blang/semver v0.0.0-20190414182527-1a9109f8c4a1" + "github.com/blang/semver v0.0.0-20190414182527-1a9109f8c4a1/go.mod" + "github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b" + "github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b/go.mod" + "github.com/cenkalti/backoff v2.2.1+incompatible" + "github.com/cenkalti/backoff v2.2.1+incompatible/go.mod" + "github.com/cheggaaa/pb v1.0.29/go.mod" + "github.com/chzyer/logex v1.1.10" + "github.com/chzyer/logex v1.1.10/go.mod" + "github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e" + "github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod" + "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1" + "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod" + "github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d" + "github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod" + "github.com/cpuguy83/go-md2man/v2 v2.0.0" + "github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod" + "github.com/creack/pty v1.1.9/go.mod" + "github.com/davecgh/go-spew v1.1.0/go.mod" + "github.com/davecgh/go-spew v1.1.1" + "github.com/davecgh/go-spew v1.1.1/go.mod" + "github.com/dominikschulz/github-releases v0.0.3" + "github.com/dominikschulz/github-releases v0.0.3/go.mod" + "github.com/dustin/go-humanize v1.0.0/go.mod" + "github.com/fatih/color v1.9.0" + "github.com/fatih/color v1.9.0/go.mod" + "github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722" + "github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722/go.mod" + "github.com/gokyle/twofactor v1.0.1" + "github.com/gokyle/twofactor v1.0.1/go.mod" + "github.com/google/go-cmp v0.3.0" + "github.com/google/go-cmp v0.3.0/go.mod" + "github.com/google/go-cmp v0.5.2" + "github.com/google/go-cmp v0.5.2/go.mod" + "github.com/google/go-github v17.0.0+incompatible" + "github.com/google/go-github v17.0.0+incompatible/go.mod" + "github.com/google/go-querystring v1.0.0" + "github.com/google/go-querystring v1.0.0/go.mod" + "github.com/google/gofuzz v1.0.0/go.mod" + "github.com/google/uuid v1.1.1" + "github.com/google/uuid v1.1.1/go.mod" + "github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1" + "github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod" + "github.com/hashicorp/errwrap v1.0.0" + "github.com/hashicorp/errwrap v1.0.0/go.mod" + "github.com/hashicorp/go-multierror v1.1.0" + "github.com/hashicorp/go-multierror v1.1.0/go.mod" + "github.com/hashicorp/golang-lru v0.5.4" + "github.com/hashicorp/golang-lru v0.5.4/go.mod" + "github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad" + "github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad/go.mod" + "github.com/json-iterator/go v1.1.10" + "github.com/json-iterator/go v1.1.10/go.mod" + "github.com/jtolds/gls v4.20.0+incompatible" + "github.com/jtolds/gls v4.20.0+incompatible/go.mod" + "github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51" + "github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod" + "github.com/klauspost/cpuid v1.2.3" + "github.com/klauspost/cpuid v1.2.3/go.mod" + "github.com/klauspost/cpuid v1.3.1" + "github.com/klauspost/cpuid v1.3.1/go.mod" + "github.com/kr/pretty v0.1.0/go.mod" + "github.com/kr/pty v1.1.1/go.mod" + "github.com/kr/text v0.1.0" + "github.com/kr/text v0.1.0/go.mod" + "github.com/kr/text v0.2.0" + "github.com/kr/text v0.2.0/go.mod" + "github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3" + "github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3/go.mod" + "github.com/mattn/go-colorable v0.1.4" + "github.com/mattn/go-colorable v0.1.4/go.mod" + "github.com/mattn/go-colorable v0.1.7" + "github.com/mattn/go-colorable v0.1.7/go.mod" + "github.com/mattn/go-isatty v0.0.8" + "github.com/mattn/go-isatty v0.0.8/go.mod" + "github.com/mattn/go-isatty v0.0.11" + "github.com/mattn/go-isatty v0.0.11/go.mod" + "github.com/mattn/go-isatty v0.0.12" + "github.com/mattn/go-isatty v0.0.12/go.mod" + "github.com/mattn/go-runewidth v0.0.4/go.mod" + "github.com/minio/md5-simd v1.1.0" + "github.com/minio/md5-simd v1.1.0/go.mod" + "github.com/minio/minio-go/v7 v7.0.7" + "github.com/minio/minio-go/v7 v7.0.7/go.mod" + "github.com/minio/sha256-simd v0.1.1" + "github.com/minio/sha256-simd v0.1.1/go.mod" + "github.com/minio/sio v0.2.1/go.mod" + "github.com/mitchellh/go-homedir v1.1.0" + "github.com/mitchellh/go-homedir v1.1.0/go.mod" + "github.com/mitchellh/go-ps v1.0.0" + "github.com/mitchellh/go-ps v1.0.0/go.mod" + "github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421" + "github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod" + "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd" + "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod" + "github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742" + "github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod" + "github.com/modern-go/reflect2 v1.0.1" + "github.com/modern-go/reflect2 v1.0.1/go.mod" + "github.com/muesli/crunchy v0.4.0" + "github.com/muesli/crunchy v0.4.0/go.mod" + "github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d" + "github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod" + "github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e" + "github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod" + "github.com/pkg/errors v0.8.1/go.mod" + "github.com/pkg/errors v0.9.1" + "github.com/pkg/errors v0.9.1/go.mod" + "github.com/pmezard/go-difflib v1.0.0" + "github.com/pmezard/go-difflib v1.0.0/go.mod" + "github.com/rs/xid v1.2.1" + "github.com/rs/xid v1.2.1/go.mod" + "github.com/russross/blackfriday/v2 v2.0.1" + "github.com/russross/blackfriday/v2 v2.0.1/go.mod" + "github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e" + "github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e/go.mod" + "github.com/sergi/go-diff v1.1.0" + "github.com/sergi/go-diff v1.1.0/go.mod" + "github.com/shurcooL/sanitized_anchor_name v1.0.0" + "github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod" + "github.com/sirupsen/logrus v1.7.0/go.mod" + "github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e" + "github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod" + "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d" + "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod" + "github.com/smartystreets/assertions v1.0.0" + "github.com/smartystreets/assertions v1.0.0/go.mod" + "github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a" + "github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod" + "github.com/smartystreets/goconvey v1.6.4" + "github.com/smartystreets/goconvey v1.6.4/go.mod" + "github.com/spf13/pflag v1.0.3/go.mod" + "github.com/stretchr/objx v0.1.0/go.mod" + "github.com/stretchr/testify v1.2.2/go.mod" + "github.com/stretchr/testify v1.3.0/go.mod" + "github.com/stretchr/testify v1.4.0/go.mod" + "github.com/stretchr/testify v1.6.1" + "github.com/stretchr/testify v1.6.1/go.mod" + "github.com/urfave/cli/v2 v2.2.0" + "github.com/urfave/cli/v2 v2.2.0/go.mod" + "github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9" + "github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9/go.mod" + "github.com/xrash/smetrics v0.0.0-20200730060457-89a2a8a1fb0b" + "github.com/xrash/smetrics v0.0.0-20200730060457-89a2a8a1fb0b/go.mod" + "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" + "golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod" + "golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod" + "golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod" + "golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod" + "golang.org/x/crypto v0.0.0-20200930160638-afb6bcd081ae" + "golang.org/x/crypto v0.0.0-20200930160638-afb6bcd081ae/go.mod" + "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod" + "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" + "golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod" + "golang.org/x/net v0.0.0-20201021035429-f5854403a974" + "golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod" + "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod" + "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" + "golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod" + "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" + "golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod" + "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod" + "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod" + "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod" + "golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod" + "golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f" + "golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod" + "golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5" + "golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5/go.mod" + "golang.org/x/text v0.3.0" + "golang.org/x/text v0.3.0/go.mod" + "golang.org/x/text v0.3.3" + "golang.org/x/text v0.3.3/go.mod" + "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" + "golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod" + "golang.org/x/tools v0.0.0-20190624222133-a101b041ded4" + "golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod" + "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543" + "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod" + "golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1" + "golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod" + "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" + "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod" + "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" + "gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f" + "gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod" + "gopkg.in/ini.v1 v1.57.0/go.mod" + "gopkg.in/ini.v1 v1.60.1" + "gopkg.in/ini.v1 v1.60.1/go.mod" + "gopkg.in/yaml.v2 v2.2.2" + "gopkg.in/yaml.v2 v2.2.2/go.mod" + "gopkg.in/yaml.v2 v2.2.4/go.mod" + "gopkg.in/yaml.v2 v2.2.8/go.mod" + "gopkg.in/yaml.v2 v2.3.0" + "gopkg.in/yaml.v2 v2.3.0/go.mod" + "gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod" + "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod" + "gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776" + "gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod" + "gotest.tools v2.2.0+incompatible" + "gotest.tools v2.2.0+incompatible/go.mod" + "gotest.tools/v3 v3.0.2" + "gotest.tools/v3 v3.0.2/go.mod" + "rsc.io/qr v0.2.0" + "rsc.io/qr v0.2.0/go.mod" +) + +go-module_set_globals + +DESCRIPTION="a simple but powerful password manager for the terminal" +HOMEPAGE="https://www.gopass.pw/" +SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz + ${EGO_SUM_SRC_URI}" + +LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" + +DEPEND=">=dev-lang/go-1.11" +RDEPEND=" + dev-vcs/git + >=app-crypt/gnupg-2 +" + +src_install() { + emake install DESTDIR="${ED}/usr" + einstalldocs +} diff --git a/app-backup/amanda/amanda-3.5.1-r3.ebuild b/app-backup/amanda/amanda-3.5.1-r3.ebuild index 81acd43577df..071fccdd8908 100644 --- a/app-backup/amanda/amanda-3.5.1-r3.ebuild +++ b/app-backup/amanda/amanda-3.5.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+" SLOT="0" IUSE="curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ppc ~ppc64 ~sparc x86" DEPEND=" acct-group/amanda acct-user/amanda diff --git a/app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-fno-common.patch b/app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-fno-common.patch new file mode 100644 index 000000000000..88bfb33433c1 --- /dev/null +++ b/app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-fno-common.patch @@ -0,0 +1,48 @@ +https://bugs.gentoo.org/707256 +--- a/tpm/tpm_emulator_extern.h ++++ b/tpm/tpm_emulator_extern.h +@@ -29,7 +29,7 @@ enum { + TPM_LOG_ERROR + }; + +-void (*tpm_log)(int priority, const char *fmt, ...); ++extern void (*tpm_log)(int priority, const char *fmt, ...); + + #if defined(_WIN32) || defined(_WIN64) + #define __BFILE__ ((strrchr(__FILE__, '\\') ? : __FILE__ - 1) + 1) +@@ -44,27 +44,27 @@ void (*tpm_log)(int priority, const char *fmt, ...); + #define error(fmt, ...) tpm_log(TPM_LOG_ERROR, "%s:%d: Error: " fmt "\n", \ + __BFILE__, __LINE__, ## __VA_ARGS__) + /* initialization */ +-int (*tpm_extern_init)(void); +-void (*tpm_extern_release)(void); ++extern int (*tpm_extern_init)(void); ++extern void (*tpm_extern_release)(void); + + /* memory allocation */ + +-void* (*tpm_malloc)(size_t size); ++extern void* (*tpm_malloc)(size_t size); + +-void (*tpm_free)(/*const*/ void *ptr); ++extern void (*tpm_free)(/*const*/ void *ptr); + + /* random numbers */ + +-void (*tpm_get_extern_random_bytes)(void *buf, size_t nbytes); ++extern void (*tpm_get_extern_random_bytes)(void *buf, size_t nbytes); + + /* usec since last call */ + +-uint64_t (*tpm_get_ticks)(void); ++extern uint64_t (*tpm_get_ticks)(void); + + /* file handling */ + +-int (*tpm_write_to_storage)(uint8_t *data, size_t data_length); +-int (*tpm_read_from_storage)(uint8_t **data, size_t *data_length); ++extern int (*tpm_write_to_storage)(uint8_t *data, size_t data_length); ++extern int (*tpm_read_from_storage)(uint8_t **data, size_t *data_length); + + #endif /* _TPM_EMULATOR_EXTERN_H_ */ + diff --git a/app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-static-libs.patch b/app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-static-libs.patch new file mode 100644 index 000000000000..845229bd7670 --- /dev/null +++ b/app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-static-libs.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/726492 +--- a/tddl/CMakeLists.txt ++++ b/tddl/CMakeLists.txt +@@ -5,21 +5,18 @@ + + set(tddl-tpm-emulator_SRCS "tddl.c" "tddl-tpm-emulator.h") + add_library(tddl-tpm-emulator SHARED ${tddl-tpm-emulator_SRCS}) +-add_library(tddl-tpm-emulator_static STATIC ${tddl-tpm-emulator_SRCS}) + if(UNIX) + set_target_properties(tddl-tpm-emulator PROPERTIES SOVERSION "1.2" + VERSION "1.2.${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}") +- set_target_properties(tddl-tpm-emulator_static PROPERTIES OUTPUT_NAME tddl-tpm-emulator) + elseif(WIN32) + set_target_properties(tddl-tpm-emulator PROPERTIES OUTPUT_NAME ifxtpm) + set_target_properties(tddl-tpm-emulator PROPERTIES PREFIX "") + endif() + + install(TARGETS tddl-tpm-emulator DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-install(TARGETS tddl-tpm-emulator_static DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES "tddl-tpm-emulator.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + add_executable(test_tddl test_tddl.c) +-target_link_libraries(test_tddl tddl-tpm-emulator_static) ++target_link_libraries(test_tddl tddl-tpm-emulator) + diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.7.5-r2.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.7.5-r3.ebuild index 9323c1f7edcb..38a0d0182708 100644 --- a/app-crypt/tpm-emulator/tpm-emulator-0.7.5-r2.ebuild +++ b/app-crypt/tpm-emulator/tpm-emulator-0.7.5-r3.ebuild @@ -1,30 +1,34 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + MODULES_OPTIONAL_USE="modules" -inherit user linux-mod cmake-utils udev +inherit cmake linux-mod udev MY_P=${P/-/_} DESCRIPTION="Emulator driver for tpm" HOMEPAGE="https://github.com/PeterHuewe/tpm-emulator" SRC_URI="https://github.com/PeterHuewe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" - IUSE="mtm-emulator" -RDEPEND="dev-libs/gmp:=" + +RDEPEND=" + acct-group/tpm + acct-user/tpm + dev-libs/gmp:=" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/${P}-build.patch" + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${P}-static-libs.patch ) pkg_setup() { - enewgroup tss - enewuser tss -1 -1 /var/lib/tpm tss if use modules; then CONFIG_CHECK="MODULES" MODULE_NAMES="tpmd_dev(extra:tpmd_dev/linux:)" @@ -39,18 +43,20 @@ src_configure() { -DMTM_EMULATOR=$(usex mtm-emulator ON OFF) -DBUILD_DEV=OFF ) - cmake-utils_src_configure + cmake_src_configure - use modules && ln -s "${BUILD_DIR}/config.h" tpmd_dev/linux + if use modules; then + ln -s "${BUILD_DIR}/config.h" tpmd_dev/linux || die + fi } src_compile() { - cmake-utils_src_compile + cmake_src_compile use modules && linux-mod_src_compile } src_install() { - cmake-utils_src_install + cmake_src_install if use modules; then linux-mod_src_install udev_newrules "tpmd_dev/linux/tpmd_dev.rules" 60-tpmd_dev.rules diff --git a/app-editors/moe/Manifest b/app-editors/moe/Manifest index 3ffcdddd6762..fda80cb2889c 100644 --- a/app-editors/moe/Manifest +++ b/app-editors/moe/Manifest @@ -1,2 +1,3 @@ DIST moe-1.10.tar.lz 84050 BLAKE2B 2e49aba27cdd603fbc9a4eb0fef5e086a527087d72f30f68beb4e3389de0ccdd85fec5bf753b3187d64cd6549ac5738c89e94c543c141f88896c580e7c33ad42 SHA512 3908d7906aa7dcb8bd4a5d340fe94b06fc91814098c20e8939906c2b0e03e1a8a3c95847b5f8111a5d9f37636a2fafa52f9105e0e8fa0ad8b16c2f9e9dede748 +DIST moe-1.11.tar.lz 89532 BLAKE2B 8479c8bb0504e614b4ad87e47ae89d1f0eb23141ff71ef3e46eb316424dfe87150f2d9474e1dbd3510fa9b1da517bd6afe47b2cd36f1aa70630b371f0f6bec3a SHA512 147f3500909739371290fc2f703ef5fab286d2ca385f6808ee3e0cb1cbae2ed58a0b5046d30ad5d24215dc28d77f0bba4efacb144c116209d89d023e731e8a39 DIST moe-1.9.tar.lz 82046 BLAKE2B 9144dfc4ce17bc04f3ad9aa9ec271f173df6c581705e5d922a346f94c086a97af9429478c016d7081c1fd38787055666504f04d25a8b9f5c1020dc147aaafdb0 SHA512 277700e4a796e1a7aee42de55ba4599a350a612f95a1a2eca5078d85f6f9a7db190fb5611eb2f286c98580af847a2934bf38a4bce10176db4c5cddc2d257f929 diff --git a/app-editors/moe/moe-1.10.ebuild b/app-editors/moe/moe-1.10.ebuild index f530b53537f9..6d9028d722c4 100644 --- a/app-editors/moe/moe-1.10.ebuild +++ b/app-editors/moe/moe-1.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm x86 amd64-linux ~x86-linux" RDEPEND=" sys-libs/ncurses:0= diff --git a/app-editors/moe/moe-1.11.ebuild b/app-editors/moe/moe-1.11.ebuild new file mode 100644 index 000000000000..690bdeff4576 --- /dev/null +++ b/app-editors/moe/moe-1.11.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs unpacker + +DESCRIPTION="A powerful and user-friendly console text editor" +HOMEPAGE="https://www.gnu.org/software/moe/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.lz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + sys-libs/ncurses:0= +" +DEPEND=" + $(unpacker_src_uri_depends) + ${RDEPEND} + virtual/pkgconfig +" + +src_prepare() { + tc-export CXX PKG_CONFIG + sed -i \ + -e "/^CXXFLAGS=/d" \ + -e "/^LDFLAGS=/d" \ + -e "/^CXX=/d" \ + configure || die "sed on configure failed" + + eapply_user + + eapply "${FILESDIR}/${PN}-1.6-tinfo.patch" +} diff --git a/app-emulation/qemu/qemu-5.2.0-r1.ebuild b/app-emulation/qemu/qemu-5.2.0-r1.ebuild index f9802f8ca290..41893806eaa0 100644 --- a/app-emulation/qemu/qemu-5.2.0-r1.ebuild +++ b/app-emulation/qemu/qemu-5.2.0-r1.ebuild @@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then SRC_URI="" else SRC_URI="https://download.qemu.org/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest index e7bddfc8d195..962391563540 100644 --- a/app-emulation/virtualbox-additions/Manifest +++ b/app-emulation/virtualbox-additions/Manifest @@ -1 +1,2 @@ DIST VBoxGuestAdditions_6.1.16.iso 60987392 BLAKE2B d4452f43c72ab8c49633f717f7a49257e14a8c6c7b60c6d61ee65ae5e4bcce00c30e19ba78d6f28fb85dfbc95ca6139aec2c7069e5afecae145dffc6ff38793a SHA512 e7606fba6e7490318b7dbadff52578040e4370bbe81fa67e6653e798176eb929ed37e363792647ab3c6626ee9e32af40f63167521997af7b446c25173ff60280 +DIST VBoxGuestAdditions_6.1.18.iso 61157376 BLAKE2B e022cfbc70fa45889c1db7592f30814faf88d7614c30ebd3fccd0127732d7fec51423904a160797ac199315dcbe4791f025e2dc4754141bfef0862b11510626c SHA512 07be8be75feb2d7d9bfc984ce34b955339d391580192817c2eb216b7577576a003dde310cc09f18c6b6bcf2e30ad548e1ee8bde0af420e4d1d43a3486861cf19 diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.18.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.18.ebuild new file mode 100644 index 000000000000..b6488481acda --- /dev/null +++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.18.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN=VBoxGuestAdditions +MY_PV="${PV/beta/BETA}" +MY_PV="${MY_PV/rc/RC}" +MY_P=${MY_PN}_${MY_PV} + +DESCRIPTION="CD image containing guest additions for VirtualBox" +HOMEPAGE="https://www.virtualbox.org/" +SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso" + +LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL" +SLOT="0/$(ver_cut 1-2)" +[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ +KEYWORDS="~amd64" +IUSE="" +RESTRICT="mirror" + +RDEPEND="!app-emulation/virtualbox-bin + !=app-emulation/virtualbox-9999" + +S="${WORKDIR}" + +src_unpack() { + return 0 +} + +src_install() { + insinto /usr/share/${PN/-additions} + newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso +} diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest index cd4f471d6cc1..9e4725abc1ce 100644 --- a/app-emulation/virtualbox-extpack-oracle/Manifest +++ b/app-emulation/virtualbox-extpack-oracle/Manifest @@ -1 +1,2 @@ DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.16-140961.tar.gz 11145670 BLAKE2B 86e620ebaea9803b9bf633990a39d9e2828fbe70cdc98cbb6ba98accc374e0ea2300a7135cae0f0ec8d13184ccc8e0ff075ca1f81132ed97206f14c20adeb3bc SHA512 89b9c709da1c4b8268c4c1849e074f4d8dc76a36663b401c9ea63f02422bec50e2b77056289144bb161b1dd226b78687379d6ab86281112a71561c1777f525fb +DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.18-142142.tar.gz 11157510 BLAKE2B d9ee20abac79ed5de03c39d1e6af3a5f18c5416149e9e64ebe9dfc4a937bd72b6590a2daaccc820e3ee6c6efcfd0c1c8e29bf3844cbbb929f13052415e16f2bb SHA512 3686b1c5dbdc5b28c172b4885c30ca9a444bc10dc7984df14a17e1dcc571456b06e80ad38e1409de8692c483c56f397162a53bd3dc6956d9ca91875fda0bda4e diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.18.142142.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.18.142142.ebuild new file mode 100644 index 000000000000..5e6035fc8003 --- /dev/null +++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.18.142142.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib + +MAIN_PV="$(ver_cut 1-3)" +if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then + MY_PV="${MAIN_PV}_$(ver_cut 5-6)" + DEP_PV="${MY_PV}" + MY_PV="${MY_PV/beta/BETA}" + MY_PV="${MY_PV/rc/RC}" +else + MY_PV="${MAIN_PV}" + DEP_PV="${MAIN_PV}" +fi +VBOX_BUILD_ID="$(ver_cut 4)" +MY_PN="Oracle_VM_VirtualBox_Extension_Pack" +MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}" + +DESCRIPTION="PUEL extensions for VirtualBox" +HOMEPAGE="https://www.virtualbox.org/" +SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz" + +LICENSE="PUEL" +SLOT="0/$(ver_cut 1-2)" +[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ +KEYWORDS="~amd64" +IUSE="" +RESTRICT="bindist mirror strip" + +RDEPEND="=app-emulation/virtualbox-${DEP_PV}*" + +S="${WORKDIR}" + +QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*" + +src_install() { + insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN} + doins -r linux.${ARCH} + doins ExtPack* PXE-Intel.rom +} diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest index f9bd0b735ed4..7e4f05e011f8 100644 --- a/app-emulation/virtualbox-guest-additions/Manifest +++ b/app-emulation/virtualbox-guest-additions/Manifest @@ -1,2 +1,3 @@ DIST VirtualBox-6.1.16.tar.bz2 165470821 BLAKE2B 13376322d0ce2ea3ed826c61816ff19c8ce1f022f6cb1f1b0c291d72354cbe574a01589a6dcc39de10080ba32d5961ca980e75fe11c7401736bf8f7e5443d166 SHA512 4373eb35934f894e419e1441f6368e646e4a84b963a0ecf1e5c71bbf0231de0b0e52f4c4377b8cd2d956bc7a11346a9da2285988bf1e4c743971c413c6529421 +DIST VirtualBox-6.1.18.tar.bz2 165507486 BLAKE2B 3cf18f30671426f533838eb0579928b08ce022b832d509e70274978efce2e3e0e14dc8fbf258ef9a1ce8a3d666081863aa6971340e04600434f58136fe5c221a SHA512 41cb4bd42429b09836c59ef9867dd3d35d0d5512ff6e515a7f8688ed444c079ce353a84f0d45b607ccf08424782d5de09b264f51b2c41a9ec34eb834458c293c DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123 diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.18.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.18.ebuild new file mode 100644 index 000000000000..666685882cb9 --- /dev/null +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.18.ebuild @@ -0,0 +1,221 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-mod systemd toolchain-funcs + +MY_PN="VirtualBox" +MY_PV="${PV/beta/BETA}" +MY_PV="${MY_PV/rc/RC}" +MY_P="${MY_PN}-${MY_PV}" +[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)" + +DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests" +HOMEPAGE="https://www.virtualbox.org/" +SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2 + https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz" + +LICENSE="GPL-2" +SLOT="0/$(ver_cut 1-2)" +[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ +KEYWORDS="~amd64 ~x86" +IUSE="X" + +# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist +RDEPEND=" + acct-group/vboxguest + acct-group/vboxsf + acct-user/vboxguest + X? ( x11-apps/xrandr + x11-apps/xrefresh + x11-libs/libXmu + x11-libs/libX11 + x11-libs/libXt + x11-libs/libXext + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libSM + x11-libs/libICE ) + sys-apps/dbus +" +DEPEND=" + ${RDEPEND} + >=dev-util/kbuild-0.1.9998.3127 + >=dev-lang/yasm-0.6.2 + sys-devel/bin86 + sys-libs/pam + sys-power/iasl + x11-base/xorg-proto +" +PDEPEND=" + X? ( x11-drivers/xf86-video-vboxvideo ) +" +BUILD_TARGETS="all" +BUILD_TARGET_ARCH="${ARCH}" + +S="${WORKDIR}/${MY_PN}-${DIR_PV:-${PV}}" +VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src" + +pkg_setup() { + export DISTCC_DISABLE=1 #674256 + MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest) + vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)" + use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)" + + linux-mod_pkg_setup + BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers" +} + +src_prepare() { + # Remove shipped binaries (kBuild,yasm), see bug #232775 + rm -r kBuild/bin tools || die + + # Provide kernel sources + pushd src/VBox/Additions &>/dev/null || die + ebegin "Extracting guest kernel module sources" + kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null || die + eend + popd &>/dev/null || die + + # PaX fixes (see bug #298988) + pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die + eapply "${FILESDIR}"/vboxguest-6.0.6-log-use-c99.patch + popd &>/dev/null || die + + # Disable things unused or splitted into separate ebuilds + cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die + use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk + + # Remove pointless GCC version check + sed -e '/^check_gcc$/d' -i configure || die + + eapply "${WORKDIR}/patches" + + eapply_user +} + +src_configure() { + # build the user-space tools, warnings are harmless + local cmd=( + ./configure + --nofatal + --disable-xpcom + --disable-sdl-ttf + --disable-pulse + --disable-alsa + --with-gcc="$(tc-getCC)" + --with-g++="$(tc-getCXX)" + --target-arch=${ARCH} + --with-linux="${KV_OUT_DIR}" + --build-headless + ) + echo "${cmd[@]}" + "${cmd[@]}" || die "configure failed" + source ./env.sh + export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}" +} + +src_compile() { + MAKE="kmk" emake \ + VBOX_BUILD_PUBLISHER=_Gentoo \ + TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \ + TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \ + TOOL_YASM_AS=yasm \ + VBOX_ONLY_ADDITIONS=1 \ + KBUILD_VERBOSE=2 + + # Now creating the kernel modules. We must do this _after_ + # we compiled the user-space tools as we need two of the + # automatically generated header files. (>=3.2.0) + linux-mod_src_compile +} + +src_install() { + linux-mod_src_install + + cd "${S}"/out/linux.${ARCH}/release/bin/additions || die + + insinto /sbin + newins mount.vboxsf mount.vboxsf + fperms 4755 /sbin/mount.vboxsf + + newinitd "${FILESDIR}"/${PN}-8.initd ${PN} + + insinto /usr/sbin/ + newins VBoxService vboxguest-service + fperms 0755 /usr/sbin/vboxguest-service + + insinto /usr/bin + doins VBoxControl + fperms 0755 /usr/bin/VBoxControl + + # VBoxClient user service and xrandr wrapper + if use X ; then + doins VBoxClient + fperms 0755 /usr/bin/VBoxClient + + pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \ + || die + newins 98vboxadd-xclient VBoxClient-all + fperms 0755 /usr/bin/VBoxClient-all + popd &>/dev/null || die + fi + + # udev rule for vboxdrv + local udev_rules_dir="/lib/udev/rules.d" + dodir ${udev_rules_dir} + echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ + >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ + || die + echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ + >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ + || die + + # VBoxClient autostart file + insinto /etc/xdg/autostart + doins "${FILESDIR}"/vboxclient.desktop + + # sample xorg.conf + dodoc "${FILESDIR}"/xorg.conf.vbox + docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox + + systemd_dounit "${FILESDIR}/${PN}.service" +} + +pkg_postinst() { + linux-mod_pkg_postinst + if ! use X ; then + elog "use flag X is off, enable it to install the" + elog "X Window System video driver." + fi + elog "" + elog "Please add users to the \"vboxguest\" group so they can" + elog "benefit from seamless mode, auto-resize and clipboard." + elog "" + elog "The vboxsf group has been added to make automount services work." + elog "These services are part of the shared folders support." + elog "" + elog "Please add:" + elog "/etc/init.d/${PN}" + elog "to the default runlevel in order to start" + elog "needed services." + elog "To use the VirtualBox X driver, use the following" + elog "file as your /etc/X11/xorg.conf:" + elog " /usr/share/doc/${PF}/xorg.conf.vbox" + elog "" + elog "Also make sure you use the Mesa library for OpenGL:" + elog " eselect opengl set xorg-x11" + elog "" + elog "An autostart .desktop file has been installed to start" + elog "VBoxClient in desktop sessions." + elog "" + elog "You can mount shared folders with:" + elog " mount -t vboxsf <shared_folder_name> <mount_point>" + elog "" + elog "Warning:" + elog "this ebuild is only needed if you are running gentoo" + elog "inside a VirtualBox Virtual Machine, you don't need" + elog "it to run VirtualBox itself." + elog "" +} diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest index fb1db2000570..730ec003094d 100644 --- a/app-emulation/virtualbox-modules/Manifest +++ b/app-emulation/virtualbox-modules/Manifest @@ -1 +1,2 @@ DIST vbox-kernel-module-src-6.1.16.tar.xz 671736 BLAKE2B 8b2153874ee7a63f88679a5372215e89def49622caa7679a5c2410423eaf23ced18ece79d638fc96db40fac88857db7568dd72dd8e05371b14add3553d61d3a7 SHA512 c51dfad5f9578ad43e2fbdd35a70659640030108006f89d362bc25dead99eb3b39a78d403633b3813f62f5b510eff22d826a2750b9c88f5fcb1cde6531295bff +DIST vbox-kernel-module-src-6.1.18.tar.xz 672004 BLAKE2B 7199ba2a5020e5ab51d82735df16aee78ece74db232733b932c380f90dffd589a72613120bbd5c580381ab6f6308abb8d12f69855b9c0a8345bfb8587d022019 SHA512 49b54898b2701774fdeec0cd99dd51a1dd71ffd9be38e125fde73f0c64a697138d13bddbb0ed0e9582d354fa0394608084effb68bd35b266c87f6e3b44c6f342 diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild new file mode 100644 index 000000000000..e179b43d5370 --- /dev/null +++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# XXX: the tarball here is just the kernel modules split out of the binary +# package that comes from virtualbox-bin + +EAPI=7 + +inherit linux-mod toolchain-funcs + +MY_P="vbox-kernel-module-src-${PV}" +DESCRIPTION="Kernel Modules for Virtualbox" +HOMEPAGE="https://www.virtualbox.org/" +SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0/$(ver_cut 1-2)" +[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ +KEYWORDS="~amd64" +IUSE="pax_kernel" + +RDEPEND="!=app-emulation/virtualbox-9999" + +S="${WORKDIR}" + +BUILD_TARGETS="all" +MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})" +MODULESD_VBOXDRV_ENABLED="yes" +MODULESD_VBOXNETADP_ENABLED="no" +MODULESD_VBOXNETFLT_ENABLED="no" + +pkg_setup() { + linux-mod_pkg_setup + BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1" +} + +src_prepare() { + if use pax_kernel && kernel_is -ge 3 0 0 ; then + eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch + fi + + default +} + +src_install() { + linux-mod_src_install + insinto /usr/lib/modules-load.d/ + newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf +} + +pkg_postinst() { + # Remove vboxpci.ko from current running kernel + find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete + linux-mod_pkg_postinst +} diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest index f9bd0b735ed4..7e4f05e011f8 100644 --- a/app-emulation/virtualbox/Manifest +++ b/app-emulation/virtualbox/Manifest @@ -1,2 +1,3 @@ DIST VirtualBox-6.1.16.tar.bz2 165470821 BLAKE2B 13376322d0ce2ea3ed826c61816ff19c8ce1f022f6cb1f1b0c291d72354cbe574a01589a6dcc39de10080ba32d5961ca980e75fe11c7401736bf8f7e5443d166 SHA512 4373eb35934f894e419e1441f6368e646e4a84b963a0ecf1e5c71bbf0231de0b0e52f4c4377b8cd2d956bc7a11346a9da2285988bf1e4c743971c413c6529421 +DIST VirtualBox-6.1.18.tar.bz2 165507486 BLAKE2B 3cf18f30671426f533838eb0579928b08ce022b832d509e70274978efce2e3e0e14dc8fbf258ef9a1ce8a3d666081863aa6971340e04600434f58136fe5c221a SHA512 41cb4bd42429b09836c59ef9867dd3d35d0d5512ff6e515a7f8688ed444c079ce353a84f0d45b607ccf08424782d5de09b264f51b2c41a9ec34eb834458c293c DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123 diff --git a/app-emulation/virtualbox/virtualbox-6.1.18.ebuild b/app-emulation/virtualbox/virtualbox-6.1.18.ebuild new file mode 100644 index 000000000000..8b02c6ecf35d --- /dev/null +++ b/app-emulation/virtualbox/virtualbox-6.1.18.ebuild @@ -0,0 +1,512 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg + +MY_PN="VirtualBox" +MY_PV="${PV/beta/BETA}" +MY_PV="${MY_PV/rc/RC}" +MY_P=${MY_PN}-${MY_PV} +[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)" + +DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use" +HOMEPAGE="https://www.virtualbox.org/" +SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2 + https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.12-patches-01.tar.xz" + +LICENSE="GPL-2 dtrace? ( CDDL )" +SLOT="0/$(ver_cut 1-2)" +[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ +KEYWORDS="~amd64" +IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" + +CDEPEND=" + ${PYTHON_DEPS} + !app-emulation/virtualbox-bin + acct-group/vboxusers + ~app-emulation/virtualbox-modules-${DIR_PV:-${PV}} + dev-libs/libIDL + >=dev-libs/libxslt-1.1.19 + net-misc/curl + dev-libs/libxml2 + media-libs/libpng:0= + media-libs/libvpx:0= + sys-libs/zlib:= + !headless? ( + media-libs/libsdl:0[X,video] + x11-libs/libX11 + x11-libs/libxcb:= + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXt + opengl? ( media-libs/libglvnd[X] ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + opengl? ( dev-qt/qtopengl:5 ) + x11-libs/libXinerama + ) + ) + libressl? ( dev-libs/libressl:= ) + !libressl? ( dev-libs/openssl:0= ) + lvm? ( sys-fs/lvm2 ) + opus? ( media-libs/opus ) + udev? ( >=virtual/udev-171 ) + vnc? ( >=net-libs/libvncserver-0.9.9 ) +" +DEPEND=" + ${CDEPEND} + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + !headless? ( + x11-libs/libXinerama + opengl? ( virtual/opengl ) + ) + pam? ( sys-libs/pam ) + pax_kernel? ( sys-apps/elfix ) + pulseaudio? ( media-sound/pulseaudio ) + qt5? ( dev-qt/linguist-tools:5 ) + vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) +" +BDEPEND=" + ${PYTHON_DEPS} + >=dev-util/kbuild-0.1.9998.3127 + >=dev-lang/yasm-0.6.2 + sys-devel/bin86 + sys-libs/libcap + sys-power/iasl + virtual/pkgconfig + doc? ( + app-text/docbook-sgml-dtd:4.4 + dev-texlive/texlive-basic + dev-texlive/texlive-latex + dev-texlive/texlive-latexrecommended + dev-texlive/texlive-latexextra + dev-texlive/texlive-fontsrecommended + dev-texlive/texlive-fontsextra + ) + java? ( >=virtual/jdk-1.6 ) +" +RDEPEND=" + ${CDEPEND} + java? ( >=virtual/jre-1.6 ) +" + +QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so + usr/lib/virtualbox/VBoxSDL.so + usr/lib/virtualbox/VBoxSharedFolders.so + usr/lib/virtualbox/VBoxDD2.so + usr/lib/virtualbox/VBoxOGLrenderspu.so + usr/lib/virtualbox/VBoxPython.so + usr/lib/virtualbox/VBoxDD.so + usr/lib/virtualbox/VBoxDDU.so + usr/lib/virtualbox/VBoxREM64.so + usr/lib/virtualbox/VBoxSharedClipboard.so + usr/lib/virtualbox/VBoxHeadless.so + usr/lib/virtualbox/VBoxRT.so + usr/lib/virtualbox/VBoxREM.so + usr/lib/virtualbox/VBoxSettings.so + usr/lib/virtualbox/VBoxKeyboard.so + usr/lib/virtualbox/VBoxSharedCrOpenGL.so + usr/lib/virtualbox/VBoxVMM.so + usr/lib/virtualbox/VirtualBox.so + usr/lib/virtualbox/VBoxOGLhosterrorspu.so + usr/lib/virtualbox/components/VBoxC.so + usr/lib/virtualbox/components/VBoxSVCM.so + usr/lib/virtualbox/components/VBoxDDU.so + usr/lib/virtualbox/components/VBoxRT.so + usr/lib/virtualbox/components/VBoxREM.so + usr/lib/virtualbox/components/VBoxVMM.so + usr/lib/virtualbox/VBoxREM32.so + usr/lib/virtualbox/VBoxPython2_7.so + usr/lib/virtualbox/VBoxXPCOMC.so + usr/lib/virtualbox/VBoxOGLhostcrutil.so + usr/lib/virtualbox/VBoxNetDHCP.so + usr/lib/virtualbox/VBoxNetNAT.so" + +S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}" + +REQUIRED_USE=" + java? ( sdk ) + python? ( sdk ) + vboxwebsrv? ( java ) + ${PYTHON_REQUIRED_USE} +" + +pkg_pretend() { + if ! use headless && ! use qt5 ; then + einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend." + elif use headless && use qt5 ; then + einfo "You selected USE=\"headless qt5\", defaulting to" + einfo "USE=\"headless\", this build will not include any X11/Qt frontend." + fi + + if ! use opengl ; then + einfo "No USE=\"opengl\" selected, this build will lack" + einfo "the OpenGL feature." + fi + if ! use python ; then + einfo "You have disabled the \"python\" USE flag. This will only" + einfo "disable the python bindings being installed." + fi +} + +pkg_setup() { + java-pkg-opt-2_pkg_setup + python-single-r1_pkg_setup + + tc-ld-disable-gold #bug 488176 + tc-export CC CXX LD AR RANLIB + export HOST_CC="$(tc-getBUILD_CC)" +} + +src_prepare() { + # Remove shipped binaries (kBuild,yasm), see bug #232775 + rm -r kBuild/bin tools || die + + # Replace pointless GCC version check with something less stupid. + # This is needed for the qt5 version check. + sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \ + -i configure || die + + # Disable things unused or split into separate ebuilds + sed -e "s@MY_LIBDIR@$(get_libdir)@" \ + "${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die + + # Respect LDFLAGS + sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \ + -i Config.kmk src/libs/xpcom18a4/Config.kmk || die + + # Do not use hard-coded ld (related to bug #488176) + sed -e '/QUIET)ld /s@ld @$(LD) @' \ + -i src/VBox/Devices/PC/ipxe/Makefile.kmk || die + + # Use PAM only when pam USE flag is enbaled (bug #376531) + if ! use pam ; then + elog "Disabling PAM removes the possibility to use the VRDP features." + sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die + sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \ + src/VBox/HostServices/Makefile.kmk || die + fi + + # add correct java path + if use java ; then + sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \ + -i "${S}"/Config.kmk || die + java-pkg-opt-2_src_prepare + fi + + # Only add nopie patch when we're on hardened + if gcc-specs-pie ; then + eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch" + fi + + # Only add paxmark patch when we're on pax_kernel + if use pax_kernel ; then + eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch + fi + + eapply "${WORKDIR}/patches" + + eapply_user +} + +doecho() { + echo "$@" + "$@" || die +} + +src_configure() { + local myconf=( + --with-gcc="$(tc-getCC)" + --with-g++="$(tc-getCXX)" + --disable-dbus + --disable-kmods + $(usex alsa '' --disable-alsa) + $(usex debug --build-debug '') + $(usex doc '' --disable-docs) + $(usex java '' --disable-java) + $(usex lvm '' --disable-devmapper) + $(usex opus '' --disable-libopus) + $(usex pulseaudio '' --disable-pulse) + $(usex python '' --disable-python) + $(usex vboxwebsrv --enable-webservice '') + $(usex vnc --enable-vnc '') + ) + if ! use headless ; then + myconf+=( + $(usex opengl '' --disable-opengl) + $(usex qt5 '' --disable-qt) + ) + else + myconf+=( + --build-headless + --disable-opengl + ) + fi + if use amd64 && ! has_multilib_profile ; then + myconf+=( --disable-vmmraw ) + fi + # not an autoconf script + doecho ./configure ${myconf[@]} +} + +src_compile() { + source ./env.sh || die + + # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529) + MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #' + MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #' + MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" + MAKE="kmk" emake \ + VBOX_BUILD_PUBLISHER=_Gentoo \ + TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \ + TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \ + TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \ + VBOX_WITH_VBOXIMGMOUNT=1 \ + all +} + +src_install() { + cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die + + local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile + + vbox_inst() { + local binary="${1}" + local perms="${2:-0750}" + local path="${3:-${vbox_inst_path}}" + + [[ -n "${binary}" ]] || die "vbox_inst: No binary given!" + [[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits." + + insinto ${path} + doins ${binary} + fowners root:vboxusers ${path}/${binary} + fperms ${perms} ${path}/${binary} + } + + # Create configuration files + insinto /etc/vbox + newins "${FILESDIR}/${PN}-4-config" vbox.cfg + + # Set the correct libdir + sed \ + -e "s@MY_LIBDIR@$(get_libdir)@" \ + -i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed" + + # Install the wrapper script + exeinto ${vbox_inst_path} + newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox" + fowners root:vboxusers ${vbox_inst_path}/VBox + fperms 0750 ${vbox_inst_path}/VBox + + # Install binaries and libraries + insinto ${vbox_inst_path} + doins -r components + + for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do + vbox_inst ${each} + done + + # These binaries need to be suid root. + for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do + vbox_inst ${each} 4750 + done + + # Install EFI Firmware files (bug #320757) + for each in VBoxEFI{32,64}.fd ; do + vbox_inst ${each} 0644 + done + + # VBoxSVC and VBoxManage need to be pax-marked (bug #403453) + # VBoxXPCOMIPCD (bug #524202) + for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do + pax-mark -m "${ED}"${vbox_inst_path}/${each} + done + + # Symlink binaries to the shipped wrapper + for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do + dosym ${vbox_inst_path}/VBox /usr/bin/${each} + done + dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl + dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount + + if use pam ; then + # VRDPAuth only works with this (bug #351949) + dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so + fi + + # set an env-variable for 3rd party tools + echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox" + doenvd "${T}/90virtualbox" + + if ! use headless ; then + vbox_inst rdesktop-vrdp + vbox_inst VBoxSDL 4750 + pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL + + for each in vboxsdl VBoxSDL ; do + dosym ${vbox_inst_path}/VBox /usr/bin/${each} + done + + if use qt5 ; then + vbox_inst VirtualBox + vbox_inst VirtualBoxVM 4750 + for each in VirtualBox{,VM} ; do + pax-mark -m "${ED}"${vbox_inst_path}/${each} + done + + if use opengl ; then + vbox_inst VBoxTestOGL + pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL + fi + + for each in virtualbox{,vm} VirtualBox{,VM} ; do + dosym ${vbox_inst_path}/VBox /usr/bin/${each} + done + + insinto /usr/share/${PN} + doins -r nls + doins -r UnattendedTemplates + + domenu ${PN}.desktop + fi + + pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die + for size in 16 32 48 64 128 ; do + newicon -s ${size} ${PN}-${size}px.png ${PN}.png + done + newicon ${PN}-48px.png ${PN}.png + doicon -s scalable ${PN}.svg + popd &>/dev/null || die + pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die + for size in 16 24 32 48 64 72 96 128 256 512 ; do + for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do + icofile="${PN}-${ico}-${size}px.png" + if [[ -f "${icofile}" ]] ; then + newicon -s ${size} ${icofile} ${PN}-${ico}.png + fi + done + done + popd &>/dev/null || die + fi + + if use lvm ; then + vbox_inst VBoxVolInfo 4750 + dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo + fi + + if use sdk ; then + insinto ${vbox_inst_path} + doins -r sdk + + if use java ; then + java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar" + java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so" + fi + fi + + if use udev ; then + # New way of handling USB device nodes for VBox (bug #356215) + local udevdir="$(get_udevdir)" + insinto ${udevdir} + doins VBoxCreateUSBNode.sh + fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh + fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh + insinto ${udevdir}/rules.d + sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \ + > "${T}"/10-virtualbox.rules || die + doins "${T}"/10-virtualbox.rules + fi + + if use vboxwebsrv ; then + vbox_inst vboxwebsrv + dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv + newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv + newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv + fi + + # Remove dead symlinks (bug #715338) + find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die + + # Fix version string in extensions or else they don't get accepted + # by the virtualbox host process (see bug #438930) + find ExtensionPacks -type f -name "ExtPack.xml" -print0 \ + | xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \ + || die + + local extensions_dir="${vbox_inst_path}/ExtensionPacks" + + if use vnc ; then + insinto ${extensions_dir} + doins -r ExtensionPacks/VNC + fi + + if use dtrace ; then + insinto ${extensions_dir} + doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack + fi + + if use doc ; then + dodoc UserManual.pdf + fi + + newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf +} + +pkg_preinst() { + xdg_pkg_preinst +} + +pkg_postinst() { + xdg_pkg_postinst + + if use udev ; then + udevadm control --reload-rules \ + && udevadm trigger --subsystem-match=usb + fi + + tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf + + if ! use headless && use qt5 ; then + elog "To launch VirtualBox just type: \"virtualbox\"." + fi + elog "You must be in the vboxusers group to use VirtualBox." + elog "" + elog "The latest user manual is available for download at:" + elog "http://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf" + elog "" + elog "For advanced networking setups you should emerge:" + elog "net-misc/bridge-utils and sys-apps/usermode-utilities" + elog "" + elog "Starting with version 4.0.0, ${PN} has USB-1 support." + elog "For USB-2 support, PXE-boot ability and VRDP support please emerge" + elog " app-emulation/virtualbox-extpack-oracle" + elog "package." + elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and" + elog "the \"extension\" USE flag. For installation of the guest additions ISO" + elog "image, please emerge" + elog " app-emulation/virtualbox-additions" + elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge" + elog " app-emulation/virtualbox-extpack-oracle" + if ! use udev ; then + elog "" + elog "WARNING!" + elog "Without USE=udev, USB devices will likely not work in ${PN}." + elif [[ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then + elog "" + elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\"" + elog "or else USB in ${PN} won't work." + fi +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/app-mobilephone/smstools/files/3.1.21-gawk-location.patch b/app-mobilephone/smstools/files/3.1.21-gawk-location.patch deleted file mode 100644 index e8070a329b99..000000000000 --- a/app-mobilephone/smstools/files/3.1.21-gawk-location.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -uNr smstools3.ORIG/scripts/hex2bin smstools3/scripts/hex2bin ---- smstools3.ORIG/scripts/hex2bin 2017-09-11 14:11:48.040928533 +0100 -+++ smstools3/scripts/hex2bin 2017-09-11 14:12:00.925927820 +0100 -@@ -1,4 +1,4 @@ --#!/bin/gawk -f -+#!/usr/bin/gawk -f - - # This script reads a hex-dump and converts it to a binary file. - # The hex-dump must contain one or more hexadecimal numbers separated diff --git a/app-mobilephone/smstools/smstools-3.1.21-r1.ebuild b/app-mobilephone/smstools/smstools-3.1.21-r1.ebuild deleted file mode 100644 index 002fe91c963a..000000000000 --- a/app-mobilephone/smstools/smstools-3.1.21-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd toolchain-funcs user eutils - -DESCRIPTION="Send and receive short messages through GSM modems" -HOMEPAGE="https://smstools3.kekekasvi.com/" -SRC_URI="http://smstools3.kekekasvi.com/packages/smstools3-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" -IUSE="stats" - -DEPEND="" -RDEPEND="sys-process/procps - stats? ( >=dev-libs/mm-1.4.0 )" - -PATCHES="${FILESDIR}/${PV}-gawk-location.patch" -S="${WORKDIR}/${PN}3" - -pkg_setup() { - enewgroup sms - enewuser smsd -1 -1 /var/spool/sms sms -} - -src_prepare() { - default - if use stats; then - sed -i -e "s:CFLAGS += -D NOSTATS:#CFLAGS += -D NOSTATS:" \ - "${S}/src/Makefile" || die - fi - echo "CFLAGS += ${CFLAGS}" >> src/Makefile || die -} - -src_compile() { - cd src || die - emake \ - CC="$(tc-getCC)" \ - LFLAGS="${LDFLAGS}" -} - -src_install() { - dobin src/smsd - cd scripts || die - dobin sendsms sms2html sms2unicode unicode2sms - dobin hex2bin hex2dec email2sms - dodoc mysmsd smsevent smsresend sms2xml sql_demo \ - smstest.php checkhandler-utf-8 eventhandler-utf-8 \ - forwardsms regular_run - cd .. || die - - keepdir /var/spool/sms/incoming - keepdir /var/spool/sms/outgoing - keepdir /var/spool/sms/checked - fowners -R smsd:sms /var/spool/sms - fperms g+s /var/spool/sms/incoming - - newinitd "${FILESDIR}"/smsd.initd4 smsd - insopts -o smsd -g sms -m0644 - insinto /etc - newins examples/smsd.conf.easy smsd.conf - dohtml -r doc - - systemd_dounit "${FILESDIR}"/smsd.service - systemd_newtmpfilesd "${FILESDIR}"/smsd.tmpfiles smsd.conf -} - -pkg_postinst() { - touch "${ROOT}"/var/log/smsd.log || die - chown -f smsd:sms "${ROOT}"/var/log/smsd.log -} diff --git a/app-office/dia/dia-0.97.3-r1.ebuild b/app-office/dia/dia-0.97.3-r1.ebuild index fc0207a5f053..156200bf1495 100644 --- a/app-office/dia/dia-0.97.3-r1.ebuild +++ b/app-office/dia/dia-0.97.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -45,6 +45,7 @@ PATCHES=( "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream #470812 #558690 "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761 "${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, upstream https://gitlab.gnome.org/GNOME/dia/merge_requests/1 + "${FILESDIR}"/${PN}-0.97.3-slibtool.patch ) src_prepare() { @@ -62,7 +63,6 @@ src_prepare() { # Upstream bug #737255 sed -i -e "/localedir/d" configure.in || die - eautoreconf gnome2_src_prepare } diff --git a/app-office/dia/files/dia-0.97.3-slibtool.patch b/app-office/dia/files/dia-0.97.3-slibtool.patch new file mode 100644 index 000000000000..1efdbc1490bc --- /dev/null +++ b/app-office/dia/files/dia-0.97.3-slibtool.patch @@ -0,0 +1,13 @@ +This fixes build with sys-devel/slibtool + +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -178,7 +178,7 @@ libdia_la_SOURCES = \ + # render.h \ + # render.c + +-libdia_la_LDFLAGS = -avoid-version --export-dynamic ++libdia_la_LDFLAGS = -avoid-version -export-dynamic + libdia_la_LIBADD = $(GTK_LIBS) + + AM_CPPFLAGS = \ diff --git a/dev-db/freetds/freetds-1.2.18.ebuild b/dev-db/freetds/freetds-1.2.18.ebuild index 3e28f31f7947..1efdc86b1872 100644 --- a/dev-db/freetds/freetds-1.2.18.ebuild +++ b/dev-db/freetds/freetds-1.2.18.ebuild @@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.freetds.org/pub/${PN}/current/${MY_PN}.${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos" IUSE="debug gnutls iconv kerberos libressl mssql iodbc odbc ssl static-libs" # iODBC and unixODBC are mutually-exclusive choices for diff --git a/dev-db/slony1/slony1-2.2.10.ebuild b/dev-db/slony1/slony1-2.2.10.ebuild index 0e854d2ba2ca..ac3b6ee7019d 100644 --- a/dev-db/slony1/slony1-2.2.10.ebuild +++ b/dev-db/slony1/slony1-2.2.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,7 +20,7 @@ SRC_URI="https://slony.info/downloads/${MAJ_PV}/source/${P}.tar.bz2 LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ppc ~x86" DEPEND="${POSTGRES_DEP} perl? ( dev-perl/DBD-Pg ) diff --git a/dev-go/go-bindata/Manifest b/dev-go/go-bindata/Manifest index e89354dd767c..bab3f4c9d656 100644 --- a/dev-go/go-bindata/Manifest +++ b/dev-go/go-bindata/Manifest @@ -1 +1 @@ -DIST go-bindata-3.1.3.tar.gz 21280 BLAKE2B cf54b50113006f02eeab47312fcf1eaa1e4b820847ee9c579318a5aac0b720648f73cbf3d2d41e120ea79b65dc3dcfa32accaff16ed4610bcf9a9dd317e9d819 SHA512 870f939cfb07b43c54000d39fa37e8151ca5c20d13eac9bde59e7ec3e2693d8386a1ea4b5372171dac42f8a4f69a754445cb9a4fa51a7a7ba9ec54f3e8a2a2f6 +DIST go-bindata-3.21.0.tar.gz 15615959 BLAKE2B b635869202025992a7f92645de7aa96fadd18f5c99d5e312a1e645712940d05342e192401eb5aec04aac72c50b17d1fe370ef317356d47a40141cec3dc8f01a7 SHA512 004b9f0389d26f82d1419e8e8ad249d33583e85c4b4aaa4e36215bd5289a24146a237bcb55b9d51ff29c1b01ebd822ff60dcf205cb73d34f810e6838df172265 diff --git a/dev-go/go-bindata/go-bindata-3.1.3.ebuild b/dev-go/go-bindata/go-bindata-3.1.3.ebuild deleted file mode 100644 index 10d5d8179d7e..000000000000 --- a/dev-go/go-bindata/go-bindata-3.1.3.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2020 Liguros Authors -# Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit golang-build golang-vcs-snapshot - -EGO_PN="github.com/go-bindata/go-bindata/..." -KEYWORDS="amd64 ~arm ~arm64" - -DESCRIPTION="A small utility which generates Go code from any file" -HOMEPAGE="https://github.com/go-bindata/go-bindata" -SRC_URI="https://github.com/go-bindata/go-bindata/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="CC-PD" -SLOT="0/${PVR}" - -src_install() { - GOBIN=${S}/bin \ - golang-build_src_install - dobin bin/* -} diff --git a/dev-go/go-bindata/go-bindata-3.21.0.ebuild b/dev-go/go-bindata/go-bindata-3.21.0.ebuild new file mode 100644 index 000000000000..02d914964278 --- /dev/null +++ b/dev-go/go-bindata/go-bindata-3.21.0.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2020 Go Overlay Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# NOTE: The original github.com/jteeuwen/go-bindata is no more maintained. +# Instead, we use a fork which is API compatible. +# For more details, see https://github.com/Dr-Terrible/go-overlay/issues/76 +GOLANG_PKG_IMPORTPATH="github.com/kevinburke" +GOLANG_PKG_ARCHIVEPREFIX="v" +GOLANG_PKG_IS_MULTIPLE=1 +GOLANG_PKG_HAVE_TEST=1 + +inherit golang-single + +DESCRIPTION="A small utility for embedding binary data in a GoLang program." + +LICENSE="CC0-1.0" +SLOT="0" +KEYWORDS="amd64 arm arm64 x86" diff --git a/dev-go/go-bindata/metadata.xml b/dev-go/go-bindata/metadata.xml index 8c1d74d431e9..0afda6620771 100644 --- a/dev-go/go-bindata/metadata.xml +++ b/dev-go/go-bindata/metadata.xml @@ -1,12 +1,18 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>dev@liguros.net</email> - <name>Development</name> - </maintainer> + <maintainer type="person"> + <email>toffanin.mauro@gmail.com</email> + <name>Mauro Toffanin</name> + <description>Maintainer. Assign bugs to him</description> + </maintainer> <upstream> - <remote-id type="github">jteeuwen/go-bindata</remote-id> + <bugs-to>https://github.com/jteeuwen/go-bindata/issues</bugs-to> </upstream> - <origin>ports</origin> + <longdescription lang="en"> + This package converts any file into managable Go source code. Useful for + embedding binary data into a go program. The file data is optionally + gzip compressed before being converted to a raw byte slice. + </longdescription> + <origin>go-overlay</origin> </pkgmetadata> diff --git a/dev-lang/erlang/erlang-23.2.ebuild b/dev-lang/erlang/erlang-23.2.ebuild index a18718fcf2a2..3c1427ccf895 100644 --- a/dev-lang/erlang/erlang-23.2.ebuild +++ b/dev-lang/erlang/erlang-23.2.ebuild @@ -22,7 +22,7 @@ LICENSE="Apache-2.0" # same build of ERTS that was used when compiling the code. See # http://erlang.org/doc/system_principles/misc.html for more information. SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets" RDEPEND=" diff --git a/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild b/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild index 9c7771ceb1ad..526f84f258a4 100644 --- a/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild +++ b/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -15,11 +15,17 @@ KEYWORDS="~amd64 ~x86" IUSE="static-libs" RDEPEND="dev-libs/gmp:0" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" DOCS=( d0_blind_id.txt ) +PATCHES=( + "${FILESDIR}/${P}-slibtool.patch" +) + src_prepare() { default @@ -44,8 +50,5 @@ src_configure() { src_install() { default - - if ! use static-libs ; then - find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die - fi + find "${ED}" -name "*.la" -delete || die } diff --git a/dev-libs/d0_blind_id/files/d0_blind_id-1.0-slibtool.patch b/dev-libs/d0_blind_id/files/d0_blind_id-1.0-slibtool.patch new file mode 100644 index 000000000000..62ae318315fa --- /dev/null +++ b/dev-libs/d0_blind_id/files/d0_blind_id-1.0-slibtool.patch @@ -0,0 +1,43 @@ +From 0d3d1f2655901776b2fc3e911eb78478412f789a Mon Sep 17 00:00:00 2001 +From: Lyberta <lyberta@lyberta.net> +Date: Sat, 7 Oct 2017 19:26:40 +0300 +Subject: [PATCH] Fixed version-info. + +--- + Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index d21887d..07338eb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -5,7 +5,7 @@ blind_id_SOURCES = main.c + blind_id_LDADD = libd0_blind_id.la + + lib_LTLIBRARIES = libd0_blind_id.la +-# versioninfo: ++# version-info: + # - compatible interface change: c:r:a -> c+1:0:a+1 + # - incompatible interface change: c:r:a -> c+1:0:0 + # - internal change: c:r:a -> c:r+1:a +@@ -29,7 +29,7 @@ libd0_blind_id_la_SOURCES += d0_bignum-gmp.c + endif + endif + endif +-libd0_blind_id_la_LDFLAGS = -versioninfo 7:1:7 ++libd0_blind_id_la_LDFLAGS = -version-info 7:1:7 + libd0_blind_id_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement + library_includedir = $(includedir)/d0_blind_id + library_include_HEADERS = d0_blind_id.h d0.h +@@ -40,7 +40,7 @@ if ENABLE_RIJNDAEL + lib_LTLIBRARIES += libd0_rijndael.la + libd0_rijndael_la_SOURCES = d0_rijndael.c \ + d0_rijndael.h +-libd0_rijndael_la_LDFLAGS = -versioninfo 0:0:0 ++libd0_rijndael_la_LDFLAGS = -version-info 0:0:0 + libd0_rijndael_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement + library_include_HEADERS += d0_rijndael.h + pkgconfig_HEADERS += d0_rijndael.pc +-- +2.20.1 + diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest index 1b13a22dbe13..9df3efab4b70 100644 --- a/dev-libs/libgcrypt/Manifest +++ b/dev-libs/libgcrypt/Manifest @@ -1,2 +1,3 @@ DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4a5c285141f89c42237326ae3bfb99c937eef05d87b466c3d8f5cf022725ccee5c0dbc74d4eb57523a8a2892864b65 SHA512 28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b DIST libgcrypt-1.8.7.tar.bz2 2985660 BLAKE2B cb2132b826f3f3af240e6c9ac5fd992808aa17ce64144d17452591a5b1e402564af82c021b58f5fd620ebeb5894ac9654835f6d8376ec05ee41fc02189dd6825 SHA512 6309d17624d8029848990d225d5924886c951cef691266c8e010fbbb7f678972cee70cbb91d370ad0bcdc8c8761402a090c2c853c9427ec79293624a59da5060 +DIST libgcrypt-1.9.0.tar.bz2 3183699 BLAKE2B 6969d8dc8e3b5f0a1816c007b78bbf2e2a6f50f8f4505535294d87de6eb54dc4f0e3d0bbe95bab43feb070538a2956801f28d745a233880e769e24fb9061e02f SHA512 cdfb812f387e4bac598fe5701eafb284ee326cce6b20fce08b92262e371e0d95a1ab529dfa3232255869e27787c102aa817f7a70bd5fbbf8d490025a01e40429 diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.0.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.0.ebuild new file mode 100644 index 000000000000..ecface3601d1 --- /dev/null +++ b/dev-libs/libgcrypt/libgcrypt-1.9.0.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic multilib-minimal toolchain-funcs + +DESCRIPTION="General purpose crypto library based on the code used in GnuPG" +HOMEPAGE="https://www.gnupg.org/" +SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" + +LICENSE="LGPL-2.1 MIT" +SLOT="0/20" # subslot = soname major version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc o-flag-munging static-libs" + +RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND="doc? ( virtual/texi2dvi )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.1-uscore.patch + "${FILESDIR}"/${PN}-multilib-syspath.patch +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/libgcrypt-config +) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + if [[ ${CHOST} == *86*-solaris* ]] ; then + # ASM code uses GNU ELF syntax, divide in particular, we need to + # allow this via ASFLAGS, since we don't have a flag-o-matic + # function for that, we'll have to abuse cflags for this + append-cflags -Wa,--divide + fi + local myeconfargs=( + CC_FOR_BUILD="$(tc-getBUILD_CC)" + --enable-noexecstack + # required for sys-power/suspend[crypt], bug 751568 + $(use_enable static-libs static) + $(use_enable o-flag-munging O-flag-munging) + + # disabled due to various applications requiring privileges + # after libgcrypt drops them (bug #468616) + --without-capabilities + + # http://trac.videolan.org/vlc/ticket/620 + # causes bus-errors on sparc64-solaris + $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") + $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") + + GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \ + $("${S}/configure" --help | grep -o -- '--without-.*-prefix') +} + +multilib_src_compile() { + default + multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf +} + +multilib_src_install() { + emake DESTDIR="${D}" install + multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf +} + +multilib_src_install_all() { + default + find "${D}" -type f -name '*.la' -delete || die +} diff --git a/dev-libs/libyaml/libyaml-0.2.5.ebuild b/dev-libs/libyaml/libyaml-0.2.5.ebuild index f75b03b982c4..9928df36c4e4 100644 --- a/dev-libs/libyaml/libyaml-0.2.5.ebuild +++ b/dev-libs/libyaml/libyaml-0.2.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/opensc/opensc-0.21.0.ebuild b/dev-libs/opensc/opensc-0.21.0.ebuild index da434727b101..720d1aa3832e 100644 --- a/dev-libs/opensc/opensc-0.21.0.ebuild +++ b/dev-libs/opensc/opensc-0.21.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sparc x86" IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib" RESTRICT="!test? ( test )" diff --git a/dev-libs/rocclr/rocclr-4.0.0.ebuild b/dev-libs/rocclr/rocclr-4.0.0.ebuild index ffa5203065d2..14d12c5c2f5d 100644 --- a/dev-libs/rocclr/rocclr-4.0.0.ebuild +++ b/dev-libs/rocclr/rocclr-4.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -31,7 +31,7 @@ src_configure() { local mycmakeargs=( -DUSE_COMGR_LIBRARY=YES -DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}" - -DCMAKE_INSTALL_PREFIX="/usr" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" ) cmake_src_configure } @@ -40,5 +40,5 @@ src_install() { cmake_src_install # This should be fixed in the CMakeLists.txt - sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${D}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die + sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${ED}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die } diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild index 125321094992..d3a5d3f5ef89 100644 --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild +++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake flag-o-matic +inherit cmake flag-o-matic prefix if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/" @@ -42,10 +42,9 @@ src_prepare() { # Remove "clinfo" - use "dev-util/clinfo" instead [ -d tools/clinfo ] && rm -rf tools/clinfo || die - # Wrong position of a '"' results in a list of strings instead of a single string and the build fails... - sed -e "s:set(CMAKE_SHARED_LINKER_FLAGS \${CMAKE_SHARED_LINKER_FLAGS} \":set(CMAKE_SHARED_LINKER_FLAGS \"\${CMAKE_SHARED_LINKER_FLAGS} :" -i "${S}/amdocl/CMakeLists.txt" - cmake_src_prepare + + hprefixify amdocl/CMakeLists.txt } src_configure() { diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest index f557a0eaaf88..7806bb6ff954 100644 --- a/dev-libs/xapian/Manifest +++ b/dev-libs/xapian/Manifest @@ -1,5 +1,3 @@ DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf6241a232d00125699ba8ed63eab9cb1651e02182fcc152f960f4e122709958632779daaaf5760fe50953a3b5b07a243 SHA512 a15b5d9b5770337519f671732f53f0642b31f08206824500d589ba309c9e91a05a30353d66ebf70a4c1cb1824b44e1c7b7630e799de3b15d645cf951a6017bfe -DIST xapian-core-1.4.14.tar.xz 2970624 BLAKE2B 5bfa5ab36ad4626fcc9a214427f88bdf55e60166939db3a65d3118b426b0ec6754efc10dbcf32456e033292eba3b29f7500679f69a49df15d40c4111322249ed SHA512 c08c9abe87e08491566b7cfa8cda9e2a80e4959a647428b6d82bce7af1c967b4cb463607ffb8976372a980c163923ced36117a66e0b5a1f35659393def3d371b -DIST xapian-core-1.4.15.tar.xz 2988752 BLAKE2B d68d69cdc55c1b62a746620fc90f028819813bb98c0ad0cc130c399a4dd62231b920d24363b61e58d002f65a79a117598455779028de1b26b7a808367f5f2de4 SHA512 f28209acae12a42a345382668f7f7da7a2ce5a08362d0e2af63c9f94cb2adca95366499a7afa0bd9008fbfcca4fd1f2c9221e594fc2a2c740f5899e9f03ecad3 -DIST xapian-core-1.4.16.tar.xz 3041132 BLAKE2B 2c009bcdec05542ceae9354e47e8ff9b971ec87d04caf8058711fd6952135620c353f2feabcd869313f55194409944bc7374ce69d626f948461963a7790c3953 SHA512 3d319ab672485e840019ee28b54b1c59bbd535c1802874f58593fb999681c19bff3e776dc19ab5d5bd97734bf01f1408f36ae49e21ca9706ca187db49f8a18a6 DIST xapian-core-1.4.17.tar.xz 2997700 BLAKE2B 882bc28c9a55731212a5c3ac6da3ad2082e3345cb473eb2c09b80fdd05e700bb31cff6c9a0524b27da015b14655c30548e92a457b48af43279bfd3564cf3c3fa SHA512 3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7 +DIST xapian-core-1.4.18.tar.xz 2984508 BLAKE2B e5d680578e0a4605a8e99470921fba29cdd3d137d017608b8bf571951726055d2a1d49e9649829f0df92af3d27d0565f90baaca5a4eb5c67cb368f5d1e592d28 SHA512 ba6240054c0d2f92b9f1059aa934cdf35388ee7c7e05f4ef6f9856bdaed8ad821095a348ed9a892afdf18c3c0ad20e163028ad0ed3a9934bd69b861e814678ef diff --git a/dev-libs/xapian/xapian-1.4.14.ebuild b/dev-libs/xapian/xapian-1.4.14.ebuild deleted file mode 100644 index f6ae79205eb5..000000000000 --- a/dev-libs/xapian/xapian-1.4.14.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit eutils multilib-minimal - -MY_P="${PN}-core-${PV}" - -DESCRIPTION="Xapian Probabilistic Information Retrieval library" -HOMEPAGE="https://www.xapian.org/" -SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/30" # ABI version of libxapian.so -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris" -IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote" - -DEPEND="sys-libs/zlib" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -multilib_src_configure() { - local myconf="" - - if use cpu_flags_x86_sse2; then - myconf="${myconf} --enable-sse=sse2" - else - if use cpu_flags_x86_sse; then - myconf="${myconf} --enable-sse=sse" - else - myconf="${myconf} --disable-sse" - fi - fi - - myconf="${myconf} $(use_enable static-libs static)" - - use inmemory || myconf="${myconf} --disable-backend-inmemory" - use remote || myconf="${myconf} --disable-backend-remote" - - myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix=" - - ECONF_SOURCE=${S} econf $myconf -} - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/xapian/postingsource.h - /usr/include/xapian/attributes.h - /usr/include/xapian/valuesetmatchdecider.h - /usr/include/xapian/version.h - /usr/include/xapian/version.h - /usr/include/xapian/types.h - /usr/include/xapian/positioniterator.h - /usr/include/xapian/registry.h -) - -multilib_src_test() { - emake check VALGRIND= -} - -multilib_src_install() { - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - if use doc; then - rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die - fi - - dodoc AUTHORS HACKING PLATFORMS README NEWS - - find "${D}" -name "*.la" -type f -delete || die -} diff --git a/dev-libs/xapian/xapian-1.4.15.ebuild b/dev-libs/xapian/xapian-1.4.15.ebuild deleted file mode 100644 index 669d3eb246de..000000000000 --- a/dev-libs/xapian/xapian-1.4.15.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit eutils multilib-minimal - -MY_P="${PN}-core-${PV}" - -DESCRIPTION="Xapian Probabilistic Information Retrieval library" -HOMEPAGE="https://www.xapian.org/" -SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/30" # ABI version of libxapian.so -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris" -IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote" - -DEPEND="sys-libs/zlib" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -multilib_src_configure() { - local myconf="" - - if use cpu_flags_x86_sse2; then - myconf="${myconf} --enable-sse=sse2" - else - if use cpu_flags_x86_sse; then - myconf="${myconf} --enable-sse=sse" - else - myconf="${myconf} --disable-sse" - fi - fi - - myconf="${myconf} $(use_enable static-libs static)" - - use inmemory || myconf="${myconf} --disable-backend-inmemory" - use remote || myconf="${myconf} --disable-backend-remote" - - myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix=" - - ECONF_SOURCE=${S} econf $myconf -} - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/xapian/postingsource.h - /usr/include/xapian/attributes.h - /usr/include/xapian/valuesetmatchdecider.h - /usr/include/xapian/version.h - /usr/include/xapian/version.h - /usr/include/xapian/types.h - /usr/include/xapian/positioniterator.h - /usr/include/xapian/registry.h -) - -multilib_src_test() { - emake check VALGRIND= -} - -multilib_src_install() { - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - if use doc; then - rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die - fi - - dodoc AUTHORS HACKING PLATFORMS README NEWS - - find "${D}" -name "*.la" -type f -delete || die -} diff --git a/dev-libs/xapian/xapian-1.4.16.ebuild b/dev-libs/xapian/xapian-1.4.18.ebuild index 669d3eb246de..b33e8c6402c3 100644 --- a/dev-libs/xapian/xapian-1.4.16.ebuild +++ b/dev-libs/xapian/xapian-1.4.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz" LICENSE="GPL-2" SLOT="0/30" # ABI version of libxapian.so -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris" IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote" DEPEND="sys-libs/zlib" diff --git a/dev-python/PyQt5/PyQt5-5.15.2.ebuild b/dev-python/PyQt5/PyQt5-5.15.2.ebuild index b6e197e26f6c..41b5d5ccd2b5 100644 --- a/dev-python/PyQt5/PyQt5-5.15.2.ebuild +++ b/dev-python/PyQt5/PyQt5-5.15.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ fi LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" # TODO: QtNfc, QtQuick3D, QtRemoteObjects, QtTextToSpeech IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild index d7213068cc24..7492c3a5965f 100644 --- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild +++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ fi LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="debug" REQUIRED_USE=" diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest index df91474bd950..4b28a7f7e09a 100644 --- a/dev-python/alembic/Manifest +++ b/dev-python/alembic/Manifest @@ -1,2 +1,3 @@ DIST alembic-1.4.3.tar.gz 1108131 BLAKE2B d9c8b6d6aebce7a45194dd6c654f4a2627714a5c1f7cb7a1cf80ed8c3fe861e3bb7857811128787ddd6c093b4370784b40cddb385cfbd30f6134d537fe949d2d SHA512 925d8957fd9008d041737a9e79ec8d7a4c5deba1976e980362d355a75348c1638d783d9d48234a5bc3b2dc3f2f09dcb281d0c80ae0f0c5bc32e176c3dfa05463 DIST alembic-1.5.0.tar.gz 1128073 BLAKE2B 067ebe7a8ee9b14fc782e0f5268990b07a8ae91ab8ae89daee119bb64f30b8cb966ff22ce71c67e476fafce7ae418952f253645b0f5b5b8a1abbf7f562794138 SHA512 a667e5b176770061c27ea7fdaafdbcdad64d968e22e729083fadd8e002530cc43909a955c3ccaa04329c393ab3f27ec5b944b03ba0ae5d29609b940e7cfb8ad5 +DIST alembic-1.5.1.tar.gz 1128404 BLAKE2B 70a2ce16adcf317c9376f77d8fa88e9eef3aa4090de5f933187f47df9fe6ac40a25df75d6c74c50c3be23dd3cef13d465eb2ddae4ea83558d01ebffd8effe241 SHA512 2fe490c46c253123333f0496fe28b59956efc78924f145b69ba95e5cb1cc091a72047c1aa5f8a85924ec59ad0aba2bfa143b9cad475dedc6f849c38695c08601 diff --git a/dev-python/alembic/alembic-1.5.1.ebuild b/dev-python/alembic/alembic-1.5.1.ebuild new file mode 100644 index 000000000000..8b64ac35c093 --- /dev/null +++ b/dev-python/alembic/alembic-1.5.1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="database migrations tool, written by the author of SQLAlchemy" +HOMEPAGE="https://github.com/sqlalchemy/alembic" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc" + +RDEPEND=" + >=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] + >=dev-python/python-editor-0.3[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest + +python_install_all() { + use doc && local HTML_DOCS=( docs/. ) + + distutils-r1_python_install_all +} diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest index 9cbd9400b124..527dee909a82 100644 --- a/dev-python/blosc/Manifest +++ b/dev-python/blosc/Manifest @@ -1,3 +1,4 @@ DIST blosc-1.10.0.tar.gz 845312 BLAKE2B 15f367f1420f56e64ec01e74d7320adc194db11d15bd26a2b78c59c88a6127f1d2b5fc7bd53e02a6d0cad785c87cf79bb909dec62982b5ee8620c92ccdd80249 SHA512 f071d131966acd74cf71f8688ae9830091ee12a92399e8736f2b2cc2243bc022f9fd194c60493e912aef87a54202813a67a8f9bddd90c1c44631205d58c3f3e3 DIST blosc-1.10.1.tar.gz 858162 BLAKE2B 768ae6d438d9fe05589460dcaeea77dbf2e0212bbc67388c6df1b9fc6bd1921e8cd79da2039cd4300cd91923d7988f8c4741ea1dbd5ebfa13e48f3ade678ac09 SHA512 06e393efa3fc7060205a483787eb4c5befe75dfdd6321b37c43ed7830dccf4d622bd88451e97da663ed9dc9302c30d7486315de9aff6351721862e2eceddd9a3 +DIST blosc-1.10.2.tar.gz 858096 BLAKE2B ff314011e1afc2d972c2445df9ad25c245494479201ddd0944ddf5f14aa0aa772c9da1e117eb5395f5488e7238aefe1236d9a5579b4d03be2b041790de9575e8 SHA512 82dab50a49ddd45d8276fd43999233f41b507e35af5897ed4945565fde8f56be0855b0dd926d254bd77904ec7a13ad3f024007159510b677769d97599b731222 DIST blosc-1.9.2.tar.gz 816897 BLAKE2B 7d1a2d925500c8ddb93975dd785c03b91dec2716a438915d5dfdb739c650de8a47ed80eb25fc55357e69b586c446c5af61212e0a4fba8158839a66849309f478 SHA512 a8f53afb7fb1bb742e2daa03015b636d4dbb1fd073be079022364ec67035c9e6ee372ab07f7ce06579b85d9fcaedd2a11f30b9cf5b2bd1d1ea62cf32a8aa3c1f diff --git a/dev-python/blosc/blosc-1.10.2.ebuild b/dev-python/blosc/blosc-1.10.2.ebuild new file mode 100644 index 000000000000..976d1dd18db6 --- /dev/null +++ b/dev-python/blosc/blosc-1.10.2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +inherit distutils-r1 + +DESCRIPTION="High performance compressor optimized for binary data" +HOMEPAGE="https://python-blosc.blosc.org" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="MIT" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=">=dev-libs/c-blosc-1.19.0:=" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-python/scikit-build[${PYTHON_USEDEP}] + test? ( + dev-python/numpy[${PYTHON_USEDEP}] + ) +" + +DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst ) +PATCHES=( + "${FILESDIR}"/blosc-1.10.0-unbundle.patch +) + +python_prepare_all() { + export BLOSC_DIR="${EPREFIX}/usr" + distutils-r1_python_prepare_all +} + +python_test() { + "${EPYTHON}" -m blosc.test -v || die +} + +python_install() { + distutils-r1_python_install + python_optimize +} diff --git a/dev-python/boto/boto-2.49.0-r4.ebuild b/dev-python/boto/boto-2.49.0-r4.ebuild new file mode 100644 index 000000000000..a3ee8497a379 --- /dev/null +++ b/dev-python/boto/boto-2.49.0-r4.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +DISTUTILS_USE_SETUPTOOLS=bdepend + +inherit distutils-r1 + +DESCRIPTION="Amazon Web Services API" +HOMEPAGE="https://github.com/boto/boto https://pypi.org/project/boto/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +PATCHES=( + # taken from https://bugs.debian.org/909545 + "${FILESDIR}"/${P}-try-to-add-SNI-support-v3.patch + "${FILESDIR}"/${P}-py38.patch + "${FILESDIR}"/${P}-py3-socket-binary.patch + "${FILESDIR}"/${P}-py3-httplib-strict.patch + "${FILESDIR}"/${P}-py3-server-port.patch + "${FILESDIR}"/${P}-unbundle-six.patch +) + +RDEPEND=">=dev-python/six-1.12.0[${PYTHON_USEDEP}]" + +BDEPEND=" + test? ( + dev-python/httpretty[${PYTHON_USEDEP}] + dev-python/keyring[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/paramiko[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/rsa[${PYTHON_USEDEP}] + dev-python/selenium[${PYTHON_USEDEP}] + )" + +distutils_enable_tests nose + +src_prepare() { + # remove bundled libs. + rm -f "${S}"/boto/vendored/six.py || die + # broken, not worth fixing + rm tests/unit/cloudfront/test_signed_urls.py || die + # fix tests + mkdir -p "${HOME}"/.ssh || die + : > "${HOME}"/.ssh/known_hosts || die + + distutils-r1_src_prepare +} + +python_test() { + nosetests -v tests/unit || + die "Tests fail with ${EPYTHON}" +} diff --git a/dev-python/boto/files/boto-2.49.0-py3-httplib-strict.patch b/dev-python/boto/files/boto-2.49.0-py3-httplib-strict.patch new file mode 100644 index 000000000000..209b01aa74a0 --- /dev/null +++ b/dev-python/boto/files/boto-2.49.0-py3-httplib-strict.patch @@ -0,0 +1,35 @@ +https://github.com/boto/boto/commit/4f4dcb31fe852c05ce19b44eb9d5b5d747e36f7c +https://github.com/boto/boto/pull/2718 + +From 4f4dcb31fe852c05ce19b44eb9d5b5d747e36f7c Mon Sep 17 00:00:00 2001 +From: Lee Ball <43632885+catleeball@users.noreply.github.com> +Date: Mon, 10 Jun 2019 16:02:53 -0700 +Subject: [PATCH] Remove `strict=True` from http_client (#6) + +In Python 3.4, the `strict` kwarg was removed[1]. We are removing it +here too. + +Alternatively, we can leave in `strict=True` for 2.x, but I chose to +remove it entirely to maintain consistent behavior across versions. + +[1]: https://docs.python.org/3/library/http.client.html +--- + boto/connection.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/boto/connection.py b/boto/connection.py +index c731173bb4eb..54e26fb2de16 100644 +--- a/boto/connection.py ++++ b/boto/connection.py +@@ -807,7 +807,7 @@ class AWSAuthConnection(object): + sock.sendall(six.ensure_binary("\r\n")) + else: + sock.sendall(six.ensure_binary("\r\n")) +- resp = http_client.HTTPResponse(sock, strict=True, debuglevel=self.debug) ++ resp = http_client.HTTPResponse(sock, debuglevel=self.debug) + resp.begin() + + if resp.status != 200: +-- +2.28.0 + diff --git a/dev-python/boto/files/boto-2.49.0-py3-server-port.patch b/dev-python/boto/files/boto-2.49.0-py3-server-port.patch new file mode 100644 index 000000000000..62e331921980 --- /dev/null +++ b/dev-python/boto/files/boto-2.49.0-py3-server-port.patch @@ -0,0 +1,42 @@ +https://github.com/boto/boto/commit/b9f6cb0ab717ea76e2780c7fddd1cd36b3bf7d63 + +From b9f6cb0ab717ea76e2780c7fddd1cd36b3bf7d63 Mon Sep 17 00:00:00 2001 +From: Matt Houglum <houglum@google.com> +Date: Fri, 21 Jun 2019 15:09:11 -0700 +Subject: [PATCH] Make server_name() behave correctly for PY3 + +...because Python-2.6-or-newer doesn't just include Python 2.6 and 2.7. +--- + boto/connection.py | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +diff --git a/boto/connection.py b/boto/connection.py +index 54e26fb2de16..bbb25d8fb842 100644 +--- a/boto/connection.py ++++ b/boto/connection.py +@@ -650,17 +650,13 @@ class AWSAuthConnection(object): + if port == 80: + signature_host = self.host + else: +- # This unfortunate little hack can be attributed to +- # a difference in the 2.6 version of http_client. In old +- # versions, it would append ":443" to the hostname sent +- # in the Host header and so we needed to make sure we +- # did the same when calculating the V2 signature. In 2.6 +- # (and higher!) +- # it no longer does that. Hence, this kludge. +- if ((ON_APP_ENGINE and sys.version[:3] == '2.5') or +- sys.version[:3] in ('2.6', '2.7')) and port == 443: ++ ver_int = sys.version_info[0] * 10 + sys.version_info[1] ++ if port == 443 and ver_int >= 26: # Py >= 2.6 + signature_host = self.host + else: ++ # In versions < 2.6, Python's http_client would append ":443" ++ # to the hostname sent in the Host header and so we needed to ++ # make sure we did the same when calculating the V2 signature. + signature_host = '%s:%d' % (self.host, port) + return signature_host + +-- +2.28.0 + diff --git a/dev-python/boto/files/boto-2.49.0-py3-socket-binary.patch b/dev-python/boto/files/boto-2.49.0-py3-socket-binary.patch new file mode 100644 index 000000000000..1d109a3f4995 --- /dev/null +++ b/dev-python/boto/files/boto-2.49.0-py3-socket-binary.patch @@ -0,0 +1,59 @@ +https://github.com/boto/boto/commit/d2cb697b32c297858ecc36701a5a4176818ab36d +https://github.com/boto/boto/pull/2718 +https://github.com/boto/boto/pull/2893 +https://github.com/boto/boto/pull/3699 + +From d2cb697b32c297858ecc36701a5a4176818ab36d Mon Sep 17 00:00:00 2001 +From: Cat Lee Ball <cball@google.com> +Date: Mon, 10 Jun 2019 13:31:11 -0700 +Subject: [PATCH] Ensure binary strings sent to socket + +When running pre-release tests with proxied connections, it appeared a +few spots in connection.py would fail under Python 3 since the +socket.sendall method expects binary strings rather than unicode. +--- + boto/connection.py | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/boto/connection.py b/boto/connection.py +index a0d89a51f49c..d084d1f881fb 100644 +--- a/boto/connection.py ++++ b/boto/connection.py +@@ -796,17 +796,17 @@ class AWSAuthConnection(object): + else: + sock = socket.create_connection((self.proxy, int(self.proxy_port))) + boto.log.debug("Proxy connection: CONNECT %s HTTP/1.0\r\n", host) +- sock.sendall("CONNECT %s HTTP/1.0\r\n" % host) +- sock.sendall("User-Agent: %s\r\n" % UserAgent) ++ sock.sendall(six.ensure_binary("CONNECT %s HTTP/1.0\r\n" % host)) ++ sock.sendall(six.ensure_binary("User-Agent: %s\r\n" % UserAgent)) + if self.proxy_user and self.proxy_pass: + for k, v in self.get_proxy_auth_header().items(): +- sock.sendall("%s: %s\r\n" % (k, v)) ++ sock.sendall(six.ensure_binary("%s: %s\r\n" % (k, v))) + # See discussion about this config option at + # https://groups.google.com/forum/?fromgroups#!topic/boto-dev/teenFvOq2Cc + if config.getbool('Boto', 'send_crlf_after_proxy_auth_headers', False): +- sock.sendall("\r\n") ++ sock.sendall(six.ensure_binary("\r\n")) + else: +- sock.sendall("\r\n") ++ sock.sendall(six.ensure_binary("\r\n")) + resp = http_client.HTTPResponse(sock, strict=True, debuglevel=self.debug) + resp.begin() + +@@ -814,9 +814,10 @@ class AWSAuthConnection(object): + # Fake a socket error, use a code that make it obvious it hasn't + # been generated by the socket library + raise socket.error(-71, ++ six.ensure_binary( + "Error talking to HTTP proxy %s:%s: %s (%s)" % + (self.proxy, self.proxy_port, +- resp.status, resp.reason)) ++ resp.status, resp.reason))) + + # We can safely close the response, it duped the original socket + resp.close() +-- +2.28.0 + diff --git a/dev-python/boto/files/boto-2.49.0-try-to-add-SNI-support-v3.patch b/dev-python/boto/files/boto-2.49.0-try-to-add-SNI-support-v3.patch new file mode 100644 index 000000000000..11d346a2199e --- /dev/null +++ b/dev-python/boto/files/boto-2.49.0-try-to-add-SNI-support-v3.patch @@ -0,0 +1,104 @@ +From f5e7f6c98b46ff622f60a4661ffc9ce07216d109 Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> +Date: Sat, 29 Sep 2018 21:47:11 +0200 +Subject: [PATCH] boto: try to add SNI support + +Add SNI support. Newer OpenSSL (with TLS1.3) fail to connect if the +hostname is missing. + +Link: https://bugs.debian.org/bug=909545 +Tested-by: Witold Baryluk <witold.baryluk@gmail.com> +Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> +--- + boto/connection.py | 19 ++++++++++--------- + boto/https_connection.py | 22 +++++++++++----------- + 2 files changed, 21 insertions(+), 20 deletions(-) + +diff --git a/boto/connection.py b/boto/connection.py +index 34b428f101df7..b4867a7657465 100644 +--- a/boto/connection.py ++++ b/boto/connection.py +@@ -778,8 +778,10 @@ + + def proxy_ssl(self, host=None, port=None): + if host and port: ++ cert_host = host + host = '%s:%d' % (host, port) + else: ++ cert_host = self.host + host = '%s:%d' % (self.host, self.port) + # Seems properly to use timeout for connect too + timeout = self.http_connection_kwargs.get("timeout") +@@ -824,23 +824,24 @@ DEFAULT_CA_CERTS_FILE = os.path.join(os.path.dirname(os.path.abspath(boto.cacert + h = http_client.HTTPConnection(host) + + if self.https_validate_certificates and HAVE_HTTPS_CONNECTION: ++ context = ssl.create_default_context() ++ context.verify_mode = ssl.CERT_REQUIRED ++ context.check_hostname = True ++ + msg = "wrapping ssl socket for proxied connection; " + if self.ca_certificates_file: + msg += "CA certificate file=%s" % self.ca_certificates_file ++ context.load_verify_locations(cafile=self.ca_certificates_file) + else: + msg += "using system provided SSL certs" ++ context.load_default_certs() + boto.log.debug(msg) + key_file = self.http_connection_kwargs.get('key_file', None) + cert_file = self.http_connection_kwargs.get('cert_file', None) +- sslSock = ssl.wrap_socket(sock, keyfile=key_file, +- certfile=cert_file, +- cert_reqs=ssl.CERT_REQUIRED, +- ca_certs=self.ca_certificates_file) +- cert = sslSock.getpeercert() +- hostname = self.host.split(':', 0)[0] +- if not https_connection.ValidateCertificateHostname(cert, hostname): +- raise https_connection.InvalidCertificateException( +- hostname, cert, 'hostname mismatch') ++ if key_file: ++ context.load_cert_chain(certfile=cert_file, keyfile=key_file) ++ ++ sslSock = context.wrap_socket(sock, server_hostname=cert_host) + else: + # Fallback for old Python without ssl.wrap_socket + if hasattr(http_client, 'ssl'): +diff --git a/boto/https_connection.py b/boto/https_connection.py +index ddc31a152292e..a5076f6f9b261 100644 +--- a/boto/https_connection.py ++++ b/boto/https_connection.py +@@ -119,20 +119,20 @@ from boto.compat import six, http_client + sock = socket.create_connection((self.host, self.port), self.timeout) + else: + sock = socket.create_connection((self.host, self.port)) ++ ++ context = ssl.create_default_context() ++ context.verify_mode = ssl.CERT_REQUIRED ++ context.check_hostname = True ++ if self.key_file: ++ context.load_cert_chain(certfile=self.cert_file, keyfile=self.key_file) ++ + msg = "wrapping ssl socket; " + if self.ca_certs: + msg += "CA certificate file=%s" % self.ca_certs ++ context.load_verify_locations(cafile=self.ca_certs) + else: + msg += "using system provided SSL certs" ++ context.load_default_certs() + boto.log.debug(msg) +- self.sock = ssl.wrap_socket(sock, keyfile=self.key_file, +- certfile=self.cert_file, +- cert_reqs=ssl.CERT_REQUIRED, +- ca_certs=self.ca_certs) +- cert = self.sock.getpeercert() +- hostname = self.host.split(':', 0)[0] +- if not ValidateCertificateHostname(cert, hostname): +- raise InvalidCertificateException(hostname, +- cert, +- 'remote hostname "%s" does not match ' +- 'certificate' % hostname) ++ ++ self.sock = context.wrap_socket(sock, server_hostname=self.host) +-- +2.19.0 + diff --git a/dev-python/boto/files/boto-2.49.0-unbundle-six.patch b/dev-python/boto/files/boto-2.49.0-unbundle-six.patch new file mode 100644 index 000000000000..188dae7eb6fd --- /dev/null +++ b/dev-python/boto/files/boto-2.49.0-unbundle-six.patch @@ -0,0 +1,28 @@ +use the system copy of six + +--- a/boto/compat.py ++++ b/boto/compat.py +@@ -46,16 +46,16 @@ except (AttributeError, ImportError): + # This is probably running on App Engine. + expanduser = (lambda x: x) + +-from boto.vendored import six ++import six + +-from boto.vendored.six import BytesIO, StringIO +-from boto.vendored.six.moves import filter, http_client, map, _thread, \ ++from six import BytesIO, StringIO ++from six.moves import filter, http_client, map, _thread, \ + urllib, zip +-from boto.vendored.six.moves.queue import Queue +-from boto.vendored.six.moves.urllib.parse import parse_qs, quote, unquote, \ ++from six.moves.queue import Queue ++from six.moves.urllib.parse import parse_qs, quote, unquote, \ + urlparse, urlsplit +-from boto.vendored.six.moves.urllib.parse import unquote_plus +-from boto.vendored.six.moves.urllib.request import urlopen ++from six.moves.urllib.parse import unquote_plus ++from six.moves.urllib.request import urlopen + + if six.PY3: + # StandardError was removed, so use the base exception type instead diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest index b458905191cc..784c4f8fca20 100644 --- a/dev-python/boto3/Manifest +++ b/dev-python/boto3/Manifest @@ -2,3 +2,4 @@ DIST boto3-1.16.36.tar.gz 341458 BLAKE2B 7e4cf667cd59caa8433226eb6914412370bfa4c DIST boto3-1.16.43.tar.gz 342444 BLAKE2B 1a367fa252eab6738533c7bec2bc370dcc206f25c4290ea34632ef82a0e308aa4521af7bd2e9755782b3b66b438c528e67f55f7238183ffff2318bfb7361e924 SHA512 1cd757a2751e48b9075f99724a9980d882751542f5a7794a4cbddc46f82a1bbf00b8e0908e0cd2db16726636750d591aee26b00004a454c35d24ab79de9c80b9 DIST boto3-1.16.50.tar.gz 342744 BLAKE2B a6581acbdb07f2d8ce21ddf384b471d281d58910366dee0669f0f726118eabd52de8a4fe129915b9044bd484950155c32fa4f4941e1ef6ce55249213ba29f2f3 SHA512 de483be833917a2c478c0fe651ffe4143dc6c742e259711a955be41a8b76197353b295526695ca800bb860b95e0378dc461119bfa163c4be0faa3b6c2ccfc097 DIST boto3-1.16.56.tar.gz 344547 BLAKE2B da32affd031a7efd7f55ec390f657d02caaf37d5c226ed811934e101dee1fcdc6df8b678ddaa181cdec140ad70525ff0a462885eee21f924040b1f2051d0f1f0 SHA512 2f35d4331db005ecb8dca5c780ebb2347242564f541e5b9585f0645e113255aeb8dff2210ecc42a2768f2b58c6731d59d6cb5eb7ac143e7aafd2bf21eae7d7ab +DIST boto3-1.16.57.tar.gz 344712 BLAKE2B 572a70f9afad3502d9f2bbaa5950654e45d40269bbb995e96d94573b423d4e182d314e36de97435c93f9608c780b79e073da79fcd4dd699899a83b60d864907d SHA512 a588ebdd03d189b63999523a2f68c0f1021b82299bf9875f7aebc3120b8db61afd9d784fb65885c87efe9e8ebe416f3c601ddd9615965a61a5910bb1f8e89e9f diff --git a/dev-python/boto3/boto3-1.16.57.ebuild b/dev-python/boto3/boto3-1.16.57.ebuild new file mode 100644 index 000000000000..2df16964cdb0 --- /dev/null +++ b/dev-python/boto3/boto3-1.16.57.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +DISTUTILS_USE_SETUPTOOLS=bdepend +inherit distutils-r1 + +DESCRIPTION="The AWS SDK for Python" +HOMEPAGE="https://github.com/boto/boto3" +LICENSE="Apache-2.0" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/boto/boto3" + inherit git-r3 + BOTOCORE_PV=${PV} +else + SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" + + # botocore is x.(y+3).z + BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)" +fi + +RDEPEND=" + >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] + >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_sphinx docs/source \ + 'dev-python/guzzle_sphinx_theme' +distutils_enable_tests nose + +python_prepare_all() { + # don't lock versions to narrow ranges + sed -e '/botocore/ d' \ + -e '/jmespath/ d' \ + -e '/s3transfer/ d' \ + -i setup.py || die + + # prevent an infinite loop + rm tests/functional/docs/test_smoke.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}" +} diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest index 2290a1fe00b4..3349a4139fbd 100644 --- a/dev-python/botocore/Manifest +++ b/dev-python/botocore/Manifest @@ -2,3 +2,4 @@ DIST botocore-1.19.36.tar.gz 7291325 BLAKE2B d1f79298a0f47d704418cac8390a5d500b1 DIST botocore-1.19.43.tar.gz 7374325 BLAKE2B 7def5221bee4774a6b8a33e6499e499588ff18f8b144e669bdf9b01ae4a3e370e3aed5a3a960360123e57299da9b0293aa8da9108fe114f8ae34521b2920f479 SHA512 a1b97cbb779d8c8fe3495dd18d3d635e38c5c49e5b5fb31b7764029cf3063a7fda44711defc45783b3afb844bead46e686705af57472a7ff27af8b7e21645ad5 DIST botocore-1.19.50.tar.gz 7382888 BLAKE2B 7de2ef7a7d051427191b13cdd47d3ebd9b4de505e3e17aa7dfb42de9a5eebffa2f06317a559631d219acc4380cc68c7dcfa1d6b0dc9cb123b2fa0315dd81df4e SHA512 7d1a8ff53e22fc265d8ac6492c0607f8948c9aa5862abaded93c605c3a3e4e98e535308e5ec1500a480636e03dbc3d849ec2b1dbf0efb22dffa841ce1cb551f9 DIST botocore-1.19.56.tar.gz 7390812 BLAKE2B 3bec12ce19f39f12a72f7f59f226568cb5af59d6f9a40447a7a1fdc0f27eea06d0cfe5a5b12d2152189b700ddaa016592e95059fa42208c590cb698c568c2d63 SHA512 76988a7ddc588dba48f2444a99159247a0f178c67378fcb6eac51e3f5cfd0ab385960f0fb68bbc483f79e74c9b891070d34a39e9566eb8c24ce903b9ae24dfa5 +DIST botocore-1.19.57.tar.gz 7393040 BLAKE2B 1eb29dbf95a373fc516febfe2222129f42f2c82fc37a5a6c8e1519b3f5fe63e760c0b4440573c7eb86c94a1463ecddc3046c024cc0415fe53e1a76e9362edc71 SHA512 da4cc5009a755f3be975169ba5226586f4de425f3bed2ea6eda3235bd4fc4591155715a410f47073afa7f606b290f371e776643b0d8d43a00313599630f7390a diff --git a/dev-python/botocore/botocore-1.19.57.ebuild b/dev-python/botocore/botocore-1.19.57.ebuild new file mode 100644 index 000000000000..9d681f87244c --- /dev/null +++ b/dev-python/botocore/botocore-1.19.57.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +inherit distutils-r1 + +DESCRIPTION="Low-level, data-driven core of boto 3" +HOMEPAGE="https://github.com/boto/botocore" +LICENSE="Apache-2.0" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/boto/botocore" + inherit git-r3 +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +fi + +RDEPEND=" + dev-python/six[${PYTHON_USEDEP}] + dev-python/jmespath[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/jsonschema[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" +) + +distutils_enable_sphinx docs/source \ + 'dev-python/guzzle_sphinx_theme' +distutils_enable_tests nose + +src_prepare() { + # unpin deps + sed -i -e "s:>=.*':':" setup.py || die + # very unstable + sed -i -e 's:test_stress_test_token_bucket:_&:' \ + tests/functional/retries/test_bucket.py || die + distutils-r1_src_prepare +} + +python_test() { + # note: suites need to be run separately as one of the unit tests + # seems to be leaking mocks and breaking a few functional tests + nosetests -v tests/unit || + die "unit tests failed under ${EPYTHON}" + nosetests -v tests/functional || + die "functional tests failed under ${EPYTHON}" +} diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest index 961392a00831..97d19f4e9652 100644 --- a/dev-python/cfn-python-lint/Manifest +++ b/dev-python/cfn-python-lint/Manifest @@ -1,3 +1,4 @@ DIST cfn-python-lint-0.44.1.tar.gz 5339578 BLAKE2B 7982cba9fe422a8323c6ea270bd7ff5f41800cc16ceaa39d9fc01c2929cda5cca3b19c45de50ca8338a56aad001c834e16bfbd0ab59140381b5189e28965ba38 SHA512 b7f9ad598411d89979334aa79c7b4667ede28eef82b0b546977ba10f33f57e89366d1448e8ceeb3f28a2e53b33a409c439c3faf7d10f53fc5819f6b8693e117d DIST cfn-python-lint-0.44.2.tar.gz 5515542 BLAKE2B 9da951dc7faa000d2abd1610595e463045079e5a2e73ad59779fb715f32fca39c1cef189484d62de3bc57a48b7776f5cebcc21c39948b7d73e394b89a4cebba9 SHA512 ca0cba19f930960711676ec285b10e0b60ff36359326098d5040bd2fd8f7ca6cfee985544c4bf94770baefa0e50eecead45c4d769ff3587031c3bf463f26355f DIST cfn-python-lint-0.44.3.tar.gz 5591470 BLAKE2B 7d8f6763023a86d528f132b36b9b860b726241576037a1dd92a296f4b5ec5389ffe24e4a41a8f504ae8351b9dafc166d96ae3b17b90ac23062af2159baa36220 SHA512 a3c5fa435ed9afce32336d01cfc6c94d1965dc5c296601aba75064fdaecda9df5bfaf2976837729b56f00bc3e8cea7fe8cd5141c58335091a35dbec31a630b69 +DIST cfn-python-lint-0.44.4.tar.gz 5632477 BLAKE2B 3520cb016f926e180bb1547b4e467d6fb5251ca5e2ef0ceaaed487f40f10b58f5b6700a5f1995d4a764b53e83ba8a4ab7a9e67fe9803557bef54df3036e691ee SHA512 39e244963109953b92cc9e9fd84e33ede157c9e752854f685dd81d2a3e09ea88ec402addc8f2c12f044f0f7ab8e0bbf53486153be9517b76f0a89fed3ff94a14 diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.44.4.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.4.ebuild new file mode 100644 index 000000000000..b0cefcddd0c5 --- /dev/null +++ b/dev-python/cfn-python-lint/cfn-python-lint-0.44.4.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +inherit distutils-r1 + +DESCRIPTION="CloudFormation Linter" +HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint" +SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +RDEPEND=" + >=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/importlib_resources[${PYTHON_USEDEP}] + ' python3_6) + dev-python/jsonpatch[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] + dev-python/junit-xml[${PYTHON_USEDEP}] + dev-python/networkx[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + >=dev-python/requests-2.15.0[${PYTHON_USEDEP}] + >=dev-python/six-1.11[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests --install unittest + +PATCHES=( + "${FILESDIR}/cfn-python-lint-0.30.1-tests.patch" +) + +src_prepare() { + # unpin the deps + sed -e 's:~=[0-9.]*::' -i setup.py || die + # requires git checkout + sed -e 's:test_update_docs:_&:' \ + -i test/unit/module/maintenance/test_update_documentation.py || die + distutils-r1_src_prepare +} diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest index d19450f06cb1..e469f31a46f4 100644 --- a/dev-python/croniter/Manifest +++ b/dev-python/croniter/Manifest @@ -1,3 +1,4 @@ DIST croniter-0.3.30.tar.gz 18122 BLAKE2B d15e19167eabf935ca12ad2b277b9b97459248c3a47982346070b4500b45f8296beeabf76c5ceb9bbff579ab2d713392c82446b234a6f4b4f6e8317adc67613d SHA512 1e7f5da56991281a16919abbb386a20a8437604bbe0e57d12726d5f19c1c038e9b320a900471b1d4dad9f5dfd0eeb85ced17232a4907e50025592a293a5a8ad1 DIST croniter-0.3.37.tar.gz 29607 BLAKE2B dfa466f8557e47c282cf7a7399b1364dd272a313d40b4c9a57e60de9e4bd174312cec24126679994ddce3c320b24d89db4b4395736e344e2a3df5fd13188f7b2 SHA512 733412d6263d5261e05139861465602016925716abe04b82218b370e82ca7cdf7418113d911fe693fc7242fdb686580970b60609de28b3b7f4330a91c721a551 DIST croniter-1.0.1.tar.gz 29720 BLAKE2B 74583e170bc2bcd504ea323a50f0421157dd2e064a8ffa6a3dd0098084f3d4fe86427373cfc851d8d859a08473e9ff1ae4b3c38a46fad5886534a9638cf1a2bb SHA512 2ea3e4f13c8b95c15249ae95c3295e80983cd1713a4d89b931da7f6f712809e4625916c231418d30f419b69caf9f0465cf3f0b5acc3d5468e8a43e1029cdf6cb +DIST croniter-1.0.2.tar.gz 29809 BLAKE2B d7e5b668f97f98efdf992de4dd92bbddd8197275557364516af5d74b8376260967b249723dfda1d835c60dd185612a45f6ed6447609c593ad108ae1b738cefc7 SHA512 6e4b593dbbb5e3e1ce9a25ad709a1970f22feb1d0a2bf7fa97b8cc3eb43fbe896a842f74b3fc3cd08e3d414767cc661bf5c5307a206c42e1f0de5776b2b24310 diff --git a/dev-python/croniter/croniter-1.0.2.ebuild b/dev-python/croniter/croniter-1.0.2.ebuild new file mode 100644 index 000000000000..21e43494945e --- /dev/null +++ b/dev-python/croniter/croniter-1.0.2.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +inherit distutils-r1 + +DESCRIPTION="Python module to provide iteration for datetime object" +HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-python/natsort[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}]" +BDEPEND=" + test? ( + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/tzlocal[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest diff --git a/dev-python/croniter/metadata.xml b/dev-python/croniter/metadata.xml index 04029a92259a..13c8b9a30d07 100644 --- a/dev-python/croniter/metadata.xml +++ b/dev-python/croniter/metadata.xml @@ -9,5 +9,9 @@ <maintainer type="person"> <email>zmedico@gentoo.org</email> </maintainer> + <maintainer type="project"> + <email>python@gentoo.org</email> + <name>Python</name> + </maintainer> <origin>gentoo-staging</origin> </pkgmetadata> diff --git a/dev-python/eventlet/eventlet-0.30.0.ebuild b/dev-python/eventlet/eventlet-0.30.0.ebuild index ecce52f2167d..0086e8fe8c54 100644 --- a/dev-python/eventlet/eventlet-0.30.0.ebuild +++ b/dev-python/eventlet/eventlet-0.30.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~s390 sparc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~s390 sparc ~x86" IUSE="doc examples test" RDEPEND=" diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest index 9cf3ed1324f2..bbeabc5ca821 100644 --- a/dev-python/flask-migrate/Manifest +++ b/dev-python/flask-migrate/Manifest @@ -1,2 +1,3 @@ DIST Flask-Migrate-2.5.2.tar.gz 12127 BLAKE2B 4c30cd5a3e59c890b0b3e397845cfd1424cdbdec1340793f406fb2e77cc3dc1c7eda777498d75e2250d09a310f28aea1b6ff5248df1ea151ff62bd7c7acabe72 SHA512 9c20fef77c1e0cd2a3ff14bdac48117e3d1610fe9417c928e111fa9c5761a63e67154dedbe83247bbea0f62796203bac61f4193478431607e26bdb253ee0892b DIST Flask-Migrate-2.5.3.tar.gz 12652 BLAKE2B 4a43cb3849ffa31afa00031ffbdfc130d07a8282184ca43c58a9b49fe94c456ee46a735fd6df9f9e3fa00ae0c82c1688852a68f2bf278afc5b08d64b31a473e7 SHA512 f26db1c6ceddceb635cce4259b4508ecc8dc26dbfa67397205668883129835840050d909337a73712d3b1ff3e0bbfab74f5ac94c2ac472ec64f86e64789107ac +DIST Flask-Migrate-2.6.0.tar.gz 12671 BLAKE2B d8d1ab6fc7c077cc9c6dfe5de26c7ab0f2bcb45455f28fdb1bc03b6ac23a063f5c4103d57050a3e0818debd59cd9927ed4833d1cd924a2147ae16f766c045d82 SHA512 91ce86079b8f438357e5bffa809dd737c26ca5cb553ac9bd315ce5039112842e2a52fbf3cec3f6548eb13def8d641be2a4e12dcbe01995b1ab073af989dbbb68 diff --git a/dev-python/flask-migrate/flask-migrate-2.6.0.ebuild b/dev-python/flask-migrate/flask-migrate-2.6.0.ebuild new file mode 100644 index 000000000000..f137f640e234 --- /dev/null +++ b/dev-python/flask-migrate/flask-migrate-2.6.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +inherit distutils-r1 + +MY_PN="Flask-Migrate" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic" +HOMEPAGE="https://pypi.org/project/Flask-Migrate/" +SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/alembic-0.7[${PYTHON_USEDEP}] + >=dev-python/flask-0.9[${PYTHON_USEDEP}] + >=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( >=dev-python/flask-script-0.6[${PYTHON_USEDEP}] ) +" + +distutils_enable_tests setup.py diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest index 0672dba6dfb4..71c242cbf8bd 100644 --- a/dev-python/freezegun/Manifest +++ b/dev-python/freezegun/Manifest @@ -1 +1,2 @@ DIST freezegun-1.0.0.tar.gz 27426 BLAKE2B ebbe77d50f71cd10ad77dd9010fbc3dd9411a781300a5d196f4f86a76a374a8416980f8779705a943c4638ffdf99250640afe577695203b87e77e2daa1be8b38 SHA512 b6e19cf7799c0689eb756f6ce922797f2f0622f03d13aaf81c62d777d00b660b6619cff996f7a89c54b2e9f33641401e04e72a455a03ba0c7dfca09b64cfecb0 +DIST freezegun-1.1.0.tar.gz 29923 BLAKE2B 8a49bcb2e2e89e09ab14b6b48f90c145ddba2a7e0d005e33a002316c01b29899766b0b011e47f510be737011752044a7cc5967fdff3e0e14dc77da92f5bb5b27 SHA512 41d2bd18c5115416679602c53aff10891dd8e97402f641eeb3819a3b84d34351c238dece8e68fe267d572693ea08b421510726b6d7c9fdb1d6d70ddc96954d54 diff --git a/dev-python/freezegun/freezegun-1.1.0.ebuild b/dev-python/freezegun/freezegun-1.1.0.ebuild new file mode 100644 index 000000000000..c64aef65374c --- /dev/null +++ b/dev-python/freezegun/freezegun-1.1.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Let your Python tests travel through time" +HOMEPAGE="https://github.com/spulec/freezegun" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +RDEPEND=" + >dev-python/python-dateutil-2.7[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + $(python_gen_impl_dep sqlite) + dev-python/nose[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest index 068df8d26c89..ad2029a828e1 100644 --- a/dev-python/fsspec/Manifest +++ b/dev-python/fsspec/Manifest @@ -1,2 +1 @@ -DIST filesystem_spec-0.8.2.tar.gz 238399 BLAKE2B f64f153dd303bd3ec44e5010507704b5cbb50a89ad4a7a2e50b38b139219896be543bcff0fe0a99e06f015450f4b0334a641fabeeeb23583b14665ef8f089159 SHA512 e30badc56871ef20cf4b2ce0f6353b4125632d9e253f68d4b08535c9e1ac5fe428745315cee89a9536bfd1b308a28cc65fff555a7b9d9511225357bf790b9aac DIST filesystem_spec-0.8.5.tar.gz 255904 BLAKE2B df400276dbc53a453e9e9a00acb2e93a86a5f239237533bab036a16bd48d6d709f68241febe75f6f72281162ba4a563a087405a1064e18805ce2501095d778fb SHA512 20001fd02348f15e764a9e20eab98267f6746bd7e86187914d3db3098061aa62cb296595c3519696ae1e99ef896d49df0fcec846aaf6e5c281dd1a344ef6c393 diff --git a/dev-python/fsspec/fsspec-0.8.2.ebuild b/dev-python/fsspec/fsspec-0.8.2.ebuild deleted file mode 100644 index 8739553cf731..000000000000 --- a/dev-python/fsspec/fsspec-0.8.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit distutils-r1 - -MY_P=filesystem_spec-${PV} - -DESCRIPTION="A specification that python filesystems should adhere to" -HOMEPAGE="https://github.com/intake/filesystem_spec/ - https://pypi.org/project/fsspec/" -SRC_URI=" - https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz - -> ${MY_P}.tar.gz" -S=${WORKDIR}/${MY_P} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" - -BDEPEND=" - dev-python/versioneer[${PYTHON_USEDEP}] - test? ( - dev-python/aiohttp[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-vcs/git - )" - -distutils_enable_tests pytest - -PATCHES=( - "${FILESDIR}"/fsspec-0.8.2-test-cleanup.patch -) - -src_test() { - git config --global user.email "you@example.com" || die - git config --global user.name "Your Name" || die - distutils-r1_src_test -} - -python_test() { - # sftp and smb require server started via docker - pytest -vv \ - --ignore fsspec/implementations/tests/test_sftp.py \ - --ignore fsspec/implementations/tests/test_smb.py || - die "Tests failed with ${EPYTHON}" -} diff --git a/dev-python/fsspec/fsspec-0.8.5.ebuild b/dev-python/fsspec/fsspec-0.8.5.ebuild index 208198fba4b9..6dad2333ccde 100644 --- a/dev-python/fsspec/fsspec-0.8.5.ebuild +++ b/dev-python/fsspec/fsspec-0.8.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P} LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" BDEPEND=" dev-python/versioneer[${PYTHON_USEDEP}] diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest index 19b5e349d597..32fe914de2f6 100644 --- a/dev-python/google-api-core/Manifest +++ b/dev-python/google-api-core/Manifest @@ -1,3 +1,2 @@ -DIST google-api-core-1.17.0.tar.gz 98660 BLAKE2B 7959f429dbbfd8de658b11d0ee5be253cb53d930f8b37a140dbdc89a0d25ecdc640fc91476138471603efbe1e6078d668bc3f0e06c1fb1481960970a6f5632dc SHA512 fd609ce85bde22b09653bf46dd7bcc504ed93b19f8832c28f1d26ecb38a01e00380bd715191152a8d109e8c3235951b60525d4692fb4ba0eccb11a3b1df58cd2 DIST google-api-core-1.24.0.tar.gz 129718 BLAKE2B 08bb8aef03d5f5cbc96c06c01d103e1e569f15bad5084ba24a5e13f732b10d9d97a299fe22db7dfdaea73809e9458b811de87a028f77dcb00ca62fc069af63b1 SHA512 9517e86389edb824fe178128003fa245857de47f4b2416e0a345b66e02fe5fb109b7a72f2e9adfd52478862165548ce6945761a5a2ca02eda4a0187ca608760b DIST google-api-core-1.25.0.tar.gz 130928 BLAKE2B be7864046b2d04ecbbcf368803e77eb472a06cbb0f1601e8c95209bbdbeff6a335a5cc7f75fd89e8e9a91b566aa5d50a9b06ebad4c65c59f54de9d5c7a2951e7 SHA512 d8a1f973ad5bece84fe413528491a37d89ca39d9638a8508ec0cf8359cc238ea62c76e2563cb5ef995e4d0997dd3e4aa1feda7d0e48c21f85851a50f7f90404c diff --git a/dev-python/google-api-core/google-api-core-1.17.0.ebuild b/dev-python/google-api-core/google-api-core-1.17.0.ebuild deleted file mode 100644 index 0bbb0b43e659..000000000000 --- a/dev-python/google-api-core/google-api-core-1.17.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit distutils-r1 - -DESCRIPTION="Core Library for Google Client Libraries" -HOMEPAGE="https://github.com/googleapis/python-api-core - https://googleapis.dev/python/google-api-core/latest" -SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P//google/python}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" - -RDEPEND=" - dev-python/namespace-google[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] - dev-python/googleapis-common-protos[${PYTHON_USEDEP}] - >=dev-python/google-auth-1.14.0[${PYTHON_USEDEP}] - >=dev-python/requests-2.18.0[${PYTHON_USEDEP}] - <dev-python/requests-3[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/grpcio[${PYTHON_USEDEP}] - dev-python/rsa[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_test() { - distutils_install_for_testing - pytest -vv || die "tests fail with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - find "${D}" -name '*.pth' -delete || die -} diff --git a/dev-python/google-api-core/google-api-core-1.24.0.ebuild b/dev-python/google-api-core/google-api-core-1.24.0.ebuild index 8abac9c5dc56..395dcf2508ba 100644 --- a/dev-python/google-api-core/google-api-core-1.24.0.ebuild +++ b/dev-python/google-api-core/google-api-core-1.24.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ S="${WORKDIR}/${P//google/python}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" RDEPEND=" dev-python/namespace-google[${PYTHON_USEDEP}] diff --git a/dev-python/locket/Manifest b/dev-python/locket/Manifest index e2eebd981c7e..fdff951378df 100644 --- a/dev-python/locket/Manifest +++ b/dev-python/locket/Manifest @@ -1 +1,2 @@ DIST locket.py-0.2.0.gh.tar.gz 5598 BLAKE2B 9b8a1b3d4c3fed3e9ab8f37a1e7bd9d0aa65e618985368691802b1b66d0dbdeb7a1635ff72efec8a7351ce31ffc00413d5ee388e520057bf181a18a39ef46f0a SHA512 e5e5d34daf5c36b0ac4871ce0dec50c67b504be16755e38d7721e40c4f2c385c022c305ac1a9bd641ba9eaf45a2693a4a77b6fa6e95d6ae5ab34947e4ac30393 +DIST locket.py-0.2.1.gh.tar.gz 5988 BLAKE2B e50ef1794a49494434c730580510a4283685e924f6f3efb95067db7d566fa4808409fc339f3c8e3276ddf09f622cb165e9dde90094f764f662558ea32f85516e SHA512 517c580a3420283f945d28607fc765c571edb2c0fab52d5c76f24226d2ec85727d1ffe0c03c5f87f6ce6204e7db4d3c8f6e408d767a389bd93d34cc0de3e8bf7 diff --git a/dev-python/locket/locket-0.2.1.ebuild b/dev-python/locket/locket-0.2.1.ebuild new file mode 100644 index 000000000000..a3d4a06315d5 --- /dev/null +++ b/dev-python/locket/locket-0.2.1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +inherit distutils-r1 + +MY_P=locket.py-${PV} +DESCRIPTION="File-based locks for Python" +HOMEPAGE="https://github.com/mwilliamson/locket.py" +SRC_URI=" + https://github.com/mwilliamson/locket.py/archive/${PV}.tar.gz + -> ${MY_P}.gh.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" + +BDEPEND=" + test? ( dev-python/spur[${PYTHON_USEDEP}] )" + +distutils_enable_tests nose diff --git a/dev-python/lz4/Manifest b/dev-python/lz4/Manifest index a135dc9c4ed7..1865ef79a683 100644 --- a/dev-python/lz4/Manifest +++ b/dev-python/lz4/Manifest @@ -1,2 +1,3 @@ DIST lz4-3.1.1.tar.gz 154325 BLAKE2B 2d40728087aea735aeac4d39c415edf94f9aca83c77e4a36fe53f6f32f6c1595c0b1ad97c11f6e58cacafb95e0e12d29336d9f072d4f0d47f2d522f552a368bf SHA512 b6ddcabcb323b88eeff1fa9cb91d379d6435ab51b2b51e080138892fbce57d92c8175e2ae1ef72e8a2f95429aaa4be66a5e8cd9d4dbc5bcd6b44ec26b7df96db DIST lz4-3.1.2.tar.gz 153729 BLAKE2B f7d8b1b6dd4ee59d07eb4c2108516f939041bb1f131c62925986c2ad49406222c3eeac5232528979d6277aa5c1a950999f7bb3e984ffe26788e9d92a7eccf2e8 SHA512 bd277baf83a4d7819c2deee64e053fc030c5ccff8d5ea91762bfad2c38d5922f5305f8435b060821e86480be06716fa826cd05f407188077cc20637122e7c397 +DIST lz4-3.1.3.tar.gz 159016 BLAKE2B 2ab86799cbd37b96550ebb5d0e1a3c301cbcee2a42c6da189f5ae0fee4eb9c5614860dd044363e2c9312e3ab275eb527a116210604a72bd74354f49589d6567b SHA512 170b5330a8ec0eb4d69f3692c54eaa384fd4de78a7e7db95721d2f1e521ae9558f814e63bbb31db2775a81f7cd7eaea1420ad2c96406cff95d25bc5d30811aba diff --git a/dev-python/lz4/lz4-3.1.3.ebuild b/dev-python/lz4/lz4-3.1.3.ebuild new file mode 100644 index 000000000000..8fdd45e9a0b7 --- /dev/null +++ b/dev-python/lz4/lz4-3.1.3.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +inherit distutils-r1 + +DESCRIPTION="LZ4 Bindings for Python" +HOMEPAGE="https://pypi.org/project/lz4/ https://github.com/python-lz4/python-lz4" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" + +RDEPEND="app-arch/lz4:=" +DEPEND=${RDEPEND} +BDEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + dev-python/pkgconfig[${PYTHON_USEDEP}] + test? ( + dev-python/psutil[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest diff --git a/dev-python/pygresql/pygresql-5.2.2.ebuild b/dev-python/pygresql/pygresql-5.2.2.ebuild index 4b3b1e177a20..945e93957745 100644 --- a/dev-python/pygresql/pygresql-5.2.2.ebuild +++ b/dev-python/pygresql/pygresql-5.2.2.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz" LICENSE="POSTGRESQL" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~sparc ~x86" DEPEND="${POSTGRES_DEP}" RDEPEND="${DEPEND}" diff --git a/dev-python/pyls-spyder/pyls-spyder-0.3.0.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.3.0.ebuild index 41375e0abec0..11e41ce98c05 100644 --- a/dev-python/pyls-spyder/pyls-spyder-0.3.0.ebuild +++ b/dev-python/pyls-spyder/pyls-spyder-0.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.ta LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" RDEPEND=">=dev-python/python-language-server-0.36.2[${PYTHON_USEDEP}]" BDEPEND="test? ( dev-python/mock )" diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest index e2c488bba2b9..412b55c67a9a 100644 --- a/dev-python/pyusb/Manifest +++ b/dev-python/pyusb/Manifest @@ -1 +1,2 @@ DIST pyusb-1.1.0.tar.gz 78752 BLAKE2B ee541afedca7d5dca345c6addee2702ccb7408bb9a2d8b23fe1eb47f067a93309599894e364c0bdcef3e5348bd13cc39f240257efd4664679017f61b87853217 SHA512 0769670e6ebd8b31f2494258eca5d6e470ad3cb17663cc14b8b3a8136ea24caa23f86d81c60c501b88a9bc94b0de6a45aac43c6c5f140e65fd03a589b4d18179 +DIST pyusb-1.1.1.tar.gz 74746 BLAKE2B 795acafae3193e1a415baeb634554c8fdec3f4baa45a61a3eac9e1af4a84634cc540d421b7d8ad20142912fbef6ba53684e2e5b008e48f3e89406a493918ab20 SHA512 19aa82dcb9421d536063a975414855d1474f44b33dc4039e9a001be795061dbd60ed576acb605ae6bab7a0fe10834e5507408757546c7edcd50b43687a65a287 diff --git a/dev-python/pyusb/pyusb-1.1.1.ebuild b/dev-python/pyusb/pyusb-1.1.1.ebuild new file mode 100644 index 000000000000..58e53304eb1f --- /dev/null +++ b/dev-python/pyusb/pyusb-1.1.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +DISTUTILS_USE_SETUPTOOLS=bdepend + +inherit distutils-r1 + +DESCRIPTION="USB support for Python" +HOMEPAGE="https://pyusb.github.io/pyusb/ https://pypi.org/project/pyusb/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" + +### This version is compatible with both 0.X and 1.X versions of libusb +DEPEND="virtual/libusb:=" +RDEPEND="${DEPEND}" + +DOCS=( README.rst docs/tutorial.rst ) + +python_test() { + cd tests || die + "${EPYTHON}" testall.py || die "Tests failed with ${EPYTHON}" +} diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest index 360375ff2813..78896f1cf487 100644 --- a/dev-python/pyyaml/Manifest +++ b/dev-python/pyyaml/Manifest @@ -1 +1,2 @@ DIST pyyaml-5.3.1.gh.tar.gz 168044 BLAKE2B 2acc62ecc7448925eb340c2555001c8a74bd883d720b992d6deaea890b4eac435e4ae02eb129db3a6778c0be21a231fa9d96ee8ae59a4a39bc49961e5fb0d6ab SHA512 27d97e8493c7660c7c0c471e20a8aa46c85431e4559a98bcbdafc2bd89a67fd04c6f2090e54ff6b206c868b33635ef8be68070a4c25d17a25c97fd5ad3549556 +DIST pyyaml-5.4.gh.tar.gz 173140 BLAKE2B 2ff298cce44442b8431197b9222c2fba18d4f0aaf600fe636174864096f49f1392c3e965155b36c94ad0cf659402ffbd660cea5719b509bf90e9f316c1893248 SHA512 a76f9cf1838380b2e509bf1d5251f175cca1b413aadc511517de5fb3b4743747918f94abc1cf1976171731a1ba67596def3cb0652d08e1e3af3235cf7c0a610f diff --git a/dev-python/pyyaml/pyyaml-5.4.ebuild b/dev-python/pyyaml/pyyaml-5.4.ebuild new file mode 100644 index 000000000000..ff677e57a82a --- /dev/null +++ b/dev-python/pyyaml/pyyaml-5.4.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="YAML parser and emitter for Python" +HOMEPAGE="https://pyyaml.org/wiki/PyYAML + https://pypi.org/project/PyYAML/ + https://github.com/yaml/pyyaml" +SRC_URI="https://github.com/yaml/pyyaml/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +IUSE="examples +libyaml" + +BDEPEND=" + libyaml? ( + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_USEDEP}] + ' 'python*') + ) +" +RDEPEND="libyaml? ( dev-libs/libyaml:= )" +DEPEND="${RDEPEND}" + +PATCHES=( + # bug #659348 + "${FILESDIR}/pyyaml-5.1-cve-2017-18342.patch" +) + +distutils_enable_tests setup.py + +python_configure_all() { + mydistutilsargs=( $(use_with libyaml) ) +} + +python_install_all() { + distutils-r1_python_install_all + if use examples; then + dodoc -r examples + docompress -x /usr/share/doc/${PF} + fi +} diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest index c1383fc5248a..f6457656af17 100644 --- a/dev-python/readthedocs-sphinx-ext/Manifest +++ b/dev-python/readthedocs-sphinx-ext/Manifest @@ -1,2 +1,3 @@ DIST readthedocs-sphinx-ext-2.1.1.tar.gz 10181 BLAKE2B 01ca34befd0f18bb747d7f843e0cc394e19db4fe471f2bb21617b6dbdf4c1ad9721047185561f9bfbd8f770e1fefd5b560e65d7c5e2675c1bc8d74e08252eeb1 SHA512 5594e375133477ecdc1d22a78c0d4dac73c5e8c1715f4309a9674497ef860b07e8872bb4ba471fbffacd8bd22bc49741b8df54ad9ca9bb474acd9cdee72c8969 DIST readthedocs-sphinx-ext-2.1.2.tar.gz 11709 BLAKE2B 9386d9c849c4287a0f52ce054e33d22afed0426b5d775a03c90b7c18021f2a2a9429334dc0231ec8d28d3b4437dcf4e3faf57a0c1e46cfb4690893b96560fa3a SHA512 c1fa8a2c1b1d50aa5039c0592a0960b1162c31f58769754a7fdbe4d85557428f3e0a3a509012077210d30d79a28463ab0624855036ffb45d0977e9e0e666622a +DIST readthedocs-sphinx-ext-2.1.3.tar.gz 12261 BLAKE2B 3121b75c2a157a61727f4bc5b15b7a5d0aa23a177593fd7208d558de4ea9d89c48c788a843af833ab9dc79b05baa32231086ca6e4ea4c69ba793fb5001becb12 SHA512 f9b03de7a5ef8e6707960cb05b1be8115a55292820fe3fd43efc6d7843b9e55c8c537a53653967e1879ff27c5856ca66f145fc6e8f98891fc1f2682e425e2faf diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.3.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.3.ebuild new file mode 100644 index 000000000000..88610c3aacf5 --- /dev/null +++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.3.ebuild @@ -0,0 +1,27 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) +inherit distutils-r1 + +DESCRIPTION="Code specific for Read the Docs and Sphinx" +HOMEPAGE="https://github.com/readthedocs/readthedocs-sphinx-ext" +SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +RDEPEND=" + >=dev-python/jinja-2.9[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}]" +PDEPEND=" + dev-python/sphinx[${PYTHON_USEDEP}]" +BDEPEND=" + test? ( ${PDEPEND} )" + +# unittest should be sufficient but tests are very verbose, so pytest's +# output capture is most welcome +distutils_enable_tests pytest diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest index 72f28f52cbb5..7cb7de763aac 100644 --- a/dev-python/tox/Manifest +++ b/dev-python/tox/Manifest @@ -1,3 +1,4 @@ DIST tox-3.20.1.tar.gz 297516 BLAKE2B 2a13059bce229f30670e247b17ffd03d4b0d907b2fa7eb7d2f6848ada8d81e1a0aad983748c4346dfa61877f88edd22e4616ed20efcbd15da34fdc1c87b4439a SHA512 0989cc3dfd25eb3d1236d973d490f12c81273c93e84140b54342217eb73dd944f446c7ce9fe228b644d764b94300f1c6ccaf94e442d0e34835d05de84cccabd6 DIST tox-3.21.0.tar.gz 300962 BLAKE2B 360aedb86ef1f918e73f726af238d8fdb20c3217b45ef068ec833b14e17af018c1115a2df43b441b9a4af802c4aee2fcaa9bac8f519028dd05b112902c47b2ce SHA512 50041660839cc081d491f867db74c6e95c93b81b2264785b3ccf7b80fbf3a1250028755ddc4243a285ebd005e12f897001d6ea7efd45d0278ce3cb14f7021572 DIST tox-3.21.1.tar.gz 301387 BLAKE2B 3b15a17cfa8f2df1c8c3558cacde81d818cbc72b3dd0c4e4868d2fedace61c85ed484ad08e8abec10c0bef4062e623c75e4bf1122b4d15151b741057ea90fba3 SHA512 c3feaf1832db2b16df444d52ea774602c9a68eabd379c86483d33716f414df901b5e95ea9d63dd7c2f4338227cb5d9ee521a56f2dbb0d9c7d21221f49d1fc335 +DIST tox-3.21.2.tar.gz 301587 BLAKE2B 81d19e45a1d53000a2e9f956ed7b934f0f1926b4270ddced997ddc8b77a1f05388e0907d379dbabaafd5e6fdcd7031d5e87f206fff385759318a89a5f3eebf58 SHA512 beb551f49af1f8661931f241cf73fa77a37a8061ade7d41b415a2fcecd4d5dd1ba7d3e3add248d3bc14627468fa896f3f4f532305bbc36d112d226b1961fd191 diff --git a/dev-python/tox/tox-3.21.2.ebuild b/dev-python/tox/tox-3.21.2.ebuild new file mode 100644 index 000000000000..1ed45c6fdaaf --- /dev/null +++ b/dev-python/tox/tox-3.21.2.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="virtualenv-based automation of test activities" +HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/" +SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +# doc disabled because of missing deps in tree +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-python/filelock[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}] + ' python3_{5,6,7} pypy3) + dev-python/packaging[${PYTHON_USEDEP}] + >=dev-python/pluggy-0.12[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/py[${PYTHON_USEDEP}] + >=dev-python/six-1.14[${PYTHON_USEDEP}] + dev-python/toml[${PYTHON_USEDEP}] + >=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]" +# TODO: figure out how to make tests work without the package being +# installed first. +BDEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + test? ( + ${RDEPEND} + >=dev-python/flaky-3.4.0[${PYTHON_USEDEP}] + >=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}] + >=dev-python/pytest-4.0.0[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + )" + +src_configure() { + export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} +} + +python_test() { + local deselect=( + # broken without Internet + tests/unit/session/test_provision.py::test_provision_non_canonical_dep + tests/integration/test_provision_int.py::test_provision_interrupt_child + + # expects python2 to exist + tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable + + # broken without tox installed first + # TODO: figure out how to make importlib_metadata work + tests/unit/test_z_cmdline.py::test_tox_console_script + tests/unit/test_z_cmdline.py::test_tox_quickstart_script + ) + + [[ ${EPYTHON} != pypy3 ]] && deselect+=( + # TODO? + tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path + + # broken without tox installed first + # TODO: why it can't import itself? + tests/integration/test_parallel_interrupt.py::test_parallel_interrupt + ) + + distutils_install_for_testing --via-root + pytest -vv --no-network ${deselect[@]/#/--deselect } || die "Testsuite failed under ${EPYTHON}" +} diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest index 34c02a68feaa..32ee6cc64689 100644 --- a/dev-python/virtualenv/Manifest +++ b/dev-python/virtualenv/Manifest @@ -2,3 +2,4 @@ DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecd DIST virtualenv-20.2.1.tar.gz 8286055 BLAKE2B da77c51b352e979f05515107df49101a70f97da01862ae92aff0e185065edf1d6d517ee68057f1f2efe5ee999dd9dec24c0f2967b1f10130b446e83e478ccbd1 SHA512 e7877a9766bc47f47a07219258201ad8457ca587a04d61119a0516da43016dda4b5cfeaf725dd0b06f1f896ac8af0f3d7a2ceed3d3f35ac7a4b6ecc607c84118 DIST virtualenv-20.3.0.tar.gz 9074217 BLAKE2B a5a00e39e31beff84e28e66d1cf6693804861ec0a3c0d0ee5c042e39a8edf894e89d6e78093fe1a4fecaf8b43bceff82e47a1ef7b8a92a1d2bc58d61411575b9 SHA512 5703a934d373d88670092febf26782f65303c65de93cffdd1a2ca06d6f2de4868378421f3ad96e3857eb99d0b60e7a77b0a2dbcf10561918efcbadb29a4ebf3b DIST virtualenv-20.3.1.tar.gz 9077527 BLAKE2B 9932c75ffd42c2448a3f5dc49aa8b31f7cd169cc671e225a97fa75fabc3339728d0b280abec9616c11fc869dc696bfd17da05bf911c6f8a14947d710ade86897 SHA512 ee95e851e9e3597fd1691086d1d4dc72a41d6a143e9644be208cadbc1dfe7c8e562cd506a657ba1f77161d8d80a9f6f648b345e6533265b0e989c7ad39cc7680 +DIST virtualenv-20.4.0.tar.gz 9079287 BLAKE2B a3c97537b9c35b463a0077e6020fd087a1cf7c22302ab9f57a7df951bd68d3b0e1bc323cdf12a71ca0fdba938364dbd970467d4f9f768ee688a5d9709949b08a SHA512 4dcc141441626ca2a565c1b51453ef0b7a05016037c44ae1017269e5b2ea98fb7fb29fb9cf3f8909a377824b5e52c5b40d2592e40931d8ad63ad850b8e5f23ac diff --git a/dev-python/virtualenv/virtualenv-20.4.0.ebuild b/dev-python/virtualenv/virtualenv-20.4.0.ebuild new file mode 100644 index 000000000000..7a01fa9ad8dc --- /dev/null +++ b/dev-python/virtualenv/virtualenv-20.4.0.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) +DISTUTILS_USE_SETUPTOOLS=manual + +inherit distutils-r1 + +DESCRIPTION="Virtual Python Environment builder" +HOMEPAGE=" + https://virtualenv.pypa.io/en/stable/ + https://pypi.org/project/virtualenv/ + https://github.com/pypa/virtualenv/ +" +SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}] + >=dev-python/distlib-0.3.1[${PYTHON_USEDEP}] + >=dev-python/filelock-3[${PYTHON_USEDEP}] + >=dev-python/setuptools-41[${PYTHON_USEDEP}] + >=dev-python/six-1.9.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}] + ' python3_{6,7} pypy3) + $(python_gen_cond_dep ' + >=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}] + ' python3_6 pypy3)" +# coverage is used somehow magically in virtualenv, maybe it actually +# tests something useful +BDEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + test? ( + ${RDEPEND} + $(python_gen_cond_dep ' + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + >=dev-python/pip-20.0.2[${PYTHON_USEDEP}] + >=dev-python/pytest-5[${PYTHON_USEDEP}] + >=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}] + >=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + >=dev-python/packaging-20.0[${PYTHON_USEDEP}] + ' 'python3*') + )" + +distutils_enable_sphinx docs \ + dev-python/sphinx_rtd_theme \ + dev-python/towncrier + +src_configure() { + export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} +} + +python_test() { + local deselect=( + tests/unit/activation/test_xonsh.py + tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data + tests/unit/create/test_creator.py::test_cross_major + ) + [[ ${EPYTHON} == pypy3 ]] && deselect+=( + 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]' + 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]' + 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]' + 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]' + 'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]' + 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]' + ) + + distutils_install_for_testing --via-root + pytest -vv ${deselect[@]/#/--deselect } || + die "Tests fail with ${EPYTHON}" +} + +pkg_postinst() { + elog "Please note that while virtualenv package no longer supports" + elog "Python 2.7, you can still create py2.7 virtualenvs via:" + elog " $ virtualenv -p 2.7 ..." +} diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest index d75d611bc506..9f1fbc17c26f 100644 --- a/dev-ruby/bundler/Manifest +++ b/dev-ruby/bundler/Manifest @@ -3,3 +3,4 @@ DIST bundler-2.2.0.gem 400896 BLAKE2B a9d67d052bc6b7b8c09a6dbc249e348209a6a02bb3 DIST bundler-2.2.3.gem 401408 BLAKE2B 7162444956c65d6684a299c7ce15f64a178dab40867315241eaa3cfcb51b6973a004980abef359c911de06ce2051e5ca98e68e3df388963f40378a6f5fabda62 SHA512 da1f1dfae51cdf3dd6792fc66c33389c113579b8a723fb204ae3b315dcd1d45aed65524469336934d7276be53b026952c944457e326c97b20d4c423dd44321ef DIST bundler-2.2.4.gem 386048 BLAKE2B 7a2cec046b75ff371df9b563a81f48c8a2a3782f75ec4868869b4b2fda5e117b6cd38daf6a566ec1201fe7a5f6b8b2c4dbe0cc552d2a63bcb4e5e9f53c710046 SHA512 f3c988278746896da276e5af5cf046c5910962c2022fc8d37ab00db1a81a69d77a1fd21fabd8a1d086891d18bfb4ac321dbb60f830b139aa7c3192ea879b4cf8 DIST bundler-2.2.5.gem 386560 BLAKE2B 070f52338e9424e571ae40c01ba559158fd9938910be4d5b1d4c8990cdaac4f6a2cb7d2a554a2e7bbb35b18a31e9d1dba5c4e711556294496ac6978ae63a94f0 SHA512 d985168531ad7415841535a496717faff2cbdcff04c8b701c0e29533f3fe5c87cb5815e6b219ab1d536c29c8c8d80b051f4f05aeb2b6fe279dc12404bf824742 +DIST bundler-2.2.6.gem 386560 BLAKE2B e1e3f50425839bbb13360fc986f98588aa09643b6fb5b8c13911b5680ef0ae2ca0b19f71ffa99234f6f6a39ca6467564f25ac26874c67b493e028f086e89c211 SHA512 58e80bb313c132125e2b601113e6e262d00f768ca75adbacbff2e98cdcd83e40aa68a8f92aa56e477c66cd396687ad6d9f54f4df9366fd6b51424b6ff5429504 diff --git a/dev-ruby/bundler/bundler-2.2.6.ebuild b/dev-ruby/bundler/bundler-2.2.6.ebuild new file mode 100644 index 000000000000..8256c6960865 --- /dev/null +++ b/dev-ruby/bundler/bundler-2.2.6.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +USE_RUBY="ruby25 ruby26 ruby27 ruby30" + +# The specs require a number of gems to be installed in a temporary +# directory, but this requires network access. They also don't work +# when run with a path that contains "-". +RUBY_FAKEGEM_RECIPE_TEST="none" + +# No documentation task +RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md" + +RUBY_FAKEGEM_BINDIR="exe" + +inherit ruby-fakegem + +DESCRIPTION="An easy way to vendor gem dependencies" +HOMEPAGE="https://github.com/carlhuda/bundler" + +LICENSE="MIT" +SLOT="$(ver_cut 1)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+doc test" + +ruby_add_rdepend virtual/rubygems + +RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0" diff --git a/dev-ruby/ffi-compiler/ffi-compiler-1.0.1.ebuild b/dev-ruby/ffi-compiler/ffi-compiler-1.0.1.ebuild index 6a2ac5d40c80..c927d37f8ee2 100644 --- a/dev-ruby/ffi-compiler/ffi-compiler-1.0.1.ebuild +++ b/dev-ruby/ffi-compiler/ffi-compiler-1.0.1.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ffi/ffi/wiki" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~sparc" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc" IUSE="" ruby_add_rdepend "dev-ruby/rake >=dev-ruby/ffi-1.0.0" diff --git a/dev-ruby/http-parser/http-parser-1.2.3.ebuild b/dev-ruby/http-parser/http-parser-1.2.3.ebuild index 24bab3203d7a..61c84cda710b 100644 --- a/dev-ruby/http-parser/http-parser-1.2.3.ebuild +++ b/dev-ruby/http-parser/http-parser-1.2.3.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/cotag/http-parser" LICENSE="MIT" SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~arm" +KEYWORDS="~amd64 ~arm ~arm64" IUSE="" DEPEND+=" >=net-libs/http-parser-2.8.1" diff --git a/dev-ruby/http/http-4.4.1.ebuild b/dev-ruby/http/http-4.4.1.ebuild index b0471b97c35c..2383d9799f22 100644 --- a/dev-ruby/http/http-4.4.1.ebuild +++ b/dev-ruby/http/http-4.4.1.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/tarcieri/http" LICENSE="MIT" SLOT="4" -KEYWORDS="~amd64 ~arm" +KEYWORDS="~amd64 ~arm ~arm64" IUSE="" ruby_add_rdepend " diff --git a/dev-ruby/ruby2_keywords/Manifest b/dev-ruby/ruby2_keywords/Manifest index cac2ba9eaefe..8bb450dddf72 100644 --- a/dev-ruby/ruby2_keywords/Manifest +++ b/dev-ruby/ruby2_keywords/Manifest @@ -1 +1,2 @@ DIST ruby2_keywords-0.0.2.gem 4608 BLAKE2B a13fab6800dafe557ca05a14301ed37afdd0fef22b6c4a8458be758d96099dbad47c49d7b01bd3c7297aec51d971c944005f704fbdfc45d8f50249040c244250 SHA512 a7bc02980e073a899bf3de2e32711ca9820657d43cc44dede44ca31681d8586e7f808a93b6f6778aaaaf8b84da37a48c8062e69ca33477d9469e9634d616ed8d +DIST ruby2_keywords-0.0.4.gem 5632 BLAKE2B 1d2d4a71823e61a14fdf15edc2ad8ed8df70e3f52f621940d3d3e00c18f58e76d7c18ca2ff409b1c2b5d77216f90e72e1d50bad00093fa1f7740ccf8375c11a2 SHA512 22cc0c9c08f84ee6485e02f1d1fa244219dc96846a638b428970e0876c83056b87939e8a3cddac833d6feb493e34420604e81a3973d7cfa4dc969a6639b13439 diff --git a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.4.ebuild b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.4.ebuild new file mode 100644 index 000000000000..da9a11ff613a --- /dev/null +++ b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.4.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +USE_RUBY="ruby25 ruby26 ruby27 ruby30" + +RUBY_FAKEGEM_RECIPE_TEST="none" + +RUBY_FAKEGEM_EXTRADOC="README.md" + +inherit ruby-fakegem + +DESCRIPTION="Shim library for Module#ruby2_keywords" +HOMEPAGE="https://github.com/ruby/ruby2_keywords" + +LICENSE="Ruby" +SLOT="$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="" diff --git a/dev-util/hip/hip-4.0.0-r1.ebuild b/dev-util/hip/hip-4.0.0-r1.ebuild new file mode 100644 index 000000000000..9252cfffc779 --- /dev/null +++ b/dev-util/hip/hip-4.0.0-r1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit cmake flag-o-matic prefix + +DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability" +HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP" +SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz" + +KEYWORDS="~amd64" +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" + +IUSE="debug profile" + +# Don't strip to prevent some tests from failing. +RESTRICT="strip" + +DEPEND=">=dev-libs/rocclr-$(ver_cut 1-2) + >=dev-util/rocminfo-$(ver_cut 1-2) + =sys-devel/llvm-roc-${PV}*[runtime]" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-3.9.0-DisableTest.patch" + "${FILESDIR}/${PN}-3.9.0-add-include-directories.patch" + "${FILESDIR}/${PN}-3.5.1-config-cmake-in.patch" + "${FILESDIR}/${PN}-3.5.1-hip_vector_types.patch" + "${FILESDIR}/${PN}-3.5.1-detect_offload-arch_for_clang-roc.patch" + "${FILESDIR}/${PN}-3.9.0-lpl_ca-add-include.patch" +) + +S="${WORKDIR}/HIP-rocm-${PV}" + +src_prepare() { + cmake_src_prepare + eapply_user + + # Use Gentoo version number, otherwise git hash is attempted in vain. + sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${PVR})" -i CMakeLists.txt || die + + # disable PCH, because it results in a build error in ROCm 4.0.0 + sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i "${S}/CMakeLists.txt" || die + + # "hcc" is deprecated and not installed, new platform is "rocclr"; + # Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include" + # which makes "stdlib.h" not found when using "#include_next" in header files; + sed -e "/HIP_PLATFORM.*HIP_COMPILER.*clang/s:hcc:rocclr:" \ + -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ + -e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \ + -i bin/hipcc || die + + # replace hcc remnants with modern rocclr. + sed -e "/HIP_PLATFORM.*STREQUAL/s:hcc:rocclr:" -i cmake/FindHIP/run_hipcc.cmake || die + + # correctly find HIP_CLANG_INCLUDE_PATH using cmake + sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die + + # change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs" + sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \ + -i "${S}/hip-config.cmake.in" || die + + einfo "prefixing hipcc and its utils..." + hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}") +} + +src_configure() { + strip-flags + if ! use debug; then + append-cflags "-DNDEBUG" + append-cxxflags "-DNDEBUG" + buildtype="Release" + else + buildtype="Debug" + fi + + # TODO: Currently a GENTOO configuration is build, + # this is also used in the cmake configuration files + # which will be installed to find HIP; + # Other ROCm packages expect a "RELEASE" configuration, + # see "hipBLAS" + local mycmakeargs=( + -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc" + -DCMAKE_BUILD_TYPE=${buildtype} + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip" + -DBUILD_HIPIFY_CLANG=OFF + -DHIP_PLATFORM=rocclr + -DHIP_RUNTIME=ROCclr + -DHIP_COMPILER=clang + -DROCM_PATH="${EPREFIX}/usr" + -DHSA_PATH="${EPREFIX}/usr" + -DUSE_PROF_API=$(usex profile 1 0) + -DROCclr_DIR="${EPREFIX}"/usr/include/rocclr + ) + + cmake_src_configure +} + +src_install() { + echo "HSA_PATH=${EPREFIX}/usr" > 99hip || die + echo "ROCM_PATH=${EPREFIX}/usr" >> 99hip || die + echo "HIP_PLATFORM=rocclr" >> 99hip || die + echo "HIP_RUNTIME=ROCclr" >> 99hip || die + echo "HIP_COMPILER=clang" >> 99hip || die + echo "HIP_CLANG_PATH=${EPREFIX}/usr/lib/llvm/roc/bin" >> 99hip || die + + echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die + echo "HIP_PATH=${EPREFIX}/usr/lib/hip" >> 99hip || die + echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die + echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die + + doenvd 99hip + + cmake_src_install +} diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest index b311313687ee..ec39364465ca 100644 --- a/dev-util/scons/Manifest +++ b/dev-util/scons/Manifest @@ -8,3 +8,7 @@ DIST scons-4.0.1-user.html 1415152 BLAKE2B 1a94b2ef5e076d883f2960825f055c7cc39cf DIST scons-4.0.1-user.pdf 2468804 BLAKE2B f0af6bc6b41d972b98e955ee3ccec908aa366eabe31bd01022abe1f6d3a94dd6d7da26f71de23a6dfbcbc7bb4e439463f69bb7e8a5780c1300e3ba508b9eb314 SHA512 0d2733e2f1391083522a64117bfd35a2160d1366382f6f630b26eba36fc12ce797467d5e16efeb3b7f58aa9d853f96ae0d50fe78f59e78d24642b146bc7e565d DIST scons-4.0.1.gh.tar.gz 5578800 BLAKE2B f9ece5eaf1b133219f975e484beb5df726560a38969b8e8ad829781b960b438458bfcd7971333da87560c957675b2a4f8675e757fb0a4268cc4ecf72bb60d45f SHA512 f23c5dfd3c236e9f9f85b986ca64a36dbd85e9f3383cb3577e082a7dea4b83283020fbf064c2d919ab116195c6708fc11f906fcf3b0bc0533a4bc49a4f7371c6 DIST scons-4.0.1.tar.gz 2874481 BLAKE2B 98377e62ae31d32758a93c4e04c578b88ea541cc292af63c6ca43e2948745e416ee6d757d98129ee30d0e0bbab90664889441a5bb86d4c9dfc649ca1dbef7536 SHA512 400b11323d48f04395b519dfafb6fce15a6dea92013f599dc4895b112629c0a06c7d2806755c74047d001d60087b94f39a118f512b7ee8de6214a4ffc7310468 +DIST scons-4.1.0-user.html 1454432 BLAKE2B 9fac4d7bfb4b25708bc4cc48d952beb030f88181af5dfee63090f726b1a82443c192c63ec5939869967ef8f374e8599321212971439fb265fb050b263681c9f8 SHA512 74f1349fa61dac9e66cfb863cb3126d07ce5f421b3e87d0220eb32bd5017ba8f6cf96eb8cb5ee45c39022671aa9f2d0408d4039970c438a69c002445aea510be +DIST scons-4.1.0-user.pdf 2691364 BLAKE2B a910a09fa936d4d6f8dc967676d5aa009aac58a5a4566399b3ddc3512ac0259731e6c5399722fefadb3b79d8f89a5257e2e9bc2fa4d65697c8293ab995248d64 SHA512 64584731a59b59b78283be3876ecca91d742f83da2653d0de17922bec01e3c9cea1ce2ce3c8dc718597910ba86ed2c8aff0f7ae371bf763439b57a6d5484e1a7 +DIST scons-4.1.0.gh.tar.gz 5609204 BLAKE2B ede3d47a1ec652b9248681e26738073e9d01daab7ffeccc58f0fcadb79661e30edb9a35a511518e4a58459243acb027afd8fa5849b0f9e4bae451055f7b1a062 SHA512 f79b86bb09783767b3872cfb8efb665372714a604af2aaf3adc66eee63d3afe27bc6b2aab83813743c83f71c81c800d42842e916501787ba402ce2726dda9b44 +DIST scons-4.1.0.tar.gz 3007701 BLAKE2B 70ab64ecfd89fa2af1d78a33fcef82a5f7db9875ffe9d2c16ea75cf40e661b2874359e3a5f75d761b3d9e863f7a434560992cfb020cce3e21e389381331d90de SHA512 24fd493643545a2998b053ed0d68caf6241f05bc2437e7cbeae33d2e1c63517a61449a1a18062f8e4e5a639295a2486925296ba3e54ccfa2ecdd56fa07132de8 diff --git a/dev-util/scons/files/scons-4.1.0-env-passthrough.patch b/dev-util/scons/files/scons-4.1.0-env-passthrough.patch new file mode 100644 index 000000000000..75172042e563 --- /dev/null +++ b/dev-util/scons/files/scons-4.1.0-env-passthrough.patch @@ -0,0 +1,40 @@ +From dd6021a9853f009e2f45f36b9aa80c5a78bc90ac Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Wed, 9 May 2018 17:04:49 +0200 +Subject: [PATCH 1/2] posix: Support GENTOO_SCONS_ENV_PASSTHROUGH=1 + +Support GENTOO_SCONS_ENV_PASSTHROUGH=1 variable to override the default +of wiping the environment and resetting PATH to default, and instead +pass all variables through. +--- + SCons/Platform/posix.py | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/src/SCons/Platform/posix.py b/src/SCons/Platform/posix.py +index 4c9f8f9ba..37786229f 100644 +--- a/src/SCons/Platform/posix.py ++++ b/src/SCons/Platform/posix.py +@@ -82,9 +82,17 @@ def generate(env): + pspawn = piped_env_spawn + # Note that this means that 'escape' is no longer used + +- if 'ENV' not in env: +- env['ENV'] = {} +- env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin:/snap/bin' ++ # Force pass-through of environment variables in Gentoo builds ++ if os.environ.get('GENTOO_SCONS_ENV_PASSTHROUGH', False): ++ new_env = os.environ.copy() ++ if 'ENV' in env: ++ new_env.update(env['ENV']) ++ env['ENV'] = new_env ++ else: ++ if 'ENV' not in env: ++ env['ENV'] = {} ++ env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin:/snap/bin' ++ + env['OBJPREFIX'] = '' + env['OBJSUFFIX'] = '.o' + env['SHOBJPREFIX'] = '$OBJPREFIX' +-- +2.30.0 + diff --git a/dev-util/scons/scons-4.1.0.ebuild b/dev-util/scons/scons-4.1.0.ebuild new file mode 100644 index 000000000000..c820cebf1b75 --- /dev/null +++ b/dev-util/scons/scons-4.1.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 + +DESCRIPTION="Extensible Python-based build utility" +HOMEPAGE="https://www.scons.org/" +SRC_URI=" + https://downloads.sourceforge.net/project/scons/scons/${PV}/${P}.tar.gz + doc? ( + https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf + https://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html + ) + test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + dev-libs/libxml2[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + ) +" + +S=${WORKDIR}/${P}/src + +PATCHES=( + # support env passthrough for Gentoo ebuilds + "${FILESDIR}"/scons-4.1.0-env-passthrough.patch + # respect CC, CXX, C*FLAGS, LDFLAGS by default + "${FILESDIR}"/scons-4.0.0-respect-cc-etc-r1.patch +) + +src_unpack() { + # use the git directory structure, but put pregenerated release + # inside src/ subdirectory to make our life easier + if use test; then + unpack "${P}.gh.tar.gz" + else + mkdir -p "${P}"/src || die + fi + + tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die +} + +src_prepare() { + # apply patches relatively to top directory + cd "${WORKDIR}/${P}" || die + distutils-r1_src_prepare + + # manpage install is completely broken + sed -i -e '/build\/doc\/man/d' src/setup.cfg || die + + if use test; then + local remove_tests=( + # TODO: does not respect PATH? + test/Clang + # broken + test/DVIPDF/DVIPDFFLAGS.py + test/Java/swig-dependencies.py + test/Java/multi-step.py + ) + rm -r "${remove_tests[@]}" || die + fi +} + +python_test() { + local -x COLUMNS=80 + # set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env + local -x GENTOO_SCONS_ENV_PASSTHROUGH=1 + # unset some env variables to pass appropriate tests + unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS + cd "${WORKDIR}/${P}" || die + "${EPYTHON}" runtest.py -a --passed \ + -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" + + # runtest.py script returns "0" if all tests are passed + # and returns "2" if there are any tests with "no result" + # (i.e. in case if some tools are not installed or it's Windows specific tests) + [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + distutils-r1_python_install_all + + doman *.1 + use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html} +} diff --git a/mail-filter/dcc/dcc-1.3.158-r1.ebuild b/mail-filter/dcc/dcc-1.3.158-r1.ebuild index 36206cce7d57..db4459137a86 100644 --- a/mail-filter/dcc/dcc-1.3.158-r1.ebuild +++ b/mail-filter/dcc/dcc-1.3.158-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.rhyolite.com/dcc/source/old/${P}.tar.Z" LICENSE="DCC GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="cgi ipv6 rrdtool milter" RDEPEND=" diff --git a/mail-filter/dcc/dcc-1.3.158.ebuild b/mail-filter/dcc/dcc-1.3.158.ebuild deleted file mode 100644 index 6725df990ca0..000000000000 --- a/mail-filter/dcc/dcc-1.3.158.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit base eutils flag-o-matic toolchain-funcs - -DESCRIPTION="Distributed Checksum Clearinghouse" -HOMEPAGE="https://www.rhyolite.com/anti-spam/dcc/" -SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${P}.tar.Z" - -LICENSE="DCC GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86" # -IUSE="cgi ipv6 rrdtool milter" - -RDEPEND="dev-lang/perl - rrdtool? ( net-analyzer/rrdtool ) - || ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp ) - milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )" -DEPEND="sys-apps/sed - sys-devel/gcc - ${RDEPEND}" - -dcc_cgibin=/var/www/localhost/cgi-bin/dcc -dcc_homedir=/var/dcc -dcc_libexec=/usr/sbin -dcc_man=/usr/share/man -dcc_rundir=/var/run/dcc - -PATCHES=( "${FILESDIR}"/dcc-1.3.140-freebsd.patch ) - -src_configure() { - tc-export CC AR RANLIB - local myconf - myconf="${myconf} --homedir=${dcc_homedir}" - myconf="${myconf} --bindir=/usr/bin" - myconf="${myconf} --libexecdir=${dcc_libexec}" - myconf="${myconf} --mandir=/usr/share/man" - myconf="${myconf} --with-updatedcc_pfile=${dcc_homedir}/updatecc.pfile" - myconf="${myconf} --with-installroot=${D}" - # sigh. should be DCC-MD5 but see line 486 in the shipped configure script - myconf="${myconf} --with-DDC-MD5" - myconf="${myconf} --with-uid=root" - myconf="${myconf} --enable-server" - myconf="${myconf} --enable-dccifd" - myconf="${myconf} --with-rundir=${dcc_rundir}" - myconf="${myconf} --with-db-memory=64" - myconf="${myconf} --with-max-db-mem=128" - myconf="${myconf} --with-max-log-size=0" - myconf="${myconf} --with-make-cmd=${MAKE:-make}" - myconf="${myconf} $(use_enable ipv6 IPv6)" - myconf="${myconf} $(use_with cgi cgibin ${dcc_cgibin})" - myconf="${myconf} $(use_enable milter dccm)" - use milter && myconf="${myconf} --with-sendmail=" - - einfo "Using config: ${myconf}" - - # This is NOT a normal configure script. - ./configure ${myconf} || die "configure failed!" -} - -moveconf() { - local into=/etc/dcc/ - for i in $@; do - mv "${D}${dcc_homedir}/${i}" "${D}${into}" - dosym "${into}${i}" "${dcc_homedir}/${i}" - done -} - -src_install() { - # stolen from the RPM .spec and modified for gentoo - MANOWN=root MANGRP=$(id -g -n root) export MANOWN MANGRP - BINOWN="${MANOWN}" BINGRP="${MANGRP}" export BINOWN BINGRP - DCC_PROTO_HOMEDIR="${D}${dcc_homedir}" export DCC_PROTO_HOMEDIR - DCC_CGIBINDIR="${D}${dcc_cgibin}" export DCC_CGIBINDIR - DCC_SUID="${BINOWN}" DCC_OWN="${BINOWN}" DCC_GRP="${BINGRP}" export DCC_SUID DCC_OWN DCC_GRP - - dodir /etc/cron.daily "${dcc_homedir}" /usr/bin /usr/sbin /usr/share/man/man{0,8} /etc/dcc - if use cgi ; then - dodir "${dcc_cgibin}" - fi - keepdir /var/log/dcc - - # This package now takes "${D}" at compile-time! - # make DESTDIR="${D}" DCC_BINDIR="${D}"/usr/bin MANDIR="${D}"/usr/share/man/man DCC_HOMEDIR="${D}"${dcc_homedir} install || die - emake install - - # branding and setting reasonable defaults - sed -e "s/BRAND=\$/BRAND='Gentoo ${PF}'/;" \ - -e "s/GREY_ENABLE=\$/GREY_ENABLE=off/;" \ - -e "s/DCCM_LOG_AT=5\$/DCCM_LOG_AT=50/;" \ - -e "s,DCCM_LOGDIR=\"log\"\$,DCCM_LOGDIR=\"/var/log/dcc\",;" \ - -e "s/DCCM_ARGS=\$/DCCM_ARGS='-SHELO -Smail_host -SSender -SList-ID'/;" \ - -e "s/DCCIFD_ARGS=\$/DCCIFD_ARGS=\"\$DCCM_ARGS\"/;" \ - -e 's/DCCIFD_ENABLE=off/DCCIFD_ENABLE=on/' \ - -e 's/DBCLEAN_LOGDAYS=14/DBCLEAN_LOGDAYS=1/' \ - -i "${D}${dcc_homedir}/dcc_conf" - - if use milter ; then - # enable milter - sed -i -e "s:^[\t #]*\(DCCM_ENABLE[\t ]*=[\t ]*\).*:\1on:g" \ - "${D}${dcc_homedir}"/dcc_conf - fi - - # provide cronjob - mv "${D}"/usr/sbin/cron-dccd "${D}"/etc/cron.daily/dccd || die "mv failed" - - # clean up - mv "${D}"/usr/sbin/logger "${D}"/usr/sbin/logger-dcc || die "mv failed" - - statslist="${D}/usr/sbin/{dcc-stats-graph,dcc-stats-init,dcc-stats-collect}" - if ! use rrdtool; then - # remove rrdtool interface scripts - eval rm -f ${statslist} || die "Failed to clean up rrdtool scripts" - fi - - # clean up - rm -f "${D}"/usr/sbin/{rcDCC,updatedcc} - - # place configuration files into /etc instead of /var/dcc - moveconf dcc_conf flod grey_flod grey_whitelist ids map map.txt whiteclnt whitecommon whitelist - - newinitd "${FILESDIR}"/dcc.initd-1.3.154 dcc - newconfd "${FILESDIR}"/dcc.confd dcc - - rmdir "${D}"/var/dcc/log/ - - dodoc CHANGES RESTRICTIONS - dohtml *.html - doman *.{0,8} -} diff --git a/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild b/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild index c694562e9fb3..aaac8899af72 100644 --- a/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild +++ b/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${COMMIT}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~hppa ~ppc ppc64 ~x86" DEPEND=" acct-group/postgrey diff --git a/media-libs/libvpx/libvpx-1.9.0.ebuild b/media-libs/libvpx/libvpx-1.9.0.ebuild index 7fdb393a5c9b..1326c2ab6ceb 100644 --- a/media-libs/libvpx/libvpx-1.9.0.ebuild +++ b/media-libs/libvpx/libvpx-1.9.0.ebuild @@ -21,7 +21,7 @@ SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="BSD" SLOT="0/6" -KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="doc +highbitdepth postproc static-libs svc test +threads" REQUIRED_USE="test? ( threads )" diff --git a/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild index 75d14100f1b4..0f597a54f81a 100644 --- a/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild +++ b/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ S="${WORKDIR}/oiio-Release-${PV}" LICENSE="BSD" SLOT="0/2.2" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" X86_CPU_FEATURES=( aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest index 62a1ed63dfa1..5986fb82600d 100644 --- a/media-sound/mpd/Manifest +++ b/media-sound/mpd/Manifest @@ -1,4 +1,2 @@ DIST mpd-0.21.26.tar.xz 685396 BLAKE2B 176c75069190c8df79e5c0b37605abeafac2358dc1840ec66b2eecb809449cf0908b7a3af61c499e88d82b210c8907a752b4f006bcffb7c7d279cbdbc082032f SHA512 31eb5d42bcfc942116cb203d8b1ceb8489b46251204f7288d1e8d7e052ff4cab2c8b2087795cc8118c8b86f080613f80cb182163fcb1c5b5027053d53c5a594a -DIST mpd-0.22.1.tar.xz 725204 BLAKE2B 7032472776129c9cb302545d8bdd266a7551df4647d6fc09e9f5e287f25b25158759316dde5bb481a7b87366d7eaa5a91613bbc6679a9f1b768297b63b1fb9fb SHA512 b7c0156bb85bbc551435bbb9a49ed719e51fe0446dcecbaadbe083e705fc16da9d03d83814c7dcc041075a46544473cf63e5d1576dbc3961bfdfa44ef5fb27d7 -DIST mpd-0.22.2.tar.xz 725808 BLAKE2B 5961177dd33b5e008b17131c6a83b8fc61df62317acdfd6bac4e20a9e31111d1307be79223a23fdaa0e2ae0593aa8015ac140648ea4b5b699a8b64632fc589ef SHA512 13ec85bda79d0c2588c50e2ebbf53b733f23c9700abfd7ccd4140db8080a4c496073727c8c04e9a2f8897669beeced0d77caa2bac7e2ca9adb41ad56dcf92aeb DIST mpd-0.22.3.tar.xz 726356 BLAKE2B a821e9fed56c3ad625d155057867747d2c883dd90d110b097dfd4acc56ff583949889b849686d5644687226f205c5ae3f95eec182841f706f56135c7e8f3746b SHA512 deeafbe1a95f777fa4f9f355293a648a3f7121fae8e299c92dbd43d821319ffa4182c558cb0691f65e90f243428cec2cf14f64e9572bc72fc6a2af0fd9c0cd60 diff --git a/media-sound/mpd/mpd-0.22.1-r1.ebuild b/media-sound/mpd/mpd-0.22.1-r1.ebuild deleted file mode 100644 index 406e09d68018..000000000000 --- a/media-sound/mpd/mpd-0.22.1-r1.ebuild +++ /dev/null @@ -1,294 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic linux-info meson systemd xdg-utils - -DESCRIPTION="The Music Player Daemon (mpd)" -HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD" -SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus - +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify - +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms - modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz - recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd - test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp - zeroconf zip zlib" - -OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder" -DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod - modplug mpg123 musepack flac sid vorbis wavpack wildmidi" -ENCODER_PLUGINS="audiofile flac lame twolame vorbis" - -REQUIRED_USE=" - || ( ${OUTPUT_PLUGINS} ) - || ( ${DECODER_PLUGINS} ) - network? ( || ( ${ENCODER_PLUGINS} ) ) - recorder? ( || ( ${ENCODER_PLUGINS} ) ) - upnp? ( expat ) - webdav? ( curl expat ) - " - -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-user/mpd - sys-libs/liburing:= - alsa? ( - media-libs/alsa-lib - media-sound/alsa-utils - ) - - ao? ( media-libs/libao[alsa?,pulseaudio?] ) - audiofile? ( media-libs/audiofile:= ) - - cdio? ( - dev-libs/libcdio:= - dev-libs/libcdio-paranoia - ) - - chromaprint? ( media-libs/chromaprint ) - curl? ( net-misc/curl ) - dbus? ( sys-apps/dbus ) - doc? ( dev-python/sphinx ) - expat? ( dev-libs/expat ) - faad? ( media-libs/faad2 ) - ffmpeg? ( media-video/ffmpeg:0= ) - flac? ( media-libs/flac ) - fluidsynth? ( media-sound/fluidsynth ) - gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) - icu? ( dev-libs/icu:= ) - id3tag? ( media-libs/libid3tag ) - jack? ( virtual/jack ) - lame? ( network? ( media-sound/lame ) ) - libmpdclient? ( media-libs/libmpdclient ) - libsamplerate? ( media-libs/libsamplerate ) - libsoxr? ( media-libs/soxr ) - mad? ( media-libs/libmad ) - mikmod? ( media-libs/libmikmod ) - mms? ( media-libs/libmms ) - modplug? ( media-libs/libmodplug ) - mpg123? ( media-sound/mpg123 ) - musepack? ( media-sound/musepack-tools ) - network? ( media-libs/libshout ) - nfs? ( net-fs/libnfs ) - openal? ( media-libs/openal ) - opus? ( media-libs/opus ) - pulseaudio? ( media-sound/pulseaudio ) - qobuz? ( dev-libs/libgcrypt:0 ) - samba? ( net-fs/samba ) - selinux? ( sec-policy/selinux-mpd ) - sid? ( || ( - media-libs/libsidplay:2 - media-libs/libsidplayfp - ) ) - sndfile? ( media-libs/libsndfile ) - soundcloud? ( >=dev-libs/yajl-2:= ) - sqlite? ( dev-db/sqlite:3 ) - systemd? ( sys-apps/systemd ) - tidal? ( dev-libs/yajl - net-misc/curl ) - twolame? ( media-sound/twolame ) - udisks? ( sys-fs/udisks:2 ) - upnp? ( net-libs/libupnp:0 ) - vorbis? ( media-libs/libvorbis ) - wavpack? ( media-sound/wavpack ) - wildmidi? ( media-sound/wildmidi ) - zeroconf? ( net-dns/avahi[dbus] ) - zip? ( dev-libs/zziplib ) - zlib? ( sys-libs/zlib:= )" - -DEPEND="${RDEPEND} - >=dev-libs/boost-1.58:= - test? ( dev-cpp/gtest )" - -BDEPEND=">=dev-util/meson-0.49.2 - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-0.18.conf.patch -) - -pkg_setup() { - if use eventfd; then - CONFIG_CHECK+=" ~EVENTFD" - ERROR_EVENTFD="${P} requires eventfd in-kernel support." - fi - - if use signalfd; then - CONFIG_CHECK+=" ~SIGNALFD" - ERROR_SIGNALFD="${P} requires signalfd in-kernel support." - fi - - if use inotify; then - CONFIG_CHECK+=" ~INOTIFY_USER" - ERROR_INOTIFY_USER="${P} requires inotify in-kernel support." - fi - - if use eventfd || use signalfd || use inotify; then - linux-info_pkg_setup - fi - - elog "If you will be starting mpd via /etc/init.d/mpd, please make - sure that MPD's pid_file is _set_." -} - -src_prepare() { - cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed" - default -} - -src_configure() { - local emesonargs=( - -Dbzip2=$(usex bzip2 enabled disabled) - -Dcdio_paranoia=$(usex cdio enabled disabled) - -Dchromaprint=$(usex chromaprint enabled disabled) - -Dcue=$(usex cue true false) - -Dcurl=$(usex curl enabled disabled) - -Ddbus=$(usex dbus enabled disabled) - -Deventfd=$(usex eventfd true false) - -Dexpat=$(usex expat enabled disabled) - -Dicu=$(usex icu enabled disabled) - -Did3tag=$(usex id3tag enabled disabled) - -Dinotify=$(usex inotify true false) - -Dipv6=$(usex ipv6 enabled disabled) - -Diso9660=$(usex cdio enabled disabled) - -Dlibmpdclient=$(usex libmpdclient enabled disabled) - -Dlibsamplerate=$(usex libsamplerate enabled disabled) - -Dmms=$(usex mms enabled disabled) - -Dnfs=$(usex nfs enabled disabled) - -Dsignalfd=$(usex signalfd true false) - -Dsmbclient=$(usex samba enabled disabled) - -Dsoxr=$(usex libsoxr enabled disabled) - -Dsqlite=$(usex sqlite enabled disabled) - -Dsystemd=$(usex systemd enabled disabled) - -Dtest=$(usex test true false) - -Dudisks=$(usex udisks enabled disabled) - -Dupnp=$(usex upnp enabled disabled) - -Dwebdav=$(usex webdav enabled disabled) - -Dzeroconf=$(usex zeroconf avahi disabled) - -Dzlib=$(usex zlib enabled disabled) - -Dzzip=$(usex zip enabled disabled) - ) - - emesonargs+=( - -Dalsa=$(usex alsa enabled disabled) - -Dao=$(usex ao enabled disabled) - -Dfifo=$(usex fifo true false) - -Djack=$(usex jack enabled disabled) - -Dopenal=$(usex openal enabled disabled) - -Doss=$(usex oss enabled disabled) - -Dpipe=$(usex pipe true false) - -Dpulse=$(usex pulseaudio enabled disabled) - -Drecorder=$(usex recorder true false) - ) - - if use samba || use upnp; then - emesonargs+=( -Dneighbor=true ) - fi - - append-lfs-flags - append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" - - if use network; then - - emesonargs+=( - -Dshine=disabled - -Dshout=enabled - -Dvorbisenc=$(usex vorbis enabled disabled) - -Dhttpd=true - -Dlame=$(usex lame enabled disabled) - -Dtwolame=$(usex twolame enabled disabled) - -Dwave_encoder=$(usex audiofile true false) - ) - fi - - emesonargs+=( - # media-libs/adplug is not packaged anymore - -Dadplug=disabled - -Daudiofile=$(usex audiofile enabled disabled) - -Dfaad=$(usex faad enabled disabled) - -Dffmpeg=$(usex ffmpeg enabled disabled) - -Dflac=$(usex flac enabled disabled) - -Dfluidsynth=$(usex fluidsynth enabled disabled) - -Dgme=$(usex gme enabled disabled) - -Dmad=$(usex mad enabled disabled) - -Dmikmod=$(usex mikmod enabled disabled) - -Dmodplug=$(usex modplug enabled disabled) - -Dmpcdec=$(usex musepack enabled disabled) - -Dmpg123=$(usex mpg123 enabled disabled) - -Dopus=$(usex opus enabled disabled) - -Dsidplay=$(usex sid enabled disabled) - -Dsndfile=$(usex sndfile enabled disabled) - -Dvorbis=$(usex vorbis enabled disabled) - -Dwavpack=$(usex wavpack enabled disabled) - -Dwildmidi=$(usex wildmidi enabled disabled) - - ) - - emesonargs+=( - -Dqobuz=$(usex qobuz enabled disabled) - -Dsoundcloud=$(usex soundcloud enabled disabled) - -Dtidal=$(usex tidal enabled disabled) - ) - - emesonargs+=( - --libdir="/usr/$(get_libdir)" - -Ddocumentation=$(usex doc enabled disabled) - -Dsndio=disabled #not yet in the tree - -Dsolaris_output=disabled - - -Ddatabase=true - -Ddsd=true - -Dio_uring=enabled - -Dtcp=true - - -Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)" - -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)" - ) - - if use icu; then - emesonargs+=( -Diconv=enabled ) - else - emesonargs+=( -Diconv=disabled ) - fi - - meson_src_configure -} - -src_install() { - meson_src_install - - insinto /etc - newins doc/mpdconf.dist mpd.conf - - insinto /etc/logrotate.d - newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN} - - newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN} - - if use unicode; then - sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \ - "${ED}"/etc/mpd.conf || die "sed failed" - fi - - keepdir /var/lib/mpd - keepdir /var/lib/mpd/music - keepdir /var/lib/mpd/playlists - - rm -r "${ED}"/usr/share/doc/mpd || die - -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/media-sound/mpd/mpd-0.22.2-r1.ebuild b/media-sound/mpd/mpd-0.22.2-r1.ebuild deleted file mode 100644 index 406e09d68018..000000000000 --- a/media-sound/mpd/mpd-0.22.2-r1.ebuild +++ /dev/null @@ -1,294 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic linux-info meson systemd xdg-utils - -DESCRIPTION="The Music Player Daemon (mpd)" -HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD" -SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus - +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify - +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms - modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz - recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd - test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp - zeroconf zip zlib" - -OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder" -DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod - modplug mpg123 musepack flac sid vorbis wavpack wildmidi" -ENCODER_PLUGINS="audiofile flac lame twolame vorbis" - -REQUIRED_USE=" - || ( ${OUTPUT_PLUGINS} ) - || ( ${DECODER_PLUGINS} ) - network? ( || ( ${ENCODER_PLUGINS} ) ) - recorder? ( || ( ${ENCODER_PLUGINS} ) ) - upnp? ( expat ) - webdav? ( curl expat ) - " - -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-user/mpd - sys-libs/liburing:= - alsa? ( - media-libs/alsa-lib - media-sound/alsa-utils - ) - - ao? ( media-libs/libao[alsa?,pulseaudio?] ) - audiofile? ( media-libs/audiofile:= ) - - cdio? ( - dev-libs/libcdio:= - dev-libs/libcdio-paranoia - ) - - chromaprint? ( media-libs/chromaprint ) - curl? ( net-misc/curl ) - dbus? ( sys-apps/dbus ) - doc? ( dev-python/sphinx ) - expat? ( dev-libs/expat ) - faad? ( media-libs/faad2 ) - ffmpeg? ( media-video/ffmpeg:0= ) - flac? ( media-libs/flac ) - fluidsynth? ( media-sound/fluidsynth ) - gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) - icu? ( dev-libs/icu:= ) - id3tag? ( media-libs/libid3tag ) - jack? ( virtual/jack ) - lame? ( network? ( media-sound/lame ) ) - libmpdclient? ( media-libs/libmpdclient ) - libsamplerate? ( media-libs/libsamplerate ) - libsoxr? ( media-libs/soxr ) - mad? ( media-libs/libmad ) - mikmod? ( media-libs/libmikmod ) - mms? ( media-libs/libmms ) - modplug? ( media-libs/libmodplug ) - mpg123? ( media-sound/mpg123 ) - musepack? ( media-sound/musepack-tools ) - network? ( media-libs/libshout ) - nfs? ( net-fs/libnfs ) - openal? ( media-libs/openal ) - opus? ( media-libs/opus ) - pulseaudio? ( media-sound/pulseaudio ) - qobuz? ( dev-libs/libgcrypt:0 ) - samba? ( net-fs/samba ) - selinux? ( sec-policy/selinux-mpd ) - sid? ( || ( - media-libs/libsidplay:2 - media-libs/libsidplayfp - ) ) - sndfile? ( media-libs/libsndfile ) - soundcloud? ( >=dev-libs/yajl-2:= ) - sqlite? ( dev-db/sqlite:3 ) - systemd? ( sys-apps/systemd ) - tidal? ( dev-libs/yajl - net-misc/curl ) - twolame? ( media-sound/twolame ) - udisks? ( sys-fs/udisks:2 ) - upnp? ( net-libs/libupnp:0 ) - vorbis? ( media-libs/libvorbis ) - wavpack? ( media-sound/wavpack ) - wildmidi? ( media-sound/wildmidi ) - zeroconf? ( net-dns/avahi[dbus] ) - zip? ( dev-libs/zziplib ) - zlib? ( sys-libs/zlib:= )" - -DEPEND="${RDEPEND} - >=dev-libs/boost-1.58:= - test? ( dev-cpp/gtest )" - -BDEPEND=">=dev-util/meson-0.49.2 - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-0.18.conf.patch -) - -pkg_setup() { - if use eventfd; then - CONFIG_CHECK+=" ~EVENTFD" - ERROR_EVENTFD="${P} requires eventfd in-kernel support." - fi - - if use signalfd; then - CONFIG_CHECK+=" ~SIGNALFD" - ERROR_SIGNALFD="${P} requires signalfd in-kernel support." - fi - - if use inotify; then - CONFIG_CHECK+=" ~INOTIFY_USER" - ERROR_INOTIFY_USER="${P} requires inotify in-kernel support." - fi - - if use eventfd || use signalfd || use inotify; then - linux-info_pkg_setup - fi - - elog "If you will be starting mpd via /etc/init.d/mpd, please make - sure that MPD's pid_file is _set_." -} - -src_prepare() { - cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed" - default -} - -src_configure() { - local emesonargs=( - -Dbzip2=$(usex bzip2 enabled disabled) - -Dcdio_paranoia=$(usex cdio enabled disabled) - -Dchromaprint=$(usex chromaprint enabled disabled) - -Dcue=$(usex cue true false) - -Dcurl=$(usex curl enabled disabled) - -Ddbus=$(usex dbus enabled disabled) - -Deventfd=$(usex eventfd true false) - -Dexpat=$(usex expat enabled disabled) - -Dicu=$(usex icu enabled disabled) - -Did3tag=$(usex id3tag enabled disabled) - -Dinotify=$(usex inotify true false) - -Dipv6=$(usex ipv6 enabled disabled) - -Diso9660=$(usex cdio enabled disabled) - -Dlibmpdclient=$(usex libmpdclient enabled disabled) - -Dlibsamplerate=$(usex libsamplerate enabled disabled) - -Dmms=$(usex mms enabled disabled) - -Dnfs=$(usex nfs enabled disabled) - -Dsignalfd=$(usex signalfd true false) - -Dsmbclient=$(usex samba enabled disabled) - -Dsoxr=$(usex libsoxr enabled disabled) - -Dsqlite=$(usex sqlite enabled disabled) - -Dsystemd=$(usex systemd enabled disabled) - -Dtest=$(usex test true false) - -Dudisks=$(usex udisks enabled disabled) - -Dupnp=$(usex upnp enabled disabled) - -Dwebdav=$(usex webdav enabled disabled) - -Dzeroconf=$(usex zeroconf avahi disabled) - -Dzlib=$(usex zlib enabled disabled) - -Dzzip=$(usex zip enabled disabled) - ) - - emesonargs+=( - -Dalsa=$(usex alsa enabled disabled) - -Dao=$(usex ao enabled disabled) - -Dfifo=$(usex fifo true false) - -Djack=$(usex jack enabled disabled) - -Dopenal=$(usex openal enabled disabled) - -Doss=$(usex oss enabled disabled) - -Dpipe=$(usex pipe true false) - -Dpulse=$(usex pulseaudio enabled disabled) - -Drecorder=$(usex recorder true false) - ) - - if use samba || use upnp; then - emesonargs+=( -Dneighbor=true ) - fi - - append-lfs-flags - append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" - - if use network; then - - emesonargs+=( - -Dshine=disabled - -Dshout=enabled - -Dvorbisenc=$(usex vorbis enabled disabled) - -Dhttpd=true - -Dlame=$(usex lame enabled disabled) - -Dtwolame=$(usex twolame enabled disabled) - -Dwave_encoder=$(usex audiofile true false) - ) - fi - - emesonargs+=( - # media-libs/adplug is not packaged anymore - -Dadplug=disabled - -Daudiofile=$(usex audiofile enabled disabled) - -Dfaad=$(usex faad enabled disabled) - -Dffmpeg=$(usex ffmpeg enabled disabled) - -Dflac=$(usex flac enabled disabled) - -Dfluidsynth=$(usex fluidsynth enabled disabled) - -Dgme=$(usex gme enabled disabled) - -Dmad=$(usex mad enabled disabled) - -Dmikmod=$(usex mikmod enabled disabled) - -Dmodplug=$(usex modplug enabled disabled) - -Dmpcdec=$(usex musepack enabled disabled) - -Dmpg123=$(usex mpg123 enabled disabled) - -Dopus=$(usex opus enabled disabled) - -Dsidplay=$(usex sid enabled disabled) - -Dsndfile=$(usex sndfile enabled disabled) - -Dvorbis=$(usex vorbis enabled disabled) - -Dwavpack=$(usex wavpack enabled disabled) - -Dwildmidi=$(usex wildmidi enabled disabled) - - ) - - emesonargs+=( - -Dqobuz=$(usex qobuz enabled disabled) - -Dsoundcloud=$(usex soundcloud enabled disabled) - -Dtidal=$(usex tidal enabled disabled) - ) - - emesonargs+=( - --libdir="/usr/$(get_libdir)" - -Ddocumentation=$(usex doc enabled disabled) - -Dsndio=disabled #not yet in the tree - -Dsolaris_output=disabled - - -Ddatabase=true - -Ddsd=true - -Dio_uring=enabled - -Dtcp=true - - -Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)" - -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)" - ) - - if use icu; then - emesonargs+=( -Diconv=enabled ) - else - emesonargs+=( -Diconv=disabled ) - fi - - meson_src_configure -} - -src_install() { - meson_src_install - - insinto /etc - newins doc/mpdconf.dist mpd.conf - - insinto /etc/logrotate.d - newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN} - - newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN} - - if use unicode; then - sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \ - "${ED}"/etc/mpd.conf || die "sed failed" - fi - - keepdir /var/lib/mpd - keepdir /var/lib/mpd/music - keepdir /var/lib/mpd/playlists - - rm -r "${ED}"/usr/share/doc/mpd || die - -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/media-sound/mpd/mpd-0.22.3.ebuild b/media-sound/mpd/mpd-0.22.3.ebuild index 406e09d68018..be1643796e1f 100644 --- a/media-sound/mpd/mpd-0.22.3.ebuild +++ b/media-sound/mpd/mpd-0.22.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" +KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86" IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms diff --git a/media-sound/mpg123/mpg123-1.26.3.ebuild b/media-sound/mpg123/mpg123-1.26.3.ebuild index 33bf8b8cebf9..44603fb0abd9 100644 --- a/media-sound/mpg123/mpg123-1.26.3.ebuild +++ b/media-sound/mpg123/mpg123-1.26.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse" # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs. diff --git a/media-video/gpac/gpac-1.0.1.ebuild b/media-video/gpac/gpac-1.0.1.ebuild index 27fe93c249df..c372803a25a4 100644 --- a/media-video/gpac/gpac-1.0.1.ebuild +++ b/media-video/gpac/gpac-1.0.1.ebuild @@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/gpac/gpac" else SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86" + KEYWORDS="~alpha amd64 ppc ppc64 sparc x86" fi inherit flag-o-matic toolchain-funcs ${SCM} xdg diff --git a/media-video/gxine/gxine-0.5.909-r1.ebuild b/media-video/gxine/gxine-0.5.909-r1.ebuild index 9bca261ef6a8..427a2d726424 100644 --- a/media-video/gxine/gxine-0.5.909-r1.ebuild +++ b/media-video/gxine/gxine-0.5.909-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xine/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="l10n_cs l10n_de lirc nls udev xinerama" DEPEND=" diff --git a/media-video/gxine/gxine-0.5.909.ebuild b/media-video/gxine/gxine-0.5.909.ebuild deleted file mode 100644 index 68f61c3f3116..000000000000 --- a/media-video/gxine/gxine-0.5.909.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils gnome2-utils multilib nsplugins xdg-utils - -DESCRIPTION="GTK+ Front-End for libxine" -HOMEPAGE="https://sourceforge.net/projects/xine/" -SRC_URI="mirror://sourceforge/xine/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="l10n_cs l10n_de lirc nls nsplugin udev xinerama" - -COMMON_DEPEND=">=media-libs/xine-lib-1.1.20[gtk] - x11-libs/gtk+:2 - >=dev-libs/glib-2 - >=dev-lang/spidermonkey-1.8.2.15:0 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - x11-libs/libxcb - lirc? ( app-misc/lirc ) - nls? ( virtual/libintl ) - nsplugin? ( dev-libs/nspr - x11-libs/libXaw - x11-libs/libXt ) - udev? ( dev-libs/libgudev:= ) - xinerama? ( x11-libs/libXinerama )" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" -RDEPEND="${COMMON_DEPEND}" - -src_prepare() { - # need to disable calling of xine-list when running without - # userpriv, otherwise we get sandbox violations (bug #233847) - if [[ ${EUID} == "0" ]]; then - sed -i -e 's:^XINE_LIST=.*$:XINE_LIST=:' configure.ac || die - fi - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_enable lirc) \ - --enable-watchdog \ - --with-xcb \ - $(has_version '<dev-lang/spidermonkey-1.8.5' && echo --with-spidermonkey=/usr/include/js) \ - $(use_with nsplugin browser-plugin) \ - $(use_with udev gudev) \ - --without-hal \ - --without-dbus \ - $(use_with xinerama) -} - -src_install() { - emake DESTDIR="${D}" \ - docdir=/usr/share/doc/${PF} \ - docsdir=/usr/share/doc/${PF} \ - install - - dodoc AUTHORS BUGS ChangeLog README{,_l10n} TODO - - use l10n_cs && dodoc README.cs - use l10n_de && dodoc README.de - - use nsplugin && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} diff --git a/media-video/vlc/vlc-3.0.12.1.ebuild b/media-video/vlc/vlc-3.0.12.1.ebuild index 1e009fb8113c..180285d0e078 100644 --- a/media-video/vlc/vlc-3.0.12.1.ebuild +++ b/media-video/vlc/vlc-3.0.12.1.ebuild @@ -21,7 +21,7 @@ else #else # SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" #fi - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86" fi inherit autotools flag-o-matic toolchain-funcs virtualx xdg diff --git a/net-analyzer/authforce/authforce-0.9.9-r3.ebuild b/net-analyzer/authforce/authforce-0.9.9-r3.ebuild index 8cc6d4ae0463..09cd2dec5a62 100644 --- a/net-analyzer/authforce/authforce-0.9.9-r3.ebuild +++ b/net-analyzer/authforce/authforce-0.9.9-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://www.divineinvasion.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="curl nls" RDEPEND="sys-libs/readline:0= diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest index af422ef675cd..80a8020f3451 100644 --- a/net-fs/openafs/Manifest +++ b/net-fs/openafs/Manifest @@ -1,6 +1,3 @@ -DIST openafs-1.8.6-doc.tar.bz2 3769160 BLAKE2B c5fe08fbb2cdab48dd691a7e228cc590644e05b22c87afef24a5fb35aa12e379d8d49d4b920cb84dd23b4e1f1a04512078f3018808531cdc7180778885bdc466 SHA512 7525325a5ef6e1ceada7075f489a03e1d250d3cbd8b8e83a25c8e40d506d50cbf10c2b28b682f2f9663a8cd450cb70891a04e6dbc296347945ee2454b138d971 -DIST openafs-1.8.6-src.tar.bz2 14874336 BLAKE2B a83f5bfe543b3797fa6d80ebc96cacb1a15f58cf5495d1c693593bc6d24a9f08678693080b3920a97afebe937689dd0ad08bbca95c996af0d2c83935974d3613 SHA512 0800c3825d4e0384b43cb801fc898e9255a0fa0d0baf1f231fbf383317919cc30f68526eeec803d2dc21fc7a6b55155ea4cb23197604c70e89ecf4d520b85ec1 DIST openafs-1.8.7-doc.tar.bz2 3808045 BLAKE2B 8ded75239dd59633297ee4208a0f3f018486b5b5b71fda91229583fd2d6a7743bbbeba280e61ff91d602617fc47944105b06a5c0610b0c89c808ecba38af7f9c SHA512 6d087320ab6681686b6afb78621b21eaec26b91dbd03a13df447ad9f0ce897332ac378b38bf1abc590575d82d8cb22757249e60a2407e4ad498d46c083632e0d DIST openafs-1.8.7-src.tar.bz2 15059909 BLAKE2B 89aacc48100d3eabbec45acca3911fbd823c029a30e79ad16564dcc3646b9bbadb60a528f142fc907de0d4eb2831d922d8146cdba72c02f4e8db9ab806c84d86 SHA512 12d5aa9177dde10e504f71b4b1ae19be0b0c52e8031e0f5afacce4a2c3f2321970af65591edab6145f7400f6276acd7e8624aa66e816d2394324e2ef5c403c01 -DIST openafs-patches-20200913.tar.xz 28392 BLAKE2B 5e8b8f2554453abdb0a84dd45d8e719cc60127224ee6ebeaca4fcddba3d38309d7e5070c43659d10301ab9eaf371ba7dcbcf12950166626a7d359d2a39c922c6 SHA512 ec0aa800b945de2fe70d949259c89a97660bdbfee3c3e43d886a5c2f6b7c530252a53ff8f196f6e80a9a657bb81f26a6937a1bec3fafbd2c70322b313a712820 DIST openafs-patches-20210116.tar.xz 67300 BLAKE2B aaafa197d1be1e9d89685fe5193a4682ea9e5e5c1c3227963a97ca7a98e6ab5e855ee65d615a31162559b30ae5867fde6ceeec1055af1a375e73b9fa25654de5 SHA512 06e9e1b65fceda34a197556aba1a05eabb630723fc17c5060d5e2a054e60ab8c5195d5c80eff3d3444bcdca40b7115da9143f5b8100659061446038ad4a79007 diff --git a/net-fs/openafs/openafs-1.8.6.ebuild b/net-fs/openafs/openafs-1.8.6.ebuild deleted file mode 100644 index c76c6d0c78f6..000000000000 --- a/net-fs/openafs/openafs-1.8.6.ebuild +++ /dev/null @@ -1,343 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools linux-mod flag-o-matic pam systemd tmpfiles toolchain-funcs - -MY_PV=${PV/_/} -MY_P="${PN}-${MY_PV}" -PVER=20200913 -KERNEL_LIMIT=5.10 - -DESCRIPTION="The OpenAFS distributed file system" -HOMEPAGE="https://www.openafs.org/" -# We always d/l the doc tarball as man pages are not USE=doc material -[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE="" -SRC_URI=" - https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2 - https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2 - https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz -" - -LICENSE="IBM BSD openafs-krb5-a APSL-2" -SLOT="0" -KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux" - -IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei -ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write" - -BDEPEND=" - dev-lang/perl - sys-devel/flex - virtual/yacc - apidoc? ( - app-doc/doxygen[dot] - media-gfx/graphviz - ) - doc? ( - dev-libs/libxslt - || ( - dev-java/fop - app-text/dblatex - app-text/docbook-sgml-utils[jadetex] - ) - ) - perl? ( dev-lang/swig )" -DEPEND=" - !net-fs/openafs-kernel - virtual/libintl - amd64? ( tsm? ( app-backup/tsm ) ) - doc? ( - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.3 - ) - fuse? ( sys-fs/fuse:0= ) - kauth? ( sys-libs/pam ) - kerberos? ( virtual/krb5 ) - ncurses? ( sys-libs/ncurses:0= )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${WORKDIR}/gentoo/patches" ) - -CONFIG_CHECK="~!AFS_FS KEYS" -ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support. Make sure not to load both at the same time!" -ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled" -MODULES_OPTIONAL_USE="modules" - -QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko" -QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko" - -pkg_pretend() { - if use modules && use kernel_linux && kernel_is -ge ${KERNEL_LIMIT/\./ } ; then - ewarn "Gentoo supports kernels which are supported by OpenAFS" - ewarn "which are limited to the kernel versions: < ${KERNEL_LIMIT}" - ewarn "" - ewarn "You are free to utilize epatch_user to provide whatever" - ewarn "support you feel is appropriate, but will not receive" - ewarn "support as a result of those changes." - ewarn "" - ewarn "Please do not file a bug report about this." - ewarn "" - ewarn "Alternatively, you may:" - ewarn "1. Use OpenAFS FUSE client, build OpenAFS with USE=fuse to enable it." - ewarn "2. Use native kernel AFS client: configure your kernel with CONFIG_AFS_FS." - ewarn "net-fs/openafs is not required in this case, but client's functionality will be limited." - fi -} - -pkg_setup() { - use kernel_linux && linux-mod_pkg_setup -} - -src_prepare() { - default - - # fixing 2-nd level makefiles to honor flags - sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \ - src/*/Makefile.in || die '*/Makefile.in sed failed' - # fix xml docs to use local dtd files - sed -i 's|http://www.oasis-open.org/docbook/xml/4.3|/usr/share/sgml/docbook/xml-dtd-4.3|' \ - doc/xml/*/*000.xml || die - - # packaging is f-ed up, so we can't run eautoreconf - # run autotools commands based on what is listed in regen.sh - eaclocal -I src/cf -I src/external/rra-c-util/m4 - eautoconf - eautoconf -o configure-libafs configure-libafs.ac - eautoheader - einfo "Deleting autom4te.cache directory" - rm -rf autom4te.cache || die -} - -src_configure() { - local -a myconf - - if use debug; then - use kauth && myconf+=( --enable-debug-pam ) - use modules && myconf+=( --enable-debug-kernel ) - fi - - if use modules; then - if use kernel_linux; then - if kernel_is -ge 3 17 && kernel_is -le 3 17 2; then - myconf+=( --enable-linux-d_splice_alias-extra-iput ) - fi - myconf+=( --with-linux-kernel-headers="${KV_DIR}" \ - --with-linux-kernel-build="${KV_OUT_DIR}" ) - elif use kernel_FreeBSD; then - myconf+=( --with-bsd-kernel-build="${BSD_BUILD_DIR}" ) - fi - fi - - use amd64 && use tsm && myconf+=( --enable-tivoli-tsm ) - - local ARCH="$(tc-arch-kernel)" - local MY_ARCH="$(tc-arch)" - local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC" - - AFS_SYSKVERS=26 \ - econf \ - --disable-strip-binaries \ - $(use_enable bitmap-later) \ - $(use_enable debug) \ - $(use_enable debug debug-locks) \ - $(use_enable debug debug-lwp) \ - $(use_enable fuse fuse-client) \ - $(use_enable kauth) \ - $(use_enable modules kernel-module) \ - $(use_enable namei namei-fileserver) \ - $(use_enable ncurses gtx) \ - $(use_enable pthreaded-ubik) \ - $(use_enable supergroups) \ - $(use_enable ubik-read-while-write) \ - $(use_with apidoc dot) \ - $(use_with doc docbook-stylesheets /usr/share/sgml/docbook/xsl-stylesheets) \ - $(use_with kerberos krb5) \ - $(use_with kerberos gssapi) \ - $(use_with perl swig) \ - "${myconf[@]}" -} - -src_compile() { - ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 - local d - if use doc; then - emake -C doc/xml/AdminGuide auagd000.pdf - emake -C doc/xml/AdminRef auarf000.pdf - emake -C doc/xml/QuickStartUnix auqbg000.pdf - emake -C doc/xml/UserGuide auusg000.pdf - fi - use apidoc && doxygen doc/doxygen/Doxyfile -} - -src_install() { - local OPENRCDIR="${WORKDIR}/gentoo/openrc" - local SYSTEMDDIR="${WORKDIR}/gentoo/systemd" - - emake DESTDIR="${ED}" install_nolibafs - - if use modules; then - if use kernel_linux; then - local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*) - [[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module" - - MODULE_NAMES="libafs(fs/openafs:${srcdir})" - - linux-mod_src_install - elif use kernel_FreeBSD; then - insinto /boot/modules - doins "${S}"/src/libafs/MODLOAD/libafs.ko - fi - fi - - insinto /etc/openafs - doins src/afsd/CellServDB - echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo - echo "openafs.org" > "${ED}"/etc/openafs/ThisCell - - # pam_afs and pam_afs.krb have been installed in irregular locations, fix - if use kauth; then - dopammod "${ED}"/usr/$(get_libdir)/pam_afs* - fi - rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die - - # remove kdump stuff provided by kexec-tools #222455 - rm -rf "${ED}"/usr/sbin/kdump* || die - - # avoid collision with mit_krb5's version of kpasswd - if use kauth; then - mv "${ED}"/usr/bin/kpasswd{,_afs} || die - mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die - fi - - # avoid collision with heimdal's pagsh - if has_version app-crypt/heimdal; then - mv "${ED}"/usr/bin/pagsh{,_afs} || die - mv "${ED}"/usr/share/man/man1/pagsh{,_afs}.1 || die - fi - - # move lwp stuff around #200674 #330061 - mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die - mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die - # update paths to the relocated lwp headers - sed -ri \ - -e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \ - "${ED}"/usr/include/*.h \ - "${ED}"/usr/include/*/*.h \ - || die - - # minimal documentation - use kauth && doman src/pam/pam_afs.5 - DOCS=( "${WORKDIR}/gentoo/README.Gentoo" - src/afsd/CellServDB NEWS README ) - - # documentation package - rm -rf doc/txt/winnotes || die # unneeded docs - if use doc; then - DOCS+=( doc/{pdf,protocol,txt} CODING CONTRIBUTING ) - newdoc doc/xml/AdminGuide/auagd000.pdf AdminGuide.pdf - newdoc doc/xml/AdminRef/auarf000.pdf AdminRef.pdf - newdoc doc/xml/QuickStartUnix/auqbg000.pdf QuickStartUnix.pdf - newdoc doc/xml/UserGuide/auusg000.pdf UserGuide.pdf - fi - use apidoc && DOCS+=( doc/doxygen/output/html ) - einstalldocs - - # Gentoo related scripts - newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client - newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client - newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server - newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server - dotmpfiles "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf - systemd_dounit "${SYSTEMDDIR}"/openafs-client.service - systemd_dounit "${SYSTEMDDIR}"/openafs-server.service - systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf - systemd_install_serviced "${SYSTEMDDIR}"/openafs-server.service.conf - - # used directories: client - keepdir /etc/openafs - - # used directories: server - keepdir /etc/openafs/server - diropts -m0700 - keepdir /var/lib/openafs - keepdir /var/lib/openafs/db - diropts -m0755 - keepdir /var/lib/openafs/logs - - # link logfiles to /var/log - dosym ../lib/openafs/logs /var/log/openafs -} - -pkg_preinst() { - ## Somewhat intelligently install default configuration files - ## (when they are not present) - local x - for x in cacheinfo CellServDB ThisCell ; do - if [ -e "${EROOT}"/etc/openafs/${x} ] ; then - cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/ - fi - done -} - -pkg_postinst() { - if use modules; then - # Update linker.hints file - use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules" - use kernel_linux && linux-mod_pkg_postinst - fi - - tmpfiles_process openafs-client.conf - - elog "This installation should work out of the box (at least the" - elog "client part doing global afs-cell browsing, unless you had" - elog "a previous and different configuration). If you want to" - elog "set up your own cell or modify the standard config," - elog "please have a look at the Gentoo OpenAFS documentation" - elog "(warning: it is not yet up to date wrt the new file locations)" - elog - elog "The documentation can be found at:" - elog " https://wiki.gentoo.org/wiki/OpenAFS" - elog - elog "Systemd users should run emerge --config ${CATEGORY}/${PN} before" - elog "first use and whenever ${EROOT}/etc/openafs/cacheinfo is edited." -} - -pkg_postrm() { - if use modules; then - # Update linker.hints file - use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules" - use kernel_linux && linux-mod_pkg_postrm - fi -} - -pkg_config() { - elog "Setting cache options for systemd." - - SERVICED_FILE="${EROOT}"/etc/systemd/system/openafs-client.service.d/00gentoo.conf - [ ! -e "${SERVICED_FILE}" ] && die "Systemd service.d file ${SERVICED_FILE} not found." - - CACHESIZE=$(cut -d ':' -f 3 "${EROOT}"/etc/openafs/cacheinfo) - [ -z ${CACHESIZE} ] && die "Failed to parse ${EROOT}/etc/openafs/cacheinfo." - - if [ ${CACHESIZE} -lt 131070 ]; then - AFSD_CACHE_ARGS="-stat 300 -dcache 100 -daemons 2 -volumes 50" - elif [ ${CACHESIZE} -lt 524288 ]; then - AFSD_CACHE_ARGS="-stat 2000 -dcache 800 -daemons 3 -volumes 70" - elif [ ${CACHESIZE} -lt 1048576 ]; then - AFSD_CACHE_ARGS="-stat 2800 -dcache 2400 -daemons 5 -volumes 128" - elif [ ${CACHESIZE} -lt 2209715 ]; then - AFSD_CACHE_ARGS="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000" - else - AFSD_CACHE_ARGS="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000" - fi - - # Replace existing env var if exists, else append line - grep -q "^Environment=\"AFSD_CACHE_ARGS=" "${SERVICED_FILE}" && \ - sed -i "s/^Environment=\"AFSD_CACHE_ARGS=.*/Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"/" "${SERVICED_FILE}" || \ - sed -i "$ a\Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"" "${SERVICED_FILE}" || \ - die "Updating ${SERVICED_FILE} failed." -} diff --git a/net-fs/openafs/openafs-1.8.7.ebuild b/net-fs/openafs/openafs-1.8.7.ebuild index d7b1f8f077db..48bb3d12f899 100644 --- a/net-fs/openafs/openafs-1.8.7.ebuild +++ b/net-fs/openafs/openafs-1.8.7.ebuild @@ -22,7 +22,7 @@ SRC_URI=" LICENSE="IBM BSD openafs-krb5-a APSL-2" SLOT="0" -KEYWORDS="~amd64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write" diff --git a/net-libs/libisds/Manifest b/net-libs/libisds/Manifest index 12b9bb9ee5b0..3314dc794a8b 100644 --- a/net-libs/libisds/Manifest +++ b/net-libs/libisds/Manifest @@ -1,2 +1 @@ -DIST libisds-0.10.8.tar.xz 726040 BLAKE2B e3509202cb95e6e2bd0a6e7592c3d1d649ecb47806823265e5e12fa3a79a5daff9d249b2f0642d13aaebf1c64243690d06c9387fcb3a166f4b989c19f337c059 SHA512 648ba30c3156ece329d663d0d6e649319d8d104de97ca1946d94c24205c44189be08cb0c573df1f5a889fba487f2d088ac472c3f922a1920e172dda0c592b41e DIST libisds-0.11.1.tar.xz 741992 BLAKE2B e1895450b1148c63a365a569fcdfa0d3cf3f2cdd011da6dbe92ea876aa1a9082470f3c7efc5757766df7e870559dd4ba62b59973e22d47401ef575e0fd412ec1 SHA512 8baf126ebf49c5eae6aa7b8f872ad90882a9a5088c8a33ffb415983eaf1ffc1df489f44ae6ba14a69a94bc4f79f455c7937276885afaa29e61c5c67408f7080a diff --git a/net-libs/libisds/libisds-0.10.8.ebuild b/net-libs/libisds/libisds-0.10.8.ebuild deleted file mode 100644 index fde0eecc3be8..000000000000 --- a/net-libs/libisds/libisds-0.10.8.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Client library for accessing ISDS Soap services" -HOMEPAGE="https://xpisar.wz.cz/libisds/" -SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz" -KEYWORDS="amd64 ~mips x86" - -LICENSE="LGPL-3" -SLOT="0" -IUSE="+curl debug nls openssl static-libs test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dev-libs/expat - dev-libs/libxml2 - curl? ( net-misc/curl[ssl] ) - openssl? ( dev-libs/openssl:= ) - !openssl? ( - app-crypt/gpgme - dev-libs/libgcrypt:= - ) -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( >=net-libs/gnutls-2.12.0 ) -" -RDEPEND="${COMMON_DEPEND} - !openssl? ( >=app-crypt/gnupg-2 ) -" - -DOCS=( NEWS README AUTHORS ChangeLog ) - -src_configure() { - local myeconfargs=( - --disable-fatalwarnings - $(use_with curl libcurl) - $(use_enable curl curlreauthorizationbug) - $(use_enable debug) - $(use_enable nls) - $(use_enable openssl openssl-backend) - $(use_enable static-libs static) - $(use_enable test) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - find "${ED}/" \( -name "*.a" -o -name "*.la" \) -delete || die -} diff --git a/net-libs/libisds/libisds-0.11.1.ebuild b/net-libs/libisds/libisds-0.11.1.ebuild index df1d8c3f3084..f4e7a1711524 100644 --- a/net-libs/libisds/libisds-0.11.1.ebuild +++ b/net-libs/libisds/libisds-0.11.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 DESCRIPTION="Client library for accessing ISDS Soap services" HOMEPAGE="https://xpisar.wz.cz/libisds/" SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz" -KEYWORDS="~amd64 ~mips ~x86" +KEYWORDS="amd64 ~mips x86" LICENSE="LGPL-3" SLOT="0" diff --git a/net-libs/neon/neon-0.31.2.ebuild b/net-libs/neon/neon-0.31.2.ebuild index d96a5ee04c60..f4bdd2f905db 100644 --- a/net-libs/neon/neon-0.31.2.ebuild +++ b/net-libs/neon/neon-0.31.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://notroj.github.io/neon/${P}.tar.gz" LICENSE="GPL-2" SLOT="0/27" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib" RESTRICT="test" diff --git a/net-libs/srt/srt-1.4.2.ebuild b/net-libs/srt/srt-1.4.2.ebuild index cad2371d541f..0fa8b5336b23 100644 --- a/net-libs/srt/srt-1.4.2.ebuild +++ b/net-libs/srt/srt-1.4.2.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~ppc-macos ~x64-macos" fi LICENSE="MPL-2.0" diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.2.2.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.2.2.ebuild index 6d5b5f6fa41a..7335166489fa 100644 --- a/net-mail/ezmlm-idx/ezmlm-idx-7.2.2.ebuild +++ b/net-mail/ezmlm-idx/ezmlm-idx-7.2.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://untroubled.org/ezmlm/archive/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~hppa ~mips ppc sparc x86" IUSE="mysql postgres sqlite" DEPEND="mysql? ( dev-db/mysql-connector-c:0= ) diff --git a/net-mail/isync/isync-1.3.3.ebuild b/net-mail/isync/isync-1.3.3.ebuild index 2eca392e7b2a..5fb6331653c5 100644 --- a/net-mail/isync/isync-1.3.3.ebuild +++ b/net-mail/isync/isync-1.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 autotools else SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" fi IUSE="libressl sasl ssl zlib" diff --git a/net-misc/nx/nx-3.5.99.25.ebuild b/net-misc/nx/nx-3.5.99.25.ebuild index 2da4b0963c23..d3b7370a9078 100644 --- a/net-misc/nx/nx-3.5.99.25.ebuild +++ b/net-misc/nx/nx-3.5.99.25.ebuild @@ -113,8 +113,9 @@ src_compile() { emake -C nx-X11 BuildDependsOnly # Parallel make issue resurfaced, upstream working on autotools switch emake -j1 -C nx-X11 World \ - USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \ - SHLIBDIR="/usr/$(get_libdir)" + USRLIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/X11" \ + SHLIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + ETCDIR_NX="${EPREFIX}/etc/nxagent" emake -C nxproxy } @@ -122,10 +123,11 @@ src_compile() { src_install() { emake \ DESTDIR="${D}" \ - PREFIX="/usr" \ - NXLIBDIR="/usr/$(get_libdir)/${PN}" \ - SHLIBDIR="/usr/$(get_libdir)" \ - USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \ + PREFIX="${EPREFIX}/usr" \ + NXLIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" \ + SHLIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + USRLIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/X11" \ + ETCDIR_NX="${EPREFIX}/etc/nxagent" \ install # Already provided by mesa & related packages diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest index e7c7ffe25084..2e1c6203b23c 100644 --- a/net-wireless/dump1090/Manifest +++ b/net-wireless/dump1090/Manifest @@ -1,2 +1 @@ -DIST dump1090-3.7.2.tar.gz 5657288 BLAKE2B 267374ec034ba5bb03989d04001f1ca82cfb5f2cb77af06d85c1d5f4446955ef84bdf60162c0c74e702266f8051a22fe15723dae9b26323c3f5cf03bf48342b7 SHA512 8958bc711b44c8c9f26242bdd4005a422498e023632bbb87f8e93de30b6fa20b6c6ab3208e7548a960c8c127e948d1bdf5e9d5ceaf84127ce9e686c6fad6cc1b DIST dump1090-4.0.tar.gz 6663754 BLAKE2B bf0a6c8dfd8b2da5ed0e7ae5f7b862c57a54e5d48bc24b29e42ebffec4e0606604fbe4b8502e85df60a3a618568bf9e2eba88e5ad2fdec7fb93043b823435362 SHA512 97dc872e4d0ac8df2f46e17b590e970a62a78baf81e18a9beeb23d37a4401a2e52591ca96cc01e1465b22aa234cf9e88f84a7b0f27d0144b3afeac62f6252c95 diff --git a/net-wireless/dump1090/dump1090-3.7.2.ebuild b/net-wireless/dump1090/dump1090-3.7.2.ebuild deleted file mode 100644 index 742de05fd100..000000000000 --- a/net-wireless/dump1090/dump1090-3.7.2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs eutils - -DESCRIPTION="simple Mode S decoder for RTLSDR devices" -#Original repo -#HOMEPAGE="https://github.com/antirez/dump1090" -#Repo that has actually been touched recenly -#HOMEPAGE="https://github.com/mutability/dump1090" -#And now we move to the next one in line -HOMEPAGE="https://github.com/flightaware/dump1090" - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/flightaware/${PN}.git" -else - KEYWORDS="amd64 x86" - #COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9" - #SRC_URI="https://github.com/flightaware/dump1090/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - #S="${WORKDIR}/${PN}-${COMMIT}" - SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="bladerf +rtlsdr" - -RDEPEND="bladerf? ( net-wireless/bladerf:= ) - rtlsdr? ( net-wireless/rtl-sdr:= ) - sys-libs/ncurses:= - virtual/libusb:1" -DEPEND="${RDEPEND}" - -src_prepare() { - default - sed -i 's#-O2 -g -Wall -Werror -W##' Makefile - sed -i "s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile -} - -src_compile() { - emake CC="$(tc-getCC)" \ - BLADERF=$(usex bladerf) \ - RTLSDR=$(usex rtlsdr) -} - -src_install() { - dobin ${PN} - dobin view1090 - dodoc README.md - - insinto /usr/share/${PN}/html - doins -r public_html/* - - insinto /usr/share/${PN}/tools - doins -r tools/* - - insinto /usr/share/${PN} - newins debian/lighttpd/89-dump1090-fa.conf lighttpd.conf -} diff --git a/net-wireless/dump1090/dump1090-4.0.ebuild b/net-wireless/dump1090/dump1090-4.0.ebuild index 41fb0b180e68..006faa02a61b 100644 --- a/net-wireless/dump1090/dump1090-4.0.ebuild +++ b/net-wireless/dump1090/dump1090-4.0.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/flightaware/${PN}.git" else - KEYWORDS="amd64 ~x86" + KEYWORDS="amd64 x86" SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz" fi diff --git a/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild b/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild deleted file mode 100644 index d55b5a6b4038..000000000000 --- a/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="MTK GPS Datalogger Device Control" -HOMEPAGE="https://www.bt747.org" -SRC_URI="mirror://sourceforge/${PN}/Stable/BT747_${PV}_full.zip - https://www.bt747.org/icon/bt747_128x128.gif -> ${PN}.gif" - -LICENSE="GPL-3" -SLOT="1" -KEYWORDS="~amd64 ~x86" - -CDEPEND=" - dev-java/commons-imaging:0 - dev-java/jcalendar:1.2 - dev-java/jchart2d:0 - dev-java/jopt-simple:0 - >=dev-java/rxtx-2.2_pre2:2 - dev-java/swing-layout:1 - dev-java/swingx:1.6 - dev-java/swingx-ws:bt747 -" - -RDEPEND=" - ${CDEPEND} - dev-libs/glib:2[dbus] - >=virtual/jre-1.7 -" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.7 - app-arch/unzip -" - -EANT_BUILD_TARGET="dist.j2se" -EANT_EXTRA_ARGS="-Dskip.proguard=yes -Dsvn=true -Dsvnversion=true -Dbuild.current.revision=Gentoo" -EANT_GENTOO_CLASSPATH="commons-imaging,jcalendar-1.2,jchart2d,jopt-simple-4.4,rxtx-2,swing-layout-1,swingx-1.6,swingx-ws-bt747" -JAVA_ANT_REWRITE_CLASSPATH="yes" - -S="${WORKDIR}" - -java_prepare() { - # Fix for newer jchart2d. - epatch "${FILESDIR}/jchart2d-3.2.patch" - - # Remove all the bundled stuff. - rm -rv dist/ lib/ || die - - # GraphicsUtilities moved in later SwingX versions. - sed -i "s:org\.jdesktop\.swingx\.graphics\.GraphicsUtilities:org.jdesktop.swingx.util.GraphicsUtilities:g" \ - src_j2se/net/sf/bt747/j2se/app/list/FileListCellRenderer.java || die - - eapply_user -} - -src_install() { - dodoc {ChangeLog,README}.txt - - java-pkg_dojar dist/*.jar - java-pkg_dolauncher ${PN} --main bt747.j2se_view.BT747Main \ - --java-args="-Xmx192m" - - doicon "${DISTDIR}/${PN}.gif" - make_desktop_entry ${PN} BT747 bt747.gif -} diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest index 1cb9a387269e..beba90be404a 100644 --- a/sci-geosciences/gpxsee/Manifest +++ b/sci-geosciences/gpxsee/Manifest @@ -1,6 +1,2 @@ DIST gpxsee-7.29.tar.gz 5363181 BLAKE2B 4d3a5693a7b5939847c2dc32bff205649264766975c6313220e305770e40602f40e03c74db22e043860f1a2953a43e7ec0a58624f4882de93f3320a32dc6292e SHA512 e4133ad7a9b5e25f3c0bdd2397e02b6219e81f8632385e6423244e7c400ff72a5be85720f1ec123428ae3aeca79cac81e03b7f40de83d309e55ee69ee7cc933f -DIST gpxsee-7.35.tar.gz 5403169 BLAKE2B 901c77aa0fd0a54976a8d88daa98acc0125dacae7b9e45455ed79f2c633f33a6311dd3c9a388eae1350dac82ac1e02b811680b15f161cb8a523878698d993aae SHA512 d3346e2ed8593d5b57c2484a2153c9900289380a79799dbbe587879c9fc0b3e95d21f14d178e7e2a4b586062cc22c4ba1d90b3e66e73f0c334360f3b04625f8e -DIST gpxsee-7.36.tar.gz 5404628 BLAKE2B 252acab21aed260eb6f01b9ee38f3c7a88067953b9e481cf2c6e77fcfd52c14fb995c69330dd381fbb3d2b9f7ea5bd345f6d2d3ae8b5be0f6b020680ef9e5f21 SHA512 8a0c718e80544506a6e393fd9b95a2d29092332d8c9fe141351cc1e3553759c909aaac12953a0206dca47f855b8516ecdaacaee577b1ce3dd0e75be2595e4062 -DIST gpxsee-7.37.tar.gz 5406206 BLAKE2B eecc311a89ee94aa1e52cb742802ee78634199d13173106938b559f787029df2496a60642c08109928051cd0d478b794f8ca0db050fe4406b2aca51c290d317e SHA512 891689e78a7cb3ece63d28cc892cadd483770ab88add241021bcee70a6acb744410a9b412e0f2286e63552eadf6398671c25a594ef02b0a09d8ecf89fa9ca278 -DIST gpxsee-7.38.tar.gz 7700995 BLAKE2B 6b2f47bf79501509cdd67ccb5387134fd04b916913cb34eeac54c0c6a60b45ebee534b94771f38c13ad29062b9917acccc412bdcee82e7348ff85368e77ef89f SHA512 9887e9be559eac8c19c4901751f2403b8824aae89c5a159f581f14e4b72154f91e9761eae871cce8b794eb193b2b744b77e6e7b5968bb4a8f9d505220de20cc9 DIST gpxsee-8.1.tar.gz 7715535 BLAKE2B f71c3e4212747f3084e2a9ed102fcd4b7c701292cfb933b01cfd1965ac41b3d09f1c67c291ca9eac8cdf66fb4c150937fdc1ccb7369d63e65c30155016fe915f SHA512 beb6a5bdae1e20cac3b5a29a398b5e2742ec28b8f2f1239c027d3470a11c354991465895ab81caa1f7c31dbc77f391aef978a1c746efd35214989505980f4654 diff --git a/sci-geosciences/gpxsee/gpxsee-7.35.ebuild b/sci-geosciences/gpxsee/gpxsee-7.35.ebuild deleted file mode 100644 index d9d146091a25..000000000000 --- a/sci-geosciences/gpxsee/gpxsee-7.35.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PLOCALES="cs da de en es fi fr hu it nb pl pt_BR ru sv tr uk" -inherit desktop qmake-utils l10n xdg - -MY_PN="GPXSee" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" -HOMEPAGE="https://www.gpxsee.org/" -SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="dev-qt/qtwidgets:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5" -DEPEND="${RDEPEND}" -BDEPEND="dev-qt/linguist-tools:5" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}"/${PN}-7.33.patch ) - -src_prepare() { - default - - l10n_find_plocales_changes lang "${PN}_" '.ts' - - rm_ts() { - sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro - } - - l10n_for_each_disabled_locale_do rm_ts -} - -src_compile() { - lrelease gpxsee.pro - eqmake5 gpxsee.pro - emake -} - -src_install() { - emake INSTALL_ROOT="${D}" install - dodoc README.md -} diff --git a/sci-geosciences/gpxsee/gpxsee-7.36.ebuild b/sci-geosciences/gpxsee/gpxsee-7.36.ebuild deleted file mode 100644 index d9d146091a25..000000000000 --- a/sci-geosciences/gpxsee/gpxsee-7.36.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PLOCALES="cs da de en es fi fr hu it nb pl pt_BR ru sv tr uk" -inherit desktop qmake-utils l10n xdg - -MY_PN="GPXSee" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" -HOMEPAGE="https://www.gpxsee.org/" -SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="dev-qt/qtwidgets:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5" -DEPEND="${RDEPEND}" -BDEPEND="dev-qt/linguist-tools:5" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}"/${PN}-7.33.patch ) - -src_prepare() { - default - - l10n_find_plocales_changes lang "${PN}_" '.ts' - - rm_ts() { - sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro - } - - l10n_for_each_disabled_locale_do rm_ts -} - -src_compile() { - lrelease gpxsee.pro - eqmake5 gpxsee.pro - emake -} - -src_install() { - emake INSTALL_ROOT="${D}" install - dodoc README.md -} diff --git a/sci-geosciences/gpxsee/gpxsee-7.37.ebuild b/sci-geosciences/gpxsee/gpxsee-7.37.ebuild deleted file mode 100644 index d9d146091a25..000000000000 --- a/sci-geosciences/gpxsee/gpxsee-7.37.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PLOCALES="cs da de en es fi fr hu it nb pl pt_BR ru sv tr uk" -inherit desktop qmake-utils l10n xdg - -MY_PN="GPXSee" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" -HOMEPAGE="https://www.gpxsee.org/" -SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="dev-qt/qtwidgets:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5" -DEPEND="${RDEPEND}" -BDEPEND="dev-qt/linguist-tools:5" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}"/${PN}-7.33.patch ) - -src_prepare() { - default - - l10n_find_plocales_changes lang "${PN}_" '.ts' - - rm_ts() { - sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro - } - - l10n_for_each_disabled_locale_do rm_ts -} - -src_compile() { - lrelease gpxsee.pro - eqmake5 gpxsee.pro - emake -} - -src_install() { - emake INSTALL_ROOT="${D}" install - dodoc README.md -} diff --git a/sci-geosciences/gpxsee/gpxsee-7.38.ebuild b/sci-geosciences/gpxsee/gpxsee-7.38.ebuild deleted file mode 100644 index d9d146091a25..000000000000 --- a/sci-geosciences/gpxsee/gpxsee-7.38.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PLOCALES="cs da de en es fi fr hu it nb pl pt_BR ru sv tr uk" -inherit desktop qmake-utils l10n xdg - -MY_PN="GPXSee" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" -HOMEPAGE="https://www.gpxsee.org/" -SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="dev-qt/qtwidgets:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5" -DEPEND="${RDEPEND}" -BDEPEND="dev-qt/linguist-tools:5" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}"/${PN}-7.33.patch ) - -src_prepare() { - default - - l10n_find_plocales_changes lang "${PN}_" '.ts' - - rm_ts() { - sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro - } - - l10n_for_each_disabled_locale_do rm_ts -} - -src_compile() { - lrelease gpxsee.pro - eqmake5 gpxsee.pro - emake -} - -src_install() { - emake INSTALL_ROOT="${D}" install - dodoc README.md -} diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index 93cc6b1b6941..ace40911202a 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1,2 +1 @@ -DIST grass-7.8.3.tar.gz 60292787 BLAKE2B e62fdeb5fa8cc64e59eff1a5cb33dbede7a62a30ed6ef08ced5d11e452e7b0109889105ae88ea28fb667b54fceca69729771eca6acf3e8d281487b1e53b1a3aa SHA512 4fa31b869771737b6d11090acfc54dd155c9ac6a259611774a75a74b8ebb59c640dc3417ff8027d91bf3444427525f9c35f32e317677b05809ab3d7aeb03dc84 DIST grass-7.8.4.tar.gz 61791074 BLAKE2B 9234ff11c9f780c350d26c94b92b1dd87e00b84cee857fd6c8d0abb4f5977871c936dbf6818f7ba174aff0b846b9a27417de4ea1edbd6f2a0b0ba65efe8a842a SHA512 0a5889c2d054c3f29ba53b8a2d2bd783e077d9b1ad7035ca4e0152258cd4ff165641dca2c696ca03ddb466ad80c1c7c7f9aee535c1fbd82a75c30d7b0a98cdb1 diff --git a/sci-geosciences/grass/grass-7.8.3.ebuild b/sci-geosciences/grass/grass-7.8.3.ebuild deleted file mode 100644 index db440721de0d..000000000000 --- a/sci-geosciences/grass/grass-7.8.3.ebuild +++ /dev/null @@ -1,273 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -PYTHON_REQ_USE="sqlite" # bug 572440 -WANT_AUTOCONF="2.1" -WX_GTK_VER=3.0 - -inherit autotools desktop flag-o-matic python-single-r1 toolchain-funcs wxwidgets xdg - -MY_PM=${PN}$(ver_cut 1-2 ${PV}) -MY_PM=${MY_PM/.} -MY_P=${P/_rc/RC} - -DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" -HOMEPAGE="https://grass.osgeo.org/" -SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/7.8.0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - opengl? ( X )" - -RDEPEND=" - ${PYTHON_DEPS} - >=app-admin/eselect-1.2 - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ') - sci-libs/gdal - sys-libs/gdbm - sys-libs/ncurses:0= - sci-libs/proj - sci-libs/xdrfile - sys-libs/zlib - blas? ( - virtual/cblas[eselect-ldso(+)] - virtual/blas[eselect-ldso(+)] - ) - fftw? ( sci-libs/fftw:3.0= ) - geos? ( sci-libs/geos ) - lapack? ( virtual/lapack[eselect-ldso(+)] ) - liblas? ( sci-geosciences/liblas ) - mysql? ( dev-db/mysql-connector-c:= ) - netcdf? ( sci-libs/netcdf ) - odbc? ( dev-db/unixODBC ) - opencl? ( virtual/opencl ) - opengl? ( virtual/opengl ) - png? ( media-libs/libpng:0= ) - postgres? ( >=dev-db/postgresql-8.4:= ) - readline? ( sys-libs/readline:0= ) - sqlite? ( dev-db/sqlite:3 ) - tiff? ( media-libs/tiff:0= ) - truetype? ( media-libs/freetype:2 ) - X? ( - dev-python/wxpython:4.0 - x11-libs/cairo[X,opengl?] - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXt - ) - zstd? ( app-arch/zstd )" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" -BDEPEND=" - sys-devel/bison - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - X? ( dev-lang/swig )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - # bug 746590 - "${FILESDIR}/${PN}-7.8-flock.patch" -) - -pkg_setup() { - if use lapack; then - local mylapack=$(eselect lapack show) - if [[ -z "${mylapack/.*reference.*/}" ]] && \ - [[ -z "${mylapack/.*atlas.*/}" ]]; then - ewarn "You need to set lapack to atlas or reference. Do:" - ewarn " eselect lapack set <impl>" - ewarn "where <impl> is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - if use blas; then - local myblas=$(eselect blas show) - if [[ -z "${myblas/.*reference.*/}" ]] && \ - [[ -z "${myblas/.*atlas.*/}" ]]; then - ewarn "You need to set blas to atlas or reference. Do:" - ewarn " eselect blas set <impl>" - ewarn "where <impl> is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - python-single-r1_pkg_setup -} - -src_prepare() { - # Fix unversioned python calls - sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die - sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die - - default - eautoreconf - - ebegin "Fixing python shebangs" - python_fix_shebang -q "${S}" - eend $? - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl - - eapply_user -} - -src_configure() { - if use X; then - local WX_BUILD=yes - setup-wxwidgets - fi - - addwrite /dev/dri/renderD128 - - local myeconfargs=( - --enable-shared - --disable-w11 - --without-opendwg - --with-regex - --with-gdal="${EPREFIX}"/usr/bin/gdal-config - --with-proj-includes="${EPREFIX}"/usr/include/proj - --with-proj-libs="${EPREFIX}"/usr/$(get_libdir) - --with-proj-share="${EPREFIX}"/usr/share/proj/ - $(use_with cxx) - $(use_with tiff) - $(use_with png) - $(use_with postgres) - $(use_with mysql) - $(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql) - $(use_with sqlite) - $(use_with opengl) - $(use_with odbc) - $(use_with fftw) - $(use_with blas) - $(use_with lapack) - $(use_with X cairo) - $(use_with truetype freetype) - $(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2) - $(use_with nls) - $(use_with readline) - $(use_with threads pthread) - $(use_with openmp) - $(use_with opencl) - $(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config) - $(use_with X wxwidgets "${WX_CONFIG}") - $(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config) - $(use_with geos geos "${EPREFIX}"/usr/bin/geos-config) - $(use_with X x) - $(use_with zstd) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - # we don't want to link against embedded mysql lib - emake CC="$(tc-getCC)" MYSQLDLIB="" -} - -src_install() { - emake DESTDIR="${ED}" \ - INST_DIR="${ED}"/usr/$(get_libdir)/${MY_PM} \ - prefix="${ED}"/usr/ BINDIR="${ED}"/usr/bin \ - PREFIX="${ED}"/usr/ \ - install - - pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die - - local HTML_DOCS=( docs/html/. ) - einstalldocs - - # manuals - dodir /usr/share/man/man1 - rm -rf man/ || die - - # translations - if use nls; then - insinto /usr/share/locale - doins -r locale/. - fi - - popd >/dev/null || die - - # link libraries in the ~standard~ place - local f file - for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do - file="${f##*/}" - dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file} - done - - # link headers in the ~standard~ place - dodir /usr/include/ - dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass - - # fix paths in addons makefile includes - local scriptMakeDir="${ED}"/usr/$(get_libdir)/${MY_PM}/include/Make/ - for f in "${scriptMakeDir}"/*; do - file="${f##*/}" - echo sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die - sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die - done - - # get proper folder for grass path in script - local gisbase=/usr/$(get_libdir)/${MY_PM} - sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\ -GISBASE = os.path.normpath(\"${gisbase}\"):" \ - -i "${ED}"/usr/bin/${MY_PM} || die - - # get proper fonts path for fontcap - sed -i \ - -e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \ - "${ED}"/usr/$(get_libdir)/${MY_PM}/etc/fontcap || die - - # set proper python interpreter - sed -e "s:os.environ\['GRASS_PYTHON'\] = \"python3\":\ -os.environ\['GRASS_PYTHON'\] = \"${EPYTHON}\":" \ - -i "${ED}"/usr/bin/${MY_PM} || die - - if use X; then - local GUI="-gui" - [[ ${WX_BUILD} == yes ]] && GUI="-wxpython" - make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" - doicon -s 48 gui/icons/${PN}-48x48.png - fi - - # install .pc file so other apps know where to look for grass - insinto /usr/$(get_libdir)/pkgconfig/ - doins grass.pc - - # fix weird +x on tcl scripts - find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die -} - -pkg_postinst() { - use X && xdg_pkg_postinst -} - -pkg_postrm() { - use X && xdg_pkg_postrm -} diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest index dc400a275408..b154aff6400a 100644 --- a/sci-geosciences/mapserver/Manifest +++ b/sci-geosciences/mapserver/Manifest @@ -1,2 +1 @@ -DIST mapserver-7.6.0.tar.gz 2713965 BLAKE2B 35e81b470afba58b1cf8cc63f70e6cc230a338c4066d38e8aa57d34a55e7414e9e3eeb6cc9c6d54ac8f60d076b90d25e23354f33f35c235d3d1d85d4f19979e7 SHA512 6e8a4639a025d3bdeaa74599ea10b58fbd20fc87367d39ccc9c29586a599d47ee4c45f6fe16dc76d593b3d7c51e26f8ca9d8656c5c3a3636181824d3aa26db36 DIST mapserver-7.6.2.tar.gz 2715806 BLAKE2B 230e4f52c526d72ac7f46cfe4ef8e547d7ae74c01d75637ad301d4e69b90d301f02ecb8fe7d838c9ee15c022ed7980aa2f9236e08a6daedafb65a2499a9473e5 SHA512 842c2cf891df6c8dc630fac5419caa31701d732a748264f7d5b6cceaf192fa420f1863fdd18cc791a417dcdc800fed5c3e5c43ac688142f32a1a6edda4c9f791 diff --git a/sci-geosciences/mapserver/mapserver-7.6.0.ebuild b/sci-geosciences/mapserver/mapserver-7.6.0.ebuild deleted file mode 100644 index cd24bd5d001a..000000000000 --- a/sci-geosciences/mapserver/mapserver-7.6.0.ebuild +++ /dev/null @@ -1,289 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# NOTE: We have to stick with EAPI 6 for now because of the -# depend.apache eclass. -EAPI=6 - -# Variables for the miscellaneous bindings we provide -PHP_EXT_OPTIONAL_USE="php" -PHP_EXT_NAME="php_mapscriptng" -PHP_EXT_SKIP_PHPIZE="yes" - -USE_PHP="php7-2 php7-3 php7-4" -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -WEBAPP_MANUAL_SLOT=yes -WEBAPP_OPTIONAL=yes - -# NOTE: Similarly, we cannot go cmake-utils -> cmake until we're on EAPI 7 -inherit cmake-utils depend.apache eapi7-ver perl-functions php-ext-source-r3 python-r1 webapp - -DESCRIPTION="Development environment for building spatially enabled webapps" -HOMEPAGE="https://mapserver.org/" -SRC_URI="https://download.osgeo.org/mapserver/${P}.tar.gz" - -LICENSE="Boost-1.0 BSD BSD-2 ISC MIT tcltk" -KEYWORDS="~amd64 ~x86" -SLOT="0" - -# NOTE: opengl removed for now as no support for it in upstream CMake -IUSE="apache bidi cairo geos mysql oracle perl php postgis python" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# Tests: -# Included tests (tests/*) are seriously outdated -# Upstream's main test suite (msautotest/*) is not in the release tarball, -# and upstream sets 'export-ignore' for that directory. -# -# The eclasses used normally try to run test suites themselves, -# or skip if nothing was found. -# However, because of the php-ext-* eclass usage, this fails and would -# cause errors running non-existent tests, so we have to restrict here. -RESTRICT="test" - -RDEPEND=" - >=dev-libs/expat-2.2.8 - dev-libs/libxml2:2= - dev-libs/libxslt[crypt] - >=dev-libs/protobuf-c-1.3.2:= - >=media-libs/freetype-2.9.1-r3 - >=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib] - >=media-libs/giflib-5.2.1:= - >=media-libs/libpng-1.6.37:= - >=net-misc/curl-7.69.1 - >=sci-libs/gdal-3.0.4:=[oracle?] - >=sci-libs/proj-6.2.1:= - virtual/jpeg - virtual/libiconv - >=x11-libs/agg-2.5-r3 - apache? ( - app-admin/webapp-config - dev-libs/fcgi - ) - bidi? ( - dev-libs/fribidi - media-libs/harfbuzz:= - ) - cairo? ( x11-libs/cairo ) - geos? ( sci-libs/geos ) - mysql? ( dev-db/mysql-connector-c:= ) - oracle? ( dev-db/oracle-instantclient:= ) - perl? ( dev-lang/perl:= ) - postgis? ( - dev-db/postgis - dev-db/postgresql:= - ) - python? ( ${PYTHON_DEPS} ) -" - -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - perl? ( >=dev-lang/swig-4.0 ) - php? ( >=dev-lang/swig-4.0 ) - python? ( - >=dev-lang/swig-4.0 - >=dev-python/setuptools-44.1.0 - ) -" - -want_apache2 apache - -pkg_setup() { - use apache && webapp_pkg_setup - use perl && perl_set_version -} - -src_prepare() { - cmake-utils_src_prepare - - use php && php-ext-source-r3_src_prepare - use python && python_copy_sources -} - -_generate_cmake_args() { - # Provides a simple, bare config for bindings to build upon - # Need WITH_WMS=ON or build fails - local args=( - "-DCMAKE_SKIP_RPATH=ON" - "-DINSTALL_LIB_DIR=/usr/$(get_libdir)" - "-DWITH_CAIRO=OFF" - "-DWITH_FCGI=OFF" - "-DWITH_FRIBIDI=OFF" - "-DWITH_GEOS=OFF" - "-DWITH_GIF=OFF" - "-DWITH_HARFBUZZ=OFF" - "-DWITH_ICONV=OFF" - "-DWITH_PROTOBUFC=OFF" - "-DWITH_POSTGIS=OFF" - "-DWITH_WMS=ON" - "-DWITH_WCS=OFF" - "-DWITH_WFS=OFF" - ) - - echo "${args[@]}" -} - -src_configure() { - # NOTE: We could make this based on _generate_cmake_args, but - # then we wouldn't be as-explicit about what is enabled/not, - # and reliant on defaults not changing. - # Readability and maintainability is better this way. - local mycmakeargs=( - "-DCMAKE_SKIP_RPATH=ON" - "-DINSTALL_LIB_DIR=/usr/$(get_libdir)" - "-DWITH_CLIENT_WMS=ON" - "-DWITH_CLIENT_WFS=ON" - "-DWITH_CURL=ON" - "-DWITH_GIF=ON" - "-DWITH_ICONV=ON" - "-DWITH_KML=ON" - "-DWITH_LIBXML2=ON" - "-DWITH_PHPNG=OFF" - "-DWITH_PROTOBUFC=ON" - "-DWITH_SOS=ON" - "-DWITH_WMS=ON" - "-DWITH_WFS=ON" - "-DWITH_WCS=ON" - "-DWITH_XMLMAPFILE=ON" - "-DWITH_APACHE_MODULE=$(usex apache ON OFF)" - "-DWITH_CAIRO=$(usex cairo ON OFF)" - "-DWITH_FCGI=$(usex apache ON OFF)" - "-DWITH_GEOS=$(usex geos ON OFF)" - "-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)" - "-DWITH_MYSQL=$(usex mysql ON OFF)" - "-DWITH_FRIBIDI=$(usex bidi ON OFF)" - "-DWITH_HARFBUZZ=$(usex bidi ON OFF)" - "-DWITH_POSTGIS=$(usex postgis ON OFF)" - "-DWITH_PERL=$(usex perl ON OFF)" - ) - - use perl && mycmakeargs+=( "-DCUSTOM_PERL_SITE_ARCH_DIR=$(perl_get_raw_vendorlib)" ) - - # Configure the standard build first - cmake-utils_src_configure - - # Minimal build for bindings - # Note that we use _generate_cmake_args to get a clean config each time, then add - # in options as appropriate. Otherwise we'd get contamination between bindings. - if use python ; then - mycmakeargs=( - $(_generate_cmake_args) - "-DWITH_PYTHON=ON" - ) - - python_foreach_impl cmake-utils_src_configure - python_foreach_impl python_optimize - fi - - if use php ; then - local slot= - for slot in $(php_get_slots) ; do - # Switch to the slot's build dir - php_init_slot_env "${slot}" - - # Take a blank config each time - # Add in only *this* slot's PHP includes dir, etc - mycmakeargs=( - $(_generate_cmake_args) - "-DWITH_PHPNG=ON" - "-DPHP_CONFIG_EXECUTABLE=${PHPCONFIG}" - "-DPHP_INCLUDES=${PHPPREFIX}" - ) - - BUILD_DIR="${S}/php${slot}" cmake-utils_src_configure - - # Return to where we left off, in case we add more - # to this phase. - cd "${S}" || die - done - fi -} - -src_compile() { - cmake-utils_src_compile - - if use python ; then - python_foreach_impl cmake-utils_src_compile - fi - - if use php ; then - local slot= - for slot in $(php_get_slots) ; do - # Switch to the slot's build dir - php_init_slot_env "${slot}" - - # Force cmake to build in it - BUILD_DIR="${S}/php${slot}" cmake-utils_src_compile - - # Return to where we left off, in case we add more - # to this phase. - cd "${S}" || die - done - fi -} - -src_install() { - # Needs to be first - use apache && webapp_src_preinst - - if use python ; then - python_foreach_impl cmake-utils_src_install - python_foreach_impl python_optimize - fi - - if use php ; then - php-ext-source-r3_createinifiles - - local slot= - for slot in $(php_get_slots) ; do - php_init_slot_env "${slot}" - - BUILD_DIR="${S}/php${slot}" cmake-utils_src_install - - cd "${S}" || die - done - fi - - # Install this last because this build is the most "fully-featured" - cmake-utils_src_install - - if use apache ; then - # We need a mapserver symlink available in cgi-bin - dosym ../../../../../../../usr/bin/mapserv /usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/mapserv - webapp_src_install - fi -} - -pkg_preinst() { - # We need to cache the value here of HAD_PHP because we want the - # original package version, not the result of us installing a new one - HAD_PHP= - has_version 'sci-geosciences/mapserver[php]' && HAD_PHP=1 -} - -pkg_postinst() { - use apache && webapp_pkg_postinst - - # Let upgrading (from a pre-rewrite version) users know that the PHP module changed - local replacing_version= - for replacing_version in ${REPLACING_VERSIONS} ; do - if ver_test "7.6.0" -gt "${replacing_version}" ; then - if use php && [[ ${HAD_PHP} -eq 1 ]] ; then - elog "Note that MapServer has deprecated the old PHP extension" - elog "You can read more at: " - elog "URL: https://mapserver.org/MIGRATION_GUIDE.html#mapserver-7-2-to-7-4-migration" - elog "This may involve porting some of your PHP scripts to use the new module." - fi - - # Only show the message once - break - fi - done -} - -pkg_prerm() { - use apache && webapp_pkg_prerm -} diff --git a/sci-geosciences/mtkbabel/Manifest b/sci-geosciences/mtkbabel/Manifest index 9fcba4850876..c1550460ffa0 100644 --- a/sci-geosciences/mtkbabel/Manifest +++ b/sci-geosciences/mtkbabel/Manifest @@ -1,2 +1 @@ -DIST mtkbabel-0.8.2.tar.gz 27896 BLAKE2B 34c2e996fb031a5236313bcd7e07fca6fe1c24d763f5e278494b08f0060875be91fc19f58aa4e011cd5f20a5a795208d856ec125cb7d9644f205e30f3a60f355 SHA512 b3b6c0c9698c165de9d60bb4d574a174b4ee805dc1cb889770dd7c0001378d94a5722e3bf2132d8f6dd888255247fe5e5635a4ef66a6000c68d58403f9756bdd DIST mtkbabel-0.8.3.1.tar.gz 28472 BLAKE2B d17363f0b4e95360910039421a26083ab088f12b56c65b0687f7ee89dc9086f8c122ef7d62091cff9df1fd2c6f34835e6712dd0501d95517963c287e8ddfe1c4 SHA512 795d058bf622b5381600fc82a67aa32258db0ce2d1c22f148b6a1b34a6afe585f31fd0a5fccd2743602b55f53fa3b6b0f8c7269ebee1555a58374e33a80d22d7 diff --git a/sci-geosciences/mtkbabel/mtkbabel-0.8.2-r1.ebuild b/sci-geosciences/mtkbabel/mtkbabel-0.8.2-r1.ebuild deleted file mode 100644 index 99dcd1ab97d1..000000000000 --- a/sci-geosciences/mtkbabel/mtkbabel-0.8.2-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="MTKBabel is a Perl program to operate the i-Blue 747 GPS data logger" -HOMEPAGE="https://sourceforge.net/projects/mtkbabel/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND=" - dev-perl/Device-SerialPort - dev-perl/TimeDate -" - -src_install() { - doman mtkbabel.1 - dobin mtkbabel - dodoc MtkExtensionsv1.xsd README changelog -} diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest index 96b2892dfc57..59f7720f7ed3 100644 --- a/sci-geosciences/opencpn/Manifest +++ b/sci-geosciences/opencpn/Manifest @@ -1,6 +1,2 @@ -DIST opencpn-4.8.0.tar.gz 53008393 BLAKE2B 79184b678db329e98c704f4f1a132e5d3af4a65b104c6eab1c37738cbbf98d88c21647ce654077a8f4b781221d7e3766c35d7450b81befdad7f269b636263c09 SHA512 1f1ea666566e98ee3af24423985119c1b14e184d4310dbc588b00065878b1dcb8fe73a7331e4ad3f75a905774fff187203fb31253faea7238f3d783a6729ad75 -DIST opencpn-4.8.2.tar.gz 59164504 BLAKE2B fbfa86051845a922a7c642194cd0672fbccd6a75e3897e8b0b3f9b08c091d0933a146060f83265c9a85d0bacf18f57a0f9ba55aa4f26e035a77d39d73e5e5a7d SHA512 231f8ba29f8a0343cb3807e52e8535bdade221de65a169b57e94816b4b464407ba90b605dcec21a5c45c742de076b644f076fee88616ec2867a8ae182105102d -DIST opencpn-4.8.8.tar.gz 59140674 BLAKE2B a03fd28b26bee46d559d16bf061eac409ca9395fdf1595162a51fe4cdfb30c3151c23b30f3396b645c4b177b3fd3b0f2ea03a850d0ea3fe2258f1abc4956a3db SHA512 4fa94655d7b9d389f5f335c15898e7138c792c71b824720fedd762ccd71c01481e5a24598b85211dba0c7d89d0ad0b2ebc2afc38301235829d4aa6f499c6f9b2 DIST opencpn-5.0.0.tar.gz 67164574 BLAKE2B a06520aaf0dc1457208c5c6968d44b0122b89eca632aa3b8471a0efd452d41c155ee05274284d84e5de9f700a9d549b61eae5d2ddfc8e70c4d5cfa7cf1c84f3f SHA512 1b0f0e1a7164bc342a79837b987d8e4f69f164739f0d9c9c6448fab496af0944fe77b9cd3bbb9f2ee874cbb42add2da67df44606c6b8e620d0be2caf6a71eb96 -DIST opencpn-doc_4.1.1329.1.orig.tar.xz 8739872 BLAKE2B 1d0b1538230488586318212d371669d0dfd6fefb45a49c1405c8749cfc2d5b1ced39c03ad7814954db42644ab5c21a37177e0f315b8d6d49c2200508f27a9899 SHA512 652a932edbf8a6f05fd3c64ddf566f817405cf44697035f58ddbf1a99bf92269b7fd9ee83b7ee065aa60db15b6030d8c5c9a4a4001049ed2def9962bc51746c2 DIST opencpn-doc_4.8.2.0.orig.tar.xz 22302480 BLAKE2B 2bcd2ac01340cde0d0be80537321c8c3e829a8e664944c34f3f3112f931c45746059b5c173402982601ccf88926241741c7fb44f251e9fe48b83aa5f3e8d7727 SHA512 678317c77feb3b0bf695e337e7e95083df1d488e0a5ad3bad41bad11dc87271d6fc0ac194a6b63b603d5c1f1184e6c9f91de895a7db01017ef2a7068a62404eb diff --git a/sci-geosciences/opencpn/opencpn-4.8.0-r1.ebuild b/sci-geosciences/opencpn/opencpn-4.8.0-r1.ebuild deleted file mode 100644 index a846188eb7d6..000000000000 --- a/sci-geosciences/opencpn/opencpn-4.8.0-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -WX_GTK_VER="3.0" -inherit cmake-utils wxwidgets - -DOC_VERSION="4.1.1329.1" - -DESCRIPTION="a free, open source software for marine navigation" -HOMEPAGE="https://opencpn.org/" -SRC_URI="https://github.com/OpenCPN/OpenCPN/archive/v${PV}.tar.gz -> ${P}.tar.gz -doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${DOC_VERSION}.orig.tar.xz ) -" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc gps opengl" - -RDEPEND=" - app-arch/bzip2 - dev-libs/tinyxml - media-libs/freetype:2 - media-libs/portaudio - sys-libs/zlib - opengl? ( virtual/opengl ) - x11-libs/gtk+:2 - x11-libs/wxGTK:${WX_GTK_VER}[X] - gps? ( sci-geosciences/gpsd ) - !sci-geosciences/opencpn-plugin-wmm -" -DEPEND="${RDEPEND} - sys-devel/gettext" - -S="${WORKDIR}/OpenCPN-${PV}" - -src_configure() { - need-wxwidgets unicode - local mycmakeargs=( - $(cmake-utils_use_use gps GPSD) - -DUSE_S57=ON - -DUSE_GARMINHOST=ON - -DBUNDLE_GSHHS=CRUDE - -DBUNDLE_TCDATA=ON - ) - - cmake-utils_src_configure -} - -src_install() { - if use doc; then - dohtml -r "${S}"/../${PN}/doc/* - fi - cmake-utils_src_install -} - -pkg_postinst() { - if use doc; then - einfo "Documentation is available at file:///usr/share/doc/${PF}/html/help_en_US.html" - fi -} diff --git a/sci-geosciences/opencpn/opencpn-4.8.2.ebuild b/sci-geosciences/opencpn/opencpn-4.8.2.ebuild deleted file mode 100644 index 4488d324a16b..000000000000 --- a/sci-geosciences/opencpn/opencpn-4.8.2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -WX_GTK_VER="3.0" -inherit cmake-utils wxwidgets - -DOC_VERSION="4.1.1329.1" - -DESCRIPTION="a free, open source software for marine navigation" -HOMEPAGE="https://opencpn.org/" -SRC_URI="https://github.com/OpenCPN/OpenCPN/archive/v${PV}.tar.gz -> ${P}.tar.gz -doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${DOC_VERSION}.orig.tar.xz ) -" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc gps opengl" - -RDEPEND=" - app-arch/bzip2 - dev-libs/tinyxml - media-libs/freetype:2 - media-libs/portaudio - sys-libs/zlib - opengl? ( virtual/opengl ) - x11-libs/gtk+:2 - x11-libs/wxGTK:${WX_GTK_VER}[X] - gps? ( sci-geosciences/gpsd ) - !sci-geosciences/opencpn-plugin-wmm -" -DEPEND="${RDEPEND} - sys-devel/gettext" - -S="${WORKDIR}/OpenCPN-${PV}" - -src_configure() { - setup-wxwidgets - local mycmakeargs=( - $(cmake-utils_use_use gps GPSD) - -DUSE_S57=ON - -DUSE_GARMINHOST=ON - -DBUNDLE_GSHHS=CRUDE - -DBUNDLE_TCDATA=ON - ) - - cmake-utils_src_configure -} - -src_install() { - if use doc; then - dohtml -r "${S}"/../${PN}/doc/* - fi - cmake-utils_src_install -} - -pkg_postinst() { - if use doc; then - einfo "Documentation is available at file:///usr/share/doc/${PF}/html/help_en_US.html" - fi -} diff --git a/sci-geosciences/opencpn/opencpn-4.8.8.ebuild b/sci-geosciences/opencpn/opencpn-4.8.8.ebuild deleted file mode 100644 index bd242464255b..000000000000 --- a/sci-geosciences/opencpn/opencpn-4.8.8.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -WX_GTK_VER="3.0" -inherit cmake-utils wxwidgets - -DOC_VERSION="4.8.2.0" - -DESCRIPTION="a free, open source software for marine navigation" -HOMEPAGE="https://opencpn.org/" -SRC_URI="https://github.com/OpenCPN/OpenCPN/archive/v${PV}.tar.gz -> ${P}.tar.gz -doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${DOC_VERSION}.orig.tar.xz ) -" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc lzma opengl" - -RDEPEND=" - app-arch/bzip2 - lzma? ( app-arch/xz-utils ) - dev-libs/tinyxml - media-libs/freetype:2 - media-libs/portaudio - net-misc/curl - sys-libs/zlib - opengl? ( virtual/opengl ) - x11-libs/gtk+:2 - x11-libs/wxGTK:${WX_GTK_VER}[X] - !sci-geosciences/opencpn-plugin-wmm -" -DEPEND="${RDEPEND} - sys-devel/gettext" - -S="${WORKDIR}/OpenCPN-${PV}" - -src_configure() { - setup-wxwidgets - local mycmakeargs=( - -DUSE_S57=ON - -DUSE_GARMINHOST=ON - -DBUNDLE_GSHHS=CRUDE - -DBUNDLE_TCDATA=ON - ) - - cmake-utils_src_configure -} - -src_install() { - if use doc; then - dohtml -r "${S}"/../${PN}/doc/* - fi - cmake-utils_src_install -} - -pkg_postinst() { - if use doc; then - einfo "Documentation is available at file:///usr/share/doc/${PF}/html/help_en_US.html" - fi -} diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest index 918e9f7a7b4e..a077a0e2ab63 100644 --- a/sci-geosciences/osm2pgsql/Manifest +++ b/sci-geosciences/osm2pgsql/Manifest @@ -1,3 +1,2 @@ -DIST osm2pgsql-0.96.0.tar.gz 1219163 BLAKE2B a89e40e74ea52bf46593e48dd1f9047b958b645ce38aeb554c930e2d9efdf4f0bb9b6fd7a9b209342d59ca8a0d3ada3023f14324bf8b02b060d8dfd987763528 SHA512 6c6bb00c17995b9a99975076ad3af35a99678a7780db144f7fdd1f5c856b777883f1b1dac7e1c3ca9a2a490d3774f62c8aa9f8742c955c377c28d5b827657372 DIST osm2pgsql-1.3.0.tar.gz 2460451 BLAKE2B ac52523bf6d35a06528ad22a51465388e70baf9f94bb3664c39c301b429ff453370d9cd44549781e4ee50d698094ddfe83f0e39a7c3d6c01556ea95e10feaf75 SHA512 e643f3a1987ead36763c96d34b5dd7e170273b77a521106c21311dc7b01d2b34470b2e00e3214050f2cbdd3d89703a1827ee6c35928ed77cc7f35fc4e20331f3 DIST osm2pgsql-1.4.0.tar.gz 2429430 BLAKE2B 5d93a159a87c9cb12d85be8b89377f720e0d94564574f70d6f3686b215a99250967655d0eeee3dcda2742fcab356ecf62de2b4bab384d69a641a06829c401388 SHA512 f0eaceb7f78087a58bba3bbfafbb9d6d70aecd4c3ba1cfb0ce784116b52a57c69855c1a7459cce8b963c87955de269ca320cf4a3934b6ff5ad29b7554e07dd9e diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild deleted file mode 100644 index 06ec976b36e2..000000000000 --- a/sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic - -DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database" -HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql - https://github.com/openstreetmap/osm2pgsql" -SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+lua" - -COMMON_DEPEND=" - app-arch/bzip2 - dev-db/postgresql:= - dev-libs/expat - sci-libs/proj:= - sys-libs/zlib - lua? ( dev-lang/lua:0= ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost -" -RDEPEND="${COMMON_DEPEND} - dev-db/postgis -" - -# Tries to connect to local postgres server and other shenanigans -RESTRICT="test" - -src_configure() { - append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 - local mycmakeargs=( - -DWITH_LUA=$(usex lua) - -DBUILD_TESTS=OFF - ) - cmake_src_configure -} diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest index aeda73e4768f..15dba5f674e0 100644 --- a/sci-geosciences/routino/Manifest +++ b/sci-geosciences/routino/Manifest @@ -1,3 +1,2 @@ -DIST routino-3.1.1.tgz 1795118 BLAKE2B 4b8a44d917f2f71e333eb233eebee37de6d19adac7b31111f9b244e125d9a9a54bbbec5e166d53f3ac435f27dcb5633c9626e0ffc4025d5e8dc0cbaed6274800 SHA512 088f22e9297f485418ed369d00827690f86e224e331b69085513339870fe6d97cffef62aa5e7e14883800469beff4af4b0a581ba8bad78920a383d7152be6ede DIST routino-3.2.tgz 2463662 BLAKE2B 4be17e83105d95052a9fbe0158b15bf5d64b4f720fb1bb61cbbb5fcd61451b933507e4dcc8867bff5e8602c6e681e916e45328d2a0ce766e9ab37366984cf378 SHA512 f5be46d9c026fcd92658490630d9ff6e4827e84ee57ccbaae48f54372da37ab78de24432ab9fa1d6860304a9a2ac86061eb876c12b39e821693282c4d4aaefcf DIST routino-3.3.2.tgz 2542029 BLAKE2B e74af857ef29d4ee4a08d8a2913180dfca747001f4afd59ad20a9ed355e654dc86d26fb1afb5486ece30ddf6b7cba7b60c52feae30af14086f2b4d5259451125 SHA512 5341a2ec063192754d641a4543260f4b3b3d84a7a9bfe745fca2082cdcc8bb7220bf37ed58aacf9e65eba4555432a6bdbb9747153a383dfff72e2aca01c66070 diff --git a/sci-geosciences/routino/files/routino-3.1.1.patch b/sci-geosciences/routino/files/routino-3.1.1.patch deleted file mode 100644 index ac54fcf9f887..000000000000 --- a/sci-geosciences/routino/files/routino-3.1.1.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- routino-3.1.1/Makefile.conf 2017-10-22 15:55:10.420531850 +0200 -+++ routino-3.1.1/Makefile.conf.new 2017-10-22 15:55:32.180533067 +0200 -@@ -45,11 +45,11 @@ - # Installation locations (edit if required) - - ifneq ($(HOST),MINGW) --prefix=/usr/local -+prefix=/usr - bindir=$(prefix)/bin - incdir=$(prefix)/include - libdir=$(prefix)/lib --docdir=$(prefix)/doc/routino -+docdir=$(prefix)/share/doc/$(PF) - datadir=$(prefix)/share/routino - else - prefix="c:/Program Files/Routino" -@@ -74,16 +74,16 @@ - - - # Maths library --LDFLAGS=-lm -+LDFLAGS+=-lm - - # Language dialect selection --CFLAGS=-std=c99 -+CFLAGS+=-std=c99 - - # Warning options - CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic - - # Optimisation options --CFLAGS+=-O3 -+#CFLAGS+=-O3 - CFLAGS+=-ffast-math - - # Optimisation option (only works if compilation and execution use exactly the same CPU architecture). -@@ -118,7 +118,7 @@ - endif - - # Put the current directory in the shared library path for the router using libroutino --LDFLAGS_LDSO=-Wl,-R. -+#LDFLAGS_LDSO=-Wl,-R. - - - # Required for multi-threaded support (comment these two lines out if not required) -@@ -139,8 +139,8 @@ - - - # Required for xz support (uncomment these two lines if required) --#CFLAGS+=-DUSE_XZ --#LDFLAGS+=-llzma -+CFLAGS+=-DUSE_XZ -+LDFLAGS+=-llzma - - - # Required to use stdio with files > 2GiB on 32-bit system. diff --git a/sci-geosciences/routino/routino-3.1.1.ebuild b/sci-geosciences/routino/routino-3.1.1.ebuild deleted file mode 100644 index be61b65ad789..000000000000 --- a/sci-geosciences/routino/routino-3.1.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Routing application based on openstreetmap data" -HOMEPAGE="https://www.routino.org/" -SRC_URI="http://www.routino.org/download/${P}.tgz" -LICENSE="AGPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -DEPEND="" - -src_prepare() { - eapply "${FILESDIR}"/${P}.patch - - sed -i -e "s@libdir=\(.*\)@libdir=\$(prefix)/$(get_libdir)@" \ - -e "s@CC=gcc@CC=$(tc-getCC)@" \ - -e "s@LD=gcc@LD=$(tc-getCC)@" \ - Makefile.conf || die "failed sed" - - eapply_user -} - -src_compile() { - emake -j1 - rm README.txt - mv doc/rm README.txt . -} diff --git a/sci-mathematics/4ti2/4ti2-1.6.2.ebuild b/sci-mathematics/4ti2/4ti2-1.6.2.ebuild deleted file mode 100644 index cdab06e898eb..000000000000 --- a/sci-mathematics/4ti2/4ti2-1.6.2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -AUTOTOOLS_AUTORECONF=true -# The swig subdir is not used, so we can skip running autotools in it. #518000 -AT_NO_RECURSIVE=1 - -inherit autotools-utils toolchain-funcs - -DESCRIPTION="Software package for algebraic, geometric and combinatorial problems" -HOMEPAGE="https://4ti2.github.io/" -SRC_URI="http://4ti2.de/version_${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="static-libs" - -DEPEND=" - sci-mathematics/glpk:0[gmp] - dev-libs/gmp[cxx]" -RDEPEND="${DEPEND}" - -AUTOTOOLS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.2-gold.patch - ) - -src_prepare() { - sed \ - -e "s:^CXX.*$:CXX=$(tc-getCXX):g" \ - -i m4/glpk-check.m4 || die - autotools-utils_src_prepare -} diff --git a/sci-mathematics/4ti2/Manifest b/sci-mathematics/4ti2/Manifest index 5384fc2923b6..38b0e115ec08 100644 --- a/sci-mathematics/4ti2/Manifest +++ b/sci-mathematics/4ti2/Manifest @@ -1,3 +1,2 @@ -DIST 4ti2-1.6.2.tar.gz 5531651 BLAKE2B 1e55f8e0df242a6eeff3b66f2a4a0f6508fc5fb722ec86558c289d6c8d295b169b60c9b3172f7e672f9fc341e767221138819c6534aba9695aa43ecbf61e1ab3 SHA512 ff68f767b8677ce0ce94cca39fa3ef87835d77a951f0ec6ae28ab171bf09ae25c551d88c2cdf5bf3115b33bd32366b063533a1c22576130a00f542f9370bcd7b DIST 4ti2-1.6.6.tar.gz 5640126 BLAKE2B e52fdfd9b406b86236795b1ba2494d9686f3c93961359bf409ddcdfeb0067e3b0904473b66268315795c8941ba0cb93dbe5e4c3cea402379bd07ee65a1951e5d SHA512 89f36aaf3d8f41bb31b37b44a013ea966d9664880473ad0d6d1825ffb00afec1eff3139c09ac6b684f0679e2ae0d201a84396bb721aa1f63dc1deca592392c41 DIST 4ti2-1.6.7.tar.gz 5649869 BLAKE2B ab0e7da1de88e5e99ead0b8fa7f7a72773b84ae903a31dc3134e83364ea45069889f8ce9812bb471cf72b824fe013756d557489b4d2ab31216141d5b6347acfc SHA512 38d638fe01ff3cef1aebae1eefd276cf02f808978851b4465e132f77d3ab34ea51d512e2ea28a42ac65263b458c43cf420dc5f8ac930f959dd0c14916cef9841 diff --git a/sci-mathematics/agda-stdlib/files/50agda-stdlib-gentoo.el b/sci-mathematics/agda-stdlib/files/50agda-stdlib-gentoo.el deleted file mode 100644 index 62264a4451a0..000000000000 --- a/sci-mathematics/agda-stdlib/files/50agda-stdlib-gentoo.el +++ /dev/null @@ -1 +0,0 @@ -(setq agda2-include-dirs '("." "/usr/share/agda-stdlib")) diff --git a/sci-mathematics/alt-ergo/Manifest b/sci-mathematics/alt-ergo/Manifest index 32a72ea3d18f..de070479a00e 100644 --- a/sci-mathematics/alt-ergo/Manifest +++ b/sci-mathematics/alt-ergo/Manifest @@ -1,2 +1 @@ -DIST alt-ergo-1.30.tar.gz 380329 BLAKE2B fab16757ed110474cf8f9d01ab53f76b6a300eb478b32bbfd6bb79d7603b1f5c2fc5c97bf44358eb138283f3487ef90febd23865723a4721b01bd870cfdd6507 SHA512 6ac6abdc6602b0ba89ee58eb96c66ac93e8195e0b4f75595381eded86365c2dd881251de2b77e2f1137684651ddc7fd94f922509de0be2964d81f52a6fb0f2f2 DIST alt-ergo-2.3.0.tar.gz 455577 BLAKE2B 1836782be452df5147fc3041517fd267f3ce7facd15ad460c3e1dfba2b6ea455fee79ad8264ccb12cf21622c21a54c186c9943e7bffb392daab15d046ff93863 SHA512 a2f209b62b8494bfefe84328cdc786185e0534c5e224e212b83045b078352a51d2ab02622f72c22c74c7de95c7a554cbdae2a9a8a0c41f3f26c841f8c72f6b21 diff --git a/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild b/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild deleted file mode 100644 index d88124561173..000000000000 --- a/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Automatic theorem prover" -HOMEPAGE="https://alt-ergo.ocamlpro.com" -SRC_URI="https://alt-ergo.ocamlpro.com/http/${P}/${P}.tar.gz" - -LICENSE="CeCILL-C" -SLOT="0" -KEYWORDS="amd64" -IUSE="examples gtk +ocamlopt" - -DEPEND=">=dev-lang/ocaml-3.12.1:=[ocamlopt=] - dev-ml/zarith:= - gtk? ( >=dev-ml/lablgtk-2.14:2=[sourceview,ocamlopt=] ) - dev-ml/camlzip:= - <=dev-ml/ocplib-simplex-0.3:=" -RDEPEND="${DEPEND}" - -DOCS=( CHANGES INSTALL.md README.md ) - -src_compile() { - emake - use gtk && emake gui -} - -src_install() { - default - use gtk && emake DESTDIR="${D}" install-gui - use examples && dodoc -r examples -} diff --git a/sci-mathematics/calc/Manifest b/sci-mathematics/calc/Manifest index 86457bd7db86..79765f5f29ec 100644 --- a/sci-mathematics/calc/Manifest +++ b/sci-mathematics/calc/Manifest @@ -1,2 +1 @@ -DIST calc-2.12.4.13.tar.bz2 970778 BLAKE2B 0e34df7d445a84de89e2c662ea7e8da4a350eaeef984b5027befe5947bf8e863180dd07bbe525c4bc04a6e3aa53bfbb2f3d719c8bfff3c238b16941b701d4b4d SHA512 7b7136c793917652ce2f2b3866b2db16a69dbead729d8a72b8c1359ebb8a4e1d4e7a3a8b214f8e85b9ccf41193ba6ffcb49926cc68f494e2b6cdff58559f2534 DIST calc-2.12.5.4.tar.bz2 956258 BLAKE2B 47c2ab46c47baf0d1f1d202a36e0d42cf0b25f7eecf61815814081b2f76aa65dc8cc4e970078a5176266ce1332751169424d1c6d2c16ff148a1b014986b56d47 SHA512 07c89059d4718b29e649a5198e0bb6c6a6d9c6705a0050ad744146f1649c65d0fb1277a68eb45daca907b08ef9336de2002808a5f9b2312e413eb3afb74d491f diff --git a/sci-mathematics/calc/calc-2.12.4.13-r1.ebuild b/sci-mathematics/calc/calc-2.12.4.13-r1.ebuild deleted file mode 100644 index b5f29872ae0d..000000000000 --- a/sci-mathematics/calc/calc-2.12.4.13-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="Arbitrary precision C-like arithmetic system" -HOMEPAGE="https://www.isthe.com/chongo/tech/comp/calc/" -SRC_URI="http://www.isthe.com/chongo/src/calc/${P}.tar.bz2" - -SLOT="0" -LICENSE="LGPL-2" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" - -IUSE="" - -DEPEND=" - sys-libs/ncurses:0= - sys-libs/readline:0=" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.12.4.13-prefix.patch\ - "${FILESDIR}"/2.12.4.0-ldflags.patch - ln -sf libcustcalc.so.${PV} custom/libcustcalc.so || die - sed -i -e "/DIR/s:/usr:${EPREFIX}/usr:g" Makefile || die -} - -src_compile() { - # parallel compilation hard to fix. better to leave upstream. - emake -j1 \ - CC="$(tc-getCC)" \ - DEBUG="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - CALCPAGER="${PAGER}" \ - USE_READLINE="-DUSE_READLINE" \ - READLINE_LIB="-lreadline -lhistory -lncurses -L\"${S}\"/custom -lcustcalc" \ - all -} - -src_test() { - if echo "${LD_PRELOAD}" | grep -q "sandbox"; then - ewarn "Can't run check when running in sandbox - see bug #59676" - else - emake chk - fi -} - -src_install() { - emake \ - T="${D}" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - install - dodoc BUGS CHANGES LIBRARY README -} diff --git a/sci-mathematics/calc/files/2.12.4.0-ldflags.patch b/sci-mathematics/calc/files/2.12.4.0-ldflags.patch deleted file mode 100644 index 0f2b67d2c084..000000000000 --- a/sci-mathematics/calc/files/2.12.4.0-ldflags.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff --git a/Makefile b/Makefile -index b526442..baa8273 100644 ---- a/Makefile -+++ b/Makefile -@@ -1144,11 +1144,13 @@ BLD_TYPE= calc-dynamic-only - # - CC_SHARE= -fPIC - LD_SHARE= --LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM --LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -+LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - else --LIBCUSTCALC_SHLIB= -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -+LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - endif - # - CC_STATIC= -@@ -1227,9 +1229,9 @@ BLD_TYPE= calc-dynamic-only - # - CC_SHARE= -fPIC - LD_SHARE= --LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM --LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" - else - LIBCUSTCALC_SHLIB= - endif -@@ -1267,9 +1269,9 @@ BLD_TYPE= calc-dynamic-only - # - CC_SHARE= -fPIC - LD_SHARE= --LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM --LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" - else - LIBCUSTCALC_SHLIB= - endif -@@ -1304,9 +1306,9 @@ CC_SHARE= -fPIC - DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib - LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ - "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" --LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM --LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" - else - LIBCUSTCALC_SHLIB= - endif -@@ -1340,8 +1342,8 @@ BLD_TYPE= calc-static-only - # - CC_SHARE= -fPIC - LD_SHARE= --LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" --LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" - # - CC_STATIC= - LD_STATIC= -@@ -1394,9 +1396,9 @@ BLD_TYPE= calc-static-only - # - CC_SHARE= -fPIC - LD_SHARE= --LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM --LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" - else - LIBCUSTCALC_SHLIB= - endif -@@ -1431,9 +1433,9 @@ CC_SHARE= -fPIC - DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib - LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ - "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" --LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM --LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" - else - LIBCUSTCALC_SHLIB= - endif -@@ -2002,7 +2004,7 @@ calc-static-only: ${STATIC_FIRST_TARGETS} ${EARLY_TARGETS} \ - - calc${EXT}: .hsrc ${CALCOBJS} ${CALC_DYNAMIC_LIBS} ${MAKE_FILE} - ${RM} -f $@ -- ${CC} ${CALCOBJS} ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \ -+ ${CC} ${LDFLAGS} ${CALCOBJS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \ - ${READLINE_LIB} ${READLINE_EXTRAS} -o $@ - - libcalc${LIB_EXT_VERSION}: ${LIBOBJS} ver_calc${EXT} ${MAKE_FILE} diff --git a/sci-mathematics/calc/files/calc-2.12.4.13-prefix.patch b/sci-mathematics/calc/files/calc-2.12.4.13-prefix.patch deleted file mode 100644 index 727618c3fe71..000000000000 --- a/sci-mathematics/calc/files/calc-2.12.4.13-prefix.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/Makefile b/Makefile -index cc84386..b526442 100644 ---- a/Makefile -+++ b/Makefile -@@ -1143,9 +1143,7 @@ ifeq ($(target),Linux) - BLD_TYPE= calc-dynamic-only - # - CC_SHARE= -fPIC --DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib --LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ -- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" -+LD_SHARE= - LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM - LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -@@ -1177,9 +1175,8 @@ ifeq ($(target),Darwin) - BLD_TYPE= calc-dynamic-only - # - CC_SHARE= -fPIC --DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:/usr/local/lib - LD_SHARE= ${DARWIN_ARCH} --LIBCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib -+LIBCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib -install_name ${LIBDIR}/libcalc${LIB_EXT_VERSION} - ifdef ALLOW_CUSTOM - LIBCUSTCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib - else -@@ -1196,7 +1193,7 @@ CCWERR= - CCOPT= ${DEBUG} - CCMISC= ${DARWIN_ARCH} - # --LCC= MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} gcc -+LCC= gcc - CC= ${PURIFY} ${LCC} ${CCWERR} - # - # Darmin dynamic shared lib filenames -@@ -1211,7 +1208,6 @@ LDCONFIG:= - # DARWIN_ARCH= -arch i386 # Intel binary - # DARWIN_ARCH= -arch ppc # PPC binary - DARWIN_ARCH= # native binary --MACOSX_DEPLOYMENT_TARGET=10.8 - # - endif - -@@ -1230,9 +1226,7 @@ ifeq ($(target),FreeBSD) - BLD_TYPE= calc-dynamic-only - # - CC_SHARE= -fPIC --DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib --LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ -- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" -+LD_SHARE= - LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM - LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -@@ -1272,9 +1266,7 @@ ifeq ($(target),OpenBSD) - BLD_TYPE= calc-dynamic-only - # - CC_SHARE= -fPIC --DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib --LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ -- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" -+LD_SHARE= - LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM - LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -@@ -1347,9 +1339,7 @@ ifeq ($(target),simple) - BLD_TYPE= calc-static-only - # - CC_SHARE= -fPIC --DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib --LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ -- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" -+LD_SHARE= - LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" - # -@@ -1403,9 +1393,7 @@ CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit - BLD_TYPE= calc-static-only - # - CC_SHARE= -fPIC --DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib --LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ -- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" -+LD_SHARE= - LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" - ifdef ALLOW_CUSTOM - LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" diff --git a/sci-mathematics/coq/coq-8.9.1-r2.ebuild b/sci-mathematics/coq/coq-8.9.1-r2.ebuild deleted file mode 100644 index d204f43dd8c5..000000000000 --- a/sci-mathematics/coq/coq-8.9.1-r2.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit desktop multilib - -MY_PV=${PV/_p/pl} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Proof assistant written in O'Caml" -HOMEPAGE="https://coq.inria.fr/" -SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk debug +ocamlopt doc" - -RESTRICT=test - -RDEPEND=" - >=dev-lang/ocaml-4.0.7:=[ocamlopt?] - dev-ml/camlp5:=[ocamlopt?] - dev-ml/num:= - gtk? ( dev-ml/lablgtk:=[sourceview,ocamlopt?] )" -DEPEND="${RDEPEND} - dev-ml/findlib - doc? ( - media-libs/netpbm[png,zlib] - virtual/latex-base - dev-tex/hevea - dev-texlive/texlive-latexrecommended - dev-texlive/texlive-pictures - dev-texlive/texlive-mathscience - dev-texlive/texlive-latexextra - )" - -S=${WORKDIR}/${MY_P} - -src_configure() { - ocaml_lib=$(ocamlc -where) - local myconf=( - -prefix /usr - -bindir /usr/bin - -libdir /usr/$(get_libdir)/coq - -mandir /usr/share/man - -coqdocdir /usr/$(get_libdir)/coq/coqdoc - -docdir /usr/share/doc/${PF} - -configdir /etc/xdg/${PN} - -lablgtkdir ${ocaml_lib}/lablgtk2 - ) - - use debug && myconf+=( -debug ) - use doc || myconf+=( -with-doc no ) - - if use gtk; then - if use ocamlopt; then - myconf+=( -coqide opt ) - else - myconf+=( -coqide byte ) - fi - else - myconf+=( -coqide no ) - fi - - use ocamlopt || myconf+=( -byte-only ) - - export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/" - ./configure ${myconf[@]} || die "configure failed" -} - -src_compile() { - emake STRIP="true" -j1 world VERBOSE=1 -} - -src_test() { - emake STRIP="true" check VERBOSE=1 -} - -src_install() { - emake STRIP="true" COQINSTALLPREFIX="${D}" install VERBOSE=1 - dodoc README.md CREDITS CHANGES.md - - use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png" -} diff --git a/sci-mathematics/cvc4/Manifest b/sci-mathematics/cvc4/Manifest index daaafcc4d443..bf26cdb9e5e1 100644 --- a/sci-mathematics/cvc4/Manifest +++ b/sci-mathematics/cvc4/Manifest @@ -1,2 +1 @@ -DIST cvc4-1.6.tar.gz 7815893 BLAKE2B 626e0dd49f911384e64d7e8ecf635aa12dad32830b2032bdcb96afd1a17c3566f56df51f75e9193cf365b562855733d0ea4ff3311ac99fc86e928a956298d2ad SHA512 0887b3f74a4b9e51e634591c7cf39d730110ca5d930149bab4816a49e383eeea8ccadf8474d22f5529cc03ddd045acacf8a2b92434b882adf352f4de4075fcd4 DIST cvc4-1.7.tar.gz 6969953 BLAKE2B 3a64db14a734e0314fb7d7b8dbed79e067c9bbf1723343dac1e9c47b3f09811b1a32ff0116412667bd0afefda2489c6c1679bf109710402a67bee0d91b62dd94 SHA512 b91dfac7ddf979a3474f562eb98f2d6f17a53efa38c1be5502429309a0c059e1f2b0d85ee95e5aee17d35f34c825f01f879ec4aaf26025b1fcac835c33a867c6 diff --git a/sci-mathematics/cvc4/cvc4-1.6.ebuild b/sci-mathematics/cvc4/cvc4-1.6.ebuild deleted file mode 100644 index cd59444be2b6..000000000000 --- a/sci-mathematics/cvc4/cvc4-1.6.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="automatic theorem prover for satisfiability modulo theories (SMT) problems" -HOMEPAGE="https://cvc4.cs.stanford.edu/web/" -SRC_URI="http://cvc4.cs.stanford.edu/downloads/builds/src/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+cln" - -RDEPEND="dev-libs/antlr-c - dev-libs/boost - cln? ( sci-libs/cln ) - !cln? ( dev-libs/gmp:= )" -DEPEND="${RDEPEND}" - -src_configure() { - econf --enable-gpl \ - $(use_with cln) -} diff --git a/sci-mathematics/cvc4/cvc4-1.7.ebuild b/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild index f95307f97216..efa393572432 100644 --- a/sci-mathematics/cvc4/cvc4-1.7.ebuild +++ b/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild @@ -1,9 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +inherit python-any-r1 cmake-utils DESCRIPTION="automatic theorem prover for satisfiability modulo theories (SMT) problems" HOMEPAGE="https://cvc4.cs.stanford.edu/web/" @@ -21,6 +23,7 @@ RDEPEND="dev-libs/antlr-c cln? ( sci-libs/cln ) !cln? ( dev-libs/gmp:= )" DEPEND="${RDEPEND}" +BDEPEND="${PYTHON_DEPS}" S="${WORKDIR}"/CVC4-${PV} diff --git a/sci-mathematics/dataplot/Manifest b/sci-mathematics/dataplot/Manifest index 400f30f2d684..5cce0ff1a381 100644 --- a/sci-mathematics/dataplot/Manifest +++ b/sci-mathematics/dataplot/Manifest @@ -1,3 +1,2 @@ DIST dplib.2009_07_15.tar.gz 7507367 BLAKE2B 5eec49feb1e90d479547955e5717e8e49eed18f78bae5942881511becf517986c8ba8e2f7513000c52fbb1686cc31fadf38ac61fb1f0822283f6b4fa9dd6431b SHA512 5e4e6c866a5690c3f67b322d53b6bf1bec33c488a99c95f360ce74785a57286541945fdcab5cbbacb04039046f5ba94aeaf8112b80aa34ed2c2cf04abc6f7d40 -DIST dpsrc_2009_08_21.tar.gz 6656048 BLAKE2B 69f5a141cc17ec6c9d8b52fc0dfd546be6cbc06b859cac0fd318f80f31829ae76596c430ec0ae61eaf7d557fca728af9ef9efd88ee2213c4908976d2c91689c4 SHA512 1e655c6832b724b9f69692f28f5497fb4064d208cde5462c4bd73c8d255605ba62b9b703f5ea32bbe7506b18ccd0ad5c4c2556381fbebdb6e05ce51625a4a339 DIST dpsrc_2013_12_20.tar.gz 6761551 BLAKE2B 029d278ebc025d0e902b2b37743f0ad53c567463d7929d69c7c1fe291b9355c29766035b9747f184ca28035eac2954ad391a7039da7151e7a5391ba123c6ac3f SHA512 a62df14f3ec59ccae4ead52b34adfc6e881ade1397e5a31b8a73c9740e7a2245317fef4f9756224c8d2fb57799c2247b15f6c4d65777de6302553fd138bb4083 diff --git a/sci-mathematics/dataplot/dataplot-20090821.ebuild b/sci-mathematics/dataplot/dataplot-20090821.ebuild deleted file mode 100644 index bf52682525e4..000000000000 --- a/sci-mathematics/dataplot/dataplot-20090821.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils fortran-2 toolchain-funcs autotools - -# YEAR MONTH DAY -MY_PV=${PV:0:4}_${PV:4:2}_${PV:6:2} -MY_P=dpsrc_${MY_PV} -# MY_PV_AUX usually ${MY_PV} -MY_PV_AUX=2009_07_15 -MY_P_AUX=dplib.${MY_PV_AUX} - -DESCRIPTION="Program for scientific visualization and statistical analyis" -HOMEPAGE="https://www.itl.nist.gov/div898/software/dataplot/" -SRC_URI=" - ftp://ftp.nist.gov/pub/dataplot/unix/${MY_P}.tar.gz - ftp://ftp.nist.gov/pub/dataplot/unix/${MY_P_AUX}.tar.gz" - -SLOT="0" -LICENSE="public-domain" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="examples gd opengl X" - -REQUIRED_USE="opengl? ( X )" - -COMMON_DEPEND=" - media-libs/plotutils - opengl? ( virtual/opengl ) - gd? ( media-libs/gd[png,jpeg] )" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - X? ( x11-misc/xdg-utils )" - -S="${WORKDIR}/${MY_P}" -S_AUX="${WORKDIR}/${MY_P_AUX}" - -src_unpack() { - # unpacking and renaming because - # upstream does not use directories - mkdir "${S_AUX}" || die - pushd "${S_AUX}" > /dev/null || die - unpack ${MY_P_AUX}.tar.gz - popd > /dev/null || die - mkdir ${MY_P} || die - cd "${S}" || die - unpack ${MY_P}.tar.gz -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-opengl.patch - cp "${FILESDIR}"/Makefile.am.${PV} Makefile.am || die - cp "${FILESDIR}"/configure.ac.${PV} configure.ac || die - sed -e "s:IHOST1='SUN':IHOST1='@HOST@:" \ - -e "s:/usr/local/lib:@datadir@:g" \ - dp1_linux.f > dp1_linux.f.in || die - sed -e "s/(MAXOBV=.*)/(MAXOBV=@MAXOBV@)/" \ - -e "s:/usr/local/lib:@datadir@:g" \ - DPCOPA.INC > DPCOPA.INC.in || die - eautoreconf -} - -src_configure() { - econf \ - $(use_enable gd) \ - $(use_enable opengl gl) \ - $(use_enable X) -} - -src_install() { - default - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r "${S_AUX}"/data/* - fi - insinto /usr/share/dataplot - doins "${S_AUX}"/dp{mes,sys,log}f.tex - doenvd "${FILESDIR}"/90${PN} -} diff --git a/sci-mathematics/dataplot/files/Makefile.am.20090821 b/sci-mathematics/dataplot/files/Makefile.am.20090821 deleted file mode 100644 index e10cf41ebd54..000000000000 --- a/sci-mathematics/dataplot/files/Makefile.am.20090821 +++ /dev/null @@ -1,46 +0,0 @@ -bin_PROGRAMS = dataplot -dataplot_SOURCES = dp1_linux.f \ - dp2.f dp3.f dp4.f dp5.f dp6.f dp7.f dp8.f dp9.f dp10.f dp11.f \ - dp12.f dp13.f dp14.f dp15.f dp16.f dp17.f dp18.f dp19.f dp20.f dp21.f \ - dp22.f dp23.f dp24.f dp25.f dp26.f dp27.f dp28.f dp29.f dp30.f dp31.f \ - dp32.f dp33.f dp34.f dp35.f dp36.f dp37.f dp38.f dp39.f dp40.f dp41.f \ - dp42.f dp43.f dp44.f dp45.f dp46.f \ - dpcalc.f dpdds2.f dpdds3.f dpdds.f edinit.f edmai2.f edsear.f edsub.f \ - edwrst.f fit3b.f starpac.f tcdriv_nopc.f aqua_src.f cluster.f compgeom.f \ - optimi.f libplot_src.c rldp.c main.f - -if ENABLE_GD -dataplot_SOURCES += gd_src.c -else -dataplot_SOURCES += gd_src.f -endif - -if ENABLE_GL -dataplot_SOURCES += gl_src.c -else -dataplot_SOURCES += gl_src.f -endif - -if ENABLE_X11 -dataplot_SOURCES += x11_src.c -else -dataplot_SOURCES += x11src.f -endif - -dataplot_CFLAGS = @GL_CFLAGS@ -dataplot_LDADD = @GD_LIBS@ @GL_LIBS@ @X11_LIBS@ $(FLIBS) -lreadline - -# this is to remove ambiguity between the similar filenames -# of the c and f77 version (shortcoming of automake) -# the f77 versions are forced -# the c versions objects are called dataplot-gd_src.o etc -gd_src.o: gd_src.f - $(F77COMPILE) -c -o $@ $< -gl_src.o: gl_src.f - $(F77COMPILE) -c -o $@ $< -aqua_src.o: aqua_src.f - $(F77COMPILE) -c -o $@ $< -libplot_src.o: libplot_src.f - $(F77COMPILE) -c -o $@ $< -rldp.o: rldp.f - $(F77COMPILE) -c -o $@ $< diff --git a/sci-mathematics/dataplot/files/configure.ac.20090821 b/sci-mathematics/dataplot/files/configure.ac.20090821 deleted file mode 100644 index fa9a700aa060..000000000000 --- a/sci-mathematics/dataplot/files/configure.ac.20090821 +++ /dev/null @@ -1,76 +0,0 @@ -AC_PREREQ(2.59) -AC_INIT([dataplot], [20090821], [n.heckert@nist.gov]) -AC_CONFIG_HEADER([config.h]) -AC_CONFIG_AUX_DIR(config) -AM_MAINTAINER_MODE -AM_INIT_AUTOMAKE([foreign]) - -AC_PROG_CC -AC_PROG_F77 -AC_F77_LIBRARY_LDFLAGS -case $F77 in - *gfortran*) FFLAGS="${FFLAGS} -w -fno-range-check" ;; - *) ;; -esac - -AC_CANONICAL_HOST -case $host in - i?86*linux*) MAXOBV=100000 ;; - *64*linux*) MAXOBV=1000000 ;; -esac -AC_SUBST(MAXOBV) - -AC_ARG_ENABLE(gd, - [AS_HELP_STRING([--enable-gd], [Enable the gd device driver])], - [enable_gd=$enableval], - [enable_gd=no]) - -AC_CHECK_LIB(plot, pl_closepl_r, , - [AC_MSG_ERROR([plotutils libraries not found])]) - -AC_ARG_ENABLE(gl, - [AS_HELP_STRING([--enable-gl], [Enable the OpenGL device driver])], - [enable_gl=$enableval], - [enable_gl=no]) - -AC_ARG_ENABLE(X, - [AS_HELP_STRING([--enable-X], [Enable the X11 device driver])], - [enable_x11=$enableval], - [enable_x11=no]) - -if test x"$enable_gd" = x"yes"; then - AC_CHECK_PROG(enable_gd, [gdlib-config],, - [AC_MSG_ERROR([GD driver requested but gdlib-config not found])]) - GD_LIBS="`gdlib-config --libs` -lgd" - GD_CFLAGS="`gdlib-config --cflags`" - AC_SUBST(GD_LIBS) - AC_SUBST(GD_CFLAGS) -fi -AM_CONDITIONAL(ENABLE_GD, [test x"$enable_gd" = x"yes"] ) - -if test x"$enable_gl" = x"yes"; then -dnl hardcoded opengl libs (should be host/implementation dependent) - AC_CHECK_HEADER(GL/gl.h,, - [AC_MSG_ERROR([OpenGL driver requested but header gl.h not found])]) - AC_CHECK_HEADER(GL/glu.h,, - [AC_MSG_ERROR([OpenGL driver requested but header glu.h not found])]) - GL_CFLAGS="-DUNIX_OS -DAPPEND_UNDERSCORE -DSUBROUTINE_CASE" - AC_SUBST(GL_CFLAGS) - - AC_CHECK_LIB(GL, glXCreateContext, GL_LIBS="-lGL", - [AC_MSG_ERROR([OpenGL driver requested but libraries not found])]) - AC_CHECK_LIB(GLU, gluPerspective, GL_LIBS="-lGL -lGLU", - [AC_MSG_ERROR([OpenGL driver requested but libraries not found])]) - GL_LIBS="-lGL -lGLU" - AC_SUBST(GL_LIBS) -fi -AM_CONDITIONAL(ENABLE_GL, [ test x"$enable_gl" = x"yes" ]) - -if test x"$enable_x11" = x"yes"; then - PKG_CHECK_MODULES(X11, x11,, - [AC_MSG_ERROR([X11 driver requested but pkgconfig module not found])]) -fi -AM_CONDITIONAL(ENABLE_X11, [ test x"$enable_x11" = x"yes" ]) - -AC_CONFIG_FILES([Makefile DPCOPA.INC dp1_linux.f]) -AC_OUTPUT diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest index 23761c102388..b02fba26e859 100644 --- a/sci-mathematics/flint/Manifest +++ b/sci-mathematics/flint/Manifest @@ -1,3 +1,2 @@ DIST flint-2.5.2.tar.gz 2212242 BLAKE2B 36b9b1f2acb1d79534d85884d755fddba3b8b40efbe92aeeecd7d1526cd21f0849054c30d23c565c6a13c609992cf22f56f5b640da15e1c7e6ba6840fc710d47 SHA512 cce36947b558aabecaf780171b4bbc0e1330c3b1a7e3580717584be5cab4991d33b190531c7995b224a3a440e28c4a610d6f781901e29f48ced12a9c5ba960a2 -DIST flint-2.6.3.tar.gz 4526340 BLAKE2B d663b44166cd857f83c2752eb4d4f6dc45eb8de535089e5dbe9939ac1464f1d69f66b62184644fff1ecd1d171f389d5ab874873def670c702733a0eba17bfd13 SHA512 8e71570364c789b1d4eaaa5f5adf10212cab47bf1a9f45c333211035ed021a86bb7b1de1feec51e83b2e113e8168853e370f127d2d2b1e941a12aec71fe8ae9e DIST flint-2.7.0.tar.gz 4943210 BLAKE2B a23b79195c71ef4691a450a82daded3de56eb51df1b3c850e13200527fff08da668281f350d7278ff52187eba8b7d9b27f4e69fafcaf771d8a01d72c6925b062 SHA512 6eac3d6fc306cacf482379074cba0d109aae4fbe8f907c17bcfe0afc2e8603c0fbe80e88a1ac374d9fa6d87aa59eb2b973f225a69da6dcc647255f060ad8711f diff --git a/sci-mathematics/flint/flint-2.6.3.ebuild b/sci-mathematics/flint/flint-2.6.3.ebuild deleted file mode 100644 index fbde1d0d4a83..000000000000 --- a/sci-mathematics/flint/flint-2.6.3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit cmake-utils python-any-r1 - -DESCRIPTION="Fast Library for Number Theory" -HOMEPAGE="https://www.flintlib.org/" -SRC_URI="http://www.flintlib.org/${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0/14" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="doc ntl test" - -RESTRICT="!test? ( test )" - -BDEPEND="doc? ( - dev-python/sphinx - app-text/texlive-core - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) - ${PYTHON_DEPS}" -DEPEND="dev-libs/gmp:= - dev-libs/mpfr:= - ntl? ( dev-libs/ntl:= )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-2.6.0-multilib-strict.patch -) - -src_configure() { - local mycmakeargs=( - -DWITH_NTL="$(usex ntl)" - -DBUILD_TESTING="$(usex test)" - -DBUILD_DOCS="$(usex doc)" - ) - - cmake-utils_src_configure - - if use doc ; then - HTML_DOCS="${BUILD_DIR}/html/*" - DOCS=( - "${S}"/README - "${S}"/AUTHORS - "${S}"/NEWS - "${BUILD_DIR}"/latex/Flint.pdf - ) - fi -} - -src_compile() { - cmake-utils_src_compile - - if use doc ; then - cmake-utils_src_make html - cmake-utils_src_make pdf - fi -} diff --git a/sci-mathematics/form/Manifest b/sci-mathematics/form/Manifest index b6fd32665e08..2901a66f405d 100644 --- a/sci-mathematics/form/Manifest +++ b/sci-mathematics/form/Manifest @@ -1,3 +1 @@ -DIST form-4.1.tar.gz 1260530 BLAKE2B ec279a069ea096089e9180541888f3212c6406311745a73cfd3f2e6da74f2fc88a93eea6d0d4af838fac6583e1eed5562455a40aca4cf502602552929453dfee SHA512 39ab2fa1e448d6d5e427cc2c92285cc27f84724addffc378f3b799fc2b3f6381b8dceb87cb980062b980885d8d81591c5c7ff7b0dbeae7b6d9a3cf0b03d58aae -DIST form-4.2.0.tar.gz 1386285 BLAKE2B 3f50fe992df2c5b0e36b278de4e65a353a75c4b2c57be0c55f9973a8177577ed76ee40f8628b13ae9c2b7d73f38a7b4710b96db38639faa8ff002f42a8ec32f8 SHA512 7566b89c1c1b74da58da92426f5e4beee271d4273df6cbe1d1de1a17377125b745103852c363dfe8ff1b0e9cb9ba4c84187406e8f77b23f5198fd592f5dfe341 DIST form-4.2.1.tar.gz 1444257 BLAKE2B 27ac9ee1412e6f478324b170e37e6e31822b74f902a5739d5fa00558aa4c9f7a977bd5fe3d6982313f1232a774c592d44af07fec8a290266c31bf3a100e87d1a SHA512 5569ae3e487194b0d082f4a032fb4b8d57238218d92d9b04d5f51db2a73e065eb1efdc26011bda46723e902fa3f324010ca2f8e91ba9a077e87b0a07b40cf594 diff --git a/sci-mathematics/form/form-4.1.ebuild b/sci-mathematics/form/form-4.1.ebuild deleted file mode 100644 index 16c8683ed40d..000000000000 --- a/sci-mathematics/form/form-4.1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools toolchain-funcs - -DESCRIPTION="Symbolic Manipulation System" -HOMEPAGE="https://www.nikhef.nl/~form/" -SRC_URI="https://www.nikhef.nl/~form/maindir/binaries/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="devref doc doxygen gmp mpi threads zlib" - -RDEPEND=" - gmp? ( dev-libs/gmp:0= ) - mpi? ( virtual/mpi ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - devref? ( dev-texlive/texlive-latex ) - doc? ( dev-texlive/texlive-latex ) - doxygen? ( app-doc/doxygen )" - -src_prepare() { - sed -i 's/LINKFLAGS = -s/LINKFLAGS =/' sources/Makefile.am || die - eautoreconf -} - -src_configure() { - econf \ - --enable-scalar \ - --enable-largefile \ - --disable-debug \ - --disable-static-link \ - --with-api=posix \ - $(use_with gmp ) \ - $(use_enable mpi parform ) \ - $(use_enable threads threaded ) \ - $(use_with zlib ) \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" -} - -src_compile() { - default - if use devref; then - pushd doc/devref > /dev/null || die "doc/devref does not exist" - LANG=C emake pdf - popd > /dev/null - fi - if use doc; then - pushd doc/manual > /dev/null || die "doc/manual does not exist" - LANG=C emake pdf - popd > /dev/null - fi - if use doxygen; then - pushd doc/doxygen > /dev/null || die "doc/doxygen does not exist" - emake html - popd > /dev/null - fi -} - -src_install() { - default - if use devref; then - insinto /usr/share/doc/${PF} - doins doc/devref/devref.pdf - fi - if use doc; then - insinto /usr/share/doc/${PF} - doins doc/manual/manual.pdf - fi - if use doxygen; then - dohtml -r doc/doxygen/html/* - fi -} diff --git a/sci-mathematics/form/form-4.2.0.ebuild b/sci-mathematics/form/form-4.2.0.ebuild deleted file mode 100644 index 6d627fb717dc..000000000000 --- a/sci-mathematics/form/form-4.2.0.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools toolchain-funcs - -DESCRIPTION="Symbolic Manipulation System" -HOMEPAGE="https://www.nikhef.nl/~form/" -SRC_URI="https://github.com/vermaseren/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="devref doc doxygen gmp mpi threads zlib" - -RDEPEND=" - gmp? ( dev-libs/gmp:0= ) - mpi? ( virtual/mpi ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - devref? ( dev-texlive/texlive-latex ) - doc? ( dev-texlive/texlive-latex ) - doxygen? ( app-doc/doxygen )" - -src_prepare() { - sed -i 's/LINKFLAGS = -s/LINKFLAGS =/' sources/Makefile.am || die - eautoreconf -} - -src_configure() { - econf \ - --enable-scalar \ - --enable-largefile \ - --disable-debug \ - --disable-static-link \ - --with-api=posix \ - $(use_with gmp ) \ - $(use_enable mpi parform ) \ - $(use_enable threads threaded ) \ - $(use_with zlib ) \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" -} - -src_compile() { - default - if use devref; then - pushd doc/devref > /dev/null || die "doc/devref does not exist" - LANG=C emake pdf - popd > /dev/null - fi - if use doc; then - pushd doc/manual > /dev/null || die "doc/manual does not exist" - LANG=C emake pdf - popd > /dev/null - fi - if use doxygen; then - pushd doc/doxygen > /dev/null || die "doc/doxygen does not exist" - emake html - popd > /dev/null - fi -} - -src_install() { - default - if use devref; then - insinto /usr/share/doc/${PF} - doins doc/devref/devref.pdf - fi - if use doc; then - insinto /usr/share/doc/${PF} - doins doc/manual/manual.pdf - fi - if use doxygen; then - dohtml -r doc/doxygen/html/* - fi -} diff --git a/sci-mathematics/fricas/Manifest b/sci-mathematics/fricas/Manifest index 6166377ba810..7e6fb084499d 100644 --- a/sci-mathematics/fricas/Manifest +++ b/sci-mathematics/fricas/Manifest @@ -1,3 +1 @@ -DIST fricas-1.3.4-full.tar.bz2 10381144 BLAKE2B caff50ef2b2d8e9ef76448c265316ac8878010c505f9d871aa5579210ab2de3915f56a44687d3f96aba1f857efc8b3ec182b9b6c5c390e38dbdaf7cdba188dcc SHA512 efee0d8a05979c806182e9e45f81b56037d1a660909971d6b94af1f97732cfb7b689709d8af4229b7f649506860b1ed915dd5afb91378f4c9d8a6e960a248170 -DIST fricas-1.3.5-full.tar.bz2 10477848 BLAKE2B 2431e6dacbe1fc9069baa4335876809ee334b677d3d1bd9ddfbb6c23f6bdaaf2307ec994956c736d9dbbe07915cb1e51a235ef58d6307bdd239dca1c19d65552 SHA512 b800a9b3793506e49a4c5a63bd12a20f00b183d00ed9bd0061865f6cea39b05c026975458dcb3bb7da652fb75b3ce6417bbe1c16312da08cd6a366428ae9eaf9 DIST fricas-1.3.6-full.tar.bz2 10422732 BLAKE2B c406907bbd8be66104db0ba52cfb49740a54daa53cbcb5949c4a4f090c7c978e8a5d345988544d4e93219be8c66a4c50b586ce4d99f32f8d020b1f015fe94b76 SHA512 5732a9645a15886a14b5778c3b2bd813462693e67ef2cd807742b325edd1ac4c3edbd671e25cc568c20e0a01b82d09defdac0b9eb7e355355461316be29d631c diff --git a/sci-mathematics/fricas/fricas-1.3.4.ebuild b/sci-mathematics/fricas/fricas-1.3.4.ebuild deleted file mode 100644 index f80354428cd3..000000000000 --- a/sci-mathematics/fricas/fricas-1.3.4.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit multilib elisp-common - -DESCRIPTION="FriCAS is a fork of Axiom computer algebra system" -HOMEPAGE="https://sourceforge.net/projects/fricas/" -SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.bz2" -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -# Supported lisps, number 0 is the default -LISPS=( sbcl cmucl gcl ecls clisp clozurecl ) -# Version restrictions, . means no restrictions -REST=( . . . . . . ) -# command name: . means just ${LISP} -COMS=( . lisp . ecl . ccl ) - -IUSE="${LISPS[*]} X emacs gmp" -RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE ) - emacs? ( >=app-editors/emacs-23.1:* ) - gmp? ( dev-libs/gmp:= )" - -# Generating lisp deps -n=${#LISPS[*]} -for ((n--; n > 0; n--)); do - LISP=${LISPS[$n]} - if [ "${REST[$n]}" = "." ]; then - DEP="dev-lisp/${LISP}" - else - DEP="${REST[$n]}" - fi - RDEPEND="${RDEPEND} ${LISP}? ( ${DEP}:= ) !${LISP}? (" -done -if [ "${REST[0]}" = "." ]; then - DEP="dev-lisp/${LISPS[0]}" -else - DEP="${REST[0]}" -fi -RDEPEND="${RDEPEND} ${DEP}:=" -n=${#LISPS[*]} -for ((n--; n > 0; n--)); do - RDEPEND="${RDEPEND} )" -done - -DEPEND="${RDEPEND}" - -# necessary for clisp and gcl -RESTRICT="strip" - -src_configure() { - local LISP n GMP - LISP=sbcl - n=${#LISPS[*]} - for ((n--; n > 0; n--)); do - if use ${LISPS[$n]}; then - LISP=${COMS[$n]} - if [ "${LISP}" = "." ]; then - LISP=${LISPS[$n]} - fi - fi - done - einfo "Using lisp: ${LISP}" - - # bug #650788 - if [[ ${LISP} = sbcl || ${LISP} = ccl ]] - then GMP=$(use_with gmp) - else GMP='' - fi - - # aldor is not yet in portage - econf --disable-aldor --with-lisp=${LISP} $(use_with X x) ${GMP} -} - -src_compile() { - # bug #300132 - emake -j1 -} - -src_test() { - emake -j1 all-input -} - -src_install() { - emake -j1 DESTDIR="${D}" install - dodoc README FAQ - - if use emacs; then - sed -e "s|(setq load-path (cons (quote \"/usr/$(get_libdir)/fricas/emacs\") load-path)) ||" \ - -i "${D}"/usr/bin/efricas \ - || die "sed efricas failed" - elisp-install ${PN} "${D}"/usr/$(get_libdir)/${PN}/emacs/*.el - elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el - else - rm "${D}"/usr/bin/efricas || die "rm efricas failed" - fi - rm -r "${D}"/usr/$(get_libdir)/${PN}/emacs || die "rm -r emacs failed" -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sci-mathematics/fricas/fricas-1.3.5.ebuild b/sci-mathematics/fricas/fricas-1.3.5.ebuild deleted file mode 100644 index f80354428cd3..000000000000 --- a/sci-mathematics/fricas/fricas-1.3.5.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit multilib elisp-common - -DESCRIPTION="FriCAS is a fork of Axiom computer algebra system" -HOMEPAGE="https://sourceforge.net/projects/fricas/" -SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.bz2" -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -# Supported lisps, number 0 is the default -LISPS=( sbcl cmucl gcl ecls clisp clozurecl ) -# Version restrictions, . means no restrictions -REST=( . . . . . . ) -# command name: . means just ${LISP} -COMS=( . lisp . ecl . ccl ) - -IUSE="${LISPS[*]} X emacs gmp" -RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE ) - emacs? ( >=app-editors/emacs-23.1:* ) - gmp? ( dev-libs/gmp:= )" - -# Generating lisp deps -n=${#LISPS[*]} -for ((n--; n > 0; n--)); do - LISP=${LISPS[$n]} - if [ "${REST[$n]}" = "." ]; then - DEP="dev-lisp/${LISP}" - else - DEP="${REST[$n]}" - fi - RDEPEND="${RDEPEND} ${LISP}? ( ${DEP}:= ) !${LISP}? (" -done -if [ "${REST[0]}" = "." ]; then - DEP="dev-lisp/${LISPS[0]}" -else - DEP="${REST[0]}" -fi -RDEPEND="${RDEPEND} ${DEP}:=" -n=${#LISPS[*]} -for ((n--; n > 0; n--)); do - RDEPEND="${RDEPEND} )" -done - -DEPEND="${RDEPEND}" - -# necessary for clisp and gcl -RESTRICT="strip" - -src_configure() { - local LISP n GMP - LISP=sbcl - n=${#LISPS[*]} - for ((n--; n > 0; n--)); do - if use ${LISPS[$n]}; then - LISP=${COMS[$n]} - if [ "${LISP}" = "." ]; then - LISP=${LISPS[$n]} - fi - fi - done - einfo "Using lisp: ${LISP}" - - # bug #650788 - if [[ ${LISP} = sbcl || ${LISP} = ccl ]] - then GMP=$(use_with gmp) - else GMP='' - fi - - # aldor is not yet in portage - econf --disable-aldor --with-lisp=${LISP} $(use_with X x) ${GMP} -} - -src_compile() { - # bug #300132 - emake -j1 -} - -src_test() { - emake -j1 all-input -} - -src_install() { - emake -j1 DESTDIR="${D}" install - dodoc README FAQ - - if use emacs; then - sed -e "s|(setq load-path (cons (quote \"/usr/$(get_libdir)/fricas/emacs\") load-path)) ||" \ - -i "${D}"/usr/bin/efricas \ - || die "sed efricas failed" - elisp-install ${PN} "${D}"/usr/$(get_libdir)/${PN}/emacs/*.el - elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el - else - rm "${D}"/usr/bin/efricas || die "rm efricas failed" - fi - rm -r "${D}"/usr/$(get_libdir)/${PN}/emacs || die "rm -r emacs failed" -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sci-mathematics/genius/Manifest b/sci-mathematics/genius/Manifest index d38b488a2248..670645d91298 100644 --- a/sci-mathematics/genius/Manifest +++ b/sci-mathematics/genius/Manifest @@ -1,3 +1,2 @@ -DIST genius-1.0.23.tar.xz 2910332 BLAKE2B 8c9822737dfd0b445092c6b96376249093f3cfece4f0b98cb1bf62e9066336875fc014798b301686a9ffcaf5e37c1f324771c5b9e86c1578455874964427cca6 SHA512 8c64235d22734a7653468d39500ebbaa38b0ba7c25e292b4e96ddf825082584bf8c70e7ddc463b685ea01d51d3e08233b4e0cf8816a9a0e3357badb90d8e43c7 DIST genius-1.0.25.tar.xz 2935920 BLAKE2B 9e5a58e15a1e53a64b10c662f1dea91ec80987d1be3ec208aaff76f59d1f9f5b2f9b2b1a2d6bede9c2cae5258038b2995b3bce6600471d088653b1392a1a8eb1 SHA512 ecd01acceb4cea3cb9796edaebc983ed7c0ee618737d98755882a845ddc07e1307851ef9fba75714bc33868556f03c004e03c3b9c42425293cb59a86b8af17a9 DIST genius-reference.pdf 1024944 BLAKE2B e0058fbd266a4ed4bf29306520ac64b7ff9a970fa79b5132f5556b61a97dd985fe916c888d0d5a678528ef231a9c66310dc2affe01491c7848451b3d54f58274 SHA512 04af3870104d2320b1d4b345d74d713a0dfcdf8a228002506508f437659b3ef6037ead0b1f6b37cc335692150750b58c4007fdaaddd9540233474ccd10dac285 diff --git a/sci-mathematics/genius/files/genius-1.0.23-tinfo.patch b/sci-mathematics/genius/files/genius-1.0.23-tinfo.patch deleted file mode 100644 index e3250f0817c5..000000000000 --- a/sci-mathematics/genius/files/genius-1.0.23-tinfo.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.gentoo.org/675670 - ---- genius-1.0.23/configure.ac -+++ genius-1.0.23/configure.ac -@@ -15,6 +15,8 @@ - - AC_PROG_INTLTOOL([0.21]) - -+PKG_PROG_PKG_CONFIG -+ - dnl ================= Requirements ================================================ - - VTE_REQUIRED=0.26.0 -@@ -64,8 +66,8 @@ - - dnl Check for termcap - AC_CHECK_LIB(termcap, tgetent,[TERMCAP_LIB="-ltermcap"], -- [AC_CHECK_LIB(ncurses, tgetent, -- [TERMCAP_LIB="-lncurses" -+ [PKG_CHECK_MODULES(NCURSES, ncurses, -+ [TERMCAP_LIB="$NCURSES_LIBS" - AC_DEFINE(USE_NCURSES,[1], [Use ncurses library]) - AC_CHECK_HEADER(ncurses/curses.h, [ - AC_DEFINE(INC_NCURSES,[1],[ncurses include])])], [ diff --git a/sci-mathematics/genius/genius-1.0.23.ebuild b/sci-mathematics/genius/genius-1.0.23.ebuild deleted file mode 100644 index f13471ac3010..000000000000 --- a/sci-mathematics/genius/genius-1.0.23.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit autotools gnome2 - -DESCRIPTION="Genius Mathematics Tool and the GEL Language" -HOMEPAGE="https://www.jirka.org/genius.html" -SRC_URI="${SRC_URI} - doc? ( https://www.jirka.org/${PN}-reference.pdf )" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc gnome" - -RDEPEND=" - >=dev-libs/glib-2.16:2 - dev-libs/gmp:0= - dev-libs/mpfr:0= - sys-libs/ncurses:0= - sys-libs/readline:0= - gnome? ( - >=x11-libs/gtk+-2.18:2 - x11-libs/gtksourceview:2.0 - >=x11-libs/vte-0.26.0:0 ) -" -DEPEND="${RDEPEND} - dev-util/gtk-update-icon-cache - dev-util/intltool - sys-devel/autoconf-archive - sys-devel/flex - virtual/yacc -" # eautoreconf needs sys-devel/autoconf-archive -# dev-util/gtk-update-icon-cache because configure checks for it for some reason and never calls it with DESTDIR set.. - -PATCHES=( - "${FILESDIR}/${PN}-1.0.23-tinfo.patch" - "${FILESDIR}/${PN}-1.0.24-no_scrollkeeper.patch" -) - -src_prepare() { - gnome2_src_prepare - eautoreconf -} - -src_configure() { - # Unrecognized --disable-scrollkeeper warning comes from gnome2.eclass adding it based on grep, but upstream has them commented out in .ac with "#" instead of "dnl" - gnome2_src_configure \ - $(use_enable gnome) \ - --enable-nls \ - --disable-extra-gcc-optimization \ - --disable-static -} - -src_install() { - use doc && DOCS+=" ${DISTDIR}/${PN}-reference.pdf" - gnome2_src_install -} diff --git a/sci-mathematics/ginac/Manifest b/sci-mathematics/ginac/Manifest index 0fd1bc438299..488cde2756a5 100644 --- a/sci-mathematics/ginac/Manifest +++ b/sci-mathematics/ginac/Manifest @@ -1,3 +1,2 @@ DIST ginac-1.6.6.tar.bz2 1028211 BLAKE2B 3f939e82cfa833ee5ba6714d4db38edf80de4e380b0bcacfe23992ca3c5eefbd719506cf77f57aebc1517968eff7d26c8d24d14167c596e5e7145458367074e8 SHA512 495ef255dd32e71ee91257a515c0566e56525e0c54c8955c19beaf9e2e55457f7d8171c7e5f6e4f29f555f5d262bbaf4edf4f033166c4904c016987a5029e958 DIST ginac-1.7.11.tar.bz2 1077491 BLAKE2B 741e9c8adfec15c225c3656b935707f86292b98310b50533269b238d1a9746bf54d186074c879fdbdd23f915dde225d9ee34fdbd87977835e8f9e78af364d77d SHA512 35a029915c946fcc10ba7b78df6fe1ece9a9f2f6bc172816a923c35f5b495154ab356526b904ac2a16a1bd6b0a81c480c5abb39ef40238ca7b32d1acbf97276c -DIST ginac-1.7.8.tar.bz2 1075317 BLAKE2B 6ae917b442c090fa6c6b28f543eecfc2a8119a63d15494933f0cb1c979f018d6439551e52e92b6d50c8cf83ce2df66aca4bb6be947e5b18cbfab2539c42e0ad2 SHA512 4d5a0e52108aee2438362d66d6b5f3e3a108855fc2c0ab2bc521ddc9a2a87c9b1404ae5304ba7d1dbcf6e985bfe26c730e14f3f46d63d0bdffe242f4a948c6a0 diff --git a/sci-mathematics/ginac/ginac-1.7.8.ebuild b/sci-mathematics/ginac/ginac-1.7.8.ebuild deleted file mode 100644 index b8985e5df43e..000000000000 --- a/sci-mathematics/ginac/ginac-1.7.8.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -DESCRIPTION="C++ library and tools for symbolic calculations" -SRC_URI="http://www.ginac.de/${P}.tar.bz2" -HOMEPAGE="https://www.ginac.de/" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc static-libs" - -RDEPEND=">=sci-libs/cln-1.2.2" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen - media-gfx/transfig - virtual/texi2dvi - dev-texlive/texlive-fontsrecommended - )" - -PATCHES=( "${FILESDIR}"/${PN}-1.5.1-pkgconfig.patch ) - -src_configure() { - append-cxxflags -std=c++14 - econf --disable-rpath -} - -src_compile() { - emake - if use doc; then - export VARTEXFONTS="${T}"/fonts - pushd doc/reference >> /dev/null || die "pushd doc/reference failed" - emake html pdf - popd >> /dev/null - pushd doc/tutorial >> /dev/null || die "pushd doc/tutorial failed" - emake ginac.pdf ginac.html - popd >> /dev/null - fi -} - -src_test() { - pushd ../${P}_build > /dev/null - emake check - popd > /dev/null -} - -src_install() { - default - if use doc; then - pushd doc > /dev/null || die "pushd doc failed" - newdoc tutorial/ginac.pdf tutorial.pdf - newdoc reference/reference.pdf reference.pdf - docinto html/reference - dodoc -r reference/html_files/. - docinto html - newdoc tutorial/ginac.html tutorial.html - docinto examples - dodoc "${S}"/doc/examples/*.cpp examples/ginac-examples.* - popd > /dev/null - fi -} diff --git a/sci-mathematics/gretl/Manifest b/sci-mathematics/gretl/Manifest index 35ae9075cd7d..3ca4fcb50dd3 100644 --- a/sci-mathematics/gretl/Manifest +++ b/sci-mathematics/gretl/Manifest @@ -1,2 +1 @@ -DIST gretl-1.9.14.tar.xz 7564192 BLAKE2B 45af589e18d44f6d9e3e5d27050fe07cb0d7241bc2d40a8ef0b5eeed40839812ea6775001712f7b176c902d968e58c0c6763a9e342ce6063a3773626f04d3f8f SHA512 61ff44cc52f3da971d3cf2cc6e52e0401280521fd761ea098f753acc529c9d35a12fc296b46136d5d257c9a29a83f91a78a77822a00ce3f65776a17f97223ee1 DIST gretl-1.9.90.tar.xz 7764820 BLAKE2B 1a47c31a62aad662ed3cfb4ad2057000eef14daf1f8cac4125f511f0229e29c1a7f43bc2e6014ec5b971173d9698e842c13e36b0f12faaa2f4fa996e26d984cb SHA512 35ec45fb2ad2dec490567411c1a5d909dc7fc8f0c4a6ca142e6e92b2d95a9efc9581f154a7806cf3f5178b530cdca9508b7c215bca29e1bcaebfa874d476667a diff --git a/sci-mathematics/gretl/files/gretl-1.9.14-readline.patch b/sci-mathematics/gretl/files/gretl-1.9.14-readline.patch deleted file mode 100644 index 9f6996b9c916..000000000000 --- a/sci-mathematics/gretl/files/gretl-1.9.14-readline.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- cli/complete.c.ORIG 2007-08-22 16:44:46.000000000 +0200 -+++ cli/complete.c 2014-03-26 16:54:40.463070119 +0100 -@@ -126,6 +126,6 @@ - rl_readline_name = "gretl"; - - /* Tell the completer that we want a crack first. */ -- rl_attempted_completion_function = (CPPFunction *) gretl_completion; -+ rl_attempted_completion_function = (rl_completion_func_t*) gretl_completion; - } - diff --git a/sci-mathematics/gretl/gretl-1.9.14.ebuild b/sci-mathematics/gretl/gretl-1.9.14.ebuild deleted file mode 100644 index 0e93f3cd9a20..000000000000 --- a/sci-mathematics/gretl/gretl-1.9.14.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -USE_EINSTALL=true - -inherit eutils elisp-common toolchain-funcs - -DESCRIPTION="Regression, econometrics and time-series library" -HOMEPAGE="https://sourceforge.net/projects/gretl/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="accessibility cpu_flags_x86_avx emacs gnome gtk nls odbc openmp python - readline cpu_flags_x86_sse2 R static-libs" - -CDEPEND=" - dev-libs/glib:2 - dev-libs/gmp:0= - dev-libs/libxml2:2 - dev-libs/mpfr:0 - sci-libs/fftw:3.0 - sci-visualization/gnuplot - virtual/lapack - virtual/latex-base - accessibility? ( app-accessibility/flite ) - emacs? ( >=app-editors/emacs-23.1:* ) - gtk? ( - media-libs/gd[png] - sci-visualization/gnuplot[gd] - x11-libs/gtk+:3 - x11-libs/gtksourceview:3.0 ) - odbc? ( dev-db/unixODBC ) - R? ( dev-lang/R ) - readline? ( sys-libs/readline:0 )" -RDEPEND="${CDEPEND} - python? ( dev-python/numpy )" -DEPEND="${CDEPEND} - virtual/pkgconfig" - -SITEFILE=50${PN}-gentoo.el - -REQUIRED_USE="emacs? ( gtk )" - -pkg_setup() { - if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp - then - ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 " - die "Need an OpenMP capable compiler" - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-readline.patch -} - -src_configure() { - econf \ - --disable-rpath \ - --enable-shared \ - --with-mpfr \ - $(use_enable cpu_flags_x86_avx avx) \ - $(use_enable gtk gui) \ - $(use_enable gtk gtk3) \ - $(use_enable gtk xdg) \ - $(use_enable gtk xdg-utils) \ - $(use_enable nls) \ - $(use_enable openmp) \ - $(use_enable cpu_flags_x86_sse2 sse2) \ - $(use_enable static-libs static) \ - $(use_with accessibility audio) \ - $(use_with odbc) \ - $(use_with readline) \ - $(use_with R libR) \ - ${myconf} \ - LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" -} - -src_compile() { - emake - if use emacs; then - cd utils/emacs && emake - elisp-compile gretl.el - fi -} - -src_install() { - # to fix - emake -j1 DESTDIR="${D}" install - if use emacs; then - elisp-install ${PN} utils/emacs/gretl.{el,elc} - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - dodoc README README.audio ChangeLog CompatLog -} - -pkg_postinst() { - if use emacs; then - elisp-site-regen - elog "To begin using gretl-mode for all \".inp\" files that you edit," - elog "add the following line to your \"~/.emacs\" file:" - elog " (add-to-list 'auto-mode-alist '(\"\\\\.inp\\\\'\" . gretl-mode))" - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sci-mathematics/jags/Manifest b/sci-mathematics/jags/Manifest index 1345c4bd29d3..c20bc1cbe762 100644 --- a/sci-mathematics/jags/Manifest +++ b/sci-mathematics/jags/Manifest @@ -1,4 +1 @@ -DIST JAGS-3.4.0.tar.gz 1677450 BLAKE2B 130f2df593852657154825a0f059f805f93bd2631839093953f83dee0b6cc2bfaba31d2b59d6fe6d03150a09a1e3d2d11f7f50c378f8d89711e5ae9c71ba8488 SHA512 7a330ea41eab63b23d8ae3622c6920f0dc3dba653a18256957b9b862bb86b746ff706e9e9bf3f806524250b439161a6df4ad05af682354073f9b0074f9825896 -DIST JAGS-4.0.0.tar.gz 1880476 BLAKE2B 22bb4de85b1d4a9567efb8005fd55ecdda1f201c16278e83ffa6c2239371e4dbfa0b5d70aaa34a1cca96320fcf94753d3571e589b5246d77ae3fe3a0575c3a4b SHA512 bbe4f4600dff0fc1db6f8548b8d386ea804174d69788646681de6d006a0e0ab018fb01257b5737f871d10c8b59865950fb91b6a9cad5d1e6addc415004c6f82c -DIST JAGS-4.1.0.tar.gz 1872634 BLAKE2B a9611917da3cef38ca8053442fc0563af7c04e62d09692381f4a6ddf3ea28149426ae9babd485213b76217936ac1e469a1d66548eadb2f585f07aace4c54f619 SHA512 76b52764e57e6c4450cc52c7c7c3de384f93bd6e57d8b88f1863b7c329bdd2ec39834902c223d433d263bcf29362b958807a9cb96b9066d4f75832b366339fd8 DIST JAGS-4.2.0.tar.gz 1875538 BLAKE2B 039cefdb546ec28b905f22a4ec3dfe6d85c64064701283fe38be59f53da971b523d8bb5b7c5efe3e9da81a255b064cb8b66cac2fd4e844883b7fcf89cdabdbb1 SHA512 316483cd1a879c70c9b8ad6f23665196b95b9745da3924a47e14f4b0fd7c1abf9237575561cb31044623594360b6e991de68e1d9746baedeb285c65b77baada8 diff --git a/sci-mathematics/jags/jags-3.4.0.ebuild b/sci-mathematics/jags/jags-3.4.0.ebuild deleted file mode 100644 index ec6c4e96ca78..000000000000 --- a/sci-mathematics/jags/jags-3.4.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools-utils toolchain-funcs - -MYP="JAGS-${PV}" - -DESCRIPTION="Just Another Gibbs Sampler for Bayesian MCMC simulation" -HOMEPAGE="https://sourceforge.net/projects/mcmc-jags/" -SRC_URI="mirror://sourceforge/project/mcmc-jags/JAGS/3.x/Source/${MYP}.tar.gz" -LICENSE="GPL-2" -IUSE="doc" - -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - virtual/blas - virtual/lapack" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( - virtual/latex-base - dev-texlive/texlive-latexextra - )" - -S="${WORKDIR}/${MYP}" - -src_configure() { - local myeconfargs=( - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" - ) - autotools-utils_src_configure -} - -src_compile() { - autotools-utils_src_compile all $(use doc && echo docs) -} - -src_install() { - autotools-utils_src_install - use doc && dodoc "${BUILD_DIR}"/doc/manual/*.pdf -} diff --git a/sci-mathematics/jags/jags-4.0.0.ebuild b/sci-mathematics/jags/jags-4.0.0.ebuild deleted file mode 100644 index d9d373dbde55..000000000000 --- a/sci-mathematics/jags/jags-4.0.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools-utils toolchain-funcs - -MYP="JAGS-${PV}" - -DESCRIPTION="Just Another Gibbs Sampler for Bayesian MCMC simulation" -HOMEPAGE="https://sourceforge.net/projects/mcmc-jags/" -SRC_URI="mirror://sourceforge/project/mcmc-jags/JAGS/4.x/Source/${MYP}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc" - -RDEPEND=" - virtual/blas - virtual/lapack" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( - virtual/latex-base - dev-texlive/texlive-latexextra - )" - -S="${WORKDIR}/${MYP}" - -src_configure() { - local myeconfargs=( - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" - ) - autotools-utils_src_configure -} - -src_compile() { - autotools-utils_src_compile all $(usex doc docs "") -} - -src_install() { - autotools-utils_src_install - use doc && dodoc "${BUILD_DIR}"/doc/manual/*.pdf -} diff --git a/sci-mathematics/jags/jags-4.1.0.ebuild b/sci-mathematics/jags/jags-4.1.0.ebuild deleted file mode 100644 index 4084bd81bbf3..000000000000 --- a/sci-mathematics/jags/jags-4.1.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils ltprune toolchain-funcs - -MYP="JAGS-${PV}" - -DESCRIPTION="Just Another Gibbs Sampler for Bayesian MCMC simulation" -HOMEPAGE="https://sourceforge.net/projects/mcmc-jags/" -SRC_URI="mirror://sourceforge/project/mcmc-jags/JAGS/4.x/Source/${MYP}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc" - -RDEPEND=" - virtual/blas - virtual/lapack" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( - virtual/latex-base - dev-texlive/texlive-latexextra - )" - -S="${WORKDIR}/${MYP}" - -src_configure() { - econf \ - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" -} - -src_compile() { - emake all $(usex doc docs "") -} - -src_install() { - default - use doc && dodoc doc/manual/*.pdf - prune_libtool_files -} diff --git a/sci-mathematics/mathematica/Manifest b/sci-mathematics/mathematica/Manifest index 4abc79ccc18c..d39a2b135362 100644 --- a/sci-mathematics/mathematica/Manifest +++ b/sci-mathematics/mathematica/Manifest @@ -1,3 +1 @@ -DIST Mathematica_10.3.1_LINUX.sh 3200459545 BLAKE2B 5a057b4e714eabb0afebe5a3ef536dbdc2d49a775130442e21493d6a0756527362fddfa7fabf927f996464456309c37b10b70a37f05718cb9f79d8ffc5912098 SHA512 08658a01a18c14a9b3f422816007980bf6576162e4cca6779ed1bdaf6b9748fb36a195006529ed6725f462042a264e7ee7753e802af8072ba6bebfee0cad8543 -DIST Mathematica_12.1.0_LINUX.sh 5889770327 BLAKE2B b0e637714f376d4066d5e484ef9facdcac36db691f7fd93e4a8228960acc9ec4b74b12ca19556c01247bd7927497f01f0c339a099b7f5abc7547051cc99c1fce SHA512 a661aa644944ee1058d7429f352ba6508514314086676a6eb918aac32773cc949feb531951b614be53198fa863575d8db456c66aa1306fd858c23423ef590fbb DIST Mathematica_12.1.1_LINUX.sh 4438946649 BLAKE2B 473f814a3e0686bb3a6ac1f49c887842bc17db11439b65c1dad1dae8cd5797e6762d94bccdf156f6f9ba1edb9a16ed5172936a6884d2f0f98c29808214b1eabe SHA512 5cfdd91bae9bad53afe405b40759732589119256c3f785058808b20faf21f593d90bf7bb2dbaccf3e983aa84ff380a1fa6d40fd63f5ba17109c1cd6818c63490 diff --git a/sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild b/sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild deleted file mode 100644 index 6abf0f35a7dd..000000000000 --- a/sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop multilib xdg - -DESCRIPTION="Wolfram Mathematica" -SRC_URI="Mathematica_${PV}_LINUX.sh" -HOMEPAGE="https://www.wolfram.com/mathematica/" - -LICENSE="all-rights-reserved" -KEYWORDS="-* ~amd64" -SLOT="0" -IUSE="+doc" - -RESTRICT="strip mirror bindist fetch" - -DEPEND="" - -# Mathematica comes with a lot of bundled stuff. We should place here only what we -# explicitly override with LD_PRELOAD. -RDEPEND=" - media-libs/freetype -" - -# we need this a few times -MPN="Mathematica" -MPV=$(ver_cut 1-2) -M_BINARIES="MathKernel Mathematica MathematicaScript WolframKernel WolframScript math mathematica mcc wolfram" -M_TARGET="opt/Wolfram/${MPN}/${MPV}" - -# we might as well list all files in all QA variables... -QA_PREBUILT="opt/*" - -S=${WORKDIR} - -src_unpack() { - /bin/sh "${DISTDIR}/${A}" --nox11 --confirm -- -auto "-targetdir=${S}/${M_TARGET}" "-execdir=${S}/opt/bin" || die -} - -src_install() { - local ARCH='-x86-64' - - einfo 'Removing MacOS- and Windows-specific files' - find AddOns SystemFiles -type d -\( -name Windows -o -name Windows-x86-64 \ - -o -name MacOSX -o -name MacOSX-x86-64 -\) -delete - - if ! use doc; then - einfo "Removing documentation" - rm -r "${S}/${M_TARGET}/Documentation" - fi - - # move all over - mv "${S}"/opt "${D}"/opt || die - - # the autogenerated symlinks point into sandbox, remove - rm "${D}"/opt/bin/* || die - - # install wrappers instead - for name in ${M_BINARIES} ; do - einfo "Generating wrapper for ${name}" - echo '#!/bin/sh' >> "${T}/${name}" - echo "LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/$(get_libdir)/libz.so.1 /${M_TARGET}/Executables/${name} \$*" \ - >> "${T}/${name}" - dobin "${T}/${name}" - done - for name in ${M_BINARIES} ; do - einfo "Symlinking ${name} to /opt/bin" - dosym ../../usr/bin/${name} /opt/bin/${name} - done - - # fix some embedded paths and install desktop files - for filename in $(find "${D}/${M_TARGET}/SystemFiles/Installation" -name "wolfram-mathematica.desktop") ; do - echo Fixing "${filename}" - sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}" - echo "Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}" - domenu "${filename}" - done - - # install mime types - insinto /usr/share/mime/application - for filename in $(find "${D}/${M_TARGET}/SystemFiles/Installation" -name "application-*.xml"); do - basefilename=$(basename "${filename}") - mv "${filename}" "${T}/${basefilename#application-}" - doins "${T}/${basefilename#application-}" - done -} - -pkg_nofetch() { - einfo "Please place the Wolfram Mathematica installation file ${SRC_URI}" - einfo "in your \$\{DISTDIR\}." - einfo "Note that to actually run and use Mathematica you need a valid license." - einfo "Wolfram provides time-limited evaluation licenses at ${HOMEPAGE}" -} diff --git a/sci-mathematics/mathematica/mathematica-12.1.0.ebuild b/sci-mathematics/mathematica/mathematica-12.1.0.ebuild deleted file mode 100644 index 20aaab87c6fa..000000000000 --- a/sci-mathematics/mathematica/mathematica-12.1.0.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop multilib xdg - -DESCRIPTION="Wolfram Mathematica" -SRC_URI="Mathematica_${PV}_LINUX.sh" -HOMEPAGE="https://www.wolfram.com/mathematica/" - -LICENSE="all-rights-reserved" -KEYWORDS="-* ~amd64" -SLOT="0" -IUSE="+doc" - -RESTRICT="strip mirror bindist fetch" - -DEPEND="" - -# Mathematica comes with a lot of bundled stuff. We should place here only what we -# explicitly override with LD_PRELOAD. -RDEPEND=" - media-libs/freetype -" - -# we need this a few times -MPN="Mathematica" -MPV=$(ver_cut 1-2) -M_BINARIES="MathKernel Mathematica MathematicaScript WolframKernel WolframScript math mathematica mcc wolfram" -M_TARGET="opt/Wolfram/${MPN}/${MPV}" - -# we might as well list all files in all QA variables... -QA_PREBUILT="opt/*" - -S=${WORKDIR} - -src_unpack() { - /bin/sh "${DISTDIR}/${A}" --nox11 --keep --target "${S}/unpack" -- "-help" || die -} - -src_prepare() { - default - - pushd "${S}/unpack" > /dev/null || die - - # fix ACCESS DENIED issue when installer check the avahi-daemon - sed -e "s:avahi-daemon -c:true:g" -i "Unix/Installer/MathInstaller" || die - - /bin/sh "Unix/Installer/MathInstaller" -auto "-targetdir=${S}/${M_TARGET}" "-execdir=${S}/opt/bin" || die - - popd > /dev/null || die -} - -src_install() { - local ARCH='-x86-64' - - if ! use doc; then - einfo "Removing documentation" - rm -r "${S}/${M_TARGET}/Documentation" - fi - - einfo 'Removing MacOS- and Windows-specific files' - find AddOns SystemFiles -type d -\( -name Windows -o -name Windows-x86-64 \ - -o -name MacOSX -o -name MacOSX-x86-64 -\) -delete - - # move all over - mv "${S}"/opt "${D}"/opt || die - - # the autogenerated symlinks point into sandbox, remove - rm "${D}"/opt/bin/* || die - - # install wrappers instead - for name in ${M_BINARIES} ; do - einfo "Generating wrapper for ${name}" - echo '#!/bin/sh' >> "${T}/${name}" - echo "LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/$(get_libdir)/libz.so.1 /${M_TARGET}/Executables/${name} \$*" \ - >> "${T}/${name}" - dobin "${T}/${name}" - done - for name in ${M_BINARIES} ; do - einfo "Symlinking ${name} to /opt/bin" - dosym ../../usr/bin/${name} /opt/bin/${name} - done - - # fix some embedded paths and install desktop files - for filename in $(find "${D}/${M_TARGET}/SystemFiles/Installation" -name "wolfram-mathematica.desktop") ; do - echo Fixing "${filename}" - sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}" - echo "Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}" - domenu "${filename}" - done - - # install mime types - insinto /usr/share/mime/application - for filename in $(find "${D}/${M_TARGET}/SystemFiles/Installation" -name "application-*.xml"); do - basefilename=$(basename "${filename}") - mv "${filename}" "${T}/${basefilename#application-}" - doins "${T}/${basefilename#application-}" - done -} - -pkg_nofetch() { - einfo "Please place the Wolfram Mathematica installation file ${SRC_URI}" - einfo "in your \$\{DISTDIR\}." - einfo "Note that to actually run and use Mathematica you need a valid license." - einfo "Wolfram provides time-limited evaluation licenses at ${HOMEPAGE}" -} diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest index 2c38b1e48d0d..1fd7d2d37f55 100644 --- a/sci-mathematics/maxima/Manifest +++ b/sci-mathematics/maxima/Manifest @@ -1,4 +1,2 @@ DIST maxima-5.42.1.tar.gz 41865510 BLAKE2B d3b8a50594dc0cef0c354c42be1aee96df77a4e222dbe457edeb47d7fe77a8fe376b10ce8da9e4ff6c447242e9c53a32286d09a64d8600112f6feda92f1fb58d SHA512 79c5e70119b0384d9dd8aa47c7e96a0ccb7e6367526b8a14d21f00137a1c2f0c8b7990bb7231d7c90ffa0090f67c1fa30a418d013d9c5982030ae68de9717f48 -DIST maxima-5.42.2.tar.gz 41840181 BLAKE2B bca8a94366f1fe2f508436fdef8de80107b19c9b267a4b72dc6f56870078d35b3feb7dbdda384589b38c5351d6eeede1b9738a5ec2152063de2afacd1ced48c4 SHA512 5033b02272121f6aacff5ededf90eaad5e644a06d0c62aafd745401c08429da979ecd8274f7aa12596a0e32ddb614659af14e4273f59d372fe1ecbec081e7829 -DIST maxima-5.43.2.tar.gz 40871773 BLAKE2B a00a6ca06159d5acde195d9dc0f59d3a4b72738b2690997c18a9d1b2c642983b3a2005aee98544d4f45d8bc9ee5d9c6b0e43e4be40df4224b0174662bd75f71d SHA512 b2503440b2c4d515de9a39dd6acbe1c8dfae5daf083c47b6af2ffce381ad48923d1fa4e5f25ec1dc0621ad592b23cebc4c456b8ee2ee52bea958df6fb9df26fd DIST maxima-5.44.0.tar.gz 34976354 BLAKE2B d6870b6fb0581d9e60d6ed97c7daed8ce12b8b1ae49d0edb7b8d31dd723f9b879eb70440659ff958f53cee16d8d2a92f80dcaa3898d9f6dbabd79a5059073a65 SHA512 1e043bebb7c6d002c113d8de20a98d58d1a8e7bedfc9bcf52819e7c7554655991dc2f42f0333889706574249736db833a237b3e59b967e7e42ede28262e31f2f diff --git a/sci-mathematics/maxima/maxima-5.42.2.ebuild b/sci-mathematics/maxima/maxima-5.42.2.ebuild deleted file mode 100644 index c83e43e58864..000000000000 --- a/sci-mathematics/maxima/maxima-5.42.2.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools elisp-common eutils xdg-utils - -DESCRIPTION="Free computer algebra environment based on Macsyma" -HOMEPAGE="https://sourceforge.net/projects/maxima/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2 GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" - -# Supported lisps -LISPS=( sbcl cmucl gcl ecls clozurecl clisp ) -# <lisp> supports readline: . - no, y - yes -SUPP_RL=( . . y . . y ) -# . - just --enable-<lisp>, <flag> - --enable-<flag> -CONF_FLAG=( . . . ecl ccl . ) -# patch file version; . - no patch -PATCH_V=( 2 1 . 3 2 1 ) - -IUSE="emacs tk nls unicode X ${LISPS[*]}" - -# Languages -LANGS="de es pt pt_BR" -for lang in ${LANGS}; do - IUSE="${IUSE} l10n_${lang/_/-}" -done - -# texlive-latexrecommended needed by imaxima for breqn.sty -RDEPEND="!app-emacs/imaxima - X? ( x11-misc/xdg-utils - sci-visualization/gnuplot[gd] - tk? ( dev-lang/tk:0 ) ) - emacs? ( >=app-editors/emacs-23.1:* - virtual/latex-base - app-emacs/auctex - app-text/ghostscript-gpl - dev-texlive/texlive-latexrecommended )" - -# generating lisp dependencies -depends() { - local LISP DEP - LISP=${LISPS[$1]} - DEP="dev-lisp/${LISP}:=" - if [ "${SUPP_RL[$1]}" = "." ]; then - DEP="${DEP} app-misc/rlwrap" - fi - echo ${DEP} -} - -n=${#LISPS[*]} -for ((n--; n >= 0; n--)); do - LISP=${LISPS[${n}]} - RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )" - DEF_DEP="${DEF_DEP} !${LISP}? ( " -done - -# default lisp -DEF_LISP=0 # sbcl -ARM_LISP=2 # gcl -DEF_DEP="${DEF_DEP} arm? ( `depends ${ARM_LISP}` ) !arm? ( `depends ${DEF_LISP}` )" - -n=${#LISPS[*]} -for ((n--; n >= 0; n--)); do - DEF_DEP="${DEF_DEP} )" -done - -unset LISP - -RDEPEND="${RDEPEND} - ${DEF_DEP}" - -DEPEND="${RDEPEND} - sys-apps/texinfo" - -TEXMF="${EPREFIX}"/usr/share/texmf-site - -pkg_setup() { - local n=${#LISPS[*]} - - for ((n--; n >= 0; n--)); do - use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}" - done - - if [ -z "${NLISPS}" ]; then - use arm && DEF_LISP=${ARM_LISP} - ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default" - NLISPS=${DEF_LISP} - fi -} - -src_prepare() { - local n PATCHES v - PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 ) - - n=${#PATCHES[*]} - for ((n--; n >= 0; n--)); do - eapply "${FILESDIR}"/${PATCHES[${n}]}.patch - done - - n=${#LISPS[*]} - for ((n--; n >= 0; n--)); do - v=${PATCH_V[${n}]} - if [ "${v}" != "." ]; then - eapply "${FILESDIR}"/${LISPS[${n}]}-${v}.patch - fi - done - - eapply_user - - # bug #343331 - rm share/Makefile.in || die - rm src/Makefile.in || die - touch src/*.mk - touch src/Makefile.am - eautoreconf -} - -src_configure() { - local CONFS CONF n lang - for n in ${NLISPS}; do - CONF=${CONF_FLAG[${n}]} - if [ ${CONF} = . ]; then - CONF=${LISPS[${n}]} - fi - CONFS="${CONFS} --enable-${CONF}" - done - - # enable existing translated doc - if use nls; then - for lang in ${LANGS}; do - if use "l10n_${lang/_/-}"; then - CONFS="${CONFS} --enable-lang-${lang}" - use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8" - fi - done - fi - - econf ${CONFS} \ - $(use_with tk wish) \ - $(use_enable emacs) \ - --with-lispdir="${EPREFIX}/${SITELISP}/${PN}" -} - -src_compile() { - emake - if use emacs; then - pushd interfaces/emacs/emaxima > /dev/null - elisp-compile *.el - popd > /dev/null - pushd interfaces/emacs/imaxima > /dev/null - BYTECOMPFLAGS="-L . -L ../emaxima" - elisp-compile *.el - popd > /dev/null - fi -} - -src_install() { - docompress -x /usr/share/info - emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install - - use tk && make_desktop_entry xmaxima xmaxima \ - /usr/share/${PN}/${PV}/xmaxima/maxima-new.png \ - "Science;Math;Education" - - # do not use dodoc because interfaces can't read compressed files - # read COPYING before attempt to remove it from dodoc - insinto /usr/share/${PN}/${PV}/doc - doins AUTHORS COPYING README README.lisps - dodir /usr/share/doc - dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} - - if use emacs; then - elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp} - elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el - - rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die - insinto ${TEXMF}/tex/latex/emaxima - doins interfaces/emacs/emaxima/emaxima.sty - - insinto /usr/share/${PN}/${PV}/doc/imaxima - doins interfaces/emacs/imaxima/README - doins -r interfaces/emacs/imaxima/imath-example - fi - - # if we use ecls, build an ecls library for maxima - if use ecls; then - ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"` - insinto "${ECLLIB#${EPREFIX}}" - doins src/binary-ecl/maxima.fas - fi -} - -pkg_postinst() { - xdg_mimeinfo_database_update - if use emacs; then - elisp-site-regen - mktexlsr - fi -} - -pkg_postrm() { - xdg_mimeinfo_database_update - if use emacs; then - elisp-site-regen - mktexlsr - fi -} diff --git a/sci-mathematics/maxima/maxima-5.43.2.ebuild b/sci-mathematics/maxima/maxima-5.43.2.ebuild deleted file mode 100644 index b62269f31c88..000000000000 --- a/sci-mathematics/maxima/maxima-5.43.2.ebuild +++ /dev/null @@ -1,214 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools elisp-common eutils xdg-utils - -DESCRIPTION="Free computer algebra environment based on Macsyma" -HOMEPAGE="https://sourceforge.net/projects/maxima/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2 GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" - -# Supported lisps -LISPS=( sbcl cmucl gcl ecls clozurecl clisp ) -# <lisp> supports readline: . - no, y - yes -SUPP_RL=( . . y . . y ) -# . - just --enable-<lisp>, <flag> - --enable-<flag> -CONF_FLAG=( . . . ecl ccl . ) -# patch file version; . - no patch -PATCH_V=( 2 1 . 3 3 1 ) - -IUSE="emacs tk nls unicode X test ${LISPS[*]}" -RESTRICT="!test? ( test )" - -# Languages -LANGS="de es pt pt_BR" -for lang in ${LANGS}; do - IUSE="${IUSE} l10n_${lang/_/-}" -done - -# texlive-latexrecommended needed by imaxima for breqn.sty -RDEPEND=" - X? ( x11-misc/xdg-utils - sci-visualization/gnuplot[gd] - tk? ( dev-lang/tk:0 ) ) - emacs? ( >=app-editors/emacs-23.1:* - virtual/latex-base - app-emacs/auctex - app-text/ghostscript-gpl - dev-texlive/texlive-latexrecommended )" - -# generating lisp dependencies -depends() { - local LISP DEP - LISP=${LISPS[$1]} - DEP="dev-lisp/${LISP}:=" - if [ "${SUPP_RL[$1]}" = "." ]; then - DEP="${DEP} app-misc/rlwrap" - fi - echo ${DEP} -} - -n=${#LISPS[*]} -for ((n--; n >= 0; n--)); do - LISP=${LISPS[${n}]} - RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )" - DEF_DEP="${DEF_DEP} !${LISP}? ( " -done - -# default lisp -DEF_LISP=0 # sbcl -ARM_LISP=2 # gcl -DEF_DEP="${DEF_DEP} arm? ( `depends ${ARM_LISP}` ) !arm? ( `depends ${DEF_LISP}` )" - -n=${#LISPS[*]} -for ((n--; n >= 0; n--)); do - DEF_DEP="${DEF_DEP} )" -done - -unset LISP - -RDEPEND="${RDEPEND} - ${DEF_DEP}" - -DEPEND="${RDEPEND} - test? ( sci-visualization/gnuplot ) - sys-apps/texinfo" - -TEXMF="${EPREFIX}"/usr/share/texmf-site - -pkg_setup() { - local n=${#LISPS[*]} - - for ((n--; n >= 0; n--)); do - use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}" - done - - if [ -z "${NLISPS}" ]; then - use arm && DEF_LISP=${ARM_LISP} - ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default" - NLISPS=${DEF_LISP} - fi -} - -src_prepare() { - local n PATCHES v - PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 texinfo-0 ) - - n=${#PATCHES[*]} - for ((n--; n >= 0; n--)); do - eapply "${FILESDIR}"/${PATCHES[${n}]}.patch - done - - n=${#LISPS[*]} - for ((n--; n >= 0; n--)); do - v=${PATCH_V[${n}]} - if [ "${v}" != "." ]; then - eapply "${FILESDIR}"/${LISPS[${n}]}-${v}.patch - fi - done - - eapply_user - - # bug #343331 - rm share/Makefile.in || die - rm src/Makefile.in || die - touch src/*.mk - touch src/Makefile.am - eautoreconf -} - -src_configure() { - local CONFS CONF n lang - for n in ${NLISPS}; do - CONF=${CONF_FLAG[${n}]} - if [ ${CONF} = . ]; then - CONF=${LISPS[${n}]} - fi - CONFS="${CONFS} --enable-${CONF}" - done - - # enable existing translated doc - if use nls; then - for lang in ${LANGS}; do - if use "l10n_${lang/_/-}"; then - CONFS="${CONFS} --enable-lang-${lang}" - use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8" - fi - done - fi - - econf ${CONFS} \ - $(use_with tk wish) \ - $(use_enable emacs) \ - --with-lispdir="${EPREFIX}/${SITELISP}/${PN}" -} - -src_compile() { - emake - if use emacs; then - pushd interfaces/emacs/emaxima > /dev/null - elisp-compile *.el - popd > /dev/null - pushd interfaces/emacs/imaxima > /dev/null - BYTECOMPFLAGS="-L . -L ../emaxima" - elisp-compile *.el - popd > /dev/null - fi -} - -src_install() { - docompress -x /usr/share/info - emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install - - use tk && make_desktop_entry xmaxima xmaxima \ - /usr/share/${PN}/${PV}/xmaxima/maxima-new.png \ - "Science;Math;Education" - - # do not use dodoc because interfaces can't read compressed files - # read COPYING before attempt to remove it from dodoc - insinto /usr/share/${PN}/${PV}/doc - doins AUTHORS COPYING README README.lisps - dodir /usr/share/doc - dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} - - if use emacs; then - elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp} - elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el - - rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die - insinto ${TEXMF}/tex/latex/emaxima - doins interfaces/emacs/emaxima/emaxima.sty - - insinto /usr/share/${PN}/${PV}/doc/imaxima - doins interfaces/emacs/imaxima/README - doins -r interfaces/emacs/imaxima/imath-example - fi - - # if we use ecls, build an ecls library for maxima - if use ecls; then - ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"` - insinto "${ECLLIB#${EPREFIX}}" - doins src/binary-ecl/maxima.fas - fi -} - -pkg_postinst() { - xdg_mimeinfo_database_update - if use emacs; then - elisp-site-regen - mktexlsr - fi -} - -pkg_postrm() { - xdg_mimeinfo_database_update - if use emacs; then - elisp-site-regen - mktexlsr - fi -} diff --git a/sci-mathematics/minisat/Manifest b/sci-mathematics/minisat/Manifest index 558c507bbb33..4f851e3ea3c4 100644 --- a/sci-mathematics/minisat/Manifest +++ b/sci-mathematics/minisat/Manifest @@ -1,3 +1,2 @@ DIST MiniSat.pdf 327416 BLAKE2B 77f77d763c9554680b4c5e1688801e8462102e8ddbcc3b53badccee17a98f935ef0e971a636abeb04021a2b3a3e9d6acfe4828b5dd20e6ef8733d71788cc31b0 SHA512 94e70c721740c0b7fd52621c7a5e43dd9207eed92e60a1c64ee63b541b9861d2580d14ba64c49c6c4f273ac028ded43bc944c71131e51693cdd7d1763af582f6 -DIST minisat-2.2.0.tar.gz 43879 BLAKE2B da4fd7694db0fe7b9a0979de8f2f3f005d7f112e2b2fe9e30b0dd6b5a5fb5bf6c7fd4ef8e8f2dd9fec34f8d5bfebb5be622810e07ca45da6989d2f84a011edc6 SHA512 cf79b05d43ebdc8fd8081899a1f853370de051cafe6e5b143eaff9827efc542b58062782a3ce2a3d1a03561a9ffd780c9cdc645bb50036eb61e80fa729136e64 DIST minisat-2.2.0_p20130925.tar.gz 49544 BLAKE2B 8c6893fb6c604140609c36cc912c02a73c1f2726d7f399595c50d674aff69c57f9c4914da6d95c37a46fefc218dd4b0550645bd7058d46640d08103e2a4ec333 SHA512 37fc35cc4f3104d7f0e8ee9f7123fc34e175df578658266799d809d71d6cf081e811919f304a02f6cb9c3827d308e59408149d63d1d1e7c6d0b495350f93b3d9 diff --git a/sci-mathematics/minisat/files/minisat-2.2.0-header_fix.patch b/sci-mathematics/minisat/files/minisat-2.2.0-header_fix.patch deleted file mode 100644 index 486c012fe2a4..000000000000 --- a/sci-mathematics/minisat/files/minisat-2.2.0-header_fix.patch +++ /dev/null @@ -1,160 +0,0 @@ ---- ./utils/System.h.orig 2010-07-10 09:07:36.000000000 -0700 -+++ ./utils/System.h 2011-04-12 18:33:41.000000000 -0700 -@@ -25,7 +25,7 @@ - #include <fpu_control.h> - #endif - --#include "mtl/IntTypes.h" -+#include <mtl/IntTypes.h> - - //------------------------------------------------------------------------------------------------- - ---- ./utils/Options.h.orig 2010-07-10 09:07:36.000000000 -0700 -+++ ./utils/Options.h 2011-04-12 18:34:38.000000000 -0700 -@@ -25,9 +25,9 @@ - #include <math.h> - #include <string.h> - --#include "mtl/IntTypes.h" --#include "mtl/Vec.h" --#include "utils/ParseUtils.h" -+#include <mtl/IntTypes.h> -+#include <mtl/Vec.h> -+#include "ParseUtils.h" - - namespace Minisat { - ---- ./core/SolverTypes.h.orig 2010-07-10 09:07:36.000000000 -0700 -+++ ./core/SolverTypes.h 2011-04-12 18:27:58.000000000 -0700 -@@ -24,11 +24,11 @@ - - #include <assert.h> - --#include "mtl/IntTypes.h" --#include "mtl/Alg.h" --#include "mtl/Vec.h" --#include "mtl/Map.h" --#include "mtl/Alloc.h" -+#include <mtl/IntTypes.h> -+#include <mtl/Alg.h> -+#include <mtl/Vec.h> -+#include <mtl/Map.h> -+#include <mtl/Alloc.h> - - namespace Minisat { - ---- ./core/Solver.h.orig 2010-07-10 09:07:36.000000000 -0700 -+++ ./core/Solver.h 2011-04-12 18:26:56.000000000 -0700 -@@ -21,11 +21,11 @@ - #ifndef Minisat_Solver_h - #define Minisat_Solver_h - --#include "mtl/Vec.h" --#include "mtl/Heap.h" --#include "mtl/Alg.h" --#include "utils/Options.h" --#include "core/SolverTypes.h" -+#include <mtl/Vec.h> -+#include <mtl/Heap.h> -+#include <mtl/Alg.h> -+#include <utils/Options.h> -+#include "SolverTypes.h" - - - namespace Minisat { ---- ./mtl/Vec.h.orig 2010-07-10 09:07:36.000000000 -0700 -+++ ./mtl/Vec.h 2011-04-12 18:30:50.000000000 -0700 -@@ -24,8 +24,8 @@ - #include <assert.h> - #include <new> - --#include "mtl/IntTypes.h" --#include "mtl/XAlloc.h" -+#include "IntTypes.h" -+#include "XAlloc.h" - - namespace Minisat { - ---- ./mtl/Sort.h.orig 2010-07-10 09:07:36.000000000 -0700 -+++ ./mtl/Sort.h 2011-04-12 18:31:05.000000000 -0700 -@@ -21,7 +21,7 @@ - #ifndef Minisat_Sort_h - #define Minisat_Sort_h - --#include "mtl/Vec.h" -+#include "Vec.h" - - //================================================================================================= - // Some sorting algorithms for vec's ---- ./mtl/Alg.h.orig 2010-07-10 09:07:36.000000000 -0700 -+++ ./mtl/Alg.h 2011-04-12 18:32:26.000000000 -0700 -@@ -21,7 +21,7 @@ - #ifndef Minisat_Alg_h - #define Minisat_Alg_h - --#include "mtl/Vec.h" -+#include "Vec.h" - - namespace Minisat { - ---- ./mtl/Alloc.h.orig 2010-07-10 09:07:36.000000000 -0700 -+++ ./mtl/Alloc.h 2011-04-12 18:32:18.000000000 -0700 -@@ -21,8 +21,8 @@ - #ifndef Minisat_Alloc_h - #define Minisat_Alloc_h - --#include "mtl/XAlloc.h" --#include "mtl/Vec.h" -+#include "XAlloc.h" -+#include "Vec.h" - - namespace Minisat { - ---- ./mtl/Heap.h.orig 2010-07-10 09:07:36.000000000 -0700 -+++ ./mtl/Heap.h 2011-04-12 18:32:05.000000000 -0700 -@@ -21,7 +21,7 @@ - #ifndef Minisat_Heap_h - #define Minisat_Heap_h - --#include "mtl/Vec.h" -+#include "Vec.h" - - namespace Minisat { - ---- ./mtl/Map.h.orig 2010-07-10 09:07:36.000000000 -0700 -+++ ./mtl/Map.h 2011-04-12 18:31:36.000000000 -0700 -@@ -20,8 +20,8 @@ - #ifndef Minisat_Map_h - #define Minisat_Map_h - --#include "mtl/IntTypes.h" --#include "mtl/Vec.h" -+#include "IntTypes.h" -+#include "Vec.h" - - namespace Minisat { - ---- ./mtl/Queue.h.orig 2010-07-10 09:07:36.000000000 -0700 -+++ ./mtl/Queue.h 2011-04-12 18:31:18.000000000 -0700 -@@ -21,7 +21,7 @@ - #ifndef Minisat_Queue_h - #define Minisat_Queue_h - --#include "mtl/Vec.h" -+#include "Vec.h" - - namespace Minisat { - ---- ./simp/SimpSolver.h.orig 2010-07-10 09:07:36.000000000 -0700 -+++ ./simp/SimpSolver.h 2011-04-12 18:35:20.000000000 -0700 -@@ -21,8 +21,8 @@ - #ifndef Minisat_SimpSolver_h - #define Minisat_SimpSolver_h - --#include "mtl/Queue.h" --#include "core/Solver.h" -+#include <mtl/Queue.h> -+#include <core/Solver.h> - - - namespace Minisat { diff --git a/sci-mathematics/minisat/metadata.xml b/sci-mathematics/minisat/metadata.xml index f4ae74b4ad5f..6c6fff3aa726 100644 --- a/sci-mathematics/minisat/metadata.xml +++ b/sci-mathematics/minisat/metadata.xml @@ -5,9 +5,6 @@ <email>sci@gentoo.org</email> <name>Gentoo Science Project</name> </maintainer> - <use> - <flag name="extended-solver">Build extended version of SAT solver with additional features.</flag> - </use> <upstream> <remote-id type="github">niklasso/minisat</remote-id> </upstream> diff --git a/sci-mathematics/minisat/minisat-2.2.0-r4.ebuild b/sci-mathematics/minisat/minisat-2.2.0-r4.ebuild deleted file mode 100644 index 0482cfcf0246..000000000000 --- a/sci-mathematics/minisat/minisat-2.2.0-r4.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Small yet efficient SAT solver with reference paper" -HOMEPAGE="https://minisat.se/Main.html" -SRC_URI="http://minisat.se/downloads/${P}.tar.gz - doc? ( http://minisat.se/downloads/MiniSat.pdf )" - -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -LICENSE="MIT" - -IUSE="debug doc extended-solver" - -DEPEND="sys-libs/zlib" -RDEPEND="${DEPEND}" - -DOCS=( README doc/ReleaseNotes-2.2.0.txt ) -PATCHES=( "${FILESDIR}"/${P}-header_fix.patch ) - -S=${WORKDIR}/${PN} - -src_prepare() { - default - # Remove makefile silencing - sed -i -e 's:@\(\$\|ln\|rm\|for\):\1:g' mtl/template.mk || die -} - -src_configure() { - myconf=$(usex debug d r) - myext=$(usex debug debug release) - mydir=$(usex extended-solver simp core) - - tc-export CXX -} - -src_compile() { - export MROOT="$S" - emake -C $mydir $myconf - LIB="${PN}" emake -C $mydir lib$myconf -} - -src_install() { - insinto /usr/include/${PN}2/mtl - doins mtl/*.h - - insinto /usr/include/${PN}2/core - doins core/Solver*.h - - insinto /usr/include/${PN}2/simp - doins simp/Simp*.h - - insinto /usr/include/${PN}2/utils - doins utils/*.h - - newbin ${mydir}/${PN}_${myext} ${PN} - newlib.a ${mydir}/lib${PN}_${myext}.a lib${PN}.a - - use doc && DOCS+=( "${DISTDIR}"/MiniSat.pdf ) - einstalldocs -} diff --git a/sci-mathematics/msieve/Manifest b/sci-mathematics/msieve/Manifest index b17c16504f0f..3f312ad50ddd 100644 --- a/sci-mathematics/msieve/Manifest +++ b/sci-mathematics/msieve/Manifest @@ -1,2 +1 @@ DIST msieve-1.53.tar.gz 976135 BLAKE2B 587007c4273b9e0ceb6dd17fb9310070b760f68f8f1c56014a168242d0989069a5257de39cba30c939b3b7e02918635d12b3153d05cd2abb9e4a6445c7ef1886 SHA512 e50e8913d38ed4108f5f2ecdbb338968edd416c56c5b7a92d8598b81fc16014ce7c7df963101c65f5bc88d1c7b2d8dbaa572efbecf53d720430a327929c9ce12 -DIST msieve151.tar.gz 623885 BLAKE2B a222f49fb1c6a411e1e46a7ed153e1ba24bbb604b70034c2c0632f69096e6a08a6783b25a44ffcd2d6b6962a8713455c893eb9514fb54a13f28a5b6a9aea3867 SHA512 79c03b5d669de7f05e27fc59fa999f416f513e41cba822376b862c31439fc66cf8749034c1f8f967f745955a5271a484b23e950ffede23d3fa2737ae26dbb0d4 diff --git a/sci-mathematics/msieve/files/fix-version2.patch b/sci-mathematics/msieve/files/fix-version2.patch deleted file mode 100644 index 6e956897bdf0..000000000000 --- a/sci-mathematics/msieve/files/fix-version2.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- demo.c 2011-11-25 00:25:28.000000000 +0800 -+++ demo.c.new 2012-11-30 16:46:50.417333847 +0800 -@@ -81,9 +81,8 @@ - /*--------------------------------------------------------------------*/ - void print_usage(char *progname) { - -- printf("\nMsieve v. %d.%02d (SVN %s)\n", MSIEVE_MAJOR_VERSION, -- MSIEVE_MINOR_VERSION, -- MSIEVE_SVN_VERSION); -+ printf("\nMsieve v. %d.%02d\n", MSIEVE_MAJOR_VERSION, -+ MSIEVE_MINOR_VERSION); - - printf("\nusage: %s [options] [one_number]\n", progname); - printf("\nnumbers starting with '0' are treated as octal,\n" diff --git a/sci-mathematics/msieve/msieve-1.51-r1.ebuild b/sci-mathematics/msieve/msieve-1.51-r1.ebuild deleted file mode 100644 index 25cedcc0c961..000000000000 --- a/sci-mathematics/msieve/msieve-1.51-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="A C library implementing a suite of algorithms to factor large integers" -HOMEPAGE="https://sourceforge.net/projects/msieve/" -SRC_URI="mirror://sourceforge/${PN}/${PN}/Msieve%20v${PV}/${PN}${PV/./}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="zlib +ecm mpi" - -DEPEND=" - ecm? ( sci-mathematics/gmp-ecm ) - mpi? ( virtual/mpi ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -src_prepare() { - # TODO: Integrate ggnfs properly - epatch \ - "${FILESDIR}"/${P}-reduce-printf.patch \ - "${FILESDIR}"/fix-version.patch \ - "${FILESDIR}"/fix-version2.patch - sed -i -e 's/-march=k8//' Makefile || die - sed -i -e 's/CC =/#CC =/' Makefile || die - sed -i -e 's/CFLAGS =/CFLAGS +=/' Makefile || die - sed -i -e 's/LIBS += -lecm/LIBS += -lecm -lgomp/' Makefile || die -} - -src_compile() { - use ecm && export "ECM=1" - use mpi && export "MPI=1" - use zlib && export "ZLIB=1" - emake \ - CC=$(tc-getCC) \ - AR=$(tc-getAR) \ - OPT_FLAGS="${CFLAGS}" \ - all -} - -src_install() { - mkdir -p "${D}/usr/include/msieve" - mkdir -p "${D}/usr/lib/" - mkdir -p "${D}/usr/share/doc/${P}/" - cp include/* "${D}/usr/include/msieve" || die "Failed to install" - cp libmsieve.a "${D}/usr/lib/" || die "Failed to install" - dobin msieve - cp Readme* "${D}/usr/share/doc/${P}/" || die "Failed to install" -} diff --git a/sci-mathematics/nauty/Manifest b/sci-mathematics/nauty/Manifest index 9ceca477aca0..24bf93bcc2bf 100644 --- a/sci-mathematics/nauty/Manifest +++ b/sci-mathematics/nauty/Manifest @@ -1,4 +1,3 @@ DIST nauty-popcnt.patch 56034 BLAKE2B 838858a0decf9323217f6b8d7b200b0158db9a02efd278a5d3cf7392ac2201e901b36b963f3f30ca6070fd0ddfa70577a442b795b09fec0d457d33649c6e93c6 SHA512 4931440b6178cb668997539ac2991f0d04758b8750668d4477cb8a456640640c5bb71c2858e423a4ad812e3401151834366e04693bf9a5ecc5ccc211d2e4229c -DIST nauty25r9.tar.gz 1007323 BLAKE2B 29d8131a5d21d22a0ef5502d8822aefc07022e83eaa9e4660819929809a6f9c318f46d47e80be45882ff0b60cac774fe23ccceadf2a3bdeb5abf169541696474 SHA512 79f9054f1d39406063f4cbab61002b27f260b93fd37d6346efdfcd113c59ebab54320e6e7b6cdf26c7eddc376e4ad558e2cd4e6071d418dce2a6918f3c8f7ca2 DIST nauty26r7.tar.gz 1660659 BLAKE2B d1d6774dd65cbdb906727324b5008bb962d54d16f99afe68f643f62ab2e7fe297a7cb4ef59b5f50c72c7e59fa9ff8ef2c82f4a77764c7f076b90e8171c7f1370 SHA512 60a724264b43b48338c17240c3cf7156f408267f1b2df995ea7b5ab9fa48852cb11057e83178a364ca028d80dc9124ca9b38cdac34e150a995475140d07c8af6 DIST nauty_2.6r7+ds-1.debian.tar.xz 30328 BLAKE2B 009d64aa2042f814e55238ff83bde4d205925922c13a46213b933ec0f6364ed9a86aeabc7b4c22fdb717bd3ee7efdf794f3f2637cd08d7921e61cee99e73cf9a SHA512 fadde6a767e43048980842415207613ffeaa38d021fbf6a3f26a4bbe6877a92ddf5950094de517edd0f924deeacc8dec1d6a7334123c2a87d15befcc3876bc63 diff --git a/sci-mathematics/nauty/nauty-2.5.9.ebuild b/sci-mathematics/nauty/nauty-2.5.9.ebuild deleted file mode 100644 index 4e5dbdc34089..000000000000 --- a/sci-mathematics/nauty/nauty-2.5.9.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit versionator - -MY_PV=$(replace_version_separator 2 'r') -MY_PV=$(delete_version_separator 1 ${MY_PV}) - -DESCRIPTION="Computing automorphism groups of graphs and digraphs" -HOMEPAGE="https://pallini.di.uniroma1.it/" -SRC_URI="http://cs.anu.edu.au/~bdm/${PN}/${PN}${MY_PV}.tar.gz" - -LICENSE="nauty" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="" - -S="${WORKDIR}/${PN}${MY_PV}" - -src_prepare() { - sed \ - -e "s/^LDFLAGS=.*/LDFLAGS=${LDFLAGS}/" \ - -e 's:${CC} -o:${CC} ${LDFLAGS} -o:g' \ - -e 's:${LDFLAGS}$::g' \ - -i makefile.in || die -} - -src_test() { - emake checks - ./runalltests -} - -src_install() { - dobin addedgeg amtog biplabg catg complg copyg countg \ - deledgeg directg dreadnaut dretog genbg geng genrang \ - gentourng labelg listg multig newedgeg NRswitchg pickg \ - planarg shortg showg - dodoc README formats.txt nug*.pdf -} diff --git a/sci-mathematics/normaliz/Manifest b/sci-mathematics/normaliz/Manifest index 7b23bd55d652..ff22aa67e421 100644 --- a/sci-mathematics/normaliz/Manifest +++ b/sci-mathematics/normaliz/Manifest @@ -1,4 +1,2 @@ -DIST Normaliz2.12.2.zip 6432949 BLAKE2B 7c2d68937e1b5ad423aca170f613d3ca5c857b1d61a42e71f0f12e5bc9ec92995d1eee4267ad468e2ceaecd50ccff12147e0b203ee46dd85b2c856940e75f252 SHA512 fd42071cb87b8efbaf9af0885c173a0583e0b38dedb8821a83225eeebb44060a7b5748c44adfc4faeac20c3a1706071bcb9883cb4447e4a1ff3aeb770bd22038 -DIST Normaliz3.1.1.zip 5839858 BLAKE2B 5acb38f335b41e59312edb3dd58687ae139080a7c9965e5cc75996fcee1da991846ee2a7c6c49cdbc8cd3edb3f877a3bd71aa8491ff11715666b5a54dfbd7ef7 SHA512 efa75844542df45d3cff6b6f877f2d6132905b722468b3df5a89468798bf66cbaf33f359000fb462f4d24fb3414f4c293a8ba84112a6712862dd593bb5f314ba DIST normaliz-3.1.3.tar.gz 3075453 BLAKE2B 0860b466dfa5335a58a496c21f7567e7e4682b07c73e36dbbd947eb65500e03758577d32355adb02fa4e271ca2f49bc5cb0449e26f1bdd11eab2dd5dbafd8f17 SHA512 c7fb1620e758dc59de88f0d7c55f50db0f67be772a00af27205e478f30c3836b7cf012a16a8adfdee3f0367d3adb4e3f887dc7d03793a7ca1601968ddb1946ce DIST normaliz-3.3.0.tar.gz 4243027 BLAKE2B 4785c47a2d815518e98b012dcbfe3cb70aac0ea8e06ad8f15ad6ba73120589e24f82050c25368775299974a43fce42052ffdf49379cd2b14ef4e415f6bb2d8f9 SHA512 3e09be1a265746c2cedf24c6a38de2f3801a906a66a0fa73a98b05916a5e6f412d84f5e38276781b5d99ff779a2db3fc420acdadd036e9822cae41b2ed539be5 diff --git a/sci-mathematics/normaliz/files/normaliz-2.12.1-respect-flags.patch b/sci-mathematics/normaliz/files/normaliz-2.12.1-respect-flags.patch deleted file mode 100644 index d7d83ee79d91..000000000000 --- a/sci-mathematics/normaliz/files/normaliz-2.12.1-respect-flags.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -U 3 -dHrN Normaliz2.12/source/Makefile Normaliz2.12.patched/source/Makefile ---- Normaliz2.12/source/Makefile 2014-10-23 15:01:56.000000000 +0200 -+++ Normaliz2.12.patched/source/Makefile 2014-10-25 14:56:39.426295174 +0200 -@@ -17,16 +17,16 @@ - @$(MAKE) normaliz - - normaliz.o: $(SOURCES) $(HEADERS) $(LIBHEADERS) -- $(CXX) $(CXXFLAGS) $(NORMFLAGS) -c Normaliz.cpp -o normaliz.o -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -c Normaliz.cpp -o normaliz.o - - normaliz: $(SOURCES) $(HEADERS) normaliz.o libnormaliz/libnormaliz.a -- $(CXX) $(CXXFLAGS) $(NORMFLAGS) normaliz.o libnormaliz/libnormaliz.a $(GMPFLAGS) -o normaliz -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) normaliz.o libnormaliz/libnormaliz.a $(GMPFLAGS) -o normaliz - - normaliz1: $(SOURCES) $(HEADERS) $(LIBHEADERS) $(LIBSOURCES) -- $(CXX) $(CXXFLAGS) $(NORMFLAGS) Normaliz-impl.cpp $(GMPFLAGS) -o normaliz1 -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) Normaliz-impl.cpp $(GMPFLAGS) -o normaliz1 - - normaliz-pg: $(SOURCES) $(HEADERS) $(LIBHEADERS) $(LIBSOURCES) -- $(CXX) $(CXXFLAGS) $(NORMFLAGS) -pg Normaliz-impl.cpp $(GMPFLAGS) -o normaliz-pg -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -pg Normaliz-impl.cpp $(GMPFLAGS) -o normaliz-pg - - - #always go down the directory and let the make there check what has to be done -diff -U 3 -dHrN Normaliz2.12/source/Makefile.configuration Normaliz2.12.patched/source/Makefile.configuration ---- Normaliz2.12/source/Makefile.configuration 2014-10-23 15:01:56.000000000 +0200 -+++ Normaliz2.12.patched/source/Makefile.configuration 2014-10-25 15:18:39.876313342 +0200 -@@ -1,11 +1,9 @@ - ## - ## Makefile configuration for normaliz - ## --CXX = g++ - #CXX = linux32 g++ -m32 -march=i686 #compile it for linux32 - CXXFLAGS += -std=c++0x - CXXFLAGS += -Wall -pedantic --CXXFLAGS += -O3 -funroll-loops - #CXXFLAGS += -I /usr/local/boost_1_45_0 - CXXFLAGS += -g ## debugging - #CXXFLAGS += -pg ## profiling -@@ -19,7 +17,6 @@ - endif - - ## for distributing the executables link static (does not work for mac) --CXXFLAGS += -static - ## for almost static compilation on Mac use - #CXXFLAGS += -static-libgcc - ## make it compatible with older Mac versions diff --git a/sci-mathematics/normaliz/files/normaliz-2.12.2-gcc49.patch b/sci-mathematics/normaliz/files/normaliz-2.12.2-gcc49.patch deleted file mode 100644 index 35a28c8cf2a3..000000000000 --- a/sci-mathematics/normaliz/files/normaliz-2.12.2-gcc49.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -U 3 -dHrN Normaliz2.12/source/libnormaliz/general.h Normaliz2.12.patched/source/libnormaliz/general.h ---- Normaliz2.12/source/libnormaliz/general.h 2014-10-23 15:01:56.000000000 +0200 -+++ Normaliz2.12.patched/source/libnormaliz/general.h 2015-03-01 13:20:01.057017555 +0100 -@@ -27,6 +27,7 @@ - - #include <iostream> - #include <assert.h> -+#include <cstddef> - - #ifdef _WIN32 //for 32 and 64 bit windows - #define NMZ_MPIR //always use MPIR diff --git a/sci-mathematics/normaliz/files/normaliz-3.0.0-respect-flags.patch b/sci-mathematics/normaliz/files/normaliz-3.0.0-respect-flags.patch deleted file mode 100644 index cfd91d2feaff..000000000000 --- a/sci-mathematics/normaliz/files/normaliz-3.0.0-respect-flags.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -U 3 -dHrN Normaliz3.0.orig/source/Makefile Normaliz3.0/source/Makefile ---- Normaliz3.0.orig/source/Makefile 2015-09-29 14:05:44.960631514 +0200 -+++ Normaliz3.0/source/Makefile 2015-09-29 14:06:06.510346764 +0200 -@@ -19,16 +19,16 @@ - @$(MAKE) normaliz - - normaliz.o: $(SOURCES) $(HEADERS) $(LIBHEADERS) -- $(CXX) $(CXXFLAGS) $(NORMFLAGS) -c Normaliz.cpp -o normaliz.o -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -c Normaliz.cpp -o normaliz.o - - normaliz: $(SOURCES) $(HEADERS) normaliz.o libnormaliz/libnormaliz.a -- $(CXX) $(CXXFLAGS) $(NORMFLAGS) normaliz.o libnormaliz/libnormaliz.a $(LINKFLAGS) -o normaliz -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) normaliz.o libnormaliz/libnormaliz.a $(LINKFLAGS) -o normaliz - - normaliz1: $(SOURCES) $(HEADERS) $(LIBHEADERS) $(LIBSOURCES) -- $(CXX) $(CXXFLAGS) $(NORMFLAGS) Normaliz-impl.cpp $(LINKFLAGS) -o normaliz1 -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) Normaliz-impl.cpp $(LINKFLAGS) -o normaliz1 - - normaliz-pg: $(SOURCES) $(HEADERS) $(LIBHEADERS) $(LIBSOURCES) -- $(CXX) $(CXXFLAGS) $(NORMFLAGS) -pg Normaliz-impl.cpp $(LINKFLAGS) -o normaliz-pg -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -pg Normaliz-impl.cpp $(LINKFLAGS) -o normaliz-pg - - - #always go down the directory and let the make there check what has to be done -diff -U 3 -dHrN Normaliz3.0.orig/source/Makefile.configuration Normaliz3.0/source/Makefile.configuration ---- Normaliz3.0.orig/source/Makefile.configuration 2015-09-29 14:05:44.960631514 +0200 -+++ Normaliz3.0/source/Makefile.configuration 2015-09-29 14:07:16.419426513 +0200 -@@ -1,11 +1,9 @@ - ## - ## Makefile configuration for normaliz - ## --CXX = g++ - #CXX = linux32 g++ -m32 -march=i686 #compile it for linux32 - CXXFLAGS += -std=c++0x - CXXFLAGS += -Wall -pedantic --CXXFLAGS += -O3 -funroll-loops - #CXXFLAGS += -I /usr/local/boost_1_45_0 - #CXXFLAGS += -g ## debugging - #CXXFLAGS += -pg ## profiling -@@ -21,7 +19,6 @@ - endif - - ## for distributing the executables link static (does not work for mac) --CXXFLAGS += -static - ## for almost static compilation on Mac use - #CXXFLAGS += -static-libgcc - ## make it compatible with older Mac versions diff --git a/sci-mathematics/normaliz/normaliz-2.12.2.ebuild b/sci-mathematics/normaliz/normaliz-2.12.2.ebuild deleted file mode 100644 index af6fde85ca81..000000000000 --- a/sci-mathematics/normaliz/normaliz-2.12.2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs versionator - -MYPV=$(get_version_component_range 1-2) -MYP="Normaliz${MYPV}" - -DESCRIPTION="Tool for computations in affine monoids and more" -HOMEPAGE="https://www.mathematik.uni-osnabrueck.de/normaliz/" -SRC_URI="http://www.mathematik.uni-osnabrueck.de/${PN}/Normaliz${PV}/Normaliz${PV}.zip" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc extras openmp" - -RDEPEND="dev-libs/gmp[cxx]" -DEPEND="${RDEPEND} - app-arch/unzip - dev-libs/boost" -# Only a boost header is needed -> not RDEPEND - -S=${WORKDIR}/${MYP} - -src_prepare() { - epatch "${FILESDIR}/${PN}-2.12.1-respect-flags.patch" - epatch "${FILESDIR}/${PN}-2.12.2-gcc49.patch" - - # Respect users AR tool (Bug 474532) - sed -e "s:ar -cr:$(tc-getAR) -cr:" -i source/libnormaliz/Makefile || die - - if use openmp && tc-has-openmp; then - export OPENMP=yes - else - export OPENMP=no - fi -} - -src_compile() { - emake CXX="$(tc-getCXX)" OPENMP="${OPENMP}" -C source -} - -src_install() { - dobin source/normaliz - if use doc ; then - dodoc doc/"Normaliz.pdf" - dodoc doc/"NmzIntegrate.pdf" - fi - if use extras; then - elog "You have selected to install extras which consist of Macaulay2" - elog "and Singular packages. These have been installed into " - elog "/usr/share/${PN}, and cannot be used without additional setup. Please refer" - elog "to the homepages of the respective projects for additional information." - elog "Note however, Gentoo's versions of Singular and Macaulay2 bring their own" - elog "copies of these interface packages. Usually you don't need normaliz's versions." - insinto "/usr/share/${PN}" - doins Singular/normaliz.lib - doins Macaulay2/Normaliz.m2 - fi -} diff --git a/sci-mathematics/normaliz/normaliz-3.1.1.ebuild b/sci-mathematics/normaliz/normaliz-3.1.1.ebuild deleted file mode 100644 index 7732c7ca91f6..000000000000 --- a/sci-mathematics/normaliz/normaliz-3.1.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs versionator - -MYPV=$(get_version_component_range 1-2) -MYP="Normaliz${MYPV}" - -DESCRIPTION="Tool for computations in affine monoids and more" -HOMEPAGE="https://www.mathematik.uni-osnabrueck.de/normaliz/" -SRC_URI="https://www.normaliz.uni-osnabrueck.de/wp-content/uploads/2016/04/Normaliz${PV}.zip" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="doc extras openmp" - -RDEPEND="dev-libs/gmp[cxx]" -DEPEND="${RDEPEND} - app-arch/unzip - dev-libs/boost" -# Only a boost header is needed -> not RDEPEND - -S=${WORKDIR}/${MYP} - -src_prepare() { - epatch "${FILESDIR}/${PN}-3.0.0-respect-flags.patch" - - # Respect users AR tool (Bug 474532) - sed -e "s:ar -cr:$(tc-getAR) -cr:" -i source/libnormaliz/Makefile || die - - if use openmp && tc-has-openmp; then - export OPENMP=yes - else - export OPENMP=no - fi -} - -src_compile() { - emake CXX="$(tc-getCXX)" OPENMP="${OPENMP}" -C source -} - -src_install() { - dobin source/normaliz - if use doc ; then - dodoc doc/"Normaliz.pdf" - dodoc doc/"NmzIntegrate.pdf" - fi - if use extras; then - elog "You have selected to install extras which consist of Macaulay2" - elog "and Singular packages. These have been installed into " - elog "/usr/share/${PN}, and cannot be used without additional setup. Please refer" - elog "to the homepages of the respective projects for additional information." - elog "Note however, Gentoo's versions of Singular and Macaulay2 bring their own" - elog "copies of these interface packages. Usually you don't need normaliz's versions." - insinto "/usr/share/${PN}" - doins Singular/normaliz.lib - doins Macaulay2/Normaliz.m2 - fi -} diff --git a/sci-mathematics/num-utils/Manifest b/sci-mathematics/num-utils/Manifest index 042126090ef2..5c0293fd7b59 100644 --- a/sci-mathematics/num-utils/Manifest +++ b/sci-mathematics/num-utils/Manifest @@ -1,3 +1,2 @@ DIST num-utils-0.5.tar.gz 31845 BLAKE2B fe6620dd0cc7c0d0dc03447918b525f57e9360c5d2a44a32afe7879cf8000bbce646dc271fc821531642c209bf6b356783b09e969755eb7c7af785a8a07a2462 SHA512 6f5a2a8304a0ac3cdba342ecfd28ccd926778a5fde5eed4655f973a5c921e558f0986061ec11ba6146382f63a46b1503570576370a28a0f975e361d790f03561 -DIST num-utils_0.5-11.diff.gz 11702 BLAKE2B d0f81877b3dedbd98f89d0e7448739eb6c953cc966a2a49dfc598821802837b7ade4d6ee70586febd0e72218f042dead06bc3750616960862a63c9e8134f1bef SHA512 b461771ba1c8054d83f1aea06cd6beb92945ba929ff71df9e9c02b589c59dce2f2a19e7dab76120d48de7ae2f9e30f0271ae0b873d6e220ea195e160d4347bbf DIST num-utils_0.5-15.debian.tar.xz 17436 BLAKE2B 099e22a67b359072789106581c6d3b4fe006eb0064ad70578c0cf07388d1b9a677eb418d8d79ae59d6a9e0f3bff93e3159448e36c965f314c6bc559f5af70921 SHA512 5cbcf0d984e2c87fc16932bbd3e952a2b38c1272e00b55839d42ffaf28e0a8b0f5e4340ae01124ef34507ec4a144df0a48fa2af087f876cef39fdc5ba20ce0d1 diff --git a/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild b/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild deleted file mode 100644 index cc567101a6ba..000000000000 --- a/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DEB_PR=11 -DESCRIPTION="A set of programs for dealing with numbers from the command line" -HOMEPAGE="https://suso.suso.org/programs/num-utils/index.phtml" -SRC_URI=" - http://suso.suso.org/programs/num-utils/downloads/${P}.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_PR}.diff.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" - -PATCHES=( - "${WORKDIR}/${PN}_${PV}-${DEB_PR}.diff" -) - -src_prepare() { - default - - sed \ - -e 's:../orig/num-utils-0.5/::g' \ - -i "${S}"/debian/patches/*.diff || die - - eapply -p0 "${S}"/debian/patches/*.diff - - local x - for x in average bound interval normalize random range round; do - mv $x num$x || die "renaming $x failed" - done - - sed \ - -e 's/^RPMDIR/#RPMDIR/' \ - -e 's/COPYING//' \ - -e 's/LICENSE//' \ - -e '/^DOCS/s/MANIFEST//' \ - -i Makefile || die "sed Makefile failed" -} - -src_install() { - emake ROOT="${ED}" install -} - -pkg_postinst() { - elog "All ${PN} programs have been renamed with prefix 'num' to avoid collisions" -} diff --git a/sci-mathematics/petsc/Manifest b/sci-mathematics/petsc/Manifest index 08d519f80c2f..d7824fbe49bc 100644 --- a/sci-mathematics/petsc/Manifest +++ b/sci-mathematics/petsc/Manifest @@ -1,2 +1 @@ -DIST petsc-3.13.0.tar.gz 35080264 BLAKE2B 0ac58e53751dbc6e053e3591cdf2363194e0cf7a493f252d879031e0135da16fa24e66974dd7bf07ce18558a75f8dd794e87f96590ad9e550d11edfeb462f727 SHA512 0590bb63d9c6dfd6ac03b1b88e5a8c11d42a0fd014084603d4d085060b126aa4341b4ec3a4d2b12146b971da327ccc7ede370e5633282bf44f269465aea32953 DIST petsc-3.13.1.tar.gz 35097687 BLAKE2B fccf64fd3694deffdd0dc561069ffa7e9342fe279b5c9123edeb011df931874083839d27b7b9a0c63faea6487b104b54fd4ce68a88a074c82de91e8baaf270b0 SHA512 41c3138a6ae6c1f2d9077b464c6aeda96287e5a76849582b8f432e2ee93d2594a78ba2181eac0054a77b6165692be5f1a057049313f2be9743d4246383dfdc77 diff --git a/sci-mathematics/petsc/petsc-3.13.0.ebuild b/sci-mathematics/petsc/petsc-3.13.0.ebuild deleted file mode 100644 index c36d5ece355f..000000000000 --- a/sci-mathematics/petsc/petsc-3.13.0.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs - -DESCRIPTION="Portable, Extensible Toolkit for Scientific Computation" -HOMEPAGE="https://www.mcs.anl.gov/petsc/" -SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="afterimage boost complex-scalars cxx debug doc fftw - fortran hdf5 hypre mpi metis mumps scotch sparse superlu threads X" - -# hypre and superlu curretly exclude each other due to missing linking to hypre -# if both are enabled -REQUIRED_USE=" - afterimage? ( X ) - complex-scalars? ( !hypre !superlu ) - hdf5? ( mpi ) - hypre? ( cxx mpi !superlu ) - mumps? ( mpi scotch ) - scotch? ( mpi ) - superlu? ( !hypre ) -" - -RDEPEND=" - virtual/blas - virtual/lapack - afterimage? ( media-libs/libafterimage ) - boost? ( dev-libs/boost ) - fftw? ( sci-libs/fftw:3.0[mpi?] ) - hdf5? ( sci-libs/hdf5[mpi?] ) - hypre? ( >=sci-libs/hypre-2.18.0[mpi?] ) - metis? ( >=sci-libs/parmetis-4 ) - mpi? ( virtual/mpi[cxx?,fortran?] ) - mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) - scotch? ( sci-libs/scotch[mpi?] ) - sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 ) - superlu? ( >=sci-libs/superlu-5 ) - X? ( x11-libs/libX11 ) -" - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig - dev-util/cmake -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.7.0-disable-rpath.patch - "${FILESDIR}"/${PN}-3.13.0-fix_sandbox_violation.patch - "${FILESDIR}"/${PN}-3.13.0-make_hypre_configure.patch - "${FILESDIR}"/${PN}-3.13.0-do_not_run_mpiexec.patch -) - -# petsc uses --with-blah=1 and --with-blah=0 to en/disable options -petsc_enable() { - use "$1" && echo "--with-${2:-$1}=1" || echo "--with-${2:-$1}=0" -} -# add external library: -# petsc_with use_flag libname libdir -# petsc_with use_flag libname include linking_libs -petsc_with() { - local myuse p=${2:-${1}} - if use ${1}; then - myuse="--with-${p}=1" - if [[ $# -ge 4 ]]; then - myuse="${myuse} --with-${p}-include=${EPREFIX}${3}" - shift 3 - myuse="${myuse} --with-${p}-lib=$@" - else - myuse="${myuse} --with-${p}-dir=${EPREFIX}${3:-/usr}" - fi - else - myuse="--with-${p}=0" - fi - echo ${myuse} -} - -# select between configure options depending on use flag -petsc_select() { - use "$1" && echo "--with-$2=$3" || echo "--with-$2=$4" -} - -src_configure() { - # bug 548498 - # PETSc runs mpi processes during configure that result in a sandbox - # violation by trying to open /proc/mtrr rw. This is not easy to - # mitigate because it happens in libpciaccess.so called by libhwloc.so, - # which is used by libmpi.so. - addpredict /proc/mtrr - # if mpi is built with knem support it needs /dev/knem too - addpredict /dev/knem - - # configureMPITypes with openmpi-2* insists on accessing the scaling - # governor rw. - addpredict /sys/devices/system/cpu/ - - local mylang - local myopt - - use cxx && mylang="cxx" || mylang="c" - use debug && myopt="debug" || myopt="opt" - - # environmental variables expected by petsc during build - - export PETSC_DIR="${S}" - export PETSC_ARCH="linux-gnu-${mylang}-${myopt}" - - if use debug; then - strip-flags - filter-flags -O* - fi - - # C Support on CXX builds is enabled if possible i.e. when not using - # complex scalars (no complex type for both available at the same time) - - econf \ - scrollOutput=1 \ - FFLAGS="${FFLAGS} -fPIC" \ - CFLAGS="${CFLAGS} -fPIC" \ - CXXFLAGS="${CXXFLAGS} -fPIC" \ - LDFLAGS="${LDFLAGS}" \ - --prefix="${EPREFIX}/usr/$(get_libdir)/petsc" \ - --with-shared-libraries \ - --with-single-library \ - --with-clanguage=${mylang} \ - $(use cxx && ! use complex-scalars && echo "with-c-support=1") \ - --with-petsc-arch=${PETSC_ARCH} \ - --with-precision=double \ - --with-gnu-compilers \ - --with-blas-lapack-lib="$($(tc-getPKG_CONFIG) --libs blas lapack)" \ - $(petsc_enable debug debugging) \ - $(petsc_enable mpi) \ - $(petsc_select mpi cc mpicc $(tc-getCC)) \ - $(petsc_select mpi cxx mpicxx $(tc-getCXX)) \ - $(petsc_enable fortran) \ - $(use fortran && echo "$(petsc_select mpi fc mpif77 $(tc-getF77))") \ - $(petsc_enable mpi mpi-compilers) \ - $(petsc_select complex-scalars scalar-type complex real) \ - --with-windows-graphics=0 \ - --with-matlab=0 \ - --with-cmake:BOOL=1 \ - $(petsc_enable threads pthread) \ - $(petsc_with afterimage afterimage \ - /usr/include/libAfterImage -lAfterImage) \ - $(use_with hdf5) \ - $(petsc_with hypre hypre \ - /usr/include/hypre -lHYPRE) \ - $(use_with sparse suitesparse) \ - $(petsc_with superlu superlu \ - /usr/include/superlu -lsuperlu) \ - $(use_with X x) \ - $(use_with X x11) \ - $(petsc_with scotch ptscotch \ - /usr/include/scotch \ - [-lptesmumps,-lptscotch,-lptscotcherr,-lscotch,-lscotcherr]) \ - $(petsc_with mumps scalapack \ - /usr/include/scalapack -lscalapack) \ - $(use_with mumps mumps \ - /usr/include \ - [-lcmumps,-ldmumps,-lsmumps,-lzmumps,-lmumps_common,-lpord]) \ - --with-imagemagick=0 \ - --with-python=0 \ - $(use_with boost) \ - $(use_with fftw) -} - -src_install() { - emake DESTDIR="${ED}" install - - # add PETSC_DIR to environmental variables - cat >> 99petsc <<- EOF - PETSC_DIR=${EPREFIX}/usr/$(get_libdir)/petsc - LDPATH=${EPREFIX}/usr/$(get_libdir)/petsc/lib - EOF - doenvd 99petsc - - if use doc ; then - docinto html - dodoc -r docs/*.html docs/changes docs/manualpages - fi -} diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest index 0627f2f8eaae..7f871e9f5208 100644 --- a/sci-mathematics/rstudio/Manifest +++ b/sci-mathematics/rstudio/Manifest @@ -1,6 +1,2 @@ DIST core-dictionaries.zip 876339 BLAKE2B f29afcbf5a7f8ec635e5a5b248d978af286d18488f54c9a09a2b95fde19b796e4473e5846402a46dd24b71c6e4167512539aaa32ab6d99713d500a80aaf46796 SHA512 9c5830cc9fed575e223f1c61f02e48c5aea6801bb0cd2586f02437c17fdffdb1d36c396d5a8ecbe02ba01196e73458304345b1f6b92c052bc7a7d05961fac2c9 -DIST rstudio-1.2.5033.tar.gz 20456976 BLAKE2B 3cbca6a5180690104dddf1456168bd38708d4152ed9b7a167035dd66e270aeb6405169d34461cbd899738be1872607e3f3b6f81ff0b3c9e6a9ed965a889b1393 SHA512 3569d4fed342275a9905c87e4f97be63b6391d2c37f75397e06201a7c31f80d94799214f51ff8e57d458ef18d5e54afe1ec8a7c56ac05ed8b8225ecca72d1daf -DIST rstudio-1.2.5042.tar.gz 20456999 BLAKE2B 3251ab2511daefefa395256fedb273ecc36dbc8118457474e3647f7616baea91301e597896582ad4b191195fc7baf17645c4c25b9a957a0c17a6251151b1dd87 SHA512 e09f2360abecde0c16e240e6838efb270a355bec3d3982ffde2b01b32b21e9281fef465734edbfeb5e05375529cc7f06d5b5d41304f367982f53ae7ad98e20f9 -DIST rstudio-1.3.1056.tar.gz 89584544 BLAKE2B 0e758ad97f9faa2d3932a49dafd92bc21199a5c0a20e2d8480267ebbb7cd11dc38596b4bb697e04add7bfe6b126f7b2ae6675040a0ac8caca5a5cf737f5ad6eb SHA512 8a9077c2ae021e0cf4cca41b374a50534087b35fd2c1e4b18bdd5ba3672e1ab275046e483ec8a3aba729a8e39f961149fb03a053ea005d8a32873b51201baca2 DIST rstudio-1.3.1093.tar.gz 89554292 BLAKE2B defd68e65a2cbc570aaf6fb14bd16342946154cda7322549d426281aea48d923803f061c1cd7d74b65b000a67ed62713dd06d311617e54130cb7c08147b34694 SHA512 c8a8d2312353e574dc2fb8ff2e64bd46c8aaf889c86f9c81ce22a7275e4cbec436dadfdaee513c3fc47dd3ad003e07a25baac4d8fcf47cc21df919afa084e92e -DIST rstudio-1.3.959.tar.gz 89639419 BLAKE2B d45b2c1b0e426ddb5a945e59a8127ddfd47f6230ef0929639c4b525382ae57437a273df6ade85cfbf3a29911cf0158ee2e0808bfa94e783d70d4615f6c228f31 SHA512 e5d8bfe16011790ff4723c731043f44070d8fe48f85c5a9ab8389c9a2b7a1d3813e9362063ec4c6a6ca3b0a0857e2190481cbb74191650a129c0d2e10b342fac diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch deleted file mode 100644 index 1ec458bb8698..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-03-28 16:08:20.000000000 +1100 -+++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-08-20 22:38:53.808923305 +1000 -@@ -296,7 +296,11 @@ - */ - timer_ptr set_timer(long duration, timer_handler callback) { - timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>( -+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000 -+ *m_io_service, -+#else - lib::ref(*m_io_service), -+#endif - boost::posix_time::milliseconds(duration) - ); - ---- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2019-03-28 16:08:20.000000000 +1100 -+++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2019-08-20 22:38:53.822923358 +1000 -@@ -184,7 +184,12 @@ - m_io_service = ptr; - m_external_io_service = true; - m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>( -- lib::ref(*m_io_service)); -+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000 -+ *m_io_service -+#else -+ lib::ref(*m_io_service) -+#endif -+ ); - - m_state = READY; - ec = lib::error_code(); ---- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2019-03-28 16:08:20.000000000 +1100 -+++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2019-08-20 22:38:53.823923362 +1000 -@@ -167,7 +167,12 @@ - } - - m_socket = lib::make_shared<boost::asio::ip::tcp::socket>( -- lib::ref(*service)); -+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000 -+ *service -+#else -+ lib::ref(*service) -+#endif -+ ); - - m_state = READY; - diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch deleted file mode 100644 index eed2c5c955cb..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- rstudio-1.2.1335-orig/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp 2019-03-28 16:08:20.000000000 +1100 -+++ rstudio-1.2.1335/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp 2019-04-09 22:08:45.331273559 +1000 -@@ -77,7 +77,13 @@ - { - // start a timer that will cancel any outstanding asynchronous operations - // when it elapses if the connection operation has not succeeded -- pConnectionTimer_.reset(new boost::asio::deadline_timer(resolver_.get_io_service(), timeout)); -+ pConnectionTimer_.reset(new boost::asio::deadline_timer( -+#if BOOST_VERSION >= 107000 -+ resolver_.get_executor(), -+#else -+ resolver_.get_io_service(), -+#endif -+ timeout)); - pConnectionTimer_->async_wait(boost::bind(&TcpIpAsyncConnector::onConnectionTimeout, - TcpIpAsyncConnector::shared_from_this(), - boost::asio::placeholders::error)); diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch deleted file mode 100644 index 2c4374bb8045..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch +++ /dev/null @@ -1,160 +0,0 @@ ---- rstudio-1.2.1335-orig/src/cpp/session/SessionClientInit.cpp 2019-03-28 16:08:20.000000000 +1100 -+++ rstudio-1.2.1335/src/cpp/session/SessionClientInit.cpp 2019-04-09 18:15:37.746363789 +1000 -@@ -87,13 +87,13 @@ - boost::shared_ptr<http::Cookie>* pCookie) - { - // extract the base URL -- json::JsonRpcRequest request; -+ core::json::JsonRpcRequest request; - Error error = parseJsonRpcRequest(ptrConnection->request().body(), &request); - if (error) - return error; - std::string baseURL; - -- error = json::readParams(request.params, &baseURL); -+ error = core::json::readParams(request.params, &baseURL); - if (error) - return error; - -@@ -161,7 +161,7 @@ - } - - // prepare session info -- json::Object sessionInfo ; -+ core::json::Object sessionInfo ; - sessionInfo["clientId"] = clientId; - sessionInfo["mode"] = options.programMode(); - -@@ -175,8 +175,8 @@ - } - - // temp dir -- FilePath tempDir = rstudio::r::session::utils::tempDir(); -- Error error = tempDir.ensureDirectory(); -+ core::FilePath tempDir = rstudio::r::session::utils::tempDir(); -+ core::Error error = tempDir.ensureDirectory(); - if (error) - LOG_ERROR(error); - sessionInfo["temp_dir"] = tempDir.absolutePath(); -@@ -194,12 +194,12 @@ - sessionInfo["prompt"] = rstudio::r::options::getOption<std::string>("prompt"); - - // client state -- json::Object clientStateObject; -+ core::json::Object clientStateObject; - rstudio::r::session::clientState().currentState(&clientStateObject); - sessionInfo["client_state"] = clientStateObject; - - // source documents -- json::Array jsonDocs; -+ core::json::Array jsonDocs; - error = modules::source::clientInitDocuments(&jsonDocs); - if (error) - LOG_ERROR(error); -@@ -224,7 +224,7 @@ - if (resumed) - { - // console actions -- json::Object actionsObject; -+ core::json::Object actionsObject; - consoleActions.asJson(&actionsObject); - sessionInfo["console_actions"] = actionsObject; - } -@@ -290,12 +290,12 @@ - } - else - { -- sessionInfo["active_project_file"] = json::Value(); -- sessionInfo["project_ui_prefs"] = json::Value(); -- sessionInfo["project_open_docs"] = json::Value(); -+ sessionInfo["active_project_file"] = core::json::Value(); -+ sessionInfo["project_ui_prefs"] = core::json::Value(); -+ sessionInfo["project_open_docs"] = core::json::Value(); - sessionInfo["project_supports_sharing"] = false; - sessionInfo["project_owned_by_user"] = false; -- sessionInfo["project_user_data_directory"] = json::Value(); -+ sessionInfo["project_user_data_directory"] = core::json::Value(); - } - - sessionInfo["system_encoding"] = std::string(::locale2charset(NULL)); -@@ -332,20 +332,20 @@ - sessionInfo["build_tools_bookdown_website"] = - module_context::isBookdownWebsite(); - -- FilePath buildTargetDir = projects::projectContext().buildTargetPath(); -+ core::FilePath buildTargetDir = projects::projectContext().buildTargetPath(); - if (!buildTargetDir.empty()) - { - sessionInfo["build_target_dir"] = module_context::createAliasedPath( - buildTargetDir); -- sessionInfo["has_pkg_src"] = (type == r_util::kBuildTypePackage) && -+ sessionInfo["has_pkg_src"] = (type == core::r_util::kBuildTypePackage) && - buildTargetDir.childPath("src").exists(); - sessionInfo["has_pkg_vig"] = -- (type == r_util::kBuildTypePackage) && -+ (type == core::r_util::kBuildTypePackage) && - buildTargetDir.childPath("vignettes").exists(); - } - else - { -- sessionInfo["build_target_dir"] = json::Value(); -+ sessionInfo["build_target_dir"] = core::json::Value(); - sessionInfo["has_pkg_src"] = false; - sessionInfo["has_pkg_vig"] = false; - } -@@ -353,9 +353,9 @@ - } - else - { -- sessionInfo["build_tools_type"] = r_util::kBuildTypeNone; -+ sessionInfo["build_tools_type"] = core::r_util::kBuildTypeNone; - sessionInfo["build_tools_bookdown_website"] = false; -- sessionInfo["build_target_dir"] = json::Value(); -+ sessionInfo["build_target_dir"] = core::json::Value(); - sessionInfo["has_pkg_src"] = false; - sessionInfo["has_pkg_vig"] = false; - } -@@ -364,7 +364,7 @@ - sessionInfo["presentation_commands"] = options.allowPresentationCommands(); - - sessionInfo["tutorial_api_available"] = false; -- sessionInfo["tutorial_api_client_origin"] = json::Value(); -+ sessionInfo["tutorial_api_client_origin"] = core::json::Value(); - - sessionInfo["build_state"] = modules::build::buildStateAsJson(); - sessionInfo["devtools_installed"] = module_context::isMinimumDevtoolsInstalled(); -@@ -375,7 +375,7 @@ - - // console history -- we do this at the end because - // restoreBuildRestartContext may have reset it -- json::Array historyArray; -+ core::json::Array historyArray; - rstudio::r::session::consoleHistory().asJson(&historyArray); - sessionInfo["console_history"] = historyArray; - sessionInfo["console_history_capacity"] = -@@ -447,14 +447,14 @@ - - sessionInfo["multi_session"] = options.multiSession(); - -- json::Object rVersionsJson; -+ core::json::Object rVersionsJson; - rVersionsJson["r_version"] = module_context::rVersion(); - rVersionsJson["r_version_label"] = module_context::rVersionLabel(); - rVersionsJson["r_home_dir"] = module_context::rHomeDir(); - sessionInfo["r_versions_info"] = rVersionsJson; - - sessionInfo["show_user_home_page"] = options.showUserHomePage(); -- sessionInfo["user_home_page_url"] = json::Value(); -+ sessionInfo["user_home_page_url"] = core::json::Value(); - - sessionInfo["r_addins"] = modules::r_addins::addinRegistryAsJson(); - sessionInfo["package_provided_extensions"] = modules::ppe::indexer().getPayload(); -@@ -491,7 +491,7 @@ - - // create response (we always set kEventsPending to false so that the client - // won't poll for events until it is ready) -- json::JsonRpcResponse jsonRpcResponse; -+ core::json::JsonRpcResponse jsonRpcResponse; - jsonRpcResponse.setField(kEventsPending, "false"); - jsonRpcResponse.setResult(sessionInfo); - diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch deleted file mode 100644 index a59fa02f1d2c..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- rstudio-1.2.1335-orig/src/cpp/desktop/CMakeLists.txt 2019-03-28 16:08:20.000000000 +1100 -+++ rstudio-1.2.1335/src/cpp/desktop/CMakeLists.txt 2019-04-09 18:04:57.783616412 +1000 -@@ -140,6 +140,13 @@ - get_filename_component(QT_LIBRARY_PATH "${QT_BIN_DIR}/../lib" ABSOLUTE CACHE) - get_filename_component(QT_INSTALL_PATH "${QT_BIN_DIR}/.." ABSOLUTE CACHE) - -+find_path(QTSINGLEAPPLIB_INCLUDE_DIR NAMES QtSingleApplication -+ PATH_SUFFIXES QtSolutions -+ PATHS -+ /usr/include/qt5) -+find_library(QTSINGLEAPPLIB Qt5Solutions_SingleApplication-2.6 -+ libQt5Solutions_SingleApplication-2.6) -+ - # disable clang warnings for qt sources - if(APPLE) - add_definitions(-Wno-unused-private-field -@@ -158,7 +165,6 @@ - - set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES}) - list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES -- ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication/qtlockedfile.h - ${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp -@@ -224,8 +230,6 @@ - DesktopSlotBinders.cpp - DesktopSubMenu.cpp - DesktopSynctex.cpp -- 3rdparty/qtsingleapplication/qtsingleapplication.cpp -- 3rdparty/qtsingleapplication/qtlocalpeer.cpp - ) - - if(WIN32) -@@ -280,6 +284,7 @@ - ${CORE_SOURCE_DIR}/include - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} -+ ${QTSINGLEAPPLIB_INCLUDE_DIR} - ${TESTS_INCLUDE_DIR} - ) - -@@ -384,6 +389,7 @@ - # set link dependencies - target_link_libraries(rstudio - ${RSTUDIO_QTMODULES} -+ ${QTSINGLEAPPLIB} - ${QT_LIBRARIES} - ${Boost_LIBRARIES} - rstudio-core ---- rstudio-1.2.1335-orig/src/cpp/desktop/DesktopPosixApplication.hpp 2019-03-28 16:08:20.000000000 +1100 -+++ rstudio-1.2.1335/src/cpp/desktop/DesktopPosixApplication.hpp 2019-04-09 18:01:39.333920927 +1000 -@@ -16,7 +16,7 @@ - #ifndef DESKTOP_POSIX_APPLICATION_HPP - #define DESKTOP_POSIX_APPLICATION_HPP - --#include "3rdparty/qtsingleapplication/QtSingleApplication" -+#include <QtSingleApplication> - - #include "DesktopApplicationLaunch.hpp" - diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5033-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.2.5033-pandoc.patch deleted file mode 100644 index b4f611063e17..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.2.5033-pandoc.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- rstudio-1.2.5033-orig/src/cpp/session/CMakeLists.txt 2019-12-04 17:22:17.000000000 +1100 -+++ rstudio-1.2.5033/src/cpp/session/CMakeLists.txt 2020-01-07 12:29:20.174304185 +1100 -@@ -25,9 +25,6 @@ - if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26") - message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to install)") - endif() --if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc") -- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)") --endif() - - # we often install embedded versions of these packages but don't do so currently - -@@ -490,19 +487,6 @@ - install(DIRECTORY "resources/connections" - DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) - -- # install pandoc -- if(WIN32) -- set(PANDOC_VERSION "2.7.2" CACHE INTERNAL "Pandoc version") -- else() -- set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version") -- endif() -- -- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}") -- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") -- install(FILES ${PANDOC_FILES} -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) -- - # install rmarkdown package - # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz") - # install(FILES ${RMARKDOWN_PACKAGE} diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5033-paths.patch b/sci-mathematics/rstudio/files/rstudio-1.2.5033-paths.patch deleted file mode 100644 index aa6a9b23fdec..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.2.5033-paths.patch +++ /dev/null @@ -1,118 +0,0 @@ ---- rstudio-1.2.5033-orig/CMakeGlobals.txt 2019-12-04 17:22:17.000000000 +1100 -+++ rstudio-1.2.5033/CMakeGlobals.txt 2020-01-07 12:20:19.115307754 +1100 -@@ -175,7 +175,7 @@ - else() - set(RSTUDIO_INSTALL_BIN bin) - endif() -- set(RSTUDIO_INSTALL_SUPPORTING .) -+ set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE}) - endif() - - # if the install prefix is /usr/local then tweak as appropriate ---- rstudio-1.2.5033-orig/src/cpp/server/CMakeLists.txt 2019-12-04 17:22:17.000000000 +1100 -+++ rstudio-1.2.5033/src/cpp/server/CMakeLists.txt 2020-01-07 12:17:32.736309024 +1100 -@@ -194,7 +194,7 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT} -- DESTINATION ${RSERVER_INITD_DEBIAN_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR}) - - # install configured redhat init.d script - set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat") -@@ -202,7 +202,7 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT} -- DESTINATION ${RSERVER_INITD_REDHAT_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR}) - - # install configured suse init.d script - set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse") -@@ -210,13 +210,13 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT} -- DESTINATION ${RSERVER_INITD_SUSE_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR}) - - # install pam profile - set(RSERVER_PAM_DIR "extras/pam") - set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio") - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE} -- DESTINATION ${RSERVER_PAM_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR}) - - # install configured upstart profile - set(RSERVER_UPSTART_DIR "extras/upstart") -@@ -224,12 +224,12 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE} -- DESTINATION ${RSERVER_UPSTART_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) - set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf") - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT} -- DESTINATION ${RSERVER_UPSTART_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) - - # install configured systemd profile - set(RSERVER_SYSTEMD_DIR "extras/systemd") ---- rstudio-1.2.5033-orig/src/cpp/server/ServerOptions.cpp 2019-12-04 17:22:17.000000000 +1100 -+++ rstudio-1.2.5033/src/cpp/server/ServerOptions.cpp 2020-01-07 12:17:32.773309023 +1100 -@@ -389,8 +389,8 @@ - - // convert relative paths by completing from the system installation - // path (this allows us to be relocatable) -- resolvePath(resourcePath, &wwwLocalPath_); -- resolvePath(resourcePath, &wwwSymbolMapsPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); - resolvePath(binaryPath, &authPamHelperPath_); - resolvePath(binaryPath, &rsessionPath_); - resolvePath(binaryPath, &rldpathPath_); ---- rstudio-1.2.5033-orig/src/cpp/session/SessionOptions.cpp 2019-12-04 17:22:17.000000000 +1100 -+++ rstudio-1.2.5033/src/cpp/session/SessionOptions.cpp 2020-01-07 12:17:32.774309023 +1100 -@@ -53,7 +53,7 @@ - namespace session { - - namespace { --const char* const kDefaultPandocPath = "bin/pandoc"; -+const char* const kDefaultPandocPath = "bin"; - const char* const kDefaultPostbackPath = "bin/postback/rpostback"; - const char* const kDefaultRsclangPath = "bin/rsclang"; - -@@ -571,14 +571,14 @@ - } - - // convert relative paths by completing from the app resource path -- resolvePath(resourcePath_, &rResourcesPath_); -- resolvePath(resourcePath_, &agreementFilePath_); -- resolvePath(resourcePath_, &wwwLocalPath_); -- resolvePath(resourcePath_, &wwwSymbolMapsPath_); -- resolvePath(resourcePath_, &coreRSourcePath_); -- resolvePath(resourcePath_, &modulesRSourcePath_); -- resolvePath(resourcePath_, &sessionLibraryPath_); -- resolvePath(resourcePath_, &sessionPackageArchivesPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &rResourcesPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &agreementFilePath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwLocalPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &coreRSourcePath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &modulesRSourcePath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionLibraryPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_); - resolvePostbackPath(resourcePath_, &rpostbackPath_); - #ifdef _WIN32 - resolvePath(resourcePath_, &consoleIoPath_); -@@ -611,7 +611,7 @@ - } - winptyPath_ = pty.complete(completion).absolutePath(); - #endif // _WIN32 -- resolvePath(resourcePath_, &hunspellDictionariesPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &hunspellDictionariesPath_); - resolvePath(resourcePath_, &mathjaxPath_); - resolvePath(resourcePath_, &libclangHeadersPath_); - resolvePandocPath(resourcePath_, &pandocPath_); diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5033-prefs.patch b/sci-mathematics/rstudio/files/rstudio-1.2.5033-prefs.patch deleted file mode 100644 index 034eba37a8b9..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.2.5033-prefs.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- rstudio-1.2.5033-orig/src/gwt/build.xml 2019-12-04 17:22:17.000000000 +1100 -+++ rstudio-1.2.5033/src/gwt/build.xml 2020-01-10 18:35:29.913030923 +1100 -@@ -28,17 +28,35 @@ - classname="com.google.javascript.jscomp.ant.CompileTask" - classpath="${tools.dir}/compiler/compiler.jar"/> - -+ <!-- Configure path to aopalliance --> -+ <property name="aopalliance.sdk" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/aopalliance-1/lib"/> -+ -+ <!-- Configure path to javax-inject --> -+ <property name="javax.inject" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/javax-inject/lib"/> -+ -+ <!-- Configure path to validation-api --> -+ <property name="validation.api" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/validation-api-1.0/lib"/> -+ <property name="validation.api.sources" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/validation-api-1.0/sources"/> -+ - <!-- Configure path to GWT SDK --> -- <property name="gwt.sdk" value="${lib.dir}/gwt/2.8.1"/> -+ <property name="gwt.sdk" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/gwt-2.8/lib"/> -+ -+ <!-- Configure path to Google Gin --> -+ <property name="gin.sdk" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/gin-2.1/lib"/> - - <property name="gwt.extra.args" value=""/> - <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/> - <property name="ace.bin" value="${src.dir}/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/> -+ <property environment="env"/> - - <path id="project.class.path"> - <pathelement location="${build.dir}"/> -+ <fileset dir="${aopalliance.sdk}" includes="*.jar"/> -+ <fileset dir="${javax.inject}" includes="*.jar"/> -+ <fileset dir="${validation.api}" includes="*.jar"/> -+ <fileset dir="${validation.api.sources}" includes="*.zip"/> - <fileset dir="${gwt.sdk}" includes="*.jar"/> -- <fileset dir="${lib.dir}/gin/2.1.2" includes="*.jar"/> -+ <fileset dir="${gin.sdk}" includes="*.jar"/> - </path> - - <path id="test.class.path"> -@@ -112,8 +130,10 @@ - <pathelement location="${src.dir}"/> - <path refid="project.class.path"/> - </classpath> -+ <jvmarg value="-Duser.home=${env.T}"/> - <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError --> - <jvmarg value="-Xmx1536M"/> -+ <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/> - <arg value="-war"/> - <arg value="${www.dir}"/> - <arg value="-localWorkers"/> -@@ -154,6 +174,7 @@ - <pathelement location="${src.dir}"/> - <path refid="project.class.path"/> - </classpath> -+ <jvmarg value="-Duser.home=${env.T}"/> - <jvmarg value="-Xmx2048M"/> - <arg value="-style"/> - <arg value="PRETTY"/> -@@ -176,6 +197,7 @@ - <pathelement location="src"/> - <path refid="project.class.path"/> - </classpath> -+ <jvmarg value="-Duser.home=${env.T}"/> - <jvmarg value="-Xmx2048M"/> - <arg value="-style"/> - <arg value="PRETTY"/> -@@ -202,6 +224,7 @@ - <pathelement location="src"/> - <path refid="project.class.path"/> - </classpath> -+ <jvmarg value="-Duser.home=${env.T}"/> - <jvmarg value="-Xmx2048M"/> - <arg value="-src"/> - <arg value = "src"/> -@@ -237,6 +260,7 @@ - <pathelement location="${test.dir}"/> - <pathelement location="${src.dir}"/> - </classpath> -+ <jvmarg value="-Duser.home=${env.T}"/> - <classpath refid="project.class.path"/> - <classpath refid="unittest.class.path"/> - <arg value="org.rstudio.studio.client.RStudioUnitTestSuite"/> diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5042-R-4.0.0.patch b/sci-mathematics/rstudio/files/rstudio-1.2.5042-R-4.0.0.patch deleted file mode 100644 index 87ec83a7d4af..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.2.5042-R-4.0.0.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 71b1a935762efd24a79de193662450de5a89f67e Mon Sep 17 00:00:00 2001 -From: Jonathan McPherson <jonathan@rstudio.com> -Date: Tue, 14 Jan 2020 12:53:20 -0800 -Subject: [PATCH] use R_NoSave over R_Slave for R 4.0+ - ---- - src/cpp/r/CMakeLists.txt | 12 ++++++++++++ - src/cpp/r/config.h.in | 8 +++++++- - src/cpp/r/session/REmbeddedPosix.cpp | 20 ++++++++++++++------ - 3 files changed, 33 insertions(+), 7 deletions(-) - -diff --git a/src/cpp/r/CMakeLists.txt b/src/cpp/r/CMakeLists.txt -index 6984ae309c..29784b8b67 100644 ---- a/src/cpp/r/CMakeLists.txt -+++ b/src/cpp/r/CMakeLists.txt -@@ -15,6 +15,18 @@ - - project (R) - -+# find the version of R in play -+find_package(LibR REQUIRED) -+execute_process( -+ COMMAND "${LIBR_EXECUTABLE}" "--vanilla" "--slave" "-e" "cat(as.character(getRversion()))" -+ OUTPUT_VARIABLE LIBR_VERSION) -+ -+# parse and save the R version to a variable -+string(REPLACE "." ";" R_VERSION_LIST "${LIBR_VERSION}") -+list(GET R_VERSION_LIST 0 R_VERSION_MAJOR) -+list(GET R_VERSION_LIST 1 R_VERSION_MINOR) -+list(GET R_VERSION_LIST 2 R_VERSION_PATCH) -+ - # include files - file(GLOB_RECURSE R_HEADER_FILES "*.h*") - -diff --git a/src/cpp/r/config.h.in b/src/cpp/r/config.h.in -index 6ba67c8e09..00bc8b6191 100644 ---- a/src/cpp/r/config.h.in -+++ b/src/cpp/r/config.h.in -@@ -1,7 +1,7 @@ - /* - * config.h.in - * -- * Copyright (C) 2009-12 by RStudio, Inc. -+ * Copyright (C) 2009-20 by RStudio, Inc. - * - * Unless you have received this program directly from RStudio pursuant - * to the terms of a commercial license agreement with RStudio, then -@@ -16,4 +16,10 @@ - - #cmakedefine PANGO_CAIRO_FOUND - -+// Important: These variables represent the version of R found during -+// compile/link time, NOT the version of R present at runtime. -+#define R_VERSION_MAJOR ${R_VERSION_MAJOR} -+#define R_VERSION_MINOR ${R_VERSION_MINOR} -+#define R_VERSION_PATCH ${R_VERSION_PATCH} -+ - -diff --git a/src/cpp/r/session/REmbeddedPosix.cpp b/src/cpp/r/session/REmbeddedPosix.cpp -index ac71b94522..73e2e2ce7f 100644 ---- a/src/cpp/r/session/REmbeddedPosix.cpp -+++ b/src/cpp/r/session/REmbeddedPosix.cpp -@@ -1,7 +1,7 @@ - /* - * REmbeddedPosix.cpp - * -- * Copyright (C) 2009-12 by RStudio, Inc. -+ * Copyright (C) 2009-20 by RStudio, Inc. - * - * Unless you have received this program directly from RStudio pursuant - * to the terms of a commercial license agreement with RStudio, then -@@ -38,6 +38,8 @@ extern "C" void (*ptr_R_ProcessEvents)(void); - extern "C" typedef void (*ptr_QuartzCocoa_SetupEventLoop)(int, unsigned long); - #endif - -+#include "config.h" -+ - extern int R_running_as_main_program; // from unix/system.c - - using namespace rstudio::core; -@@ -103,14 +105,20 @@ void runEmbeddedR(const core::FilePath& /*rHome*/, // ignored on posix - // - structRstart rp; - Rstart Rp = &rp; -- R_DefParams(Rp) ; -- Rp->R_Slave = FALSE ; -+ R_DefParams(Rp); -+#if R_VERSION_MAJOR > 3 -+ // R 4.0 and above use --no-echo to suppress output -+ Rp->R_NoEcho = FALSE; -+#else -+ // R 3.x and below use --slave -+ Rp->R_Slave = FALSE; -+#endif - Rp->R_Quiet = quiet ? TRUE : FALSE; -- Rp->R_Interactive = TRUE ; -- Rp->SaveAction = defaultSaveAction ; -+ Rp->R_Interactive = TRUE; -+ Rp->SaveAction = defaultSaveAction; - Rp->RestoreAction = SA_NORESTORE; // handled within initialize() - Rp->LoadInitFile = loadInitFile ? TRUE : FALSE; -- R_SetParams(Rp) ; -+ R_SetParams(Rp); - - // redirect console - R_Interactive = TRUE; // should have also been set by call to Rf_initialize_R diff --git a/sci-mathematics/rstudio/files/rstudio-1.3.959-R-4.0.0.patch b/sci-mathematics/rstudio/files/rstudio-1.3.959-R-4.0.0.patch deleted file mode 100644 index dc35d0ce0083..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.3.959-R-4.0.0.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 71b1a935762efd24a79de193662450de5a89f67e Mon Sep 17 00:00:00 2001 -From: Jonathan McPherson <jonathan@rstudio.com> -Date: Tue, 14 Jan 2020 12:53:20 -0800 -Subject: [PATCH] use R_NoSave over R_Slave for R 4.0+ - ---- - src/cpp/r/CMakeLists.txt | 12 ++++++++++++ - src/cpp/r/config.h.in | 8 +++++++- - src/cpp/r/session/REmbeddedPosix.cpp | 20 ++++++++++++++------ - 3 files changed, 33 insertions(+), 7 deletions(-) - -diff --git a/src/cpp/r/CMakeLists.txt b/src/cpp/r/CMakeLists.txt -index 6984ae309c..29784b8b67 100644 ---- a/src/cpp/r/CMakeLists.txt -+++ b/src/cpp/r/CMakeLists.txt -@@ -15,6 +15,18 @@ - - project (R) - -+# find the version of R in play -+find_package(LibR REQUIRED) -+execute_process( -+ COMMAND "${LIBR_EXECUTABLE}" "--vanilla" "--slave" "-e" "cat(as.character(getRversion()))" -+ OUTPUT_VARIABLE LIBR_VERSION) -+ -+# parse and save the R version to a variable -+string(REPLACE "." ";" R_VERSION_LIST "${LIBR_VERSION}") -+list(GET R_VERSION_LIST 0 R_VERSION_MAJOR) -+list(GET R_VERSION_LIST 1 R_VERSION_MINOR) -+list(GET R_VERSION_LIST 2 R_VERSION_PATCH) -+ - # include files - file(GLOB_RECURSE R_HEADER_FILES "*.h*") - -diff --git a/src/cpp/r/config.h.in b/src/cpp/r/config.h.in -index 6ba67c8e09..00bc8b6191 100644 ---- a/src/cpp/r/config.h.in -+++ b/src/cpp/r/config.h.in -@@ -1,7 +1,7 @@ - /* - * config.h.in - * -- * Copyright (C) 2009-12 by RStudio, PBC -+ * Copyright (C) 2009-20 by RStudio, Inc. - * - * Unless you have received this program directly from RStudio pursuant - * to the terms of a commercial license agreement with RStudio, then -@@ -16,4 +16,10 @@ - - #cmakedefine PANGO_CAIRO_FOUND - -+// Important: These variables represent the version of R found during -+// compile/link time, NOT the version of R present at runtime. -+#define R_VERSION_MAJOR ${R_VERSION_MAJOR} -+#define R_VERSION_MINOR ${R_VERSION_MINOR} -+#define R_VERSION_PATCH ${R_VERSION_PATCH} -+ - -diff --git a/src/cpp/r/session/REmbeddedPosix.cpp b/src/cpp/r/session/REmbeddedPosix.cpp -index ac71b94522..73e2e2ce7f 100644 ---- a/src/cpp/r/session/REmbeddedPosix.cpp -+++ b/src/cpp/r/session/REmbeddedPosix.cpp -@@ -1,7 +1,7 @@ - /* - * REmbeddedPosix.cpp - * -- * Copyright (C) 2009-19 by RStudio, PBC -+ * Copyright (C) 2009-20 by RStudio, Inc. - * - * Unless you have received this program directly from RStudio pursuant - * to the terms of a commercial license agreement with RStudio, then -@@ -38,6 +38,8 @@ extern "C" void (*ptr_R_ProcessEvents)(void); - extern "C" typedef void (*ptr_QuartzCocoa_SetupEventLoop)(int, unsigned long); - #endif - -+#include "config.h" -+ - extern int R_running_as_main_program; // from unix/system.c - - using namespace rstudio::core; -@@ -103,14 +105,20 @@ void runEmbeddedR(const core::FilePath& /*rHome*/, // ignored on posix - // - structRstart rp; - Rstart Rp = &rp; -- R_DefParams(Rp) ; -- Rp->R_Slave = FALSE ; -+ R_DefParams(Rp); -+#if R_VERSION_MAJOR > 3 -+ // R 4.0 and above use --no-echo to suppress output -+ Rp->R_NoEcho = FALSE; -+#else -+ // R 3.x and below use --slave -+ Rp->R_Slave = FALSE; -+#endif - Rp->R_Quiet = quiet ? TRUE : FALSE; -- Rp->R_Interactive = TRUE ; -- Rp->SaveAction = defaultSaveAction ; -+ Rp->R_Interactive = TRUE; -+ Rp->SaveAction = defaultSaveAction; - Rp->RestoreAction = SA_NORESTORE; // handled within initialize() - Rp->LoadInitFile = loadInitFile ? TRUE : FALSE; -- R_SetParams(Rp) ; -+ R_SetParams(Rp); - - // redirect console - R_Interactive = TRUE; // should have also been set by call to Rf_initialize_R diff --git a/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild b/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild deleted file mode 100644 index 09ff6e9c5162..000000000000 --- a/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild +++ /dev/null @@ -1,236 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils cmake-utils pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean - -# TODO -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -# update from scripts in dependencies/common -# egrep '(GWT_SDK_VER=|GIN_VER=)' dependencies/common/install-gwt -GWT_VER=2.8.1 -GIN_VER=2.1.2 -# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc -# It should be PANDOC_VER=2.3.1 however >=app-text/pandoc-2.3.1 is not yet in portage -PANDOC_VER=1.19.2.1 -# grep -5 QT_CANDIDATES src/cpp/desktop/CMakeLists.txt -QT_VER=5.10 -QT_SLOT=5 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated libressl server" - -RDEPEND=" - >=app-text/pandoc-${PANDOC_VER} - dev-java/aopalliance:1 - dev-java/gin:2.1 - dev-java/gwt:2.8 - dev-java/javax-inject - =dev-java/validation-api-1.0*:1.0[source] - dev-haskell/pandoc-citeproc - dev-lang/R - dev-libs/boost:= - >=dev-libs/mathjax-2.7.4 - sys-apps/util-linux - sys-devel/clang:* - sys-libs/zlib - >=virtual/jre-1.8:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets] - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( sys-libs/pam ) - ) - dedicated? ( sys-libs/pam ) - dedicated? ( - sys-libs/pam - acct-user/rstudio-server - acct-group/rstudio-server - ) - server? ( - acct-user/rstudio-server - acct-group/rstudio-server - ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.8:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.2.5033-prefs.patch - "${FILESDIR}"/${PN}-1.2.5033-paths.patch - "${FILESDIR}"/${PN}-1.2.5033-pandoc.patch - "${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch - "${FILESDIR}"/${PN}-1.2.1335-qtsingleapplication.patch - "${FILESDIR}"/${PN}-1.0.44-systemd.patch - "${FILESDIR}"/${PN}-1.2.1335-core.patch - "${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p1.patch - "${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p2.patch - "${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch - "${FILESDIR}"/${PN}-1.2.5042-R-4.0.0.patch -) - -src_unpack() { - unpack ${P}.tar.gz - cd "${S}" || die - mkdir -p dependencies/common/dictionaries - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die -} - -src_prepare() { - cmake-utils_src_prepare - java-pkg-2_src_prepare - egit_clean - - # Enable CMake to install our .service file for systemd usage - mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die - cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes - sed -i \ - -e "s@\(DESTINATION \"\)\(extras/themes\"\)@\1${EROOT}/etc/rstudio/\2@" \ - src/cpp/server/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # The git commit for tag: git rev-list -n 1 v${PV} - sed -e 's@git ARGS rev-parse HEAD@echo ARGS 6871a99b32add885fe6fa3d50fe15f62346142e7@'\ - -i "${S}"/CMakeLists.txt \ - "${S}"/CMakeGlobals.txt \ - || die - - eprefixify src/gwt/build.xml -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(ver_cut 1) - export RSTUDIO_VERSION_MINOR=$(ver_cut 2) - export RSTUDIO_VERSION_PATCH=$(ver_cut 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DRSTUDIO_VERIFY_R_VERSION=FALSE - ) - - if use !dedicated; then - mycmakeargs+=( - -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")" - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - ) - fi - cmake-utils_src_configure -} - -src_compile() { - local JAVA_ANT_REWRITE_CLASSPATH="yes" - local EANT_BUILD_XML="src/gwt/build.xml" - local EANT_BUILD_TARGET="clean" - java-pkg-2_src_compile - - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - use dedicated || pax-mark m "${ED}/usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update ;} -} - -pkg_postrm() { - use dedicated || { xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild b/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild deleted file mode 100644 index 6c4943d4513b..000000000000 --- a/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild +++ /dev/null @@ -1,236 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils cmake-utils pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean - -# TODO -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -# update from scripts in dependencies/common -# egrep '(GWT_SDK_VER=|GIN_VER=)' dependencies/common/install-gwt -GWT_VER=2.8.1 -GIN_VER=2.1.2 -# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc -# It should be PANDOC_VER=2.3.1 however >=app-text/pandoc-2.3.1 is not yet in portage -PANDOC_VER=1.19.2.1 -# grep -5 QT_CANDIDATES src/cpp/desktop/CMakeLists.txt -QT_VER=5.10 -QT_SLOT=5 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated libressl server" - -RDEPEND=" - >=app-text/pandoc-${PANDOC_VER} - dev-java/aopalliance:1 - dev-java/gin:2.1 - dev-java/gwt:2.8 - dev-java/javax-inject - =dev-java/validation-api-1.0*:1.0[source] - dev-haskell/pandoc-citeproc - dev-lang/R - dev-libs/boost:= - >=dev-libs/mathjax-2.7.4 - sys-apps/util-linux - sys-devel/clang:* - sys-libs/zlib - >=virtual/jre-1.8:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets] - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( sys-libs/pam ) - ) - dedicated? ( sys-libs/pam ) - dedicated? ( - sys-libs/pam - acct-user/rstudio-server - acct-group/rstudio-server - ) - server? ( - acct-user/rstudio-server - acct-group/rstudio-server - ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.8:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.2.5033-prefs.patch - "${FILESDIR}"/${PN}-1.2.5033-paths.patch - "${FILESDIR}"/${PN}-1.2.5033-pandoc.patch - "${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch - "${FILESDIR}"/${PN}-1.2.1335-qtsingleapplication.patch - "${FILESDIR}"/${PN}-1.0.44-systemd.patch - "${FILESDIR}"/${PN}-1.2.1335-core.patch - "${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p1.patch - "${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p2.patch - "${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch - "${FILESDIR}"/${PN}-1.2.5042-R-4.0.0.patch -) - -src_unpack() { - unpack ${P}.tar.gz - cd "${S}" || die - mkdir -p dependencies/common/dictionaries - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die -} - -src_prepare() { - cmake-utils_src_prepare - java-pkg-2_src_prepare - egit_clean - - # Enable CMake to install our .service file for systemd usage - mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die - cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes - sed -i \ - -e "s@\(DESTINATION \"\)\(extras/themes\"\)@\1${EROOT}/etc/rstudio/\2@" \ - src/cpp/server/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # The git commit for tag: git rev-list -n 1 v${PV} - sed -e 's@git ARGS rev-parse HEAD@echo ARGS e4a1c219cbf6c10d9aec41461d80171ab3009bef@'\ - -i "${S}"/CMakeLists.txt \ - "${S}"/CMakeGlobals.txt \ - || die - - eprefixify src/gwt/build.xml -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(ver_cut 1) - export RSTUDIO_VERSION_MINOR=$(ver_cut 2) - export RSTUDIO_VERSION_PATCH=$(ver_cut 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DRSTUDIO_VERIFY_R_VERSION=FALSE - ) - - if use !dedicated; then - mycmakeargs+=( - -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")" - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - ) - fi - cmake-utils_src_configure -} - -src_compile() { - local JAVA_ANT_REWRITE_CLASSPATH="yes" - local EANT_BUILD_XML="src/gwt/build.xml" - local EANT_BUILD_TARGET="clean" - java-pkg-2_src_compile - - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - use dedicated || pax-mark m "${ED}/usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update ;} -} - -pkg_postrm() { - use dedicated || { xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-1.3.1056.ebuild b/sci-mathematics/rstudio/rstudio-1.3.1056.ebuild deleted file mode 100644 index 49d75885be5f..000000000000 --- a/sci-mathematics/rstudio/rstudio-1.3.1056.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils cmake pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean - -# TODO -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -GIN_VER=2.1.2 -# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc -# It should be PANDOC_VER=2.7.3 however >=app-text/pandoc-2.7.3 is not yet in portage -PANDOC_VER=1.19.2.1 -# grep -5 QT_CANDIDATES src/cpp/desktop/CMakeLists.txt -QT_VER=5.12.6 -QT_SLOT=5 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated libressl server" - -RDEPEND=" - >=app-text/pandoc-${PANDOC_VER} - dev-java/aopalliance:1 - dev-java/gin:2.1 - dev-java/javax-inject - =dev-java/validation-api-1.0*:1.0[source] - dev-haskell/pandoc-citeproc - dev-lang/R - dev-libs/boost:= - >=dev-libs/mathjax-2.7.4 - sys-apps/util-linux - sys-devel/clang:* - sys-libs/zlib - >=virtual/jre-1.8:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets] - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( sys-libs/pam ) - ) - dedicated? ( sys-libs/pam ) - dedicated? ( - sys-libs/pam - acct-user/rstudio-server - acct-group/rstudio-server - ) - server? ( - acct-user/rstudio-server - acct-group/rstudio-server - ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.8:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.959-prefs.patch - "${FILESDIR}"/${PN}-1.3.959-paths.patch - "${FILESDIR}"/${PN}-1.3.959-pandoc-mathjax.patch - "${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch - "${FILESDIR}"/${PN}-1.3.959-qtsingleapplication.patch - "${FILESDIR}"/${PN}-1.0.44-systemd.patch - "${FILESDIR}"/${PN}-1.3.959-core.patch - "${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch - "${FILESDIR}"/${PN}-1.3.1056-R-4.0.0.patch - "${FILESDIR}"/${PN}-1.3.1056-boost-1.74.0.patch -) - -src_unpack() { - unpack ${P}.tar.gz - cd "${S}" || die - mkdir -p dependencies/common/dictionaries - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die -} - -src_prepare() { - cmake_src_prepare - java-pkg-2_src_prepare - egit_clean - - # Enable CMake to install our .service file for systemd usage - mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die - cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes - sed -i \ - -e "s@\(DESTINATION \"\)\(extras/themes\"\)@\1${EROOT}/etc/rstudio/\2@" \ - src/cpp/server/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # The git commit for tag: git rev-list -n 1 v${PV} - sed -e 's@git ARGS rev-parse HEAD@echo ARGS 5a4dee980c998d9a270a83b582b367126f3914cf@'\ - -i "${S}"/CMakeLists.txt \ - "${S}"/CMakeGlobals.txt \ - || die - - eprefixify src/gwt/build.xml -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(ver_cut 1) - export RSTUDIO_VERSION_MINOR=$(ver_cut 2) - export RSTUDIO_VERSION_PATCH=$(ver_cut 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DRSTUDIO_VERIFY_R_VERSION=FALSE - -DRSTUDIO_USE_SYSTEM_BOOST=TRUE - ) - - if use !dedicated; then - mycmakeargs+=( - -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")" - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - ) - fi - cmake_src_configure -} - -src_compile() { - local JAVA_ANT_REWRITE_CLASSPATH="yes" - local EANT_BUILD_XML="src/gwt/build.xml" - local EANT_BUILD_TARGET="clean" - java-pkg-2_src_compile - - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake_src_install - use dedicated || pax-mark m "${ED}/usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update ;} -} - -pkg_postrm() { - use dedicated || { xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-1.3.959.ebuild b/sci-mathematics/rstudio/rstudio-1.3.959.ebuild deleted file mode 100644 index d708ec5bd513..000000000000 --- a/sci-mathematics/rstudio/rstudio-1.3.959.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils cmake-utils pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean - -# TODO -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -GIN_VER=2.1.2 -# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc -# It should be PANDOC_VER=2.7.3 however >=app-text/pandoc-2.7.3 is not yet in portage -PANDOC_VER=1.19.2.1 -# grep -5 QT_CANDIDATES src/cpp/desktop/CMakeLists.txt -QT_VER=5.12.6 -QT_SLOT=5 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated libressl server" - -RDEPEND=" - >=app-text/pandoc-${PANDOC_VER} - dev-java/aopalliance:1 - dev-java/gin:2.1 - dev-java/javax-inject - =dev-java/validation-api-1.0*:1.0[source] - dev-haskell/pandoc-citeproc - dev-lang/R - dev-libs/boost:= - >=dev-libs/mathjax-2.7.4 - sys-apps/util-linux - sys-devel/clang:* - sys-libs/zlib - >=virtual/jre-1.8:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets] - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( sys-libs/pam ) - ) - dedicated? ( sys-libs/pam ) - dedicated? ( - sys-libs/pam - acct-user/rstudio-server - acct-group/rstudio-server - ) - server? ( - acct-user/rstudio-server - acct-group/rstudio-server - ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.8:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.959-prefs.patch - "${FILESDIR}"/${PN}-1.3.959-paths.patch - "${FILESDIR}"/${PN}-1.3.959-pandoc-mathjax.patch - "${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch - "${FILESDIR}"/${PN}-1.3.959-qtsingleapplication.patch - "${FILESDIR}"/${PN}-1.0.44-systemd.patch - "${FILESDIR}"/${PN}-1.3.959-core.patch - "${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch - "${FILESDIR}"/${PN}-1.3.959-R-4.0.0.patch -) - -src_unpack() { - unpack ${P}.tar.gz - cd "${S}" || die - mkdir -p dependencies/common/dictionaries - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die -} - -src_prepare() { - cmake-utils_src_prepare - java-pkg-2_src_prepare - egit_clean - - # Enable CMake to install our .service file for systemd usage - mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die - cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes - sed -i \ - -e "s@\(DESTINATION \"\)\(extras/themes\"\)@\1${EROOT}/etc/rstudio/\2@" \ - src/cpp/server/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # The git commit for tag: git rev-list -n 1 v${PV} - sed -e 's@git ARGS rev-parse HEAD@echo ARGS 3a09be39fd51a8fafa8ae330007937d31924b395@'\ - -i "${S}"/CMakeLists.txt \ - "${S}"/CMakeGlobals.txt \ - || die - - eprefixify src/gwt/build.xml -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(ver_cut 1) - export RSTUDIO_VERSION_MINOR=$(ver_cut 2) - export RSTUDIO_VERSION_PATCH=$(ver_cut 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DRSTUDIO_VERIFY_R_VERSION=FALSE - -DRSTUDIO_USE_SYSTEM_BOOST=TRUE - ) - - if use !dedicated; then - mycmakeargs+=( - -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")" - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - ) - fi - cmake-utils_src_configure -} - -src_compile() { - local JAVA_ANT_REWRITE_CLASSPATH="yes" - local EANT_BUILD_XML="src/gwt/build.xml" - local EANT_BUILD_TARGET="clean" - java-pkg-2_src_compile - - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - use dedicated || pax-mark m "${ED}/usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update ;} -} - -pkg_postrm() { - use dedicated || { xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update ;} -} diff --git a/sci-mathematics/sha1-polyml/Manifest b/sci-mathematics/sha1-polyml/Manifest index efdcee3c37dc..1c96d60f6037 100644 --- a/sci-mathematics/sha1-polyml/Manifest +++ b/sci-mathematics/sha1-polyml/Manifest @@ -1,2 +1 @@ -DIST polyml-5.5.0.tar.gz 12776783 BLAKE2B 8ec50df7a43049f564e4f0fd67aa961fb2dd075359934a58340526e77a852006fdc1083d199837ea406524cbe3fc53d5a85d83e5a414662e141257b18d8c9a22 SHA512 4d8accc7083e12a0117fb4e34367e9b22c500d31094d8f0e381b91e91a3e8122cb5ca760ecc86bdcf7ff50a460848a181747bafc068b4a300b01de54e55fbad7 DIST polyml-5.6-1.tar.gz 22041657 BLAKE2B c097dda273b12dfe013706e5fa313f210f1f0bf6b32766db6e459ce1bca46f93504baef3d7644922c60d119431d659cbd69d8cd273fcc94609eadff058d3cb9b SHA512 3107f4a5b17283dc3873b0ecf7eb1c607c42e14e859b50345b666f19412a2592e359ea29f03e56d390491e9104a71e0bf80eb39884f51d8724b37f8f935fa7d2 diff --git a/sci-mathematics/sha1-polyml/sha1-polyml-5.5.0.ebuild b/sci-mathematics/sha1-polyml/sha1-polyml-5.5.0.ebuild deleted file mode 100644 index 83e87a2f8a45..000000000000 --- a/sci-mathematics/sha1-polyml/sha1-polyml-5.5.0.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit multilib - -MY_PN=polyml -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="implementation of SHA1 is taken from the GNU coreutils package" -HOMEPAGE="https://isabelle.in.tum.de/" -SRC_URI="http://isabelle.in.tum.de/components/${MY_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}/sha1" - -LIBDIR="/usr/"$(get_libdir)"/${PN}" - -# sci-mathematics/isabelle requires sci-mathematics/sha1-polyml, to avoid -# this warning: -# ### load_lib </usr/bin/libsha1.so> : /usr/bin/libsha1.so: cannot open shared -# object file: No such file or directory -# ### Using slow ML implementation of SHA1.digest -# sci-mathematics/sha1-polyml supplies the library libsha1.so. Which -# is the implementation of SHA1 taken from the GNU coreutils package -# as described in the sci-mathematics/sha1-polyml README. Isabelle -# builds libsha1.so in the contrib/polyml/$ML_PLATFORM directory. -# isabelle dynamically loads libsha1.so as a plugin. The Isabelle-2012 -# linux binary bundle places libsha1.so in the contrib/polyml directory, which -# is referred to as ML_HOME in the Isabelle Pure/General/sha1_polyml.ML source file. -# ML_HOME is /usr/bin on Gentoo, and we want isabelle to depend o sha1-polyml. -# For these reasons isabelle is patched to load it from -# /usr/$(get_libdir)/sha1-polyml/libsha1.so - -src_prepare() { - cp -p "${S}/build" "${S}/build-orig" || die "Could not cp build to build-orig" - sed -e "s@CFLAGS=\"@CFLAGS=\"${CFLAGS} @g" \ - -e "s@LDFLAGS=\"@LDFLAGS=\"${LDFLAGS} @g" \ - -i "${S}/build" || die "Could not set flags in build" - cp -p "${S}/build" "${S}/tests" || die "Could not cp build to tests" - sed -e '/echo "Running tests ..."/,$d' \ - -i "${S}/build" || die "Could not remove run tests from build" - sed -e '$i\\nexit 0' \ - -i "${S}/build" || die "Could not add exit 0 to build" - sed -e 's/echo "Running tests ..."/echo "Running tests ..."\necho "Running tests ..."/' \ - -i "${S}/tests" || die "Could not duplicate echo line in tests" - sed -e '/# building/,/echo "Running tests ..."/d' \ - -i "${S}/tests" || die "Could not remove build from run tests" - sed -e '$i\\nexit 0' \ - -i "${S}/tests" || die "Could not add exit 0 to tests" -} - -src_compile() { - arch=$(uname -m) - uos=$(uname) - # Switch to ,, when we switch to EAPI=6. - #local los=${uos,,} - los=$(tr '[:upper:]' '[:lower:]' <<<"${uos}") - ./build "${arch}-${los}" || die "build failed" -} - -src_test() { - ./tests "${arch}-${los}" || die "tests failed" -} - -src_install() { - dodoc README - insinto "/usr/"$(get_libdir) - dodir ${LIBDIR} - exeinto ${LIBDIR} - doexe ${arch}-${los}/libsha1.so -} diff --git a/sci-mathematics/twelf/twelf-1.7.1.ebuild b/sci-mathematics/twelf/twelf-1.7.1.ebuild deleted file mode 100644 index b26e6491cc42..000000000000 --- a/sci-mathematics/twelf/twelf-1.7.1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit elisp-common eutils multilib - -MY_PN="${PN}-src" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Implementation of the logical framework LF" -HOMEPAGE="https://twelf.org/" -SRC_URI="http://twelf.plparty.org/releases/${MY_P}.tar.gz" - -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -LICENSE="BSD-2" -IUSE="doc emacs examples" - -# tests reference non-existing directory TEST -RESTRICT="test" - -RDEPEND=" - dev-lang/mlton - doc? ( - virtual/latex-base - app-text/texi2html - ) - emacs? ( - >=app-editors/emacs-23.1:* - )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${PN} - -SITEFILE=50${PN}-gentoo.el - -PATCHES=( - "${FILESDIR}/${PN}-1.7.1-doc-guide-twelf-dot-texi.patch" - "${FILESDIR}/${PN}-1.7.1-doc-guide-Makefile.patch" - "${FILESDIR}/${PN}-1.7.1-emacs-twelf.patch" - "${FILESDIR}/${PN}-1.7.1-emacs-twelf-init.patch" - "${FILESDIR}/${PN}-1.7.1-Makefile.patch" - "${FILESDIR}/${PN}-1.7.1-mlton-mlb.patch" -) - -src_prepare() { - epatch "${PATCHES[@]}" - sed \ - -e "s@/usr/bin@${ROOT}usr/bin@g" \ - -e "s@/usr/share@${ROOT}usr/share@" \ - -i "${S}"/emacs/twelf-init.el \ - || die "Could not set ROOT in ${S}/emacs/twelf-init.el" -} - -src_compile() { - emake mlton CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} -fno-PIE" - if use emacs ; then - pushd "${S}/emacs" || die "Could change directory to emacs" - elisp-compile \ - auc-menu.el \ - twelf-font.el \ - twelf-init.el \ - twelf.el \ - || die "emacs elisp compile failed" - popd - fi - if use doc; then - pushd doc/guide - emake all - popd - fi -} - -ins_example_dir() { - insinto "/usr/share/${PN}/examples/${1}" - pushd "${S}/${1}" - doins -r * - popd -} - -src_install() { - if use emacs ; then - elisp-install ${PN} emacs/*.{el,elc} - cp "${FILESDIR}"/${SITEFILE} "${S}" - elisp-site-file-install ${SITEFILE} - fi - if use examples; then - ins_example_dir examples - ins_example_dir examples-clp - ins_example_dir examples-delphin - fi - dobin bin/twelf-server - if use doc; then - dohtml doc/html/index.html - doinfo doc/guide/twelf.info - dodoc doc/guide/twelf.dvi doc/guide/twelf.ps doc/guide/twelf.pdf - dohtml doc/guide/twelf/* - fi -} - -pkg_postinst() { - if use emacs; then - elisp-site-regen - ewarn "For twelf emacs, add this line to ~/.emacs" - ewarn "" - ewarn '(load (concat twelf-root "/twelf-init.el"))' - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2019-r1.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2019-r1.ebuild deleted file mode 100644 index e6b33bf068a7..000000000000 --- a/sci-mathematics/why3-for-spark/why3-for-spark-2019-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -MYP=why3-${PV}-20190517-197BB-src - -DESCRIPTION="Platform for deductive program verification" -HOMEPAGE="https://why3.lri.fr/" -SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf915d31e87a8f1c967d54 - -> ${MYP}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt zarith zip" -RESTRICT=strip - -DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt=] - >=dev-ml/ocamlbuild-0.14.0 - dev-ml/menhir:= - dev-ml/num:= - coq? ( >=sci-mathematics/coq-8.9.1 ) - doc? ( dev-tex/rubber ) - gtk? ( >=dev-ml/lablgtk-2.18.8:=[sourceview] ) - emacs? ( >=app-editors/emacs-23.1:* ) - html? ( dev-tex/hevea:= ) - hypothesis-selection? ( dev-ml/ocamlgraph:= ) - zarith? ( dev-ml/zarith:= ) - zip? ( >=dev-ml/camlzip-1.07:= )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${MYP} - -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -REQUIRED_USE="html? ( doc )" - -src_configure() { - econf \ - --disable-pvs-libs \ - --disable-isabelle-libs \ - --enable-verbose-make \ - $(use_enable coq coq-libs) \ - $(use_enable doc) \ - $(use_enable emacs emacs-compilation) \ - $(use_enable gtk ide) \ - $(use_enable html html-doc) \ - $(use_enable hypothesis-selection) \ - $(use_enable ocamlopt native-code) \ - $(use_enable zarith) \ - $(use_enable zip) -} - -src_compile() { - emake -j1 - if use ocamlopt; then - emake byte - fi - use doc && emake doc -} - -src_install() { - emake DESTDIR="${D}" -j1 install - emake DESTDIR="${D}" -j1 install-lib - emake DESTDIR="${D}" install_spark2014_dev - dosym ../why3server /usr/$(get_libdir)/why3/commands/why3server - einstalldocs - docompress -x /usr/share/doc/${PF}/examples - dodoc -r examples - if use doc; then - dodoc doc/manual.pdf - use html && dodoc -r doc/html - fi -} diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2019.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2019.ebuild deleted file mode 100644 index c0646024b7d3..000000000000 --- a/sci-mathematics/why3-for-spark/why3-for-spark-2019.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -MYP=why3-${PV}-20190517-197BB-src - -DESCRIPTION="Platform for deductive program verification" -HOMEPAGE="https://why3.lri.fr/" -SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf915d31e87a8f1c967d54 - -> ${MYP}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt profiling zarith zip" -RESTRICT="strip" - -DEPEND=">=dev-lang/ocaml-4.02.3:=[ocamlopt=] - dev-ml/menhir:= - coq? ( sci-mathematics/coq ) - doc? ( dev-tex/rubber ) - gtk? ( dev-ml/lablgtk:=[sourceview] ) - emacs? ( >=app-editors/emacs-23.1:* ) - html? ( dev-tex/hevea:= ) - hypothesis-selection? ( dev-ml/ocamlgraph:= ) - zarith? ( dev-ml/zarith:= ) - zip? ( >=dev-ml/camlzip-1.07:= )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${MYP} - -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -REQUIRED_USE="html? ( doc )" - -src_configure() { - econf \ - --disable-pvs-libs \ - --disable-isabelle-libs \ - --enable-verbose-make \ - $(use_enable coq coq-libs) \ - $(use_enable doc) \ - $(use_enable emacs emacs-compilation) \ - $(use_enable gtk ide) \ - $(use_enable html html-doc) \ - $(use_enable hypothesis-selection) \ - $(use_enable ocamlopt native-code) \ - $(use_enable profiling) \ - $(use_enable zarith) \ - $(use_enable zip) -} - -src_compile() { - emake -j1 - if use ocamlopt; then - emake byte - fi - use doc && emake doc -} - -src_install() { - emake DESTDIR="${D}" -j1 install - emake DESTDIR="${D}" -j1 install-lib - emake DESTDIR="${D}" install_spark2014_dev - dosym ../why3server /usr/$(get_libdir)/why3/commands/why3server - einstalldocs - docompress -x /usr/share/doc/${PF}/examples - dodoc -r examples - if use doc; then - dodoc doc/manual.pdf - use html && dodoc -r doc/html - fi -} diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest index 8cd6ddc4d025..14ca398e0786 100644 --- a/sci-mathematics/wxmaxima/Manifest +++ b/sci-mathematics/wxmaxima/Manifest @@ -1,8 +1,2 @@ DIST wxmaxima-18.11.4.tar.gz 12156776 BLAKE2B 75be0fb88402af011885616a646f7abcad25516ea9b0b375daf02edac5518b113188290262bc431e8bfb4836fc1f731982a1c41c62871818e4d2cc68c96ccb31 SHA512 964de93edc5c46e98de3de405b1873fa0ed594d54f1ddc030377b023110261cb1e6b0b08dbf210551888bf890e28d16e9b1698768c93dde413d5e1918cbd234e -DIST wxmaxima-20.01.1.tar.gz 14011946 BLAKE2B ed80f02158aa0c43f37c040225010b35eea49756d8f052bcfa245d31a4a2203880463f51833ed40f2e1365473eb138269287c30a52e9f9b98ef4d9a5daac8cf5 SHA512 bff946f87db39b4bf416ef3440fdfea277f9dc9ed95debcea5798211299ae8c8dbb136a44be586a79e538b99fd38c46febf5378caab6ac31a01a01033f083937 -DIST wxmaxima-20.01.3.tar.gz 14221966 BLAKE2B cdaf62f5456446fe6edf1247323faa9f0aeb84dbe890cb03028f9f441c4c6bd3e7acf806b71a86b156ea7f10664c0188517b8f2aa15536e3350e16e3307f412c SHA512 4a977bd293255ac3c010610c74aa39fba8b8468aaa9fc59707bab69ede7a427e261ce827bae8d302ee1343bb0fce5e7aa5ee3c59f17198d5c473637571667abd -DIST wxmaxima-20.02.4.tar.gz 15242422 BLAKE2B ea9dc613fa94d046a9d461c56a9d1564001f4fa28d90a553040e85b7dd442df025521dd9501257d12c808a2e9285b7f34b04c9f10d4ce658bc6d423055c9fbd7 SHA512 d5eb0e09de55c3e6ebafeaa95957ca8bbdacac9ec1d99f6041fa99b7fa59364b3228336675f9bffa71b879b17268b80c695f16c9259bee6d5cab9ef7ed86294b -DIST wxmaxima-20.04.0.tar.gz 15313618 BLAKE2B 04a9544aeb1a7084250696fad99c51be21bf0b119581cebdf62b8dece3034ebcc1469b9d07576bfed8d72efe77ce6db47b5a29c4185a5e85114b552d3385caf9 SHA512 8caf9effa0167c3307eff4a6895a3b19b41aab37f845e4cdc139f3cdd03d9a061adc9ea4ad8ca7e0f28d83faf34d15f828f03c86d05ad7d83f0e28aee82aba70 -DIST wxmaxima-20.07.0.tar.gz 15723971 BLAKE2B cdec59e8ca17d0f4577a316a68e90795424d3d31829130e1854d908d76e54c02b125d20ce3a41ad5b4b06d57d918156bbbce7dead114b05daade34845d045124 SHA512 7272df5314ac79248154ee899397361da0570a6188ddc464b0479d2d6ac556ddf3941cf1ac17c9e6642e77d79a8458b902e70513dfdea15bc6a6d36d76b0bec2 -DIST wxmaxima-20.09.0.tar.gz 16159536 BLAKE2B 758537f9d35ecbec1405318465ccce91b172f0e6fb00c71b926224f1cb90ed31263d8ae69a14a437c05e9e489e5143fb2e010ccb44e3fd9d7cf29785dbac9dfa SHA512 952fdfec3f07904e3385657b43f5ad669a3149307843d352aa4d78c6ff88fb51aa31f301964a13c86faece5d4a2acce5af91338e7de57599d7414da447564fe8 DIST wxmaxima-20.12.2.tar.gz 16262617 BLAKE2B 2f9f910f565158b2011f014d96747498c6286a95bdb69f9b6b2f82a37a569e8a02abbae5cbb9ae2ac1e78d0b976487666794b267c1c40c1245df08c752486403 SHA512 1c3e3f68a2fa2cd798dfb05c52e7ddf3193a15cb45282553c280914bd524d463ad27acc89898cb4a292ff236699d1ec2abb70d83fa52cb126123ab8e2fcd5ceb diff --git a/sci-mathematics/wxmaxima/wxmaxima-20.01.1.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.01.1.ebuild deleted file mode 100644 index 9a2b704c52cf..000000000000 --- a/sci-mathematics/wxmaxima/wxmaxima-20.01.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -WX_GTK_VER="3.0" -PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW" -inherit cmake-utils wxwidgets l10n xdg - -DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit" -HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/" -SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" -S="${WORKDIR}"/${PN}-Version-${PV} - -DEPEND=" - dev-libs/libxml2:2 - x11-libs/wxGTK:${WX_GTK_VER}" -RDEPEND="${DEPEND} - media-fonts/jsmath - sci-visualization/gnuplot[wxwidgets] - sci-mathematics/maxima" - -src_prepare() { - setup-wxwidgets - cmake-utils_src_prepare - - sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \ - || die "sed info/CMakeLists.txt failed" - - # locales - rm_po() { - rm "${S}"/locales/wxMaxima/${1}.po || die "rm ${1}.po failed" - rm -f "${S}"/locales/manual/${1}.po - rm -f "${S}"/locales/wxwin/${1}.po - rm -f "${S}"/info/${PN}.${1}.md - rm -f "${S}"/info/${PN}.${1}.html - } - l10n_find_plocales_changes "${S}"/locales/wxMaxima '' '.po' - l10n_for_each_disabled_locale_do rm_po -} - -src_install() { - docompress -x /usr/share/doc/${PF} - cmake-utils_src_install -} diff --git a/sci-mathematics/wxmaxima/wxmaxima-20.01.3.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.01.3.ebuild deleted file mode 100644 index 9a2b704c52cf..000000000000 --- a/sci-mathematics/wxmaxima/wxmaxima-20.01.3.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -WX_GTK_VER="3.0" -PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW" -inherit cmake-utils wxwidgets l10n xdg - -DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit" -HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/" -SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" -S="${WORKDIR}"/${PN}-Version-${PV} - -DEPEND=" - dev-libs/libxml2:2 - x11-libs/wxGTK:${WX_GTK_VER}" -RDEPEND="${DEPEND} - media-fonts/jsmath - sci-visualization/gnuplot[wxwidgets] - sci-mathematics/maxima" - -src_prepare() { - setup-wxwidgets - cmake-utils_src_prepare - - sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \ - || die "sed info/CMakeLists.txt failed" - - # locales - rm_po() { - rm "${S}"/locales/wxMaxima/${1}.po || die "rm ${1}.po failed" - rm -f "${S}"/locales/manual/${1}.po - rm -f "${S}"/locales/wxwin/${1}.po - rm -f "${S}"/info/${PN}.${1}.md - rm -f "${S}"/info/${PN}.${1}.html - } - l10n_find_plocales_changes "${S}"/locales/wxMaxima '' '.po' - l10n_for_each_disabled_locale_do rm_po -} - -src_install() { - docompress -x /usr/share/doc/${PF} - cmake-utils_src_install -} diff --git a/sci-mathematics/wxmaxima/wxmaxima-20.02.4.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.02.4.ebuild deleted file mode 100644 index 9a2b704c52cf..000000000000 --- a/sci-mathematics/wxmaxima/wxmaxima-20.02.4.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -WX_GTK_VER="3.0" -PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW" -inherit cmake-utils wxwidgets l10n xdg - -DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit" -HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/" -SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" -S="${WORKDIR}"/${PN}-Version-${PV} - -DEPEND=" - dev-libs/libxml2:2 - x11-libs/wxGTK:${WX_GTK_VER}" -RDEPEND="${DEPEND} - media-fonts/jsmath - sci-visualization/gnuplot[wxwidgets] - sci-mathematics/maxima" - -src_prepare() { - setup-wxwidgets - cmake-utils_src_prepare - - sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \ - || die "sed info/CMakeLists.txt failed" - - # locales - rm_po() { - rm "${S}"/locales/wxMaxima/${1}.po || die "rm ${1}.po failed" - rm -f "${S}"/locales/manual/${1}.po - rm -f "${S}"/locales/wxwin/${1}.po - rm -f "${S}"/info/${PN}.${1}.md - rm -f "${S}"/info/${PN}.${1}.html - } - l10n_find_plocales_changes "${S}"/locales/wxMaxima '' '.po' - l10n_for_each_disabled_locale_do rm_po -} - -src_install() { - docompress -x /usr/share/doc/${PF} - cmake-utils_src_install -} diff --git a/sci-mathematics/wxmaxima/wxmaxima-20.04.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.04.0.ebuild deleted file mode 100644 index 9a2b704c52cf..000000000000 --- a/sci-mathematics/wxmaxima/wxmaxima-20.04.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -WX_GTK_VER="3.0" -PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW" -inherit cmake-utils wxwidgets l10n xdg - -DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit" -HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/" -SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" -S="${WORKDIR}"/${PN}-Version-${PV} - -DEPEND=" - dev-libs/libxml2:2 - x11-libs/wxGTK:${WX_GTK_VER}" -RDEPEND="${DEPEND} - media-fonts/jsmath - sci-visualization/gnuplot[wxwidgets] - sci-mathematics/maxima" - -src_prepare() { - setup-wxwidgets - cmake-utils_src_prepare - - sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \ - || die "sed info/CMakeLists.txt failed" - - # locales - rm_po() { - rm "${S}"/locales/wxMaxima/${1}.po || die "rm ${1}.po failed" - rm -f "${S}"/locales/manual/${1}.po - rm -f "${S}"/locales/wxwin/${1}.po - rm -f "${S}"/info/${PN}.${1}.md - rm -f "${S}"/info/${PN}.${1}.html - } - l10n_find_plocales_changes "${S}"/locales/wxMaxima '' '.po' - l10n_for_each_disabled_locale_do rm_po -} - -src_install() { - docompress -x /usr/share/doc/${PF} - cmake-utils_src_install -} diff --git a/sci-mathematics/wxmaxima/wxmaxima-20.07.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.07.0.ebuild deleted file mode 100644 index 9a2b704c52cf..000000000000 --- a/sci-mathematics/wxmaxima/wxmaxima-20.07.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -WX_GTK_VER="3.0" -PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW" -inherit cmake-utils wxwidgets l10n xdg - -DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit" -HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/" -SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" -S="${WORKDIR}"/${PN}-Version-${PV} - -DEPEND=" - dev-libs/libxml2:2 - x11-libs/wxGTK:${WX_GTK_VER}" -RDEPEND="${DEPEND} - media-fonts/jsmath - sci-visualization/gnuplot[wxwidgets] - sci-mathematics/maxima" - -src_prepare() { - setup-wxwidgets - cmake-utils_src_prepare - - sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \ - || die "sed info/CMakeLists.txt failed" - - # locales - rm_po() { - rm "${S}"/locales/wxMaxima/${1}.po || die "rm ${1}.po failed" - rm -f "${S}"/locales/manual/${1}.po - rm -f "${S}"/locales/wxwin/${1}.po - rm -f "${S}"/info/${PN}.${1}.md - rm -f "${S}"/info/${PN}.${1}.html - } - l10n_find_plocales_changes "${S}"/locales/wxMaxima '' '.po' - l10n_for_each_disabled_locale_do rm_po -} - -src_install() { - docompress -x /usr/share/doc/${PF} - cmake-utils_src_install -} diff --git a/sci-mathematics/wxmaxima/wxmaxima-20.09.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.09.0.ebuild deleted file mode 100644 index 9a2b704c52cf..000000000000 --- a/sci-mathematics/wxmaxima/wxmaxima-20.09.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -WX_GTK_VER="3.0" -PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW" -inherit cmake-utils wxwidgets l10n xdg - -DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit" -HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/" -SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" -S="${WORKDIR}"/${PN}-Version-${PV} - -DEPEND=" - dev-libs/libxml2:2 - x11-libs/wxGTK:${WX_GTK_VER}" -RDEPEND="${DEPEND} - media-fonts/jsmath - sci-visualization/gnuplot[wxwidgets] - sci-mathematics/maxima" - -src_prepare() { - setup-wxwidgets - cmake-utils_src_prepare - - sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \ - || die "sed info/CMakeLists.txt failed" - - # locales - rm_po() { - rm "${S}"/locales/wxMaxima/${1}.po || die "rm ${1}.po failed" - rm -f "${S}"/locales/manual/${1}.po - rm -f "${S}"/locales/wxwin/${1}.po - rm -f "${S}"/info/${PN}.${1}.md - rm -f "${S}"/info/${PN}.${1}.html - } - l10n_find_plocales_changes "${S}"/locales/wxMaxima '' '.po' - l10n_for_each_disabled_locale_do rm_po -} - -src_install() { - docompress -x /usr/share/doc/${PF} - cmake-utils_src_install -} diff --git a/sci-misc/ViSP-images/Manifest b/sci-misc/ViSP-images/Manifest index 7660b370f30f..48f0da3ae758 100644 --- a/sci-misc/ViSP-images/Manifest +++ b/sci-misc/ViSP-images/Manifest @@ -1,2 +1 @@ -DIST visp-images-3.2.0.zip 84366211 BLAKE2B a0cb17bf7e79ed187a40f229b236e83127bd449f48a4046c21235f6f6cd37b25a324ba74c1337a110b91a42789249e71ce86fc2fa81e1573733db1bf4fff1cc5 SHA512 1249f63ca648e0248d6dcc13ae19a8485d347c90f3f929d4725909ec1b25962f58a999e8feed664ed51ccba9a3ba95a184385aabd0a5aef88f118dbb2a020c14 DIST visp-images-3.3.0.zip 91291914 BLAKE2B e2c893303401e5facf52bff847785a155d3f990f8fc149ef1003b0bd1609b7740cea41bc5a24ed64bc0eefe23b02587cd6bfcd2d3303bbd84941d36f108da587 SHA512 d0f4c7f10a36f4aa365bd7bf65d35941755d429331c5f28b7731faa0c01c66fe9ab9137403c90cc0b3fb7b718553da69acdb3e9309c9bff14be7981a726bb41f diff --git a/sci-misc/ViSP-images/ViSP-images-3.2.0.ebuild b/sci-misc/ViSP-images/ViSP-images-3.2.0.ebuild deleted file mode 100644 index c1e3ca262d3c..000000000000 --- a/sci-misc/ViSP-images/ViSP-images-3.2.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="ViSP images data set" -HOMEPAGE="https://www.irisa.fr/lagadic/visp/" -SRC_URI="http://visp-doc.inria.fr/download/dataset/visp-images-${PV}.zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm" -IUSE="" - -DEPEND="app-arch/unzip" -RDEPEND="" - -S="${WORKDIR}/visp-images-${PV}" - -src_install() { - dodoc README.md - rm -f README.md LICENSE.txt - dodir /usr/share/visp-images-data/ - mv "${S}" "${ED}/usr/share/visp-images-data/${PN}" -} diff --git a/sci-misc/cdfplayer/Manifest b/sci-misc/cdfplayer/Manifest index 43586506a2dd..01697f322106 100644 --- a/sci-misc/cdfplayer/Manifest +++ b/sci-misc/cdfplayer/Manifest @@ -1,3 +1 @@ -DIST CDFPlayer_11.2.0_LINUX.sh 1821479711 BLAKE2B 7d12a94b43fdd60dc6af3d78fe45f85a2aa68752c690de023d4cd0cc5d24f8b091db7846d3732d7618d7df659b982fbcf19543d7d0c0116ddcae7f7b1aa11d88 SHA512 8a9a98ed5dceb18db41e52269dedf2a00ee89015a76eb650b852f8e1c19040918ecfa7594737f2982118c7358eab4d1e85694eecbe059edc963d4bdc8533b470 -DIST CDFPlayer_11.3.0_LINUX.sh 1556151070 BLAKE2B 652adda3989bdac10f02c5fc648ded7189e56555bab9d48f75c642a9ca6b0ca70771cae54142f55bc2d19a720a17fad04abd3c7240a114a237dee69e4f8ca303 SHA512 d28939481772e1a2ec6296b5f4d7e98628ccc015c75c084b09a90937525415c6a447111c1488482bf355917ac2ddb8dc154f46b8864d0d001bb7d419cd2f671a DIST WolframPlayer_12.2.0_LINUX.sh 1003754320 BLAKE2B b37e2500e09543efd5084b6fadd6f5d6d6f7f2b75627fc8cb3819578d41de00a8ba5f529440d64efebabcf9d26a77b51b01969135f02baca851c42811ef521b7 SHA512 dc4449836419dd7abe8590319912b07019a4f2cf542e31759c15bde0055bfc6bebc880fd6ab88809758d5723862bbbe971affa07429a660b728698d24a4c9d20 diff --git a/sci-misc/cdfplayer/cdfplayer-11.2.0.ebuild b/sci-misc/cdfplayer/cdfplayer-11.2.0.ebuild deleted file mode 100644 index 8af77a03ae63..000000000000 --- a/sci-misc/cdfplayer/cdfplayer-11.2.0.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator - -DESCRIPTION="Wolfram Player for the interactive Computable Document Format (CDF)" -SRC_URI="CDFPlayer_11.2.0_LINUX.sh" -HOMEPAGE="https://www.wolfram.com/cdf-player/" - -LICENSE="WolframCDFPlayer" -KEYWORDS="-* ~amd64 ~x86" -SLOT="0" -IUSE="" - -RESTRICT="strip mirror bindist fetch" - -DEPEND="" - -# this list comes from lsof output -# probably there are still some libraries missing -RDEPEND=" - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXcursor - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - media-libs/alsa-lib - dev-libs/expat - media-libs/fontconfig - dev-libs/icu - x11-libs/libxcb - dev-libs/libxml2 - sys-libs/ncurses-compat:5 -" - -# we need this a few times -MPV=$(get_version_component_range 1-2) - -# we might as well list all files in all QA variables... -QA_PREBUILT="opt/*" - -S=${WORKDIR} - -src_unpack() { - /bin/sh "${DISTDIR}/${A}" --nox11 --confirm --keep -- -auto "-targetdir=${S}/opt/Wolfram/CDFPlayer/${MPV}" "-execdir=${S}/opt/bin" || die -} - -src_install() { - # move all over - mv "${S}/opt" "${D}/opt" || die - - # the autogenerated symlinks point into sandbox, redo - rm "${D}/opt/bin/"* || die - dosym ../Wolfram/CDFPlayer/${MPV}/Executables/wolframcdfplayer opt/bin/wolframcdfplayer - dosym ../Wolfram/CDFPlayer/${MPV}/Executables/WolframCDFPlayer opt/bin/WolframCDFPlayer - - # fix some embedded paths and install desktop files - insinto /usr/share/applications - for filename in $(find "${D}" -name "wolfram-cdf11.desktop") ; do - echo Fixing "${filename}" - sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}" - echo "Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}" - doins "${filename}" - done -} - -pkg_nofetch() { - einfo "Sadly Wolfram provides no permanent link to the player files." - einfo "Please download the Wolfram CFD Player installation file ${SRC_URI} from" - einfo "${HOMEPAGE} and place it into your DISTDIR directory." -} diff --git a/sci-misc/cdfplayer/cdfplayer-11.3.0.ebuild b/sci-misc/cdfplayer/cdfplayer-11.3.0.ebuild deleted file mode 100644 index 6dbba4529162..000000000000 --- a/sci-misc/cdfplayer/cdfplayer-11.3.0.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib versionator - -DESCRIPTION="Wolfram Player for the interactive Computable Document Format (CDF)" -SRC_URI="CDFPlayer_11.3.0_LINUX.sh" -HOMEPAGE="https://www.wolfram.com/cdf-player/" - -LICENSE="WolframCDFPlayer" -KEYWORDS="-* ~amd64 ~x86" -SLOT="0" -IUSE="" - -RESTRICT="strip mirror bindist fetch" - -DEPEND="" - -# this list comes from lsof output -# probably there are still some libraries missing -RDEPEND=" - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXcursor - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - media-libs/alsa-lib - dev-libs/expat - media-libs/fontconfig - dev-libs/icu - x11-libs/libxcb - dev-libs/libxml2 - sys-libs/ncurses-compat:5 - media-libs/freetype -" - -# we need this a few times -MPN="CDFPlayer" -MPV=$(get_version_component_range 1-2) - -# we might as well list all files in all QA variables... -QA_PREBUILT="opt/*" - -S=${WORKDIR} - -src_unpack() { - /bin/sh "${DISTDIR}/${A}" --nox11 --confirm --keep -- -auto "-targetdir=${S}/opt/Wolfram/${MPN}/${MPV}" "-execdir=${S}/opt/bin" || die -} - -src_install() { - local ARCH - if use amd64; then ARCH='-x86-64'; else ARCH=''; fi - - # move all over - mv "${S}"/opt "${D}"/opt || die - - # the autogenerated symlinks point into sandbox, redo - rm "${D}"/opt/bin/* || die - dosym ../Wolfram/${MPN}/${MPV}/Executables/wolframcdfplayer opt/bin/wolframcdfplayer - dosym ../Wolfram/${MPN}/${MPV}/Executables/WolframCDFPlayer opt/bin/WolframCDFPlayer - rm "${D}"/opt/Wolfram/${MPN}/${MPV}/Executables/wolframscript - dosym ../SystemFiles/Kernel/Binaries/Linux${ARCH}/wolframscript /opt/Wolfram/${MPN}/${MPV}/Executables/wolframscript - - # fix some embedded paths and install desktop files - insinto /usr/share/applications - for filename in $(find "${D}" -name "wolfram-cdf11.desktop") ; do - echo Fixing "${filename}" - sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}" - echo "Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}" - doins "${filename}" - done - - # install a wrapper - echo '#!/bin/sh' >> ${PN} - echo "LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/lib/libz.so.1 /opt/Wolfram/${MPN}/${MPV}/Executables/wolframcdfplayer \$*" \ - >> ${PN} - dobin ${PN} -} - -pkg_nofetch() { - einfo "Sadly Wolfram provides no permanent link to the player files." - einfo "Please download the Wolfram CFD Player installation file ${SRC_URI} from" - einfo "${HOMEPAGE} and place it into your DISTDIR directory." -} diff --git a/sci-misc/fitsverify/Manifest b/sci-misc/fitsverify/Manifest index f8429893d7d5..ceab79a90af3 100644 --- a/sci-misc/fitsverify/Manifest +++ b/sci-misc/fitsverify/Manifest @@ -1,2 +1 @@ -DIST fitsverify-4.17.tar.gz 42634 BLAKE2B 6273b709314d8ffa05b981d781fc80d5ef03f7c3c64cd2414d003be10a0dc537b902e3e8bcbac2fc572e6011687a9e806db16cdd660f5d2c4b4d0f1e3b394e4d SHA512 0d15b8e4ae5098126bed2bb2dfaa47ac20d977ed707352dc7930ebaf23a7a20cc69458fd77f9e76888e2ec4ef8a2a2f180c2fe03b9b7a4c9299aeea6df831879 DIST fitsverify-4.18.tar.gz 42840 BLAKE2B e02fc9d5558e31fa2fa98b155a8acabe75f1fa2dfd8924519c6117cfde4754a2f49085e77fe52c0f859310877f5927e7a17f93c458e7d5aa72cb14b313c99211 SHA512 4be82078bf328538e1b98b386aedd6b2501a25e3d17f19e0db5b82ed8f62493e51f01228653ecf769ff3c706a16c8d65fe64ebc8693e8dd406e88d0a9ffc5010 diff --git a/sci-misc/fitsverify/fitsverify-4.17.ebuild b/sci-misc/fitsverify/fitsverify-4.17.ebuild deleted file mode 100644 index 9d85f6e203cf..000000000000 --- a/sci-misc/fitsverify/fitsverify-4.17.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="FITS file format checker" -HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/ftools/fitsverify/" -SRC_URI="https://heasarc.gsfc.nasa.gov/docs/software/ftools/fitsverify/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="sci-libs/cfitsio:0=" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${PN}" - -src_compile() { - $(tc-getCC) ${CPPFLAGS} -DSTANDALONE ${CFLAGS} ${LDFLAGS} \ - $($(tc-getPKG_CONFIG) --cflags cfitsio) \ - ftverify.c fvrf*.c \ - $($(tc-getPKG_CONFIG) --libs cfitsio) -o ${PN} \ - || die "compiled failed" -} - -src_install() { - dobin fitsverify - dodoc README -} diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest index 89ee08092cfb..a5d77918fa0f 100644 --- a/sci-physics/bullet/Manifest +++ b/sci-physics/bullet/Manifest @@ -1,4 +1 @@ -DIST bullet-2.86.tar.gz 25806558 BLAKE2B a8576d8dacd67b9789d32d7b1acc6c4025df3c15427c60d66f98b1906eee8b2b94e5b0108b9a8c00ca6261510ccaf57ba5c02c72fee8f528d4f723b304166731 SHA512 af8a6b282ab606437d7975a59cd8a9c2bf273c83b0e79f0c4c1de6fa51695ba6d5f3c853dce2fdba9cb55e7572214e15089e54db51afc465ca26f502cbd5a4f9 -DIST bullet-2.89.tar.gz 135742506 BLAKE2B 3725533bb50f3cf4783e21c57a5e3596f280d9aa3caa5b7a44925d4785206cc86514ff89c2cc1e33f8a14af7c8a5165190bb0515a6931fc4c7ec2e2b9aef3dd8 SHA512 3c4ba6a3b3623ef44dd4a23e0bc2e90dec1f2b7af463edcb886e110feac1dfb4a91945f0ed640052cac228318539e275976d37238102fb10a0f78aef065a730b -DIST bullet-3.05.tar.gz 142858358 BLAKE2B d7ef2e68c0740e5bd2a728c576bcd3f07fff3680d8f604d7fd89bb6d7eb8c38f6205aea3bae300d70c2ec4e362c14e0567e3af3aabc893f8e33d979ffe8b3521 SHA512 4cb67547b466e01f6c2258b1f350fdfac0f2dc73a7962b6e196491e6722e1cd22cdfe80d7b2f4e1e92a90f91e277bff5cabfd0f55ef55010f9a4d7286843cecd DIST bullet-3.07.tar.gz 148413637 BLAKE2B 776cd7651d11d865095ea000d353860bea09c6ff4ec8dd8e43282a78373e2830f6ce1ce2b87ed25a67be7bded297b3a6320b2872a71dfd3849e7b197c6d2c936 SHA512 31fc7cb4ed8b939abc9eeb0a8f6fff3a454ea4ebcffd797fd35a2320fe3ab222fcd315569809ea148d0efff47267f5eec9f4bf7aaf07730a06aa9babd2abc9a6 diff --git a/sci-physics/bullet/bullet-2.86.ebuild b/sci-physics/bullet/bullet-2.86.ebuild deleted file mode 100644 index 9d76230d1ddb..000000000000 --- a/sci-physics/bullet/bullet-2.86.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Continuous Collision Detection and Physics Library" -HOMEPAGE="https://www.bulletphysics.com/" -SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="+bullet3 doc double-precision examples extras test" - -RDEPEND=" - virtual/opengl - media-libs/freeglut" -DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen[dot] )" - -PATCHES=( "${FILESDIR}"/${PN}-2.85-soversion.patch ) - -DOCS=( AUTHORS.txt LICENSE.txt README.md ) - -# Building / linking of third Party library BussIK does not work out of the box -RESTRICT="test" - -S="${WORKDIR}/${PN}3-${PV}" - -src_prepare() { - cmake_src_prepare - - # allow to generate docs - sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_CPU_DEMOS=OFF - -DBUILD_OPENGL3_DEMOS=OFF - -DBUILD_BULLET2_DEMOS=OFF - -DUSE_GRAPHICAL_BENCHMARK=OFF - -DINSTALL_LIBS=ON - -DINSTALL_EXTRA_LIBS=ON - -DBUILD_BULLET3=$(usex bullet3) - -DBUILD_EXTRAS=$(usex extras) - -DUSE_DOUBLE_PRECISION=$(usex double-precision) - -DBUILD_UNIT_TESTS=$(usex test) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc; then - doxygen || die - HTML_DOCS+=( html/. ) - DOCS+=( docs/*.pdf ) - fi - - if use examples; then - # throws QA warnings - rm examples/ThirdPartyLibs/openvr/*/linux64/libopenvr_api.so || die - DOCS+=( examples ) - fi -} diff --git a/sci-physics/bullet/bullet-2.89.ebuild b/sci-physics/bullet/bullet-2.89.ebuild deleted file mode 100644 index 7f5c25d488d8..000000000000 --- a/sci-physics/bullet/bullet-2.89.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake toolchain-funcs - -DESCRIPTION="Continuous Collision Detection and Physics Library" -HOMEPAGE="https://www.bulletphysics.com/" -SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+bullet3 doc double-precision examples extras openmp tbb test threads" - -REQUIRED_USE=" - openmp? ( threads ) - tbb? ( threads ) -" - -RDEPEND=" - virtual/opengl - media-libs/freeglut - tbb? ( dev-cpp/tbb ) -" -DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen[dot] )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.85-soversion.patch - "${FILESDIR}"/${PN}-2.89-no-dangling-pointer.patch -) - -DOCS=( AUTHORS.txt LICENSE.txt README.md ) - -# Building / linking of third Party library BussIK does not work out of the box -RESTRICT="test" - -S="${WORKDIR}/${PN}3-${PV}" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - cmake_src_prepare - - # allow to generate docs - sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_CPU_DEMOS=OFF - -DBUILD_OPENGL3_DEMOS=OFF - -DBUILD_BULLET2_DEMOS=OFF - -DUSE_GRAPHICAL_BENCHMARK=OFF - -DINSTALL_LIBS=ON - -DINSTALL_EXTRA_LIBS=ON - -DBUILD_BULLET3=$(usex bullet3) - -DBUILD_EXTRAS=$(usex extras) - -DUSE_DOUBLE_PRECISION=$(usex double-precision) - -DBUILD_UNIT_TESTS=$(usex test) - -DBULLET2_MULTITHREADING=$(usex threads) - -DBULLET2_USE_OPEN_MP_MULTITHREADING=$(usex openmp) - -DBULLET2_USE_TBB_MULTITHREADING=$(usex tbb) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc; then - doxygen || die - HTML_DOCS+=( html/. ) - DOCS+=( docs/*.pdf ) - fi - - if use examples; then - # throws QA warnings - rm examples/ThirdPartyLibs/openvr/*/linux64/libopenvr_api.so || die - DOCS+=( examples ) - fi -} diff --git a/sci-physics/bullet/bullet-3.05.ebuild b/sci-physics/bullet/bullet-3.05.ebuild deleted file mode 100644 index 0ba0a2d387cd..000000000000 --- a/sci-physics/bullet/bullet-3.05.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake toolchain-funcs - -DESCRIPTION="Continuous Collision Detection and Physics Library" -HOMEPAGE="https://www.bulletphysics.com/" -SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc double-precision examples openmp tbb test threads" - -REQUIRED_USE=" - openmp? ( threads ) - tbb? ( threads ) -" - -RDEPEND=" - virtual/opengl - media-libs/freeglut - tbb? ( dev-cpp/tbb ) -" -DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen[dot] )" - -PATCHES=( "${FILESDIR}"/${PN}-2.85-soversion.patch ) - -DOCS=( AUTHORS.txt LICENSE.txt README.md ) - -# Building / linking of third Party library BussIK does not work out of the box -RESTRICT="test" - -S="${WORKDIR}/${PN}3-${PV}" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - cmake_src_prepare - - # allow to generate docs - sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_CPU_DEMOS=OFF - -DBUILD_OPENGL3_DEMOS=OFF - -DBUILD_BULLET2_DEMOS=OFF - -DUSE_GRAPHICAL_BENCHMARK=OFF - -DINSTALL_LIBS=ON - -DBUILD_BULLET3=ON - -DBUILD_EXTRAS=OFF - -DUSE_DOUBLE_PRECISION=$(usex double-precision) - -DBUILD_UNIT_TESTS=$(usex test) - -DBULLET2_MULTITHREADING=$(usex threads) - -DBULLET2_USE_OPEN_MP_MULTITHREADING=$(usex openmp) - -DBULLET2_USE_TBB_MULTITHREADING=$(usex tbb) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc; then - doxygen || die - HTML_DOCS+=( html/. ) - DOCS+=( docs/*.pdf ) - fi - - if use examples; then - # throws QA warnings - rm examples/ThirdPartyLibs/openvr/*/linux*/libopenvr_api.so || die - DOCS+=( examples ) - fi -} diff --git a/sci-physics/bullet/files/bullet-2.89-no-dangling-pointer.patch b/sci-physics/bullet/files/bullet-2.89-no-dangling-pointer.patch deleted file mode 100644 index 8eee0016ae28..000000000000 --- a/sci-physics/bullet/files/bullet-2.89-no-dangling-pointer.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1c64add35ed4918222ceb4fe93b7bef0e2b4e41c Mon Sep 17 00:00:00 2001 -From: stolk <b.stolk@gmail.com> -Date: Wed, 1 Apr 2020 10:59:16 -0700 -Subject: [PATCH] Do not return a dangling pointer! - -Signed-off-by: Ross Charles Campbell <rossbridger.cc@gmail.com> ---- - Extras/ConvexDecomposition/cd_wavefront.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Extras/ConvexDecomposition/cd_wavefront.cpp b/Extras/ConvexDecomposition/cd_wavefront.cpp -index b33080964..53b5784df 100644 ---- a/Extras/ConvexDecomposition/cd_wavefront.cpp -+++ b/Extras/ConvexDecomposition/cd_wavefront.cpp -@@ -437,7 +437,7 @@ const char **InPlaceParser::GetArglist(char *line, int &count) // convert sourc - { - const char **ret = 0; - -- const char *argv[MAXARGS]; -+ static const char *argv[MAXARGS]; - int argc = 0; - - char *foo = line; --- -2.28.0 - diff --git a/sci-physics/bullet/metadata.xml b/sci-physics/bullet/metadata.xml index e675e23592fd..2a35e6647691 100644 --- a/sci-physics/bullet/metadata.xml +++ b/sci-physics/bullet/metadata.xml @@ -19,9 +19,7 @@ for games and animation. </longdescription> <use> - <flag restrict="<=sci-physics/bullet-2.89" name="bullet3">Build Bullet 3</flag> <flag restrict="<=sci-physics/bullet-2.89" name="double-precision">Build libraries in double precision</flag> - <flag restrict="<=sci-physics/bullet-2.89" name="extras">Build additional libraries</flag> <flag restrict="=sci-physics/bullet-2.89" name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag> </use> <upstream> diff --git a/sci-physics/cernlib/Manifest b/sci-physics/cernlib/Manifest index 8e42f93ad047..89f9e4e42ac1 100644 --- a/sci-physics/cernlib/Manifest +++ b/sci-physics/cernlib/Manifest @@ -1,4 +1,3 @@ DIST cernlib_20061220+dfsg3-2.debian.tar.gz 257093 BLAKE2B 35ae90e38ddb935f252531cdf49dc038cdb7543b9168076f97458323a2458938cfa2f1768165d4cc59649021e2b268139dd53b3ef09d2a6601e1f68792c69af1 SHA512 43a2ca55d42b92bfb551b029c75728e80b4c83473397b52f746d9481c7503762bc5a281732908bfeb29a64f728fed4c127ed1cb9101c16e4fb2dd28c452730ea -DIST cernlib_20061220+dfsg3-4.1.debian.tar.xz 170100 BLAKE2B 7bc206a246cc437babae6cdb38bd5831ccf4f665bbe65f2ebabf7df8a68c0b7c317f4a7ed283024bf70b6fe50fa8f01bd9a2882cfba174020a23f768f69c237c SHA512 d259ab304b040c6bab8535c0db60aaa466ef7bb9bbcce9b2d8931505a180c92935d428e0dd45bfa6199ec939f67580a6d3ac1035c0384bdcf9e6601a351ce90a DIST cernlib_20061220+dfsg3-4.3.debian.tar.xz 168928 BLAKE2B 15147d1d84d3e4abb06620154425a035e64d6e5254177f9647634fdf63e4a5aa42deba6c8f638f338cf85e8766732388cc6298813dd5b007d1ef97fddcef3d39 SHA512 8cb666d9ef62627e7e3e55bd1986b40ca9ddfcc882101b1a3597c1d60870e30649b5c7716687f7e4106b30ba0aa88a9ca7bc3a3651b0d1405f55a6f611dc308b DIST cernlib_20061220+dfsg3.orig.tar.gz 6434476 BLAKE2B 069eda316ffbc4873e79952283a0aa2693ed58a3cc369bca72e29a4feaef4840922b4f62ababba1476f2aa0309f68833a4a35a3b5c6ac015bdbd85b3b58b2efe SHA512 11fade45c5ae69c858f37a82e74ab1a69416314a23c12ec5205ee6b918590d66f26d3ae68afa466ae3109d736212968ece956a444270ddd189a27a24c0ccece8 diff --git a/sci-physics/cernlib/cernlib-2006-r6.ebuild b/sci-physics/cernlib/cernlib-2006-r6.ebuild deleted file mode 100644 index abdee8792276..000000000000 --- a/sci-physics/cernlib/cernlib-2006-r6.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils fortran-2 multilib toolchain-funcs - -DEB_PN=cernlib -DEB_PV=20061220+dfsg3 -DEB_PR=4.1 -DEB_P=${DEB_PN}_${DEB_PV} - -DESCRIPTION="CERN program library for High Energy Physics" -HOMEPAGE="https://cernlib.web.cern.ch/cernlib/" -SRC_URI=" - mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz - mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.debian.tar.xz" - -SLOT="0" -LICENSE="GPL-2 LGPL-2 BSD" -KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - x11-libs/motif:0 - virtual/lapack - dev-lang/cfortran" -DEPEND="${RDEPEND} - x11-misc/imake - x11-misc/makedepend - virtual/pkgconfig" - -S="${WORKDIR}/${DEB_PN}-${DEB_PV}" - -src_prepare() { - mv ../debian . || die - epatch "${FILESDIR}"/${P}-nogfortran.patch - # set some default paths - sed -i \ - -e "s:/usr/local:${EROOT}/usr:g" \ - -e "s:prefix)/lib/\$(DEB_HOST_MULTIARCH):prefix)/$(get_libdir):" \ - -e "s:\$(prefix)/etc:${EROOT}/etc:" \ - -e 's:$(prefix)/man:$(prefix)/share/man:' \ - debian/add-ons/cernlib.mk || die "sed failed" - - # use system blas and lapack set by gentoo framework - sed -i \ - -e "s:\$DEPS -lm:$($(tc-getPKG_CONFIG) --libs blas):" \ - -e "s:\$DEPS -llapack -lm:$($(tc-getPKG_CONFIG) --libs lapack):" \ - -e 's:`depend $d $a blas`::' \ - -e 's:X11R6:X11:g' \ - -e 's: /[^ ]*`dpkg-arch.*`::' \ - debian/add-ons/bin/cernlib.in || die "sed failed" - - cp debian/add-ons/Makefile . - export DEB_BUILD_OPTIONS="$(tc-getFC) nostrip nocheck" - - einfo "Applying Debian patches" - emake -j1 patch - - epatch "${FILESDIR}"/${P}-fgets.patch - epatch "${FILESDIR}"/${P}-ypatchy-short-name.patch - # since we depend on cfortran, do not use the one from cernlib - rm src/include/cfortran/cfortran.h || die - - # respect users flags - sed -i \ - -e 's/-O3/-O2/g' \ - -e "s/-O2/${CFLAGS}/g" \ - -e "s|\(CcCmd[[:space:]]*\)gcc|\1$(tc-getCC)|g" \ - -e "s|\(CplusplusCmd[[:space:]]*\)g++|\1$(tc-getCXX)|g" \ - -e "s|\(FortranCmd[[:space:]]*\)gfortran|\1$(tc-getFC)|g" \ - src/config/linux.cf \ - || die "sed linux.cf failed" - sed -i \ - -e "s|\(ArCmdBase[[:space:]]*\)ar|\1$(tc-getAR)|g" \ - -e "s|\(RanlibCmd[[:space:]]*\)ranlib|\1$(tc-getRANLIB)|g" \ - src/config/Imake.tmpl \ - || die "sed Imake.tmpl failed" - - sed -i \ - -e 's/\$(FCLINK)/\$(FCLINK) $(LDFLAGS)/' \ - -e 's/\$(CCLINK)/\$(CCLINK) $(LDFLAGS)/' \ - src/config/{biglib,fortran,Imake}.rules \ - src/patchy/Imakefile \ - || die "sed for ldflags propagation failed" - - # add missing headers for implicit - sed -i \ - -e '0,/^#include/i#include <stdlib.h>' \ - src/kernlib/kerngen/ccgen*/*.c || die -} - -src_compile() { - # parallel make breaks and complex patched imake system, hard to debug - emake -j1 cernlib-indep cernlib-arch -} - -src_test() { - LD_LIBRARY_PATH="${S}"/shlib emake -j1 cernlib-test -} - -src_install() { - default - cd debian - dodoc changelog README.* deadpool.txt NEWS copyright - newdoc add-ons/README README.add-ons -} diff --git a/sci-physics/fastjet/files/fastjet-3.0.3-system-siscone.patch b/sci-physics/fastjet/files/fastjet-3.0.3-system-siscone.patch deleted file mode 100644 index b74b8e4e9033..000000000000 --- a/sci-physics/fastjet/files/fastjet-3.0.3-system-siscone.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -Nur fastjet-3.0.3.orig/configure.ac fastjet-3.0.3/configure.ac ---- fastjet-3.0.3.orig/configure.ac 2012-06-25 15:15:32.000000000 +0100 -+++ fastjet-3.0.3/configure.ac 2012-07-24 18:39:11.000000000 +0100 -@@ -14,7 +14,7 @@ - dnl - the first macro needs to place the files in the correct - dnl dir in order to have the correct -I options for the remote build - dnl - see Makefile.am for distcleaning AX_PREFIX_CONFIG_H leftovers --AM_CONFIG_HEADER(include/fastjet/config_raw.h:config.h.in) -+AC_CONFIG_HEADERS(include/fastjet/config_raw.h:config.h.in) - AX_PREFIX_CONFIG_H(include/fastjet/config_auto.h,FASTJET,include/fastjet/config_raw.h) - - dnl check autoconf version -@@ -252,6 +252,12 @@ - fi - - dnl SISCone -+AC_ARG_WITH(bundle-siscone, -+ [ --with-bundle-siscone Build the bundled SISCone library [default=no]], -+ [bundle_siscone=$withval], -+ [bundle_siscone=no]) -+AM_CONDITIONAL(BUNDLE_SISCONE, test x$bundle_siscone != xno) -+ - ACX_CHECK_PLUGIN(SISCone, siscone, SISCONE, yes, - [CONFIG_LIBS_PLUGINS=${CONFIG_LIBS_PLUGINS}" -lsiscone_spherical -lsiscone" - CONFIG_LIBS_PLUGINS_STATIC=${CONFIG_LIBS_PLUGINS_STATIC}" \${installationdir}/lib/libsiscone.a \${installationdir}/lib/libsiscone_spherical.a"]) -diff -Nur fastjet-3.0.3.orig/example/Makefile.am fastjet-3.0.3/example/Makefile.am ---- fastjet-3.0.3.orig/example/Makefile.am 2012-06-13 15:14:58.000000000 +0100 -+++ fastjet-3.0.3/example/Makefile.am 2012-07-24 18:26:15.000000000 +0100 -@@ -43,7 +43,7 @@ - 03_plugin_CXXFLAGS = $(AM_CXXFLAGS) $(CGAL_CPPFLAGS) -I$(srcdir)/../include - 03_plugin_LDADD = ../src/libfastjet.la $(CGAL_LIBS) - 03_plugin_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone --03_plugin_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la -+03_plugin_LDADD += ../plugins/SISCone/libSISConePlugin.la - else - EXTRA_DIST += 03-plugin.cc - endif -@@ -125,7 +125,7 @@ - fastjet_areas_LDADD = ../src/libfastjet.la $(CGAL_LIBS) - if BUILD_PLUGIN_SISCONE - fastjet_areas_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone --fastjet_areas_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la -+fastjet_areas_LDADD += ../plugins/SISCone/libSISConePlugin.la - endif - - fastjet_timing_plugins_SOURCES = fastjet_timing_plugins.cc CmdLine.cc -@@ -135,7 +135,7 @@ - fastjet_timing_plugins_LDADD += ../tools/libfastjettools.la - if BUILD_PLUGIN_SISCONE - fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone --fastjet_timing_plugins_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la -+fastjet_timing_plugins_LDADD += ../plugins/SISCone/libSISConePlugin.la - endif - if BUILD_PLUGIN_CDFCONES - fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/CDFCones -diff -Nur fastjet-3.0.3.orig/plugins/SISCone/Makefile.am fastjet-3.0.3/plugins/SISCone/Makefile.am ---- fastjet-3.0.3.orig/plugins/SISCone/Makefile.am 2012-06-13 15:14:51.000000000 +0100 -+++ fastjet-3.0.3/plugins/SISCone/Makefile.am 2012-07-24 18:36:56.000000000 +0100 -@@ -1,11 +1,22 @@ --SUBDIRS = siscone fastjet . -+SUBDIRS = fastjet . - - if MONOLITHIC_PLUGINS - noinst_LTLIBRARIES = libSISConePlugin.la - else - lib_LTLIBRARIES = libSISConePlugin.la - endif --libSISConePlugin_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir) -I$(srcdir)/siscone -I$(srcdir)/../../include -+libSISConePlugin_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir) -I$(srcdir)/../../include -+ -+if BUNDLE_SISCONE -+SUBDIRS += siscone -+libSISConePlugin_la_CXXFLAGS += -I$(srcdir)/siscone -+libSISConePlugin_la_LIBADD = \ -+ $(top_builddir)/plugins/SISCone/siscone/siscone/libsiscone.la \ -+ $(top_builddir)/plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la -+else -+libSISConePlugin_la_LIBADD = -lsiscone -lsiscone_spherical -+endif -+ - libSISConePlugin_la_SOURCES = SISConePlugin.cc SISConeSphericalPlugin.cc - - EXTRA_DIST = makefile.static diff --git a/sci-physics/geant-data/Manifest b/sci-physics/geant-data/Manifest index 1057c9ce8b6a..c564745f74c8 100644 --- a/sci-physics/geant-data/Manifest +++ b/sci-physics/geant-data/Manifest @@ -1,7 +1,6 @@ DIST G4ABLA.3.1.tar.gz 107286 BLAKE2B ff60665b01dcdb85a76028af472e6f71068b8132187701c46e5c4e8509125d34853d3c574561be22f34cc5f35503ec0808f2964888cd19259392de8054f19647 SHA512 4178870783ca015dade0b07006afc27fed095ff195251c672a0812f9c8e13908b5dfa9a127e8f3ec473f242bf7faf6d49a3371a75e669a06245722924b7c4278 DIST G4EMLOW.7.13.tar.gz 298636910 BLAKE2B ee9c83410183a6fef3a2d44e866818a765f85aecb637879a6f96b2958e0c3675acb0a2891b6dd07c81fffabcb95dcc541f23f076b4aa1cbb2131e72b2b869b93 SHA512 8789ee0cae6d62c6e6af5f8c5f49706f37230df609cad375bef9568d13d5cd62fa1bded616385fd4790d047bb305090ba08957980fe7881d169a2a0e31693879 DIST G4EMLOW.7.9.1.tar.gz 119756769 BLAKE2B 67be0b7ac34beb995ad4132883927fb99a78f93e7c99390c93fe897b4208a94a3ea5faaab1d04def5c248151c82d46431b411cb22303ffe941c6fe8a57d30423 SHA512 7f52ad5a3935323b60e5ea5196a64a2209337ca3d208109bceb648b95a5a3b0aa33f9a46f878884cb398e49302733c6f5b6316254261d350d038af8ec412952f -DIST G4EMLOW.7.9.tar.gz 118027817 BLAKE2B 3456d07a0d87accbdf90049626e653488bb592f113e898e364638924259ce889940a20b7c84e40f16e654ca3fbb9e892050ce7e66a62a9e267706c5750bcd313 SHA512 6c5ae214915b273d20bec1483267279d53a015a13ed30ba1de325d489b5b34e65b227f8fd6caeb5fef28c2a582b7285002338e866f32c7f151fb1508ee55c54d DIST G4ENSDFSTATE.2.2.tar.gz 290632 BLAKE2B aff44d0b6512e4a227fa61a33045023652699843f80d1e90e236d491afd90be828a7bb393a4bb5b224b296d6e3f899a11027340b9e1ebffe705d08708af283fa SHA512 4feaa4229ac520d0e81ab0e31691ee899fa1f10b1a57f66b986fbe19729f7548000b8bac3519d09e91a1f7e116aa7a5bfeae5a3f5b6c3364168b51f4b5bb88c3 DIST G4ENSDFSTATE.2.3.tar.gz 290745 BLAKE2B 89c642a43ebcb979b233cfb1af1bde9b2f4fd5a5ff2f282f8975aae9514c3579d67e66b1b3559e75a633b13d272c0f54fc41aef415463583a6920fc6e3f66b78 SHA512 0f92d1871f532a979829406a150e263ac13141e594acca6728edd1dbe0a181c03d0be23f7cbb6a6e73550dc71bf1337edb799c9845dff6df991b44ea8cb8ceec DIST G4INCL.1.0.tar.gz 95840 BLAKE2B 2c264b7563620cdbdb8a5e529f21766a5b5ea3e2e51047362518714d01854de8d9ca2ca2a0183ab672cc2f8a4d951327b0e1a7298799695fd48233fa5e529686 SHA512 9d769566d1728674bd6d1e59fc05882943cd240d2f0a9e47dff37fa64fe27720b20b66f6dea6d300c3c9082a22f7f71bb416df8c7d2b5bae87251c4a0113f49b diff --git a/sci-physics/geant-data/geant-data-4.10.6-r1.ebuild b/sci-physics/geant-data/geant-data-4.10.6-r1.ebuild deleted file mode 100644 index 807a0dc104e8..000000000000 --- a/sci-physics/geant-data/geant-data-4.10.6-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Data files for Geant4 physical processes" -HOMEPAGE="https://geant4.web.cern.ch" -SRC_DATA="https://geant4-data.web.cern.ch/geant4-data/datasets" - -declare -A DATASETS - -DATASETS=( - [G4NDL]="G4NDL 4.6 G4NEUTRONHPDATA" - [G4EMLOW]="G4EMLOW 7.9 G4LEDATA" - [PhotonEvaporation]="G4PhotonEvaporation 5.5 G4LEVELGAMMADATA" - [RadioactiveDecay]="G4RadioactiveDecay 5.4 G4RADIOACTIVEDATA" - [G4PARTICLEXS]="G4PARTICLEXS 2.1 G4PARTICLEXSDATA" - [G4PII]="G4PII 1.3 G4PIIDATA" - [RealSurface]="G4RealSurface 2.1.1 G4REALSURFACEDATA" - [G4SAIDDATA]="G4SAIDDATA 2.0 G4SAIDXSDATA" - [G4ABLA]="G4ABLA 3.1 G4ABLADATA" - [G4INCL]="G4INCL 1.0 G4INCLDATA" - [G4ENSDFSTATE]="G4ENSDFSTATE 2.2 G4ENSDFSTATEDATA" - [G4TENDL]="G4TENDL 1.3.2 G4PARTICLEHPDATA" -) - -for DATASET in ${!DATASETS[@]}; do - read FILENAME VERSION ENVVAR <<< "${DATASETS[$DATASET]}" - SRC_URI+="${SRC_DATA}/${FILENAME}.${VERSION}.tar.gz " -done -unset DATASET FILENAME VERSION ENVVAR - -LICENSE="geant4" -SLOT="4" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="" - -S="${WORKDIR}" - -src_unpack() { - # unpack in destination only to avoid copy - return -} - -src_install() { - for DATASET in ${!DATASETS[@]}; do - read FILENAME VERSION ENVVAR <<< "${DATASETS[$DATASET]}" - echo $ENVVAR=\"${EPREFIX}/usr/share/geant4/data/${DATASET}${VERSION}\"; - done >| 99geant-data - doenvd 99geant-data - dodir /usr/share/geant4/data - cd "${ED}/usr/share/geant4/data" || die - unpack ${A} -} diff --git a/sci-physics/geant-data/geant-data-4.10.6_p1-r1.ebuild b/sci-physics/geant-data/geant-data-4.10.6_p1-r1.ebuild deleted file mode 100644 index ae7c1d2b919d..000000000000 --- a/sci-physics/geant-data/geant-data-4.10.6_p1-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Data files for Geant4 physical processes" -HOMEPAGE="https://geant4.web.cern.ch" -SRC_DATA="https://geant4-data.web.cern.ch/geant4-data/datasets" - -declare -A DATASETS - -DATASETS=( - [G4NDL]="G4NDL 4.6 G4NEUTRONHPDATA" - [G4EMLOW]="G4EMLOW 7.9.1 G4LEDATA" - [PhotonEvaporation]="G4PhotonEvaporation 5.5 G4LEVELGAMMADATA" - [RadioactiveDecay]="G4RadioactiveDecay 5.4 G4RADIOACTIVEDATA" - [G4PARTICLEXS]="G4PARTICLEXS 2.1 G4PARTICLEXSDATA" - [G4PII]="G4PII 1.3 G4PIIDATA" - [RealSurface]="G4RealSurface 2.1.1 G4REALSURFACEDATA" - [G4SAIDDATA]="G4SAIDDATA 2.0 G4SAIDXSDATA" - [G4ABLA]="G4ABLA 3.1 G4ABLADATA" - [G4INCL]="G4INCL 1.0 G4INCLDATA" - [G4ENSDFSTATE]="G4ENSDFSTATE 2.2 G4ENSDFSTATEDATA" - [G4TENDL]="G4TENDL 1.3.2 G4PARTICLEHPDATA" -) - -for DATASET in ${!DATASETS[@]}; do - read FILENAME VERSION ENVVAR <<< "${DATASETS[$DATASET]}" - SRC_URI+="${SRC_DATA}/${FILENAME}.${VERSION}.tar.gz " -done -unset DATASET FILENAME VERSION ENVVAR - -LICENSE="geant4" -SLOT="4" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="" - -S="${WORKDIR}" - -src_unpack() { - # unpack in destination only to avoid copy - return -} - -src_install() { - for DATASET in ${!DATASETS[@]}; do - read FILENAME VERSION ENVVAR <<< "${DATASETS[$DATASET]}" - echo $ENVVAR=\"${EPREFIX}/usr/share/geant4/data/${DATASET}${VERSION}\"; - done >| 99geant-data - doenvd 99geant-data - dodir /usr/share/geant4/data - cd "${ED}/usr/share/geant4/data" || die - unpack ${A} -} diff --git a/sci-physics/geant-vmc/Manifest b/sci-physics/geant-vmc/Manifest index 016c1ffe961e..f28791df07e5 100644 --- a/sci-physics/geant-vmc/Manifest +++ b/sci-physics/geant-vmc/Manifest @@ -1,2 +1 @@ -DIST geant-vmc-4.5.1_p1.tar.gz 7441504 BLAKE2B 2bcb844a8fc79c800eec50f914cd7238a68ba0c1ffa1e8d185adcded70583118e39efbac3330f7942a098fc64f990c1e9e0eeb1796f71ebd98f97d121aa6c121 SHA512 760611c1df481ea3d9f9069061678677ffc2bcf9edd7cfd44789a6359b945bc341f705da0ee85ecda7f8ac2b096cd5b7aa9ea2c44b464e3085c16eeb33ee1316 DIST geant-vmc-4.5.3.tar.gz 7411643 BLAKE2B 31a486aa32f879093753aab09798eabf1a936f0aa246bb97c7f055eefb789c9c5a5097c14ce47b05a99f3cc2b46bea6edeba2af80ee362bb8fee039ee711eddc SHA512 918ce3ca4a4fb329f00000fce00dae3d4a4c9f348553f31bf474f727c1e67242b5ff28fe7dc5d3ab12d1174663b1dd96b654b5baf7edfa662ab3f66687792e94 diff --git a/sci-physics/geant-vmc/geant-vmc-4.5.1_p1.ebuild b/sci-physics/geant-vmc/geant-vmc-4.5.1_p1.ebuild deleted file mode 100644 index db272c5e8dfa..000000000000 --- a/sci-physics/geant-vmc/geant-vmc-4.5.1_p1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vmc-project/geant4_vmc.git" - KEYWORDS="" -else - MY_PV=$(ver_rs 1-2 - $(ver_cut 2-)) - SRC_URI="https://github.com/vmc-project/geant4-vmc/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/geant4_vmc-${MY_PV}" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Virtual Monte Carlo Geant4 implementation" -HOMEPAGE="https://root.cern.ch/root/vmc/VirtualMC.html" - -LICENSE="GPL-3" -SLOT="4" -IUSE="+c++11 c++14 c++17 doc examples geant3 +g4root +mtroot rootvmc vgm test" - -REQUIRED_USE="^^ ( c++11 c++14 c++17 )" - -RDEPEND=" - rootvmc? ( - >=sci-physics/root-6.18:=[vmc] - !!sci-physics/vmc - ) - !rootvmc? ( - >=sci-physics/root-6.18:=[-vmc] - sci-physics/vmc:=[c++11?,c++14?,c++17?] - ) - >=sci-physics/geant-4.10.6[c++11?,c++14?,c++17?,opengl,geant3?] - >=sci-physics/root-6.18:=[c++11?,c++14?,c++17?] - vgm? ( >=sci-physics/vgm-4.8:=[c++11?,c++14?,c++17?] )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" -RESTRICT=" - !examples? ( test ) - !geant3? ( test ) - !g4root? ( test ) - !mtroot? ( test ) - !test? ( test ) - !vgm? ( test )" - -DOCS=(history README.md) - -src_configure() { - local mycmakeargs=( - -DGeant4VMC_USE_VGM="$(usex vgm)" - -DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)" - -DGeant4VMC_USE_G4Root="$(usex g4root)" - -DGeant4VMC_BUILD_MTRoot="$(usex mtroot)" - -DGeant4VMC_BUILD_EXAMPLES="$(usex test)" - -DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)" - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use doc ; then - local dirs=( - source - $(usev g4root) - $(usev mtroot) - $(usev examples) - ) - local d - for d in "${dirs[@]}"; do - pushd "${d}" > /dev/null || die - doxygen || die - popd > /dev/null || die - done - fi -} - -src_test() { - cd examples || die - ./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die - ./test_suite_exe.sh --g3=off --garfield=off --garfield=off --builddir="${BUILD_DIR}" || die -} - -src_install() { - cmake_src_install - use doc && local HTML_DOCS=(doc/.) - einstalldocs -} diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest index 2aadd1760dca..30465aa34b06 100644 --- a/sci-physics/geant/Manifest +++ b/sci-physics/geant/Manifest @@ -1,5 +1 @@ -DIST geant4.10.06.p01.tar.gz 34869969 BLAKE2B 0a27f34df213a0dcc2d87c6001c100269be7496519c614fa5b51cd6502d98232d09de0f3c44216c34b6788ec8a1f626d22a53cb7329027006c614a10777b6896 SHA512 d9bca66b086a309a577dcf018c0ca52f5d786b1ebe5ce9d30c29c579c342399816c34efbcb34af60871145b6713cb8151f5517c5a0aa9d24d00e4257a5c1c6c0 -DIST geant4.10.06.p02.tar.gz 34833550 BLAKE2B c1a3b51cf5fc135edd8f547e5a88c80f8f6ed991be92439e161225afa0447473b67c0ef0757011e1e3a22a370f43ad9b14c9fe9cb3d5f5f0a78a762c86e0dd80 SHA512 bcfbea05c88a6021898e361ffa0c8e28637631e65b2f9ae2d694deae36a67c6af78785569c5971d1c63a4692a3dfbfc082cf14d7af209cb9f36efff9bec9bc20 -DIST geant4.10.06.p03.tar.gz 35099426 BLAKE2B 75668b87eb3f1d8be00c46dc3e6e2131707ad89f4d077d2c55b7c985803709da565dbddd2ebd6ee7b6a3f4d58dc84a41bcded3b1db926127b480fb8e9fab2765 SHA512 844769991e20f4397a336a8e94bb82434b4ce44c84c956935659d2407ebf29b388b672650466f9683d3c99f9c7fa4f2c81e3f27075427f1613d825f38a74df69 -DIST geant4.10.06.tar.gz 34834510 BLAKE2B 48f50c734186e444f5ef2fd02b013565db7f404b7fbaeb3127d7dd67ede76196fd5fa4512a5482cceb7696305eb72dbe819fe43fa26ac63ded49259d804f5ccf SHA512 e03d69cb66947ddc71d20b9065fd5db384dfc8b2b8e905ddab9ebb992c642dc33f369d7eba5f2338487da5d9d28f20f3078917f222d187c65e5af1a0112ee044 DIST geant4.10.07.tar.gz 36422877 BLAKE2B d81a37e0968f3c13bb846efc252b1b31cb01a8642610b079bcf6ec1741e7f5da09d50f4abe4054b7a06433dc7d9b611110c4f9a1f971a5f1df27580d49b8906d SHA512 057ab2c6ee5d5ad7012bd889bf883faa3ef1fa72a93190d00d1320f250b7b52e21cbae552cbc35065ad5f5bd46cd91fd1536dd4d5e620afa0abb6b065bd7c86b diff --git a/sci-physics/geant/files/geant-4.10.6-datadir.patch b/sci-physics/geant/files/geant-4.10.6-datadir.patch deleted file mode 100644 index c26bf8914b46..000000000000 --- a/sci-physics/geant/files/geant-4.10.6-datadir.patch +++ /dev/null @@ -1,159 +0,0 @@ -From 44966c44635debaddd859c788b008cd4e6c7fab6 Mon Sep 17 00:00:00 2001 -From: Guilherme Amadio <amadio@cern.ch> -Date: Fri, 13 Mar 2020 15:36:27 +0100 -Subject: [PATCH] Allow customization of CMAKE_INSTALL_DATADIR - ---- - cmake/Modules/G4CMakeMain.cmake | 2 +- - cmake/Modules/G4ConfigureGNUMakeHelpers.cmake | 20 +++++++++---------- - cmake/Modules/Geant4InstallData.cmake | 4 ++-- - source/analysis/CMakeLists.txt | 2 +- - source/analysis/g4tools/CMakeLists.txt | 2 +- - 5 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/cmake/Modules/G4CMakeMain.cmake b/cmake/Modules/G4CMakeMain.cmake -index a6b984fcad..5ab63202ca 100644 ---- a/cmake/Modules/G4CMakeMain.cmake -+++ b/cmake/Modules/G4CMakeMain.cmake -@@ -121,7 +121,7 @@ mark_as_advanced(GEANT4_INSTALL_EXAMPLES) - - if(GEANT4_INSTALL_EXAMPLES) - install(DIRECTORY examples -- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION} -+ DESTINATION ${CMAKE_INSTALL_DATADIR} - COMPONENT Examples - PATTERN "CVS" EXCLUDE - PATTERN ".svn" EXCLUDE -diff --git a/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake b/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake -index c2aeefee59..1052f43a45 100644 ---- a/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake -+++ b/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake -@@ -729,7 +729,7 @@ _g4tc_configure_build_tree_scripts(geant4make) - # +- CMAKE_INSTALL_PREFIX - # +- LIBDIR/Geant4-VERSION (G4LIB) - # +- INCLUDEDIR/Geant4 (G4INCLUDE) --# +- DATAROOTDIR/Geant4-VERSION/ -+# +- DATADIR/ - # +- geant4make (THIS IS G4INSTALL!) - # +- geant4make.(c)sh - # +- config/ -@@ -742,7 +742,7 @@ set(G4INSTALL "\"\$geant4make_root\"") - # - Include dir - file(RELATIVE_PATH - G4MAKE_TO_INCLUDEDIR -- ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make -+ ${CMAKE_INSTALL_FULL_DATADIR}/geant4make - ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME} - ) - set(G4INCLUDE "\"`cd \$geant4make_root/${G4MAKE_TO_INCLUDEDIR} > /dev/null \; pwd`\"") -@@ -750,7 +750,7 @@ set(G4INCLUDE "\"`cd \$geant4make_root/${G4MAKE_TO_INCLUDEDIR} > /dev/null \; pw - # - Bin dir - file(RELATIVE_PATH - G4MAKE_TO_BINDIR -- ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make -+ ${CMAKE_INSTALL_FULL_DATADIR}/geant4make - ${CMAKE_INSTALL_FULL_BINDIR} - ) - set(G4BIN_DIR "\"`cd \$geant4make_root/${G4MAKE_TO_BINDIR} > /dev/null \; pwd`\"") -@@ -758,7 +758,7 @@ set(G4BIN_DIR "\"`cd \$geant4make_root/${G4MAKE_TO_BINDIR} > /dev/null \; pwd`\" - # - Lib dir - file(RELATIVE_PATH - G4MAKE_TO_LIBDIR -- ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make -+ ${CMAKE_INSTALL_FULL_DATADIR}/geant4make - ${CMAKE_INSTALL_FULL_LIBDIR} - ) - set(G4LIB "\"`cd \$geant4make_root/${G4MAKE_TO_LIBDIR}/Geant4-${Geant4_VERSION} > /dev/null \; pwd`\"") -@@ -775,7 +775,7 @@ foreach(_ds ${GEANT4_EXPORTED_DATASETS}) - - file(RELATIVE_PATH - G4MAKE_TO_DATADIR -- ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make -+ ${CMAKE_INSTALL_FULL_DATADIR}/geant4make - ${${_ds}_PATH} - ) - set(${_ds}_PATH "\"`cd \$geant4make_root/${G4MAKE_TO_DATADIR} > /dev/null \; pwd`\"") -@@ -788,7 +788,7 @@ set(TOOLS_FONT_PATH "\"`cd \$geant4make_root/../fonts > /dev/null ; pwd`\"") - _g4tc_configure_install_tree_scripts( - ${CMAKE_BINARY_DIR}/InstallTreeFiles - geant4make -- ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make -+ ${CMAKE_INSTALL_DATADIR}/geant4make - ) - - -@@ -797,7 +797,7 @@ _g4tc_configure_install_tree_scripts( - # softlink to the G4SYSTEM directory. - # - install(DIRECTORY config -- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/geant4make - COMPONENT Development - FILES_MATCHING PATTERN "*.gmk" - PATTERN "CVS" EXCLUDE -@@ -845,11 +845,11 @@ endforeach() - - # - Fonts - file(RELATIVE_PATH -- G4ENV_BINDIR_TO_DATAROOTDIR -+ G4ENV_BINDIR_TO_DATADIR - "${CMAKE_INSTALL_FULL_BINDIR}" -- "${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}" -+ "${CMAKE_INSTALL_FULL_DATADIR}" - ) --set(TOOLS_FONT_PATH "\"`cd \$geant4_envbindir/${G4ENV_BINDIR_TO_DATAROOTDIR}/fonts > /dev/null ; pwd`\"") -+set(TOOLS_FONT_PATH "\"`cd \$geant4_envbindir/${G4ENV_BINDIR_TO_DATADIR}/fonts > /dev/null ; pwd`\"") - - - # - Configure for each shell -diff --git a/cmake/Modules/Geant4InstallData.cmake b/cmake/Modules/Geant4InstallData.cmake -index 496b0fc4df..55536e51d4 100644 ---- a/cmake/Modules/Geant4InstallData.cmake -+++ b/cmake/Modules/Geant4InstallData.cmake -@@ -105,7 +105,7 @@ set(GEANT4_DATASETS_URL "https://cern.ch/geant4-data/datasets") - set(GEANT4_BUILD_FULL_DATADIR ${PROJECT_BINARY_DIR}/data) - - # Where to install data in the install tree (a Default) --set(GEANT4_INSTALL_DATADIR_DEFAULT "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}-${${PROJECT_NAME}_VERSION}/data") -+set(GEANT4_INSTALL_DATADIR_DEFAULT "${CMAKE_INSTALL_DATADIR}/data") - - # File containing dataset list - set(GEANT4_DATASETS_DEFINITIONS "Geant4DatasetDefinitions") -@@ -596,7 +596,7 @@ endfunction() - # Choose Physics Data Install Dir - # This follows the pattern for interface and setting as in GNUInstallDirs - if(NOT GEANT4_INSTALL_DATADIR) -- set(GEANT4_INSTALL_DATADIR "" CACHE PATH "read-only architecture independent Geant4 physics data (DATAROOTDIR/${GEANT4_INSTALL_DATADIR_DEFAULT}") -+ set(GEANT4_INSTALL_DATADIR "" CACHE PATH "read-only architecture independent Geant4 physics data (DATADIR/data") - set(GEANT4_INSTALL_DATADIR "${GEANT4_INSTALL_DATADIR_DEFAULT}") - endif() - -diff --git a/source/analysis/CMakeLists.txt b/source/analysis/CMakeLists.txt -index 44fa4a97be..4c40c704be 100644 ---- a/source/analysis/CMakeLists.txt -+++ b/source/analysis/CMakeLists.txt -@@ -67,7 +67,7 @@ endif() - # - if (GEANT4_USE_FREETYPE) - install(DIRECTORY fonts/ -- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/fonts -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/fonts - PATTERN ".svn" EXCLUDE - ) - endif() -diff --git a/source/analysis/g4tools/CMakeLists.txt b/source/analysis/g4tools/CMakeLists.txt -index 54c72f1297..df87582bc1 100644 ---- a/source/analysis/g4tools/CMakeLists.txt -+++ b/source/analysis/g4tools/CMakeLists.txt -@@ -43,7 +43,7 @@ install(DIRECTORY include/ - # We also need to install the tools license - # - install(FILES tools.license -- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION} -+ DESTINATION ${CMAKE_INSTALL_DATADIR} - ) - - #------------------------------------------------------------------------------ --- -2.25.1 - diff --git a/sci-physics/geant/geant-4.10.6-r1.ebuild b/sci-physics/geant/geant-4.10.6-r1.ebuild deleted file mode 100644 index 59fedc8d7cc8..000000000000 --- a/sci-physics/geant/geant-4.10.6-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3)) - -case ${PV} in -*_beta*) - MY_P+=.b$(printf %02d $(ver_cut 5)) - DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt" - ;; -*_p*) - MY_P+=.p$(printf %02d $(ver_cut 5)) - DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt" - HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html" - ;; -*) - HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html" - ;; -esac - -DESCRIPTION="Toolkit for simulation of passage of particles through matter" -HOMEPAGE="https://geant4.web.cern.ch/" -SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz" - -LICENSE="geant4" -SLOT="4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5 - inventor motif opengl qt5 raytracerx static-libs threads vrml" - -REQUIRED_USE="^^ ( c++11 c++14 c++17 )" - -RDEPEND=" - dev-libs/expat - >=sci-physics/clhep-2.4.1.3:2=[threads?] - data? ( ~sci-physics/geant-data-${PV} ) - dawn? ( media-gfx/dawn ) - doc? ( ~app-doc/geant-docs-$(ver_cut 1-3) ) - gdml? ( dev-libs/xerces-c ) - hdf5? ( sci-libs/hdf5[threads?] ) - inventor? ( media-libs/SoXt ) - motif? ( x11-libs/motif:0 ) - opengl? ( virtual/opengl ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - opengl? ( dev-qt/qtopengl:5 ) - ) - raytracerx? ( - x11-libs/libX11 - x11-libs/libXmu - )" - -PATCHES=( "${FILESDIR}"/geant-4.10.6-datadir.patch ) - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4" - -DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-) - -DGEANT4_BUILD_MULTITHREADED=$(usex threads) - -DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec) - -DGEANT4_INSTALL_DATA=OFF - -DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data" - -DGEANT4_INSTALL_EXAMPLES=$(usex examples) - -DGEANT4_USE_FREETYPE=$(usex freetype) - -DGEANT4_USE_G3TOG4=$(usex geant3) - -DGEANT4_USE_GDML=$(usex gdml) - -DGEANT4_USE_HDF5=$(usex hdf5) - -DGEANT4_USE_INVENTOR=$(usex inventor) - -DGEANT4_USE_NETWORKDAWN=$(usex dawn) - -DGEANT4_USE_NETWORKVRML=$(usex vrml) - -DGEANT4_USE_OPENGL_X11=$(usex opengl) - -DGEANT4_USE_QT=$(usex qt5) - -DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx) - -DGEANT4_USE_SYSTEM_CLHEP=ON - -DGEANT4_USE_SYSTEM_EXPAT=ON - -DGEANT4_USE_SYSTEM_ZLIB=ON - -DGEANT4_USE_WT=OFF - -DGEANT4_USE_XM=$(usex motif) - -DBUILD_STATIC_LIBS=$(usex static-libs) - ${EXTRA_ECONF} - ) - if use inventor; then - mycmakeargs+=( - -DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)" - -DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)" - ) - fi - cmake-utils_src_configure -} - -src_install() { - # adjust clhep linking flags for system clhep - # binmake.gmk is only useful for legacy build systems - sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die - cmake-utils_src_install - rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts" - - einstalldocs -} diff --git a/sci-physics/geant/geant-4.10.6.3.ebuild b/sci-physics/geant/geant-4.10.6.3.ebuild deleted file mode 100644 index 2339a156d897..000000000000 --- a/sci-physics/geant/geant-4.10.6.3.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3)) - -case ${PV} in -*_beta*) - MY_P+=.b$(printf %02d $(ver_cut 5)) - DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt" - ;; -*) - if [[ $(ver_cut 4) -gt 0 ]]; then - MY_P+=.p$(printf %02d $(ver_cut 4)) - DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt" - fi - HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html" - ;; -esac - -DESCRIPTION="Toolkit for simulation of passage of particles through matter" -HOMEPAGE="https://geant4.web.cern.ch/" -SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz" - -LICENSE="geant4" -SLOT="4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5 - inventor motif opengl qt5 raytracerx static-libs threads vrml" - -REQUIRED_USE=" - ^^ ( c++11 c++14 c++17 ) - inventor? ( opengl ) - motif? ( opengl ) - qt5? ( opengl ) -" - -RDEPEND=" - dev-libs/expat - >=sci-physics/clhep-2.4.1.3:2=[threads?] - data? ( ~sci-physics/geant-data-${PV} ) - dawn? ( media-gfx/dawn ) - doc? ( =app-doc/geant-docs-$(ver_cut 1-3)* ) - gdml? ( dev-libs/xerces-c ) - hdf5? ( sci-libs/hdf5[threads?] ) - inventor? ( media-libs/SoXt ) - motif? ( x11-libs/motif:0 ) - opengl? ( virtual/opengl ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - opengl? ( dev-qt/qtopengl:5 ) - ) - raytracerx? ( - x11-libs/libX11 - x11-libs/libXmu - )" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4" - -DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-) - -DGEANT4_BUILD_MULTITHREADED=$(usex threads) - -DGEANT4_BUILD_STORE_TRAJECTORY=OFF - -DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec) - -DGEANT4_BUILD_VERBOSE_CODE=OFF - -DGEANT4_INSTALL_DATA=OFF - -DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data" - -DGEANT4_INSTALL_EXAMPLES=$(usex examples) - -DGEANT4_INSTALL_PACKAGE_CACHE=OFF - -DGEANT4_USE_FREETYPE=$(usex freetype) - -DGEANT4_USE_G3TOG4=$(usex geant3) - -DGEANT4_USE_GDML=$(usex gdml) - -DGEANT4_USE_HDF5=$(usex hdf5) - -DGEANT4_USE_INVENTOR=$(usex inventor) - -DGEANT4_USE_NETWORKDAWN=$(usex dawn) - -DGEANT4_USE_NETWORKVRML=$(usex vrml) - -DGEANT4_USE_OPENGL_X11=$(usex opengl) - -DGEANT4_USE_QT=$(usex qt5) - -DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx) - -DGEANT4_USE_SYSTEM_CLHEP=ON - -DGEANT4_USE_SYSTEM_EXPAT=ON - -DGEANT4_USE_SYSTEM_ZLIB=ON - -DGEANT4_USE_WT=OFF - -DGEANT4_USE_XM=$(usex motif) - -DBUILD_STATIC_LIBS=$(usex static-libs) - ${EXTRA_ECONF} - ) - if use inventor; then - mycmakeargs+=( - -DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)" - -DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)" - ) - fi - cmake_src_configure -} - -src_install() { - # adjust clhep linking flags for system clhep - # binmake.gmk is only useful for legacy build systems - sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die - cmake_src_install - rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts" - - einstalldocs -} diff --git a/sci-physics/geant/geant-4.10.6_p1-r1.ebuild b/sci-physics/geant/geant-4.10.6_p1-r1.ebuild deleted file mode 100644 index 59fedc8d7cc8..000000000000 --- a/sci-physics/geant/geant-4.10.6_p1-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3)) - -case ${PV} in -*_beta*) - MY_P+=.b$(printf %02d $(ver_cut 5)) - DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt" - ;; -*_p*) - MY_P+=.p$(printf %02d $(ver_cut 5)) - DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt" - HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html" - ;; -*) - HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html" - ;; -esac - -DESCRIPTION="Toolkit for simulation of passage of particles through matter" -HOMEPAGE="https://geant4.web.cern.ch/" -SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz" - -LICENSE="geant4" -SLOT="4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5 - inventor motif opengl qt5 raytracerx static-libs threads vrml" - -REQUIRED_USE="^^ ( c++11 c++14 c++17 )" - -RDEPEND=" - dev-libs/expat - >=sci-physics/clhep-2.4.1.3:2=[threads?] - data? ( ~sci-physics/geant-data-${PV} ) - dawn? ( media-gfx/dawn ) - doc? ( ~app-doc/geant-docs-$(ver_cut 1-3) ) - gdml? ( dev-libs/xerces-c ) - hdf5? ( sci-libs/hdf5[threads?] ) - inventor? ( media-libs/SoXt ) - motif? ( x11-libs/motif:0 ) - opengl? ( virtual/opengl ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - opengl? ( dev-qt/qtopengl:5 ) - ) - raytracerx? ( - x11-libs/libX11 - x11-libs/libXmu - )" - -PATCHES=( "${FILESDIR}"/geant-4.10.6-datadir.patch ) - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4" - -DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-) - -DGEANT4_BUILD_MULTITHREADED=$(usex threads) - -DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec) - -DGEANT4_INSTALL_DATA=OFF - -DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data" - -DGEANT4_INSTALL_EXAMPLES=$(usex examples) - -DGEANT4_USE_FREETYPE=$(usex freetype) - -DGEANT4_USE_G3TOG4=$(usex geant3) - -DGEANT4_USE_GDML=$(usex gdml) - -DGEANT4_USE_HDF5=$(usex hdf5) - -DGEANT4_USE_INVENTOR=$(usex inventor) - -DGEANT4_USE_NETWORKDAWN=$(usex dawn) - -DGEANT4_USE_NETWORKVRML=$(usex vrml) - -DGEANT4_USE_OPENGL_X11=$(usex opengl) - -DGEANT4_USE_QT=$(usex qt5) - -DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx) - -DGEANT4_USE_SYSTEM_CLHEP=ON - -DGEANT4_USE_SYSTEM_EXPAT=ON - -DGEANT4_USE_SYSTEM_ZLIB=ON - -DGEANT4_USE_WT=OFF - -DGEANT4_USE_XM=$(usex motif) - -DBUILD_STATIC_LIBS=$(usex static-libs) - ${EXTRA_ECONF} - ) - if use inventor; then - mycmakeargs+=( - -DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)" - -DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)" - ) - fi - cmake-utils_src_configure -} - -src_install() { - # adjust clhep linking flags for system clhep - # binmake.gmk is only useful for legacy build systems - sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die - cmake-utils_src_install - rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts" - - einstalldocs -} diff --git a/sci-physics/geant/geant-4.10.6_p2.ebuild b/sci-physics/geant/geant-4.10.6_p2.ebuild deleted file mode 100644 index b266de392cd4..000000000000 --- a/sci-physics/geant/geant-4.10.6_p2.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3)) - -case ${PV} in -*_beta*) - MY_P+=.b$(printf %02d $(ver_cut 5)) - DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt" - ;; -*_p*) - MY_P+=.p$(printf %02d $(ver_cut 5)) - DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt" - HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html" - ;; -*) - HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html" - ;; -esac - -DESCRIPTION="Toolkit for simulation of passage of particles through matter" -HOMEPAGE="https://geant4.web.cern.ch/" -SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz" - -LICENSE="geant4" -SLOT="4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5 - inventor motif opengl qt5 raytracerx static-libs threads vrml" - -REQUIRED_USE="^^ ( c++11 c++14 c++17 )" - -RDEPEND=" - dev-libs/expat - >=sci-physics/clhep-2.4.1.3:2=[threads?] - data? ( ~sci-physics/geant-data-4.10.6_p1 ) - dawn? ( media-gfx/dawn ) - doc? ( ~app-doc/geant-docs-$(ver_cut 1-3) ) - gdml? ( dev-libs/xerces-c ) - hdf5? ( sci-libs/hdf5[threads?] ) - inventor? ( media-libs/SoXt ) - motif? ( x11-libs/motif:0 ) - opengl? ( virtual/opengl ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - opengl? ( dev-qt/qtopengl:5 ) - ) - raytracerx? ( - x11-libs/libX11 - x11-libs/libXmu - )" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4" - -DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-) - -DGEANT4_BUILD_MULTITHREADED=$(usex threads) - -DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec) - -DGEANT4_INSTALL_DATA=OFF - -DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data" - -DGEANT4_INSTALL_EXAMPLES=$(usex examples) - -DGEANT4_USE_FREETYPE=$(usex freetype) - -DGEANT4_USE_G3TOG4=$(usex geant3) - -DGEANT4_USE_GDML=$(usex gdml) - -DGEANT4_USE_HDF5=$(usex hdf5) - -DGEANT4_USE_INVENTOR=$(usex inventor) - -DGEANT4_USE_NETWORKDAWN=$(usex dawn) - -DGEANT4_USE_NETWORKVRML=$(usex vrml) - -DGEANT4_USE_OPENGL_X11=$(usex opengl) - -DGEANT4_USE_QT=$(usex qt5) - -DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx) - -DGEANT4_USE_SYSTEM_CLHEP=ON - -DGEANT4_USE_SYSTEM_EXPAT=ON - -DGEANT4_USE_SYSTEM_ZLIB=ON - -DGEANT4_USE_WT=OFF - -DGEANT4_USE_XM=$(usex motif) - -DBUILD_STATIC_LIBS=$(usex static-libs) - ${EXTRA_ECONF} - ) - if use inventor; then - mycmakeargs+=( - -DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)" - -DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)" - ) - fi - cmake-utils_src_configure -} - -src_install() { - # adjust clhep linking flags for system clhep - # binmake.gmk is only useful for legacy build systems - sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die - cmake-utils_src_install - rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts" - - einstalldocs -} diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest index ed97e8094c26..a8c8cb3fe797 100644 --- a/sci-physics/pythia/Manifest +++ b/sci-physics/pythia/Manifest @@ -11,5 +11,4 @@ DIST pythia-6.4.28.tar.xz 490248 BLAKE2B aff9006a4d3a0536d39a5b5161329f058b98055 DIST pythia6-20160413.tar.gz 567976 BLAKE2B 92ee81e41db46d49706599ee387a650f67d54a0ea165648de0d09d6cec811c2a4b22903c15cca0abaf5f34cf28333d70315a2c71f4ce0ec0bc48757c20114ae7 SHA512 2a9ea2ae299e8d49bd9750f8c68f0b7f534fb91254c2eebc60ef40828400bdf5e5c4e0956d61807e773a51db873ab4a036c3ac264f904d0bb2b85f4860e538d3 DIST pythia6.tar.gz 567451 BLAKE2B c32a67d87fc6f22027d3d9551256af5a0151e494fbae02c5d14ccf08595f1ebf49b638a1c33f7a52214e8bbb510756a72ef0f68f5dc8037e2a6acd3fbf290cfd SHA512 baa18023de22c3e90f14d2a5a39efa171905f507a31a90f87c65dca271b3be4c9f0d1a56282f5a04b3efabe0b5b15c964e4569d1f9994a75750e52e0be4360b1 DIST pythia8186.tgz 8921248 BLAKE2B 9e753a04c2dbc5362a24b06d40c238e5fcc5ac700dd20b9bc47b1a68604fdb87808018593c28a1d6dcb06a212bdec1146431f1096db70f4c934413a0c3b20fa0 SHA512 84729004abbdf522183c27918ae35db037a8954af761a2b452dcff54f82076b1e3bfc7fe9ea0a7cb2c0b6499aedb1c25cc13768d47b24edaa08d631b55d0b86b -DIST pythia8210.tgz 14301345 BLAKE2B 799955192d55f34fb7a0b91c4ea4b130fe2836437b5fed3416be5e0edf476c00a3054615e73d3b926cfc3facffbf6bbd973fb59e1439481a95c00e91fdabb5f5 SHA512 fe2d02e32fd5d25bcdcc216754b91ca509a189c58f1a06ca8deba975af552586632fc8cf8ad3e62920884ee64c4af596fbe7c6872f5ddbd1f5a0cea4ba4bc90d DIST pythia8226.tgz 17639842 BLAKE2B b80d7c10bd5ccc45fbb2db0df0eff679236b9911958f58987517b475e055959aa494a2199f64117631baedd90c8e2753f996e5d64552e39e54859bfe77274dad SHA512 85db807264f99c27dd87ad0572b98f4ac8d37fed818c3dd1ac89f0ac124ae0a5ee13b290727e515cb04269a6e0be8b386d954bed62309f26d1e60b431f952ca0 diff --git a/sci-physics/pythia/pythia-8.1.86.ebuild b/sci-physics/pythia/pythia-8.1.86.ebuild deleted file mode 100644 index 84f97d31e811..000000000000 --- a/sci-physics/pythia/pythia-8.1.86.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils versionator toolchain-funcs multilib - -MV=$(get_major_version) -MY_P=${PN}$(replace_all_version_separators "" ${PV}) - -DESCRIPTION="Lund Monte Carlo high-energy physics event generator" -HOMEPAGE="https://pythia8.hepforge.org/" -SRC_URI="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz" - -SLOT="8" -LICENSE="GPL-2" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="doc examples gzip +hepmc static-libs" - -DEPEND=" - gzip? ( dev-libs/boost sys-libs/zlib ) - hepmc? ( sci-physics/hepmc:0= )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - PYTHIADIR="${EPREFIX}/usr/share/pythia8" - # set datadir for xmldor in include file - sed -i \ - -e "s:../xmldoc:${PYTHIADIR}/xmldoc:" \ - include/Pythia8/Pythia.h || die - # respect libdir, prefix, flags - sed -i \ - -e "s:/lib:/$(get_libdir):g" \ - -e "s:/usr:${EPREFIX}/usr:g" \ - -e "s:-O2::g" \ - configure || die - sed -i \ - -e "s:LIBDIR=.*:LIBDIR=$(get_libdir):" \ - -e "s:LIBDIRARCH=.*:LIBDIRARCH=$(get_libdir):" \ - -e "s:cp -r lib:cp -r $(get_libdir):" \ - -e '/ln -fs/d' \ - Makefile examples/Makefile || die -} - -src_configure() { - export USRCXXFLAGS="${CXXFLAGS}" - export USRLDFLAGSSHARED="${LDFLAGS}" - tc-export CC CXX - # homemade configure script - ./configure \ - --installdir="${EPREFIX}/usr" \ - --datadir="${PYTHIADIR}" \ - --enable-shared \ - $(usex gzip "--enable-gzip=yes" "") \ - $(usex hepmc "--with-hepmcversion=2 --with-hepmc=${EPREFIX}/usr" "") \ - || die - if ! use static-libs; then - sed -i \ - -e '/targets.*=$(LIBDIR.*\.a$/d' \ - -e 's/+=\(.*libpythia8\.\)/=\1/' \ - Makefile || die - sed -i \ - -e 's:\.a:\.so:g' \ - -e 's:$(LIBDIRARCH):$(LIBDIR):g' \ - examples/Makefile || die - fi -} - -src_test() { - cd examples || die - # use emake for parallel instead of long runmains - local tests="$(echo main0{1..8})" t - use hepmc && tests="${tests} main31" - emake ${tests} - for t in ${tests}; do - LD_LIBRARY_PATH="${S}/$(get_libdir):${LD_LIBRARY_PATH}" \ - bin/${t}.exe > ${t}.out || die "test ${t} failed" - done - emake clean && rm main*out -} - -src_install() { - emake INSTALLDIR="${ED}/usr" DATADIR="${D}/${PYTHIADIR}" install - rm -r "${D}"/${PYTHIADIR}/{html,php}doc || die - echo "PYTHIA8DATA=${PYTHIADIR}/xmldoc" >> 99pythia8 - doenvd 99pythia8 - - dodoc GUIDELINES AUTHORS README - if use doc; then - dodoc worksheet.pdf - dohtml -r htmldoc/* - fi - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/sci-physics/pythia/pythia-8.2.10.ebuild b/sci-physics/pythia/pythia-8.2.10.ebuild deleted file mode 100644 index 53c80e761f3e..000000000000 --- a/sci-physics/pythia/pythia-8.2.10.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib toolchain-funcs versionator - -MV=$(get_major_version) -MY_P=${PN}$(replace_all_version_separators "" ${PV}) -LHA_VER="6.1" - -DESCRIPTION="Lund Monte Carlo high-energy physics event generator" -HOMEPAGE="https://pythia8.hepforge.org/" -SRC_URI="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz - test? ( lhapdf? ( - https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/CT10.tar.gz - https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/MRST2007lomod.tar.gz - https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/NNPDF23_nlo_as_0119_qed_mc.tar.gz - https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/NNPDF23_nnlo_as_0119_qed_mc.tar.gz - https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/cteq66.tar.gz - https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/cteq6l1.tar.gz - https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/unvalidated/MRST2004qed.tar.gz - ) )" - -SLOT="8" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples gzip +hepmc fastjet lhapdf root static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - fastjet? ( >=sci-physics/fastjet-3 ) - gzip? ( sys-libs/zlib ) - hepmc? ( sci-physics/hepmc:0= ) - lhapdf? ( >=sci-physics/lhapdf-6:= ) -" -# ROOT is used only when building related tests -DEPEND="${RDEPEND} - test? ( root? ( sci-physics/root:= ) ) -" - -S="${WORKDIR}/${MY_P}" - -pkg_pretend() { - if use root && ! use test; then - ewarn "ROOT support will only affect examples code build during test stage." - ewarn "Since you have tests disabled, this is a no-op." - fi -} - -src_prepare() { - PYTHIADIR="/usr/share/pythia8" - EPYTHIADIR="${EPREFIX}${PYTHIADIR}" - # set datadir for xmldor in include file - sed -i \ - -e "s:../share/Pythia8/xmldoc:${EPYTHIADIR}/xmldoc:" \ - include/Pythia8/Pythia.h || die - # respect libdir, prefix, flags - sed -i \ - -e "s:/lib:/$(get_libdir):g" \ - -e "s:/usr:${EPREFIX}/usr:g" \ - -e "s:-O2:${CXXFLAGS}:g" \ - -e "s:Cint:Core:g" \ - configure || die - sed -i 's:$(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED):$(CXX) $(LDFLAGS) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED):g' \ - Makefile || die - sed -i 's:$(CXX):$(CXX) $(LDFLAGS):' examples/Makefile || die - # we use lhapdf6 instead of lhapdf5 - # some PDFs changed, use something similar - sed -i \ - -e "s:LHAPDF5:LHAPDF6:g" \ - -e "s:\.LHgrid::g" \ - -e "s:\.LHpdf::g" \ - -e "s:MRST2001lo:MRST2007lomod:g" \ - -e "s:cteq6ll:cteq6l1:g" \ - -e "s:cteq6m:cteq66:g" \ - examples/*.{cc,cmnd} || die - # After lhapdf5->6 migration PDFs are identical within ~1/1000 - # https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/README - sed -i \ - -e "s:1e-8:3e-1:g" \ - -e "s:nlo_as_0119_qed:nlo_as_0119_qed_mc:g" \ - -e "s:xmldoc:share/Pythia8/xmldoc:g" \ - examples/main54.cc || die - # ask cflags from root - sed -i "s:root-config:root-config --cflags:g" examples/Makefile || die - if ! use static-libs; then - sed -i \ - -e '/TARGETS=$(LOCAL_LIB)\/libpythia8\.a/d' \ - -e 's:libpythia8\.a$:libpythia8\.so$:g' \ - Makefile || die - sed -i 's:libpythia8\.a:libpythia8\.so:g' \ - examples/Makefile || die - fi - - epatch "${FILESDIR}/${PN}8209-run-tests.patch" - epatch "${FILESDIR}/${PN}8209-root-noninteractive.patch" -} - -# TODO: the following optional packages are out of Gentoo tree: -# - EvtGen http://atlas-computing.web.cern.ch/atlas-computing/links/externalDirectory/EvtGen/ -# - PowHEG http://powhegbox.mib.infn.it/ -# - ProMC https://github.com/Argonne-National-Laboratory/ProMC/ -src_configure() { - # homemade configure script - ./configure \ - --arch=Linux \ - --cxx=$(tc-getCXX) \ - --enable-shared \ - --prefix="${EPREFIX}/usr" \ - --prefix-lib="$(get_libdir)" \ - --prefix-share="${EPYTHIADIR}" \ - $(usex fastjet "--with-fastjet3" "") \ - $(usex gzip "--with-gzip" "") \ - $(usex hepmc "--with-hepmc2" "") \ - $(usex lhapdf "--with-lhapdf6 - --with-lhapdf6-plugin=LHAPDF6.h - --with-lhapdf6-lib=${EPREFIX}/usr/$(get_libdir)" "") \ - $(usex root "--with-root - --with-root-include=${EPREFIX}/usr/include/root - --with-root-lib=${EPREFIX}/usr/$(get_libdir)/root" "") \ - || die - - # fix pythia config script - sed -i \ - -e 's:pythia8/examples/Makefile.inc:pythia8/Makefile.inc:' \ - -e 's:LINE%=:LINE%%=:' \ - bin/pythia8-config || die -} - -src_test() { - cd examples || die - - local tests="$(echo main{{01..32},37,38,61,62,73,80}.out)" - use hepmc && tests+=" $(echo main{41,42,85,86}.out)" - use hepmc && use lhapdf && tests+=" $(echo main{43,{87..89}}.out)" - use lhapdf && tests+=" $(echo main{51..54}.out)" - use fastjet && tests+=" $(echo main{71,72}.out)" - use fastjet && use hepmc && use lhapdf && tests+=" $(echo main{81..84}).out" - use root && tests+=" main91.out" - # Disabled tests: - # 33 needs PowHEG - # 46 needs ProMC - # 48 needs EvtGen - # 92 generated ROOT dictionary is badly broken - - # use emake for parallel instead of long runmains - LD_LIBRARY_PATH="${S}/$(get_libdir):${LD_LIBRARY_PATH}" \ - PYTHIA8DATA="../share/Pythia8/xmldoc/" \ - LHAPDF_DATA_PATH="${WORKDIR}" \ - emake ${tests} - emake clean -} - -src_install() { - # make install is too broken, much easier to install manually - dobin bin/pythia8-config - doheader -r include/* - dolib lib/* - insinto "${PYTHIADIR}" - doins -r share/Pythia8/xmldoc examples/Makefile.inc - - echo "PYTHIA8DATA=${EPYTHIADIR}/xmldoc" >> 99pythia8 - doenvd 99pythia8 - - dodoc AUTHORS GUIDELINES README - if use doc; then - dodoc share/Pythia8/pdfdoc/* - dohtml -r share/Pythia8/htmldoc/* - fi - if use examples; then - # reuse system Makefile.inc - rm examples/Makefile.inc || die - sed -i "s:include Makefile.inc:include ${EPYTHIADIR}:" \ - examples/Makefile || die - - insinto /usr/share/doc/${PF} - doins -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - - # cleanup - unset PYTHIADIR EPYTHIADIR -} diff --git a/sci-physics/qmeq/Manifest b/sci-physics/qmeq/Manifest index d3f7124e6be8..171d8c65a906 100644 --- a/sci-physics/qmeq/Manifest +++ b/sci-physics/qmeq/Manifest @@ -1,3 +1,2 @@ -DIST qmeq-1.0.tar.gz 590715 BLAKE2B 7f091be0651236f2dcb45825df541813e27b43b2b8ec9184a342c962363921e29462726ba23530d0b956bba45793ed2036cec6287696e5fa58f91204d9267933 SHA512 3589fe927740cac5130a5b936e7fb8f73ce20f280878a326cdf91fe6340e8853f5e055c7e07170433c0977130cbb31644b0d9f84d23cd467aaa82557c8541e6f DIST qmeq-1.0_p202004.tgz 98025 BLAKE2B fa0ad1bafca28a1c8a16db7b3f9c590bd12340bdd635616592cc75c2a448f719c16b266f960a17ab60de53b40489022ce4ee34548ff44aa997e4dfb6804885d8 SHA512 3001ebc7f8670269ac65bff3f3b96be900946a7991afcc76408e3bbfec5a39d603a67e27f88f48f30d2b576dbf91c0d1898fdbe43cfc194c408f2565abd12806 DIST qmeq-examples-1.0.tgz 289316 BLAKE2B add7520b579023c8da91aff294dd5a8fd29ba3520c3b496f2a98c8159dab4ad6bcdd1d12070357d868a10bbf224511ab27da069b94951d2c8632064344d2e143 SHA512 4a7b78a200ab4fa407401ea89740cdbcfb82376d97e8146e20a1cdab154269a6b9ce8217fb7ce78af73677b544ab535c5eadd386655dbff9c4ebde6c8eda9e38 diff --git a/sci-physics/qmeq/qmeq-1.0-r1.ebuild b/sci-physics/qmeq/qmeq-1.0-r1.ebuild deleted file mode 100644 index 3e4fdadb0bb5..000000000000 --- a/sci-physics/qmeq/qmeq-1.0-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2018-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit distutils-r1 - -DESCRIPTION="Quantum master equation package for Quantum dot transport calculations" -HOMEPAGE="https://github.com/gedaskir/qmeq" -SRC_URI=" - mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - examples? ( https://github.com/gedaskir/${PN}-examples/archive/${PV}.tar.gz -> ${PN}-examples-${PV}.tgz ) -" - -KEYWORDS="~amd64" -IUSE="examples" -LICENSE="BSD-2" -SLOT="0" - -COMMON_DEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] -" -RDEPEND=" - ${COMMON_DEPEND} - examples? ( dev-python/jupyter[${PYTHON_USEDEP}] ) -" -DEPEND=" - ${COMMON_DEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/cython[${PYTHON_USEDEP}] -" - -src_install() { - distutils-r1_src_install - docompress -x "/usr/share/doc/${PF}" - use examples && dodoc -r "${WORKDIR}/${PN}-examples-${PV}"/* -} diff --git a/sci-physics/root/files/root-6.22.00-rlogger.patch b/sci-physics/root/files/root-6.22.00-rlogger.patch deleted file mode 100644 index 8ff25c86b521..000000000000 --- a/sci-physics/root/files/root-6.22.00-rlogger.patch +++ /dev/null @@ -1,36 +0,0 @@ -From bea87d2cde7c490c8417a97f043eaa6905c27f08 Mon Sep 17 00:00:00 2001 -From: Axel Naumann <Axel.Naumann@cern.ch> -Date: Wed, 3 Jun 2020 16:38:49 +0200 -Subject: [PATCH] [cmake] Fix ROOT/RLogger.hxx not found: - -When building without root7 but with C++14, RLogger is used. -Make it available to the include directories. - -(cherry picked from commit fbe075ceedcd7d7f9993864c82ac5bd2960f3494) ---- - core/base/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt -index 66ec9a2224..95eea9b44a 100644 ---- a/core/base/CMakeLists.txt -+++ b/core/base/CMakeLists.txt -@@ -198,6 +198,7 @@ set(BASE_SOURCES - if(CMAKE_CXX_STANDARD GREATER 11) - list(APPEND BASE_HEADERS ROOT/RLogger.hxx) - list(APPEND BASE_SOURCES v7/src/RLogger.cxx) -+ set(BASE_V7_INC ${CMAKE_SOURCE_DIR}/core/base/v7/inc) - # TLogger.hxx may be used without root7 flag, but is placed in v7/inc/, - # so we need to tell ROOT_INSTALL_HEADERS() where to find it - set(BASE_HEADER_DIRS inc/ v7/inc/) -@@ -220,6 +221,7 @@ set(Core_dict_headers ${BASE_HEADERS} PARENT_SCOPE) - ROOT_OBJECT_LIBRARY(Base ${BASE_SOURCES}) - - target_include_directories(Base PRIVATE -+ ${BASE_V7_INC} - ${PCRE_INCLUDE_DIR} - res - ${CMAKE_SOURCE_DIR}/core/foundation/res --- -2.27.0 - diff --git a/sci-physics/siscone/Manifest b/sci-physics/siscone/Manifest index 186c35d53cfe..299805c46509 100644 --- a/sci-physics/siscone/Manifest +++ b/sci-physics/siscone/Manifest @@ -1,2 +1 @@ -DIST siscone-2.0.6.tar.gz 473370 BLAKE2B 25395184c443a27a792cea3e713e98c923fd34a3df26f9c13ba3a23072ef9891783255fbf82a3954c3724b21554d92f1bc3d0ed8fdfa1196ce6e431174ab77e9 SHA512 3a1bbd50db8800a2ce00eac4f4cd498d7e6674ba739ed8157f6e0c0e32fd7724d19d227b5a023fa945a5b4be5c415c5c77c2e2a60e80ec4029c016e3fd95983d DIST siscone-3.0.3.tar.gz 540939 BLAKE2B dfb9c9fab91f4faf8d8aa8a44fca505a83cdd02d2a9b659bacf6487e505159ef61bf2ed8db08a304328effdd6aac8c4a593b630954898aceb985a3a270a5aeb6 SHA512 dccbb872c897b8c0c28dff593d7f015b396923a0bd885182930d74e5115b901875a89565244a33fad0329fdfb5a83d6cc570152d0085c45c24bc427de075e559 diff --git a/sci-physics/siscone/siscone-2.0.6.ebuild b/sci-physics/siscone/siscone-2.0.6.ebuild deleted file mode 100644 index dbaa14634f3d..000000000000 --- a/sci-physics/siscone/siscone-2.0.6.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools-utils - -DESCRIPTION="Hadron Seedless Infrared-Safe Cone jet algorithm" -HOMEPAGE="https://siscone.hepforge.org/" -SRC_URI="http://www.hepforge.org/archive/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="examples static-libs" - -RDEPEND="" -DEPEND="${RDEPEND}" - -src_install() { - autotools-utils_src_install - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins examples/*.{cpp,h} - insinto /usr/share/doc/${PF}/examples/events - doins examples/events/*.dat - fi -} diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest index 6e9c7ee47e1e..717f6f9163e0 100644 --- a/sci-physics/vgm/Manifest +++ b/sci-physics/vgm/Manifest @@ -1,2 +1 @@ -DIST vgm-4.5.tar.gz 3474063 BLAKE2B 70c4fe0bd5eb9bc94607553ad30ffb625e66ef4e6f8a965b1289c1c7ad6f71d7eba035d2825ba8cd94705a0c223aa56408d3285748b068045eee3a29f556e3b2 SHA512 541fde12e12cc51ba065900788dbceb8e5b9a4e4615a4e4e0bbd2ba199b8a203b6927dbe23ead7bc183bd61f6b641e3e954fe7b78451c2d423d3a2b737f00572 DIST vgm-4.8.tar.gz 3661965 BLAKE2B 29f878fb6716e261c27d60b2c9081d66313591a053d80f78501973f131aff88bbcee743ff9767836883dcb28d3ce5aeee3759a5890d7c8811a6a61503417284f SHA512 8b7cabc5796649c4014ccbdf1c6d209d2e7c2b4b06258716a72cadd997a9f6f51c4f9cb5870fd10abfd1ee133766876523c84441a69c7242bc2002687ca0ce58 diff --git a/sci-physics/vgm/files/vgm-fix-FindCLHEP.patch b/sci-physics/vgm/files/vgm-fix-FindCLHEP.patch deleted file mode 100644 index d3bf3d0d4f31..000000000000 --- a/sci-physics/vgm/files/vgm-fix-FindCLHEP.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -Naur vgm/cmake/FindCLHEP.cmake vgm.patched/cmake/FindCLHEP.cmake ---- vgm/cmake/FindCLHEP.cmake 2019-01-25 18:46:25.000000000 +0100 -+++ vgm.patched/cmake/FindCLHEP.cmake 2019-06-29 19:50:18.092076913 +0200 -@@ -4,13 +4,13 @@ - # The configuration file for CMake build for Virtual Geometry Model - # Copyright (C) 2012, Ivana Hrivnacova - # All rights reserved. --# -+# - # For the licensing terms see vgm/LICENSE. - # Contact: ivana@ipno.in2p3.fr - # ------------------------------------------------------------------------------ - --# The CMake build for Virtual Geometry Model is a result of a merge --# of the CMake configuration files kindly provided -+# The CMake build for Virtual Geometry Model is a result of a merge -+# of the CMake configuration files kindly provided - # by Florian Uhlig, GSI and Pere Mato, CERN. - - # - Try to find CLHEP -@@ -36,28 +36,29 @@ - $ENV{CLHEP_BASE_DIR}/include - ) - --# CLHEP library external to Geant4 --find_path(EXTERNAL_CLHEP_LIBRARY_DIR NAMES libCLHEP.so libCLHEP.dylib PATHS -+# CLHEP library external to Geant4 -+find_library(EXTERNAL_CLHEP_LIBRARY NAMES libCLHEP.so libCLHEP.dylib PATHS - ${CLHEP_LIB_DIR} - ${CLHEP_DIR}/lib - $ENV{CLHEP_BASE_DIR}/lib - ) --if (EXTERNAL_CLHEP_LIBRARY_DIR) -- set(CLHEP_LIBRARY_DIR ${EXTERNAL_CLHEP_LIBRARY_DIR}) -- set(CLHEP_LIBRARY_NAME CLHEP) --endif() -- --# CLHEP library within Geant4 --if (NOT EXTERNAL_CLHEP_LIBRARY_DIR) -- find_path(CLHEP_LIBRARY_DIR NAMES libG4clhep.so libG4clhep.dylib PATHS -+if (EXTERNAL_CLHEP_LIBRARY) -+ get_filename_component(CLHEP_LIBRARY_DIR "${EXTERNAL_CLHEP_LIBRARY}" DIRECTORY) -+ set(CLHEP_LIBRARY_NAME CLHEP) -+endif() -+ -+# CLHEP library within Geant4 -+if (NOT EXTERNAL_CLHEP_LIBRARY) -+ find_library(CLHEP_LIBRARY NAMES libG4clhep.so libG4clhep.dylib PATHS - ${Geant4_DIR}/.. - ${GEANT4_LIBRARY_DIR} - ) -- if (CLHEP_LIBRARY_DIR) -+ if (CLHEP_LIBRARY) -+ get_filename_component(CLHEP_LIBRARY_DIR "${CLHEP_LIBRARY}" DIRECTORY) - set(CLHEP_LIBRARY_NAME G4clhep) -- endif(CLHEP_LIBRARY_DIR) --endif() -- -+ endif(CLHEP_LIBRARY) -+endif() -+ - if (CLHEP_INCLUDE_DIRS AND CLHEP_LIBRARY_DIR) - set(CLHEP_FOUND TRUE) - endif (CLHEP_INCLUDE_DIRS AND CLHEP_LIBRARY_DIR) diff --git a/sci-physics/vgm/vgm-4.5.ebuild b/sci-physics/vgm/vgm-4.5.ebuild deleted file mode 100644 index e5bcec75338c..000000000000 --- a/sci-physics/vgm/vgm-4.5.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git" -else - MY_PV=$(ver_rs 1- -) - SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${PN}-${MY_PV}" -fi - -DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments" -HOMEPAGE="https://ivana.home.cern.ch/ivana/VGM.html" - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc examples +geant4 +root test" - -# sci-physics/root[c++11] required to match sci-physics/geant -RDEPEND=" - sci-physics/clhep:= - root? ( >=sci-physics/root-6.14:=[c++11] ) - geant4? ( >=sci-physics/geant-4.10.03 )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen[dot] ) - test? ( - sci-physics/geant[gdml] - sci-physics/geant-vmc[g4root] - )" -RESTRICT=" - !geant4? ( test ) - !root? ( test ) - !test? ( test )" - -DOCS=( - doc/README - doc/todo.txt - doc/VGMhistory.txt - doc/VGM.html - doc/VGMversions.html -) -PATCHES=( - "${FILESDIR}"/"${PN}-fix-FindCLHEP.patch" -) - -src_configure() { - local mycmakeargs=( - -DCLHEP_DIR="${EPREFIX}/usr" - -DWITH_EXAMPLES="$(usex examples)" - -DINSTALL_EXAMPLES="$(usex examples)" - -DWITH_GEANT4="$(usex geant4)" - -DWITH_ROOT="$(usex root)" - -DWITH_TEST="$(usex test)" - ) - if use test && use root && use geant4; then - mycmakeargs+=( -DWITH_G4ROOT=yes ) - else - mycmakeargs+=( -DWITH_G4ROOT=no ) - fi - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use doc; then - cd packages - doxygen || die - fi -} - -src_test() { - cd "${BUILD_DIR}"/test || die - ./test_suite.sh || die -} - -src_install() { - cmake_src_install - use doc && local HTML_DOCS=( doc/html/. ) - einstalldocs -} diff --git a/sci-physics/vmc/Manifest b/sci-physics/vmc/Manifest index 8f62d6c40d23..aa34be22f3f2 100644 --- a/sci-physics/vmc/Manifest +++ b/sci-physics/vmc/Manifest @@ -1,2 +1 @@ -DIST vmc-1.0_p2.tar.gz 91400 BLAKE2B d444a003433f4939f1b737ee8aa117a3230f83428ff9a79f8219a88bf5146104460a8be80ada9ab3a0a0edebc7d85d02bc51de053d54b06739d26cb0bbec3429 SHA512 51d6a8462c854411b595a20a2657b8012f19cd9c139f3341ccd72eb262473d01f6909ad22ee8d083f01cc5a2e43b2af265a7ed7c62a1285e8fab34c1b68ee3cd DIST vmc-1.0_p3.tar.gz 91476 BLAKE2B 3005e0575a5835b832175e6a272d4e3c328990e28ac998aca60a42c4ddd03faba4d1b761867d8af597ca2468cf3072c49bb007852b5ec892c215df37297656dc SHA512 621c0cb3f2846f9401e3e4fff6fa47ab2afbff7c4dca5c19869abb1806ec19d4a221e5741aad9b3929a4e8b8207ee6008a9bf06ec8bf03ed73771cb29fda1b8d diff --git a/sci-physics/vmc/vmc-1.0_p2.ebuild b/sci-physics/vmc/vmc-1.0_p2.ebuild deleted file mode 100644 index fdebc4ac86fa..000000000000 --- a/sci-physics/vmc/vmc-1.0_p2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git" -else - MY_PV=$(ver_rs 1-2 -) - SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${PN}-${MY_PV}" -fi - -DESCRIPTION="The Virtual Monte Carlo core library." -HOMEPAGE="https://vmc-project.github.io/" - -LICENSE="GPL-3" -SLOT="0" -IUSE="+c++11 c++14 c++17 doc" - -REQUIRED_USE="^^ ( c++11 c++14 c++17 )" - -RDEPEND=">=sci-physics/root-6.18:=[c++11?,c++14?,c++17?,-vmc]" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen[dot] )" - -DOCS=(README.md History) - -src_compile() { - cmake_src_compile - if use doc; then - # TRAVIS_BUILD_DIR hardcoded in Doxyfile by upstream. - TRAVIS_BUILD_DIR="${S}" doxygen doc/doxygen/Doxyfile || die - fi -} - -src_install() { - cmake_src_install - use doc && local HTML_DOCS=( doc/html/. ) - einstalldocs -} diff --git a/sci-physics/xfoil/Manifest b/sci-physics/xfoil/Manifest index f8c066ff8e4a..b4810f7f096c 100644 --- a/sci-physics/xfoil/Manifest +++ b/sci-physics/xfoil/Manifest @@ -1,3 +1,2 @@ DIST dataflow.pdf 7654 BLAKE2B 67871007f6d2d72fe89c0f3bfcd7027d08ad8d064a0426c2947c5e41d6a31049973dd8b586ca0dd482def6745023c337157a77dbf35b541a5f3a8295f0162b03 SHA512 1bb5be8e70fca1fa90f28d214140e96a8795c7d82a37f4fe4d68606fa3eb28252913b8fb13eb3e97a3cf05c3001c88dbfcdb8a2f20d4baed5e730770a2d602b1 -DIST xfoil6.97.tar.gz 3972497 BLAKE2B 25c50621bb76cec5463f05ca975b97b52688408cc8111e464fc89fd6bf1ab3f66b43798d89aa68c4a2ef4ffb049801e5930b45b520c0afeabfb8d89efd486536 SHA512 02c0a123fb99fa20de1e3577ca7c6ce00d494058f2ef3ec82e3fdea48901f4346180aea3436e001c5b90401007ccdd5b7e9daa6a96794f0d6b5781a5b36e36e7 DIST xfoil6.99.tgz 4515991 BLAKE2B a96dc534a0ceff116970a22b9e267705065076f1561052334c4706d7d6d2d750ad75954fb9af843ef50ca5e8ab8cfd4c8e5d873f9f36b6337fe3381604cb2d37 SHA512 6f5bed520826dba2efd1b191b1f90dd810b53d9041cbbaddde09207ba9042f99dd0c9e9aa8b8cdf48767bf2695e328ac8fbd297e1510e53ac10b0f1eea35cfef diff --git a/sci-physics/xfoil/files/xfoil-6.97-overflow.patch b/sci-physics/xfoil/files/xfoil-6.97-overflow.patch deleted file mode 100644 index 6f71440f050c..000000000000 --- a/sci-physics/xfoil/files/xfoil-6.97-overflow.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/pplot.f -+++ b/src/pplot.f -@@ -36,7 +36,7 @@ - PROGRAM PPLOT - INCLUDE 'PPLOT.INC' - C -- LOGICAL ERROR, LGETFN -+ LOGICAL ERROR, LGETFN, LERR - REAL RINP(10) - REAL CPOLO(NAX,IPTOT,NPX), VPOLO(NAX,2,NPX) - C ---- a/src/xoper.f -+++ b/src/xoper.f -@@ -114,7 +114,7 @@ - C---- don't try to read integers, since might get integer overflow - DO I=1, NINPUT - IF(ABS(RINPUT(I)) .GT. 2.1E9) THEN -- IINPUT(I) = 2**31 -+ IINPUT(I) = HUGE(0) - ELSE - IINPUT(I) = INT(RINPUT(I)) - ENDIF diff --git a/sci-physics/xfoil/xfoil-6.97-r1.ebuild b/sci-physics/xfoil/xfoil-6.97-r1.ebuild deleted file mode 100644 index 252bac61e7d7..000000000000 --- a/sci-physics/xfoil/xfoil-6.97-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit fortran-2 toolchain-funcs - -DESCRIPTION="Design and analysis of subsonic isolated airfoils" -HOMEPAGE="https://raphael.mit.edu/xfoil/" -SRC_URI=" - http://web.mit.edu/drela/Public/web/${PN}/${PN}${PV}.tar.gz - doc? ( http://web.mit.edu/drela/Public/web/${PN}/dataflow.pdf )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples" - -RDEPEND="x11-libs/libX11" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-overflow.patch ) - -S="${WORKDIR}/${PN^}" - -src_prepare() { - # fix bug #147033 - [[ $(tc-getFC) == *gfortran ]] && PATCHES+=( "${FILESDIR}"/${PN}-6.96-gfortran.patch ) - default - - sed \ - -e '/^FC/d' \ - -e '/^CC/d' \ - -e '/^FFLAGS/d' \ - -e '/^CFLAGS/d' \ - -e 's/^\(FFLOPT .*\)/FFLOPT = $(FFLAGS)/g' \ - -i {bin,plotlib,orrs/bin}/Makefile plotlib/config.make \ - || die "sed for flags and compilers failed" - - sed \ - -e "s:/var/local/codes/orrs/osmap.dat:${EPREFIX}/usr/share/xfoil/orrs/osmap.dat:" \ - -i orrs/src/osmap.f || die "sed osmap.f failed" -} - -src_compile() { - emake -C orrs/bin FLG="${FFLAGS}" FTNLIB="${LDFLAGS}" OS - pushd orrs >/dev/null || die - bin/osgen osmaps_ns.lst - popd >/dev/null || die - emake -C plotlib CFLAGS="${CFLAGS} -DUNDERSCORE" - - local i - for i in xfoil pplot pxplot; do - emake -C bin \ - PLTOBJ="../plotlib/libPlt.a" \ - CFLAGS="${CFLAGS} -DUNDERSCORE" \ - FTNLIB="${LDFLAGS}" \ - $i - done -} - -src_install() { - dobin bin/{pplot,pxplot,xfoil} - insinto /usr/share/xfoil/orrs - doins orrs/osm*.dat - - local DOCS=( *.txt README ) - use doc && DOCS+=( "${DISTDIR}"/dataflow.pdf ) - einstalldocs - if use examples; then - dodoc -r runs - docompress -x /usr/share/doc/${PF}/runs - fi -} diff --git a/sci-visualization/fityk/fityk-1.3.1.ebuild b/sci-visualization/fityk/fityk-1.3.1.ebuild deleted file mode 100644 index 8233f353cdce..000000000000 --- a/sci-visualization/fityk/fityk-1.3.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER=3.0 - -inherit wxwidgets xdg - -DESCRIPTION="General-purpose nonlinear curve fitting and data analysis" -HOMEPAGE="https://fityk.nieto.pl/" -SRC_URI="https://github.com/wojdyr/${PN}/releases/download/v${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="gnuplot nlopt readline wxwidgets" - -DEPEND=" - >=dev-lang/lua-5.1:0 - dev-libs/boost:= - >=sci-libs/xylib-1 - nlopt? ( sci-libs/nlopt ) - readline? ( sys-libs/readline:0= ) - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )" -RDEPEND="${DEPEND} - gnuplot? ( sci-visualization/gnuplot )" -BDEPEND="dev-lang/swig" - -src_configure() { - use wxwidgets && setup-wxwidgets - - econf \ - --disable-python \ - --disable-static \ - $(use_enable nlopt) \ - $(use_enable wxwidgets GUI) \ - $(use_with readline) \ - --with-wx-config="${WX_CONFIG}" -} - -src_install() { - default - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-visualization/ggobi/Manifest b/sci-visualization/ggobi/Manifest index 42f809f42b1d..b6808716cc84 100644 --- a/sci-visualization/ggobi/Manifest +++ b/sci-visualization/ggobi/Manifest @@ -1,2 +1 @@ -DIST ggobi_2.1.10.orig.tar.bz2 2776784 BLAKE2B 6e5f5bfcb3b10af425a552da1f0d9eb4ba445d0eced0e5b5a20d3ea88da782f9e333005b929408baeb895a1e62d5e1500a86de5c7353b60ee8fbf950521b00c0 SHA512 40bc4a7fae992bf327d6b36c5aea7802279a3b6229242f31386e771636b4561260914a7fefb6a6337c1e1ab5a0682fbdd626389b83d9b57d0c2d050fac3723e5 DIST ggobi_2.1.11.orig.tar.bz2 2787709 BLAKE2B e4b853f3212abda00150e6a3b3a344638225bdc564c109632c7ca2f9cb8cc41d35af9df1ee153d2ede3bd3191d9219e2bdd6bd6bc9c64f42447dfe17562361f1 SHA512 d34c6569d05d1e680101b62745012940c1e18c1588cd37b89b26b89e9eed9bab8fc53e0585a595b6cb4c9f2bb7d603ca4252cb6a6ba344bbc24e5cc5fd8a6dc1 diff --git a/sci-visualization/ggobi/files/ggobi-2.1.10-hardened.patch b/sci-visualization/ggobi/files/ggobi-2.1.10-hardened.patch deleted file mode 100644 index 63681a0a03ea..000000000000 --- a/sci-visualization/ggobi/files/ggobi-2.1.10-hardened.patch +++ /dev/null @@ -1,66 +0,0 @@ -Description: Upstream changes introduced in version 2.1.10-4 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - ggobi (2.1.10-4) unstable; urgency=low - . - * src/ggobi.c: Applied patch kindly supplied by Michael Lawrence to - address issues found under hardened compiler flags (Closes: #646260) - . - The person named in the Author field signed this changelog entry. -Author: Dirk Eddelbuettel <edd@debian.org> -Bug-Debian: http://bugs.debian.org/646260 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - ---- ggobi-2.1.10.orig/src/ggobi.c -+++ ggobi-2.1.10/src/ggobi.c -@@ -698,10 +698,10 @@ ValidateGGobiRef (ggobid * gg, gboolean - } - - if (fatal) { -- g_error (error_msg); -+ g_error ("%s", error_msg); - } - else -- g_critical (error_msg); -+ g_critical ("%s", error_msg); - - return (NULL); - } -@@ -718,9 +718,9 @@ ValidateDatadRef (GGobiData * d, ggobid - } - - if (fatal) -- g_error (error_msg); -+ g_error ("%s", error_msg); - else -- g_critical (error_msg); -+ g_critical ("%s", error_msg); - - return (NULL); - } -@@ -739,9 +739,9 @@ ValidateDisplayRef (displayd * d, ggobid - } - - if (fatal) -- g_error (error_msg); -+ g_error ("%s", error_msg); - else -- g_critical (error_msg); -+ g_critical ("%s", error_msg); - - return (NULL); - } diff --git a/sci-visualization/ggobi/ggobi-2.1.10.ebuild b/sci-visualization/ggobi/ggobi-2.1.10.ebuild deleted file mode 100644 index 9b860ef03f6b..000000000000 --- a/sci-visualization/ggobi/ggobi-2.1.10.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils autotools xdg - -DESCRIPTION="Visualization program for exploring high-dimensional data" -HOMEPAGE="https://www.ggobi.org/" -# source code release is not well published -#SRC_URI="http://www.ggobi.org/downloads/${P}.tar.bz2" -SRC_URI="mirror://debian/pool/main/g/${PN}/${PN}_${PV}.orig.tar.bz2" - -LICENSE="CPL-1.0" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc minimal nls" - -RDEPEND=" - dev-libs/libxml2:2 - media-gfx/graphviz - x11-libs/gtk+:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - sed -i \ - -e 's|ND_coord_i|ND_coord|' \ - plugins/GraphLayout/graphviz.c || die - rm m4/libtool.m4 m4/lt*m4 plugins/*/aclocal.m4 || die - epatch \ - "${FILESDIR}"/${PN}-2.1.8-plugindir.patch \ - "${FILESDIR}"/${PN}-2.1.9-as-needed.patch \ - "${FILESDIR}"/${PN}-2.1.10-hardened.patch \ - "${FILESDIR}"/${PN}-2.1.10-desktop.patch - # need the ${S} for recursivity lookup - AT_M4DIR="${S}"/m4 eautoreconf -} - -src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --disable-rpath \ - $(use_enable nls) \ - $(use_with !minimal all-plugins) -} - -src_compile() { - emake all ggobirc -} - -src_install() { - default - insinto /etc/xdg/ggobi - doins ggobirc - use doc || rm "${ED}"/usr/share/doc/${PF}/*.pdf -} diff --git a/sci-visualization/gnuplot/gnuplot-5.4.1.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.1.ebuild deleted file mode 100644 index caf4ab0deb6c..000000000000 --- a/sci-visualization/gnuplot/gnuplot-5.4.1.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets - -DESCRIPTION="Command-line driven interactive plotting program" -HOMEPAGE="https://www.gnuplot.info/" - -if [[ -z ${PV%%*9999} ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main" - EGIT_BRANCH="master" - MY_P="${PN}" - EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}" -else - MY_P="${P/_/.}" - SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -S="${WORKDIR}/${MY_P}" - -LICENSE="gnuplot" -SLOT="0" -IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X" - -RDEPEND=" - cairo? ( - x11-libs/cairo - x11-libs/pango ) - gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) - ggi? ( media-libs/libggi ) - latex? ( - virtual/latex-base - lua? ( - dev-tex/pgf - >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) - libcaca? ( media-libs/libcaca ) - lua? ( dev-lang/lua:0 ) - qt5? ( - dev-qt/qtcore:5= - dev-qt/qtgui:5= - dev-qt/qtnetwork:5= - dev-qt/qtprintsupport:5= - dev-qt/qtsvg:5= - dev-qt/qtwidgets:5= ) - readline? ( sys-libs/readline:0= ) - libcerf? ( sci-libs/libcerf ) - wxwidgets? ( - x11-libs/wxGTK:3.0-gtk3[X] - x11-libs/cairo - x11-libs/pango - x11-libs/gtk+:3 ) - X? ( x11-libs/libXaw )" - -DEPEND="${RDEPEND}" - -BDEPEND=" - virtual/pkgconfig - doc? ( - virtual/latex-base - dev-texlive/texlive-latexextra - dev-texlive/texlive-langgreek - app-text/ghostscript-gpl ) - qt5? ( dev-qt/linguist-tools:5 )" - -GP_VERSION="${PV%.*}" -E_SITEFILE="lisp/50${PN}-gentoo.el" -TEXMF="${EPREFIX}/usr/share/texmf-site" - -PATCHES=( - "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch - "${FILESDIR}"/${PN}-5.0.6-no-picins.patch -) - -src_prepare() { - default - - if [[ ${PV##*.} = 9999 ]]; then - local dir - for dir in config demo m4 term tutorial; do - emake -C "$dir" -f Makefile.am.in Makefile.am - done - fi - - # Add special version identification as required by provision 2 - # of the gnuplot license - sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die - - eautoreconf - - # Make sure we don't mix build & host flags. - sed -i \ - -e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \ - -e 's:@CFLAGS@:$(BUILD_CFLAGS):' \ - -e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \ - -e 's:@CC@:$(CC_FOR_BUILD):' \ - docs/Makefile.in || die -} - -src_configure() { - if ! use latex; then - sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die - fi - - if use wxwidgets; then - WX_GTK_VER="3.0-gtk3" - setup-wxwidgets - fi - - tc-export CC CXX #453174 - tc-export_build_env BUILD_CC - export CC_FOR_BUILD=${BUILD_CC} - - use qt5 && append-cxxflags -std=c++11 - - econf \ - --with-texdir="${TEXMF}/tex/latex/${PN}" \ - --with-readline=$(usex readline gnu builtin) \ - $(use_with bitmap bitmap-terminals) \ - $(use_with cairo) \ - $(use_with gd) \ - "$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \ - "$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \ - $(use_with libcerf) \ - $(use_with lua) \ - $(use_with regis) \ - $(use_with X x) \ - --enable-stats \ - $(use_with qt5 qt qt5) \ - $(use_enable wxwidgets) \ - DIST_CONTACT="https://bugs.gentoo.org/" \ - EMACS=no -} - -src_compile() { - # Prevent access violations, see bug 201871 - export VARTEXFONTS="${T}/fonts" - - emake all - - if use doc; then - # Avoid sandbox violation in epstopdf/ghostscript - addpredict /var/cache/fontconfig - if use cairo; then - emake -C docs pdf - else - ewarn "Cannot build figures unless cairo is enabled." - ewarn "Building documentation without figures." - emake -C docs pdf_nofig - mv docs/nofigures.pdf docs/gnuplot.pdf || die - fi - fi -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES - newdoc term/PostScript/README README-ps - newdoc term/js/README README-js - use lua && newdoc term/lua/README README-lua - - local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can - use the "pdfcairo" terminal for PDF output.' - use cairo || DOC_CONTENTS+=' It is available with USE="cairo".' - use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output, - you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT - environment variables. See the FAQ file in /usr/share/doc/${PF}/ - for more information." - readme.gentoo_create_doc - - if use examples; then - # Demo files - insinto /usr/share/${PN}/${GP_VERSION} - doins -r demo - rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile* - rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary* - fi - - if use doc; then - # Manual, FAQ - dodoc docs/gnuplot.pdf FAQ.pdf - # Documentation for making PostScript files - docinto psdoc - dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README} - fi -} - -src_test() { - emake check GNUTERM="dumb" -} - -pkg_postinst() { - use latex && texmf-update - readme.gentoo_print_elog -} - -pkg_postrm() { - use latex && texmf-update -} diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest index 2814e7189753..cfd0de276438 100644 --- a/sci-visualization/grace/Manifest +++ b/sci-visualization/grace/Manifest @@ -1,4 +1,2 @@ DIST grace-5.1.25.tar.gz 2957689 BLAKE2B f46032c92aa2ed2484ca05c0eb858f47adfa88517e7d06c0d95a6d23c044356edfc52b9a7566a625ef5f4a1a4b5450b0ce065a94ba15c59fb8395d53c85872c9 SHA512 9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a -DIST grace.png 338 BLAKE2B 3a109acd9e44929b9efe1fd6b707459b71cfbb601b98a00619096becff8d89fb46f2fe34f4a5c5974b125b4bed9b5f2452fee669627146ba00976dd43a7778b0 SHA512 804a693b867ad63f34964c7388f61719c558d253cb2c7bc7b6bd0647ad9b3ddc6b23d3950091b6804e4a94736f024486cf3dcce5f877135def34712ee95e4031 -DIST grace.png.tar 10240 BLAKE2B 3e99cd04a92b547ed5440475363b140d0183c92d1865f0b4564890f705a87df4e55624d681fa77408948a841eac4358465e49e65fa02615e31ec54ffb84f059d SHA512 e94970b92894e58fd481d2f81e615c38b77fab7039985516a2ad9b2bb2bb7a82f4e3e8cdb639e7c0d55eaad6bf8abc636a342c94a356e3bd0520824252faddcf DIST grace_5.1.25-7.debian.tar.xz 108904 BLAKE2B 17265969d0501e1b1306733178a680b93d1d5fa96d63df4c14e5b3cba70b68d44d90a77d6ec0aa5243c2a79048bb75aedefeae1a2bab551a6315d253ee831735 SHA512 2fa34337858454c8a28b666fccb7157e9c4895b828f25171c4c6b68316abbf6d4bc54032f1de01ccb6b86068f7059ae2462d18b4a273341f588f49fc35f1bb61 diff --git a/sci-visualization/grace/files/grace-5.1.21-netcdf.patch b/sci-visualization/grace/files/grace-5.1.21-netcdf.patch deleted file mode 100644 index d843cb4b284c..000000000000 --- a/sci-visualization/grace/files/grace-5.1.21-netcdf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure 2007-02-16 22:44:49.000000000 +0000 -+++ b/configure 2007-09-28 23:03:29.000000000 +0100 -@@ -15181,7 +15181,7 @@ - int main(void) { - char *vlib; - vlib = nc_inq_libvers(); -- if (strcmp(vlib, "3.0") < 0) { -+ if (((vlib[0] == '"') && (strcmp(vlib, "\"3.0") < 0)) || ((vlib[0] != '"') && (strcmp(vlib, "3.0") < 0))){ - exit(1); - } - exit(0); diff --git a/sci-visualization/grace/files/grace-5.1.22-ldflags.patch b/sci-visualization/grace/files/grace-5.1.22-ldflags.patch deleted file mode 100644 index 2a65cd233361..000000000000 --- a/sci-visualization/grace/files/grace-5.1.22-ldflags.patch +++ /dev/null @@ -1,41 +0,0 @@ -Respect LDFLAGS - -http://bugs.gentoo.org/show_bug.cgi?id=336984 - ---- grace-5.1.22/src/Makefile -+++ grace-5.1.22/src/Makefile -@@ -37,10 +37,10 @@ - include Make.dep - - xmgrace$(EXE) : $(GROBJS) $(PARS_C) $(GUIOBJS) $(CEPHES_LIB) -- $(CC) $(CFLAGS) $(GROBJS) $(GUIOBJS) -o $@ $(LDFLAGS) $(LIBS) -+ $(CC) $(LDFLAGS) $(CFLAGS) $(GROBJS) $(GUIOBJS) -o $@ $(LIBS) - - grace$(EXE) : $(GROBJS) $(PARS_C) $(CEPHES_LIB) -- $(CC) $(CFLAGS) $(GROBJS) -o $@ $(LDFLAGS) $(LIBS) -+ $(CC) $(LDFLAGS) $(CFLAGS) $(GROBJS) -o $@ $(LIBS) - - - buildinfo$(EXE) : buildinfo$(O) ---- grace-5.1.22/auxiliary/Makefile -+++ grace-5.1.22/auxiliary/Makefile -@@ -22,7 +22,7 @@ - devclean : distclean - - convcal$(EXE) : convcal.c -- $(CC) $(CFLAGS0) $(CPPFLAGS) -o $@ convcal.c $(NOGUI_LIBS) -+ $(CC) $(LDFLAGS) $(CFLAGS0) $(CPPFLAGS) -o $@ convcal.c $(NOGUI_LIBS) - - install : $(AUXILIARIES) $(PROGRAMS) $(SCRIPTS) - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/auxiliary ---- grace-5.1.22/grconvert/Makefile -+++ grace-5.1.22/grconvert/Makefile -@@ -23,7 +23,7 @@ - all : $(PROG) - - $(PROG) : $(OBJS) -- $(CC) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) -+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - $(OBJS) : grconvert.h - diff --git a/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch b/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch deleted file mode 100644 index 402a5162c584..000000000000 --- a/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -Naur grace-5.1.22/src/editpwin.c grace-5.1.22.new/src/editpwin.c ---- grace-5.1.22/src/editpwin.c 2006-06-03 17:19:52.000000000 -0400 -+++ grace-5.1.22.new/src/editpwin.c 2008-07-26 12:45:21.000000000 -0400 -@@ -776,12 +776,12 @@ - */ - void do_ext_editor(int gno, int setno) - { -- char *fname, ebuf[256]; -+ char fname[64], ebuf[256]; - FILE *cp; - int save_autos; - -- fname = tmpnam(NULL); -- cp = grace_openw(fname); -+ strcpy(fname, "grace-XXXXXX"); -+ cp = fdopen(mkstemp(fname), "wb"); - if (cp == NULL) { - return; - } -diff -Naur grace-5.1.22/src/plotone.c grace-5.1.22.new/src/plotone.c ---- grace-5.1.22/src/plotone.c 2005-05-19 16:30:25.000000000 -0400 -+++ grace-5.1.22.new/src/plotone.c 2008-07-26 12:45:40.000000000 -0400 -@@ -121,19 +121,27 @@ - sprintf(print_file, "%s.%s", get_docbname(), dev.fext); - } - strcpy(fname, print_file); -+ prstream = grace_openw(fname); - } else { -+ int hdfd; - s = get_print_cmd(); - if (s == NULL || s[0] == '\0') { - errmsg("No print command defined, output aborted"); - return; - } -- tmpnam(fname); -- /* VMS doesn't like extensionless files */ -- strcat(fname, ".prn"); -+ strcpy(fname, "grace-hardcopy-XXXXXX"); -+ hdfd=mkstemp(fname); -+ if (hdfd == -1) { -+ errmsg("Could not create a temporary file, output aborted."); -+ return; -+ } -+ prstream = fdopen(hdfd, "wb"); -+ if (prstream == NULL) { -+ errmsg("Could not create a temporary file, output aborted."); -+ return; -+ } - } - -- prstream = grace_openw(fname); -- - if (prstream == NULL) { - return; - } diff --git a/sci-visualization/grace/grace-5.1.25.ebuild b/sci-visualization/grace/grace-5.1.25.ebuild deleted file mode 100644 index cc86861fbe77..000000000000 --- a/sci-visualization/grace/grace-5.1.25.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -FORTRAN_NEEDED=fortran - -inherit eutils fortran-2 toolchain-funcs - -DESCRIPTION="Motif based XY-plotting tool" -HOMEPAGE="https://plasma-gate.weizmann.ac.il/Grace/" -SRC_URI=" - http://pkgs.fedoraproject.org/cgit/grace.git/plain/grace.png - https://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar - ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2 LGPL-2" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="fftw fortran jpeg netcdf png" - -DEPEND=" - media-libs/t1lib - media-libs/tiff:0 - sys-libs/zlib - >=x11-libs/motif-2.3:0 - x11-libs/xbae - fftw? ( sci-libs/fftw:2.1= ) - jpeg? ( virtual/jpeg:0 ) - netcdf? ( sci-libs/netcdf ) - png? ( media-libs/libpng:0= )" -RDEPEND="${DEPEND} - x11-misc/xdg-utils" - -PATCHES=( - # move tmpnam to mkstemp (adapted from debian) - "${FILESDIR}"/${PN}-5.1.22-mkstemp.patch - # fix configure instead of aclocal.m4 - "${FILESDIR}"/${PN}-5.1.21-netcdf.patch - # fix for missing defines when fortran is disabled - "${FILESDIR}"/${PN}-5.1.21-fortran.patch - # fix a leak (from freebsd) - "${FILESDIR}"/${PN}-5.1.22-dlmodule.patch - "${FILESDIR}"/${PN}-5.1.22-ldflags.patch -) - -pkg_setup() { - fortran-2_pkg_setup -} - -src_prepare() { - default - - # don't strip if not asked for - sed -i \ - -e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \ - {auxiliary,grconvert,src}/Makefile || die - - sed -i \ - -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \ - -e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \ - -e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \ - -e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \ - Makefile */Makefile || die "sed failed" - - sed -i \ - -e 's:bin/grconvert:grconvert:' \ - -e 's:auxiliary/fdf2fit:fdf2fit:' \ - gracerc || die -} - -src_configure() { - tc-export CC AR - - # the configure script just produces a basic Make.conf - # and a config.h - econf \ - --disable-pdfdrv \ - --disable-xmhtml \ - --without-bundled-xbae \ - --without-bundled-t1lib \ - --enable-grace-home="${EPREFIX}"/usr/share/${PN} \ - --with-helpviewer="xdg-open %s" \ - --with-editor="xdg-open %s" \ - --with-printcmd="lpr" \ - --x-includes="${EPREFIX}"/usr/include \ - --x-libraries="${EPREFIX}"/usr/$(get_libdir) \ - $(use_with fftw) \ - $(use_enable fortran f77-wrapper) \ - $(use_enable netcdf) \ - $(use_enable jpeg jpegdrv) \ - $(use_enable png pngdrv) \ - $(use_with fortran f77 $(tc-getFC)) -} - -src_install() { - default - - dosym ../../${PN}/examples /usr/share/doc/${PF}/examples - dosym ../../${PN}/doc /usr/share/doc/${PF}/html - - doman "${ED%/}"/usr/share/doc/${PF}/html/*.1 - rm -f "${ED%/}"/usr/share/doc/${PF}/html/*.1 || die - - domenu "${FILESDIR}"/${PN}.desktop - doicon "${WORKDIR}"/${PN}.png -} diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest index b26081a4c46b..121ce2a83172 100644 --- a/sci-visualization/paraview/Manifest +++ b/sci-visualization/paraview/Manifest @@ -1,2 +1 @@ -DIST ParaView-v5.8.0.tar.xz 49789116 BLAKE2B 25689220f506221731bb5a56c647c249df0de8654a4b3347a7c09067bb5755818597bd7cfff88c2d129f448189b107079995c93599d482f7bf8b4cc6c7430e72 SHA512 43304d62c3f55bc390e68c033fb4c7dc2c0789d0dadbb98ef734b7d9de0419af4c240ce94f36e2b52c939ac950fba1d70dbd9fc3a1e6da37c7ef847b5c8682a2 DIST ParaView-v5.8.1.tar.xz 49822084 BLAKE2B 1b99392a85c19fdc02f8f9f0f055fb7efd8a0b17eedfd84005d1af9b170c34ec4eedb25700f91c3a2241ee80e271fe1e744e3a729b7726deb8f9c7a9fd2e4191 SHA512 94861c01da2f98c47e7453d072a4de34a7f52f5df280a8745b44d58d8d6a1dba42a15d0bac31895bbe25f23d993d4d356e5af1f8415137e289afd60570070248 diff --git a/sci-visualization/paraview/paraview-5.8.0-r3.ebuild b/sci-visualization/paraview/paraview-5.8.0-r3.ebuild deleted file mode 100644 index 61746478824b..000000000000 --- a/sci-visualization/paraview/paraview-5.8.0-r3.ebuild +++ /dev/null @@ -1,255 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit cmake-utils desktop gnome2-utils python-single-r1 qmake-utils toolchain-funcs - -MAIN_PV=$(ver_cut 0-1) -MAJOR_PV=$(ver_cut 1-2) -MY_P="ParaView-v${PV}" - -DESCRIPTION="Powerful scientific data visualization application" -HOMEPAGE="https://www.paraview.org" -SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz" - -LICENSE="paraview GPL-2" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 +sqlite test tk +webengine" - -RESTRICT="mirror test" - -# "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL" -REQUIRED_USE=" - python? ( mpi ${PYTHON_REQUIRED_USE} ) - mysql? ( sqlite ) - webengine? ( qt5 ) - qt5? ( sqlite ) - ?? ( offscreen qt5 )" - -RDEPEND=" - app-arch/lz4 - dev-libs/expat - dev-libs/jsoncpp:= - dev-libs/libxml2:2 - dev-libs/protobuf:= - dev-libs/pugixml - media-libs/freetype - media-libs/glew:0 - media-libs/libpng:0 - media-libs/libtheora - media-libs/tiff:0= - sci-libs/cgnslib - sci-libs/hdf5:=[mpi=] - >=sci-libs/netcdf-4.2[hdf5] - >=sci-libs/netcdf-cxx-4.2:3 - sys-libs/zlib - virtual/glu - virtual/jpeg:0 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - coprocessing? ( - dev-python/PyQt5 - dev-qt/qtgui:5[-gles2-only] - ) - ffmpeg? ( media-video/ffmpeg ) - mpi? ( virtual/mpi[cxx,romio] ) - mysql? ( dev-db/mysql-connector-c ) - offscreen? ( >=media-libs/mesa-18.3.6[osmesa] ) - !offscreen? ( virtual/opengl ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/constantly[${PYTHON_MULTI_USEDEP}] - dev-python/incremental[${PYTHON_MULTI_USEDEP}] - dev-python/matplotlib[${PYTHON_MULTI_USEDEP}] - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - dev-python/pygments[${PYTHON_MULTI_USEDEP}] - dev-python/sip[${PYTHON_MULTI_USEDEP}] - dev-python/six[${PYTHON_MULTI_USEDEP}] - dev-python/twisted[${PYTHON_MULTI_USEDEP}] - dev-python/zope-interface[${PYTHON_MULTI_USEDEP}] - mpi? ( dev-python/mpi4py ) - qt5? ( dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}] ) - ') - ) - qt5? ( - dev-qt/designer:5 - dev-qt/qtgui:5[-gles2-only] - dev-qt/qthelp:5 - dev-qt/qtopengl:5[-gles2-only] - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qttest:5 - dev-qt/qtx11extras:5 - dev-qt/qtxmlpatterns:5 - ) - sqlite? ( dev-db/sqlite:3 ) - tk? ( dev-lang/tk:0= ) - webengine? ( dev-qt/qtwebengine:5[widgets] )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - boost? ( - $(python_gen_cond_dep ' - dev-libs/boost[mpi?,${PYTHON_MULTI_USEDEP}] - ') - ) - doc? ( app-doc/doxygen )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch - "${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch - "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch - "${FILESDIR}"/${P}-w-vtk-8.2.0-qt-5.15.patch -) - -CMAKE_MAKEFILE_GENERATOR="emake" #579474 - -pkg_setup() { - [[ ${MERGE_TYPE} != "binary" ]] && use openmp && tc-check-openmp - use python && python-single-r1_pkg_setup - PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV} -} - -src_prepare() { - - # Bug #661812 - mkdir -p Plugins/StreamLinesRepresentation/doc || die - - cmake-utils_src_prepare - - # lib64 fixes - sed -i \ - -e "s:/lib/python:/$(get_libdir)/python:g" \ - VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die - sed -i \ - -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \ - Remoting/Application/vtkInitializationHelper.cxx || die -} - -src_configure() { - if use qt5; then - export QT_SELECT=qt5 - fi - - local mycmakeargs=( - -DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}" - -UBUILD_SHARED_LIBS - -DPARAVIEW_BUILD_SHARED_LIBS=ON - -DCMAKE_VERBOSE_MAKEFILE=ON - - -DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=TRUE - - -DVTK_USE_OGGTHEORA_ENCODER=TRUE - - -DVTK_GROUP_ENABLE_Imaging=YES - -DVTK_GROUP_ENABLE_Rendering=YES - -DVTK_GROUP_ENABLE_StandAlone=YES - -DVTK_GROUP_ENABLE_Views=YES - - # boost - -DVTK_MODULE_ENABLE_VTK_IOInfovis="$(usex boost YES NO)" - - # coprocessing -# -DVTK_MODULE_ENABLE_ParaView_Catalyst="$(usex coprocessing YES NO)" - - # doc - -DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION="$(usex doc)" - - # examples - -DBUILD_EXAMPLES="$(usex examples)" - - # ffmpeg - -DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)" - -DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)" - - # mpi - -DPARAVIEW_USE_MPI="$(usex mpi)" - -DXDMF_BUILD_MPI="$(usex mpi)" - -DVTK_GROUP_ENABLE_MPI="$(usex mpi YES NO)" - - # mysql - -DVTK_MODULE_ENABLE_VTK_IOMySQL="$(usex mysql YES NO)" - - # offscreen - -DVTK_USE_X="$(usex !offscreen)" - -DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)" - -DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)" - - # plugins - -DPARAVIEW_PLUGINS_DEFAULT="$(usex plugins)" - - # python - -DModule_pqPython="$(usex python)" - -DPARAVIEW_USE_PYTHON="$(usex python)" - - # qt5 - -DPARAVIEW_INSTALL_DEVELOPMENT_FILES="$(usex development)" - -DPARAVIEW_USE_QT="$(usex qt5)" - -DModule_pqPython="$(usex qt5 "$(usex python)" "off")" - -DVTK_USE_NVCONTROL="$(usex nvcontrol)" - -DVTK_GROUP_ENABLE_Qt="$(usex qt5 YES NO)" - - # sqlite - -DVTK_MODULE_ENABLE_VTK_sqlite="$(usex sqlite YES NO)" - - # test - -DBUILD_TESTING="$(usex test)" - - # tk - -DVTK_USE_TK="$(usex tk)" - -DVTK_GROUP_ENABLE_Tk="$(usex tk YES NO)" - - # webengine - -DPARAVIEW_USE_QTWEBENGINE="$(usex webengine)" - -DVTK_GROUP_ENABLE_Web="$(usex webengine YES NO)" - ) - - if use openmp; then - mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP ) - fi - - if use qt5; then - mycmakeargs+=( - -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so - -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so - -DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" - ) - fi - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - # remove wrapper binaries and put the actual executable in place - for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do - if [ -f "${ED}"/usr/lib/"$i" ]; then - mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die - fi - done - - # set up the environment - echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die - doenvd "${T}"/40${PN} - - newicon "${S}"/Clients/ParaView/pvIcon-96x96.png paraview.png - make_desktop_entry paraview "Paraview" paraview - - use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV} - } - - pkg_postinst() { - xdg_icon_cache_update - } - - pkg_postrm() { - xdg_icon_cache_update - } diff --git a/sci-visualization/quickplot/Manifest b/sci-visualization/quickplot/Manifest index fc1b8c1e1c84..29730e1cad91 100644 --- a/sci-visualization/quickplot/Manifest +++ b/sci-visualization/quickplot/Manifest @@ -1,3 +1,2 @@ DIST quickplot-0.10.6.tar.xz 445172 BLAKE2B bcb2c694cc6a3777b7d88a5fbd6562d2612f76b0fabde67562ddba44708db0674336b72f5223aa6043524e9c6cb057e518b076086f2c05370bef6eb54b07e8bf SHA512 10b5277d8d0b8febc3c663256f3912bdd9d879b3038a5fdd3a7adc223419893ee56b825f04b5bee29883f30acb3b6a329d8e314b049fef26d6220192767d4adb -DIST quickplot-0.10.8.tar.bz2 531610 BLAKE2B 3092329b471b45c5a9c0387528ee65ac6c83ca3f21f2e4b7cd1b644a958c83eeb019e4da772a72343c45b478d1709b659372886c50b51623c5b756b4be6ba6d0 SHA512 e382206ba70849755e4110070a5e6b128bea4502ef623c59aa041ba84ed407e0ad06c62366b3bbcd71f8a76a3e651a04efab61edeb616ab6321c5680b03afa95 DIST quickplot-1.0.1rc.tar.gz 303055 BLAKE2B 52c8b60b0f79171358d81691f8824e39c1e3bafc1c084c3a52037e8cd1148e8bf68027ccc90593eca15fcbee0074d42ad7def1eb9d1f5c656b86e12adb6cfdcc SHA512 9cfaaafb7db379fb43b2975d588464288ac18eb21b3248fb02e5a30b0fa0950313a9818cfec23821046f9819d78255f02dff9970668a4b4ed8c4f452d6df3451 diff --git a/sci-visualization/quickplot/quickplot-0.10.8.ebuild b/sci-visualization/quickplot/quickplot-0.10.8.ebuild deleted file mode 100644 index c2b131eb4835..000000000000 --- a/sci-visualization/quickplot/quickplot-0.10.8.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -AUTOTOOLS_AUTORECONF=true - -inherit autotools-utils eutils - -DESCRIPTION="A fast interactive 2D plotter" -HOMEPAGE="https://sourceforge.net/projects/quickplot/ https://github.com/lanceman2/quickplot" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -RDEPEND=" - media-libs/libsndfile - >=sys-libs/readline-0.6.2:0= - x11-libs/gtk+:3" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - sed '/libquickplot_la_LIBADD/s:$: -lm:g' -i Makefile.am || die - autotools-utils_src_prepare -} - -src_configure() { - local myeconfargs=( - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - make_desktop_entry 'quickplot --no-pipe' Quickplot quickplot Graphics - mv "${ED}"/usr/share/applications/quickplot*.desktop \ - "${ED}"/usr/share/applications/quickplot.desktop || die -} diff --git a/sci-visualization/tensorboard/Manifest b/sci-visualization/tensorboard/Manifest index 5be2e2c09d44..838f59d63d11 100644 --- a/sci-visualization/tensorboard/Manifest +++ b/sci-visualization/tensorboard/Manifest @@ -1,2 +1 @@ -DIST tensorboard-2.3.0.zip 6789437 BLAKE2B 34fe0ac903f6b79fc1ddebd2fab3d64e48a4ef9bb6159494e6b3ec5444ab6ad339f5ca7e4e478ec03dc7a788bbce6a4bd3ce253640136079a7a470f01f7b3a48 SHA512 d4cfdc8dbf030c022ecd635249f643d158c92274b142cd3de93cd8877c47cf59b9aca9aab12a971b986b84c7396bed3d7a012837b08d9dee6b0e53dc56e9fcbe DIST tensorboard-2.4.0.zip 10631832 BLAKE2B e892c3f62855bd900320adbbea2758191296e2863e8865f4ffed3c5623fe5273a5a26554504b63db58c60d2a8c407e234d6cf3edc3868c88dfebd894def99859 SHA512 2301f526a98ac85cf5d182fff0f565c86883ec795bbaf2322696416621c8473d850a3f508079f89ca2a86a05fe020acde1282b72e2bb5ad77aab2d0e5ea2db4f diff --git a/sci-visualization/tensorboard/tensorboard-2.3.0.ebuild b/sci-visualization/tensorboard/tensorboard-2.3.0.ebuild deleted file mode 100644 index 76e9194a37c0..000000000000 --- a/sci-visualization/tensorboard/tensorboard-2.3.0.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit python-r1 - -DESCRIPTION="TensorFlow's Visualization Toolkit" -HOMEPAGE="https://www.tensorflow.org/" -SRC_URI="https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P}-py3-none-any.whl -> ${P}.zip" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -RDEPEND=" - ${PYTHON_DEPS} - dev-python/bleach[${PYTHON_USEDEP}] - >=dev-python/google-auth-1.6.3[${PYTHON_USEDEP}] - >=dev-python/google-auth-oauthlib-0.4.1[${PYTHON_USEDEP}] - dev-python/grpcio[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/markdown[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=dev-python/setuptools-41[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - >=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]" -BDEPEND="app-arch/unzip - ${PYTHON_DEPS}" -PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]" - -S="${WORKDIR}" - -src_prepare() { - eapply_user - - rm -rf "${S}/${PN}/_vendor/bleach" || die - rm -rf "${S}/${PN}/_vendor/html5lib" || die - sed -i -e '/_vendor.bleach/d' -e '/_vendor.html5lib/d' "${S}/${P}.dist-info/RECORD" || die "failed to unvendor" - - find "${S}/${PN}" -name '*.py' -exec sed -i \ - -e 's/^from tensorboard\._vendor import html5lib/import html5lib/' \ - -e 's/^from tensorboard\._vendor import bleach/import bleach/' \ - -e 's/^from tensorboard\._vendor\.html5lib/from html5lib/' \ - -e 's/^from tensorboard\._vendor\.bleach/from bleach/' \ - {} + || die "failed to unvendor" - - sed -i -e '/tensorboard-plugin-/d' "${S}/${P}.dist-info/METADATA" || die "failed to remove plugin deps" -} - -src_install() { - do_install() { - python_domodule "${PN}" - python_domodule "${P}.dist-info" - } - python_foreach_impl do_install -} diff --git a/sys-apps/fwupd/fwupd-1.5.5.ebuild b/sys-apps/fwupd/fwupd-1.5.5.ebuild index 1b17621bf609..569e70ed7154 100644 --- a/sys-apps/fwupd/fwupd-1.5.5.ebuild +++ b/sys-apps/fwupd/fwupd-1.5.5.ebuild @@ -67,9 +67,9 @@ CDEPEND="${PYTHON_DEPS} net-libs/gnutls sys-boot/gnu-efi sys-boot/efibootmgr + sys-fs/udisks sys-libs/efivar x11-libs/cairo - sys-fs/udisks ) " # Block sci-chemistry/chemical-mime-data for bug #701900 diff --git a/sys-boot/refind/refind-0.12.0-r1.ebuild b/sys-boot/refind/refind-0.12.0-r1.ebuild index 19bfa806fd58..39004c2d0093 100644 --- a/sys-boot/refind/refind-0.12.0-r1.ebuild +++ b/sys-boot/refind/refind-0.12.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz" LICENSE="BSD GPL-2 GPL-3 FDL-1.3" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs" IUSE="${FS_USE} custom-cflags doc" diff --git a/sys-devel/gcc/gcc-8.4.0-r2.ebuild b/sys-devel/gcc/gcc-8.4.0-r2.ebuild index 576f5446974d..7de031d31f4a 100644 --- a/sys-devel/gcc/gcc-8.4.0-r2.ebuild +++ b/sys-devel/gcc/gcc-8.4.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -7,7 +7,7 @@ PATCH_VER="3" inherit toolchain -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" RDEPEND="" DEPEND="${RDEPEND} diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.0.0-hip-location.patch b/sys-devel/llvm-roc/files/llvm-roc-4.0.0-hip-location.patch new file mode 100644 index 000000000000..8342299f1139 --- /dev/null +++ b/sys-devel/llvm-roc/files/llvm-roc-4.0.0-hip-location.patch @@ -0,0 +1,47 @@ +replace hardcoded hip finder with Gentoo paths. + +Author: Benda Xu <heroxbd@gentoo.org> + +Index: llvm-project-rocm-4.0.0/clang/lib/Driver/ToolChains/AMDGPU.cpp +=================================================================== +--- llvm-project-rocm-4.0.0.orig/clang/lib/Driver/ToolChains/AMDGPU.cpp ++++ llvm-project-rocm-4.0.0/clang/lib/Driver/ToolChains/AMDGPU.cpp +@@ -116,37 +116,8 @@ RocmInstallationDetector::getInstallatio + return Candidates; + } + +- // Try to find relative to the compiler binary. +- const char *InstallDir = D.getInstalledDir(); ++ Candidates.emplace_back(D.SysRoot + "/usr/lib/hip", /*StrictChecking=*/true); + +- // Check both a normal Unix prefix position of the clang binary, as well as +- // the Windows-esque layout the ROCm packages use with the host architecture +- // subdirectory of bin. +- +- // Strip off directory (usually bin) +- StringRef ParentDir = llvm::sys::path::parent_path(InstallDir); +- StringRef ParentName = llvm::sys::path::filename(ParentDir); +- +- // Some builds use bin/{host arch}, so go up again. +- if (ParentName == "bin") { +- ParentDir = llvm::sys::path::parent_path(ParentDir); +- ParentName = llvm::sys::path::filename(ParentDir); +- } +- +- // Some versions of the rocm llvm package install to /opt/rocm/llvm/bin +- if (ParentName == "llvm") +- ParentDir = llvm::sys::path::parent_path(ParentDir); +- +- Candidates.emplace_back(ParentDir.str(), /*StrictChecking=*/true); +- +- // Device library may be installed in clang resource directory. +- Candidates.emplace_back(D.ResourceDir, /*StrictChecking=*/true); +- +- Candidates.emplace_back(D.SysRoot + "/opt/rocm", /*StrictChecking=*/true); +- if (ParentName.startswith("aomp")) { +- // Some versions of the aomp package install to /opt/rocm/aomp/bin +- Candidates.emplace_back(ParentDir.str()); +- } + return Candidates; + } + diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.0.0-remove-isystem-usr-include.patch b/sys-devel/llvm-roc/files/llvm-roc-4.0.0-remove-isystem-usr-include.patch new file mode 100644 index 000000000000..f14ec4ac0db2 --- /dev/null +++ b/sys-devel/llvm-roc/files/llvm-roc-4.0.0-remove-isystem-usr-include.patch @@ -0,0 +1,29 @@ +Author: Wilfried (justxi) Holzke + +Adopted from https://github.com/justxi/rocm/blob/master/sys-devel/llvm-roc/files/llvm-roc-4.0.0-remove-isystem-usr-include.patch + +Index: llvm-project-rocm-4.0.0/clang/lib/Driver/ToolChains/AMDGPU.cpp +=================================================================== +--- llvm-project-rocm-4.0.0.orig/clang/lib/Driver/ToolChains/AMDGPU.cpp ++++ llvm-project-rocm-4.0.0/clang/lib/Driver/ToolChains/AMDGPU.cpp +@@ -326,11 +326,6 @@ void RocmInstallationDetector::AddHIPInc + // + // ROCm 3.5 does not fully support the wrapper headers. Therefore it needs + // a workaround. +- SmallString<128> P(D.ResourceDir); +- if (UsesRuntimeWrapper) +- llvm::sys::path::append(P, "include", "cuda_wrappers"); +- CC1Args.push_back("-internal-isystem"); +- CC1Args.push_back(DriverArgs.MakeArgString(P)); + } + + if (DriverArgs.hasArg(options::OPT_nogpuinc)) +@@ -341,8 +336,6 @@ void RocmInstallationDetector::AddHIPInc + return; + } + +- CC1Args.push_back("-internal-isystem"); +- CC1Args.push_back(DriverArgs.MakeArgString(getIncludePath())); + if (UsesRuntimeWrapper) + CC1Args.append({"-include", "__clang_hip_runtime_wrapper.h"}); + } diff --git a/sys-devel/llvm-roc/llvm-roc-4.0.0-r1.ebuild b/sys-devel/llvm-roc/llvm-roc-4.0.0-r1.ebuild new file mode 100644 index 000000000000..5714ae9b7198 --- /dev/null +++ b/sys-devel/llvm-roc/llvm-roc-4.0.0-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Radeon Open Compute llvm,lld,clang" +HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/" +SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz" + +LICENSE="UoI-NCSA rc BSD public-domain" +SLOT="0" +KEYWORDS="~amd64" +IUSE="debug +runtime" + +RDEPEND="virtual/cblas + dev-libs/libxml2 + sys-libs/zlib + sys-libs/ncurses:=" +DEPEND="${RDEPEND}" +PDEPEND="dev-libs/rocr-runtime" + +S="${WORKDIR}/llvm-project-rocm-${PV}/llvm" + +PATCHES=( + "${FILESDIR}/${PN}-3.7.0-current_pos.patch" + "${FILESDIR}/${PN}-3.9.0-tensorflow.patch" +) + +CMAKE_BUILD_TYPE=RelWithDebInfo + +src_prepare() { + cd "${WORKDIR}/llvm-project-rocm-${PV}" || die + eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch" + eapply "${FILESDIR}/${PN}-4.0.0-remove-isystem-usr-include.patch" + eapply "${FILESDIR}/${PN}-4.0.0-hip-location.patch" + + if [[ -n ${EPREFIX} ]]; then + pushd "${S}"/../clang >/dev/null || die + sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" CMakeLists.txt + eend $? + ebegin "Use ${EPREFIX} as default sysroot" + cd lib/Driver/ToolChains >/dev/null || die + ebegin "Use dynamic linker from ${EPREFIX}" + sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" Linux.cpp + eend $? + + ebegin "Remove --sysroot call on ld for native toolchain" + sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp + eend $? + popd >/dev/null || die + fi + + # handled by sysroot, don't prefixify here. + sed -e 's:/opt/rocm:/usr/lib/hip:' \ + -i "${S}"/../clang/lib/Driver/ToolChains/AMDGPU.cpp + + eapply_user + cmake_src_prepare +} + +src_configure() { + PROJECTS="clang;lld" + + if usex runtime; then + PROJECTS+=";compiler-rt" + fi + + local mycmakeargs=( + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc" + -DLLVM_ENABLE_PROJECTS="${PROJECTS}" + -DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" + -DLLVM_BUILD_DOCS=NO + -DLLVM_ENABLE_OCAMLDOC=OFF + -DLLVM_ENABLE_SPHINX=NO + -DLLVM_ENABLE_DOXYGEN=OFF + -DLLVM_INSTALL_UTILS=ON + -DLLVM_VERSION_SUFFIX=roc + -DOCAMLFIND=NO + ) + + use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" + + cmake_src_configure +} + +src_install() { + cmake_src_install + cat > "99${PN}" <<-EOF + LDPATH="${EROOT}/usr/lib/llvm/roc/lib" + EOF + doenvd "99${PN}" +} diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 33bfd684b422..a2d32f5f04f6 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -16,6 +16,8 @@ DIST gentoo-kernel-5.10.7-1.x86.xpak 57282477 BLAKE2B 743d2bb10de76025510a307f93 DIST gentoo-kernel-5.10.8-1.amd64.xpak 64351138 BLAKE2B 7518aea3df5555f97debfd4ce1d3670c4d388b0ee66c865144c87b7d68bc735f0c6861980316357d76b9981169c082bb7fa443bd8c652fabe85ff69280d5455b SHA512 0c9b7790f7fee0f70dc7553bc5a1d279021769be6e975e936942ca468828a3215e75986ec7d05f573f4bb1c90697c52d36ade5c8b2f3f7586c64dc38b4e3e51f DIST gentoo-kernel-5.10.8-1.arm64.xpak 59771930 BLAKE2B f124d13111f2c749ae45c08478a1a42ab3a179bb39fd30524c8cbd34f07ac8286496dbbf549e21f3f5041a6a26f90dd894458140da94128741762dfceb5b8179 SHA512 a897ed41a7ade8ab572a07d5c629ec394d5bffe578beba83e08742e078612d47d772749eee0b53cf9e39170e1f1f1599a3fdbc7354a7ff5940538ab39c4ff9bf DIST gentoo-kernel-5.10.8-1.x86.xpak 57271496 BLAKE2B f141f9eac74d497327e39456fd346a810334b05e5f3b19ae1cf3b8e27297a412038165ec93a0bea42c46b712ec91bf9b3d51d3c452e7f34dcad0d338fda647a4 SHA512 ec84d1bc50def3bcad74a2f0f8555e120a91f8fd8c2df334faa73f7ef3e00f9ff34815124a124481751609b94e844c4e7946eeb6199abf729058f5c7b4ee0943 +DIST gentoo-kernel-5.10.9-1.amd64.xpak 64344838 BLAKE2B a43bee38c3d4ce1be11d99ee73489cf2d93c794fa06405f7597a7a2fa29c9ef3e64a0f9f34a20467fb730d25682062cba0ad73eb824b34918c5854010bc6cfc7 SHA512 b6c09eac07a3ada4e8ab6573d877ac62ac67858f4b5ad70364e7414fd4d269df88a57dd4fe2bd31a76537fd464b234fac513e898f07969f5d5c6857c8f0fbe65 +DIST gentoo-kernel-5.10.9-1.x86.xpak 57275255 BLAKE2B b577fbfbf9a470a4383f6d3cf91a26ecb8e41da62807595fded551d52b4629d2f532604e986900c9b8818a48dfbfc87b98deafbffa0c2a96bba8a252446e7675 SHA512 ce5d7bbe47d0c2ec31611580da10af7e4d0ef8979ca14a86c172b75658ef536c25b6336e57aad023de890f806e6e93658d9cf809d3a4f08bb5b2c22b002ae2c8 DIST gentoo-kernel-5.4.80-r1-1.amd64.xpak 61053571 BLAKE2B 24eebf676e1824b01aa6b75963ff8afe25e797afe90440016f4675e8385e1d6b1a04aa662d7c92217af97d56d79f9631a84c2a271b005b5ea7ad71bb8637d941 SHA512 ea99729ee68a44f6b5081e0d81dd7d5abbb50482eda8c4e435d6ee997572362de09d7c813da2ecf1aac4ed299feb73205bcff7d4d359793889690ce07cfb057f DIST gentoo-kernel-5.4.80-r1-1.x86.xpak 52880910 BLAKE2B f94a7bbdcdbd383e919f2542251d2552e50e34264ab495a43d75e28dab881162f2549b48383b32a3b2a813a192b7d9f602eaa8210085733ac123e2246e6a285b SHA512 3b5dd91103461306f4a4ea4554792d4cdabedba6165de119523b927abb2009adc7d554f23110ddeac1a1add69b2d1674b7b87b93b1e1b186a2594174808dd9d2 DIST gentoo-kernel-5.4.83-1.amd64.xpak 61015400 BLAKE2B 73527460e0c430a23c8221f8a736416ef6c3ff0ab93d017096456e72bd6c2c88e2a631bd18b2f995bc929f918e9b5a59aa033119a534a985ae1e33d39ff48790 SHA512 53dbb9fe6d940bd93eeb35c93bb869931f8f423f6c3997433030bede0b0c11dde478e391ff372ff252771a1bb32207cefbfb478f79715ba2ee3910016087bd87 @@ -39,3 +41,5 @@ DIST gentoo-kernel-5.4.89-1.x86.xpak 52893729 BLAKE2B 10ab4e0b343cfc5803a72a0328 DIST gentoo-kernel-5.4.90-1.amd64.xpak 61093793 BLAKE2B 3230b63cfd81a4b9ab3721f3288fe92d87578fed12ee0b9e9ffa677a1373a3c4d62003d47bc08d6e3ca27d8bd121cf904bc59de2267f684ff36e976cb75d3c68 SHA512 430153300290d9900b9418518452b4a0d35fd8ab91c74b48fff52ea35ef0d8fa70212752d3666ac9e3faae8880b0849f7839633858b91656f2541b10ead63861 DIST gentoo-kernel-5.4.90-1.arm64.xpak 56377814 BLAKE2B 6fa1a85cb9ff8c4f75c40e3f27942408670750c4501d0e51586e270885223d2a524541a197c189d73b4551340ac461d3e64215e4884cdfff70ce560a9404b693 SHA512 a199b602e36998b3bdb5f3ec3be1c8ad6658f4c4f7488ee5231335584ff81ca146b64d06c18bd3b5fadcac59d04c8b51081a48b187320519a21516c32977e829 DIST gentoo-kernel-5.4.90-1.x86.xpak 52894045 BLAKE2B 53e8bf765625298041c5f2e2d47ac7f9c5f34e40acae62b43a895aaf2285c3a9bc2bdc841ecc9b0da731522fb9fe32e6ff4461ba9ad57a8ea040ff45c96501a1 SHA512 89f51dd4e420dd75063c0b7ea15dec896dfe25cc64dea3bcaf8fd9362b34a6ef57c5155a248f59cc89162c66d81383bcc2194ccd2a23c6bbde457e61ea8b7298 +DIST gentoo-kernel-5.4.91-1.amd64.xpak 61048020 BLAKE2B f2155b5e4cdf3f142eaa1b81bcef529840dd50c0eb7d6cc225216ce5965bd53f00fc7c6334c6c7e6332feac3a3432dcdbc35622d9015cf750fcbb08202bb9c40 SHA512 fecb178c72e37b12d940e924a320802e4bf1a27338a7f07c0f0cca9c45f65b72b9e03eb120da399aad4e9aebf2ca806134de4350b9b8c936665a2845fae88de6 +DIST gentoo-kernel-5.4.91-1.x86.xpak 52889220 BLAKE2B d58145b5a092981f90f7699d1455a6f8e21bb5b8c15d4dba100aa0512782248d0017adb19edc7fb7a5348649aa76ea285e4f288c1f748d9de18453db505daa54 SHA512 5b1e5563181c1d5fa6593a5547f22670504edea0f9553e0b4e7d43d8a621f46ff4ebe369c95e1d7239c483ee31d99b9395384cb02e49c2eefecac26d475e9ede diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.9.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.9.ebuild new file mode 100644 index 000000000000..31b6fee9f812 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.9.ebuild @@ -0,0 +1,48 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kernel-install + +MY_P=${P/-bin/}-1 +DESCRIPTION="Pre-built Linux kernel with genpatches" +HOMEPAGE="https://www.kernel.org/" +SRC_URI+=" + amd64? ( + https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak + -> ${MY_P}.amd64.xpak + ) + x86? ( + https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak + -> ${MY_P}.x86.xpak + )" +S=${WORKDIR} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + !sys-kernel/gentoo-kernel:${SLOT} + !sys-kernel/vanilla-kernel:${SLOT} + !sys-kernel/vanilla-kernel-bin:${SLOT}" +PDEPEND=" + >=virtual/dist-kernel-${PV}" + +QA_PREBUILT='*' + +src_unpack() { + ebegin "Unpacking ${MY_P}.${ARCH}.xpak" + tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak") + eend ${?} || die "Unpacking ${MY_P} failed" +} + +src_test() { + kernel-install_test "${PV}" \ + "${WORKDIR}/usr/src/linux-${PV}/$(dist-kernel_get_image_path)" \ + "lib/modules/${PV}" +} + +src_install() { + mv * "${ED}" || die +} diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.91.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.91.ebuild new file mode 100644 index 000000000000..b8eb2c63573a --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.91.ebuild @@ -0,0 +1,55 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kernel-install + +MY_P=${P/-bin/}-1 +DESCRIPTION="Pre-built Linux kernel with genpatches" +HOMEPAGE="https://www.kernel.org/" +SRC_URI+=" + amd64? ( + https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak + -> ${MY_P}.amd64.xpak + ) + x86? ( + https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak + -> ${MY_P}.x86.xpak + )" +S=${WORKDIR} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + !sys-kernel/gentoo-kernel:${SLOT} + !sys-kernel/vanilla-kernel:${SLOT} + !sys-kernel/vanilla-kernel-bin:${SLOT}" +PDEPEND=" + >=virtual/dist-kernel-${PV}" + +QA_PREBUILT='*' + +pkg_pretend() { + ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch" + ewarn "Linux configs to Fedora. Please keep a backup kernel just in case." + + kernel-install_pkg_pretend +} + +src_unpack() { + ebegin "Unpacking ${MY_P}.${ARCH}.xpak" + tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak") + eend ${?} || die "Unpacking ${MY_P} failed" +} + +src_test() { + kernel-install_test "${PV}" \ + "${WORKDIR}/usr/src/linux-${PV}/$(dist-kernel_get_image_path)" \ + "lib/modules/${PV}" +} + +src_install() { + mv * "${ED}" || die +} diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 23b8100c4d71..1bd7238815fd 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -1,5 +1,7 @@ DIST genpatches-5.10-10.base.tar.xz 303380 BLAKE2B 61d1378cbde5f4df5ee41d2a3391705279e647410125350a2329c6448357617cc93e1acb7f8af4cb43869ff11b6759caa3652242b52feeb8ce2aa2c36c26260a SHA512 9d9bd200682a6cd92e067024e42bdb80347e7083a698d2aa135de34998a80454130ac82ab49018e538197d35f48fdfb0e60827a219e2d6844e221450b86b9ada DIST genpatches-5.10-10.extras.tar.xz 1768 BLAKE2B cabeb1ebfbd545382a8bd7fe89ca78d58665848b86a5b25519c2d018720d04253847824d4059308b80edfe137383d26c89491c15be8efe86b95dcc184d3f35e0 SHA512 1e7c37441d3324c961d8d55eda3e43afed64cdbb45f2080673ab888b65b3b93c5f74495d8a3a53197b17f9d07f01cfc84a0b1719e5f3cd93652a512b9be536e4 +DIST genpatches-5.10-11.base.tar.xz 343372 BLAKE2B d844a4ce292477da26bc02743916143cd6851b2ba85229ed37361213580b47b5386f260bde7cb77eb5842f3fd1022b6af64d47dcc3fcf2161be8157380e082bd SHA512 069efa3d348d8a7601c6bf37ec92e3efa692abe4a7ca5dc4bfe30fb76f1b7fe8daf1a0f237d60dcf66a0815e909ac77cb1cc189d46f6fb4884a260f30a4af48b +DIST genpatches-5.10-11.extras.tar.xz 1772 BLAKE2B 8d4c4b94e9bd7c585f56038900256b3ec1ae721b4ed7adb326f393094e5c8960575efdbe2cc14cd219ae0a69cdde5c626d6983741e3f13a39bed3e85f3eb7060 SHA512 90ce771ad84ffbeaeaff6a2827577fc9c9113930dc4fd394300e1a971cc205a1f4805404e1b356dc36b373bfcd9daa95de7a364144f0fbeb0f923209946635fe DIST genpatches-5.10-5.base.tar.xz 19928 BLAKE2B 6fe55e2d7b32871600fc8d97b644e22797dac42450512c9d35f9d7f1eb72671bdc4e71ae22dbc178d1fed479ce2c8d908e77087da9c9eff90ce0b9536e89d0cf SHA512 dc9f536c40259a584041a72e8aebd6c38e94645ba2a25d05da76c254be0d1d959a45245e9645c876fb44a00887e8730c94c14bd7bb81cc194260f0688fecd3ac DIST genpatches-5.10-5.extras.tar.xz 1772 BLAKE2B 1c475a58e71f1d029676d627e31859d93970b59d300106dfb24839bec1545dc5f9185ae802c325f5f0f76bdfa9bec27514d8aa9c61388b5ff76b2ada1d742edd SHA512 96aad42f563cb5eab9944b660d51639c2ac30e9c4a5f4742796c5084d22dacf2789226cb7df804aad5b9450f5715945632bae1df6f22183eb6ab38494e16527c DIST genpatches-5.10-6.base.tar.xz 203736 BLAKE2B 9bc25d288cf6f0b7c8b93518484a3bdb4324627813ad4b03c4a8189637776b6a142bc1168ff34d0e50c539887a17d4ae26647cb508dee64de010407567b9107a SHA512 0314a323a35cd98d736010753dea6a267fefee0d648ca66f5cabafbbd760a6e2424ec86785c1a1d3da7b933afba01a09f13d9af73e2cd1b8303e9912e81cc28e @@ -28,6 +30,8 @@ DIST genpatches-5.4-91.base.tar.xz 2975372 BLAKE2B 6385731a166348210c96f8ad6a813 DIST genpatches-5.4-91.extras.tar.xz 1772 BLAKE2B d7440a80cd6d994cc853f54f5f4c4708f203fd625b99c9b9431cbecc2206dd335f0710dc6364b658e246eaa8e758a65bdb6daa45cd795f06a6f963853a7be04d SHA512 63317305324b862fdd70bb2955504795d4764f9e90fb74953d40ecd8c0201114b1bfe11fea96a97471011b35d72f16234de7c0540f466e8e510a69e7047e3ffd DIST genpatches-5.4-92.base.tar.xz 2987648 BLAKE2B ffdccfc93b1b759494cd3adf2496e2074e847c46ec1c9dfdab32d3a7dfaf5a334df0391ba7ccb35250c562a529df8ae2784656628e110887b593536ac6b0d3ea SHA512 d2c08ecebcabaeb658407626c71c98201f86cf6510c4906b37f45d0f9fd6677b709fbdd9a1ce16622632c9a2e72a11d93463bdae62c5d8d0655c999223909e51 DIST genpatches-5.4-92.extras.tar.xz 1768 BLAKE2B 41cca01e9893db97ab1c7bc920d3240b3aec6207ff6516b346a87f24b47811077d7bbbdca49ed267238af4f5eeb2e8e0de03c946fb6f3784a08bdde348a5a64b SHA512 bb88a3c13a4335b93eb1ded903696e63ffa87b0a1dc587f464335fe077623abc36831fe514f33737960328ec765c5c0bf5489e84dff3fc6ae37ab2e1cd61d94e +DIST genpatches-5.4-93.base.tar.xz 3001024 BLAKE2B d5f3020aae1a920a076457cf28ae640e8ab7387652a61db3d631a3494c5cb0e8706d92debb6356768fea992679aefd4bda6d212a9918a714740439811dd3ef6d SHA512 420512b65e20f00fcabf4d122cf5fd166a6cc196a77451f8a06b333ca2cdc189c38654333e565cc555b1f3e9745e9c4b188b98648cd57ccb395ca1259675e4d2 +DIST genpatches-5.4-93.extras.tar.xz 1772 BLAKE2B 0ad1eff5f82120235a1f326176beeaefcf7aa547eecc94ad103a5be1701dd922ae0309431a10233c0df5bf63c5ba970bdec32e6ca782965e369be2fa5a4577dc SHA512 b5415fe59ba41d60a46e0c123abcee0bb72b5a7d7358789947627ae086c7391c09f116a16c32b2475c278ea14d7275932046d686aa4a849942cbf64440506c92 DIST gentoo-kernel-config-5.10.7.tar.gz 1146 BLAKE2B f755581e9f3be3122e5f6e6fc133d3e5c3116d4580b53f95ff5b2cee5150233fe82be5cd45637a9792ae4612be5d2cb4dd954506f97fe82c9e96cb8b772cb342 SHA512 8c64768e83d2552e69a29c6c3f958ef6a1e5a767acd04b3bfcd0cd49453ab5d0aa54fcfee76a8c9d07f72abdbf70380b070e3d1584e7b7d05a6daa3399892f51 DIST gentoo-kernel-config-5.4.77-r1.tar.gz 1289 BLAKE2B 6612741cfbf458f4bd8915b476aac3aa6934e8bbab344da877fa4ad52b6133e01f5d44bf0e5d048e79e56c1a351774135ee55f1aa839b230e2418db7c5d9b123 SHA512 2a09dd85af37447b278847aeaad114ef47470726cec015ed5ee1b54b3080f4b2c48de8b2f7b817eeb4e27c753579cf0820053e22caa762cb1552116d8d69eba0 DIST gentoo-kernel-config-5.4.89.tar.gz 1240 BLAKE2B 50bd2e64eb1a62d2f0d67e02b78da56cb507fd7a5993d663b880c94ecd535898285ed01e00d5d07fc1ba0d044657e776456736d8fdcacecf7ca464979a8a1d06 SHA512 ad31f9895b9dd45edd7f8715516edfc303c23600f243f3ca122c7c554c9fdbe3c3aa62970a24ef7291d7937e04c63c0258f6348e796686902a011c055c1bed01 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.9.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.9.ebuild new file mode 100644 index 000000000000..57b838f8aba7 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.9.ebuild @@ -0,0 +1,89 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kernel-build + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.10.7 +CONFIG_HASH=b238267df7cd80dc3aa6b5b654cbe145367383df +GENTOO_CONFIG_VER=5.10.7 + +DESCRIPTION="Linux kernel built with Gentoo patches" +HOMEPAGE="https://www.kernel.org/" +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz + amd64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) + arm64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config + -> kernel-aarch64-fedora.config.${CONFIG_VER} + ) + ppc64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config + -> kernel-ppc64le-fedora.config.${CONFIG_VER} + ) + x86? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config + -> kernel-i686-fedora.config.${CONFIG_VER} + )" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="debug" +REQUIRED_USE="arm? ( savedconfig )" + +RDEPEND=" + !sys-kernel/vanilla-kernel:${SLOT} + !sys-kernel/vanilla-kernel-bin:${SLOT}" +BDEPEND=" + debug? ( dev-util/dwarves )" +PDEPEND=" + >=virtual/dist-kernel-${PV}" + +src_prepare() { + local PATCHES=( + # meh, genpatches have no directory + "${WORKDIR}"/*.patch + ) + default + + # prepare the default config + case ${ARCH} in + amd64) + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die + ;; + arm) + return + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die + ;; + ppc64) + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die + ;; + x86) + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die + ;; + *) + die "Unsupported arch ${ARCH}" + ;; + esac + + local merge_configs=( + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config + ) + use debug || merge_configs+=( + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config + ) + kernel-build_merge_configs "${merge_configs[@]}" +} diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.91.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.91.ebuild new file mode 100644 index 000000000000..e8748c9098fd --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.91.ebuild @@ -0,0 +1,96 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kernel-build + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.4.21 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea +GENTOO_CONFIG_VER=5.4.89 + +DESCRIPTION="Linux kernel built with Gentoo patches" +HOMEPAGE="https://www.kernel.org/" +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz + amd64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config + -> kernel-x86_64.config.${CONFIG_VER} + ) + arm64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config + -> kernel-aarch64.config.${CONFIG_VER} + ) + ppc64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config + -> kernel-ppc64le.config.${CONFIG_VER} + ) + x86? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config + -> kernel-i686.config.${CONFIG_VER} + )" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="debug" + +RDEPEND=" + !sys-kernel/vanilla-kernel:${SLOT} + !sys-kernel/vanilla-kernel-bin:${SLOT}" +BDEPEND=" + debug? ( dev-util/dwarves )" +PDEPEND=" + >=virtual/dist-kernel-${PV}" + +pkg_pretend() { + ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch" + ewarn "Linux configs to Fedora. Please keep a backup kernel just in case." + + kernel-install_pkg_pretend +} + +src_prepare() { + local PATCHES=( + # meh, genpatches have no directory + "${WORKDIR}"/*.patch + ) + default + + # prepare the default config + case ${ARCH} in + amd64) + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die + ;; + ppc64) + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die + ;; + x86) + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die + ;; + *) + die "Unsupported arch ${ARCH}" + ;; + esac + + local merge_configs=( + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config + ) + use debug || merge_configs+=( + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config + ) + [[ ${ARCH} == x86 ]] && merge_configs+=( + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config + ) + + kernel-build_merge_configs "${merge_configs[@]}" +} diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest index 110f81dbc330..0ee39f39c156 100644 --- a/sys-kernel/pf-sources/Manifest +++ b/sys-kernel/pf-sources/Manifest @@ -13,4 +13,5 @@ DIST pf-sources-5.10_p5.patch 3767157 BLAKE2B 7ea53839532d97225bbb95cd0e56c5e81d DIST pf-sources-5.10_p6.patch 3863592 BLAKE2B 5ce92850e459f9ea9bdd19d4375f13a7554adbdcd3ed2b2c77c1e138c6cb508554ab8701398f77485f9551ad6422fd14e4f7ba708d607d9a107ccd818c42f560 SHA512 44398b4bcef521267ed4b9dc56281cff2587680498f68130361bab8de8bf164601bc95642493dcbb08eaf43ffca3b333ab2a12db825e7f52eb0171bb191bbaea DIST pf-sources-5.10_p7.patch 4104263 BLAKE2B a53f381c255aa242955d7401496b5b21fba743c2a4d3d0c31a06d67c15806e1672c8910f165140ddc1aff6958e93d2871c50e64b81afeff50f1982bd854c9c19 SHA512 583f48a8fba4cc62b60a17a0274ada2f17bd8a75b16b0e9e27fa9536e743bfbba57c561a544a7c8b7a87e65059aa01e92259c9c55dc46544445d5026b06fcd82 DIST pf-sources-5.10_p8.patch 4232466 BLAKE2B efe977028da96031c2834af65fc7da943ad0d7d0155a54e614a61ae825672b147dca31491487c8bb500aac9db869e303d3ced6a30bdd9f6fdf4bf0a0d93dc9c3 SHA512 bf64e4a12627f5c0b39dba44f815d7a42758a9e0a79fb341c535ed2b64e99068c8fdc1b8e3ae6656e815280337715b2b19d084fb589a5c60a1e5ab8e2153e27a +DIST pf-sources-5.10_p9.patch 4509136 BLAKE2B a0bd46d0e6f833849736da492e89fbc3885bf3b96db0f1cbd03525e5d60a2a8f224851f92c73f51224565ba27517ab3310af8b853fa03fedc55d8f035bda0389 SHA512 45ad1097dc270a347be598c053bc19d0a830f86e124e317c5bdf3682ed41c523ed80d277ae94ca6ecee247792254b8f16b9c9ad5c90288dec9ab6d4cb5f0d272 DIST pf-sources-5.9_p7.patch 3027972 BLAKE2B 9247ea63b30f9d42d79303b73a900d468a71e703333932f7f15ae697cdba52c46358297023e037226c219fad5df912fb5d21e6f4b7190556ca799fa84924480e SHA512 c69e14f59bf98944b3329c65b7e2c271d74a756bc8c890130bf3cc68b4b96d31f1c33c4edb128580fcaefeb6e42dd04b1eb3d7f071b2d58bc764d26322bda8cd diff --git a/sys-kernel/pf-sources/pf-sources-5.10_p9.ebuild b/sys-kernel/pf-sources/pf-sources-5.10_p9.ebuild new file mode 100644 index 000000000000..223e79a03a51 --- /dev/null +++ b/sys-kernel/pf-sources/pf-sources-5.10_p9.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# Define what default functions to run +ETYPE="sources" + +# No 'experimental' USE flag provided, but we still want to use genpatches +K_EXP_GENPATCHES_NOUSE="1" + +# Just get basic genpatches, -pf patch set already includes vanilla-linux updates +K_GENPATCHES_VER="1" + +# -pf already sets EXTRAVERSION to kernel Makefile +K_NOSETEXTRAVERSION="1" + +# Not supported by the Gentoo security team +K_SECURITY_UNSUPPORTED="1" + +# We want the very basic patches from gentoo-sources, experimental patch is +# already included in pf-sources +K_WANT_GENPATCHES="base extras" + +inherit kernel-2 optfeature +detect_version + +DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches" +HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README + https://dev.gentoo.org/~mpagano/genpatches/" +SRC_URI="${KERNEL_URI} + https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch + https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz + https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz" + +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +S="${WORKDIR}/linux-${PVR}-pf" + +PATCHES=( "${DISTDIR}/${P}.patch" ) + +K_EXTRAEINFO="For more info on pf-sources and details on how to report problems, + see: ${HOMEPAGE}." + +pkg_setup() { + ewarn "" + ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way." + ewarn "If you need support, please contact the pf developers directly." + ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with" + ewarn "the ebuilds. Thank you." + ewarn "" + + kernel-2_pkg_setup +} + +src_prepare() { + # kernel-2_src_prepare doesn't apply PATCHES(). + default +} + +pkg_postinst() { + kernel-2_pkg_postinst + + elog "Optional features:" + optfeature "Userspace KSM helper" sys-process/uksmd +} diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 62d7c5932488..5b954782e1c8 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -26,6 +26,8 @@ DIST linux-5.10.7.tar.sign 989 BLAKE2B b6c0f9ede022691159e3b8d85f1ac96435485e05b DIST linux-5.10.7.tar.xz 116616036 BLAKE2B c3a222cf56350a3778bd825ba8434d27266412ffe921429be189d51fa97ec66b6aaf336bfd67c20d44828e4b150afade9659b341e9c499f63d6dc01fc2a4fb03 SHA512 d639ee7ddd8071b1b54354e68034508bd32a3d2b8eb50ab4aa0f64f3beac9d4ce4f7940ba1848f9903ee827f7cad1a2625185eb4071b0f348bc4639af6f41d9a DIST linux-5.10.8.tar.sign 989 BLAKE2B 5f4194a7199daac1bb9d967b81cf6e9107d7064065cd2df4ea9ca195195c2924e8f314ca0a0c33a0c373cc59ae7d64536faef5a2193e18102d4e89c5694c474f SHA512 cc4da89a8e12aff5a933d92642146789bea700ec2cffd5e32b555bb0dc700819f59df5cc807cd2acad3b54ff13a6080a5c0874b8fa3e6dab049c87aa43712e65 DIST linux-5.10.8.tar.xz 116625448 BLAKE2B 1bea3293bb036639d5dd72aba9ca078e1cf94c3752d48abd6462c65038ca5808ee976919623ccb64356756b2cc766a014e57483e8e1418a089236522a0e0a56e SHA512 13ea7cf81db43059466c1558bd80175a6c2090496786fe9220c165958d19781d5501104f41f8207e0239a101611a1faa38b203dd1e8890964494ef8518f5f21e +DIST linux-5.10.9.tar.sign 989 BLAKE2B 4573f4a502d7b86924051da635af393a0d61628fb88f01d14ec5a8b454974b707f547c60bcf965f73af92e850f496c659847142058e61951065db4e2e40cf8e6 SHA512 0a1700731809dd615a8d692a9be195564d6f0edbf722e72d8fd36cecbe4c3dbbcc26e3a194ab08945445a883d5ef3f491f5358d715537240a430bd750179f5f9 +DIST linux-5.10.9.tar.xz 116619508 BLAKE2B faedb4032fd709d3f0089d706232ec0dcfdf3817223aa910112e6cd58bffea20a3127fee407a465fa3b4db1a54050fabd839809c404492820216fadae70885b9 SHA512 63271212f300a58a5c2826052928aa980994fff6af553f801b0d2a1ae05e3b55788cc46fa26c97f330bab74068a93df58ce768f21fc5edd1481c841b975e56cf DIST linux-5.4.80.tar.sign 989 BLAKE2B 7d0fa889c353c83eeb38d4868de3736baf6dd668db2b6660472b85dd6f9fffa83350954da80bd8e6441b54aa15324d68734ca863b0b1980b92a7b3a58073037e SHA512 54b7a124065020a69702fbc4ec82359c728ba32e8cafb7ba083d12974914c8309cc6b33b85769d87f91cbb2583b7c0a20d019d1b3808f32f07dda0ec795e8906 DIST linux-5.4.80.tar.xz 109626784 BLAKE2B b395b0326162ca6d9b9a59966e641eb1df63dbd402c8287b276c915478819132e201ae68fcbab2fbae353591ff4f38951a643b6a2e1283a551ab8464c21a2abc SHA512 ba400e61ce4e55a8bf391b45df15bb71f43f42de1f2cf2c19468f503b102ec1269589908fa186bfff946baf031ae1531f30ab420605a078439508898e5fdfb37 DIST linux-5.4.83.tar.sign 989 BLAKE2B 0c1c9737b51eb02747146498475436682fec4d0e97c6e90e840682878eff34aeffa6970eac0ce117ce18bb8ca2e15fc1a9b0bfb83e021b710fa10dd713437c32 SHA512 be2564571dc109611e802d5dfe1d69339d375bb01259d46888c18ef03979401d9943721131c10609a8a07f14cfe0b990e558e15c7d89a2eccc71e86d620cf4c0 @@ -42,3 +44,5 @@ DIST linux-5.4.89.tar.sign 989 BLAKE2B 6a18738bf3d05b8eec8937604680d2d836b75df6d DIST linux-5.4.89.tar.xz 109646912 BLAKE2B 598c524ea324dfa77abeaf0117ed9587c9e1d4d9c7b2db60d46c3e374b31e72374df095aa08e66372a62aba9bf5ebfd489c335557fa0e837ff4b0ab198228cb2 SHA512 b69793a9ad0807db409593bee12dd4998b21bdf43a4b07d212818f7f6b916cfadd4a599007f1989fc49425367cd5ba5094fc35e075bb796b2efb7502813e657e DIST linux-5.4.90.tar.sign 989 BLAKE2B 5ccde60f966806468ea1a839cbab030dbdeff530a5ef76e64ba1d9d861ae3b5dba3c773d5f56c14e103662e57ec3c4984d21935a27ecc01451d3837d77548a3c SHA512 f4b71ee6298f2d54f5f51b0b6fca6d5adf41c7139cac1ffd16b8ebc516b12ae9b0be123f0edeae777f46f7820bd4ab2118a5d6a847d70b054409e49c66da30f8 DIST linux-5.4.90.tar.xz 109650236 BLAKE2B d40a447bea1b77eb9ebac798c1d35e4ce63a2babb54675da5ebff3d954f8ce6c40dc367b019e2280463e7d7813035374461d0cb4dbd80c9574cc752486e86f6f SHA512 4be07d786b74958ce27d6aaf196dd9b920f1e25dc93dd18edaace0fb86f7d0570bd7b594afb27c0502b23533fee22ae825200c37bcbfd10aa54140bea1dfc5e4 +DIST linux-5.4.91.tar.sign 989 BLAKE2B 9eb7b9e7201ce69e6779a501e6f6e4a862cec1606150a55961a238d6031ed4b4f5d75b7b16dc2ddf9c4be0984fee53ad264d4b6f2bee2ef8e4a4740f23ca5846 SHA512 d2fbbff77bfd2f927d62f14a47587894b0de479de25c01aafcb74d3a52928992303600a8435ccc7025f33731e9dfd437842b707603e30a2192f6eff5f043478a +DIST linux-5.4.91.tar.xz 109653720 BLAKE2B 5b017547953aded31e54a69c2609dfae6e516b50b10d58fe1aeedbbd93652de33aac737a688b284889bf6d0ee2d5d6551eae73a693ddbf45d9d9fdd0663268d1 SHA512 81d02edc9b4ea416e630064904187e981bd607ac9ae795e19935f53bd91a48d0371ba2786693f6c0f26245752113eb8009bcdf7d04664982eb6343584732c22b diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9.ebuild new file mode 100644 index 000000000000..51afd5f766b8 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9.ebuild @@ -0,0 +1,100 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kernel-build verify-sig + +MY_P=linux-${PV} +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.10.7 +CONFIG_HASH=b238267df7cd80dc3aa6b5b654cbe145367383df +GENTOO_CONFIG_VER=5.10.7 + +DESCRIPTION="Linux kernel built from vanilla upstream sources" +HOMEPAGE="https://www.kernel.org/" +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz + verify-sig? ( + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign + ) + amd64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) + arm64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config + -> kernel-aarch64-fedora.config.${CONFIG_VER} + ) + ppc64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config + -> kernel-ppc64le-fedora.config.${CONFIG_VER} + ) + x86? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config + -> kernel-i686-fedora.config.${CONFIG_VER} + )" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="debug" +REQUIRED_USE=" + arm? ( savedconfig )" + +RDEPEND=" + !sys-kernel/vanilla-kernel-bin:${SLOT}" +BDEPEND=" + debug? ( dev-util/dwarves ) + verify-sig? ( app-crypt/openpgp-keys-kernel )" +PDEPEND=" + >=virtual/dist-kernel-${PV}" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc + +src_unpack() { + if use verify-sig; then + einfo "Unpacking linux-${PV}.tar.xz ..." + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \ + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x)) + assert "Unpack failed" + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz" + else + default + fi +} + +src_prepare() { + default + + # prepare the default config + case ${ARCH} in + amd64) + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die + ;; + arm) + return + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die + ;; + ppc64) + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die + ;; + x86) + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die + ;; + *) + die "Unsupported arch ${ARCH}" + ;; + esac + + local merge_configs=( + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config + ) + use debug || merge_configs+=( + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config + ) + kernel-build_merge_configs "${merge_configs[@]}" +} diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.91.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.91.ebuild new file mode 100644 index 000000000000..f8ec23f5913a --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.91.ebuild @@ -0,0 +1,106 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kernel-build verify-sig + +MY_P=linux-${PV} +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.4.21 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea +GENTOO_CONFIG_VER=5.4.89 + +DESCRIPTION="Linux kernel built from vanilla upstream sources" +HOMEPAGE="https://www.kernel.org/" +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz + verify-sig? ( + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign + ) + amd64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config + -> kernel-x86_64.config.${CONFIG_VER} + ) + arm64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config + -> kernel-aarch64.config.${CONFIG_VER} + ) + ppc64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config + -> kernel-ppc64le.config.${CONFIG_VER} + ) + x86? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config + -> kernel-i686.config.${CONFIG_VER} + )" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="debug" + +RDEPEND=" + !sys-kernel/vanilla-kernel-bin:${SLOT}" +BDEPEND=" + debug? ( dev-util/dwarves ) + verify-sig? ( app-crypt/openpgp-keys-kernel )" +PDEPEND=" + >=virtual/dist-kernel-${PV}" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc + +pkg_pretend() { + ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch" + ewarn "Linux configs to Fedora. Please keep a backup kernel just in case." + + kernel-install_pkg_pretend +} + +src_unpack() { + if use verify-sig; then + einfo "Unpacking linux-${PV}.tar.xz ..." + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \ + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x)) + assert "Unpack failed" + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz" + else + default + fi +} + +src_prepare() { + default + + # prepare the default config + case ${ARCH} in + amd64) + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die + ;; + ppc64) + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die + ;; + x86) + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die + ;; + *) + die "Unsupported arch ${ARCH}" + ;; + esac + + local merge_configs=( + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config + ) + use debug || merge_configs+=( + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config + ) + [[ ${ARCH} == x86 ]] && merge_configs+=( + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config + ) + + kernel-build_merge_configs "${merge_configs[@]}" +} diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest index 00e49336751a..bfa6867d5f66 100644 --- a/sys-kernel/vanilla-sources/Manifest +++ b/sys-kernel/vanilla-sources/Manifest @@ -5,8 +5,8 @@ DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f DIST patch-4.14.216.xz 4101572 BLAKE2B 614b2653087bc1535e31071403c98a53bc7bd56bb1cac971a52e5f940d389568e0dd571af05814992a4ed1d25eb693fe19d0f241bb500e3f1ec6bc92cbf15b65 SHA512 e16cd2aa38a4c8e7522079e2acf43cd4f666fec6fdff3d2e888107b7c1df0ade19b9ecb0fcd0cf9c8e14508e75c95d207dfa0fd3089e1bb3e3240b0b6be03466 -DIST patch-4.19.168.xz 3738200 BLAKE2B 9fde60b5163c5246b116069626f125d9c81e6b84ec660c8eb83e6ef9e282d73231af6f28cdee3dc119f48157c39bfac01c60e5111e1d4bcefcee0b07af681ed9 SHA512 bcda20f0b340498d85d4f35b271eef9974dfd166514e1617ceabfba96a229ff3cccff66445a61ed9f4cf25eb4a1daa838a830f9d919aa78f26b7da5b8fc4664f +DIST patch-4.19.169.xz 3742408 BLAKE2B 3b2d25e670abde382590ba76ad8e94368f706e2174617610f969d65461c6f5458e0a39db530947ac630b9b62df9b1fd8860e793e0cd1cb912fc39d0520b04d16 SHA512 f43ac8b70b1eaed179c848333b600bb2f8f8a225752891ff80c072aa11e9a684fa915fa03616aafae4e19442a1d4edc3ea6297ff220e327412a0ca0e1d1748cf DIST patch-4.4.252.xz 3437184 BLAKE2B 8208f5b6e2534bbc5edfe10ec6181e06c8c38f0d1cb3e5a1691060d045c4f1019112cde5d5d7ea39845a3a980ee99e5e7e791dadb6d4276f383f312d3ce81eba SHA512 087077c709038cd450dc70dd52ea5e44c91e9300f13b21cd7fb83b42f00a6bad94ed3c6145ab677e295055469401881ac4edadd22c5092b8764db47d6e913286 DIST patch-4.9.252.xz 3831008 BLAKE2B 6607586b237008a4f0b3dfbacc10f8694be748e610fe2894e8a6ef88a684e2372f6cfff1644e8b2e3b15d5b9ec013ac8a63c05b8e156789515efdfce5f593723 SHA512 a16fb676060a2cf11c5ccfb16c990a7b8dd83356f81a8bdd56af5d841720905456742d8ea885be9bf205be71f907a258806a1fc4b2282b5f1989eb1a9eceec4e -DIST patch-5.10.8.xz 296188 BLAKE2B a670d287a48be8c2f347fe38953cce0634f1ad621460ba296d35649e5e50b3d5f5fe92b058228c5221418d90b0198d8068b756f080bd551e0ee3899c8548afa2 SHA512 1680ae6f248d29bef2e9a37a40bda40ff17757a02d469b1d9c097ec5898cd4c5c4c46f8e7c9e5be0df9b56422e97364f675774a5c921f9dc05719cfc5d76735a -DIST patch-5.4.90.xz 2537360 BLAKE2B 26b20652cebc901e347ee837c47d3adb47cf3e20d8503eed802375c8162109accb25f0e4557af70d183d05b5ccea670d2ab787874d3d3928d8c3704db512e86a SHA512 1850ea73f37f56265564d43eba053d95ca557dfe77ed7f0656afa8153c7649d34037433cd549f67c08c538f8f5dfd62190e63f93e650eb0eeb537cf533f161b5 +DIST patch-5.10.9.xz 335044 BLAKE2B f0052ce809cbccc32c1681fbc9ff9607a04d2dd735a364231a481841b7c8dac1231f944acc6e0720f9e9953f33945a1b0ab936f2795b534e210437e06df82fae SHA512 d1580e3a1863f3ce69237e35b3fb130fcb9a97a2d306abce51761821ff3db0e6308b5393dc3e0dc1cc4da5f3a4ce79ce2d159c2653084177f66bfcbd982fe04d +DIST patch-5.4.91.xz 2549132 BLAKE2B 9bcd04123381d361a133b323a8c0d4ef09a6cd55fef9ed5f7ae5796ba5ac15b62a029712b523eb5b4a7adc4723577f07a1337c9e37672093012030db6c5c3cfb SHA512 68afc75fccc4ca70734084d8e3a023f80d512f4affc97693f59ba32bfd8762b0660936a3ae519644c2ef7dd0029c86537371519b4f6a06a9f962884e035e1cc7 diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.168.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.169.ebuild index 7083facc514b..7083facc514b 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.168.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.169.ebuild diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.8.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.9.ebuild index 7083facc514b..7083facc514b 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-5.10.8.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-5.10.9.ebuild diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.90.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.91.ebuild index 7083facc514b..7083facc514b 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.90.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.91.ebuild diff --git a/sys-libs/blocksruntime/blocksruntime-0_pre20171027-r1.ebuild b/sys-libs/blocksruntime/blocksruntime-0_pre20171027-r1.ebuild index 1c13f0588947..ccb8ae621206 100644 --- a/sys-libs/blocksruntime/blocksruntime-0_pre20171027-r1.ebuild +++ b/sys-libs/blocksruntime/blocksruntime-0_pre20171027-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/mackyle/blocksruntime/archive/${COMMIT}.tar.gz -> ${ LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" -KEYWORDS="amd64 ~arm x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc x86" IUSE="static-libs" RDEPEND="" diff --git a/sys-libs/musl/musl-1.2.2.ebuild b/sys-libs/musl/musl-1.2.2.ebuild index 12045636d356..2796fe47b046 100644 --- a/sys-libs/musl/musl-1.2.2.ebuild +++ b/sys-libs/musl/musl-1.2.2.ebuild @@ -37,10 +37,6 @@ IUSE="headers-only" QA_SONAME="/usr/lib/libc.so" QA_DT_NEEDED="/usr/lib/libc.so" -PATCHES=( - "${FILESDIR}/${P}-CVE-2020-28928.patch" -) - is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } diff --git a/virtual/dist-kernel/dist-kernel-5.10.9.ebuild b/virtual/dist-kernel/dist-kernel-5.10.9.ebuild new file mode 100644 index 000000000000..3df38272de32 --- /dev/null +++ b/virtual/dist-kernel/dist-kernel-5.10.9.ebuild @@ -0,0 +1,19 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Virtual to depend on any Distribution Kernel" +HOMEPAGE="" +SRC_URI="" + +LICENSE="" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +RDEPEND=" + || ( + ~sys-kernel/gentoo-kernel-${PV} + ~sys-kernel/gentoo-kernel-bin-${PV} + ~sys-kernel/vanilla-kernel-${PV} + )" diff --git a/virtual/dist-kernel/dist-kernel-5.4.91.ebuild b/virtual/dist-kernel/dist-kernel-5.4.91.ebuild new file mode 100644 index 000000000000..11d6573ded7c --- /dev/null +++ b/virtual/dist-kernel/dist-kernel-5.4.91.ebuild @@ -0,0 +1,19 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Virtual to depend on any Distribution Kernel" +HOMEPAGE="" +SRC_URI="" + +LICENSE="" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + +RDEPEND=" + || ( + ~sys-kernel/gentoo-kernel-${PV} + ~sys-kernel/gentoo-kernel-bin-${PV} + ~sys-kernel/vanilla-kernel-${PV} + )" diff --git a/x11-misc/fpm2/Manifest b/x11-misc/fpm2/Manifest index 198e0ebb4163..e3b4e237cc07 100644 --- a/x11-misc/fpm2/Manifest +++ b/x11-misc/fpm2/Manifest @@ -1,2 +1 @@ -DIST fpm2-0.79.tar.bz2 230189 BLAKE2B 6e444dbed72a139fd7cecaa3669c0da042d17dc1adc72ff0350b4b094f990e9d19a953328319ade692088536673ca04df50624919c3a2d087486f09c8dff7fa4 SHA512 2310f69df323c172954932f9a3454fab95d1389854110c1d18bfbb0dff59f0da937cbc2641abe98c7be85b7c5a65234a925acd9f82b5643079864ce529dc92b2 DIST fpm2-0.90.tar.xz 212972 BLAKE2B 2608b40fd39db18407da5625f07534021dee72456fe168ffcb0c7b1f0a86fae0c69cdec5a9bfbfd09838622afcf575051326b9be5c47eb69e0b089abc205f99f SHA512 e02ebbc7af4202538b85394ef2e91d6fe7b11fbe6aaec5c5bd521d473b557db4ca8426810d1bef69967496071c936a789112307fbf028a8e3771d792c97495b6 diff --git a/x11-misc/fpm2/fpm2-0.79-r1.ebuild b/x11-misc/fpm2/fpm2-0.79-r1.ebuild deleted file mode 100644 index d10f34560837..000000000000 --- a/x11-misc/fpm2/fpm2-0.79-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A GUI password manager utility with password generator" -HOMEPAGE="https://als.regnet.cz/fpm2/" -SRC_URI="https://als.regnet.cz/${PN}/download/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=">=x11-libs/gtk+-2.10.14:2 - dev-libs/libxml2 - >=dev-libs/glib-2.16 - x11-libs/libX11" - -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-util/intltool" - -src_prepare() { - default - # fix tests - local x - for x in ${PN}.glade data/${PN}.desktop.in; do - echo "${x}" >> "${S}"/po/POTFILES.in || die - done -} diff --git a/x11-misc/fpm2/fpm2-0.90.ebuild b/x11-misc/fpm2/fpm2-0.90.ebuild index 40c1f6b3bec8..d4ee0e2a7259 100644 --- a/x11-misc/fpm2/fpm2-0.90.ebuild +++ b/x11-misc/fpm2/fpm2-0.90.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://als.regnet.cz/${PN}/download/${P}.tar.xz" LICENSE="GPL-2" SLOT="2" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" dev-libs/glib:2 diff --git a/x11-wm/awesome/awesome-4.3-r2.ebuild b/x11-wm/awesome/awesome-4.3-r2.ebuild deleted file mode 100644 index d330c79709cc..000000000000 --- a/x11-wm/awesome/awesome-4.3-r2.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake desktop pax-utils - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git" -else - SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz" - KEYWORDS="amd64 arm ppc ~ppc64 x86" -fi - -DESCRIPTION="A dynamic floating and tiling window manager" -HOMEPAGE="https://awesomewm.org/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="dbus doc gnome luajit test" -RESTRICT="test" # https://bugs.gentoo.org/654084 - -RDEPEND=" - dev-lang/lua:0 - dev-libs/glib:2 - dev-libs/libxdg-basedir - dev-lua/lgi - x11-libs/cairo[X,xcb(+)] - x11-libs/gdk-pixbuf:2 - x11-libs/libxcb[xkb] - x11-libs/pango[introspection] - x11-libs/startup-notification - x11-libs/xcb-util - x11-libs/xcb-util-cursor - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-wm - x11-libs/xcb-util-xrm - x11-libs/libXcursor - x11-libs/libxkbcommon[X] - x11-libs/libX11 - dbus? ( sys-apps/dbus ) - luajit? ( dev-lang/luajit:2 ) -" - -# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 -DEPEND="${RDEPEND} - x11-base/xcb-proto - x11-base/xorg-proto - test? ( - x11-base/xorg-server[xvfb] - dev-lua/busted - dev-lua/luacheck - ) -" -BDEPEND=" - app-text/asciidoc - media-gfx/imagemagick[png] - virtual/pkgconfig - doc? ( dev-lua/ldoc ) - test? ( app-shells/zsh )" - -# Skip installation of README.md by einstalldocs, which leads to broken symlink -DOCS=() -PATCHES=( - "${FILESDIR}"/${PN}-4.0-convert-path.patch # bug #408025 - "${FILESDIR}"/${PN}-xsession.patch # bug #408025 - "${FILESDIR}"/${PN}-4.0-cflag-cleanup.patch # bug #509658 - "${FILESDIR}"/${P}-fno-common.patch # bug #707262 -) - -src_configure() { - # Compression of manpages is handled by portage - local mycmakeargs=( - -DSYSCONFDIR="${EPREFIX}"/etc - -DCOMPRESS_MANPAGES=OFF - -DWITH_DBUS=$(usex dbus) - -DGENERATE_DOC=$(usex doc) - -DAWESOME_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF} - ) - if use luajit; then - mycmakeargs+=("-DLUA_INCLUDE_DIR=${EPREFIX}/usr/include/luajit-2.0") - mycmakeargs+=("-DLUA_LIBRARY=${EPREFIX}/usr/$(get_libdir)/libluajit-5.1.so") - fi - cmake_src_configure -} - -src_test() { - # awesome's test suite starts Xvfb by itself, no need for virtualx eclass - HEADLESS=1 cmake_build check -j1 -} - -src_install() { - cmake_src_install - rm "${ED}"/usr/share/doc/${PF}/LICENSE || die - - pax-mark m "${ED}"/usr/bin/awesome - - exeinto /etc/X11/Sessions - newexe "${FILESDIR}"/${PN}-session ${PN} - - # GNOME-based awesome - if use gnome; then - # GNOME session - insinto /usr/share/gnome-session/sessions - newins "${FILESDIR}"/${PN}-gnome-3.session ${PN}-gnome.session - - # Application launcher - domenu "${FILESDIR}"/${PN}-gnome.desktop - - # X Session - insinto /usr/share/xsessions - doins "${FILESDIR}"/${PN}-gnome-xsession.desktop - fi - - # This directory contains SVG images which we don't want to compress - use doc && docompress -x /usr/share/doc/${PF}/doc -} - -pkg_postinst() { - # bug #447308 - if use gnome; then - elog "You have enabled the gnome USE flag." - elog "Please note that quitting awesome won't kill your gnome session." - elog "To really quit the session, you should bind your quit key" - elog "to the following command:" - elog " gnome-session-quit --logout" - elog "For more info visit" - elog " https://bugs.gentoo.org/show_bug.cgi?id=447308" - fi - - # bug #440724 - elog "If you are having issues with Java application windows being" - elog "completely blank, try installing" - elog " x11-misc/wmname" - elog "and setting the WM name to LG3D." - elog "For more info visit" - elog " https://bugs.gentoo.org/show_bug.cgi?id=440724" -} diff --git a/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch b/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch deleted file mode 100644 index 3cfeaba2df36..000000000000 --- a/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u awesome-3.5.5/awesomeConfig.cmake awesome-3.5.5.new/awesomeConfig.cmake ---- awesome-3.5.5/awesomeConfig.cmake 2014-08-24 23:28:04.178646000 -0400 -+++ awesome-3.5.5.new/awesomeConfig.cmake 2014-08-24 23:28:44.204646000 -0400 -@@ -16,7 +16,7 @@ - option(GENERATE_DOC "generate API documentation" ON) - - # {{{ CFLAGS --add_definitions(-O1 -std=gnu99 -ggdb3 -rdynamic -fno-strict-aliasing -Wall -Wextra -+add_definitions(-std=gnu99 -fno-strict-aliasing -Wall -Wextra - -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings - -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized -Winit-self - -Wpointer-arith -Wformat-nonliteral diff --git a/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch b/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch deleted file mode 100644 index 588f9ab9ec52..000000000000 --- a/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: Uli Schlachter <psychon@znc.in> -Date: Sat, 12 Apr 2014 14:15:11 +0000 (+0200) -Subject: Merge git://github.com/Teknocrat/awesome -X-Git-Url: http://git.naquadah.org/?p=awesome.git;a=commitdiff_plain;h=d76d3e0b6a00b8b289b3801ba197e0dae732a92d;hp=1090719d677c86e90a1394a34f0effb418728493 - -Merge git://github.com/Teknocrat/awesome ---- - -diff --git a/lib/awful/util.lua.in b/lib/awful/util.lua.in -index 1d35f2f..123c4a6 100644 ---- a/lib/awful/util.lua.in -+++ b/lib/awful/util.lua.in -@@ -185,21 +185,24 @@ end - -- of the dirs are searched first - function util.geticonpath(iconname, exts, dirs, size) - exts = exts or { 'png', 'gif' } -- dirs = dirs or { '/usr/share/pixmaps/' } -+ dirs = dirs or { '/usr/share/pixmaps/', '/usr/share/icons/hicolor/' } -+ icontypes = { 'apps', 'actions', 'categories', 'emblems', -+ 'mimetypes', 'status', 'devices', 'extras', 'places', 'stock' } - for _, d in pairs(dirs) do -+ local icon - for _, e in pairs(exts) do -- local icon -- if size then -- icon = string.format("%s%ux%u/%s.%s", -- d, size, size, iconname, e) -- if util.file_readable(icon) then -- return icon -- end -- end - icon = d .. iconname .. '.' .. e - if util.file_readable(icon) then - return icon - end -+ if size then -+ for _, t in pairs(icontypes) do -+ icon = string.format("%s%ux%u/%s/%s.%s", d, size, size, t, iconname, e) -+ if util.file_readable(icon) then -+ return icon -+ end -+ end -+ end - end - end - end diff --git a/x11-wm/awesome/files/awesome-3.5.9-slotted-lua.patch b/x11-wm/awesome/files/awesome-3.5.9-slotted-lua.patch deleted file mode 100644 index 67f0d9810f44..000000000000 --- a/x11-wm/awesome/files/awesome-3.5.9-slotted-lua.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Nuar awesome-3.5.9.orig/build-utils/lgi-check.sh awesome-3.5.9/build-utils/lgi-check.sh ---- awesome-3.5.9.orig/build-utils/lgi-check.sh 2016-03-06 14:05:54.000000000 +0000 -+++ awesome-3.5.9/build-utils/lgi-check.sh 2019-01-23 21:36:35.973967623 +0000 -@@ -1,5 +1,7 @@ - #!/bin/sh - -+LUA=${LUA:=lua} -+ - die() - { - exec >&2 -@@ -22,11 +24,11 @@ - } - - # Check if we have lgi --lua -e 'require("lgi")' || die -+$LUA -e 'require("lgi")' || die - - # Check the version number - # Keep this in sync with lib/gears/surface.lua.in! --lua -e 'if tonumber(string.match(require("lgi.version"), "(%d%.%d)")) < 0.7 then error("lgi too old, need at least version 0.7.0") end' || die -+$LUA -e 'if tonumber(string.match(require("lgi.version"), "(%d%.%d)")) < 0.7 then error("lgi too old, need at least version 0.7.0") end' || die - - # Check for the needed gi files --lua -e 'l = require("lgi") assert(l.cairo, l.Pango, l.PangoCairo)' || die -+$LUA -e 'l = require("lgi") assert(l.cairo, l.Pango, l.PangoCairo)' || die -diff -Nuar awesome-3.5.9.orig/awesomeConfig.cmake awesome-3.5.9/awesomeConfig.cmake ---- awesome-3.5.9.orig/awesomeConfig.cmake 2019-01-23 22:01:17.364046606 +0000 -+++ awesome-3.5.9/awesomeConfig.cmake 2019-01-23 21:50:30.152919084 +0000 -@@ -66,6 +66,7 @@ - include(FindPkgConfig) - # lua 5.1 - include(FindLua51) -+set(ENV{LUA} "${LUA_EXECUTABLE}") - # }}} - - # {{{ Check if documentation can be build -diff -Nuar awesome-3.5.9.orig/CMakeLists.txt awesome-3.5.9/CMakeLists.txt ---- awesome-3.5.9.orig/CMakeLists.txt 2016-03-06 14:05:54.000000000 +0000 -+++ awesome-3.5.9/CMakeLists.txt 2019-01-23 22:00:08.715111414 +0000 -@@ -105,7 +105,9 @@ - - # check for lgi and the needed gobject introspection files - add_custom_target(lgi-check ALL -- COMMAND ${SOURCE_DIR}/build-utils/lgi-check.sh) -+ COMMAND ${CMAKE_COMMAND} -E env LUA=${LUA_EXECUTABLE} ${SOURCE_DIR}/build-utils/lgi-check.sh -+ COMMENT "Verifying LGI module") -+# VERBATIM) - - # atoms - file(MAKE_DIRECTORY ${BUILD_DIR}/common) diff --git a/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch b/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch deleted file mode 100644 index e6c37b0f9c76..000000000000 --- a/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar --exclude '*.orig' awesome-3.5-rc1.orig/awesomeConfig.cmake awesome-3.5-rc1/awesomeConfig.cmake ---- awesome-3.5-rc1.orig/awesomeConfig.cmake 2012-11-24 13:51:33.000000000 +0000 -+++ awesome-3.5-rc1/awesomeConfig.cmake 2012-11-24 20:42:23.743412441 +0000 -@@ -56,7 +56,7 @@ - a_find_program(LUA_EXECUTABLE lua FALSE) - a_find_program(LDOC_EXECUTABLE ldoc.lua FALSE) - # theme graphics --a_find_program(CONVERT_EXECUTABLE convert TRUE) -+a_find_program(CONVERT_EXECUTABLE bin/convert TRUE) - # doxygen - include(FindDoxygen) - # pkg-config |