diff --git a/Manifest.files.gz b/Manifest.files.gz index 547fe86fe55c..1bb5819eaf61 100644 Binary files a/Manifest.files.gz and b/Manifest.files.gz differ diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index 4dcb83073170..51e11fe29f65 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest index bc6978d4eb84..0a1d8ec2a46c 100644 --- a/app-admin/ansible/Manifest +++ b/app-admin/ansible/Manifest @@ -1,3 +1,2 @@ DIST ansible-2.9.10.tar.gz 14237929 BLAKE2B 52230b18efa94dbcbd6e4fba3d0915e2375fc8de7412944eaeefc054f50ea888a1aeb86b688a7ae97184b1a8a10180e67a7004d48906235ce4e1b83976d10e9a SHA512 c0d5e26491f52d1eb8d1c3755903bb6a8d50634df5fb50a970076d49d99cfda424fa60c258a6a5821e01c435a8ef077d46ced4b2f8c4f4a8d381737e6f14afb4 -DIST ansible-2.9.7.tar.gz 14215538 BLAKE2B b3882c359d0e71446c81b4f4592a08447656c22ed70358d7eddf36f4a84811d97f047afcdfd57f67664a130cee5c1231a106fc5b77b52cfab8b1be868ee03f81 SHA512 ce029441bcafdc5b44c9fda69f183d4defea84ead5628164caf87306cb97efec68c11b2cce728e90f28290640c320549486a6b4e823710f638d1d2e7c35675a4 DIST ansible-2.9.9.tar.gz 14222889 BLAKE2B bcacd9271aa0275cff8090819ee5c2832c7b59a287d976ced7e4dad52b5af85350baa1de30f56fdbb92e237c1dd3a9f6ff86cd1af5cb20167331b3f846649d4a SHA512 327c5ece277096f71f10fec2b33a8d2c94ee59b0e22b15bb5ca449da2331b8158239bdbc8e3afd093af358a787f410c7c2e0942010de65a8d9c8719cf83e4abd diff --git a/app-admin/ansible/ansible-2.9.10.ebuild b/app-admin/ansible/ansible-2.9.10.ebuild index 8c8b3a948043..2a5dea9c0317 100644 --- a/app-admin/ansible/ansible-2.9.10.ebuild +++ b/app-admin/ansible/ansible-2.9.10.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos" IUSE="doc test" RESTRICT="test" diff --git a/app-admin/ansible/ansible-2.9.7.ebuild b/app-admin/ansible/ansible-2.9.7.ebuild deleted file mode 100644 index 2a5dea9c0317..000000000000 --- a/app-admin/ansible/ansible-2.9.7.ebuild +++ /dev/null @@ -1,68 +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} ) - -inherit distutils-r1 eutils - -DESCRIPTION="Model-driven deployment, config management, and command execution framework" -HOMEPAGE="https://ansible.com/" -SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos" -IUSE="doc test" -RESTRICT="test" - -RDEPEND=" - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/netaddr[${PYTHON_USEDEP}] - dev-python/pexpect[${PYTHON_USEDEP}] - net-misc/sshpass - virtual/ssh -" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/packaging-16.6[${PYTHON_USEDEP}] - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-notfound-page[${PYTHON_USEDEP}] - >=dev-python/pygments-2.4.0[${PYTHON_USEDEP}] - ) - test? ( - ${RDEPEND} - dev-python/nose[${PYTHON_USEDEP}] - >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] - dev-python/passlib[${PYTHON_USEDEP}] - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/unittest2[${PYTHON_USEDEP}] - dev-vcs/git - )" - -python_compile_all() { - if use doc; then - cd docs/docsite || die - export CPUS=4 - emake -f Makefile.sphinx html - fi -} - -python_test() { - nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/docsite/_build/html/. ) - distutils-r1_python_install_all - - dodoc -r examples -} diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest index 3dcf6da412f3..62f2cd9372b9 100644 --- a/app-admin/consul/Manifest +++ b/app-admin/consul/Manifest @@ -3,8 +3,6 @@ DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.zip 2508208 BLAKE2B d17c22f3d8e3f0b52b DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip 2721920 BLAKE2B f3fde8f5cc53496dc314bcae822a415cf00950da0a03b968de00685371e7a2e84ffa304fb176e791c85c930728859687e768ff785829f0751ae919546bd3326d SHA512 8981a08b1ba0226854567b0977d8a349abe2b58420421ab1dccdaf9c98e7657cb2140ad1a38767d25cb54249b61f162ecd51d401374a29f7368a550b19196595 -DIST consul-1.7.2.tar.gz 22755052 BLAKE2B d863ac756f487004d0c1361bf470c1202bc2e2d1364414d4aad16dc313c7bb5021c45b1c8080ded707d67120ac009afcfc0bba37ccc99eb474049e57779f3db1 SHA512 d13d7750c745aeeb2577ed334bfef1ac8a4e0c6f671a6705c0b8978217d071ebcf32455c0bfc83a77fd03caef68a6e256d95b48d5406deaaaba263f1a97b23c2 -DIST consul-1.7.3.tar.gz 22785232 BLAKE2B fde414c0f76dcd2aa267114a6ebe12f57e5165d67a581fbc2fa1eda6a50e67ff81f993c5e9898975e21a66942526a0460f47a0fc5f90062fa345dfbef5a77ca1 SHA512 6cbc4f3fce613b3f8ac220038cd013ce14801ccc6c999b12e42f2149277f845531932243b063fbd83d92b84ed75000c47636f7883bd04079c0b82c642e021c01 DIST consul-1.7.4.tar.gz 22787889 BLAKE2B cb7a813beac2fd752858046d5a92f898662ea986f09d660c65173eb68e7523e9f1c6a8fc267275b2170490dc1e897d9c8d0df57dd898e58f0197e835c759919a SHA512 50466c6ded9d46ade57df252cda3cfc24ff321c13455d789dc7ea300ba037386aca73c6a47be9c5817985ff9678e04daa3295aff5ae83c97afa297451456bc4b DIST consul-1.8.0.tar.gz 24065255 BLAKE2B 2e6dd72d5cfb235b5574fdadee9dde44c602604409ffe023d7032d56e7285a82efa51df26bee09ac07116daa87738867fc6fb8052339c35011962f3a178f68c7 SHA512 29f678bfe9012304f5eb49a47c2f2e799268bb4e98262d38b21de88a8bbd51d7035bc0eac8fb72d0a78526e1c2f83d34e897023476871198c543cb9ac43308f1 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e @@ -250,25 +248,20 @@ DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip 14840 BLAKE2B afc6 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod 96 BLAKE2B ada026bc3e6104973cb7900d638acb7976ee8301e98cea55548fc800d8954997b666d0c605dcf1de0f639932c8834bd13e8f8512e74529a818d3de978f0163d4 SHA512 7276c308f91ed52579965e7e83e839351f2170cef2b58ef67887d5eb926dd21fd502f98ddc84ca8e6f16c81171490c1e2d9a131569b5d6d56a1e2ba28f227451 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip 17595 BLAKE2B 06dae93e8077ab6235d59b57646a162ff31e044624bab3b6ec86c7aaadf49c36b262b957704151db889c515c425630299d396d0b76919403eabf4a3e71098ef6 SHA512 aa4b145476a80d7be7959bf7d0a9a278765496dbf915d083fbc40c5b216a52126af9ba12cf09f9cc178ce53987822ed61c92e2a0295fa977f8a460262e857c30 DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod 770 BLAKE2B 22eef413edcfeb0337641d6567fdfb73d32f8ab2b3e624a3e5dafa15d31ca15c98c9740d4e9c8652adc5cd9f336153c029b086c260cf9ed8beda64b9c0c06028 SHA512 65489f1fe43c58303bd999f4c8d96b6bdb4d194b78e14d2ae9de9ce4fa877827f47d5d3c79e8417c88d1571b135678c069571e528b061238a9d59dfc8b472097 -DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.zip 105218 BLAKE2B f08840f6a06d88834cc537a458805b9589a3fd247ce94bea5ea99c39061ea6a710d9bbf7a5864ec2a3b136a72997bf5755e94685104aaec76352633c7334fe2a SHA512 d2487934034ddf55c95fc98c02de482c9182079960698c21e14e8b89016c9229853e835695aac7a21ad11abd263fab8464bc8014eb9fcff52bbc2ae1866a00a4 DIST github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod 276 BLAKE2B 1ed39160b23bffe3c57b2d21b4881b8c9adad956bb2b929a8ae2abe94d8abbec24c73a7a679cf7051f7b8b0a61167ce8c6958532dcff3df4de87a2148196626c SHA512 4385e13d97a4b7243d73f9415c943c40595444bc576f917ca59ea8cf6da3a5794b82ece26a484fb06fc2e2aaf0a46e3904ba22f9236f673c59fdf7e09a297546 DIST github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip 20140 BLAKE2B 21b3ae179e61ad340a764c28fa866c4b438f658b544e9687f03eb024ecd5b5588ca94454d7904cb0b1358751e3c0532bcf826c358bf6efde25c801b6f7059fff SHA512 ea0f407cec7f99a370593a66539dfa0265856faf9972e89182d169063c5ab7270ea92d46f558f2fc234e5c47e9875784f7a1b0b56996720aaff2b7d2f39b5c4c DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b -DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.zip 17490 BLAKE2B 197d279b7840f334b77ba4a80f24e491709462c6d75f27838d01e4502128bb8a431093d58e689156338a8e5f3b9d5cd785c746a5eae6ecbb47e6a066d2f4cb77 SHA512 cb4a6900e45de081395dbf670c3f7aba821993fb081adebcfcd68ac3aeb94c8acb3d777a28edb1dad6b0a4fc9035c4c3c118ebcb803f2bcbb35f540f1c11787b DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip 17666 BLAKE2B 17ec61e27967762f6f2d29e8dc23f4fba5c4ba0ee5acf7dd342e7437956af4348096da9df87c47c24bdc5f0d11544a1e5638125e888a9f163c97086259cbd888 SHA512 62644e1aad01d8475a0fe8878492477f11c5ac26cb0142a69b0afaf46a74ef3e3658b199ee6f505941f19d9ede170d62237422758e2800d81b251f365ac8bbbd DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod 98 BLAKE2B d536f017d021aa2e43bdef41de97b002d8e08e2767ae5222ad7d05ae23af04c4920fa2663b553ee803d72751ae0772b4e8ab7dd5243aae1c35d53c0f6ed85d24 SHA512 97ad4c83d3c61a8b878871c886a1fcd6e3e954623b56e0775897160368b08a243d325991956d557b5d8741b0609d758b2da0277049e57163e18248594ce3cdb6 -DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.zip 14910 BLAKE2B f57ec2238d5535dc22946b7636ac5d56ffc4ee90ac57d11e045971634455783bb18443ae67b09dd6dc3086b861e597e8ecd7a06cef2ef7225a04a21017bb4978 SHA512 d18262019ea6feadd73719800d8a613dc0ea00643c5f6ca5f557e46c5d757d584c5735b717a360c65bb68b25949b6d2a39ffc207e4e0f93a49ab855c050c93e8 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod 98 BLAKE2B d536f017d021aa2e43bdef41de97b002d8e08e2767ae5222ad7d05ae23af04c4920fa2663b553ee803d72751ae0772b4e8ab7dd5243aae1c35d53c0f6ed85d24 SHA512 97ad4c83d3c61a8b878871c886a1fcd6e3e954623b56e0775897160368b08a243d325991956d557b5d8741b0609d758b2da0277049e57163e18248594ce3cdb6 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip 15463 BLAKE2B 88fb544a56eb6266a2ed75b3b6380f52d11d725e8711f2fbe321bd30494201d43db01398348fca95ef76ebb46ce26f3f523be67bc2d56f264f5c9fc3ac1cb8c1 SHA512 891f2adbadf938d7d070d80198f50a62e187a6aa6fa6b489e0055b98a9b2547b43cda11ee983815026b1e6f0f8864d695bf7e72d70290423ff53b4872d310735 DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d -DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.zip 130743 BLAKE2B d7e78c75b2a9cf89b07fc1c1ebd0f93668d595e21d13f45fe7cb98f09a8e7539cbc2acd2d14527370c6d4e219c0d5dadf414a8504930b499dd306a08117d774f SHA512 718496a1cd900d52b314a0113729906e42940f9e3caed0f989f16d7e28a5b8476400c00917f05e669737c5c45da3af95741c99a188698b628497ab2eb18ec49b DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod 215 BLAKE2B 1533dab2e1f588c3e362d82a22e8031674457b30822ec51d6130bab2d9bdf9412a86eef4d581ac50b2320ed39277386f6422e0ed26145cc5a415428ee77a927e SHA512 cd1d90707ef0309643612f59ed64ee94aa1ba686a4140ed84963e983dce5204788b10def7a0c949b15b215063f52269e7441c2e0230440b07d45d704580662d3 DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip 132950 BLAKE2B 382fd8ab248997b4f364426ab0cd0a31085b5969b9ea9ed50046e8b7687b81eaf766e9e8e0bd15cfeee84319dd25b0c32b0ca2795066ed38f6979dabe654803f SHA512 43075467209b036a7634f6398af7147d209f685e2108f6190e51487905df4d0e5e0b66c40c8bc5a26ae6edf4652fe605fc2e84fb5421019c07d45710352c146d DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871 DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip 6210 BLAKE2B b5d3b234531523546445cfc48d9c4198fd0ffe8c91ad6d2b3349f28d5073a6d3cd76f0db36380d69ea5617357a8677a81ef8cebe04c0dbc4538bec1810f817ae SHA512 50519f8c8efb7b3494c857373cb119b924f2ace674f07bd0d0da5939a75f8c154b5cc8875fd35135228a9e8e221fccc174aa298d21bd490b89a0f2d9aeb38e09 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e -DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.zip 7792 BLAKE2B 2ed26e132b77e3fb84ee25c0a591c074040de3992abb9bf9f11399db65855301ac2334b9b5290220d01965c5203eaa1882ba1af551f8aa6ab775abecf2ff2797 SHA512 102786b62fe1c84de948cb11a09cd07f3084454d71b32ad48356553660e7eb94fb8d5950f74d6393d12ac9caad01a8b01add526c9ef8bd73039707f18729376a DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip 7804 BLAKE2B 118a166e041d64c446114e195ab870455fb75db45554e02f0ca1b0a2ee76938022120848bcd5d3668a9711c32345db5911cc627977a602bfdcaa875be791199e SHA512 3a3e4b23b82bea9b094f407662f5c63659ae427bd0e922c37f0dcafa1e3cbb16f4117f265cacf2a0219f5240d378aad7aa4cd2f9960e07b7cc7200859b0d6699 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e @@ -278,9 +271,7 @@ DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip 15533 BLAKE2B 6804423 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip 15917 BLAKE2B 66bf9607834472667be4da679727ff2b004e95dc52e4c69d1470586244387b3cb2afb792b8f7d858c4edb3f73151771eed8d7509c7da91ad31655a945ac4d326 SHA512 b1267266cdb9895cfc0707dcfbb3dbcc8e3a53adb297811ee70d20f6a77d080f5cb0c4b8438e68d933a7ebf701c0c3e3f9a1b881916fbdf5b4832d5ae790ebe8 DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472039fcdbfaceb0046f7af0cbe4078af4f2560457d8a47e3bf4654c725578f4f54ca1d41f48e37ff6bd1b3968e9b061773ce9fbda5fa5c50f17f SHA512 a36b4a70bb4b943055ad91fc4f754d55473b48f1e6330c9526e4a50dc4aba3b3462b787c71d7f2e863f78518e945ce15f9198a9bd0d6817146f92799733460f1 -DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.zip 525053 BLAKE2B c667a83b0ff18782c883406910620d3eb32b541043520e782953a71c33ebdbdc149612f87df68fb645f72db9c888c1d0ea8165210c35498bb840b9047ff0d1aa SHA512 5e60b4baa404de9210496a710ef1bd73b8795f679c6079719d7ff30c5a545f9ee407108981a3019bba008100f35b722f9eade9e48c09df4b8a245b0dac228ccd DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1 -DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.zip 19501 BLAKE2B 6c60c3832f5bd1d3c50b058611c9896a3db90dd727401506bdcb656966368cc9af7d8384a714e370dd69714856b63351db4485716dff566c3518434919cc4035 SHA512 02cde99c414bb38d5586ce722128e6c9a940583c9c4a99f1ec30787988235de6a3a1c516c150aa2bc94dab7723a9988c7efa2d8b151d05c9c36c04af6d145168 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 19548 BLAKE2B fe48c3db37bc280cf5f36e522f4b13f7daa45768cad11c1148634ce7af618c1c20f568f98ea7193b0be7021fe8a4d209a4a7f1c94be3c05924a36022a57c46b1 SHA512 6927a910a368e1f2b0792989858d25c5a55891082cc38f5907c539a35919916e02872619cbf45ed583c6f6f8e85936a3fa790a161b071dddc922383e983d37ee DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b @@ -288,15 +279,10 @@ DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip 121655 BLAKE2B 071d008723f19 DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.mod 32 BLAKE2B fc55666bc550b3f1fb19c148ddcee24a0bde3bd4fac2e7e651bdc300d6bdb5ae0ac88c51b19c905520498e1ccd7bf4846bdfa4d2cd6464ef7dd564dad2fc06cb SHA512 b584d1f966117184e44883b0c057f3a51323e9a6f5a4223655ee1c4e7b5928631d3121abce2505e2a58219cf531d75ad63d3e7e05c12982d73095d4cce21736f DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.zip 58035 BLAKE2B 7e29dde7d2d36e3d6854f56b4d253bfcce1dc78845cd60ea52c8d50a3a64d391667de99fd96ae94101650f850b834c72b3509a9f02594fb46c49daea2ec9342a SHA512 4975a066f8b65dda7f51516347889b666aa930d016270100d0ffb9dd46aa7656dabe8a4ff84751d77ee807e9ebc51fdd882bb6e873bf00b1fcfe88289b04aa46 DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66 -DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip 9174 BLAKE2B d972fd0c0a8b7135723ae51a6e57ce7b686c7d4b88313c2df73fc537874405595f82f58f5ca51da4036667f6d48f74022225209bcf148228e1d0deb0a6d3d709 SHA512 f2935ed7cc01bfb3aa7ff86dc4172edcf5fe20727c59a43676565d81c878de1dc6a0c49bd51076bf2e078ff71f72ad689802c0286d26e0bad26b2ded74d222d2 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1 -DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.zip 14575 BLAKE2B aa85d696951ae3aefd27eb419d146d6475bd8d9039d2385fd44a1ec7d0ebda4d1d82a7cea586a6090d67b0d7f692ea958b62ea1d8d75caba640ddc58469b7996 SHA512 498f6c6cefcfd5558cac0f3485e2a11f4ce9aeb9ccf4d9c460354da5268d17bd5a301ac60cf93d73062a236330d254da8c2ca02fe0a339d25f9a70fe064ac610 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod 328 BLAKE2B 5d3c1f5b839250a69efe71d633601e076be84d2adbf5f69067118851ec76b6044728cfe23644a8fba03502e476bc40ee79ef3e0c3385ab8ee2c3103321753deb SHA512 ed46a1036f3f7a7c2c5d55440ac93f468b5b4282fb5bee31a0c1a746b00426922544acd55ca6ca539d9d6927a23888e81aa360d2140036e84dc895b5a97c9b43 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip 14557 BLAKE2B 7b306a1151cda04a778b2606fbd7e5257a80da359ee6f02374bcf7199f16e3513be56c706d8af2fe2e683c46b80f9680e6831f0e022f3c8dbc5e0c16020d7a72 SHA512 96125081b3fe8233d3c2885c52cbd46c7091f4dbe7ff3e542f934c21c75f498b6bbb89200f9ed27dcc572b16dcb31bd400bb4d74b4e75e171c565ce7c1ecb3cd DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6 -DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.zip 103250 BLAKE2B d322a7ccfc3ca434f8f44cc07769e4179197d1d48d85bf7c4e666f9a6c12640dc4196937af09ba7a07c9da1bdbba5749f2c37744ae28b7c526174aa7af072866 SHA512 af29d68cb9eeadc11a5d0e9033ac0c9a9aa9972935b2cc7eb76e951db9b12124f16b0a6ad91a5990b37c08c8b39258f32a9e63afad75e114fc853ec89504db93 -DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.6.mod 930 BLAKE2B 57a45b6fb8d71a650588f54042a48e04085980f044df42be676b6985d12df508b5e82ec4816df18be51b38ff8be4a42432d8ab4f32bc3b54e2420dc6a903a5c3 SHA512 b0d79367b189b5794c6f8aa68adb1695452d259136cef5e5731813b8ca31b014f7c719f881b40d6c2df5ffcde73d44956158a1c847d0296431651228361f5470 -DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.6.zip 108299 BLAKE2B 636c6b766006dae64701678775421e1ae3fce829da1e7b1e8c7c2687098e5b19237be43839de7906ead9fd4d88763654aea4aa013df9808ac1c606bc18d328a2 SHA512 db23ad5568f7c7d142e88a4246509f06e35aba2fffe6a609ea036337a64d72f9398220e4cf63968bd2cf832c9adb0d59cc88f94a2627e60bd1d967df48e673b9 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.0.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.0.zip 112061 BLAKE2B 96727caa4d00da2a8e9faf0ce2586fed181f3d84525ac585f7eab9a6770c90ee77958a0b446d958b6a9a7e86a40785d16da9b96ebed90f5f212c9b4ad532e9a4 SHA512 127c3b69c4375748a0ce4ef094788b17cb27979099160b933a88c87aa08e2b6c52ae0bf5ab68f028eb64e27ad7f25172e85e2efc326c001a5ec180013c75a4f5 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88 @@ -304,15 +290,11 @@ DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip 114585 BLAKE2B 846541 DIST github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod 47 BLAKE2B 67dc6ab625743aeecd408ea7bf04f70243ffb0a997cfc49206db31f0de98b3a30ef06afcc69726d771512585ea9f855bd42306de4a15ae99c07f49138cb79c20 SHA512 d1ab435b05bfa15b854c2ad3ead3678f0671f79fe9ec7d1352122438e62e40fcae32501a0f539f10747cc8762e8d94c0535d176f89c626c650beacb9c4f82f49 DIST github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip 4515 BLAKE2B ae028eecfc31eea1056857da702cf0f4521a43ae5a1f1e2a267c1aefb9b5e703703d4f13d87928089e67d4721df1bbed2f7247e72db2cf7b24281114e5956327 SHA512 de6607396bc85d72d44c291a4d4eec7c98f0b54c27a92fbe0b89bc8916ca59294c419e4591da7d12ebe0541867bfb9c57f46ca4be19562129646ec2a764c0604 DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod 410 BLAKE2B 192e571d096d665a55c29da1dc35ba17c52d6f5b0c3f522c80b355bf881ffe269b27a62fe44761143966aaa5bede99800918999a313869c1a81dba98b710a1ad SHA512 e44c233e6bf407eac6a4eb6f7a72dc0118575b6dfe48a9d0afb95d99a847ad30f75b11e6d008238b7761965182df56e52ec183bb0905e054a638c76898368e6d -DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.zip 151101 BLAKE2B 41c638b0934f697256c87b5d034010ee49bf42740a5152005effcba78d29911ee2e981e6e6643df6f804bf38675b2dcb961161f2a8c912d514d007dd349512f4 SHA512 d4aaa571f5f30c87a37f70ce4b190665386e943bf107931cb0650eb54b2480b9acf31e8b83a66b1a8bef11d088a80c522ee70a4b85ee25ab1b28d7cc44d0e131 DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.mod 410 BLAKE2B 192e571d096d665a55c29da1dc35ba17c52d6f5b0c3f522c80b355bf881ffe269b27a62fe44761143966aaa5bede99800918999a313869c1a81dba98b710a1ad SHA512 e44c233e6bf407eac6a4eb6f7a72dc0118575b6dfe48a9d0afb95d99a847ad30f75b11e6d008238b7761965182df56e52ec183bb0905e054a638c76898368e6d DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip 156422 BLAKE2B 18071e2808ed442be205365d206d4f36042953663db3b219b4a54e90e723e42d753d465ba86614732495f0d3d06c6ae577cfc0ae8d0f715ad4a88c8bb340ec73 SHA512 dc554594229ea4caebdc7dfe34ddd5fc054ee59f8717a6afe2d32197ccf9b357a7f66c30d019c6d7b89685869e0e04c0dbcecbdaaf79e47c766c7573dad54d4d DIST github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod 40 BLAKE2B 77f35128903a84139dfc23055bf87c4fd8b4843953c764f0ec004a8a2b10599de19bd767a569080422179bd8ad66218d3639025cf1d83eb5cab22599b5da2c3a SHA512 76ce93f04caa8045ed49fccbbbfe76fc278bb7d94c973e408d0695e8c9c5e569b3dc9d4af8722f13c4718753aa72fea76a238dc8243aff34bbfd10d4b684e38a DIST github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip 12245 BLAKE2B a83d39eea2c911303550703d23c6c6be3e71c47c008d9bfc947303b5efe87f60983ba00a5fa3d28359959940ccf299a82971cc4cea9ab0bc28e7214db83398df SHA512 6b88063dd61b36a5bce08e49fa630d2a59d9e3617c9f9b5b747993cc66029209597e296dcdb38c126559226139bacb57dacf451bda3e50d6e85c7b4953e4dc80 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd -DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.zip 540021 BLAKE2B edeffa17022930bd4a779b44fdfbfac3b301ffa9853841ad8ec2f047a4276580d385867dabc3f965822d80ce75a777272cba283347db6856215c89ecebc2c176 SHA512 acc3212eb8404e04fd4016dcfbdeaf519e7ff7a0b1c651d3ba9ffb3dac0565f4195ebca66c0d9fe2a6439d8057699a743447fc78ed671dfb971f1e818e6abf3a -DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.5.mod 693 BLAKE2B b1f4b4893f87a8af176cac7c5f0ae327efba67b52ed075e52e019489e9ccc815eba4df5f60825d28cd2b8097914934109e3b4dd9758d07d2d0ca228768b9f49f SHA512 c2c27911a47cc4c95faad6ea770506670a2c8ebe0ea4a7b24897348da1756d6a28dbd0e518cd8d0eae4de3cdd4425c1c3c3262ff7ea8b9f0d45684e2b47ee5a5 -DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.5.zip 544544 BLAKE2B f39c5cfe3c5853827b276a9d685459384ea7908237d49762b3d55ed279d2fe44b67feff4be685b1c8254125f0e7fc91dac5d336fb3a144dce42656cec33b4763 SHA512 26c8a0cc981bb44e948dbba039aaee8a969d09512f0ec6b8078c0fb7e2229c3d7d60834745bf9c5e1dd5bb175684dc7c8d45b55af4d75d8088a1dc3897fdd67f DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.0.mod 637 BLAKE2B 66ea021f5ca48fabeff8d0fb0049fd5b90c044102bbb492120aa91630dd4fd37f315020ec6cae4559ea4ab45cf826ffd41448e8b21e1eb41ba1c8f145bb2696a SHA512 5afbf9a96e8fc302d4f4ce11482a54f6fe015e94579334d8a8f3e080b7fb84ea25f5a41248991f6f1f02edb23ac737c01c18580ec5b44b74c3c182a54f88f508 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.0.zip 548050 BLAKE2B 3c0d1ac113ab2219fad328e7935ef425bf4d5d824dc3ca530d5b39d55fcbe02bae261be2d100d43a3086129afa9094532c32d426ccb7d4fd3ae3a7667780aed2 SHA512 0dd3888646caabe9e65c4d7b0465fa42b76147405dda435f2bfbf688c2b8cdebf3c6e960108f2d0727a1f333b2fd4aae11d75511c56839757671c8033291cad0 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.2.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e @@ -352,18 +334,15 @@ DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip 131514 BLAKE2B 477f1ba8434036d96652435c432190539006ee38ccf606671cf319e356c6047c3913c6dffad6e4af13e023dbcb6ce93455797e37d3e5b9524b75ddbcbe0e906e SHA512 e64c91926d1e3688151b4f511f506fe4c2acd0a2ab839a43d12c77145e23215e7ce3ea281651f46bb945a07e04a1d2b6bccdfc3d862b3b7cce074e5817ac014e DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f -DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.zip 9872 BLAKE2B 50868f91729f65d64bbe9dca73ffccbcbb31df9bb30c383d104eae3174551ed24b6dd3048b5e1da16b754d618d4ac5d1ac1f455466e7a8a09f77dd7071b16ae1 SHA512 e3b41d60f9467ab7aaa2f2647deb572d95e5e6582dc15fabbf146d3004cc2e19aff6dc862d7cc33f6ab3d64f38d4f9457ad1e55dda3e176d84be1a9001325708 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9 -DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.zip 18981 BLAKE2B c940bf7f20236ef2b770dc683b5bd5525bc1413c86ae63dd328b2ab1aec7a319d5201733cc832b31185027e27739a6dcd5277d76856f1f95197b3b7797a23bf1 SHA512 9eba5f95e6c5d29b2928708ed91b1cd5a023f0b7053b5529095112a2190d097ba26be7f63b7719f7ee2ed29e698bfe7c4dfa0b33f60b4e475fd1d420453fe7e2 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip 3968 BLAKE2B 223cfe3604cb674a11d4558b8f5a35e2eb41cf11d536e2e2cbdccd6a3c6bed8abf66f450774b39e7247493ea8a382906617c5f297fda02a272b18eef8dcbcf47 SHA512 16c4bf83b78541d2d684113926813ce4cc91f3f13f34dc2cf8d643661dc9f21a988b8382d2c058e138fc87c1ca197e8f694b07595959e917c82bd6ca9101a5ec DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d -DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip 11505 BLAKE2B a0c7e576801c150d9eccd27e0a36304a931f9ed53da6e47f69882cf78cadb4e61096d2c748d1ae5bd5ebad26f5f4c2f37cb0b6e15de0a7b9aefb0aab86ce4134 SHA512 0dd52dadb4327839bd37391c19a9e008b2345f9a61356323ac79fa0abd54e23223d7e5568562f26d937ed05171a3b63fb273510867e612e2eb1cbc44ce0d8928 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb @@ -382,7 +361,6 @@ DIST github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip 333347 BLAKE2B 6aaa8e120b7 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976 -DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip 10606 BLAKE2B d9aed996970ecc4828716e86ddbc85a7949f60ceacc7326708ce499bfc09250bc8ee336806b229a44064839e7ce34f5cb2a7607da5e82c417a737ea869f97f03 SHA512 dd1763a8d04540b3e579d397fa4888c4bd8c00c3963cfcd1fe42af7c1990ef85f9a2e2fd5c5f2c7d3e6817448df5e2237241ff5a2cda651b061cc8932e0afdca DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip 12838 BLAKE2B 668586a4df02fa2d5db174a4ada1245a463946d4bccdef2599b791414af4f10eb07f56c61484977eeb21499db7f9b46f8fea03feebbaae5511504c13e3f7a64d SHA512 c3104e921a94b1a424cbf6936e8e5cdf5823947132f41190c211e050c9c8b7135c7b319eee0667a2b958c9f4fda27b9cbad4436d37b512e269716249dbfbef65 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5 @@ -392,23 +370,19 @@ DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503 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.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1 -DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.zip 7014 BLAKE2B 077be89b06969ca8149b1f3838940633896f1da465e21a189809ca1efda41755d33c5f52b3c6dab971726c2d8044b169950198c62f3223cc01ff813f6439bcb4 SHA512 bb4845cfecd934818a6352ee9d9311d795e0c6e7f8af97da4676b9e2085154bd0175599f745e3cc30ddf123cc807ce50ca02d82fdb665b2582edb842c001a8f7 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361 -DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.zip 205179 BLAKE2B fb8268a263b729fdeebf985c355c67aa1f3d2d9cfa21dc8268852df9788a2b27b06586be0d715e0d65211272b41117810e2441594bb1f74013cfcfd794baed18 SHA512 21644fd845a9e20e7b142e5671cc53cc39a0de3461b8374b6fb1719b44d464014041458e547e1621a765c3156742b0d5f2c6bd168f4ea49e9819af0d9f25ac79 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod 371 BLAKE2B 3ff3ff24a8fa567c715a8698c5a636f3eb2b1bf95263dc71a57d506a8fdf9e25cd741b8d0564ba95c04c696ba536ba44149da16572e13c1b5134c24dd0edddec SHA512 5a25ee9f24cf52fccb76de4ca0d1ee7bf309044e6700d48273bc1ceba948831320a51a7013584f60496df642284a4a282b2ed44e7d6290e96927927a220619d6 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip 214127 BLAKE2B 305af1bdb26a01095cb780a27be74f6a3d53c72b1af1b6388dc284290271c6a2cd39e06b6d8856d81584b35be6c2ff1ee38d79175502a9e2bab782f29cb855ae SHA512 2ac387028c1ffe54d5223a0325e2c36c827ad93e24c628ac353da6b4b97df9ccbb3f8d0440449d3b190f30ffcfd7fb865e3e030b882dcbdea116f20e3184fcf5 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4 -DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.zip 30028 BLAKE2B 2d6bd9a97203fa6b04ff50734a1f7da69641cc4fab3830aef9820c63f680182efebc9802ab33aa471c4701bce8ae571cb1ca13a8f48f820358b921ca19ef98ee SHA512 37d61427d0ff8e8b7f9183046aaaf829e5006abb3b0e3824c0dfab2c96f03dbecbaab9ea983a8835da953ec664cc6074097f13382edd4fb19ee7eeb21cff4668 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod 425 BLAKE2B 8e9c5ee0d4795def5f031ec58ce255227d2d17c80e0ebe028218e3022bb7c5b2cb831981a3247279a5405f36a061e7f0ec717f7d71ae96f33b56d20d0dbea520 SHA512 743b2f950677b8d24423a2491cfd67edcfb45d032e6995a743ebb1f3d6ec6f407f2e4d1d56b2bd14cbe4c519523ee83470f3e594f2da6e0b3fe7c2dfbad9c961 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip 30608 BLAKE2B 68db36e6420be62aa1594d415cc95da064c3f80e220891bc747ab61d1bada168fa8c33875bb8f5a1b3cbfcae6b9f48cc28fd792b884f7378b797f5f7445c268a SHA512 41d05b304a7325dbb01dc2704407f5a7c7f7c1255c58cfde66b1d9668b15e1b5e83b5159b25a6ad7d6fed90e64446b32c1633135a018bbb4357c495e3efc8a83 DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod 91 BLAKE2B 22854387f9c0bc85c6f4b7b9c5ce8a774c10c6be0c43ec6d188b6ff2f2e394ffdedcdd1bc0b8ba0e31fa3c418cc9339a78a798beeb355032a0724b284573c38a SHA512 8858ec62f3bcef65224ee7d66bbc16c080b2ed16609c46c5c6b6d983b9f7eef9e020a2ae78a16d0226c0f02c609ec5da92565861c02a81494cd6060dd56d005b DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip 11210 BLAKE2B a469026ecf6a1ee2f2d56091fd90f00857cf5e57164ead9e53c15af03d10a8b737a1d2b2fc336e3e972af014dacf8f1321ee1fa1cc9dab93790fb6d03ae195ed SHA512 30b1a531823403a911d9f877352218890bbea15d82390b4561ebaa4bab09f493d49181ea5c34078c18df31b1896165e80c4862b450ef5858ed8af55b2a0c42eb DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee -DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.zip 4039 BLAKE2B 7ddabda9d19c3468c1568dada882ea500a4bc8927bb780e8d714fccf9c77a4a33bf2d2108d3c7decc9330b6ca4e3fe12ae9e02aa3391b319e88086319893b398 SHA512 0ec6241bd37dff2b6c700be9eba99a39e5d5fd57933678647d56120d450c3619a2f51c9469a6caa4f48118e2d38b4c90091cd120f42d1067f99d649a39cf6cac 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-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b @@ -446,7 +420,6 @@ DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mo DIST github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod 41 BLAKE2B c0ae8bfbe1cba24ea72ee152799087e23fd36f61e7e75fe4e0f9ec1e45ceea6c29783a8927aa05dc630c5c75c2413aaad96d7592d397ea055794ca6419176b59 SHA512 30746c685ae63769ee178c2edffbe0a7bd8e9c9fe59c1eb7e04c16c00f282ee4d085e853b6aa6751b3ce53b9b8a10f8dfe5f7554c2873731469ea3faa92e9289 DIST github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip 26003 BLAKE2B 25263739206a1a1bc788c80db6f3e4c98b3d79b09666b7e74e0bfa8d270c25daf37096e715981d76db76c395ddfd7ab39fb523297d41fc3c2241744788ff38fa SHA512 7f7b5e08c4dafb1873cd55f838163afc65d3f945a7607d424595f4e0ed599b05fa2c7e29894c0e6abadd2c1e4c9a5c709e5e2d8206dca27d8c9f9e9ebbd65c16 DIST github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod 28 BLAKE2B d1f2187d0457fbf3087b388af0e41fa8c7a6c1d54c9f22fb631a144f42adf679bd372b5fc45f8d6f33d7e3cfbd57c1b7da2c4e969ae32185281390db58e9acbd SHA512 41e5c366b775318a4162bea00a6fa4e3d5a23c2ddb5c2707e4a4fb77c42855ce407429a7cf9c8e506bc79493ad5c56423c70dab081187ea6c94fbdaa0d5040d7 -DIST github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.zip 8493 BLAKE2B 0f00762e52e47e39e2c76907ef393dae846d9a49422e066c82ebba3e769ceab17df6fe1cb473ba490cb3b2c5c5aeb1616cfdb42b617c4685ee2066f7fe9612f8 SHA512 08341ab41505c3a098ec989ff43d8e460ec2b449b9a4cce6cb6240e33f8580f75071c2a7e7c8269f6cfa3fc2a5e33a3315af0fd2ae80bcc0901cc6ae9118804c DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba @@ -455,14 +428,12 @@ DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.zip 239560 BLAKE2B bbb8130df38c1ed DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.1.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624 -DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.1.zip 145979 BLAKE2B 344044eff97c443e90a322dd802afc033f42567db06bebc17abb582110e37ca065766b5bfa4aa3ec1fffd86089fb5ca78db4c7540556c4f50efb7b5081c3f77c SHA512 788e605225f70da535279c14183501b95c86cd92ef77d2f2c0c4dd2f03627f2ff4b9e2fedaa29e6eadd97027ae16edb65bccf866ccb75c6194b853863eefb4b5 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.zip 149648 BLAKE2B 4000934047e824770a1e083a8db85683f5ad7af35983705aa640e3a19290d3d2d902e1ced2515859efa7f6280b353452b29be533bb600420bd50509270cead6f SHA512 764fa02affbcd953435d97804094180ea5eac53d312721dc59d20b87d5e3ffaff4f50908db378e1df6b6d9e03fa4bb59d1fc1ae5d22a5ee69e92116d94137661 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8 DIST github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod 37 BLAKE2B ed6f4a483b165555bd8e0483e5ea03f2b46f9aaa60d0c0275877d1ca107561627e1c8b894bbc3d0054f3229e05f828f9aedf9de9ea8c58879dc2cf8543aee8c0 SHA512 73d11fe4f2a7a420d84b2a749f589bb586d9280ec3f4864825d4d2a557aa5f0e1c2a8acc2dc2661cb06425a35d9cd94d06617ca11aa0a92af786dd25f9911466 DIST github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip 44333 BLAKE2B 0c915c31d64606ea905b35d962953770fc868ed63c1408d7ce61d96165f3995371bd865defbfa120ceeb7cd0a394cf34364727229129b53f44d50a5208b675ef SHA512 915840cde63a7b85eba397ebd26cc4d61b65df9327ff1f190ac68fc1acd2c044e5dd3b5d0630322177df6d62a8120a1ffe8f7c45c7e66036b848e3af432ab95c DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802 -DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip 25325 BLAKE2B 5a4a2551f61bf5c4d0da0dc32ebdc22b9c8c8e52bd1f4e74a658c919ce8c685e8aa7d8a8eece85a8b4958a30459c7daf90424b7dc67c3460323c340aa2743e33 SHA512 da2634fbe6ebfafe3e70a9b6bdd1d9cbba051086a27f9b23eb49d04d2148c10b53b53f6b59161655e813bf7451d5663e8bd2a5b64476950435c3211a69e27b41 DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802 DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip 24373 BLAKE2B 48d3d48ea7431eba6946ec134f22d789b1e71d5ed5d421214f7c8b1803e0c44988375f1464206209a30cd20ab22da83d34ac27a3efeac55869ec24219fd835d0 SHA512 540d0f75e2fc27aeada7b736a896555732d8f4940462003fa574921d4479523ec1d7cf08697dae09a9bc1aba37b06557639ffdd8458c73346a114fa445dcc9e0 DIST github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod 37 BLAKE2B 0e37253242e439c5d26f3782ec2a3790b799c1014089101fe2a3b6996ce12b001495e11efdc1de203059231cc4d759445a43fc5e9617e56864082337383d0c41 SHA512 5a7842b9804240c1cbf50e2812f26821a0ccd68d5dbffdc3e761e0e60014dda69de842246c45569c7b09c8129bcdbcf9ddbff1071ae14b7be875a9351ed46f0a @@ -473,7 +444,6 @@ DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip 22487 BLAK DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.zip 3703141 BLAKE2B 0c8b5a768e298b8bdf314459aeb938a4a05dfa22bdee1b0a2d65e7b02edbf2be6b73ee51a331f4b1d14caef6bd9a001b11a72b85f5de3efcc044501fc2e0d3ce SHA512 b5352137315ec28c2f40f201629a4e60ac26a218a3c75666cf56959cff953fbb6153123413fd1518a1a636d10edac9022ba9f38065274b9f88a89e937283eefd DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0 -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip 14743 BLAKE2B c0c06d296c0583be2a6eb06359659b50941ea516bc768833bbfe252b73a2d81616dbe2d2db1991bd196b4a615b253c60046bbc6d56ca7268ded5b0ff40a4dc81 SHA512 2975fb8868fddaff560951be41194b82b631138d617705c3f6162acb76ace8697cc8ebc8f610ca1fb1a5167c6b6b0ecc87c150133a757447831463a0da18f392 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f4d756f0d92c911cd0fb8e00232db3bb013a0ef12addae0aea2388ce3adf79407a81e13cfe9cd4b45aeb2bc9f8b84b4e3c5dfa63b59d46a1 SHA512 f97471d54c5e73b3f59326847cdd4dbbb142a9ae790df83493f11a851d716fb407e01a857152812caf731b8f3e0f37ae151ee83300feaa73152173f6cb5b8515 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902 @@ -516,7 +486,6 @@ DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af. DIST github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod 29 BLAKE2B 2ea3c35fc2c4329d91f1e51488b118dad13de2b395a1485922f1522c0f510773109caa149ce2e1082e117fed475302995623c26bd1a24e700e445a6d71979b26 SHA512 ba2bf79bee3aaf1c22f0f53a12a30b7fd4a8f344f768ff6e4edc84c237ec8fd4aedbd1442f5a9e6d81d2bfafb6366e844067d4862eaadae49331a155bc7dbe13 DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7 -DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.zip 5643 BLAKE2B c6fff7979b6a647b76551dfb80f7e61f7b86cf2c1e70f58d6be6609af8197119dd562acb78a395d7e62cb22fc2c60c4c69a036da7cc30f6990a01900c71284f6 SHA512 ed6672528754c42370277b8ceb0f1a06e2b36cfed8526d077192d71c9412430f338612671a0a0c807dee15741f83ac6cf1225bb900194758b736466fd95d3cf7 DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7 DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip 4810 BLAKE2B e42236b0da77d785a299eb5ba0aebe74c6c4211f7a363bf1f654cb37551e1357cbc0798166641bf691f024b3b1b4328491d04db104a7c48fe3bf7e8adae06cd8 SHA512 094dc845fc470cbe5261646fd3a9eb313c5a41d456dd6e0522656d47f41622092e5f86776ac4855c1dd9b6f145178497c31a621dcad51e224d8294e6947449f1 DIST github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod 35 BLAKE2B 68028ffeebb96ddadff1a781e7f0d7267d9ee0255b2b00958d9e36b6870e27630f7cfb1f6a1c90d81fa6303465d50936c66567c4b562a8b2711d459ee4e093b4 SHA512 1cf1bb0f786ca726b882a958d719c3b762ac146c01b5f57fa246dabd3fc1462b47cb71f7fa0c6b146873113a609b5a94aee724d2d624fec9651947b78d39cf73 @@ -537,9 +506,7 @@ DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip 58627 BLAKE2B f4276f0095188324c06e4412303ac19e3006b18823985e26ca49b2de54ef58cade626b3d2439f5f2a29c47618420b890951f94e5a4801dbaad4c3294f6555a4e SHA512 3bf6be07dd9a97bde938309857e16dc425587c100e35b2acd1a6f11a9ac196238b0844abbaded43fcc01be0664efa15b64f159f6259322043e3046e7d361dc20 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180820201707-7c9eb446e3cf.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d -DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180820201707-7c9eb446e3cf.zip 80812 BLAKE2B 49073e9a5e8a22c2e024dd44efbe4f413615da649bc0569ea39dba815224d80d04443177afcae0f998a234054d5fe38b24ab9349f99ade95c5e3ced0b707ca60 SHA512 e2fb60ac45ebd94068e3520f43980fbcfe0130a7b4732eed85ba0056da15de24e0bc6fd07ed1a644d06545dfb2389c223fd9da4c5abe239d2f546616d9e237c2 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod 41 BLAKE2B aeccb766735cab34f6559537127886e3227273ec40f78cb289b852430e5cb967e2b3b8a798dd20ab0d1c8481c62d25976a76831092bc114cc6c04214ce7ab081 SHA512 8ce1457d8f4e3cd2d997306844a157198039ae5feb9132f22d5768c1de32800469f682d33a8c3c455f7728332136f376858c23bf00da180a53f9d32d4e4ef291 -DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.zip 1526595 BLAKE2B 3742d9543c9149072eabfe65841df7b9f684c9eb57c12036d62eb085811e18bddf17cb22a16986c44bfdf14e0ecc0796d423fb3b753ea1433c93ac0bd7f684b6 SHA512 a8ed78675612f30aca890d42154fd6d6f530a991069dcc048e66244bdb4c4345e31a60c4ecfebcd36b5756df7ad4694222d58397a21d704ed5629deac7d24eae DIST github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod 41 BLAKE2B 5d4d27e0f2c2a03d5ea5a22e208ac33d9a4eba122ac4ca95618d2c3681e63540907800a6e6e28bab54c720e88a4454440a23c0911e1c86855f67b67128f5e011 SHA512 a887a2c822f38592ebd66fdcb2c13a3c2f3a7c3de53eba3c0cff66106dd287332c2d0287ffa4c1b386f1fc008047152e79820bd56d64864a7941d10a91bb4019 DIST github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip 711899 BLAKE2B 59e7ab12479e515512a2d7a9f20cdbe0b490f6bff444d0856d4d3432698762ef0537933461c88de17a3a844702e5b63cbad7493ac9f58af30f968b008b38ed35 SHA512 906a0e32262d50a20ff827163fa91ebad2b4a1af3ae90625532630fe66c6ddfefc6dfefb2a399be3f511db8da305280e65d6d0cc901483ca1448724150d20964 DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32 @@ -559,20 +526,16 @@ DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd9 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod 986 BLAKE2B 4f2c5d920b08d5802df635316a6ca72ab3346dcd2b0ec76bc9657c265eebc68ef7c8036c1993595bcdb416ea9ef0e7ea338162a7c6854c98db3a16b035c310ca SHA512 2195ba8e28e21deb5d4f78a9319e568ea5e81fb7a257292ec12d0aeaba84d1898e8d0cb51355f87d7093c3c0501cfa1f93f2e520e40edc4995260d7977fe306f DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod 2018 BLAKE2B 516407d1afeaeb665c558a4babcaa35aff28dd9b41298d04b904378159f1978a924323195e4c160cb9cb992c264558c7ae4f07ec157dd8c65fb98853a3cdc53f SHA512 fda6d22c26332038895ea2f2c62458baebededb0df883728dc9a127c10102b9bfd3e8128dfee194d909d645ea652f3ccd5ef737a8cb7ceadab71864b21de117b DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5 -DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.zip 34637 BLAKE2B 9e26766ed5717903173455e60ee1b690779e286b6be3cc22f633ccf26592839d149f813a1b92775ab2a447f0c1a20960f956fe5aa4a7c56abc6642b58b7973e3 SHA512 968b76a138261cfee0d1f58ede483741328968e24d073b24affdc7ab9cbf9bb76dd9fa1785423c49471c02ea4804810ebe673bc623c4f72389b2654a64a565e1 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip 37190 BLAKE2B 7c8b79cb736f53337fdd2878cd1d745a6da3d803c3d3f6a0ed53a86f1d4789d2c656c6e7a17f90caed496fac91fdc89fa66b1de7b2caf97409114aa59658efa3 SHA512 b2af82dccd20e9539d72c8629f2d4babd573f711a810fa77e629fec897a614776cc4ff857700c0b6eb32370a13d122504c0a4abdd3d9111eb8ac0938a0e7234f DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip 81710 BLAKE2B 245149718759e71d8c882731fb51813924beee131aa16c9d6ea83a72738721011bceee80411d88dedf91653219d3c8ae33f66349e2d373b08931c28aa2e16d8d SHA512 b2cb918d623065d391a318f4f5c532aec12635662d176a441c30cbe3b042b60be848c7eb685679c5258e661f5780ebc3db3f9dbbb8a37e157da214b4f57fde88 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod 51 BLAKE2B 08863dd989e6100eeb94aea780331caed21f93fa1ccc6dcb4c77050afe0b8ede362f40e0a8271668e2ca0e328a3594dfb6481640ff3d5f1d1ad3e6b4e7747e11 SHA512 dcbae023694dbb97fa3e1cd6bc20ab7eee364117c45a45912e6d782744a54e0b2292936cce6e807af0dff179a495993e19ff86360b27d3a79c90a1f81b6e22b6 DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip 1101286 BLAKE2B fedec4637e5f7bdc4edcc0cbbf3aa451125c95f932d81316351554bbce5b45b68ad359936afbc5d46d602e5cab4a7534fc8a80216a713ee8b364e000ceef8d65 SHA512 6d848faf0c554bd0a1818108b58f15dac2ea8378f5dae46bc1943e48319f9dbc87e2ba2efcfbd45b5c74e3f70ee8702c28b521e3fb2442b52c949bbabdf85d84 DIST github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod 36 BLAKE2B 5eebb18ea03bc58198d1b18c741aef83b26e69166ad294d9fd109990b528bf96e38ac47e03ad7dc2bf74f763ac292bee5745f8e12e087330225363be9c528bfe SHA512 15a75be7ae2d3696bc36a1bc1f4f26628d9b0af57fe5845df5ac329690be5d0f60ee88ddc43cde47bdbec74afe8d0e3b9a6ed531be640ef8bced3b3cea85f4fc -DIST github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.zip 4676 BLAKE2B 62db12d8619bf2c5509f4fadb7cc01b9d46addb002da723fb0ee6e50886b7713a5de46166dfd0e781eabc9db0db09bfae59b35c73f98261743e47d18359e96bd SHA512 66c654f334e4a83be21f1e90f70c1bad40406db38a63a144a602bae2331ebc5eb7f5249ee9a95da72a0ba9783461f1a185ba9665a5d19c6660e65f1fb6324d6d DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b DIST github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod 32 BLAKE2B c5bd918ed79f8ad33509bee3028b85da9941f721e12735da810f7cf4238ddf83d3c5b7634c01944ebbe9d0c77fea36d5480d945d2dad9d9126cdb5ceb1cc1d11 SHA512 4168487b908d7fbec0813e5ac4d1cc854216d2355fd2843c2856ce81ee7bc399d9fc2b0811b5fbf1f0f1f26e92d327aab3d54b30809ffed621aff37a706e3417 DIST github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip 3224 BLAKE2B 408f2daf471af61b729a0dc22ae744fc338c93b375bdedcd76dbc0a27d1c01693c414d3e1e968289177fe1e0a0437fd2ede5177e9582bfce726eb7b63d25f9a4 SHA512 73e006b0818fff13479165491eac667deca291b656e4e4d4b834eca553f40844d4b3ddd943848882a1995752344c0be3c41ed8ccea373bb895df8630c1bb99f7 @@ -591,13 +554,11 @@ DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.zip 1762275 BLAKE2B 5025486c3ccef3c6967216f6ee8dac5416f37ce22c5f8b3236038100766b768278c5beb2f1483d89111f24c81061fd79231bf8b26cb0170bb340eb77f001af6b SHA512 8605ec4abfddbc56652ad2106863f5e316708f5bd055cc28ff557029377b4f9df98215a1fa8c8832b7bc7f959d89d212b663e7f6dec725aa680dc38813f7fe8c DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod 146 BLAKE2B be8899d39fa75a36aa5a09db22d890466433efdd5310fbe61e7672f3c008a9aa34d038f844ca92450e9b8dde8c7d4d3649984f5edcb02abc34c71f46ce584c76 SHA512 173aab1e733ef5c18c3d259720c9fd7e46681d525ec934b4dc29a56beb91a362216768c28b50891b6230be003bb8e38636974e941d4fe6270a016798675fddea -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.zip 1825975 BLAKE2B 8524a8f4a8a97083e7f3e680b5882b417f8f13fe989361e25f785cca9c7e26214f643b47e10f3827eab878c783aa588864ef58972d34db1a8a788726cbb19844 SHA512 cd4dc434a7db8bec5cc82fcfcf19c7d2ef46314cdc38d471069a03e5bf24988f159fa1bd2487b02bc95ee1d5358035f20dc663b7d5ad814e7c9bb468307ff20d DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.zip 1845086 BLAKE2B 967aa93280eeac0b9ce3e269d135ee547cbcf007d6411e94eb8b7a6b32dbec501fef102f908e977c670e57c60672b0fc91ea16d17d106cc526d91ddf4427897e SHA512 86b0caeffaa24b588f4439370b3b5b2bb087c9a76e409dfdef278d42a2f21d57aa8ee019353b75178f72441339eb796cacaec5706f9bc73e820743137ab531b8 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06 @@ -614,10 +575,8 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.zip 1332193 BLAKE2B ea35c1c08cc3ee88c3391a518cb47377b3c78aae434c34c5ca8bd706f760118760009146329daf136ed026ed1c18f5b36def3c97dc25b1fde4fc1941766bc3c8 SHA512 8154db7b3e750eebd3708c05feeff86210ffe96f83044ea161c23eed8a794863579f7bedc70bf4b961ff8db92c17678b5ff47a37e53e1633435d41ba966b9c33 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.zip 1322810 BLAKE2B 5457e6fe2004a8b694d792518f1f707c69ce44d005d7c2f6623a0fd36eb099a683022677d6042861a891e421a594212c979adddb56bee840bea15cac9c8de5e5 SHA512 2b34a5da99f3d41b13a7a8414d5948aa15b584beb1ff3e650fa99ec53f23b17b914778b0523b19f8e06623d9c8240441334c5e4026435a9201b8bcc9b46e29a4 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a @@ -625,10 +584,8 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAK DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.zip 1413845 BLAKE2B 4e290566f02fa53f1eb78cef295a9d53e012fd29b43387366b10b7bc06e35d65c98ffc37bdf7f8b30445a872b1a924b3993069f4c9f43c4027d74a8b26fb316c SHA512 2723a1c2fba3427eb42957bd57c62c3bde7cb3a08db4f075816e5c72ecf237bcfcfe91dd5f75aa985a61a24017689a8b7672da00d741e9eef164184623b87ee1 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-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip 1421786 BLAKE2B 15782d84b4fd3576df5ae0c6540880b3a87f5ed47d66527ad88bbdd5e96cd1b0fb321b896b686de67d4518d3c6eecd008f1e49f48fa29df962a4d01f6e08653f SHA512 e79353b8f6b6866a14236eed278aae32ccb02eed040a557dda219cd96eecdc0174a8ac29a5509a33f6f0f9e5aa16f7d1c6861167d9798a5cb1eb01aabcee56f2 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip 1423356 BLAKE2B 412d4c362e9d11899790082861e26002ed0fe500b4d5d0b9caa1a00ee9363337d1e47cdc6a232d858d00ff10da2b581c000d20208539098a8fe1f83d012fb00e SHA512 dbd74ce99432faf080dc0980624adfea31cd74d53949a4b747e14d6464632c48e78c40a1b862305bb5650cfb1b202f2c024f44f9ffdcc104555e9f42b4eae30f DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 @@ -651,7 +608,6 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.zip 1435633 BLAKE2B d1eac5dcb4b5717d6b87984e51d9a11c9fe763b0af44b75ce706f5ae7bb9f733266768a51e874ee5f52c151f126f2c16e1c14fb2e3f7fd859a263d85b6b8acfe SHA512 ffaa302839b9a3e09f1711a5988d06f04d609b8f106c0ae13a301b4b5a26fc19cba9eac170b8df0bba3e2ec9733acff4761cc2a050238ac0138ab3ec6ff31769 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c @@ -665,14 +621,11 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190508220229-2d0786266e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190508220229-2d0786266e9c.zip 1774647 BLAKE2B e38b255b8dd6781e119b13e0dac4a05c8a6a85433b1eace5185e86f8b51514db6ad0512f452a772edf2991592288d7f971faab7173a12da1c9c4f9ac27d13977 SHA512 acfaa929567511eacb7f0111edfac5c9e5ffaef3274cba7268ef325d355b0e2a68d31e20378a02ac1710676a9621495fca406be2cbdd39f0c40bbea906d5f412 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.zip 1778829 BLAKE2B 75462ad792956b08df688432b8f3ddbd8e33cf585eb806513ddd45a25ab4fd86b232f2bc5438ceedccc5212a19f91d0d8640532d2b7607da6deb83b10322e48b SHA512 28d0af738f9e071f8bbb58c6fcc685888a608e2597cf0fc61e847e9fff82c009dea33ae9cb672ab7a0dc346f5ab3a09ff79afef454c3cfb057e45fc7579ca17a DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.zip 1846026 BLAKE2B 4e3ef68bf7e75a37f819024dba92027ac85109b3087282bd03db1c0a234d4ada2f9aa8f02d611fe96b015bf2fd7cb7ed9d8354a0abeddcf89c0905ed20d6bebf SHA512 558185afea455dd7e96423174af16a6df90b528189065d2ea9929cb20fc9268324c4eb347b23b97dbb48c6ae72c4cdba88327bcf7a96a838815a5b945467c762 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab @@ -682,13 +635,11 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip 1918660 BLAKE2B 015e9ad74f145cdd7cdeb55d7b2d8949d6e7baedaae36089fa53cb257b4fb49830aeb299ea3a1f782b2f033443a18d009cafcf0211d1709d4d37b4b97d5f3d08 SHA512 24a653028d079c52ba8128d9f43452d2ecabd374c8eba36d44704c3f70cac50761597c7b7bb6524ba50fcde696fbcded57c29f04f35e42c62e23a9790852bb56 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d 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.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 -DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.zip 12802 BLAKE2B bd71752bbf787376638a3eb8369fb3f3ac4efdc057cf3ecc9f02318186011af009c17c0a7a3b9183b1bb6a88aad15128dc64835821c90d9bc2adabf6cb6ddde6 SHA512 2e23c18588f6f5cb58a6edc02b23ba1abfef92ec0d46c272b3f542354f8ffba45b14c3a328372dc46bd8118a255d3f3d9aed303a8a91ababd6ed296cba2aadc6 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip 11671 BLAKE2B 0a73cd55380594ca4bac71bee0207b51979e62407ec3c828f975e8091a20e2b9a6cc331dea88cf0ff44ff3a6c7d1cfd2844651acd1d957c0d725de525a58985f SHA512 ccd129fd4ce8e4067d0ad4b164cd8c4fb7ba65d5022bb656dfdb50dd2d467152bb83760f3d94c465b6d4c29c29931c8be6c697e1634ccbab4eb3a53edca7dc4a @@ -710,14 +661,12 @@ DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041 DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.zip 12958909 BLAKE2B 9ffceb4fe3e735aac577decb8f9db46c431c76a121c9ff946d19ad36081c67119c3f35e7c0825b761f206edd906eb95cd33f83ac3af24aa1c08e46d58b276b87 SHA512 00e929de2fc5da89f64d434ac2a4ca0252f7ef24926dc0c8c43bdbc84348522801b98346739b387c0b17c88bdb822875301b32a5007b8ecd54a443e0c4ec3057 DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.zip 391093 BLAKE2B 7e103e9c4be5d953371d0ea553272b8edd9fb180a32708f44b5f97b232498686ab311980d3a01bca53773d8c312307197819223c748adb5b027eeefe60b60efd SHA512 0c4f225732f14c6d205a572b8e289aefa480286a0fe5fa2c6e75e4aaf7443f42fb21866b11e227619cde683c0ca7835adef792178724b25ba9ab035efbe1bb67 DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475 DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip 408151 BLAKE2B 9f815084675da034d639cf3e8648ee5dd2d1282d2bb6937ffc91956b5cfa46809499441a39636e4f0565c4307854977201ecc8cfaf38b46557c3e715cef0722e SHA512 1eeb760cf1057c306f2301ef4c7065cdd6dc18cdeefefd3a1cc8cc22efa312ee5ba7da6b79a4e7666bc09429d1ca73d7bc1db574f9cd33d271a72700a070a219 DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475 DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475 DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip 417366 BLAKE2B 71895742e5a6ad69c7b0db979f725e0171b6df432633912dfda6f367510b0b4d5a2b41d94c7a8eecdbb4de90d2e92818d7f6dc1ba99e41ba54184d39134513b9 SHA512 263419180987380202def791006a59739446ed956bef6314ea378cb6da54079967ddcecf031080295e66755b7312f76795b0f74b876e4928700b877fe1e1e9de DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.zip 2541816 BLAKE2B d23e165336ee73dcb15c5a5d9632a4594b8853421601d497c29a8c16a69c558b6e7fb8a478e15e9808b9bb9f138501a8d82f6f6329e486a24481e337f883fc14 SHA512 eda9b82bbe85d100e1ff545b838fae621b68848c9293e0d3caa8bd2a183bcfb5dce072a1ac721468cffc264e5f9dc38797e4d98c23f85f905ee95b3587c6d867 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.zip 6533885 BLAKE2B 194748b0fc9279db95843c40fb88495765086b0aa42472c3952ca9b58e1c5ec1b90654e63ecd308a474d8afb846c9fc233a7f298b7c53efc5e48453409878e80 SHA512 676aa55eade0c609837f446ca93b9b823cb0943ccfff344808f7a2b2e4a0d7c8d34674d7b218d6a5fde6d98be5d8ca4a3f6e4476c69c2e9df3a22c8c662a1414 @@ -729,7 +678,6 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.zip DIST google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.1.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.1.zip 856324 BLAKE2B 5c563f29ab050b21a5a388b94f8b567311e2ac8b2fa6dc5ba227d5348a622369d6f95ba91856a9c82c91e1d41835e33db241408ed98a85cc9b2aef5e141a7d37 SHA512 d133c16fa7fe72d1b349fddd2c7562ca5c5fb77d8b28795305690e7b9668c98a50306808bd73e9d4f7511009634128155bfdc0bf8db7efd05929e61a5b784d18 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2 @@ -739,9 +687,7 @@ DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod 36 BLAKE2B 33002a8288351 DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip 8866 BLAKE2B 279099b17d2f9a46f3b5e2db1e9855fb352eb840cad4c70e67b4612a6305a83d7926ed28396f0e84e27b56778b15f262ec497a835f7e2327ec82d1ec9388c69d SHA512 1649454679bdb5427e34f9ed83952cc509369ca04ee3776beff20096589bbe4d24bd6f6121c816ad4b9563da6fb0c0e4ddc873196160b42da6c07a204b21d43c DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015 DIST gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod 28 BLAKE2B 0fbbe5d1e239fce8fc245a0a54a09a57ba1a669a6ed93aabefe8fd333549b3309ad9e6eb15cff2f0a853d3830e6b5cd60961835b14e2dd13aad5812cca6ee04c SHA512 00151108bdaa29a2097ab78c99c93bf0ec27af203696a11bc7ba55e36d7115ad13279110c245bd3a2cc84b63bb2a8840964e3b2e1334a0d085ac1e8ec5239bad -DIST gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip 29965 BLAKE2B 43a72ac189d5bb6a581938910c317ec96c39c3c32695d844c1a9cd83243a567505d388f045e6c514d077e27857a6e206d628851454eef97ec14b52ccfc2a5da3 SHA512 4624295283c43a64b2413e25c3ca5a91c798d2b2cd7e60313b92c58d048404b12052dca119f6906e1fa0419bafd2e02c160b486856e2e88f75bfb2d08fd662f3 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%2Fv0.0.0-20161208181325-20d25e280405.zip 39844 BLAKE2B b3dab69dbd1ebb999938c12595de7007dce9431cfeaeb5e77aba80c49918d1a4edf7fb95279e9b66686cb45deaf57a011c083e55fb66ec2c614582ba323954da SHA512 97c96a92ec86372c2f06141c30bceaa86ed62c1db34696f9542f43f3411cb0a37dea654de923a5ee054e603198179b9048e3b477da140e4092ffadc4525b9241 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-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d @@ -761,9 +707,7 @@ DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE2B 56a68e317ccf9e6b0912331e7006742c3bfffd087742293b3d48ca7069c707db57b3722179c76b8c724303c8d58ac9ebf847c4277ed38a59e1510c676ebc941c SHA512 658ebdf931b23afe9d9d5d33d6c910fba7cf37740efe7052ba7627199c1a5fa4f93f093796674e341109430ba1f1b5ea933ea4a32356f63eaf337f05a562004a DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.zip 77767 BLAKE2B d77644df22edfcda7d99d4a4a23a1fd1154fa21489dc36b9a8f9ffc45e341d8d793faae76d4d3d32290766c7b13cea30d17efaa7e8e74786ead90b0605f70967 SHA512 bc935858e1d5c341c7d53c41bdf6f856976a469c8f54f017e41e8be742064ce9980cc6881353e022f854d6e19096a37f5ff62bf7b01019b0425a0c03dc6fe14a 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.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce diff --git a/app-admin/consul/consul-1.7.2.ebuild b/app-admin/consul/consul-1.7.2.ebuild deleted file mode 100644 index 52f7b83a48ed..000000000000 --- a/app-admin/consul/consul-1.7.2.ebuild +++ /dev/null @@ -1,553 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit go-module systemd -GIT_COMMIT=9ea1a204d - -DESCRIPTION="A tool for service discovery, monitoring and configuration" -HOMEPAGE="https://www.consul.io" - -# Upstream doesn't use "-mod=vendor" in their build system, and the -# vendor directory is incomplete. -# On the next bump, remove this if they have added "-mod=vendor" -EGO_SUM=( - "cloud.google.com/go v0.26.0" - "cloud.google.com/go v0.26.0/go.mod" - "github.com/Azure/azure-sdk-for-go v16.0.0+incompatible" - "github.com/Azure/azure-sdk-for-go v16.0.0+incompatible/go.mod" - "github.com/Azure/go-autorest v10.7.0+incompatible/go.mod" - "github.com/Azure/go-autorest v10.15.3+incompatible" - "github.com/Azure/go-autorest v10.15.3+incompatible/go.mod" - "github.com/BurntSushi/toml v0.3.1/go.mod" - "github.com/DataDog/datadog-go v2.2.0+incompatible" - "github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod" - "github.com/Microsoft/go-winio v0.4.3" - "github.com/Microsoft/go-winio v0.4.3/go.mod" - "github.com/NYTimes/gziphandler v1.0.1" - "github.com/NYTimes/gziphandler v1.0.1/go.mod" - "github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6" - "github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod" - "github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af" - "github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod" - "github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e" - "github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod" - "github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da" - "github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod" - "github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878" - "github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod" - "github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310" - "github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod" - "github.com/armon/go-radix v1.0.0" - "github.com/armon/go-radix v1.0.0/go.mod" - "github.com/aws/aws-sdk-go v1.25.41" - "github.com/aws/aws-sdk-go v1.25.41/go.mod" - "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973" - "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod" - "github.com/bgentry/speakeasy v0.1.0" - "github.com/bgentry/speakeasy v0.1.0/go.mod" - "github.com/boltdb/bolt v1.3.1" - "github.com/boltdb/bolt v1.3.1/go.mod" - "github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible" - "github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod" - "github.com/circonus-labs/circonusllhist v0.1.3" - "github.com/circonus-labs/circonusllhist v0.1.3/go.mod" - "github.com/client9/misspell v0.3.4/go.mod" - "github.com/coredns/coredns v1.1.2" - "github.com/coredns/coredns v1.1.2/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/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661" - "github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod" - "github.com/dgrijalva/jwt-go v3.2.0+incompatible" - "github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod" - "github.com/digitalocean/godo v1.1.1" - "github.com/digitalocean/godo v1.1.1/go.mod" - "github.com/digitalocean/godo v1.10.0" - "github.com/digitalocean/godo v1.10.0/go.mod" - "github.com/dimchansky/utfbom v1.1.0" - "github.com/dimchansky/utfbom v1.1.0/go.mod" - "github.com/dnaeon/go-vcr v1.0.1" - "github.com/dnaeon/go-vcr v1.0.1/go.mod" - "github.com/docker/go-connections v0.3.0" - "github.com/docker/go-connections v0.3.0/go.mod" - "github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0" - "github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod" - "github.com/envoyproxy/go-control-plane v0.8.0" - "github.com/envoyproxy/go-control-plane v0.8.0/go.mod" - "github.com/envoyproxy/protoc-gen-validate v0.0.14" - "github.com/envoyproxy/protoc-gen-validate v0.0.14/go.mod" - "github.com/fatih/color v1.7.0" - "github.com/fatih/color v1.7.0/go.mod" - "github.com/fatih/color v1.9.0" - "github.com/fatih/color v1.9.0/go.mod" - "github.com/fatih/structs v1.1.0/go.mod" - "github.com/fsnotify/fsnotify v1.4.7" - "github.com/fsnotify/fsnotify v1.4.7/go.mod" - "github.com/ghodss/yaml v1.0.0" - "github.com/ghodss/yaml v1.0.0/go.mod" - "github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod" - "github.com/go-ldap/ldap v3.0.2+incompatible" - "github.com/go-ldap/ldap v3.0.2+incompatible/go.mod" - "github.com/go-ole/go-ole v1.2.1" - "github.com/go-ole/go-ole v1.2.1/go.mod" - "github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod" - "github.com/go-test/deep v1.0.2" - "github.com/go-test/deep v1.0.2/go.mod" - "github.com/gogo/googleapis v1.1.0" - "github.com/gogo/googleapis v1.1.0/go.mod" - "github.com/gogo/protobuf v1.1.1" - "github.com/gogo/protobuf v1.1.1/go.mod" - "github.com/gogo/protobuf v1.2.1" - "github.com/gogo/protobuf v1.2.1/go.mod" - "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b" - "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod" - "github.com/golang/mock v1.1.1" - "github.com/golang/mock v1.1.1/go.mod" - "github.com/golang/protobuf v1.2.0" - "github.com/golang/protobuf v1.2.0/go.mod" - "github.com/golang/protobuf v1.3.1" - "github.com/golang/protobuf v1.3.1/go.mod" - "github.com/golang/snappy v0.0.1" - "github.com/golang/snappy v0.0.1/go.mod" - "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c" - "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod" - "github.com/google/go-cmp v0.2.0" - "github.com/google/go-cmp v0.2.0/go.mod" - "github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135" - "github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod" - "github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf" - "github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod" - "github.com/googleapis/gnostic v0.2.0" - "github.com/googleapis/gnostic v0.2.0/go.mod" - "github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca" - "github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca/go.mod" - "github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c" - "github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod" - "github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7" - "github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod" - "github.com/hashicorp/errwrap v1.0.0" - "github.com/hashicorp/errwrap v1.0.0/go.mod" - "github.com/hashicorp/go-bexpr v0.1.2" - "github.com/hashicorp/go-bexpr v0.1.2/go.mod" - "github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de" - "github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/go.mod" - "github.com/hashicorp/go-cleanhttp v0.5.0/go.mod" - "github.com/hashicorp/go-cleanhttp v0.5.1" - "github.com/hashicorp/go-cleanhttp v0.5.1/go.mod" - "github.com/hashicorp/go-connlimit v0.2.0" - "github.com/hashicorp/go-connlimit v0.2.0/go.mod" - "github.com/hashicorp/go-discover v0.0.0-20191202160150-7ec2cfbda7a2" - "github.com/hashicorp/go-discover v0.0.0-20191202160150-7ec2cfbda7a2/go.mod" - "github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod" - "github.com/hashicorp/go-hclog v0.8.0/go.mod" - "github.com/hashicorp/go-hclog v0.9.1" - "github.com/hashicorp/go-hclog v0.9.1/go.mod" - "github.com/hashicorp/go-hclog v0.12.0" - "github.com/hashicorp/go-hclog v0.12.0/go.mod" - "github.com/hashicorp/go-immutable-radix v1.0.0" - "github.com/hashicorp/go-immutable-radix v1.0.0/go.mod" - "github.com/hashicorp/go-immutable-radix v1.1.0" - "github.com/hashicorp/go-immutable-radix v1.1.0/go.mod" - "github.com/hashicorp/go-memdb v1.0.3" - "github.com/hashicorp/go-memdb v1.0.3/go.mod" - "github.com/hashicorp/go-msgpack v0.5.3/go.mod" - "github.com/hashicorp/go-msgpack v0.5.5" - "github.com/hashicorp/go-msgpack v0.5.5/go.mod" - "github.com/hashicorp/go-multierror v1.0.0" - "github.com/hashicorp/go-multierror v1.0.0/go.mod" - "github.com/hashicorp/go-plugin v1.0.1" - "github.com/hashicorp/go-plugin v1.0.1/go.mod" - "github.com/hashicorp/go-raftchunking v0.6.1" - "github.com/hashicorp/go-raftchunking v0.6.1/go.mod" - "github.com/hashicorp/go-retryablehttp v0.5.3" - "github.com/hashicorp/go-retryablehttp v0.5.3/go.mod" - "github.com/hashicorp/go-retryablehttp v0.5.4" - "github.com/hashicorp/go-retryablehttp v0.5.4/go.mod" - "github.com/hashicorp/go-rootcerts v1.0.1" - "github.com/hashicorp/go-rootcerts v1.0.1/go.mod" - "github.com/hashicorp/go-rootcerts v1.0.2" - "github.com/hashicorp/go-rootcerts v1.0.2/go.mod" - "github.com/hashicorp/go-sockaddr v1.0.0" - "github.com/hashicorp/go-sockaddr v1.0.0/go.mod" - "github.com/hashicorp/go-sockaddr v1.0.2" - "github.com/hashicorp/go-sockaddr v1.0.2/go.mod" - "github.com/hashicorp/go-syslog v1.0.0" - "github.com/hashicorp/go-syslog v1.0.0/go.mod" - "github.com/hashicorp/go-uuid v1.0.0" - "github.com/hashicorp/go-uuid v1.0.0/go.mod" - "github.com/hashicorp/go-uuid v1.0.1" - "github.com/hashicorp/go-uuid v1.0.1/go.mod" - "github.com/hashicorp/go-version v1.1.0" - "github.com/hashicorp/go-version v1.1.0/go.mod" - "github.com/hashicorp/go.net v0.0.1" - "github.com/hashicorp/go.net v0.0.1/go.mod" - "github.com/hashicorp/golang-lru v0.5.0" - "github.com/hashicorp/golang-lru v0.5.0/go.mod" - "github.com/hashicorp/golang-lru v0.5.1" - "github.com/hashicorp/golang-lru v0.5.1/go.mod" - "github.com/hashicorp/hcl v1.0.0" - "github.com/hashicorp/hcl v1.0.0/go.mod" - "github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5" - "github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod" - "github.com/hashicorp/logutils v1.0.0" - "github.com/hashicorp/logutils v1.0.0/go.mod" - "github.com/hashicorp/mdns v1.0.0" - "github.com/hashicorp/mdns v1.0.0/go.mod" - "github.com/hashicorp/mdns v1.0.1" - "github.com/hashicorp/mdns v1.0.1/go.mod" - "github.com/hashicorp/memberlist v0.1.3" - "github.com/hashicorp/memberlist v0.1.3/go.mod" - "github.com/hashicorp/memberlist v0.1.6" - "github.com/hashicorp/memberlist v0.1.6/go.mod" - "github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69" - "github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod" - "github.com/hashicorp/raft v1.1.1" - "github.com/hashicorp/raft v1.1.1/go.mod" - "github.com/hashicorp/raft v1.1.2" - "github.com/hashicorp/raft v1.1.2/go.mod" - "github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea" - "github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod" - "github.com/hashicorp/serf v0.8.2" - "github.com/hashicorp/serf v0.8.2/go.mod" - "github.com/hashicorp/serf v0.8.5" - "github.com/hashicorp/serf v0.8.5/go.mod" - "github.com/hashicorp/vault/api v1.0.4" - "github.com/hashicorp/vault/api v1.0.4/go.mod" - "github.com/hashicorp/vault/sdk v0.1.13" - "github.com/hashicorp/vault/sdk v0.1.13/go.mod" - "github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443" - "github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod" - "github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod" - "github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d" - "github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod" - "github.com/hpcloud/tail v1.0.0" - "github.com/hpcloud/tail v1.0.0/go.mod" - "github.com/imdario/mergo v0.3.6" - "github.com/imdario/mergo v0.3.6/go.mod" - "github.com/istio/gogo-genproto v0.0.0-20190124151557-6d926a6e6feb/go.mod" - "github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da" - "github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod" - "github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af" - "github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod" - "github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62" - "github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod" - "github.com/json-iterator/go v1.1.5" - "github.com/json-iterator/go v1.1.5/go.mod" - "github.com/jtolds/gls v4.2.1+incompatible" - "github.com/jtolds/gls v4.2.1+incompatible/go.mod" - "github.com/kisielk/errcheck v1.1.0/go.mod" - "github.com/kisielk/gotool v1.0.0" - "github.com/kisielk/gotool v1.0.0/go.mod" - "github.com/kr/pretty v0.1.0" - "github.com/kr/pretty v0.1.0/go.mod" - "github.com/kr/pretty v0.2.0" - "github.com/kr/pretty v0.2.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/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod" - "github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod" - "github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod" - "github.com/likexian/gokit v0.20.16/go.mod" - "github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod" - "github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod" - "github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod" - "github.com/linode/linodego v0.7.1" - "github.com/linode/linodego v0.7.1/go.mod" - "github.com/mattn/go-colorable v0.0.9" - "github.com/mattn/go-colorable v0.0.9/go.mod" - "github.com/mattn/go-colorable v0.1.4" - "github.com/mattn/go-colorable v0.1.4/go.mod" - "github.com/mattn/go-isatty v0.0.3" - "github.com/mattn/go-isatty v0.0.3/go.mod" - "github.com/mattn/go-isatty v0.0.8/go.mod" - "github.com/mattn/go-isatty v0.0.10/go.mod" - "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/matttproud/golang_protobuf_extensions v1.0.1" - "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod" - "github.com/miekg/dns v1.0.14" - "github.com/miekg/dns v1.0.14/go.mod" - "github.com/miekg/dns v1.1.26" - "github.com/miekg/dns v1.1.26/go.mod" - "github.com/mitchellh/cli v1.0.0" - "github.com/mitchellh/cli v1.0.0/go.mod" - "github.com/mitchellh/copystructure v1.0.0" - "github.com/mitchellh/copystructure v1.0.0/go.mod" - "github.com/mitchellh/go-homedir v1.0.0" - "github.com/mitchellh/go-homedir v1.0.0/go.mod" - "github.com/mitchellh/go-homedir v1.1.0" - "github.com/mitchellh/go-homedir v1.1.0/go.mod" - "github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod" - "github.com/mitchellh/go-testing-interface v1.0.0" - "github.com/mitchellh/go-testing-interface v1.0.0/go.mod" - "github.com/mitchellh/go-wordwrap v1.0.0/go.mod" - "github.com/mitchellh/gox v0.4.0/go.mod" - "github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452" - "github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod" - "github.com/mitchellh/iochan v1.0.0/go.mod" - "github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod" - "github.com/mitchellh/mapstructure v1.1.2" - "github.com/mitchellh/mapstructure v1.1.2/go.mod" - "github.com/mitchellh/reflectwalk v1.0.0/go.mod" - "github.com/mitchellh/reflectwalk v1.0.1" - "github.com/mitchellh/reflectwalk v1.0.1/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 v1.0.1" - "github.com/modern-go/reflect2 v1.0.1/go.mod" - "github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2" - "github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod" - "github.com/oklog/run v1.0.0" - "github.com/oklog/run v1.0.0/go.mod" - "github.com/onsi/ginkgo v1.6.0" - "github.com/onsi/ginkgo v1.6.0/go.mod" - "github.com/onsi/gomega v1.4.1" - "github.com/onsi/gomega v1.4.1/go.mod" - "github.com/onsi/gomega v1.4.2" - "github.com/onsi/gomega v1.4.2/go.mod" - "github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c" - "github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod" - "github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c" - "github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod" - "github.com/pascaldekloe/goe v0.1.0" - "github.com/pascaldekloe/goe v0.1.0/go.mod" - "github.com/peterbourgon/diskv v2.0.1+incompatible" - "github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod" - "github.com/pierrec/lz4 v2.0.5+incompatible" - "github.com/pierrec/lz4 v2.0.5+incompatible/go.mod" - "github.com/pkg/errors v0.8.0" - "github.com/pkg/errors v0.8.0/go.mod" - "github.com/pkg/errors v0.8.1" - "github.com/pkg/errors v0.8.1/go.mod" - "github.com/pmezard/go-difflib v1.0.0" - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/posener/complete v1.1.1" - "github.com/posener/complete v1.1.1/go.mod" - "github.com/prometheus/client_golang v0.9.2" - "github.com/prometheus/client_golang v0.9.2/go.mod" - "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910" - "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod" - "github.com/prometheus/common v0.0.0-20181126121408-4724e9255275" - "github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod" - "github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a" - "github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod" - "github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03" - "github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod" - "github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f" - "github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod" - "github.com/ryanuber/columnize v2.1.0+incompatible" - "github.com/ryanuber/columnize v2.1.0+incompatible/go.mod" - "github.com/ryanuber/go-glob v1.0.0" - "github.com/ryanuber/go-glob v1.0.0/go.mod" - "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529" - "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod" - "github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880" - "github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod" - "github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4" - "github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod" - "github.com/sirupsen/logrus v1.0.6" - "github.com/sirupsen/logrus v1.0.6/go.mod" - "github.com/smartystreets/assertions v0.0.0-20180820201707-7c9eb446e3cf" - "github.com/smartystreets/assertions v0.0.0-20180820201707-7c9eb446e3cf/go.mod" - "github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a" - "github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod" - "github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d" - "github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod" - "github.com/spf13/pflag v1.0.2/go.mod" - "github.com/spf13/pflag v1.0.3" - "github.com/spf13/pflag v1.0.3/go.mod" - "github.com/stretchr/objx v0.1.0" - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/objx v0.1.1" - "github.com/stretchr/objx v0.1.1/go.mod" - "github.com/stretchr/testify v1.2.2" - "github.com/stretchr/testify v1.2.2/go.mod" - "github.com/stretchr/testify v1.3.0" - "github.com/stretchr/testify v1.3.0/go.mod" - "github.com/stretchr/testify v1.4.0" - "github.com/stretchr/testify v1.4.0/go.mod" - "github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible" - "github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod" - "github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9" - "github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod" - "github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926" - "github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod" - "github.com/vmware/govmomi v0.18.0" - "github.com/vmware/govmomi v0.18.0/go.mod" - "golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3" - "golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod" - "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" - "golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392" - "golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod" - "golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4" - "golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4/go.mod" - "golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod" - "golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod" - "golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod" - "golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod" - "golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod" - "golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod" - "golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod" - "golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519" - "golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod" - "golang.org/x/net v0.0.0-20181201002055-351d144fa1fc" - "golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod" - "golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod" - "golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/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-20190503192946-f4e77d36d62c" - "golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod" - "golang.org/x/net v0.0.0-20190620200207-3b0461eec859" - "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod" - "golang.org/x/net v0.0.0-20190923162816-aa69164e4478" - "golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod" - "golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod" - "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be" - "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod" - "golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod" - "golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod" - "golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod" - "golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod" - "golang.org/x/sync v0.0.0-20190423024810-112230192c58" - "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod" - "golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod" - "golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod" - "golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod" - "golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5" - "golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod" - "golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/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-20190403152447-81d4e9dc473e/go.mod" - "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" - "golang.org/x/sys v0.0.0-20190508220229-2d0786266e9c" - "golang.org/x/sys v0.0.0-20190508220229-2d0786266e9c/go.mod" - "golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5" - "golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod" - "golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod" - "golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe" - "golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod" - "golang.org/x/sys v0.0.0-20191008105621-543471e840be/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-20200124204421-9fbb57f87de9" - "golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod" - "golang.org/x/text v0.3.0" - "golang.org/x/text v0.3.0/go.mod" - "golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod" - "golang.org/x/text v0.3.2" - "golang.org/x/text v0.3.2/go.mod" - "golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2" - "golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod" - "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4" - "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod" - "golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod" - "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" - "golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod" - "golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod" - "golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod" - "golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod" - "golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod" - "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod" - "google.golang.org/api v0.0.0-20180829000535-087779f1d2c9" - "google.golang.org/api v0.0.0-20180829000535-087779f1d2c9/go.mod" - "google.golang.org/appengine v1.1.0" - "google.golang.org/appengine v1.1.0/go.mod" - "google.golang.org/appengine v1.4.0" - "google.golang.org/appengine v1.4.0/go.mod" - "google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8" - "google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod" - "google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107" - "google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod" - "google.golang.org/grpc v1.14.0/go.mod" - "google.golang.org/grpc v1.19.0/go.mod" - "google.golang.org/grpc v1.19.1" - "google.golang.org/grpc v1.19.1/go.mod" - "google.golang.org/grpc v1.22.0/go.mod" - "google.golang.org/grpc v1.23.0" - "google.golang.org/grpc v1.23.0/go.mod" - "gopkg.in/airbrake/gobrake.v2 v2.0.9" - "gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod" - "gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d" - "gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" - "gopkg.in/fsnotify.v1 v1.4.7" - "gopkg.in/fsnotify.v1 v1.4.7/go.mod" - "gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2" - "gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod" - "gopkg.in/inf.v0 v0.9.1" - "gopkg.in/inf.v0 v0.9.1/go.mod" - "gopkg.in/resty.v1 v1.12.0" - "gopkg.in/resty.v1 v1.12.0/go.mod" - "gopkg.in/square/go-jose.v2 v2.3.1" - "gopkg.in/square/go-jose.v2 v2.3.1/go.mod" - "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7" - "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod" - "gopkg.in/yaml.v2 v2.2.1" - "gopkg.in/yaml.v2 v2.2.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.2/go.mod" - "gopkg.in/yaml.v2 v2.2.8" - "gopkg.in/yaml.v2 v2.2.8/go.mod" - "honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod" - "honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod" - "k8s.io/api v0.0.0-20180806132203-61b11ee65332/go.mod" - "k8s.io/api v0.0.0-20190325185214-7544f9db76f6" - "k8s.io/api v0.0.0-20190325185214-7544f9db76f6/go.mod" - "k8s.io/apimachinery v0.0.0-20180821005732-488889b0007f/go.mod" - "k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841" - "k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841/go.mod" - "k8s.io/client-go v8.0.0+incompatible" - "k8s.io/client-go v8.0.0+incompatible/go.mod" - ) -go-module_set_globals -SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI}" - -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT" -RESTRICT+=" test" -SLOT="0" -KEYWORDS="amd64" - -BDEPEND="dev-go/gox" -COMMON_DEPEND=" - acct-group/consul - acct-user/consul" - DEPEND="${COMMON_DEPEND}" - RDEPEND="${COMMON_DEPEND}" - -src_compile() { - # The dev target sets causes build.sh to set appropriate XC_OS - # and XC_ARCH, and skips generation of an unused zip file, - # avoiding a dependency on app-arch/zip. - GIT_DESCRIBE="v${PV}" \ - GIT_DIRTY="" \ - GIT_COMMIT="${GIT_COMMIT}" \ - emake dev-build -} - -src_install() { - dobin bin/consul - - keepdir /etc/consul.d - insinto /etc/consul.d - doins "${FILESDIR}/"*.json.example - - keepdir /var/log/consul - fowners consul:consul /var/log/consul - - newinitd "${FILESDIR}/consul.initd" "${PN}" - newconfd "${FILESDIR}/consul.confd" "${PN}" - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotated" "${PN}" - systemd_dounit "${FILESDIR}/consul.service" -} diff --git a/app-admin/consul/consul-1.7.3.ebuild b/app-admin/consul/consul-1.7.3.ebuild deleted file mode 100644 index 5ba5232b6488..000000000000 --- a/app-admin/consul/consul-1.7.3.ebuild +++ /dev/null @@ -1,514 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit go-module systemd -GIT_COMMIT=8b4a3d952 - -DESCRIPTION="A tool for service discovery, monitoring and configuration" -HOMEPAGE="https://www.consul.io" - -# Upstream doesn't use "-mod=vendor" in their build system, and the -# vendor directory is incomplete. -# On the next bump, remove this if they have added "-mod=vendor" -EGO_SUM=( - "cloud.google.com/go v0.26.0" - "cloud.google.com/go v0.26.0/go.mod" - "github.com/Azure/azure-sdk-for-go v16.0.0+incompatible" - "github.com/Azure/azure-sdk-for-go v16.0.0+incompatible/go.mod" - "github.com/Azure/go-autorest v10.7.0+incompatible/go.mod" - "github.com/Azure/go-autorest v10.15.3+incompatible" - "github.com/Azure/go-autorest v10.15.3+incompatible/go.mod" - "github.com/BurntSushi/toml v0.3.1/go.mod" - "github.com/DataDog/datadog-go v2.2.0+incompatible" - "github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod" - "github.com/Microsoft/go-winio v0.4.3" - "github.com/Microsoft/go-winio v0.4.3/go.mod" - "github.com/NYTimes/gziphandler v1.0.1" - "github.com/NYTimes/gziphandler v1.0.1/go.mod" - "github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6" - "github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod" - "github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af" - "github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod" - "github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e" - "github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod" - "github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da" - "github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod" - "github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878" - "github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod" - "github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310" - "github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod" - "github.com/armon/go-radix v1.0.0" - "github.com/armon/go-radix v1.0.0/go.mod" - "github.com/aws/aws-sdk-go v1.25.41" - "github.com/aws/aws-sdk-go v1.25.41/go.mod" - "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973" - "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod" - "github.com/bgentry/speakeasy v0.1.0" - "github.com/bgentry/speakeasy v0.1.0/go.mod" - "github.com/boltdb/bolt v1.3.1" - "github.com/boltdb/bolt v1.3.1/go.mod" - "github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible" - "github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod" - "github.com/circonus-labs/circonusllhist v0.1.3" - "github.com/circonus-labs/circonusllhist v0.1.3/go.mod" - "github.com/client9/misspell v0.3.4/go.mod" - "github.com/coredns/coredns v1.1.2" - "github.com/coredns/coredns v1.1.2/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/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661" - "github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod" - "github.com/dgrijalva/jwt-go v3.2.0+incompatible" - "github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod" - "github.com/digitalocean/godo v1.1.1" - "github.com/digitalocean/godo v1.1.1/go.mod" - "github.com/digitalocean/godo v1.10.0" - "github.com/digitalocean/godo v1.10.0/go.mod" - "github.com/dimchansky/utfbom v1.1.0" - "github.com/dimchansky/utfbom v1.1.0/go.mod" - "github.com/dnaeon/go-vcr v1.0.1" - "github.com/dnaeon/go-vcr v1.0.1/go.mod" - "github.com/docker/go-connections v0.3.0" - "github.com/docker/go-connections v0.3.0/go.mod" - "github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0" - "github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod" - "github.com/envoyproxy/go-control-plane v0.8.0" - "github.com/envoyproxy/go-control-plane v0.8.0/go.mod" - "github.com/envoyproxy/protoc-gen-validate v0.0.14" - "github.com/envoyproxy/protoc-gen-validate v0.0.14/go.mod" - "github.com/fatih/color v1.7.0" - "github.com/fatih/color v1.7.0/go.mod" - "github.com/fatih/color v1.9.0" - "github.com/fatih/color v1.9.0/go.mod" - "github.com/fatih/structs v1.1.0/go.mod" - "github.com/fsnotify/fsnotify v1.4.7" - "github.com/fsnotify/fsnotify v1.4.7/go.mod" - "github.com/ghodss/yaml v1.0.0" - "github.com/ghodss/yaml v1.0.0/go.mod" - "github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod" - "github.com/go-ldap/ldap v3.0.2+incompatible" - "github.com/go-ldap/ldap v3.0.2+incompatible/go.mod" - "github.com/go-ole/go-ole v1.2.1" - "github.com/go-ole/go-ole v1.2.1/go.mod" - "github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod" - "github.com/go-test/deep v1.0.2" - "github.com/go-test/deep v1.0.2/go.mod" - "github.com/gogo/googleapis v1.1.0" - "github.com/gogo/googleapis v1.1.0/go.mod" - "github.com/gogo/protobuf v1.1.1" - "github.com/gogo/protobuf v1.1.1/go.mod" - "github.com/gogo/protobuf v1.2.1" - "github.com/gogo/protobuf v1.2.1/go.mod" - "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b" - "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod" - "github.com/golang/mock v1.1.1" - "github.com/golang/mock v1.1.1/go.mod" - "github.com/golang/protobuf v1.2.0" - "github.com/golang/protobuf v1.2.0/go.mod" - "github.com/golang/protobuf v1.3.1" - "github.com/golang/protobuf v1.3.1/go.mod" - "github.com/golang/snappy v0.0.1" - "github.com/golang/snappy v0.0.1/go.mod" - "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c" - "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod" - "github.com/google/go-cmp v0.2.0" - "github.com/google/go-cmp v0.2.0/go.mod" - "github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135" - "github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod" - "github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf" - "github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod" - "github.com/googleapis/gnostic v0.2.0" - "github.com/googleapis/gnostic v0.2.0/go.mod" - "github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca" - "github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca/go.mod" - "github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c" - "github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod" - "github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7" - "github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod" - "github.com/hashicorp/errwrap v1.0.0" - "github.com/hashicorp/errwrap v1.0.0/go.mod" - "github.com/hashicorp/go-bexpr v0.1.2" - "github.com/hashicorp/go-bexpr v0.1.2/go.mod" - "github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de" - "github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/go.mod" - "github.com/hashicorp/go-cleanhttp v0.5.0/go.mod" - "github.com/hashicorp/go-cleanhttp v0.5.1" - "github.com/hashicorp/go-cleanhttp v0.5.1/go.mod" - "github.com/hashicorp/go-connlimit v0.2.0" - "github.com/hashicorp/go-connlimit v0.2.0/go.mod" - "github.com/hashicorp/go-discover v0.0.0-20191202160150-7ec2cfbda7a2" - "github.com/hashicorp/go-discover v0.0.0-20191202160150-7ec2cfbda7a2/go.mod" - "github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod" - "github.com/hashicorp/go-hclog v0.8.0/go.mod" - "github.com/hashicorp/go-hclog v0.9.1" - "github.com/hashicorp/go-hclog v0.9.1/go.mod" - "github.com/hashicorp/go-hclog v0.12.0" - "github.com/hashicorp/go-hclog v0.12.0/go.mod" - "github.com/hashicorp/go-immutable-radix v1.0.0" - "github.com/hashicorp/go-immutable-radix v1.0.0/go.mod" - "github.com/hashicorp/go-immutable-radix v1.1.0" - "github.com/hashicorp/go-immutable-radix v1.1.0/go.mod" - "github.com/hashicorp/go-memdb v1.0.3" - "github.com/hashicorp/go-memdb v1.0.3/go.mod" - "github.com/hashicorp/go-msgpack v0.5.3/go.mod" - "github.com/hashicorp/go-msgpack v0.5.5" - "github.com/hashicorp/go-msgpack v0.5.5/go.mod" - "github.com/hashicorp/go-multierror v1.0.0" - "github.com/hashicorp/go-multierror 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/go-plugin v1.0.1/go.mod" - "github.com/hashicorp/go-raftchunking v0.6.1" - "github.com/hashicorp/go-raftchunking v0.6.1/go.mod" - "github.com/hashicorp/go-retryablehttp v0.5.3/go.mod" - "github.com/hashicorp/go-retryablehttp v0.5.4" - "github.com/hashicorp/go-retryablehttp v0.5.4/go.mod" - "github.com/hashicorp/go-rootcerts v1.0.1/go.mod" - "github.com/hashicorp/go-rootcerts v1.0.2" - "github.com/hashicorp/go-rootcerts v1.0.2/go.mod" - "github.com/hashicorp/go-sockaddr v1.0.0/go.mod" - "github.com/hashicorp/go-sockaddr v1.0.2" - "github.com/hashicorp/go-sockaddr v1.0.2/go.mod" - "github.com/hashicorp/go-syslog v1.0.0" - "github.com/hashicorp/go-syslog v1.0.0/go.mod" - "github.com/hashicorp/go-uuid v1.0.0/go.mod" - "github.com/hashicorp/go-uuid v1.0.1" - "github.com/hashicorp/go-uuid v1.0.1/go.mod" - "github.com/hashicorp/go-version v1.1.0" - "github.com/hashicorp/go-version v1.1.0/go.mod" - "github.com/hashicorp/go.net v0.0.1/go.mod" - "github.com/hashicorp/golang-lru v0.5.0/go.mod" - "github.com/hashicorp/golang-lru v0.5.1" - "github.com/hashicorp/golang-lru v0.5.1/go.mod" - "github.com/hashicorp/hcl v1.0.0" - "github.com/hashicorp/hcl v1.0.0/go.mod" - "github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5" - "github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod" - "github.com/hashicorp/logutils v1.0.0/go.mod" - "github.com/hashicorp/mdns v1.0.0/go.mod" - "github.com/hashicorp/mdns v1.0.1" - "github.com/hashicorp/mdns v1.0.1/go.mod" - "github.com/hashicorp/memberlist v0.1.3/go.mod" - "github.com/hashicorp/memberlist v0.2.2" - "github.com/hashicorp/memberlist v0.2.2/go.mod" - "github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69" - "github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod" - "github.com/hashicorp/raft v1.1.1/go.mod" - "github.com/hashicorp/raft v1.1.2" - "github.com/hashicorp/raft v1.1.2/go.mod" - "github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea" - "github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod" - "github.com/hashicorp/serf v0.8.2/go.mod" - "github.com/hashicorp/serf v0.9.2" - "github.com/hashicorp/serf v0.9.2/go.mod" - "github.com/hashicorp/vault/api v1.0.4" - "github.com/hashicorp/vault/api v1.0.4/go.mod" - "github.com/hashicorp/vault/sdk v0.1.13" - "github.com/hashicorp/vault/sdk v0.1.13/go.mod" - "github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443" - "github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod" - "github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod" - "github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d" - "github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod" - "github.com/hpcloud/tail v1.0.0" - "github.com/hpcloud/tail v1.0.0/go.mod" - "github.com/imdario/mergo v0.3.6" - "github.com/imdario/mergo v0.3.6/go.mod" - "github.com/istio/gogo-genproto v0.0.0-20190124151557-6d926a6e6feb/go.mod" - "github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da" - "github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod" - "github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af" - "github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod" - "github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62" - "github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod" - "github.com/json-iterator/go v1.1.5" - "github.com/json-iterator/go v1.1.5/go.mod" - "github.com/jtolds/gls v4.2.1+incompatible/go.mod" - "github.com/kisielk/errcheck v1.1.0/go.mod" - "github.com/kisielk/gotool v1.0.0/go.mod" - "github.com/kr/pretty v0.1.0/go.mod" - "github.com/kr/pretty v0.2.0" - "github.com/kr/pretty v0.2.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/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod" - "github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod" - "github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod" - "github.com/likexian/gokit v0.20.16/go.mod" - "github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod" - "github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod" - "github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod" - "github.com/linode/linodego v0.7.1" - "github.com/linode/linodego v0.7.1/go.mod" - "github.com/mattn/go-colorable v0.0.9/go.mod" - "github.com/mattn/go-colorable v0.1.4/go.mod" - "github.com/mattn/go-colorable v0.1.6" - "github.com/mattn/go-colorable v0.1.6/go.mod" - "github.com/mattn/go-isatty v0.0.3/go.mod" - "github.com/mattn/go-isatty v0.0.8/go.mod" - "github.com/mattn/go-isatty v0.0.10/go.mod" - "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/matttproud/golang_protobuf_extensions v1.0.1" - "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod" - "github.com/miekg/dns v1.0.14/go.mod" - "github.com/miekg/dns v1.1.26" - "github.com/miekg/dns v1.1.26/go.mod" - "github.com/mitchellh/cli v1.0.0/go.mod" - "github.com/mitchellh/cli v1.1.0" - "github.com/mitchellh/cli v1.1.0/go.mod" - "github.com/mitchellh/copystructure v1.0.0" - "github.com/mitchellh/copystructure v1.0.0/go.mod" - "github.com/mitchellh/go-homedir v1.0.0/go.mod" - "github.com/mitchellh/go-homedir v1.1.0" - "github.com/mitchellh/go-homedir v1.1.0/go.mod" - "github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod" - "github.com/mitchellh/go-testing-interface v1.0.0" - "github.com/mitchellh/go-testing-interface v1.0.0/go.mod" - "github.com/mitchellh/go-testing-interface v1.0.3" - "github.com/mitchellh/go-testing-interface v1.0.3/go.mod" - "github.com/mitchellh/go-wordwrap v1.0.0/go.mod" - "github.com/mitchellh/gox v0.4.0/go.mod" - "github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452" - "github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod" - "github.com/mitchellh/iochan v1.0.0/go.mod" - "github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod" - "github.com/mitchellh/mapstructure v1.1.2/go.mod" - "github.com/mitchellh/mapstructure v1.2.3" - "github.com/mitchellh/mapstructure v1.2.3/go.mod" - "github.com/mitchellh/reflectwalk v1.0.0/go.mod" - "github.com/mitchellh/reflectwalk v1.0.1" - "github.com/mitchellh/reflectwalk v1.0.1/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 v1.0.1" - "github.com/modern-go/reflect2 v1.0.1/go.mod" - "github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2" - "github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod" - "github.com/oklog/run v1.0.0/go.mod" - "github.com/onsi/ginkgo v1.6.0" - "github.com/onsi/ginkgo v1.6.0/go.mod" - "github.com/onsi/gomega v1.4.1/go.mod" - "github.com/onsi/gomega v1.4.2" - "github.com/onsi/gomega v1.4.2/go.mod" - "github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c" - "github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod" - "github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod" - "github.com/pascaldekloe/goe v0.1.0" - "github.com/pascaldekloe/goe v0.1.0/go.mod" - "github.com/peterbourgon/diskv v2.0.1+incompatible" - "github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod" - "github.com/pierrec/lz4 v2.0.5+incompatible" - "github.com/pierrec/lz4 v2.0.5+incompatible/go.mod" - "github.com/pkg/errors v0.8.0/go.mod" - "github.com/pkg/errors v0.8.1" - "github.com/pkg/errors v0.8.1/go.mod" - "github.com/pmezard/go-difflib v1.0.0" - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/posener/complete v1.1.1/go.mod" - "github.com/posener/complete v1.2.3" - "github.com/posener/complete v1.2.3/go.mod" - "github.com/prometheus/client_golang v0.9.2" - "github.com/prometheus/client_golang v0.9.2/go.mod" - "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910" - "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod" - "github.com/prometheus/common v0.0.0-20181126121408-4724e9255275" - "github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod" - "github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a" - "github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod" - "github.com/rboyer/safeio v0.2.1" - "github.com/rboyer/safeio v0.2.1/go.mod" - "github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03" - "github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod" - "github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod" - "github.com/ryanuber/columnize v2.1.0+incompatible" - "github.com/ryanuber/columnize v2.1.0+incompatible/go.mod" - "github.com/ryanuber/go-glob v1.0.0" - "github.com/ryanuber/go-glob v1.0.0/go.mod" - "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529" - "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod" - "github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880" - "github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod" - "github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4" - "github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod" - "github.com/sirupsen/logrus v1.0.6" - "github.com/sirupsen/logrus v1.0.6/go.mod" - "github.com/smartystreets/assertions v0.0.0-20180820201707-7c9eb446e3cf/go.mod" - "github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod" - "github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d" - "github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod" - "github.com/spf13/pflag v1.0.2/go.mod" - "github.com/spf13/pflag v1.0.3" - "github.com/spf13/pflag v1.0.3/go.mod" - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/objx v0.1.1" - "github.com/stretchr/objx v0.1.1/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" - "github.com/stretchr/testify v1.4.0/go.mod" - "github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible" - "github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod" - "github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod" - "github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926" - "github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod" - "github.com/vmware/govmomi v0.18.0" - "github.com/vmware/govmomi v0.18.0/go.mod" - "golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod" - "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" - "golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod" - "golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4" - "golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4/go.mod" - "golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod" - "golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod" - "golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod" - "golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod" - "golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod" - "golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod" - "golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod" - "golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod" - "golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod" - "golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod" - "golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/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-20190503192946-f4e77d36d62c/go.mod" - "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod" - "golang.org/x/net v0.0.0-20190923162816-aa69164e4478" - "golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod" - "golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod" - "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be" - "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod" - "golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod" - "golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod" - "golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod" - "golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod" - "golang.org/x/sync v0.0.0-20190423024810-112230192c58" - "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod" - "golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod" - "golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod" - "golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod" - "golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod" - "golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/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-20190403152447-81d4e9dc473e/go.mod" - "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" - "golang.org/x/sys v0.0.0-20190508220229-2d0786266e9c/go.mod" - "golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod" - "golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod" - "golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod" - "golang.org/x/sys v0.0.0-20191008105621-543471e840be/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-20200124204421-9fbb57f87de9/go.mod" - "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae" - "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod" - "golang.org/x/text v0.3.0/go.mod" - "golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod" - "golang.org/x/text v0.3.2" - "golang.org/x/text v0.3.2/go.mod" - "golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod" - "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4" - "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod" - "golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod" - "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" - "golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod" - "golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod" - "golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod" - "golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod" - "golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod" - "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod" - "google.golang.org/api v0.0.0-20180829000535-087779f1d2c9" - "google.golang.org/api v0.0.0-20180829000535-087779f1d2c9/go.mod" - "google.golang.org/appengine v1.1.0/go.mod" - "google.golang.org/appengine v1.4.0" - "google.golang.org/appengine v1.4.0/go.mod" - "google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod" - "google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107" - "google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod" - "google.golang.org/grpc v1.14.0/go.mod" - "google.golang.org/grpc v1.19.0/go.mod" - "google.golang.org/grpc v1.19.1/go.mod" - "google.golang.org/grpc v1.22.0/go.mod" - "google.golang.org/grpc v1.23.0" - "google.golang.org/grpc v1.23.0/go.mod" - "gopkg.in/airbrake/gobrake.v2 v2.0.9" - "gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod" - "gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" - "gopkg.in/fsnotify.v1 v1.4.7" - "gopkg.in/fsnotify.v1 v1.4.7/go.mod" - "gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2" - "gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod" - "gopkg.in/inf.v0 v0.9.1" - "gopkg.in/inf.v0 v0.9.1/go.mod" - "gopkg.in/resty.v1 v1.12.0" - "gopkg.in/resty.v1 v1.12.0/go.mod" - "gopkg.in/square/go-jose.v2 v2.3.1" - "gopkg.in/square/go-jose.v2 v2.3.1/go.mod" - "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7" - "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod" - "gopkg.in/yaml.v2 v2.2.1/go.mod" - "gopkg.in/yaml.v2 v2.2.2/go.mod" - "gopkg.in/yaml.v2 v2.2.8" - "gopkg.in/yaml.v2 v2.2.8/go.mod" - "honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod" - "honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod" - "k8s.io/api v0.0.0-20180806132203-61b11ee65332/go.mod" - "k8s.io/api v0.0.0-20190325185214-7544f9db76f6" - "k8s.io/api v0.0.0-20190325185214-7544f9db76f6/go.mod" - "k8s.io/apimachinery v0.0.0-20180821005732-488889b0007f/go.mod" - "k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841" - "k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841/go.mod" - "k8s.io/client-go v8.0.0+incompatible" - "k8s.io/client-go v8.0.0+incompatible/go.mod" - ) -go-module_set_globals -SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI}" - -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT" -RESTRICT+=" test" -SLOT="0" -KEYWORDS="~amd64" - -BDEPEND="dev-go/gox" -COMMON_DEPEND=" - acct-group/consul - acct-user/consul" - DEPEND="${COMMON_DEPEND}" - RDEPEND="${COMMON_DEPEND}" - -src_compile() { - # The dev target sets causes build.sh to set appropriate XC_OS - # and XC_ARCH, and skips generation of an unused zip file, - # avoiding a dependency on app-arch/zip. - GIT_DESCRIBE="v${PV}" \ - GIT_DIRTY="" \ - GIT_COMMIT="${GIT_COMMIT}" \ - emake dev-build -} - -src_install() { - dobin bin/consul - - keepdir /etc/consul.d - insinto /etc/consul.d - doins "${FILESDIR}/"*.json.example - - keepdir /var/log/consul - fowners consul:consul /var/log/consul - - newinitd "${FILESDIR}/consul.initd" "${PN}" - newconfd "${FILESDIR}/consul.confd" "${PN}" - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotated" "${PN}" - systemd_dounit "${FILESDIR}/consul.service" -} diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz index 67a8dd60b3c1..ef37c8e2c79c 100644 Binary files a/app-antivirus/Manifest.gz and b/app-antivirus/Manifest.gz differ diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest index e0ddd86c54d1..fdf9ea6c9726 100644 --- a/app-antivirus/clamav/Manifest +++ b/app-antivirus/clamav/Manifest @@ -1,2 +1 @@ -DIST clamav-0.102.3.tar.gz 13226108 BLAKE2B 741c0cc6a088ffe880eabb7a59151b3c13c5754f9cb36582ffca9cbeea6b039e3c49b7155ba14fa302e9ee4bfa6adf8b98f0e29f2354ea8569b11b1ed2b2532c SHA512 d239718814b303fb0f1655d9bdaf3675d888eea57e786d927eafabb7b6f58cd7f5fb7dc149511c2af6f800dcc919f2e1d6954110d45b9e16619c632e8d2b37f2 DIST clamav-0.102.4.tar.gz 13234444 BLAKE2B 7109da3e2281472032777b8a9d14ca6ff345aead33e5aaf0b9d1ff4721459926062f789dd1f7e8637155e4b9f3bce9f78127bf450f32baf3f1006b8083d3431a SHA512 29893deb8d2d913dff72331875d3dc3a10356bfb254ddfe1c1933b3ea4f8b76c96a1b840f95e72be36cbc0e00b9ec35e395225ef264761f53e709bb1026a4f09 diff --git a/app-antivirus/clamav/clamav-0.102.3.ebuild b/app-antivirus/clamav/clamav-0.102.3.ebuild deleted file mode 100644 index 53ece5a2bf29..000000000000 --- a/app-antivirus/clamav/clamav-0.102.3.ebuild +++ /dev/null @@ -1,214 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic systemd - -DESCRIPTION="Clam Anti-Virus Scanner" -HOMEPAGE="https://www.clamav.net/" -SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" -IUSE="bzip2 doc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux test uclibc xml" - -REQUIRED_USE="libclamav-only? ( !clamdtop !clamsubmit !milter !metadata-analysis-api )" - -RESTRICT="!test? ( test )" - -# Require acct-{user,group}/clamav at build time so that we can set -# the permissions on /var/lib/clamav in src_install rather than in -# pkg_postinst; calling "chown" on the live filesystem scares me. -CDEPEND="acct-group/clamav - acct-user/clamav - dev-libs/libltdl - dev-libs/libmspack - || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) - >=sys-libs/zlib-1.2.2:= - bzip2? ( app-arch/bzip2 ) - clamdtop? ( sys-libs/ncurses:0 ) - clamsubmit? ( net-misc/curl dev-libs/json-c:= ) - elibc_musl? ( sys-libs/fts-standalone ) - iconv? ( virtual/libiconv ) - !libclamav-only? ( net-misc/curl ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) - xml? ( dev-libs/libxml2 )" - -BDEPEND="virtual/pkgconfig" - -DEPEND="${CDEPEND} - metadata-analysis-api? ( dev-libs/json-c:* ) - test? ( dev-libs/check )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-clamav )" - -PATCHES=( - "${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729 - "${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328 - "${FILESDIR}/${PN}-0.102.2-fix-curl-detection.patch" #709616 -) - -src_prepare() { - default - eautoconf -} - -src_configure() { - use elibc_musl && append-ldflags -lfts - use ppc64 && append-flags -mminimal-toc - use uclibc && export ac_cv_type_error_t=yes - - # according to configure help it should be - # $(use_enable xml) - # but that does not work - # do not add this, since --disable-xml seems to override - # --without-xml - JSONUSE="--without-libjson" - - if use clamsubmit || use metadata-analysis-api; then - # either of those 2 requires libjson. - # clamsubmit will be built as soon as libjson and curl are found - # but we only install the binary if requested - JSONUSE="--with-libjson=${EPREFIX}/usr" - fi - - local myeconfargs=( - $(use_enable bzip2) - $(use_enable clamdtop) - $(use_enable ipv6) - $(use_enable milter) - $(use_enable test check) - $(use_with xml) - $(use_with iconv) - ${JSONUSE} - $(use_enable libclamav-only) - $(use_with !libclamav-only libcurl) - --with-system-libmspack - --cache-file="${S}"/config.cache - --disable-experimental - --disable-static - --disable-zlib-vcheck - --enable-id-check - --with-dbdir="${EPREFIX}"/var/lib/clamav - # Don't call --with-zlib=/usr (see bug #699296) - --with-zlib - --disable-llvm - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - rm -rf "${ED}"/var/lib/clamav || die - - if ! use libclamav-only ; then - newinitd "${FILESDIR}"/clamd.initd-r6 clamd - newconfd "${FILESDIR}"/clamd.conf-r1 clamd - - systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf" - systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service" - systemd_dounit "${FILESDIR}/clamd.service" - systemd_dounit "${FILESDIR}/freshclamd.service" - - insinto /etc/logrotate.d - newins "${FILESDIR}"/clamav.logrotate clamav - - # Modify /etc/{clamd,freshclam}.conf to be usable out of the box - sed -i -e "s:^\(Example\):\# \1:" \ - -e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \ - -e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \ - -e "s:.*\(User\) .*:\1 clamav:" \ - -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \ - -e "s:^\#\(LogTime\).*:\1 yes:" \ - -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - -e "s:^\#\(DatabaseDirectory\).*:\1 /var/lib/clamav:" \ - "${ED}"/etc/clamd.conf.sample || die - - sed -i -e "s:^\(Example\):\# \1:" \ - -e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \ - -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \ - -e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \ - -e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \ - -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \ - -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - -e "s:^\#\(DatabaseDirectory\).*:\1 /var/lib/clamav:" \ - "${ED}"/etc/freshclam.conf.sample || die - - if use milter ; then - # MilterSocket one to include ' /' because there is a 2nd line for - # inet: which we want to leave - ##dodoc "${FILESDIR}"/clamav-milter.README.gentoo - sed -i -e "s:^\(Example\):\# \1:" \ - -e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \ - -e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \ - -e "s:.*\(User\) .*:\1 clamav:" \ - -e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \ - -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \ - "${ED}"/etc/clamav-milter.conf.sample || die - - cat >> "${ED}"/etc/conf.d/clamd <<-EOF - MILTER_NICELEVEL=19 - START_MILTER=no - EOF - - systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service - fi - - local i - for i in clamd freshclam clamav-milter - do - if [[ -f "${ED}"/etc/"${i}".conf.sample ]]; then - mv "${ED}"/etc/"${i}".conf{.sample,} || die - fi - done - - # These both need to be writable by the clamav user. - # TODO: use syslog by default; that's what it's for. - diropts -o clamav -g clamav - keepdir /var/lib/clamav - keepdir /var/log/clamav - fi - - if use doc ; then - local HTML_DOCS=( docs/html/. ) - einstalldocs - - if ! use libclamav-only ; then - doman docs/man/*.[1-8] - fi - fi - - find "${ED}" -name '*.la' -delete || die -} - -src_test() { - if use libclamav-only ; then - ewarn "Test target not available when USE=libclamav-only is set, skipping tests ..." - return 0 - fi - - emake quick-check -} - -pkg_postinst() { - if use milter ; then - elog "For simple instructions how to setup the clamav-milter read the" - elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}" - fi - - local databases=( "${EROOT}"/var/lib/clamav/main.c[lv]d ) - if [[ ! -f "${databases}" ]] ; then - ewarn "You must run freshclam manually to populate the virus database" - ewarn "before starting clamav for the first time." - fi - - elog "For instructions on how to use clamonacc, see" - elog - elog " https://www.clamav.net/documents/on-access-scanning" -} diff --git a/app-antivirus/clamav/clamav-0.102.4.ebuild b/app-antivirus/clamav/clamav-0.102.4.ebuild index 0a4fac640e38..41623104ea44 100644 --- a/app-antivirus/clamav/clamav-0.102.4.ebuild +++ b/app-antivirus/clamav/clamav-0.102.4.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="bzip2 doc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux test uclibc xml" REQUIRED_USE="libclamav-only? ( !clamdtop !clamsubmit !milter !metadata-analysis-api )" diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz index e6c9f00d89ad..e4869d80cb47 100644 Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ diff --git a/app-backup/bacula/bacula-9.6.5.ebuild b/app-backup/bacula/bacula-9.6.5.ebuild index 8b6104a81e97..9456256ad40c 100644 --- a/app-backup/bacula/bacula-9.6.5.ebuild +++ b/app-backup/bacula/bacula-9.6.5.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="~amd64 ppc ~sparc ~x86" IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" DEPEND=" diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz index f47150fa3624..d21b646e4ec5 100644 Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.2-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.2-r1.ebuild index 028d6760e0da..fc2b061cec6c 100644 --- a/app-crypt/mit-krb5/mit-krb5-1.18.2-r1.ebuild +++ b/app-crypt/mit-krb5/mit-krb5-1.18.2-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz" LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )" SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86" +KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd" # Test suite requires network access diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest index 87b110101466..fe49a00fe0d2 100644 --- a/app-crypt/seahorse/Manifest +++ b/app-crypt/seahorse/Manifest @@ -1 +1,2 @@ DIST seahorse-3.34.1.tar.xz 1271616 BLAKE2B 64956d0ee4f15bc048f42cefd827aad91927b34eecf4a2e53d988c379b3eae1ce0ae29ef469c2ff80ec9cceeaf77a271c57e28cb98dd24ae55c048faff487c1d SHA512 d2dff7d73a0968c1a5a8d39460f08b67f6794f22812200f564ef719354ab5cc2dac2213cba0d4bc10a455aecb9f55de8ff39943db4482beaac9cfdc2ca1012b8 +DIST seahorse-3.36.2.tar.xz 1695824 BLAKE2B e4efb20f952e879b0ff17a9c8664ba61d10c69e377a2fdda52904a8bf5c026d147f9feb9b55c07982f256b366f756dd1567a522d89969c8c5c461f653a130676 SHA512 6a0cb7847fe9917d6d6da31f9b81a4737e425d451fc80604d8e3deb9fa57798f04aa577dae68bc156a15743975f74fbde5ff06a0b05b34228bdc9ef2539b6451 diff --git a/app-crypt/seahorse/seahorse-3.36.2.ebuild b/app-crypt/seahorse/seahorse-3.36.2.ebuild new file mode 100644 index 000000000000..e76835d6eeea --- /dev/null +++ b/app-crypt/seahorse/seahorse-3.36.2.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome.org gnome2-utils meson xdg vala + +DESCRIPTION="Manage your passwords and encryption keys" +HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse" + +LICENSE="GPL-2+ FDL-1.1+" +SLOT="0" +IUSE="ldap zeroconf" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND=" + >=dev-libs/glib-2.44:2 + >=app-crypt/gcr-3.11.91:= + >=app-crypt/gpgme-1.7.0 + >=x11-libs/gtk+-3.22.0:3 + >=app-crypt/gnupg-2.0.12 + >=gui-libs/libhandy-0.0.12:0.0= + >=app-crypt/libsecret-0.16 + dev-libs/libpwquality + net-misc/openssh + ldap? ( net-nds/openldap:= ) + >=net-libs/libsoup-2.33.92:2.4 + zeroconf? ( >=net-dns/avahi-0.6:=[dbus] ) +" +DEPEND="${RDEPEND} + $(vala_depend) + dev-libs/appstream-glib + dev-libs/libxml2:2 + dev-libs/libxslt + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xsl-stylesheets + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + app-crypt/gcr[vala] + app-crypt/libsecret[vala] +" + +src_prepare() { + xdg_src_prepare + vala_src_prepare +} + +src_configure() { + local emesonargs=( + -Dhelp=true + -Dpgp-support=true + -Dcheck-compatible-gpg=false # keep lowest version listed as compatible as min dep for gnupg RDEPEND + -Dpkcs11-support=true + -Dkeyservers-support=true + -Dhkp-support=true + $(meson_use ldap ldap-support) + $(meson_use zeroconf key-sharing) + -Dmanpage=true + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index db1584bd2031..31eb8de80e63 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/qemu/qemu-5.0.0-r1.ebuild b/app-emulation/qemu/qemu-5.0.0-r1.ebuild index 6afbb774ee4d..19aad2860de1 100644 --- a/app-emulation/qemu/qemu-5.0.0-r1.ebuild +++ b/app-emulation/qemu/qemu-5.0.0-r1.ebuild @@ -68,7 +68,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) - virtfs? ( xattr ) + virtfs? ( caps xattr ) vte? ( gtk ) plugins? ( !static !static-user ) " diff --git a/app-emulation/qemu/qemu-5.0.0-r2.ebuild b/app-emulation/qemu/qemu-5.0.0-r2.ebuild index 745a99669b8e..5e8c64c39050 100644 --- a/app-emulation/qemu/qemu-5.0.0-r2.ebuild +++ b/app-emulation/qemu/qemu-5.0.0-r2.ebuild @@ -37,7 +37,7 @@ IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc jemalloc +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux - slirp + +slirp smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs +xkb zstd" @@ -68,7 +68,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) - virtfs? ( xattr ) + virtfs? ( caps xattr ) vte? ( gtk ) plugins? ( !static !static-user ) " @@ -413,6 +413,7 @@ qemu_src_configure() { --with-confsuffix=/qemu --localstatedir=/var --disable-bsd-user + --disable-containers # bug #732972 --disable-guest-agent --disable-strip --disable-werror diff --git a/app-emulation/qemu/qemu-5.0.0.ebuild b/app-emulation/qemu/qemu-5.0.0.ebuild index e9a2dceb35a7..d7fd0d7eafa2 100644 --- a/app-emulation/qemu/qemu-5.0.0.ebuild +++ b/app-emulation/qemu/qemu-5.0.0.ebuild @@ -68,7 +68,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) - virtfs? ( xattr ) + virtfs? ( caps xattr ) vte? ( gtk ) plugins? ( !static !static-user ) " diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index f568bdfec832..eca95e6c49e4 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -37,7 +37,7 @@ IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc jemalloc +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux - slirp + +slirp smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs +xkb zstd" @@ -46,7 +46,7 @@ COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb" IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} - lm32 moxie rx tricore unicore32" + avr lm32 moxie rx tricore unicore32" IUSE_USER_TARGETS="${COMMON_TARGETS} aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx" @@ -68,7 +68,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) - virtfs? ( xattr ) + virtfs? ( caps xattr ) vte? ( gtk ) plugins? ( !static !static-user ) " @@ -411,6 +411,7 @@ qemu_src_configure() { --with-confsuffix=/qemu --localstatedir=/var --disable-bsd-user + --disable-containers # bug #732972 --disable-guest-agent --disable-strip --disable-werror diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index 909e30deae1c..80b70dd92518 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -1,4 +1,3 @@ -DIST xen-4.12.3-upstream-patches-0.tar.xz 7236 BLAKE2B d795e2be6f1edb31f1d794912328c4d3673eb800464d99c5ae867d189d0ea2b4cbac0c8bcda7790ae40742f6bf79308eb624b4f67d1c7f12cc64be6d8c920b84 SHA512 de5723d4fd547845ca9a876f8535e720f7bd790e48dbf1d92397d60a285ef88a31cad276b1a01a4fa8946cefb15d69c8a3a00da5113b6e5e2655b871be076adf DIST xen-4.12.3-upstream-patches-1.tar.xz 39052 BLAKE2B dbe18a8d67009be9597ea8f0cd45850ed0e437119095c414796efff2810e884a3d7c062a7e5e12e93d8991cbbab50c0095d7ae1c937129f8f9490aa5f31ca6f8 SHA512 1383b1c0e3d4918b6b43c9cdff5284e259385136aad479814ea1d50b25017a0466a6a0044321585f38f4c8fb30f5af91a45f666a6d7fce6e60a4dfdb346a421b DIST xen-4.12.3.tar.gz 26985230 BLAKE2B 403de519a552f1cd49e5a85b63f48df1b7a47ff8381385860b67df32af0b33be1c13c92ca2234e4479b7f415e711e0f46c396c3f62dfb5b2465d2991723cf6ef SHA512 7bbf4e752477f18143ac9a62fb633b1fbe115a1a9b03d0132f33dfca025bc9b76d9c2e9b66a3e407d14aff161b940b1a82e3e3ca43213798e9dd38b6970194e0 DIST xen-4.13.1-upstream-patches-1.tar.xz 46892 BLAKE2B 8ccfe1d6b3589e262fa04526d5238694e324fef3b514daebdffcb74cecfc2700e37f810faf868ec198c99ed3a9af2c351656c31798c5791bfd6816552d78fd7a SHA512 2d9708c4b558c5986afd1caea56f69ac8b11d69371fd4afae0e9c3480a0b863c99ebe2d3b857d623d41924437db7f7e44fefc7bae892cd05d7605243ae8140d5 diff --git a/app-emulation/xen/xen-4.12.3-r1.ebuild b/app-emulation/xen/xen-4.12.3-r1.ebuild deleted file mode 100644 index a265f1c31492..000000000000 --- a/app-emulation/xen/xen-4.12.3-r1.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) - -inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs - -MY_PV=${PV/_/-} -MY_P=${PN}-${MY_PV} - -if [[ $PV == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="git://xenbits.xen.org/xen.git" - SRC_URI="" -else - KEYWORDS="amd64 ~arm -x86" - UPSTREAM_VER=0 - SECURITY_VER= - GENTOO_VER= - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${SECURITY_VER} ]] && \ - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" - SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz - ${UPSTREAM_PATCHSET_URI} - ${SECURITY_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" -fi - -DESCRIPTION="The Xen virtual machine monitor" -HOMEPAGE="https://www.xenproject.org" -LICENSE="GPL-2" -SLOT="0" -IUSE="debug efi flask" - -DEPEND="${PYTHON_DEPS} - efi? ( >=sys-devel/binutils-2.22[multitarget] ) - !efi? ( >=sys-devel/binutils-2.22 )" -RDEPEND="" -PDEPEND="~app-emulation/xen-tools-${PV}" - -# no tests are available for the hypervisor -# prevent the silliness of /usr/lib/debug/usr/lib/debug files -# prevent stripping of the debug info from the /usr/lib/debug/xen-syms -RESTRICT="test splitdebug strip" - -# Approved by QA team in bug #144032 -QA_WX_LOAD="boot/xen-syms-${PV}" - -REQUIRED_USE="arm? ( debug )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - python-any-r1_pkg_setup - if [[ -z ${XEN_TARGET_ARCH} ]]; then - if use amd64; then - export XEN_TARGET_ARCH="x86_64" - elif use arm; then - export XEN_TARGET_ARCH="arm32" - elif use arm64; then - export XEN_TARGET_ARCH="arm64" - else - die "Unsupported architecture!" - fi - fi - - if use flask ; then - export "XSM_ENABLE=y" - export "FLASK_ENABLE=y" - fi -} - -src_prepare() { - # Upstream's patchset - [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream - - # Security patchset - if [[ -n ${SECURITY_VER} ]]; then - einfo "Try to apply Xen Security patch set" - # apply main xen patches - # Two parallel systems, both work side by side - # Over time they may concdense into one. This will suffice for now - source "${WORKDIR}"/patches-security/${PV}.conf - - local i - for i in ${XEN_SECURITY_MAIN}; do - eapply "${WORKDIR}"/patches-security/xen/$i - done - fi - - # Gentoo's patchset - [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo - - eapply "${FILESDIR}"/${PN}-4.11-efi.patch - - # Drop .config - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" - - if use efi; then - export EFI_VENDOR="gentoo" - export EFI_MOUNTPOINT="/boot" - fi - - default -} - -src_configure() { - use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" - - use debug && myopt="${myopt} debug=y" - - # remove flags - unset CFLAGS - unset LDFLAGS - unset ASFLAGS - - tc-ld-disable-gold # Bug 700374 -} - -src_compile() { - # Send raw LDFLAGS so that --as-needed works - emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} -} - -src_install() { - local myopt - use debug && myopt="${myopt} debug=y" - - # The 'make install' doesn't 'mkdir -p' the subdirs - if use efi; then - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die - fi - - emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install - - # make install likes to throw in some extra EFI bits if it built - use efi || rm -rf "${D}/usr/$(get_libdir)/efi" -} - -pkg_postinst() { - elog "Official Xen Guide:" - elog " https://wiki.gentoo.org/wiki/Xen" - - use efi && einfo "The efi executable is installed in /boot/efi/gentoo" - - elog "You can optionally block the installation of /boot/xen-syms by an entry" - elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK" - elog "e.g. echo ${msg} > /etc/portage/env/xen.conf" - - ewarn - ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause" - ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems" - ewarn "to work fine." - ewarn - ewarn "Add sched=credit to xen command line options to use the legacy scheduler." - ewarn - ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B" -} diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz index d87078dcd23f..dcfdca3a9248 100644 Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ diff --git a/app-eselect/eselect-iptables/eselect-iptables-20200508.ebuild b/app-eselect/eselect-iptables/eselect-iptables-20200508.ebuild index f033207e9698..734c7d425d23 100644 --- a/app-eselect/eselect-iptables/eselect-iptables-20200508.ebuild +++ b/app-eselect/eselect-iptables/eselect-iptables-20200508.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~chutzpah/dist/iptables/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -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="app-admin/eselect" diff --git a/app-eselect/eselect-rust/eselect-rust-20200419.ebuild b/app-eselect/eselect-rust/eselect-rust-20200419.ebuild index 505dc6789336..e8554ff59f49 100644 --- a/app-eselect/eselect-rust/eselect-rust-20200419.ebuild +++ b/app-eselect/eselect-rust/eselect-rust-20200419.ebuild @@ -8,7 +8,7 @@ if [[ ${PV} == "99999999" ]] ; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git" else SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2" - KEYWORDS="amd64 ~arm arm64 ppc64 x86" + KEYWORDS="amd64 arm arm64 ppc64 x86" fi DESCRIPTION="Eselect module for management of multiple Rust versions" diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz index 55da06c5bdb0..fab53d459d48 100644 Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest index bb187789095d..b5f95b458333 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -1,2 +1,2 @@ DIST mc-4.8.24.tar.xz 2434988 BLAKE2B 18bd730d5bfbad19fa5e70fb578cf587a3df8da33885543b3d316548ac0d29bd67e4683d32b2751471e148e89390c7658edb622fd741eae054b7fae774996b60 SHA512 ec9e40198455e7001bb1d06ea060b9b4c32ad3a3750d0cc9bac334b53eb666df1746335bfcd411213fa4386b23e516f6026fe3d74ad9119b2340b26c63ccd4fc -DIST mc-4.8.25_rc1.tar.xz 2487732 BLAKE2B 18bbff9e44bdd2996e5e4dc44389167a90798bc03098850f3df70b8451951e95f66fdd58416e9f44289e072729d4217be7ecf20e65fb4f507e44669d76c13589 SHA512 61e21d905dd28ea732d62c75cb5a18e67f90c7c85376ceb2240089ff7b5d724bcf2cb7de4d89709a44b795cdcbbf123648a302552bd370972e23f0967a3a1353 +DIST mc-4.8.25.tar.xz 2488324 BLAKE2B 47047c85fbe3ce1c54b9a3477c35fb05d76b3688205bfd13db03844bb9d8b3e74498ef4d6b449cfcf79c0188687accd93602274b7e8c0cbffc5247d433e33272 SHA512 51913fd41df18b49498b97ad8e13aa4365cec24ab24169b1abe93209263e4cfea4b52e0faccaf934182c84e8eb5dc49336c885358b4b66c48d38900f890fde5e diff --git a/app-misc/mc/mc-4.8.25_rc1.ebuild b/app-misc/mc/mc-4.8.25.ebuild similarity index 93% rename from app-misc/mc/mc-4.8.25_rc1.ebuild rename to app-misc/mc/mc-4.8.25.ebuild index 563e47b602e1..f2506e57245a 100644 --- a/app-misc/mc/mc-4.8.25_rc1.ebuild +++ b/app-misc/mc/mc-4.8.25.ebuild @@ -3,12 +3,13 @@ EAPI=7 -inherit flag-o-matic vcs-snapshot +inherit flag-o-matic + +MY_P=${P/_/-} DESCRIPTION="GNU Midnight Commander is a text based file manager" HOMEPAGE="https://www.midnight-commander.org" -#SRC_URI="http://ftp.midnight-commander.org/${P}.tar.xz" -SRC_URI="https://www.midnight-commander.org/nopaste/tarball/mc-4.8.24-163-g171957980.tar.xz -> ${P}.tar.xz" +SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz" LICENSE="GPL-3" SLOT="0" @@ -39,6 +40,8 @@ DEPEND="${RDEPEND} RESTRICT="!test? ( test )" +S=${WORKDIR}/${MY_P} + pkg_pretend() { if use slang && use unicode ; then ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled." diff --git a/app-misc/neofetch/neofetch-7.0.0.ebuild b/app-misc/neofetch/neofetch-7.0.0.ebuild index 16837479730e..2b82020241d3 100644 --- a/app-misc/neofetch/neofetch-7.0.0.ebuild +++ b/app-misc/neofetch/neofetch-7.0.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 if [[ ${PV} != *9999* ]]; then SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~mips ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~x86" else inherit git-r3 EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git" diff --git a/app-misc/prog-express/prog-express-3.8.8.ebuild b/app-misc/prog-express/prog-express-3.8.8.ebuild index 899e0b637b5f..7eeddbbb7e78 100644 --- a/app-misc/prog-express/prog-express-3.8.8.ebuild +++ b/app-misc/prog-express/prog-express-3.8.8.ebuild @@ -12,7 +12,7 @@ SRC_URI=" x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/${P}-1.i386.deb ) " -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* ~amd64 x86" LICENSE="prog-express" SLOT="0" diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz index ee1d2da452e6..822eea345c16 100644 Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index 867835ec111f..351fbb7e9b7c 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -1,2 +1 @@ -DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f diff --git a/app-office/calligra/calligra-3.1.0-r4.ebuild b/app-office/calligra/calligra-3.1.0-r4.ebuild deleted file mode 100644 index 9e095aa47228..000000000000 --- a/app-office/calligra/calligra-3.1.0-r4.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CHECKREQS_DISK_BUILD="4G" -ECM_HANDBOOK_DIR="xxx" # contains no language subdirs -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit check-reqs ecm - -DESCRIPTION="KDE Office Suite" -HOMEPAGE="https://www.calligra.org/" -SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="amd64 x86" - -CAL_FTS=( karbon sheets stage words ) - -IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms okular openexr - +pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})" - -# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) -# Required for the matlab/octave formula tool -BDEPEND=" - sys-devel/gettext -" -COMMON_DEPEND=" - dev-lang/perl - >=dev-qt/designer-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtscript-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdelibs4support-${KFMIN}:5 - >=kde-frameworks/kemoticons-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kross-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - sys-libs/zlib - virtual/libiconv - activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) - charts? ( dev-libs/kdiagram:5 ) - crypt? ( app-crypt/qca:2[qt5(+)] ) - fontconfig? ( media-libs/fontconfig ) - gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] ) - gsl? ( sci-libs/gsl ) - import-filter? ( - app-text/libetonyek - app-text/libodfgen - app-text/libwpd:* - app-text/libwpg:* - >=app-text/libwps-0.4 - dev-libs/librevenge - >=kde-frameworks/khtml-${KFMIN}:5 - media-libs/libvisio - ) - lcms? ( - media-libs/ilmbase:= - media-libs/lcms:2 - ) - openexr? ( media-libs/openexr ) - pdf? ( >=app-text/poppler-0.73:=[qt5] ) - phonon? ( media-libs/phonon[qt5(+)] ) - spacenav? ( dev-libs/libspnav ) - truetype? ( media-libs/freetype:2 ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - ) - calligra_features_sheets? ( dev-cpp/eigen:3 ) - calligra_features_stage? ( okular? ( >=kde-apps/okular-19.04.3:5 ) ) - calligra_features_words? ( - dev-libs/libxslt - okular? ( >=kde-apps/okular-19.04.3:5 ) - ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) -" -RDEPEND="${COMMON_DEPEND} - calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) - !app-office/calligra:4 - !app-office/calligra-l10n:4 -" -RESTRICT+=" test" - -PATCHES=( - "${FILESDIR}"/${P}-no-arch-detection.patch - "${FILESDIR}"/${P}-doc.patch - "${FILESDIR}"/${P}-{,stage-}qt-5.11.patch - "${FILESDIR}"/${P}-poppler-0.{69,71,72,73}.patch - "${FILESDIR}"/${P}-no-webkit.patch - "${FILESDIR}"/${P}-missing-header.patch -) - -pkg_pretend() { - check-reqs_pkg_pretend -} - -pkg_setup() { - ecm_pkg_setup - check-reqs_pkg_setup -} - -src_prepare() { - ecm_src_prepare - - if has_version ">=app-text/poppler-0.82"; then - eapply "${FILESDIR}/${P}-poppler-0.82.patch" # TODO: make upstreamable patch - fi - - if has_version ">=app-text/poppler-0.83"; then - eapply "${FILESDIR}/${P}-poppler-0.83.patch" # TODO: make upstreamable patch - fi - - if ! use test; then - sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \ - -i libs/pigment/CMakeLists.txt || die - fi - - # Unconditionally disable deprecated deps (required by QtQuick1) - ecm_punt_bogus_dep Qt5 Declarative - ecm_punt_bogus_dep Qt5 OpenGL - - # Hack around the excessive use of CMake macros - if use okular && ! use calligra_features_words; then - sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \ - extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT" - fi - - if use okular && ! use calligra_features_stage; then - sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \ - extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP" - fi -} - -src_configure() { - local cal_ft myproducts - - # applications - for cal_ft in ${CAL_FTS[@]}; do - use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" ) - done - - use lcms && myproducts+=( PLUGIN_COLORENGINES ) - use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR ) - - local mycmakeargs=( - -DPACKAGERS_BUILD=OFF - -DRELEASE_BUILD=ON - -DWITH_Iconv=ON - -DPRODUCTSET="${myproducts[*]}" - $(cmake_use_find_package activities KF5Activities) - $(cmake_use_find_package charts KChart) - -DWITH_Qca-qt5=$(usex crypt) - -DWITH_Fontconfig=$(usex fontconfig) - $(cmake_use_find_package gemini Libgit2) - $(cmake_use_find_package gemini Qt5QuickWidgets) - -DWITH_GSL=$(usex gsl) - -DWITH_LibEtonyek=$(usex import-filter) - -DWITH_LibOdfGen=$(usex import-filter) - -DWITH_LibRevenge=$(usex import-filter) - -DWITH_LibVisio=$(usex import-filter) - -DWITH_LibWpd=$(usex import-filter) - -DWITH_LibWpg=$(usex import-filter) - -DWITH_LibWps=$(usex import-filter) - $(cmake_use_find_package phonon Phonon4Qt5) - -DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON - -DWITH_LCMS2=$(usex lcms) - -DWITH_Okular5=$(usex okular) - -DWITH_OpenEXR=$(usex openexr) - -DWITH_Poppler=$(usex pdf) - -DWITH_Eigen3=$(usex calligra_features_sheets) - -DBUILD_UNMAINTAINED=$(usex calligra_features_stage) - -ENABLE_CSTESTER_TESTING=$(usex test) - -DWITH_Freetype=$(usex truetype) - ) - - ecm_src_configure -} diff --git a/app-office/calligra/files/calligra-3.1.0-doc.patch b/app-office/calligra/files/calligra-3.1.0-doc.patch deleted file mode 100644 index ad150edbf8a4..000000000000 --- a/app-office/calligra/files/calligra-3.1.0-doc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt 2018-03-15 16:59:36.624682111 +0100 -+++ b/CMakeLists.txt 2018-03-15 17:07:02.306267220 +0100 -@@ -1160,9 +1160,7 @@ - add_subdirectory(braindump) - endif() - --if(SHOULD_BUILD_DOC) -- add_subdirectory(doc) --endif() -+add_subdirectory(doc) - - if(SHOULD_BUILD_PART_QTQUICK) - add_subdirectory(qtquick) diff --git a/app-office/calligra/files/calligra-3.1.0-missing-header.patch b/app-office/calligra/files/calligra-3.1.0-missing-header.patch deleted file mode 100644 index f15c3787172d..000000000000 --- a/app-office/calligra/files/calligra-3.1.0-missing-header.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0c5430697bdcf41a45046107b28014e40c49a11a Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Tue, 23 Jul 2019 13:02:34 +0200 -Subject: Fix compilation with Qt 5.13 (missing include) - ---- - sheets/plugins/calendar/CalendarToolWidget.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp -index b10b230..0c5eeb6 100644 ---- a/sheets/plugins/calendar/CalendarToolWidget.cpp -+++ b/sheets/plugins/calendar/CalendarToolWidget.cpp -@@ -30,6 +30,7 @@ - #include - - #include -+#include - - namespace Calligra - { --- -cgit v1.1 diff --git a/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch b/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch deleted file mode 100644 index aa83ba1a3010..000000000000 --- a/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch +++ /dev/null @@ -1,17 +0,0 @@ -Avoid automagic CXXFLAG detection courtesy of dev-libs/vc. - -Gentoo-bug: 584118 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -617,10 +617,6 @@ - endif() - endmacro() - -- if (NOT PACKAGERS_BUILD) -- # Optimize the whole Calligra for current architecture -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}") -- endif () - endif() - set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} ) - diff --git a/app-office/calligra/files/calligra-3.1.0-no-webkit.patch b/app-office/calligra/files/calligra-3.1.0-no-webkit.patch deleted file mode 100644 index f126e2e51386..000000000000 --- a/app-office/calligra/files/calligra-3.1.0-no-webkit.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 9817c4c2ee1e11ae1d2eacb31b8a2a65d6ea6e8d Mon Sep 17 00:00:00 2001 -From: Dag Andersen -Date: Mon, 22 Oct 2018 09:41:53 +0200 -Subject: Stage does not use WebKit, so remove - ---- - CMakeLists.txt | 21 +-------------------- - stage/part/CMakeLists.txt | 1 - - 2 files changed, 1 insertion(+), 21 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8b148c0..1e29140 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -272,14 +272,7 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET - Quick - QuickWidgets - Sql -- WebKit --# WebKitWidgets --) --message("**********************************************************************************************************************") --message("**********************************************************************************************************************") --message("Qt WebKitWidgets is required for Stage's html export preview. This will need porting, as that module no longer exists.") --message("**********************************************************************************************************************") --message("**********************************************************************************************************************") -+) - - # Qt5Declarative was removed in Qt 5.6.0 so search for it in a separate call - # Including it in a collected find_package(Qt5 ...) call can lead to a fatal not-found error: -@@ -313,14 +306,6 @@ set_package_properties(Qt5WebKit PROPERTIES - PURPOSE "Required for Braindump's Web shape" - TYPE OPTIONAL - ) --set_package_properties(Qt5WebKitWidget PROPERTIES -- PURPOSE "Required for Stage" -- TYPE RECOMMENDED --) -- --if(Qt5WebKit_FOUND) -- add_definitions( -DCAN_USE_QTWEBKIT ) --endif() - - set(HAVE_OPENGL ${Qt5OpenGL_FOUND}) - -@@ -983,10 +968,6 @@ calligra_drop_product_on_bad_condition( FEATURE_RDF - Soprano_FOUND "Soprano not found" - ) - --# calligra_drop_product_on_bad_condition( PART_STAGE --# Qt5WebKitWidgets_FOUND "Qt5WebKitWidgets devel not found" --# ) -- - calligra_drop_product_on_bad_condition( PART_SHEETS - EIGEN3_FOUND "Eigen devel not found" - ) -diff --git a/stage/part/CMakeLists.txt b/stage/part/CMakeLists.txt -index d6000a1..9bdc840 100644 ---- a/stage/part/CMakeLists.txt -+++ b/stage/part/CMakeLists.txt -@@ -165,7 +165,6 @@ target_link_libraries(calligrastageprivate - KF5::IconThemes - KF5::Completion - Qt5::Svg --# Qt5::WebKitWidgets - ) - if(HAVE_OPENGL) - target_link_libraries(calligrastageprivate PRIVATE Qt5::OpenGL) --- -cgit v1.1 diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.69.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.69.patch deleted file mode 100644 index c82fbd242b8a..000000000000 --- a/app-office/calligra/files/calligra-3.1.0-poppler-0.69.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 56bd4bab320b0c0a893751caee9a15a2241e3ef8 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Wed, 24 Oct 2018 08:28:00 +0200 -Subject: Fix build with poppler>=0.69 - -Remove no longer available Object::memCheck usage (which didn't do anything anyway since DEBUG_MEM was not set); add some const's - -Differential Revision: https://phabricator.kde.org/D16388 ---- - filters/karbon/pdf/PdfImport.cpp | 3 --- - filters/karbon/pdf/SvgOutputDev.cpp | 8 ++++---- - filters/karbon/pdf/SvgOutputDev.h | 2 +- - 3 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp -index c3e96b0..48b08df 100644 ---- a/filters/karbon/pdf/PdfImport.cpp -+++ b/filters/karbon/pdf/PdfImport.cpp -@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt - delete globalParams; - globalParams = 0; - -- // check for memory leaks -- Object::memCheck(stderr); -- - return KoFilter::OK; - } - -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 931917a..7901317 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -212,7 +212,7 @@ QString SvgOutputDev::convertMatrix(const QMatrix &matrix) - .arg(matrix.dx()) .arg(matrix.dy()); - } - --QString SvgOutputDev::convertMatrix(double * matrix) -+QString SvgOutputDev::convertMatrix(const double * matrix) - { - return QString("matrix(%1 %2 %3 %4 %5 %6)") - .arg(matrix[0]).arg(matrix[1]) -@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) - - QString str; - -- char * p = s->getCString(); -+ const char * p = s->getCString(); - int len = s->getLength(); - CharCode code; - Unicode *u = nullptr; -@@ -429,7 +429,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) - double x = state->getCurX(); - double y = state->getCurY(); - -- double * ctm = state->getCTM(); -+ const double * ctm = state->getCTM(); - QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); - - QMatrix mirror; -@@ -522,7 +522,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, - return; - } - -- double * ctm = state->getCTM(); -+ const double * ctm = state->getCTM(); - QMatrix m; - m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]); - -diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h -index 85fe55d..2a44908 100644 ---- a/filters/karbon/pdf/SvgOutputDev.h -+++ b/filters/karbon/pdf/SvgOutputDev.h -@@ -84,7 +84,7 @@ public: - private: - QString convertPath(GfxPath *path); - QString convertMatrix(const QMatrix &matrix); -- QString convertMatrix(double * matrix); -+ QString convertMatrix(const double * matrix); - QString printFill(); - QString printStroke(); - --- -cgit v1.1 diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.71.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.71.patch deleted file mode 100644 index 6b50e3a42ed0..000000000000 --- a/app-office/calligra/files/calligra-3.1.0-poppler-0.71.patch +++ /dev/null @@ -1,202 +0,0 @@ -From fa4c2961b8280456d4c1484565b973d312e0bd1c Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Thu, 25 Oct 2018 23:04:39 +0200 -Subject: Mark the functions as override - -So when poppler API breaks (as it often does) it stops compiling and -someone has to fix it - -From 82d68cebf870ac97fd27b626a08c3fb4dd94ea3e Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Thu, 25 Oct 2018 23:06:34 +0200 -Subject: GBool -> bool - -It was just a typedef in poppler and it'll die in next versions - -From f099b8e143bbeb1de3c7e89f4764006c3de61ae4 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Fri, 2 Nov 2018 21:23:13 +0100 -Subject: Fix build with poppler 0.71 - -Port away from removed API - -diff -u a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -39,7 +39,7 @@ - { - public: - Private(const QString &fname) -- : svgFile(fname), defs(0), body(0), state(gTrue) -+ : svgFile(fname), defs(0), body(0), state(true) - , brush(Qt::SolidPattern) {} - - ~Private() { -@@ -52,7 +52,7 @@ - QString defsData; - QTextStream * defs; - QTextStream * body; -- GBool state; -+ bool state; - QSizeF pageSize; - QPen pen; - QBrush brush; -@@ -62,7 +62,7 @@ - : d(new Private(fileName)) - { - if (! d->svgFile.open(QIODevice::WriteOnly)) { -- d->state = gFalse; -+ d->state = false; - return; - } - -@@ -75,24 +75,24 @@ - delete d; - } - --GBool SvgOutputDev::isOk() -+bool SvgOutputDev::isOk() - { - return d->state; - } - --GBool SvgOutputDev::upsideDown() -+bool SvgOutputDev::upsideDown() - { -- return gTrue; -+ return true; - } - --GBool SvgOutputDev::useDrawChar() -+bool SvgOutputDev::useDrawChar() - { -- return gFalse; -+ return false; - } - --GBool SvgOutputDev::interpretType3Chars() -+bool SvgOutputDev::interpretType3Chars() - { -- return gFalse; -+ return false; - } - - void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/) -@@ -387,7 +387,7 @@ - return stroke; - } - --void SvgOutputDev::drawString(GfxState * state, GooString * s) -+void SvgOutputDev::drawString(GfxState * state, const GooString * s) - { - int render = state->getRender(); - // check for invisible text -- this is used by Acrobat Capture -@@ -476,7 +476,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) - - void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- int *maskColors, GBool /*inlineImg*/) -+ bool /*interpolate*/, int *maskColors, bool inlineImg) - { - ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); - imgStr->reset(); -@@ -550,7 +549,0 @@ --void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, -- int width, int height, GfxImageColorMap *colorMap, -- GBool /*interpolate*/, int *maskColors, GBool inlineImg) --{ -- drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg); --} -- - ---- a/filters/karbon/pdf/SvgOutputDev.h -+++ b/filters/karbon/pdf/SvgOutputDev.h -@@ -20,11 +20,6 @@ - #ifndef SVGOUTPUTDEV_H - #define SVGOUTPUTDEV_H - --// Don't show this warning: it's an issue in poppler --#ifdef __GNUC__ --#pragma GCC diagnostic ignored "-Wunused-parameter" --#endif -- - #include - #include - -@@ -44,40 +44,37 @@ - explicit SvgOutputDev(const QString &fileName); - virtual ~SvgOutputDev(); - -- GBool isOk(); -+ bool isOk(); - -- virtual GBool upsideDown(); -- virtual GBool useDrawChar(); -- virtual GBool interpretType3Chars(); -- virtual void startPage(int pageNum, GfxState *state, XRef *xref); -- virtual void endPage(); -+ bool upsideDown() override; -+ bool useDrawChar() override; -+ bool interpretType3Chars() override; -+ void startPage(int pageNum, GfxState *state, XRef *xref) override; -+ void endPage() override; - - // path painting -- virtual void stroke(GfxState * state); -- virtual void fill(GfxState * state); -- virtual void eoFill(GfxState *state); -+ void stroke(GfxState * state) override; -+ void fill(GfxState * state) override; -+ void eoFill(GfxState *state) override; - - // text -- virtual void drawString(GfxState * state, GooString * s); -+ void drawString(GfxState * state, const GooString * s) override; - - // images -- virtual void drawImage(GfxState *state, Object *ref, Stream *str, -+ void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- int *maskColors, GBool inlineImg); -- virtual void drawImage(GfxState *state, Object *ref, Stream *str, -- int width, int height, GfxImageColorMap *colorMap, -- GBool interpolate, int *maskColors, GBool inlineImg); -+ bool interpolate, int *maskColors, bool inlineImg) override; - - // styles -- virtual void updateAll(GfxState *state); -- virtual void updateFillColor(GfxState *state); -- virtual void updateStrokeColor(GfxState *state); -- virtual void updateFillOpacity(GfxState *state); -- virtual void updateStrokeOpacity(GfxState *state); -- virtual void updateLineJoin(GfxState *state); -- virtual void updateLineCap(GfxState *state); -- virtual void updateMiterLimit(GfxState *state); -- virtual void updateLineWidth(GfxState *state); -+ void updateAll(GfxState *state) override; -+ void updateFillColor(GfxState *state) override; -+ void updateStrokeColor(GfxState *state) override; -+ void updateFillOpacity(GfxState *state) override; -+ void updateStrokeOpacity(GfxState *state) override; -+ void updateLineJoin(GfxState *state) override; -+ void updateLineCap(GfxState *state) override; -+ void updateMiterLimit(GfxState *state) override; -+ void updateLineWidth(GfxState *state) override; - - /// Dumps content to svg file - void dumpContent(); ---- a/filters/karbon/pdf/PdfImport.cpp -+++ b/filters/karbon/pdf/PdfImport.cpp -@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt - SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile()); - if (dev->isOk()) { - int rotate = 0; -- GBool useMediaBox = gTrue; -- GBool crop = gFalse; -- GBool printing = gFalse; -+ bool useMediaBox = true; -+ bool crop = false; -+ bool printing = false; - pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing); - dev->dumpContent(); - } diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch deleted file mode 100644 index 817a8ddcd679..000000000000 --- a/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3784fdf0259a14f1f7b20c156dcfe42b45d76896 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Thu, 24 Jan 2019 23:55:02 +0100 -Subject: [PATCH] Fix build with poppler-0.72 - -This is a downstream fix without backwards compat, not upstreamable. ---- - filters/karbon/pdf/SvgOutputDev.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 391e86cc117..bc72a003efb 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) - - QString str; - -- const char * p = s->getCString(); -+ const char * p = s->c_str(); - int len = s->getLength(); - CharCode code; - Unicode *u = nullptr; -@@ -451,10 +451,10 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) - *d->body << " y=\"" << y << "px\""; - - if (font && font->getFamily()) { -- *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\""; -+ *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\""; - //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() ); - } else if (font && font->getName()) { -- *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\""; -+ *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\""; - //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() ); - } - *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\""; --- -2.20.1 - diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch deleted file mode 100644 index 727f6edf3f12..000000000000 --- a/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a1ddd91e6c354e8f0dda40f8a522053c3fa19c39 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Tue, 15 Jan 2019 22:24:08 +0100 -Subject: Guchar -> unsigned char - -It was just a typdef and it's now gone ---- - filters/karbon/pdf/SvgOutputDev.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 80f01a5..1a5aa30b 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -496,7 +496,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, - if (maskColors) { - for (int y = 0; y < height; y++) { - dest = (unsigned int *)(buffer + y * 4 * width); -- Guchar * pix = imgStr->getLine(); -+ unsigned char * pix = imgStr->getLine(); - colorMap->getRGBLine(pix, dest, width); - - for (int x = 0; x < width; x++) { -@@ -515,7 +515,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, - } else { - for (int y = 0; y < height; y++) { - dest = (unsigned int *)(buffer + y * 4 * width); -- Guchar * pix = imgStr->getLine(); -+ unsigned char * pix = imgStr->getLine(); - colorMap->getRGBLine(pix, dest, width); - } - --- -cgit v1.1 - diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch deleted file mode 100644 index 4cb9d1872ebb..000000000000 --- a/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch +++ /dev/null @@ -1,35 +0,0 @@ -Patch stolen from Mageia Cauldron but had to be modified quite a bit. - -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index ffdbf01..70bc9f8 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -405,7 +405,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) - const char * p = s->c_str(); - int len = s->getLength(); - CharCode code; -- Unicode *u = nullptr; -+ const Unicode *u = nullptr; - int uLen; - double dx, dy, originX, originY; - while (len > 0) { -@@ -545,7 +545,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, - - void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- bool /*interpolate*/, int *maskColors, bool inlineImg) -+ bool /*interpolate*/, const int *maskColors, bool inlineImg) - { - drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg); - } ---- a/filters/karbon/pdf/SvgOutputDev.h -+++ b/filters/karbon/pdf/SvgOutputDev.h -@@ -63,7 +63,7 @@ public: - // images - void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- bool interpolate, int *maskColors, bool inlineImg) override; -+ bool interpolate, const int *maskColors, bool inlineImg) override; - - // styles - virtual void updateAll(GfxState *state); diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.83.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.83.patch deleted file mode 100644 index 383131ab3871..000000000000 --- a/app-office/calligra/files/calligra-3.1.0-poppler-0.83.patch +++ /dev/null @@ -1,69 +0,0 @@ -Source: Timo Gurr -Upstream: Reported, https://bugs.kde.org/show_bug.cgi?id=414795 -Reason: Fix build with poppler 0.83.0 - -diff -Naur calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp calligra-3.1.0.new/filters/karbon/pdf/PdfImport.cpp ---- calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp 2019-12-04 12:41:13.000000000 +0100 -+++ calligra-3.1.0.new/filters/karbon/pdf/PdfImport.cpp 2019-12-04 12:39:03.000000000 +0100 -@@ -60,19 +60,17 @@ - } - - // read config file -- globalParams = new GlobalParams(); -+ globalParams.reset(new GlobalParams()); - if (! globalParams) - return KoFilter::NotImplemented; - - GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); - PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); - if (! pdfDoc) { -- delete globalParams; - return KoFilter::StupidError; - } - - if (! pdfDoc->isOk()) { -- delete globalParams; - delete pdfDoc; - return KoFilter::StupidError; - } -@@ -99,7 +97,6 @@ - - delete dev; - delete pdfDoc; -- delete globalParams; - globalParams = 0; - - return KoFilter::OK; -diff -Naur calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.cpp ---- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp 2019-12-04 12:41:14.000000000 +0100 -+++ calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.cpp 2019-12-04 12:35:30.000000000 +0100 -@@ -172,7 +172,7 @@ - *d->body << "/>" << endl; - } - --QString SvgOutputDev::convertPath(GfxPath *path) -+QString SvgOutputDev::convertPath(const GfxPath *path) - { - if (! path) - return QString(); -@@ -180,7 +180,7 @@ - QString output; - - for (int i = 0; i < path->getNumSubpaths(); ++i) { -- GfxSubpath * subpath = path->getSubpath(i); -+ const GfxSubpath * subpath = path->getSubpath(i); - if (subpath->getNumPoints() > 0) { - output += QString("M%1 %2").arg(subpath->getX(0)).arg(subpath->getY(0)); - int j = 1; -diff -Naur calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.h ---- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h 2019-12-04 12:41:14.000000000 +0100 -+++ calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.h 2019-12-04 12:30:41.000000000 +0100 -@@ -83,7 +83,7 @@ - /// Dumps content to svg file - void dumpContent(); - private: -- QString convertPath(GfxPath *path); -+ QString convertPath(const GfxPath *path); - QString convertMatrix(const QMatrix &matrix); - QString convertMatrix(const double * matrix); - QString printFill(); diff --git a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch deleted file mode 100644 index bdbe4b6e8559..000000000000 --- a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch +++ /dev/null @@ -1,109 +0,0 @@ -From f53805bdc108b608e40f217e6a78e7e4df4284f2 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 18 Mar 2018 11:56:57 +0100 -Subject: [PATCH] Fix build with Qt 5.11 (missing headers) - -Reviewers: #calligra:_3.0 - -Tags: #calligra:_3.0 - -Differential Revision: https://phabricator.kde.org/D11454 ---- - libs/widgets/KoCsvImportDialog.cpp | 1 + - libs/widgets/KoPageLayoutWidget.cpp | 2 ++ - plugins/chartshape/dialogs/TableEditorDialog.cpp | 1 + - plugins/formulashape/FormulaToolWidget.cpp | 1 + - sheets/dialogs/LayoutDialog.cpp | 1 + - words/part/dialogs/KWAnchoringProperties.cpp | 1 + - words/part/dialogs/KWRunAroundProperties.cpp | 2 ++ - 15 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp -index 0ffdcf62a70..cdca006dc62 100644 ---- a/libs/widgets/KoCsvImportDialog.cpp -+++ b/libs/widgets/KoCsvImportDialog.cpp -@@ -21,6 +21,7 @@ - #include "KoCsvImportDialog.h" - - // Qt -+#include - #include - #include - -diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp -index f91555ca262..a3816f96d8a 100644 ---- a/libs/widgets/KoPageLayoutWidget.cpp -+++ b/libs/widgets/KoPageLayoutWidget.cpp -@@ -23,6 +23,8 @@ - - #include - -+#include -+ - class Q_DECL_HIDDEN KoPageLayoutWidget::Private - { - public: -diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp -index c0d5136f09e..d2a772e83c2 100644 ---- a/plugins/chartshape/dialogs/TableEditorDialog.cpp -+++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp -@@ -24,6 +24,7 @@ - - // Qt - #include -+#include - - // Calligra - #include -diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp -index ed109192cc5..8f521779617 100644 ---- a/plugins/formulashape/FormulaToolWidget.cpp -+++ b/plugins/formulashape/FormulaToolWidget.cpp -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - - FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent ) -diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp -index a0a9832ddfc..7d7db53823b 100644 ---- a/sheets/dialogs/LayoutDialog.cpp -+++ b/sheets/dialogs/LayoutDialog.cpp -@@ -36,6 +36,7 @@ - #include - - #include -+#include - #include - #include - #include -diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp -index d64208cbdb6..bfddb3a03f5 100644 ---- a/words/part/dialogs/KWAnchoringProperties.cpp -+++ b/words/part/dialogs/KWAnchoringProperties.cpp -@@ -35,6 +35,7 @@ - - #include - -+#include - #include - - const int KWAnchoringProperties::vertRels[4][20] = { -diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp -index e38599a06d7..7e8b2d51ef9 100644 ---- a/words/part/dialogs/KWRunAroundProperties.cpp -+++ b/words/part/dialogs/KWRunAroundProperties.cpp -@@ -28,6 +28,8 @@ - - #include - -+#include -+ - KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state) - : m_state(state) - { --- -2.16.2 - diff --git a/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch deleted file mode 100644 index 120864e11d45..000000000000 --- a/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Tue, 3 Apr 2018 00:31:19 +0200 -Subject: Fix compilation with Qt 5.11 (missing include) - ---- - stage/part/KPrPresentationTool.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp -index ae743da..3007f91 100644 ---- a/stage/part/KPrPresentationTool.cpp -+++ b/stage/part/KPrPresentationTool.cpp -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include - #include --- -cgit v0.11.2 diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 823daf4f2db2..968c3cbf84b2 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,2 +1 @@ -DIST scribus-1.5.5.tar.xz 73861836 BLAKE2B 1a10878eaba67116d72c20d8ecd8952764c709ad14d575e4eb921b4f8a7c4525b73e6722f610b1cce57c08540f619d6ebd3d32e04b653b310e475026c185561b SHA512 2d62424ad609296df33ced550940fceb4e15133a595a740cc4f4b4ffbc92aa31737336ac7716c2eed20d2866e37f5a9b780a44d86128daa6bbad3ccb58168b50 DIST scribus-1.5.5_p20200626.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245 diff --git a/app-office/scribus/files/scribus-1.5.5-docdir.patch b/app-office/scribus/files/scribus-1.5.5-docdir.patch deleted file mode 100644 index 897a8a75ae95..000000000000 --- a/app-office/scribus/files/scribus-1.5.5-docdir.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f5b3e77..4c5fd3f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -313,14 +313,16 @@ else() - endif() - - #SHARE - use the default on Apple as TAG_VERSION is empty --if(WIN32 OR OS2) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") --elseif(TAG_VERSION OR BUILD_OSX_BUNDLE) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") --elseif(NOT WANT_VERSIONING) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") --else() -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") -+if(NOT DOCDIR) -+ if(WIN32 OR OS2) -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") -+ elseif(TAG_VERSION OR BUILD_OSX_BUNDLE) -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") -+ elseif(NOT WANT_VERSIONING) -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") -+ else() -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") -+ endif() - endif() - - if(IS_ABSOLUTE ${DOCDIR} AND WANT_RELOCATABLE) diff --git a/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch b/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch deleted file mode 100644 index a8993ca63874..000000000000 --- a/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/CMakeLists.txt 2019-07-31 00:34:43.000000000 +0200 -+++ b/CMakeLists.txt 2019-10-02 00:17:34.968355656 +0200 -@@ -954,6 +954,16 @@ - endif() - #>>HUNSPELL for Speelling support - -+#<>HYPHEN for Hyphenation support -+ - #< -Date: Mon, 28 Oct 2019 22:11:56 +0000 -Subject: [PATCH] Work around poppler 0.82 signature changes - -git-svn-id: svn://scribus.net/trunk/Scribus@23287 11d20701-8431-0410-a711-e3c959e3b870 - -Use same mechanism as with previous poppler versions to support change of constness in function signatures - -git-svn-id: svn://scribus.net/trunk/Scribus@23289 11d20701-8431-0410-a711-e3c959e3b870 ---- - scribus/plugins/import/pdf/importpdfconfig.h | 6 ++++++ - scribus/plugins/import/pdf/slaoutput.cpp | 6 +++--- - scribus/plugins/import/pdf/slaoutput.h | 6 +++--- - 3 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h -index 2a13b0d10..9913ee382 100644 ---- a/scribus/plugins/import/pdf/importpdfconfig.h -+++ b/scribus/plugins/import/pdf/importpdfconfig.h -@@ -52,4 +52,10 @@ for which a new license (GPL+exception) is in place. - #define POPPLER_REF - #endif - -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 82, 0) -+#define POPPLER_CONST_082 const -+#else -+#define POPPLER_CONST_082 -+#endif -+ - #endif -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index 6094f3d9e..520474f65 100644 ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -2784,7 +2784,7 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, i - delete[] mbuffer; - } - --void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg) -+void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, POPPLER_CONST_082 int* maskColors, GBool inlineImg) - { - ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); - // qDebug() << "Image Components" << colorMap->getNumPixelComps() << "Mask" << maskColors; -@@ -3365,7 +3365,7 @@ err1: - fontsrc->unref(); - } - --void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, Unicode *u, int uLen) -+void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, POPPLER_CONST_082 Unicode *u, int uLen) - { - double x1, y1, x2, y2; - int render; -@@ -3452,7 +3452,7 @@ void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, doub - } - } - --GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen) -+GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, POPPLER_CONST_082 Unicode *u, int uLen) - { - // qDebug() << "beginType3Char"; - GfxFont *gfxFont; -diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h -index bc4350a03..14a590d55 100644 ---- a/scribus/plugins/import/pdf/slaoutput.h -+++ b/scribus/plugins/import/pdf/slaoutput.h -@@ -229,7 +229,7 @@ public: - - //----- image drawing - void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg) override; -- void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg) override; -+ void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, POPPLER_CONST_082 int *maskColors, GBool inlineImg) override; - void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, -@@ -261,8 +261,8 @@ public: - //----- text drawing - void beginTextObject(GfxState *state) override; - void endTextObject(GfxState *state) override; -- void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/) override; -- GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/) override; -+ void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, POPPLER_CONST_082 Unicode * /*u*/, int /*uLen*/) override; -+ GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, POPPLER_CONST_082 Unicode * /*u*/, int /*uLen*/) override; - void endType3Char(GfxState * /*state*/) override; - void type3D0(GfxState * /*state*/, double /*wx*/, double /*wy*/) override; - void type3D1(GfxState * /*state*/, double /*wx*/, double /*wy*/, double /*llx*/, double /*lly*/, double /*urx*/, double /*ury*/) override; --- -2.23.0 - diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.83.patch b/app-office/scribus/files/scribus-1.5.5-poppler-0.83.patch deleted file mode 100644 index 0d52486da924..000000000000 --- a/app-office/scribus/files/scribus-1.5.5-poppler-0.83.patch +++ /dev/null @@ -1,153 +0,0 @@ -Source/Upstream: Yes fixed in svn -Reason: Fix build with poppler 0.83.0 - -From b51c2bab4d57d685f96d427d6816bdd4ecfb4674 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Wed, 4 Dec 2019 05:51:19 +0000 -Subject: [PATCH] #15985: Fix failure to build against poppler 0.83.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@23395 11d20701-8431-0410-a711-e3c959e3b870 ---- - scribus/plugins/import/pdf/importpdf.cpp | 22 ++++++++++++++++++++ - scribus/plugins/import/pdf/importpdfconfig.h | 6 ++++++ - scribus/plugins/import/pdf/slaoutput.cpp | 4 ++-- - scribus/plugins/import/pdf/slaoutput.h | 2 +- - 4 files changed, 31 insertions(+), 3 deletions(-) - -diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp -index 2ab38ac758..427cd66ef2 100644 ---- a/scribus/plugins/import/pdf/importpdf.cpp -+++ b/scribus/plugins/import/pdf/importpdf.cpp -@@ -74,7 +74,11 @@ PdfPlug::PdfPlug(ScribusDoc* doc, int flags) - QImage PdfPlug::readThumbnail(const QString& fName) - { - QString pdfFile = QDir::toNativeSeparators(fName); -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) -+ globalParams.reset(new GlobalParams()); -+#else - globalParams = new GlobalParams(); -+#endif - if (globalParams) - { - #if defined(Q_OS_WIN32) && POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 62, 0) -@@ -89,7 +93,9 @@ QImage PdfPlug::readThumbnail(const QString& fName) - if (pdfDoc->getErrorCode() == errEncrypted) - { - delete pdfDoc; -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) - delete globalParams; -+#endif - return QImage(); - } - if (pdfDoc->isOk()) -@@ -133,11 +139,15 @@ QImage PdfPlug::readThumbnail(const QString& fName) - image.setText("YSize", QString("%1").arg(h)); - delete dev; - delete pdfDoc; -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) - delete globalParams; -+#endif - return image; - } - delete pdfDoc; -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) - delete globalParams; -+#endif - } - } - return QImage(); -@@ -343,7 +353,11 @@ bool PdfPlug::convert(const QString& fn) - qApp->processEvents(); - } - -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) -+ globalParams.reset(new GlobalParams()); -+#else - globalParams = new GlobalParams(); -+#endif - GooString *userPW = nullptr; - if (globalParams) - { -@@ -385,7 +399,9 @@ bool PdfPlug::convert(const QString& fn) - if (progressDialog) - progressDialog->close(); - delete pdfDoc; -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) - delete globalParams; -+#endif - return false; - } - if (progressDialog) -@@ -430,7 +446,9 @@ bool PdfPlug::convert(const QString& fn) - progressDialog->close(); - delete optImp; - delete pdfDoc; -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) - delete globalParams; -+#endif - return false; - } - pageString = optImp->getPagesString(); -@@ -843,8 +861,12 @@ bool PdfPlug::convert(const QString& fn) - } - delete pdfDoc; - } -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) -+ globalParams.release(); -+#else - delete globalParams; - globalParams = nullptr; -+#endif - - // qDebug() << "converting finished"; - // qDebug() << "Imported" << Elements.count() << "Elements"; -diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h -index 9913ee382c..5a7e0d2162 100644 ---- a/scribus/plugins/import/pdf/importpdfconfig.h -+++ b/scribus/plugins/import/pdf/importpdfconfig.h -@@ -58,4 +58,10 @@ for which a new license (GPL+exception) is in place. - #define POPPLER_CONST_082 - #endif - -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) -+#define POPPLER_CONST_083 const -+#else -+#define POPPLER_CONST_083 -+#endif -+ - #endif -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index 5e4d32a551..ffcfa8450b 100644 ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -3678,7 +3678,7 @@ QString SlaOutputDev::getAnnotationColor(const AnnotColor *color) - return fNam; - } - --QString SlaOutputDev::convertPath(GfxPath *path) -+QString SlaOutputDev::convertPath(POPPLER_CONST_083 GfxPath *path) - { - if (! path) - return QString(); -@@ -3688,7 +3688,7 @@ QString SlaOutputDev::convertPath(GfxPath *path) - - for (int i = 0; i < path->getNumSubpaths(); ++i) - { -- GfxSubpath * subpath = path->getSubpath(i); -+ POPPLER_CONST_083 GfxSubpath * subpath = path->getSubpath(i); - if (subpath->getNumPoints() > 0) - { - output += QString("M %1 %2").arg(subpath->getX(0)).arg(subpath->getY(0)); -diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h -index 60fb900618..d928fada81 100644 ---- a/scribus/plugins/import/pdf/slaoutput.h -+++ b/scribus/plugins/import/pdf/slaoutput.h -@@ -282,7 +282,7 @@ class SlaOutputDev : public OutputDev - void getPenState(GfxState *state); - QString getColor(GfxColorSpace *color_space, POPPLER_CONST_070 GfxColor *color, int *shade); - QString getAnnotationColor(const AnnotColor *color); -- QString convertPath(GfxPath *path); -+ QString convertPath(POPPLER_CONST_083 GfxPath *path); - int getBlendMode(GfxState *state); - void applyMask(PageItem *ite); - void pushGroup(const QString& maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false); diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch b/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch deleted file mode 100644 index de1f39411e8e..000000000000 --- a/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3742559924136c2471ab15081c5b600dd5feaeb0 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Sat, 28 Dec 2019 21:32:29 +0000 -Subject: [PATCH] Fix failure to build with poppler 0.84.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@23429 11d20701-8431-0410-a711-e3c959e3b870 ---- - scribus/plugins/import/pdf/slaoutput.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index ffcfa8450b..d788f9f06c 100644 ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -1189,6 +1189,11 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA) - catalog = catA; - pdfDoc = doc; - updateGUICounter = 0; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 84, 0) -+ m_fontEngine = new SplashFontEngine(true, true, true, true); -+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 61, 0) -+ m_fontEngine = new SplashFontEngine(globalParams->getEnableFreeType(), true, true, true); -+#else - m_fontEngine = new SplashFontEngine( - #if HAVE_T1LIB_H - globalParams->getEnableT1lib(), -@@ -1199,6 +1204,7 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA) - true, - #endif - true); -+#endif - } - - void SlaOutputDev::startPage(int pageNum, GfxState *, XRef *) diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.86.patch b/app-office/scribus/files/scribus-1.5.5-poppler-0.86.patch deleted file mode 100644 index e91bb3afdb6c..000000000000 --- a/app-office/scribus/files/scribus-1.5.5-poppler-0.86.patch +++ /dev/null @@ -1,459 +0,0 @@ -From 67f8771aaff2f55d61b8246f420e762f4b526944 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Mon, 2 Mar 2020 14:45:59 +0000 -Subject: [PATCH] PDF import plugin: support poppler 0.86.x - -git-svn-id: svn://scribus.net/trunk/Scribus@23478 11d20701-8431-0410-a711-e3c959e3b870 ---- - scribus/plugins/import/pdf/importpdf.cpp | 51 +++++++- - scribus/plugins/import/pdf/importpdf.h | 19 +-- - scribus/plugins/import/pdf/slaoutput.cpp | 154 +++++++++++++++++++++-- - scribus/plugins/import/pdf/slaoutput.h | 13 +- - 4 files changed, 215 insertions(+), 22 deletions(-) - -diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp -index 427cd66ef2..4679674a4d 100644 ---- a/scribus/plugins/import/pdf/importpdf.cpp -+++ b/scribus/plugins/import/pdf/importpdf.cpp -@@ -791,11 +791,20 @@ bool PdfPlug::convert(const QString& fn) - names = catDict.dictLookup("OpenAction"); - if (names.isDict()) - { -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ std::unique_ptr linkAction; -+ linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI()); -+#else - LinkAction *linkAction = nullptr; - linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI()); -+#endif - if (linkAction) - { -- LinkJavaScript *jsa = (LinkJavaScript*)linkAction; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ LinkJavaScript *jsa = (LinkJavaScript*) linkAction.get(); -+#else -+ LinkJavaScript *jsa = (LinkJavaScript*) linkAction; -+#endif - if (jsa->isOk()) - { - QString script = UnicodeParsedString(jsa->getScript()); -@@ -1003,3 +1012,43 @@ QString PdfPlug::UnicodeParsedString(POPPLER_CONST GooString *s1) - } - return result; - } -+ -+QString PdfPlug::UnicodeParsedString(const std::string& s1) -+{ -+ if (s1.length() == 0) -+ return QString(); -+ GBool isUnicode; -+ int i; -+ Unicode u; -+ QString result; -+ if ((s1.at(0) & 0xff) == 0xfe && (s1.length() > 1 && (s1.at(1) & 0xff) == 0xff)) -+ { -+ isUnicode = gTrue; -+ i = 2; -+ result.reserve((s1.length() - 2) / 2); -+ } -+ else -+ { -+ isUnicode = gFalse; -+ i = 0; -+ result.reserve(s1.length()); -+ } -+ while (i < s1.length()) -+ { -+ if (isUnicode) -+ { -+ u = ((s1.at(i) & 0xff) << 8) | (s1.at(i+1) & 0xff); -+ i += 2; -+ } -+ else -+ { -+ u = s1.at(i) & 0xff; -+ ++i; -+ } -+ // #15616: imagemagick may write unicode strings incorrectly in PDF -+ if (u == 0) -+ continue; -+ result += QChar( u ); -+ } -+ return result; -+} -diff --git a/scribus/plugins/import/pdf/importpdf.h b/scribus/plugins/import/pdf/importpdf.h -index bb58fd208f..bc55819618 100644 ---- a/scribus/plugins/import/pdf/importpdf.h -+++ b/scribus/plugins/import/pdf/importpdf.h -@@ -82,6 +84,7 @@ class PdfPlug : public QObject - bool convert(const QString& fn); - QRectF getCBox(int box, int pgNum); - QString UnicodeParsedString(POPPLER_CONST GooString *s1); -+ QString UnicodeParsedString(const std::string& s1); - - QList Elements; - double baseX, baseY; -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index 93ceb1e305..6e73049ef7 100644 ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -273,9 +273,15 @@ LinkAction* SlaOutputDev::SC_getAction(AnnotWidget *ano) - } - - /* Replacement for the crippled Poppler function LinkAction* AnnotWidget::getAdditionalAction(AdditionalActionsType type) */ -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+std::unique_ptr SlaOutputDev::SC_getAdditionalAction(const char *key, AnnotWidget *ano) -+{ -+ std::unique_ptr linkAction; -+#else - LinkAction* SlaOutputDev::SC_getAdditionalAction(const char *key, AnnotWidget *ano) - { - LinkAction *linkAction = nullptr; -+#endif - Object obj; - Ref refa = ano->getRef(); - -@@ -420,7 +426,11 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do - POPPLER_CONST GooString *ndst = gto->getNamedDest(); - if (ndst) - { -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ std::unique_ptr dstn = pdfDoc->findDest(ndst); -+#else - LinkDest *dstn = pdfDoc->findDest(ndst); -+#endif - if (dstn) - { - if (dstn->getKind() == destXYZ) -@@ -464,7 +474,11 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do - POPPLER_CONST GooString *ndst = gto->getNamedDest(); - if (ndst) - { -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ std::unique_ptr dstn = pdfDoc->findDest(ndst); -+#else - LinkDest *dstn = pdfDoc->findDest(ndst); -+#endif - if (dstn) - { - if (dstn->getKind() == destXYZ) -@@ -932,7 +946,11 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) - POPPLER_CONST GooString *ndst = gto->getNamedDest(); - if (ndst) - { -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ std::unique_ptr dstn = pdfDoc->findDest(ndst); -+#else - LinkDest *dstn = pdfDoc->findDest(ndst); -+#endif - if (dstn) - { - if (dstn->getKind() == destXYZ) -@@ -984,7 +1002,11 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) - POPPLER_CONST GooString *ndst = gto->getNamedDest(); - if (ndst) - { -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ std::unique_ptr dstn = pdfDoc->findDest(ndst); -+#else - LinkDest *dstn = pdfDoc->findDest(ndst); -+#endif - if (dstn) - { - if (dstn->getKind() == destXYZ) -@@ -1053,96 +1075,148 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) - else - qDebug() << "Found unsupported Action of type" << Lact->getKind(); - } -- LinkAction *Aact = SC_getAdditionalAction("D", ano); -+ auto Aact = SC_getAdditionalAction("D", ano); - if (Aact) - { - if (Aact->getKind() == actionJavaScript) - { -- LinkJavaScript *jsa = (LinkJavaScript*)Aact; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ LinkJavaScript *jsa = (LinkJavaScript*) Aact.get(); -+#else -+ LinkJavaScript *jsa = (LinkJavaScript*) Aact; -+#endif - if (jsa->isOk()) - { - ite->annotation().setD_act(UnicodeParsedString(jsa->getScript())); - ite->annotation().setAAact(true); - } - } -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ Aact.reset(); -+#else - Aact = nullptr; -+#endif - } - Aact = SC_getAdditionalAction("E", ano); - if (Aact) - { - if (Aact->getKind() == actionJavaScript) - { -- LinkJavaScript *jsa = (LinkJavaScript*)Aact; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ LinkJavaScript *jsa = (LinkJavaScript*) Aact.get(); -+#else -+ LinkJavaScript *jsa = (LinkJavaScript*) Aact; -+#endif - if (jsa->isOk()) - { - ite->annotation().setE_act(UnicodeParsedString(jsa->getScript())); - ite->annotation().setAAact(true); - } - } -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ Aact.reset(); -+#else - Aact = nullptr; -+#endif - } - Aact = SC_getAdditionalAction("X", ano); - if (Aact) - { - if (Aact->getKind() == actionJavaScript) - { -- LinkJavaScript *jsa = (LinkJavaScript*)Aact; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ LinkJavaScript *jsa = (LinkJavaScript*) Aact.get(); -+#else -+ LinkJavaScript *jsa = (LinkJavaScript*) Aact; -+#endif - if (jsa->isOk()) - { - ite->annotation().setX_act(UnicodeParsedString(jsa->getScript())); - ite->annotation().setAAact(true); - } - } -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ Aact.reset(); -+#else - Aact = nullptr; -+#endif - } - Aact = SC_getAdditionalAction("Fo", ano); - if (Aact) - { - if (Aact->getKind() == actionJavaScript) - { -- LinkJavaScript *jsa = (LinkJavaScript*)Aact; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ LinkJavaScript *jsa = (LinkJavaScript*) Aact.get(); -+#else -+ LinkJavaScript *jsa = (LinkJavaScript*) Aact; -+#endif - if (jsa->isOk()) - { - ite->annotation().setFo_act(UnicodeParsedString(jsa->getScript())); - ite->annotation().setAAact(true); - } - } -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ Aact.reset(); -+#else - Aact = nullptr; -+#endif - } - Aact = SC_getAdditionalAction("Bl", ano); - if (Aact) - { - if (Aact->getKind() == actionJavaScript) - { -- LinkJavaScript *jsa = (LinkJavaScript*)Aact; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ LinkJavaScript *jsa = (LinkJavaScript*) Aact.get(); -+#else -+ LinkJavaScript *jsa = (LinkJavaScript*) Aact; -+#endif - if (jsa->isOk()) - { - ite->annotation().setBl_act(UnicodeParsedString(jsa->getScript())); - ite->annotation().setAAact(true); - } - } -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ Aact.reset(); -+#else - Aact = nullptr; -+#endif - } - Aact = SC_getAdditionalAction("C", ano); - if (Aact) - { - if (Aact->getKind() == actionJavaScript) - { -- LinkJavaScript *jsa = (LinkJavaScript*)Aact; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ LinkJavaScript *jsa = (LinkJavaScript*) Aact.get(); -+#else -+ LinkJavaScript *jsa = (LinkJavaScript*) Aact; -+#endif - if (jsa->isOk()) - { - ite->annotation().setC_act(UnicodeParsedString(jsa->getScript())); - ite->annotation().setAAact(true); - } - } -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ Aact.reset(); -+#else - Aact = nullptr; -+#endif - } - Aact = SC_getAdditionalAction("F", ano); - if (Aact) - { - if (Aact->getKind() == actionJavaScript) - { -- LinkJavaScript *jsa = (LinkJavaScript*)Aact; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ LinkJavaScript *jsa = (LinkJavaScript*) Aact.get(); -+#else -+ LinkJavaScript *jsa = (LinkJavaScript*) Aact; -+#endif - if (jsa->isOk()) - { - ite->annotation().setF_act(UnicodeParsedString(jsa->getScript())); -@@ -1150,14 +1224,22 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) - ite->annotation().setFormat(5); - } - } -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ Aact.reset(); -+#else - Aact = nullptr; -+#endif - } - Aact = SC_getAdditionalAction("K", ano); - if (Aact) - { - if (Aact->getKind() == actionJavaScript) - { -- LinkJavaScript *jsa = (LinkJavaScript*)Aact; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ LinkJavaScript *jsa = (LinkJavaScript*) Aact.get(); -+#else -+ LinkJavaScript *jsa = (LinkJavaScript*) Aact; -+#endif - if (jsa->isOk()) - { - ite->annotation().setK_act(UnicodeParsedString(jsa->getScript())); -@@ -1165,21 +1247,33 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) - ite->annotation().setFormat(5); - } - } -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ Aact.reset(); -+#else - Aact = nullptr; -+#endif - } - Aact = SC_getAdditionalAction("V", ano); - if (Aact) - { - if (Aact->getKind() == actionJavaScript) - { -- LinkJavaScript *jsa = (LinkJavaScript*)Aact; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ LinkJavaScript *jsa = (LinkJavaScript*) Aact.get(); -+#else -+ LinkJavaScript *jsa = (LinkJavaScript*) Aact; -+#endif - if (jsa->isOk()) - { - ite->annotation().setV_act(UnicodeParsedString(jsa->getScript())); - ite->annotation().setAAact(true); - } - } -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ Aact.reset(); -+#else - Aact = nullptr; -+#endif - } - } - -@@ -3901,6 +3995,46 @@ QString SlaOutputDev::UnicodeParsedString(POPPLER_CONST GooString *s1) - return result; - } - -+QString SlaOutputDev::UnicodeParsedString(const std::string& s1) -+{ -+ if (s1.length() == 0) -+ return QString(); -+ GBool isUnicode; -+ int i; -+ Unicode u; -+ QString result; -+ if ((s1.at(0) & 0xff) == 0xfe && (s1.length() > 1 && (s1.at(1) & 0xff) == 0xff)) -+ { -+ isUnicode = gTrue; -+ i = 2; -+ result.reserve((s1.length() - 2) / 2); -+ } -+ else -+ { -+ isUnicode = gFalse; -+ i = 0; -+ result.reserve(s1.length()); -+ } -+ while (i < s1.length()) -+ { -+ if (isUnicode) -+ { -+ u = ((s1.at(i) & 0xff) << 8) | (s1.at(i+1) & 0xff); -+ i += 2; -+ } -+ else -+ { -+ u = s1.at(i) & 0xff; -+ ++i; -+ } -+ // #15616: imagemagick may write unicode strings incorrectly in PDF -+ if (u == 0) -+ continue; -+ result += QChar( u ); -+ } -+ return result; -+} -+ - bool SlaOutputDev::checkClip() - { - bool ret = false; -diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h -index d928fada81..67b5a51937 100644 ---- a/scribus/plugins/import/pdf/slaoutput.h -+++ b/scribus/plugins/import/pdf/slaoutput.h -@@ -20,6 +20,8 @@ for which a new license (GPL+exception) is in place. - #include - #include - -+#include -+ - #include "fpointarray.h" - #include "importpdfconfig.h" - #include "pageitem.h" -@@ -159,7 +161,11 @@ class SlaOutputDev : public OutputDev - virtual ~SlaOutputDev(); - - LinkAction* SC_getAction(AnnotWidget *ano); -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) -+ std::unique_ptr SC_getAdditionalAction(const char *key, AnnotWidget *ano); -+#else - LinkAction* SC_getAdditionalAction(const char *key, AnnotWidget *ano); -+#endif - static GBool annotations_callback(Annot *annota, void *user_data); - bool handleTextAnnot(Annot* annota, double xCoor, double yCoor, double width, double height); - bool handleLinkAnnot(Annot* annota, double xCoor, double yCoor, double width, double height); -@@ -287,6 +293,7 @@ class SlaOutputDev : public OutputDev - void applyMask(PageItem *ite); - void pushGroup(const QString& maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false); - QString UnicodeParsedString(POPPLER_CONST GooString *s1); -+ QString UnicodeParsedString(const std::string& s1); - bool checkClip(); - bool pathIsClosed {false}; - QString CurrColorFill; diff --git a/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch b/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch deleted file mode 100644 index 4ece0feb8e44..000000000000 --- a/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 17d6a9833488163d7c33c3f2233916b18550e253 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Sun, 29 Mar 2020 10:55:06 +0000 -Subject: [PATCH] #16076: Fix build with Qt 5.15 - -git-svn-id: svn://scribus.net/trunk/Scribus@23541 11d20701-8431-0410-a711-e3c959e3b870 ---- - scribus/ui/scresizecursor.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/scribus/ui/scresizecursor.cpp b/scribus/ui/scresizecursor.cpp -index f2c78e5ae7..85271ed861 100644 ---- a/scribus/ui/scresizecursor.cpp -+++ b/scribus/ui/scresizecursor.cpp -@@ -12,6 +12,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/app-office/scribus/scribus-1.5.5-r1.ebuild b/app-office/scribus/scribus-1.5.5-r1.ebuild deleted file mode 100644 index 9ba577497293..000000000000 --- a/app-office/scribus/scribus-1.5.5-r1.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="tk?" -inherit cmake desktop flag-o-matic python-single-r1 xdg - -DESCRIPTION="Desktop publishing (DTP) and layout program" -HOMEPAGE="https://www.scribus.net/" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - tk? ( scripts )" - -# osg -# couple of third_party libs bundled -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -DEPEND="${PYTHON_DEPS} - app-text/libmspub - app-text/libqxp - app-text/poppler:= - dev-libs/hyphen - >=dev-libs/icu-58.2:0= - dev-libs/librevenge - dev-libs/libxml2 - dev-qt/qtcore:5 - dev-qt/qtgui:5[-gles2-only] - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/fontconfig - media-libs/freetype:2 - >=media-libs/harfbuzz-0.9.42:0=[icu] - media-libs/lcms:2 - media-libs/libcdr - media-libs/libfreehand - media-libs/libpagemaker - media-libs/libpng:0= - media-libs/libvisio - media-libs/libzmf - media-libs/tiff:0 - net-print/cups - sys-libs/zlib[minizip] - virtual/jpeg:0= - >=x11-libs/cairo-1.10.0[X,svg] - boost? ( >=dev-libs/boost-1.67:= ) - hunspell? ( app-text/hunspell:= ) - graphicsmagick? ( media-gfx/graphicsmagick:= ) - osg? ( dev-games/openscenegraph:= ) - pdf? ( app-text/podofo:0= ) - scripts? ( - $(python_gen_cond_dep ' - dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}] - ') - ) -" -RDEPEND="${DEPEND} - app-text/ghostscript-gpl -" - -PATCHES=( - # upstream svn trunk - "${FILESDIR}"/${P}-poppler-0.82.patch - "${FILESDIR}"/${P}-poppler-0.83.patch - "${FILESDIR}"/${P}-poppler-0.84.patch - "${FILESDIR}"/${P}-poppler-0.86.patch - "${FILESDIR}"/${P}-qt-5.15.patch # bug 726046 - # non(?)-upstreamable - "${FILESDIR}"/${PN}-1.5.3-fpic.patch - "${FILESDIR}"/${P}-docdir.patch - "${FILESDIR}"/${P}-findhyphen-{1,2}.patch -) - -src_prepare() { - cmake_src_prepare - - rm -r codegen/cheetah scribus/third_party/hyphen || die - - cat > cmake/modules/FindZLIB.cmake <<- EOF || die - find_package(PkgConfig) - pkg_check_modules(ZLIB minizip zlib) - SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} ) - SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} ) - MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR ) - EOF - sed \ - -e "/^\s*unzip\.[ch]/d" \ - -e "/^\s*ioapi\.[ch]/d" \ - -i scribus/CMakeLists.txt Scribus.pro || die - rm scribus/ioapi.[ch] || die - - sed \ - -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \ - -i resources/templates/CMakeLists.txt || die - - sed \ - -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \ - -i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test -} - -src_configure() { - # bug #550818 - append-cppflags -DHAVE_MEMRCHR - - local mycmakeargs=( - -DHAVE_PYTHON=ON - -DPYTHON_INCLUDE_PATH=$(python_get_includedir) - -DPYTHON_LIBRARY=$(python_get_library_path) - -DWANT_DISTROBUILD=ON - -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/ - -DWITH_BOOST=$(usex boost) - -DWANT_DEBUG=$(usex debug) - -DWANT_NOEXAMPLES=$(usex !examples) - -DWANT_GRAPHICSMAGICK=$(usex graphicsmagick) - -DWANT_HUNSPELL=$(usex hunspell) - -DWANT_HEADERINSTALL=$(usex !minimal) - -DWANT_NOOSG=$(usex !osg) - -DWITH_PODOFO=$(usex pdf) - -DWANT_NOTEMPLATES=$(usex !templates) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - if ! use tk; then - rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die - fi - if use scripts; then - python_fix_shebang "${ED}"/usr/share/scribus/scripts - python_optimize "${ED}"/usr/share/scribus/scripts - else - rm "${ED}"/usr/share/scribus/scripts/*.py || die - fi - - mv "${ED}"/usr/share/doc/${PF}/{en,html} || die - ln -sf html "${ED}"/usr/share/doc/${PF}/en || die - - # These files are parsed to populate the help/about window. - cat >> "${T}"/COPYING <<- EOF || die - ${PN} is licensed under the "${LICENSE}". - Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text. - EOF - dodoc "${T}"/COPYING - docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING} - - local size - for size in 16 32 128 256 512; do - newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png - done - newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png - doicon resources/iconsets/*/scribus.png - domenu scribus.desktop -} diff --git a/app-office/scribus/scribus-1.5.5_p20200626.ebuild b/app-office/scribus/scribus-1.5.5_p20200626.ebuild index bf3f85e57b47..2b4f3fb49c3c 100644 --- a/app-office/scribus/scribus-1.5.5_p20200626.ebuild +++ b/app-office/scribus/scribus-1.5.5_p20200626.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk" REQUIRED_USE="${PYTHON_REQUIRED_USE} diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz index 41558ed7b3aa..5a1ac4e43071 100644 Binary files a/app-pda/Manifest.gz and b/app-pda/Manifest.gz differ diff --git a/app-pda/ifuse/ifuse-1.1.3.ebuild b/app-pda/ifuse/ifuse-1.1.3-r1.ebuild similarity index 97% rename from app-pda/ifuse/ifuse-1.1.3.ebuild rename to app-pda/ifuse/ifuse-1.1.3-r1.ebuild index 9d0c2f66960c..9f08c8c83f43 100644 --- a/app-pda/ifuse/ifuse-1.1.3.ebuild +++ b/app-pda/ifuse/ifuse-1.1.3-r1.ebuild @@ -16,7 +16,7 @@ IUSE="" RDEPEND=">=app-pda/libimobiledevice-1.1.4:= >=app-pda/libplist-1.8:= - >=sys-fs/fuse-2.7.0:=" + sys-fs/fuse:0=" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/app-pda/libimobiledevice/libimobiledevice-1.3.0.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild similarity index 97% rename from app-pda/libimobiledevice/libimobiledevice-1.3.0.ebuild rename to app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild index a2811ac14075..81dee625cbed 100644 --- a/app-pda/libimobiledevice/libimobiledevice-1.3.0.ebuild +++ b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/libimobiledevice/libimobiledevice/releases/download/ # While COPYING* doesn't mention 'or any later version', all the headers do, hence use + LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0/6" # based on SONAME of libimobiledevice.so +SLOT="0/1.0-6" # based on SONAME of libimobiledevice-1.0.so KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE="doc gnutls libressl python static-libs" diff --git a/app-pda/libplist/files/libplist-2.2.0-pkgconfig-lib.patch b/app-pda/libplist/files/libplist-2.2.0-pkgconfig-lib.patch new file mode 100644 index 000000000000..30ef67798865 --- /dev/null +++ b/app-pda/libplist/files/libplist-2.2.0-pkgconfig-lib.patch @@ -0,0 +1,10 @@ +diff -Naur libplist/src/libplist-2.0.pc.in libplist-pcfile/src/libplist-2.0.pc.in +--- libplist/src/libplist-2.0.pc.in 2020-07-18 17:25:52.156222244 +0300 ++++ libplist-pcfile/src/libplist-2.0.pc.in 2020-07-18 17:26:32.752017958 +0300 +@@ -6,5 +6,5 @@ + Name: @PACKAGE_NAME@ + Description: A library to handle Apple Property Lists whereas they are binary or XML + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lplist-2.0 ++Libs: -L${libdir} -lplist-2.0 -lplist + Cflags: -I${includedir} diff --git a/app-pda/libplist/libplist-2.2.0.ebuild b/app-pda/libplist/libplist-2.2.0-r1.ebuild similarity index 99% rename from app-pda/libplist/libplist-2.2.0.ebuild rename to app-pda/libplist/libplist-2.2.0-r1.ebuild index 7c1f430c30fe..c5c2f5167b89 100644 --- a/app-pda/libplist/libplist-2.2.0.ebuild +++ b/app-pda/libplist/libplist-2.2.0-r1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://www.libimobiledevice.org/" SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" -SLOT="0/3" +SLOT="0/2.0-3" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE="python static-libs" diff --git a/app-pda/libplist/libplist-2.2.0-r2.ebuild b/app-pda/libplist/libplist-2.2.0-r2.ebuild new file mode 100644 index 000000000000..d7ac5a7b4a39 --- /dev/null +++ b/app-pda/libplist/libplist-2.2.0-r2.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) +inherit autotools python-r1 toolchain-funcs + +DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)" +HOMEPAGE="https://www.libimobiledevice.org/" +SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0/2.0-3" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="python static-libs" + +RDEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] ) +" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DOCS=( AUTHORS NEWS README.md ) + +PATCHES=( "${FILESDIR}"/libplist-2.2.0-pkgconfig-lib.patch ) + +BUILD_DIR="${S}_build" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local ECONF_SOURCE=${S} + local myeconfargs=( $(use_enable static-libs static) ) + + do_configure() { + mkdir -p "${BUILD_DIR}" || die + pushd "${BUILD_DIR}" >/dev/null || die + econf "${myeconfargs[@]}" "${@}" + popd >/dev/null || die + } + + do_configure_python() { + local -x PYTHON_LDFLAGS="$(python_get_LIBS)" + do_configure "$@" + } + + # Don't prefer clang. + tc-export CC CXX + + do_configure --without-cython + use python && python_foreach_impl do_configure_python +} + +src_compile() { + # + ln -s "${native_builddir}/src/libplist-2.0.la" "${native_builddir}/src/libplist.la" + python_compile() { + emake -C "${BUILD_DIR}"/cython \ + VPATH="${S}/cython:${native_builddir}/cython" \ + plist_la_LIBADD="${native_builddir}/src/libplist-2.0.la" + } + + local native_builddir=${BUILD_DIR} + pushd "${BUILD_DIR}" >/dev/null || die + emake + use python && python_foreach_impl python_compile + popd >/dev/null || die +} + +src_test() { + emake -C "${BUILD_DIR}" check +} + +src_install() { + python_install() { + emake -C "${BUILD_DIR}/cython" \ + VPATH="${S}/cython:${native_builddir}/cython" \ + DESTDIR="${D}" install + } + + local native_builddir=${BUILD_DIR} + pushd "${BUILD_DIR}" >/dev/null || die + emake DESTDIR="${D}" install + use python && python_foreach_impl python_install + popd >/dev/null || die + + einstalldocs + + if use python ; then + insinto /usr/include/plist/cython + doins cython/plist.pxd + fi + + find "${D}" -name '*.la' -delete || die + + # temporary fix for 2.2.0 release: + # b.g.o 733082, + # https://github.com/libimobiledevice/libplist/issues/163 + # upstream commit 137716df3f197a7184c1fba88fcb30480dafd6e0 + dosym ./libplist-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist.pc + dosym ./libplist++-2.0.so.3.3.0 /usr/$(get_libdir)/libplist++.so + dosym ./libplist-2.0.so.3.3.0 /usr/$(get_libdir)/libplist.so +} diff --git a/app-pda/libusbmuxd/libusbmuxd-2.0.2.ebuild b/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild similarity index 93% rename from app-pda/libusbmuxd/libusbmuxd-2.0.2.ebuild rename to app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild index 9c0bb1c26cbf..7692c22ec8a0 100644 --- a/app-pda/libusbmuxd/libusbmuxd-2.0.2.ebuild +++ b/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices" HOMEPAGE="https://www.libimobiledevice.org/" SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2" LICENSE="GPL-2+ LGPL-2.1+" # tools/*.c is GPL-2+, rest is LGPL-2.1+ -SLOT="0/6" # based on SONAME of libusbmuxd.so +SLOT="0/2.0-6" # based on SONAME of libusbmuxd-2.0.so KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE="static-libs" diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz index 8f1176d1d4e1..27003ea846f7 100644 Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index 2df0822864a9..0eb91679b4b7 100644 --- a/app-text/calibre/Manifest +++ b/app-text/calibre/Manifest @@ -1,7 +1,5 @@ DIST calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch 1222 BLAKE2B 14038b4ea5f87d9a8f645b5af8342da90337202b0247b07dccd8995f55bb965b5c2bbdddc24b55b6e92e899f91d5dec19c10ddea8fcc42c8ed3d74ee90eb09d6 SHA512 b0652c3277b8390f47039366380fceacfd3cd9014fe42306a947f6749c6192657b77e3d832044828bea06c43f1f5e745e6b4ff8dd24efc73d9ad5261c4c73a5e -DIST calibre-4.17.0.tar.xz 37027156 BLAKE2B e1e9fbbb93cc14af0790e400d79b433c774f17bb06d99161e27769217ab7eed5c2660ab8a3e09109bade91684a8f5a8b52795667833ddf454343e530109eea63 SHA512 95719c820839a8548c0734a7be105fa4124c3c070fdd79ceeef5fef7f9c81f89d5b2077a71df3cc6cd103c14b813cd0d42add1c75ec4883686a8596de36ef5d0 -DIST calibre-4.18.0.tar.xz 37135328 BLAKE2B 247fc226fade064306309933be008e7636bacfdcfb1c96ae900fce5cc4474e26853b3a9dd932fd758543e31af95374f089d2e7a15c3d9ca7655eabd077727e2c SHA512 cc75e8b78722eb286af57f1d6b1ed783647f69471d903a3d4dd458b3f6966804e8e4fda7bd1947e9107ce9a280486ea7de101f7b843f8365bfe6e874d9ebf3d3 -DIST calibre-4.19.0.tar.xz 37172532 BLAKE2B 1cf3a4727ac7a2e7fe4d926acad7e6324b0673728db862209d98280f4fe9457eb33d734e47ac4882accebad2a6ffd12aa0add6bdcfe64cc4baa8a39dc2b4b94f SHA512 47b767b3f23f01fa1931abd470eb69f5493f5b0e6cd5c0e566b5576d1d831137c28555de3f73ad2a2dd0dd03615171a4c62356278a590ad48b77a6ca1cac890b DIST calibre-4.20.0.tar.xz 36997620 BLAKE2B 28ee9539eda96809004f4c276c8dceba119122379867f4b9235ad52a3ec68337330c4cbc2e715462f27ea0c3a0c8470609a50273db49a69f69a60e7fbcef11a5 SHA512 97e33c0a4a53c0b799ed76fde6327570d3e6356a812836d204ce0e6f5273715e274fdf2e987a0446b61ce6aceb4ce5cfda9c0cb8a2f2871efd83b76acbc43820 +DIST calibre-4.21.0.tar.xz 36937392 BLAKE2B 7797e1b99eefa795a84a1ce913b7739ce6961d58ea28c68e3f5a1b756bbec20c206bd7cab25f1ffacc33f39fed2cc4acf99b5bb90ba88b0607987801770d8b30 SHA512 d2e711d2dec77b41a7930cfd39a7597d1b56fdd57bad44686efdf4be66321565622f42e20dfd844c90cc5f2d6625c17b4e8997b9b4592648af1664fda341bf27 DIST calibre-4.9.1-bug-731786.patch 1069 BLAKE2B 8b57fb89c9ec2d3a435fbc90f514d45468ceb96b46428efd5d2084cc9bb6137b49dd90dc2f7e574b6d8b8d536728392863046b068c39c8f9bcc3ae23678ac590 SHA512 acd158923bb369270155b3032b033a8387bcb53d1b0ea3e2c0724a40ec0cff6add5fca85649caaf37db0a0878fc3dafacc98b2b641cf10a8d58dc719642c6be5 DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71 diff --git a/app-text/calibre/calibre-4.17.0-r1.ebuild b/app-text/calibre/calibre-4.17.0-r1.ebuild deleted file mode 100644 index bd20fd840abc..000000000000 --- a/app-text/calibre/calibre-4.17.0-r1.ebuild +++ /dev/null @@ -1,276 +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} ) -PYTHON_REQ_USE="sqlite,ssl" - -inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils - -DESCRIPTION="Ebook management application" -HOMEPAGE="https://calibre-ebook.com/" -SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz - https://github.com/kovidgoyal/calibre/commit/db7007a25faefb0cc90e64dda1c0793393b9512d.patch -> calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch" - -LICENSE=" - GPL-3+ - GPL-3 - GPL-2+ - GPL-2 - GPL-1+ - LGPL-3+ - LGPL-2.1+ - LGPL-2.1 - BSD - MIT - Old-MIT - Apache-2.0 - public-domain - || ( Artistic GPL-1+ ) - CC-BY-3.0 - OFL-1.1 - PSF-2 -" -KEYWORDS="~amd64 ~arm ~x86" -SLOT="0" -IUSE="ios +udisks" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND="${PYTHON_DEPS} - >=app-text/hunspell-1.7:= - >=app-text/podofo-0.9.6_pre20171027:= - >=app-text/poppler-0.26.5[qt5] - >=dev-libs/chmlib-0.40:= - dev-libs/glib:2= - dev-libs/hyphen:= - >=dev-libs/icu-57.1:= - dev-libs/libinput:= - >=dev-libs/dbus-glib-0.106 - >=sys-apps/dbus-1.10.8 - $(python_gen_cond_dep ' - >=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}] - dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}] - >=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}] - >=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}] - >=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}] - dev-python/dnspython[${PYTHON_MULTI_USEDEP}] - >=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}] - >=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}] - >=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}] - >=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}] - >=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}] - >=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}] - >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}] - >=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}] - dev-python/regex[${PYTHON_MULTI_USEDEP}] - dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] - ') - dev-qt/qtcore:5= - dev-qt/qtdbus:5= - dev-qt/qtgui:5= - >=dev-qt/qtwebengine-5.12 - dev-qt/qtwidgets:5= - dev-util/desktop-file-utils - dev-util/gtk-update-icon-cache - media-fonts/liberation-fonts - media-libs/fontconfig:= - >=media-libs/freetype-2:= - >=media-libs/libmtp-1.1.11:= - >=media-libs/libwmf-0.2.8 - >=media-gfx/optipng-0.7.6 - >=sys-libs/zlib-1.2.11:= - virtual/libusb:1= - x11-libs/libxkbcommon:= - x11-libs/libX11:= - x11-libs/libXext:= - x11-libs/libXrender:= - x11-misc/shared-mime-info - >=x11-misc/xdg-utils-1.0.2-r2 - ios? ( - >=app-pda/usbmuxd-1.0.8 - >=app-pda/libimobiledevice-1.2.0 - ) - udisks? ( virtual/libudev )" -RDEPEND="${COMMON_DEPEND} - udisks? ( sys-fs/udisks:2 )" -DEPEND="${COMMON_DEPEND} - $(python_gen_cond_dep ' - >=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}] - dev-python/sip[${PYTHON_MULTI_USEDEP}] - ') - >=virtual/podofo-build-0.9.6_pre20171027 - virtual/pkgconfig" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then - eerror "Calibre cannot be built with this version of gcc." - eerror "You need at least gcc-6.0" - die "Your C compiler is too old for this package." - fi -} - -src_prepare() { - # no_updates: do not annoy user with "new version is availible all the time - # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface - eapply \ - "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ - "${FILESDIR}/${PN}-disable_plugins.patch" \ - "${DISTDIR}/calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch" - - eapply_user - - # Fix outdated version constant. - #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \ - # -i src/calibre/constants.py || \ - # die "sed failed to patch constants.py" - - # Avoid sandbox violation in /usr/share/gnome/apps when linux.py - # calls xdg-* (bug #258938). - sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \ - -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \ - -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \ - -e "s|, PreserveMIMEDefaults():|:|" \ - -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \ - -e "s|cmd\[2\]|cmd[4]|" \ - -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \ - -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \ - -i src/calibre/linux.py || die "sed failed to patch linux.py" - - # Disable unnecessary privilege dropping for bug #287067. - sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \ - -i setup/install.py || die "sed failed to patch install.py" - - sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\ -\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \ -'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \ -'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \ -'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \ -'-i', 'Makefile'])" \ - -i setup/build.py || die "sed failed to patch build.py" -} - -src_install() { - # calibre works with python 3, so remove the python 2 constraint - export CALIBRE_PY3_PORT=1 - - # Bypass kbuildsycoca and update-mime-database in order to - # avoid sandbox violations if xdg-mime tries to call them. - cat - > "${T}/kbuildsycoca" <<-EOF - #!${BASH} - echo $0 : $@ - exit 0 - EOF - - cp "${T}"/{kbuildsycoca,update-mime-database} || die - chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die - - export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake" - - # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox - # violation with kbuildsycoca as in bug #287067, comment #13. - export -n DISPLAY - - # Bug #352625 - Some LANGUAGE values can trigger the following ValueError: - # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale - # return _parse_localename(localename) - # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename - # raise ValueError, 'unknown locale: %s' % localename - #ValueError: unknown locale: 46 - export -n LANG LANGUAGE ${!LC_*} - export LC_ALL=C.utf8 #709682 - - # Bug #295672 - Avoid sandbox violation in ~/.config by forcing - # variables to point to our fake temporary $HOME. - export HOME="${T}/fake_homedir" - export XDG_CONFIG_HOME="${HOME}/.config" - export XDG_DATA_HOME="${HOME}/.local/share" - export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre" - mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die - - tc-export CC CXX - # Bug #334243 - respect LDFLAGS when building extensions - export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS" - local libdir=$(get_libdir) - [[ -n $libdir ]] || die "get_libdir returned an empty string" - - addpredict /dev/dri #665310 - - PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ - "${PYTHON}" setup.py install \ - --root="${D}" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/${libdir}" \ - --staging-root="${ED}/usr" \ - --staging-libdir="${ED}/usr/${libdir}" || die - - rm "${ED}/usr/share/applications/defaults.list" || die - find "${ED}"/usr/share -type d -empty -delete - - cd "${ED}"/usr/share/calibre/fonts/liberation || die - local x - for x in * ; do - [[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue - ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die - done - - einfo "Converting python shebangs" - python_fix_shebang --force "${ED}" - - einfo "Compiling python modules" - python_optimize "${ED}"/usr/lib/calibre - - newinitd "${FILESDIR}"/calibre-server-3.init calibre-server - newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server - - bashcomp_alias calibre \ - lrfviewer \ - calibre-debug \ - ebook-meta \ - calibre-server \ - ebook-viewer \ - ebook-polish \ - fetch-ebook-metadata \ - lrf2lrs \ - ebook-convert \ - ebook-edit \ - calibre-smtp \ - ebook-device - -} - -pkg_preinst() { - # Indentify stray directories from upstream's "Binary install" - # method (see bug 622728). - CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre - CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do - printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}" -} - -pkg_postinst() { - [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset" - local x - for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do - if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then - elog "Purging '${x}'" - rm -rf "${x}" - fi - done - xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update -} diff --git a/app-text/calibre/calibre-4.18.0.ebuild b/app-text/calibre/calibre-4.18.0.ebuild deleted file mode 100644 index a4f5f90a8186..000000000000 --- a/app-text/calibre/calibre-4.18.0.ebuild +++ /dev/null @@ -1,275 +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} ) -PYTHON_REQ_USE="sqlite,ssl" - -inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils - -DESCRIPTION="Ebook management application" -HOMEPAGE="https://calibre-ebook.com/" -SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz - https://github.com/kovidgoyal/calibre/commit/db7007a25faefb0cc90e64dda1c0793393b9512d.patch -> calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch" - -LICENSE=" - GPL-3+ - GPL-3 - GPL-2+ - GPL-2 - GPL-1+ - LGPL-3+ - LGPL-2.1+ - LGPL-2.1 - BSD - MIT - Old-MIT - Apache-2.0 - public-domain - || ( Artistic GPL-1+ ) - CC-BY-3.0 - OFL-1.1 - PSF-2 -" -KEYWORDS="~amd64 ~arm ~x86" -SLOT="0" -IUSE="ios +udisks" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND="${PYTHON_DEPS} - >=app-text/hunspell-1.7:= - >=app-text/podofo-0.9.6_pre20171027:= - >=app-text/poppler-0.26.5[qt5] - >=dev-libs/chmlib-0.40:= - dev-libs/glib:2= - dev-libs/hyphen:= - >=dev-libs/icu-57.1:= - dev-libs/libinput:= - >=dev-libs/dbus-glib-0.106 - >=sys-apps/dbus-1.10.8 - $(python_gen_cond_dep ' - >=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}] - dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}] - >=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}] - >=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}] - >=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}] - dev-python/dnspython[${PYTHON_MULTI_USEDEP}] - >=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}] - >=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}] - >=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}] - >=dev-python/msgpack-0.6.2[${PYTHON_MULTI_USEDEP}] - >=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}] - >=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}] - >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}] - >=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}] - dev-python/regex[${PYTHON_MULTI_USEDEP}] - dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] - ') - dev-qt/qtcore:5= - dev-qt/qtdbus:5= - dev-qt/qtgui:5= - >=dev-qt/qtwebengine-5.12 - dev-qt/qtwidgets:5= - dev-util/desktop-file-utils - dev-util/gtk-update-icon-cache - media-fonts/liberation-fonts - media-libs/fontconfig:= - >=media-libs/freetype-2:= - >=media-libs/libmtp-1.1.11:= - >=media-libs/libwmf-0.2.8 - >=media-gfx/optipng-0.7.6 - >=sys-libs/zlib-1.2.11:= - virtual/libusb:1= - x11-libs/libxkbcommon:= - x11-libs/libX11:= - x11-libs/libXext:= - x11-libs/libXrender:= - x11-misc/shared-mime-info - >=x11-misc/xdg-utils-1.0.2-r2 - ios? ( - >=app-pda/usbmuxd-1.0.8 - >=app-pda/libimobiledevice-1.2.0 - ) - udisks? ( virtual/libudev )" -RDEPEND="${COMMON_DEPEND} - udisks? ( sys-fs/udisks:2 )" -DEPEND="${COMMON_DEPEND} - $(python_gen_cond_dep ' - >=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}] - dev-python/sip[${PYTHON_MULTI_USEDEP}] - ') - >=virtual/podofo-build-0.9.6_pre20171027 - virtual/pkgconfig" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then - eerror "Calibre cannot be built with this version of gcc." - eerror "You need at least gcc-6.0" - die "Your C compiler is too old for this package." - fi -} - -src_prepare() { - # no_updates: do not annoy user with "new version is availible all the time - # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface - eapply \ - "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ - "${FILESDIR}/${PN}-disable_plugins.patch" - - eapply_user - - # Fix outdated version constant. - #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \ - # -i src/calibre/constants.py || \ - # die "sed failed to patch constants.py" - - # Avoid sandbox violation in /usr/share/gnome/apps when linux.py - # calls xdg-* (bug #258938). - sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \ - -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \ - -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \ - -e "s|, PreserveMIMEDefaults():|:|" \ - -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \ - -e "s|cmd\[2\]|cmd[4]|" \ - -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \ - -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \ - -i src/calibre/linux.py || die "sed failed to patch linux.py" - - # Disable unnecessary privilege dropping for bug #287067. - sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \ - -i setup/install.py || die "sed failed to patch install.py" - - sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\ -\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \ -'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \ -'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \ -'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \ -'-i', 'Makefile'])" \ - -i setup/build.py || die "sed failed to patch build.py" -} - -src_install() { - # calibre works with python 3, so remove the python 2 constraint - export CALIBRE_PY3_PORT=1 - - # Bypass kbuildsycoca and update-mime-database in order to - # avoid sandbox violations if xdg-mime tries to call them. - cat - > "${T}/kbuildsycoca" <<-EOF - #!${BASH} - echo $0 : $@ - exit 0 - EOF - - cp "${T}"/{kbuildsycoca,update-mime-database} || die - chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die - - export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake" - - # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox - # violation with kbuildsycoca as in bug #287067, comment #13. - export -n DISPLAY - - # Bug #352625 - Some LANGUAGE values can trigger the following ValueError: - # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale - # return _parse_localename(localename) - # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename - # raise ValueError, 'unknown locale: %s' % localename - #ValueError: unknown locale: 46 - export -n LANG LANGUAGE ${!LC_*} - export LC_ALL=C.utf8 #709682 - - # Bug #295672 - Avoid sandbox violation in ~/.config by forcing - # variables to point to our fake temporary $HOME. - export HOME="${T}/fake_homedir" - export XDG_CONFIG_HOME="${HOME}/.config" - export XDG_DATA_HOME="${HOME}/.local/share" - export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre" - mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die - - tc-export CC CXX - # Bug #334243 - respect LDFLAGS when building extensions - export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS" - local libdir=$(get_libdir) - [[ -n $libdir ]] || die "get_libdir returned an empty string" - - addpredict /dev/dri #665310 - - PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ - "${PYTHON}" setup.py install \ - --root="${D}" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/${libdir}" \ - --staging-root="${ED}/usr" \ - --staging-libdir="${ED}/usr/${libdir}" || die - - rm "${ED}/usr/share/applications/defaults.list" || die - find "${ED}"/usr/share -type d -empty -delete - - cd "${ED}"/usr/share/calibre/fonts/liberation || die - local x - for x in * ; do - [[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue - ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die - done - - einfo "Converting python shebangs" - python_fix_shebang --force "${ED}" - - einfo "Compiling python modules" - python_optimize "${ED}"/usr/lib/calibre - - newinitd "${FILESDIR}"/calibre-server-3.init calibre-server - newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server - - bashcomp_alias calibre \ - lrfviewer \ - calibre-debug \ - ebook-meta \ - calibre-server \ - ebook-viewer \ - ebook-polish \ - fetch-ebook-metadata \ - lrf2lrs \ - ebook-convert \ - ebook-edit \ - calibre-smtp \ - ebook-device - -} - -pkg_preinst() { - # Indentify stray directories from upstream's "Binary install" - # method (see bug 622728). - CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre - CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do - printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}" -} - -pkg_postinst() { - [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset" - local x - for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do - if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then - elog "Purging '${x}'" - rm -rf "${x}" - fi - done - xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update -} diff --git a/app-text/calibre/calibre-4.19.0.ebuild b/app-text/calibre/calibre-4.21.0.ebuild similarity index 99% rename from app-text/calibre/calibre-4.19.0.ebuild rename to app-text/calibre/calibre-4.21.0.ebuild index ae82240de8bf..187479a77138 100644 --- a/app-text/calibre/calibre-4.19.0.ebuild +++ b/app-text/calibre/calibre-4.21.0.ebuild @@ -75,7 +75,7 @@ COMMON_DEPEND="${PYTHON_DEPS} ') dev-qt/qtcore:5= dev-qt/qtdbus:5= - dev-qt/qtgui:5= + dev-qt/qtgui:5=[jpeg] >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils diff --git a/app-text/calibre/calibre-4.9.1-r3.ebuild b/app-text/calibre/calibre-4.9.1-r3.ebuild index b38a6d256982..ce4305d2881b 100644 --- a/app-text/calibre/calibre-4.9.1-r3.ebuild +++ b/app-text/calibre/calibre-4.9.1-r3.ebuild @@ -76,7 +76,7 @@ COMMON_DEPEND="${PYTHON_DEPS} ') dev-qt/qtcore:5= dev-qt/qtdbus:5= - dev-qt/qtgui:5= + dev-qt/qtgui:5=[jpeg] >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils diff --git a/app-text/hunspell/hunspell-1.7.0-r1.ebuild b/app-text/hunspell/hunspell-1.7.0-r1.ebuild deleted file mode 100644 index 77c6e414f32e..000000000000 --- a/app-text/hunspell/hunspell-1.7.0-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic - -MY_P="${PN}-${PV/_beta/b}" - -DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo" -SRC_URI="https://github.com/hunspell/hunspell/archive/v${PV}.tar.gz -> ${P}.tar.gz" -HOMEPAGE="https://github.com/hunspell" - -SLOT="0/$(ver_cut 1-2)" -LICENSE="MPL-1.1 GPL-2 LGPL-2.1" -IUSE="ncurses nls readline static-libs" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -RDEPEND=" - ncurses? ( sys-libs/ncurses:0= ) - readline? ( sys-libs/readline:= ) -" -DEPEND="${RDEPEND} - sys-devel/gettext -" - -LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id -is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk -zu" - -PDEPEND="" -for lang in ${LANGS}; do - IUSE+=" l10n_${lang}" - case ${lang} in - de-1901) dict="de_1901" ;; - pt-BR) dict="pt-br" ;; - *) dict="${lang}" ;; - esac - PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )" -done -unset dict lang LANGS - -S="${WORKDIR}/${MY_P}" - -DOCS=( - AUTHORS ChangeLog NEWS THANKS license.hunspell - license.myspell README.md -) - -PATCHES=( - # Upstream package creates some executables which names are too generic - # to be placed in /usr/bin - this patch prefixes them with 'hunspell-'. - # It modifies a Makefile.am file, hence eautoreconf. - "${FILESDIR}/${PN}-1.7.0-renameexes.patch" - - "${FILESDIR}/${PN}-1.7.0-tinfo.patch" #692614 -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # missing somehow, and I am too lazy to fix it properly - [[ ${CHOST} == *-darwin* ]] && append-libs -liconv - - # I wanted to put the include files in /usr/include/hunspell. - # You can do that, libreoffice can find them anywhere, just - # ping me when you do so ; -- scarabeus - local myeconfargs=( - $(use_enable nls) - $(use_with ncurses ui) - $(use_with readline readline) - $(use_enable static-libs static) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - einstalldocs - find "${ED}" -type f -name '*.la' -delete || die - - #342449 - pushd "${ED}"/usr/$(get_libdir)/ >/dev/null - ln -s lib${PN}{-$(ver_cut 1).$(ver_cut 2).so.0.0.1,.so} - popd >/dev/null -} diff --git a/app-text/podofo/podofo-0.9.6_p20190928.ebuild b/app-text/podofo/podofo-0.9.6_p20190928.ebuild index 0c3c7b2bd809..9b782fb66466 100644 --- a/app-text/podofo/podofo-0.9.6_p20190928.ebuild +++ b/app-text/podofo/podofo-0.9.6_p20190928.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.xz" LICENSE="GPL-2 LGPL-2.1" SLOT="0/${PV%_*}" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86" IUSE="+boost idn libressl debug test +tools" RESTRICT="!test? ( test )" REQUIRED_USE="test? ( tools )" diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz index 4f9f28c120dc..d4e40ad82ddf 100644 Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ diff --git a/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild index 525d59e6e4c9..d3ecf6decf9d 100644 --- a/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild +++ b/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/GSL-${PV}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz index 10b1211125d9..8cc35e3de2d7 100644 Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ diff --git a/dev-db/influxdb/Manifest b/dev-db/influxdb/Manifest index 11650e6e7a13..8476098a8b37 100644 --- a/dev-db/influxdb/Manifest +++ b/dev-db/influxdb/Manifest @@ -529,6 +529,7 @@ DIST influxdb-1.5.1.tar.gz 1225941 BLAKE2B 6d3639f0c31b885f836e3e97ad943147ba206 DIST influxdb-1.6.3.tar.gz 1506621 BLAKE2B e0594a6f9992cabbb7b44ca75b3054a97af22e02278c2b44262ec5c3a00fab35e17b48957625d0ba267e1ef924d7999feed34d2b215ea79067592f50e5dc5941 SHA512 a6bca52223ae084a7d3feef20574b0f6d96105547a17e4cb2713bee18beb0fb31d096779a908d14ceec1510db93841cba5bfd26bc5e6961538351069f1a7a728 DIST influxdb-1.6.4.tar.gz 1510337 BLAKE2B 6bd706101bb2776043d1ce0729276998e090cf57b24f4fbaa3156a673f3fd55b02b8deff3f3e0a1d8bbda446c8fe879633b51b6f52eb0f79bad5f9c19bed0e7e SHA512 19604a1cd33e5d9f81ed46f58ec32b99772077401b6d0789ad00813baaf8a1d488a9d84767fc6021f9f980f8f4e62a3bbe238037fa3a231e81eab8629d9e8838 DIST influxdb-1.8.0.tar.gz 12064140 BLAKE2B cd3731cbfe5d7b0162dbcd36862bc6efb806e1f345993f5f249992203e6e21ca388e1b86a829333d9da807ee13c577829f27d23071645ad8e98f8da92f388c40 SHA512 d62aa9dc7777d8a1c5d3a9b36937255f783002c762ee3c60bbcb190edb4d4b0f67d99d500f67d726ec4f407b7ca350cb409b58dc6a999648884a286f8160f426 +DIST influxdb-1.8.1.tar.gz 12068325 BLAKE2B dcc5a8291188aa8f0c040dbda89fa0bbd1868f54fb92c0d90f053138839ff045c00d9e948aa1087c3b1dfb1532ba8bfda17082c6c82c92412653fe470b7a78a2 SHA512 46a3629b4cff2bee15659f8cbee125900a03f00bbde8ae1e8c7b86692a28028ff6bfdd009fa92887f08df8ef5bb4e51cef88fadfd4c8b3c87c2955bf63a9a866 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.zip 450232 BLAKE2B 2d10520e06557fa00e94a1ccd80b9b937bcaf404f81f853a020eed606c7a297db037baf784518e060604319ba5454423e4995ab005be18ae1398c5ef16f24719 SHA512 0a15b90c2a4577cbc298a34f714660e9fdc488b1fb72b33d0ae296cb6f15a691091d5e6d3c801998b9c2b7236b163118577b2816316078d613f74cd803947534 DIST rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod 18 BLAKE2B 02f32b5a77e5009f179cf1fdc9acbb977fe219698f19ef41acee8129e0de7ad93b0b39ce82ac1538c82a7cdd33776e270f0acec114716c791727b021a4d3e147 SHA512 f911a889614d9177295952c82f8b4a0942fcbb7b4fca7378c0b98a63ed0e37e1319d51905f906ad08144eb0f3f829a2ccc2af04c2147e60cc2ac1ea8d7dab16f diff --git a/dev-db/influxdb/influxdb-1.8.1.ebuild b/dev-db/influxdb/influxdb-1.8.1.ebuild new file mode 100644 index 000000000000..1d9aee6f3de1 --- /dev/null +++ b/dev-db/influxdb/influxdb-1.8.1.ebuild @@ -0,0 +1,508 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit go-module systemd +GIT_COMMIT=af0237819ab9c5997c1c0144862dc762b9d8fc25 +GIT_BRANCH=1.8 + +DESCRIPTION="Scalable datastore for metrics, events, and real-time analytics" +HOMEPAGE="https://www.influxdata.com" + +EGO_SUM=( + "cloud.google.com/go v0.26.0/go.mod" + "cloud.google.com/go v0.34.0/go.mod" + "cloud.google.com/go v0.38.0/go.mod" + "cloud.google.com/go v0.43.0/go.mod" + "cloud.google.com/go v0.44.1/go.mod" + "cloud.google.com/go v0.44.2/go.mod" + "cloud.google.com/go v0.45.1/go.mod" + "cloud.google.com/go v0.46.3/go.mod" + "cloud.google.com/go v0.50.0/go.mod" + "cloud.google.com/go v0.51.0" + "cloud.google.com/go v0.51.0/go.mod" + "cloud.google.com/go/bigquery v1.0.1/go.mod" + "cloud.google.com/go/bigquery v1.3.0" + "cloud.google.com/go/bigquery v1.3.0/go.mod" + "cloud.google.com/go/bigtable v1.2.0" + "cloud.google.com/go/bigtable v1.2.0/go.mod" + "cloud.google.com/go/datastore v1.0.0" + "cloud.google.com/go/datastore v1.0.0/go.mod" + "cloud.google.com/go/pubsub v1.0.1/go.mod" + "cloud.google.com/go/pubsub v1.1.0" + "cloud.google.com/go/pubsub v1.1.0/go.mod" + "cloud.google.com/go/storage v1.0.0/go.mod" + "cloud.google.com/go/storage v1.5.0" + "cloud.google.com/go/storage v1.5.0/go.mod" + "collectd.org v0.3.0" + "collectd.org v0.3.0/go.mod" + "dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod" + "github.com/BurntSushi/toml v0.3.1" + "github.com/BurntSushi/toml v0.3.1/go.mod" + "github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod" + "github.com/DATA-DOG/go-sqlmock v1.3.3" + "github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod" + "github.com/OneOfOne/xxhash v1.2.2" + "github.com/OneOfOne/xxhash v1.2.2/go.mod" + "github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod" + "github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc" + "github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod" + "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf" + "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod" + "github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883" + "github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod" + "github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db" + "github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod" + "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod" + "github.com/beorn7/perks v1.0.0" + "github.com/beorn7/perks v1.0.0/go.mod" + "github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40" + "github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod" + "github.com/boltdb/bolt v1.3.1" + "github.com/boltdb/bolt v1.3.1/go.mod" + "github.com/c-bata/go-prompt v0.2.2" + "github.com/c-bata/go-prompt v0.2.2/go.mod" + "github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod" + "github.com/cespare/xxhash v1.1.0" + "github.com/cespare/xxhash v1.1.0/go.mod" + "github.com/chzyer/logex v1.1.10/go.mod" + "github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod" + "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod" + "github.com/client9/misspell v0.3.4/go.mod" + "github.com/dave/jennifer v1.2.0/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/dgrijalva/jwt-go v3.2.0+incompatible" + "github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod" + "github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8" + "github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod" + "github.com/eclipse/paho.mqtt.golang v1.2.0" + "github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod" + "github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod" + "github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod" + "github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod" + "github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd" + "github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod" + "github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31" + "github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod" + "github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod" + "github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod" + "github.com/go-kit/kit v0.8.0/go.mod" + "github.com/go-logfmt/logfmt v0.3.0/go.mod" + "github.com/go-logfmt/logfmt v0.4.0/go.mod" + "github.com/go-sql-driver/mysql v1.4.1" + "github.com/go-sql-driver/mysql v1.4.1/go.mod" + "github.com/go-stack/stack v1.8.0/go.mod" + "github.com/gogo/protobuf v1.1.1" + "github.com/gogo/protobuf v1.1.1/go.mod" + "github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod" + "github.com/golang/geo v0.0.0-20190916061304-5b978397cfec" + "github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod" + "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b" + "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod" + "github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod" + "github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7" + "github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod" + "github.com/golang/mock v1.1.1/go.mod" + "github.com/golang/mock v1.2.0/go.mod" + "github.com/golang/mock v1.3.1/go.mod" + "github.com/golang/protobuf v1.2.0/go.mod" + "github.com/golang/protobuf v1.3.1/go.mod" + "github.com/golang/protobuf v1.3.2" + "github.com/golang/protobuf v1.3.2/go.mod" + "github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db" + "github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod" + "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod" + "github.com/google/btree v1.0.0" + "github.com/google/btree v1.0.0/go.mod" + "github.com/google/flatbuffers v1.11.0" + "github.com/google/flatbuffers v1.11.0/go.mod" + "github.com/google/go-cmp v0.2.0/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.3.1/go.mod" + "github.com/google/go-cmp v0.4.0" + "github.com/google/go-cmp v0.4.0/go.mod" + "github.com/google/martian v2.1.0+incompatible" + "github.com/google/martian v2.1.0+incompatible/go.mod" + "github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod" + "github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod" + "github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod" + "github.com/google/renameio v0.1.0/go.mod" + "github.com/googleapis/gax-go/v2 v2.0.4/go.mod" + "github.com/googleapis/gax-go/v2 v2.0.5" + "github.com/googleapis/gax-go/v2 v2.0.5/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/golang-lru v0.5.0/go.mod" + "github.com/hashicorp/golang-lru v0.5.1/go.mod" + "github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod" + "github.com/inconshreveable/mousetrap v1.0.0" + "github.com/inconshreveable/mousetrap v1.0.0/go.mod" + "github.com/influxdata/flux v0.65.0" + "github.com/influxdata/flux v0.65.0/go.mod" + "github.com/influxdata/influxql v1.1.0" + "github.com/influxdata/influxql v1.1.0/go.mod" + "github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e" + "github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e/go.mod" + "github.com/influxdata/promql/v2 v2.12.0/go.mod" + "github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6" + "github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod" + "github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9" + "github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod" + "github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368" + "github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod" + "github.com/json-iterator/go v1.1.6/go.mod" + "github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod" + "github.com/jstemmer/go-junit-report v0.9.1" + "github.com/jstemmer/go-junit-report v0.9.1/go.mod" + "github.com/jsternberg/zap-logfmt v1.0.0" + "github.com/jsternberg/zap-logfmt v1.0.0/go.mod" + "github.com/jtolds/gls v4.20.0+incompatible" + "github.com/jtolds/gls v4.20.0+incompatible/go.mod" + "github.com/julienschmidt/httprouter v1.2.0/go.mod" + "github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod" + "github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef" + "github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod" + "github.com/kisielk/gotool v1.0.0/go.mod" + "github.com/klauspost/compress v1.4.0" + "github.com/klauspost/compress v1.4.0/go.mod" + "github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5" + "github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod" + "github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6" + "github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod" + "github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada" + "github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod" + "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod" + "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod" + "github.com/kr/pretty v0.1.0" + "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/lib/pq v1.0.0" + "github.com/lib/pq v1.0.0/go.mod" + "github.com/mattn/go-colorable v0.0.9" + "github.com/mattn/go-colorable v0.0.9/go.mod" + "github.com/mattn/go-isatty v0.0.4" + "github.com/mattn/go-isatty v0.0.4/go.mod" + "github.com/mattn/go-runewidth v0.0.3" + "github.com/mattn/go-runewidth v0.0.3/go.mod" + "github.com/mattn/go-sqlite3 v1.11.0" + "github.com/mattn/go-sqlite3 v1.11.0/go.mod" + "github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104" + "github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod" + "github.com/matttproud/golang_protobuf_extensions v1.0.1" + "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod" + "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod" + "github.com/modern-go/reflect2 v1.0.1/go.mod" + "github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae" + "github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod" + "github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod" + "github.com/opentracing/opentracing-go v1.0.2/go.mod" + "github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947" + "github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947/go.mod" + "github.com/paulbellamy/ratecounter v0.2.0" + "github.com/paulbellamy/ratecounter v0.2.0/go.mod" + "github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f" + "github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod" + "github.com/philhofer/fwd v1.0.0" + "github.com/philhofer/fwd v1.0.0/go.mod" + "github.com/pierrec/lz4 v2.0.5+incompatible" + "github.com/pierrec/lz4 v2.0.5+incompatible/go.mod" + "github.com/pkg/errors v0.8.0/go.mod" + "github.com/pkg/errors v0.8.1" + "github.com/pkg/errors v0.8.1/go.mod" + "github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5" + "github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5/go.mod" + "github.com/pmezard/go-difflib v1.0.0" + "github.com/pmezard/go-difflib v1.0.0/go.mod" + "github.com/prometheus/client_golang v0.9.1/go.mod" + "github.com/prometheus/client_golang v1.0.0" + "github.com/prometheus/client_golang v1.0.0/go.mod" + "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod" + "github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90" + "github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod" + "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4" + "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod" + "github.com/prometheus/common v0.4.1/go.mod" + "github.com/prometheus/common v0.6.0" + "github.com/prometheus/common v0.6.0/go.mod" + "github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod" + "github.com/prometheus/procfs v0.0.2" + "github.com/prometheus/procfs v0.0.2/go.mod" + "github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52" + "github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod" + "github.com/rogpeppe/go-internal v1.3.0/go.mod" + "github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b" + "github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b/go.mod" + "github.com/segmentio/kafka-go v0.1.0/go.mod" + "github.com/segmentio/kafka-go v0.2.0" + "github.com/segmentio/kafka-go v0.2.0/go.mod" + "github.com/sergi/go-diff v1.0.0" + "github.com/sergi/go-diff v1.0.0/go.mod" + "github.com/sirupsen/logrus v1.2.0/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/goconvey v1.6.4" + "github.com/smartystreets/goconvey v1.6.4/go.mod" + "github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72" + "github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod" + "github.com/spf13/cast v1.3.0" + "github.com/spf13/cast v1.3.0/go.mod" + "github.com/spf13/cobra v0.0.3" + "github.com/spf13/cobra v0.0.3/go.mod" + "github.com/spf13/pflag v1.0.3" + "github.com/spf13/pflag v1.0.3/go.mod" + "github.com/stretchr/objx v0.1.0/go.mod" + "github.com/stretchr/objx v0.1.1/go.mod" + "github.com/stretchr/testify v1.2.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" + "github.com/stretchr/testify v1.4.0/go.mod" + "github.com/tinylib/msgp v1.0.2" + "github.com/tinylib/msgp v1.0.2/go.mod" + "github.com/willf/bitset v1.1.3" + "github.com/willf/bitset v1.1.3/go.mod" + "github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6" + "github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod" + "go.opencensus.io v0.21.0/go.mod" + "go.opencensus.io v0.22.0/go.mod" + "go.opencensus.io v0.22.2" + "go.opencensus.io v0.22.2/go.mod" + "go.uber.org/atomic v1.3.2" + "go.uber.org/atomic v1.3.2/go.mod" + "go.uber.org/multierr v1.1.0" + "go.uber.org/multierr v1.1.0/go.mod" + "go.uber.org/zap v1.9.1" + "go.uber.org/zap v1.9.1/go.mod" + "golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod" + "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" + "golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod" + "golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5" + "golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod" + "golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550" + "golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod" + "golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod" + "golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod" + "golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod" + "golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod" + "golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod" + "golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod" + "golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod" + "golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod" + "golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod" + "golang.org/x/exp v0.0.0-20191227195350-da58074b4299" + "golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod" + "golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod" + "golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod" + "golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod" + "golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod" + "golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod" + "golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod" + "golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod" + "golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod" + "golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod" + "golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod" + "golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f" + "golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod" + "golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod" + "golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod" + "golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod" + "golang.org/x/mod v0.1.0/go.mod" + "golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod" + "golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod" + "golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod" + "golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod" + "golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod" + "golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/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-20190501004415-9ce7a6920f09/go.mod" + "golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod" + "golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod" + "golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod" + "golang.org/x/net v0.0.0-20190620200207-3b0461eec859" + "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod" + "golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod" + "golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553" + "golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod" + "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod" + "golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod" + "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45" + "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod" + "golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod" + "golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d" + "golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod" + "golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod" + "golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod" + "golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod" + "golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod" + "golang.org/x/sync v0.0.0-20190423024810-112230192c58" + "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod" + "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e" + "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod" + "golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod" + "golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod" + "golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod" + "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" + "golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod" + "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" + "golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod" + "golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod" + "golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod" + "golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0" + "golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod" + "golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod" + "golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod" + "golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod" + "golang.org/x/sys v0.0.0-20200107162124-548cf772de50" + "golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod" + "golang.org/x/text v0.3.0/go.mod" + "golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod" + "golang.org/x/text v0.3.2" + "golang.org/x/text v0.3.2/go.mod" + "golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod" + "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4" + "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod" + "golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod" + "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" + "golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod" + "golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod" + "golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod" + "golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod" + "golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod" + "golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod" + "golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod" + "golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod" + "golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod" + "golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod" + "golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod" + "golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod" + "golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod" + "golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod" + "golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod" + "golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod" + "golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod" + "golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod" + "golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod" + "golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod" + "golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod" + "golang.org/x/tools v0.0.0-20200108203644-89082a384178" + "golang.org/x/tools v0.0.0-20200108203644-89082a384178/go.mod" + "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod" + "golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod" + "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543" + "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod" + "gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod" + "gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod" + "gonum.org/v1/gonum v0.6.0" + "gonum.org/v1/gonum v0.6.0/go.mod" + "gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod" + "gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0" + "gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod" + "gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod" + "google.golang.org/api v0.4.0/go.mod" + "google.golang.org/api v0.7.0/go.mod" + "google.golang.org/api v0.8.0/go.mod" + "google.golang.org/api v0.9.0" + "google.golang.org/api v0.9.0/go.mod" + "google.golang.org/api v0.13.0/go.mod" + "google.golang.org/api v0.14.0/go.mod" + "google.golang.org/api v0.15.0" + "google.golang.org/api v0.15.0/go.mod" + "google.golang.org/appengine v1.1.0/go.mod" + "google.golang.org/appengine v1.4.0/go.mod" + "google.golang.org/appengine v1.5.0/go.mod" + "google.golang.org/appengine v1.6.1/go.mod" + "google.golang.org/appengine v1.6.5" + "google.golang.org/appengine v1.6.5/go.mod" + "google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod" + "google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod" + "google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod" + "google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod" + "google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod" + "google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod" + "google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod" + "google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod" + "google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod" + "google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod" + "google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod" + "google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod" + "google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod" + "google.golang.org/genproto v0.0.0-20200108215221-bd8f9a0ef82f" + "google.golang.org/genproto v0.0.0-20200108215221-bd8f9a0ef82f/go.mod" + "google.golang.org/grpc v1.19.0/go.mod" + "google.golang.org/grpc v1.20.1/go.mod" + "google.golang.org/grpc v1.21.1" + "google.golang.org/grpc v1.21.1/go.mod" + "google.golang.org/grpc v1.23.0/go.mod" + "google.golang.org/grpc v1.26.0" + "google.golang.org/grpc v1.26.0/go.mod" + "gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod" + "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" + "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127" + "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod" + "gopkg.in/errgo.v2 v2.1.0/go.mod" + "gopkg.in/yaml.v2 v2.2.1/go.mod" + "gopkg.in/yaml.v2 v2.2.2" + "gopkg.in/yaml.v2 v2.2.2/go.mod" + "honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod" + "honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod" + "honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod" + "honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod" + "honnef.co/go/tools v0.0.1-2019.2.3" + "honnef.co/go/tools v0.0.1-2019.2.3/go.mod" + "rsc.io/binaryregexp v0.2.0" + "rsc.io/binaryregexp v0.2.0/go.mod" + "rsc.io/pdf v0.1.1/go.mod" + ) +go-module_set_globals +SRC_URI="https://github.com/influxdata/influxdb/archive/v${PV}.tar.gz -> ${P}.tar.gz + ${EGO_SUM_SRC_URI}" + +LICENSE="MIT BSD Apache-2.0 EPL-1.0 MPL-2.0 BSD-2 ISC" +SLOT="0" +KEYWORDS="~amd64" +IUSE="man" + +BDEPEND="man? ( + app-text/asciidoc + app-text/xmlto +)" +COMMON_DEPEND=" + acct-group/influxdb + acct-user/influxdb" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" + +src_compile() { + set -- env GOBIN="${S}/bin/" go install \ + -ldflags="-X main.version=${PV} -X main.branch=${GIT_BRANCH} -X main.commit=${GIT_COMMIT}" \ + ./... + echo "$@" + "$@" || die "compile failed" + use man && emake -C man build +} + +src_install() { + dobin bin/influx* + dodoc *.md + use man && doman man/*.1 + insinto /etc/influxdb + newins etc/config.sample.toml influxdb.conf + insinto /etc/logrotate.d + newins scripts/logrotate influxdb + systemd_dounit scripts/influxdb.service + + newconfd "${FILESDIR}"/influxdb.confd influxdb + newinitd "${FILESDIR}"/influxdb.rc-r1 influxdb + keepdir /var/log/influxdb + fowners influxdb:influxdb /var/log/influxdb +} + +src_test() { + go test ./tests || die +} diff --git a/dev-db/influxdb/metadata.xml b/dev-db/influxdb/metadata.xml index 893224717480..da3b7249ff46 100644 --- a/dev-db/influxdb/metadata.xml +++ b/dev-db/influxdb/metadata.xml @@ -10,4 +10,7 @@ dependencies. It is useful for recording metrics, events, and performing analytics. + + Build and install man pages + diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest index 1d6065c2b01c..c1dd84e4105c 100644 --- a/dev-db/mysql-workbench/Manifest +++ b/dev-db/mysql-workbench/Manifest @@ -1,3 +1,4 @@ DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed SHA512 de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1 DIST mysql-workbench-community-8.0.19-src.tar.gz 19391463 BLAKE2B f9374c234a75851784c940f8288a783ee1c02fe4be2973b174a0d3768a60dd5318ceea7d2dacb083376c83c33bed8fca02768bcf4f3b8ba6284ca78fc7910cfe SHA512 986a34328ec3b9aba1532cfd8792fb970fe3c71eda577988a17a6bca25e783a520878067acd097a74ca3f274f02d271af16d7d6beb6970bca48332721021eebc DIST mysql-workbench-community-8.0.20-src.tar.gz 19391920 BLAKE2B 9baf37dec18002ebf7956979fa1e3e45b69a7061bd85d6b2ef25f058ce7595a6847ea314b7443dadf7524ff985ff4e87869e91ea7a012e6cf07a6d139a6c733b SHA512 b31314fac018959a008b283c795df5a676d6c667827e87a98379ce1de172b98cfdf8dd5cac009e2fb78241358afcb318abfed0178d73840bf6b4432b85b6a4e7 +DIST mysql-workbench-community-8.0.21-src.tar.gz 19211633 BLAKE2B 452ac946d478acb1d0e358d2bc44125f0b7d1f1bc2943d2b03ce6767e659df71b7525b7a51ed1cd5560f02a7a1047e2cd35477a71ddd91f71992e5becc3d1c0d SHA512 40c1144f801424c3b46eb033c9d1174c9bd903cd17672924eacd3ff58daa91b0d09f6045af4746ce7490f5ab2b0973b6d7f44ee8ae022607057cb0f09fc59a3f diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.21.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.21.ebuild new file mode 100644 index 000000000000..2590c53d77bb --- /dev/null +++ b/dev-db/mysql-workbench/mysql-workbench-8.0.21.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GCONF_DEBUG="no" + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite" + +ANTLR_VERSION=4.7.1 + +inherit gnome2 flag-o-matic python-single-r1 cmake-utils + +MY_P="${PN}-community-${PV}-src" + +DESCRIPTION="MySQL Workbench" +HOMEPAGE="https://www.mysql.com/products/workbench/" +SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz + https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug doc" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# glibc: deprecated mutex functions, removed in 2.36.0 +CDEPEND="${PYTHON_DEPS} + app-crypt/libsecret + dev-libs/glib:2 + dev-cpp/antlr-cpp:4 + dev-cpp/atkmm + dev-cpp/pangomm + >=dev-cpp/glibmm-2.14:2 + dev-cpp/gtkmm:3.0 + dev-libs/atk + >=net-libs/libssh-0.8.5[server] + x11-libs/pango + x11-libs/gtk+:3 + gnome-base/libglade:2.0 + >=x11-libs/cairo-1.5.12[glib,svg] + >=dev-libs/rapidjson-1.1.0 + dev-libs/libsigc++:2 + >=dev-libs/boost-1.55.0[nls] + >=dev-cpp/ctemplate-0.95 + >=dev-libs/libxml2-2.6.2:2 + dev-libs/libzip + dev-libs/libpcre[cxx] + >=sci-libs/gdal-1.11.1-r1 + virtual/opengl + || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) + dev-libs/tinyxml[stl] + >=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1* + dev-db/vsqlite++ + || ( dev-db/libiodbc dev-db/unixODBC ) + dev-python/pexpect + >=dev-python/paramiko-1.7.4 +" + +RDEPEND="${CDEPEND} + app-admin/sudo + >=sys-apps/net-tools-1.60_p20120127084908" + +DEPEND="${CDEPEND} + dev-lang/swig + virtual/jre + virtual/pkgconfig" + +S="${WORKDIR}"/"${MY_P}" + +PATCHES=( + "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" + "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch" +) + +src_unpack() { + unpack ${PN}-community-${PV}-src.tar.gz +} + +src_prepare() { + ## remove hardcoded CXXFLAGS + sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die + ## And avoid -Werror + sed -i -e 's/-Werror//' CMakeLists.txt || die + + ## package is very fragile... + strip-flags + + cmake-utils_src_prepare +} + +src_configure() { + if has_version dev-db/libiodbc ; then + IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config" + fi + + append-cxxflags -std=c++11 + ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar" + local mycmakeargs=( + -DWITH_ANTLR_JAR=${ANTLR_JAR_PATH} + -DLIB_INSTALL_DIR="/usr/$(get_libdir)" + -DIODBC_INCLUDE_PATH="/usr/include/iodbc" + ${IODBC} + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DMySQL_CONFIG_PATH="/usr/bin/mysql_config" + ) + cmake-utils_src_configure +} diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest index 617516bdd3e0..fa6f2df34dde 100644 --- a/dev-db/postgis/Manifest +++ b/dev-db/postgis/Manifest @@ -1,2 +1,4 @@ DIST postgis-2.5.3.tar.gz 16424752 BLAKE2B 94c2ccd41eb88a39c6db48ad7f4d142742a1b0791e3abe57adb2c778406dcc8286afc6d55c80067e0b94a1300eff1c76a227d3cfd813e12541c715edeea11a9b SHA512 1c9f873ba8f8ff4aeae248c68c001eb4174416de1e00ce6a0d0c9ea129b475e887a83235027068d52f587ab95c549adbfaa7e5dccdda77855e39c55dac0fdc2d +DIST postgis-2.5.4.tar.gz 15882033 BLAKE2B 317e6f3857dce8b1c054b5cdb6c6b215b015b89266aeaa0187803b9355cdc3cbb62be89f36ffe29e2fcbc1e7b693a7f88fb23b5c172fcefea376f6afea3c064d SHA512 767c146245ae11545ce4e0764f9bd313cfdf2eed78c485c5aa5530517edb8e433bcdbaffcf4d92b0c0f3c997de9831b5e3beed7638fc3bc773f264b45e5d8ab4 DIST postgis-3.0.0.tar.gz 17359802 BLAKE2B aa83bdc2d1950c517f99cbdd877eb7261f6c29ce2cbd9f67f1e606c290080fc3d02ab0b7ceb68ce852e0c0d3d4b7753f03cb5b0921da164ab65d68e23d1df538 SHA512 82c233681fa6444686f9979768e5d6d3a9b6ca9cbd4fc2b14bd0a5d1269a8d0f45ee067e64984077063407c7abc13fa0e37a29928d7ccbfe3a61b694f592bed2 +DIST postgis-3.0.1.tar.gz 16839923 BLAKE2B 6888fa49562ab71929e92007de305fd6610c74988faaf08fbeabbf1d13029ebbb5da788826dc63d03ae5c873fbe408ae6c0f108b2975755d2b13bc69bed53558 SHA512 5ebce2303d672bb342f7fae6cade08140c8a687fc38e82e5b41eebb8465cdf3dc7bdbeae53b1179df8112a01842dd65f362fc107b381e2a1fa6e161b77a50227 diff --git a/dev-db/postgis/postgis-2.5.4.ebuild b/dev-db/postgis/postgis-2.5.4.ebuild new file mode 100644 index 000000000000..098d69d159b8 --- /dev/null +++ b/dev-db/postgis/postgis-2.5.4.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +POSTGRES_COMPAT=( 9.{4..6} {10..12} ) +POSTGRES_USEDEP="server" +inherit autotools postgres-multi + +MY_P="${PN}-$(ver_rs 3 '')" + +if [[ ${PV} = *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git" +else + PGIS="$(ver_cut 1-2)" + SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="Geographic Objects for PostgreSQL" +HOMEPAGE="https://postgis.net" + +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +IUSE="address-standardizer doc gtk mapbox static-libs test topology" + +REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}" + +# Needs a running psql instance, doesn't work out of the box +RESTRICT="test" + +RDEPEND="${POSTGRES_DEP} + dev-libs/json-c:= + dev-libs/libxml2:2 + dev-libs/protobuf-c + >=sci-libs/geos-3.5.0 + >=sci-libs/proj-4.6.0:= + >=sci-libs/gdal-1.10.0 + address-standardizer? ( dev-libs/libpcre ) + gtk? ( x11-libs/gtk+:2 ) + mapbox? ( dev-libs/protobuf-c:= ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.5 + dev-libs/libxslt + virtual/imagemagick-tools[png] + ) + test? ( dev-util/cunit ) +" + +PATCHES=( "${FILESDIR}/${PN}-2.2.0-arflags.patch" ) + +src_prepare() { + default + + if [[ ${PV} = *9999* ]] ; then + source "${S}"/Version.config + PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}" + fi + + # These modules are built using the same *FLAGS that were used to build + # dev-db/postgresql. The right thing to do is to ignore the current + # *FLAGS settings. + QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" + + local AT_M4DIR="macros" + eautoreconf + + postgres-multi_src_prepare +} + +src_configure() { + local myeconfargs=( + --with-protobuf + $(use_with address-standardizer) + $(use_with gtk gui) + $(use_with mapbox) + $(use_with topology) + ) + postgres-multi_foreach econf "${myeconfargs[@]}" +} + +src_compile() { + postgres-multi_foreach emake + postgres-multi_foreach emake -C topology + + if use doc ; then + postgres-multi_foreach emake comments + postgres-multi_foreach emake cheatsheets + postgres-multi_forbest emake -C doc html + fi +} + +src_install() { + postgres-multi_foreach emake DESTDIR="${D}" install + postgres-multi_foreach emake -C topology DESTDIR="${D}" install + postgres-multi_forbest dobin ./utils/postgis_restore.pl + + dodoc CREDITS TODO loader/README.* doc/*txt + + docinto topology + dodoc topology/{TODO,README} + + if use doc ; then + postgres-multi_foreach emake DESTDIR="${D}" comments-install + + docinto html + postgres-multi_forbest dodoc doc/html/{postgis.html,style.css} + + docinto html/images + postgres-multi_forbest dodoc doc/html/images/* + fi + + use static-libs || find "${ED}" -name '*.a' -delete +} + +pkg_postinst() { + ebegin "Refreshing PostgreSQL symlinks" + postgresql-config update + eend $? + + local base_uri="https://postgis.net/docs/manual-" + if [[ ${PV} = *9999* ]] ; then + base_uri+="dev" + else + base_uri+="${PGIS}" + fi + + elog "To finish installing PostGIS, follow the directions detailed at:" + elog "${base_uri}/postgis_installation.html#create_new_db_extensions" +} diff --git a/dev-db/postgis/postgis-3.0.1.ebuild b/dev-db/postgis/postgis-3.0.1.ebuild new file mode 100644 index 000000000000..b272f3d2031a --- /dev/null +++ b/dev-db/postgis/postgis-3.0.1.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +POSTGRES_COMPAT=( 9.{5..6} {10..12} ) +POSTGRES_USEDEP="server" +inherit autotools postgres-multi + +MY_P="${PN}-$(ver_rs 3 '')" + +if [[ ${PV} = *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git" +else + PGIS="$(ver_cut 1-2)" + SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="Geographic Objects for PostgreSQL" +HOMEPAGE="https://postgis.net" + +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +IUSE="address-standardizer doc gtk static-libs test topology" + +REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}" + +# Needs a running psql instance, doesn't work out of the box +RESTRICT="test" + +RDEPEND="${POSTGRES_DEP} + dev-libs/json-c:= + dev-libs/libxml2:2 + dev-libs/protobuf-c:= + >=sci-libs/geos-3.6.0 + >=sci-libs/proj-4.9.0:= + >=sci-libs/gdal-1.10.0:= + address-standardizer? ( dev-libs/libpcre ) + gtk? ( x11-libs/gtk+:2 ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.5 + dev-libs/libxslt + virtual/imagemagick-tools[png] + ) + test? ( dev-util/cunit ) +" + +PATCHES=( "${FILESDIR}/${PN}-2.2.0-arflags.patch" ) + +src_prepare() { + default + + if [[ ${PV} = *9999* ]] ; then + source "${S}"/Version.config + PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}" + fi + + # These modules are built using the same *FLAGS that were used to build + # dev-db/postgresql. The right thing to do is to ignore the current + # *FLAGS settings. + QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" + + local AT_M4DIR="macros" + eautoreconf + + postgres-multi_src_prepare +} + +src_configure() { + local myeconfargs=( + --with-protobuf # funky misdetection if enabled but --without-protobuf + $(use_with address-standardizer) + $(use_with gtk gui) + $(use_with topology) + ) + postgres-multi_foreach econf "${myeconfargs[@]}" +} + +src_compile() { + postgres-multi_foreach emake + postgres-multi_foreach emake -C topology + + if use doc ; then + postgres-multi_foreach emake comments + postgres-multi_foreach emake cheatsheets + postgres-multi_forbest emake -C doc html + fi +} + +src_install() { + postgres-multi_foreach emake DESTDIR="${D}" install + postgres-multi_foreach emake -C topology DESTDIR="${D}" install + postgres-multi_forbest dobin ./utils/postgis_restore.pl + + dodoc CREDITS TODO loader/README.* doc/*txt + + docinto topology + dodoc topology/{TODO,README} + + if use doc ; then + postgres-multi_foreach emake DESTDIR="${D}" comments-install + + docinto html + postgres-multi_forbest dodoc doc/html/{postgis.html,style.css} + + docinto html/images + postgres-multi_forbest dodoc doc/html/images/* + fi + + use static-libs || find "${ED}" -name '*.a' -delete +} + +pkg_postinst() { + ebegin "Refreshing PostgreSQL symlinks" + postgresql-config update + eend $? + + local base_uri="https://postgis.net/docs/manual-" + if [[ ${PV} = *9999* ]] ; then + base_uri+="dev" + else + base_uri+="${PGIS}" + fi + + elog "To finish installing PostGIS, follow the directions detailed at:" + elog "${base_uri}/postgis_installation.html#create_new_db_extensions" +} diff --git a/dev-db/repmgr/Manifest b/dev-db/repmgr/Manifest index e60b7b71d26f..ca615167c8da 100644 --- a/dev-db/repmgr/Manifest +++ b/dev-db/repmgr/Manifest @@ -1,2 +1,3 @@ DIST repmgr-3.0.1.tar.gz 91724 BLAKE2B be0ac2d54dbaae7a45abaa90ed1a851e22f05a1bb0969a1c5d95e58d7c3f89513cc47555b77cc57bb5cd5baf60c21c9c44375363a757510f07b111ec78f87441 SHA512 5655745df18132ee53ff36f80b3a2bb8caa6cedd8091350464cf343386baa31c47d46b25c171dda0fd1f4c3402babea9864f4557a10659111449a2eb2e1fa2b9 DIST repmgr-3.3.2.tar.gz 162107 BLAKE2B b1029297fa548241dc5d58bcdcffc0a6f749725eba2d3c7d2cb70b1f46a96b491dc27deb7baf8459e91eae9663df000a1713e80f05e7e0e39afc020b4136c9a4 SHA512 98fba8fc0d9074e496c66762dbec45734fe279f39c9c51adb3e66dca929ac37f66a609789c8c658545856fd81f5afc5b35f6b5e389e52bce8c04ce8c52acd8dd +DIST repmgr-5.1.0.tar.gz 426487 BLAKE2B 25157923f94b8bd27a2b57796f701e89e7d9acfc8dabc4368640068d5926934e5688b27147ae94b4bee7bad54d59353927b5b70cf5590c554c4eef35fadf29b9 SHA512 9fa8a43ee3920269d1c1d2e619939eb68cb7ba79effe11e87dd67c594bacfcde609949322ce968df328f3913111f27d0ebe2f7742a72e21f3df97b0e05c56cc7 diff --git a/dev-db/repmgr/repmgr-5.1.0.ebuild b/dev-db/repmgr/repmgr-5.1.0.ebuild new file mode 100644 index 000000000000..06a26ac1e9b5 --- /dev/null +++ b/dev-db/repmgr/repmgr-5.1.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit eutils multilib +DESCRIPTION="PostgreSQL Replication Manager" +HOMEPAGE="http://www.repmgr.org/" +SRC_URI="http://www.repmgr.org/download/${P}.tar.gz" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="" + +DEPEND=">=dev-db/postgresql-9.3[server,static-libs]" +RDEPEND="${DEPEND} + net-misc/rsync" + +src_compile() { + emake USE_PGXS=1 +} + +src_install() { + emake DESTDIR="${D}" USE_PGXS=1 install + export PGSLOT="$(postgresql-config show)" + einfo "PGSLOT: ${PGSLOT}" + PGBASEDIR=/usr/$(get_libdir)/postgresql-${PGSLOT} + PGBINDIR=${PGBASEDIR}/bin/ + PGCONTRIB=/usr/share/postgresql-${PGSLOT}/contrib/ + dodir $PGCONTRIB $PGBINDIR + dosym $PGBINDIR/repmgr /usr/bin/repmgr${PGSLOT//.} + dosym $PGBINDIR/repmgrd /usr/bin/repmgrd${PGSLOT//.} + dodoc CREDITS HISTORY COPYRIGHT *.md + insinto /etc + newins repmgr.conf.sample repmgr.conf + fowners postgres:postgres /etc/repmgr.conf + ewarn "Remember to modify /etc/repmgr.conf" +} diff --git a/dev-db/sqlite/sqlite-3.32.3.ebuild b/dev-db/sqlite/sqlite-3.32.3.ebuild index f396f2c80d25..21fd1f0b5d0e 100644 --- a/dev-db/sqlite/sqlite-3.32.3.ebuild +++ b/dev-db/sqlite/sqlite-3.32.3.ebuild @@ -22,7 +22,7 @@ fi LICENSE="public-domain" SLOT="3" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" if [[ "${PV}" == "9999" ]]; then PROPERTIES="live" diff --git a/dev-dotnet/Manifest.gz b/dev-dotnet/Manifest.gz index a655f2437b76..9c8a86a11b07 100644 Binary files a/dev-dotnet/Manifest.gz and b/dev-dotnet/Manifest.gz differ diff --git a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.21-mono-ambiguous-range.patch b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.21-mono-ambiguous-range.patch new file mode 100644 index 000000000000..048373a3ec71 --- /dev/null +++ b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.21-mono-ambiguous-range.patch @@ -0,0 +1,15 @@ +https://github.com/mono/gtk-sharp/commit/a00552ad68ae349e89e440dca21b86dbd6bccd30 +https://bugs.gentoo.org/697108 +--- a/sample/test/TestRange.cs 2012-09-25 14:19:02.000000000 -0700 ++++ b/sample/test/TestRange.cs 2020-07-05 09:07:25.112932811 -0700 +@@ -10,6 +10,10 @@ + + using Gtk; + ++// disambiguate, Gtk.Range vs System.Range ++using Range=Gtk.Range; ++ ++ + namespace WidgetViewer { + + public class TestRange diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-2.12.21.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-2.12.21.ebuild index 9d011d0f9f48..91c76012d1da 100644 --- a/dev-dotnet/gtk-sharp/gtk-sharp-2.12.21.ebuild +++ b/dev-dotnet/gtk-sharp/gtk-sharp-2.12.21.ebuild @@ -35,6 +35,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig sys-devel/automake:1.11" +PATCHES=( + "${FILESDIR}/${PN}-2.12.21-mono-ambiguous-range.patch" +) + src_prepare() { base_src_prepare eautoreconf diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz index 72b66639f37b..938c0e9b046a 100644 Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ diff --git a/dev-embedded/gnome-avrdude/Manifest b/dev-embedded/gnome-avrdude/Manifest deleted file mode 100644 index c0b380c329e1..000000000000 --- a/dev-embedded/gnome-avrdude/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnome-avrdude-0.1.tar.gz 105608 BLAKE2B 0deb705604666659abc3813e31436ccb79b9cb058e66d791128cb275952169d99a660c7c114d637a32e528e96e94645eb0dee3ea6a45bda1039e0124d60dd938 SHA512 9b9bbb5fe8247ea33482d7d40089a23b1c2aa9f3709d96e0f008e6cc60a7313468fb22829391b175cd51916b5335811dae0263de553f7c8f3c447acdb39f8198 diff --git a/dev-embedded/gnome-avrdude/gnome-avrdude-0.1.ebuild b/dev-embedded/gnome-avrdude/gnome-avrdude-0.1.ebuild deleted file mode 100644 index 3ba5502018e0..000000000000 --- a/dev-embedded/gnome-avrdude/gnome-avrdude-0.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit gnome2 autotools - -DESCRIPTION="GNOME GUI for avrdude" -HOMEPAGE="https://www.sourceforge.net/projects/gnome-avrdude/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-libs/glib-2 - x11-libs/gtk+:2 - gnome-base/gconf - gnome-base/libgnome - gnome-base/libgnomeui - gnome-base/libglade - x11-libs/pango" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -RDEPEND="${RDEPEND} - dev-embedded/avrdude" - -DOCS="AUTHORS NEWS README" - -src_prepare() { - sed -i \ - -e :a -e '/\\$/N; s/\\\n//; ta' \ - -e 's/^gnome_avrdude/#gnome_avrdude/' \ - "${S}"/Makefile.am \ - || die "sed failed" - sed -i \ - -e 's/Wall\\/Wall/' \ - -e 's/^[\t ]*-g//' \ - "${S}"/src/Makefile.am \ - || die "sed failed" - - # Remove Application category from .desktop file. - sed -i 's/;Application;/;/' gnome-avrdude.desktop - - eautoreconf -} diff --git a/dev-embedded/gnome-avrdude/metadata.xml b/dev-embedded/gnome-avrdude/metadata.xml deleted file mode 100644 index 13dbe7261495..000000000000 --- a/dev-embedded/gnome-avrdude/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - embedded@gentoo.org - Embedded Gentoo - - - gnome-avrdude is a GNOME graphical user interface (GUI) for the command-line - Atmel AVR microcontroller programming software avrdude - - - gnome-avrdude - - diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz index 52978d78dde4..f4a01f59863b 100644 Binary files a/dev-erlang/Manifest.gz and b/dev-erlang/Manifest.gz differ diff --git a/dev-erlang/base64url/base64url-1.0.1.ebuild b/dev-erlang/base64url/base64url-1.0.1.ebuild index 39e89bd05bea..3d320992ddfe 100644 --- a/dev-erlang/base64url/base64url-1.0.1.ebuild +++ b/dev-erlang/base64url/base64url-1.0.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/dvv/base64url/archive/${PV}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86" DEPEND=">=dev-lang/erlang-17.1" RDEPEND="${DEPEND}" diff --git a/dev-erlang/eimp/eimp-1.0.15.ebuild b/dev-erlang/eimp/eimp-1.0.15.ebuild index fff67fd505eb..44b63d1e2af5 100644 --- a/dev-erlang/eimp/eimp-1.0.15.ebuild +++ b/dev-erlang/eimp/eimp-1.0.15.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/eimp/archive/${PV}.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86" RDEPEND=">=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.19 diff --git a/dev-erlang/jose/jose-1.10.1.ebuild b/dev-erlang/jose/jose-1.10.1.ebuild index dea411d70034..6cb4e86bc131 100644 --- a/dev-erlang/jose/jose-1.10.1.ebuild +++ b/dev-erlang/jose/jose-1.10.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/potatosalad/erlang-jose/archive/${PV}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86" IUSE="" DEPEND=">=dev-lang/erlang-19.0" diff --git a/dev-erlang/mqtree/mqtree-1.0.7.ebuild b/dev-erlang/mqtree/mqtree-1.0.7.ebuild index c1c9dc0775a9..54901bfa07a2 100644 --- a/dev-erlang/mqtree/mqtree-1.0.7.ebuild +++ b/dev-erlang/mqtree/mqtree-1.0.7.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~sparc" +KEYWORDS="~amd64 ~arm ~ia64 ~sparc" DEPEND=">=dev-lang/erlang-17.5 >=dev-erlang/p1_utils-1.0.18" diff --git a/dev-erlang/p1_acme/p1_acme-1.0.5.ebuild b/dev-erlang/p1_acme/p1_acme-1.0.5.ebuild index d827d7ed7938..ef4e61ce6b0c 100644 --- a/dev-erlang/p1_acme/p1_acme-1.0.5.ebuild +++ b/dev-erlang/p1_acme/p1_acme-1.0.5.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~sparc" +KEYWORDS="~amd64 ~arm ~ia64 ~sparc" DEPEND=">=dev-lang/erlang-17.1 >=dev-erlang/jiffy-1.0.1 diff --git a/dev-erlang/pkix/pkix-1.0.5.ebuild b/dev-erlang/pkix/pkix-1.0.5.ebuild index 3209f81fcd03..c14edf0234b7 100644 --- a/dev-erlang/pkix/pkix-1.0.5.ebuild +++ b/dev-erlang/pkix/pkix-1.0.5.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~sparc" +KEYWORDS="~amd64 ~arm ~ia64 ~sparc" DEPEND=">=dev-lang/erlang-17.5" RDEPEND="${DEPEND}" diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index d6da60bddb2e..3f116fde9703 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest index f28afb350fea..a76117f75ea7 100644 --- a/dev-java/gradle-bin/Manifest +++ b/dev-java/gradle-bin/Manifest @@ -1,4 +1 @@ -DIST gradle-3.3-all.zip 91388147 BLAKE2B 15539ec06cadcdaee9d54928381d5626bf06bae3251eb304fee095e6d0362f23759e99e3841dac2b9a1eed50b6057ecce78230dafb45711bfe764bf107b1f704 SHA512 4b852eaf4030c780516fe9214c289e49fc93fc62672da70b7fd6bbbcd128e6912dd196195ce32570984503ea53b48593a41fbf4ec69b0f18b5e32c2fe9e556b3 -DIST gradle-3.4.1-all.zip 91604607 BLAKE2B 1c4aaae4899f3faa94fc3ead84c4fd4bdb6212c0f579a255c7494896fd2a498890c58e853315892c3c9d78635b58da5423b1b2211b991639474d19eca1f2992f SHA512 bdaabf747e60ae1cf2c9fedb0730a2e3deb914609db05ffc7e4cbd5402bc44e84d2c98154f14fdd7f944c2f49eb5dead0f44c119ac5a16bd7491c3369d784f5c -DIST gradle-bin-5.2.1.zip 132549774 BLAKE2B c6d6fa9975bc28030672a99f22f0e9c4c2cb3d667ae3658c1062428d0ab2fd8c3b4df0479f4fde7b2d75b8fcb64c7f5b208e53c5b30a9b3c7afb5ad7e1a4139d SHA512 e2a17072c10d27acbe4a0282dfdfed907ab5c57109668595feaec681ab1d4be017ac0f6090c2c2b64a057d71c1e244bb50f4047509d36c5930e894837a96171b DIST gradle-bin-6.3.zip 145161013 BLAKE2B f840bda2c1e2a6dd5306b9f7ad6fc8ae8c3d7342de57bd813b8dff64f733fc058af8dc7c9c5a138eac4eef3d5d12074976db81fe7eeb51b52d726502af04d036 SHA512 9796c14f8d4559128b4cb7e676883d83ef99b67242ae8156abebdb38bb7a561e8b3df3f93b24aa53274b7d78a7b04ea51e73268c2465799daa9da53ef73de24d diff --git a/dev-java/gradle-bin/gradle-bin-3.3.ebuild b/dev-java/gradle-bin/gradle-bin-3.3.ebuild deleted file mode 100644 index e14942e03d7e..000000000000 --- a/dev-java/gradle-bin/gradle-bin-3.3.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit java-pkg-2 - -MY_PN=${PN%%-bin} -MY_P="${MY_PN}-${PV/_rc/-rc-}" - -DESCRIPTION="A project automation and build tool with a Groovy based DSL" -SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip" -HOMEPAGE="http://www.gradle.org/" -LICENSE="Apache-2.0" -SLOT="${PV}" -KEYWORDS="~amd64 ~x86" - -DEPEND="app-arch/zip" -RDEPEND=">=virtual/jdk-1.6" - -IUSE="source doc examples" - -S="${WORKDIR}/${MY_P}" - -src_install() { - local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}" - - dodoc docs/release-notes.html getting-started.html - - insinto "${gradle_dir}" - - # source - if use source ; then - java-pkg_dosrc src/* - fi - - # docs - if use doc ; then - java-pkg_dojavadoc docs/javadoc - fi - - # examples - if use examples ; then - java-pkg_doexamples samples - fi - - insinto "${gradle_dir}" - doins -r bin/ lib/ - fperms 755 "${gradle_dir}/bin/gradle" - dosym "${gradle_dir}/bin/gradle" "/usr/bin/${MY_PN}" -} diff --git a/dev-java/gradle-bin/gradle-bin-3.4.1.ebuild b/dev-java/gradle-bin/gradle-bin-3.4.1.ebuild deleted file mode 100644 index ab78e3f8790e..000000000000 --- a/dev-java/gradle-bin/gradle-bin-3.4.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit java-pkg-2 - -MY_PN=${PN%%-bin} -MY_P="${MY_PN}-${PV/_rc/-rc-}" - -DESCRIPTION="A project automation and build tool with a Groovy based DSL" -SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip" -HOMEPAGE="http://www.gradle.org/" -LICENSE="Apache-2.0" -SLOT="${PV}" -KEYWORDS="~amd64 ~x86" - -DEPEND="app-arch/zip" -RDEPEND=">=virtual/jdk-1.6" - -IUSE="source doc examples" - -S="${WORKDIR}/${MY_P}" - -src_install() { - local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}" - - dodoc docs/release-notes.html getting-started.html - - insinto "${gradle_dir}" - - # source - if use source ; then - java-pkg_dosrc src/* - fi - - # docs - if use doc ; then - java-pkg_dojavadoc docs/javadoc - fi - - # examples - if use examples ; then - java-pkg_doexamples samples - fi - - insinto "${gradle_dir}" - doins -r bin/ lib/ - fperms 755 "${gradle_dir}/bin/gradle" - dosym "${gradle_dir}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}" -} diff --git a/dev-java/gradle-bin/gradle-bin-5.2.1.ebuild b/dev-java/gradle-bin/gradle-bin-5.2.1.ebuild deleted file mode 100644 index 0f029927d1f2..000000000000 --- a/dev-java/gradle-bin/gradle-bin-5.2.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-pkg-2 - -IUSE="source doc examples" - -MY_PN=${PN%%-bin} -MY_P="${MY_PN}-${PV/_rc/-rc-}" - -DESCRIPTION="A project automation and build tool with a Groovy based DSL" -SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip" -HOMEPAGE="http://www.gradle.org/" - -LICENSE="Apache-2.0" -SLOT="${PV}" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - >=virtual/jdk-1.6" - -DEPEND=" - app-arch/zip - >=virtual/jre-1.6" - -S="${WORKDIR}/${MY_P}" - -src_install() { - local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}" - - dodoc docs/release-notes.html getting-started.html - - insinto "${gradle_dir}" - - # source - if use source ; then - java-pkg_dosrc src/* - fi - - # docs - if use doc ; then - java-pkg_dojavadoc docs/javadoc - fi - - # examples - if use examples ; then - java-pkg_doexamples samples - fi - - insinto "${gradle_dir}" - doins -r bin/ lib/ - fperms 755 "${gradle_dir}/bin/gradle" - dosym "${gradle_dir}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}" -} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.105.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.105.ebuild index c65e1f064dd7..91d3702b16cd 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.105.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.105.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="3.0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="" DEPEND=">=virtual/jdk-1.6" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.57.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.57.ebuild index b6216e53c6b0..beddeca2707e 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.57.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.57.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="3.1" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="" DEPEND=">=virtual/jdk-1.8" diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz index 73a7f80eb522..ce41f16bd5db 100644 Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ diff --git a/dev-lang/gnuprologjava/gnuprologjava-0.2.6-r1.ebuild b/dev-lang/gnuprologjava/gnuprologjava-0.2.6-r1.ebuild new file mode 100644 index 000000000000..e02b82d8ab14 --- /dev/null +++ b/dev-lang/gnuprologjava/gnuprologjava-0.2.6-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 2016-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils java-pkg-2 java-ant-2 + +DESCRIPTION="GNU Prolog for Java is an implementation of ISO Prolog as a Java library" +HOMEPAGE="https://www.gnu.org/software/gnuprologjava" +SRC_URI="mirror://gnu/gnuprologjava/${P}-src.zip" + +LICENSE="LGPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +RDEPEND=">=virtual/jdk-1.6:=" +DEPEND="${RDEPEND} + dev-java/ant-core" + +S="${WORKDIR}" + +src_prepare() { + eapply "${FILESDIR}"/${P}-manual.patch + eapply_user +} + +src_compile() { + eant jar + if use doc ; then + eant doc + fi + mv build/${P}.jar build/${PN}.jar || die +} + +src_install() { + java-pkg_dojar build/${PN}.jar + + if use doc ; then + java-pkg_dohtml -r build/api || die + java-pkg_dohtml -r build/manual || die + fi + + dodoc NEWS.txt docs/readme.txt +} diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest index faf172eba3d1..fbb3ea463a88 100644 --- a/dev-lang/go/Manifest +++ b/dev-lang/go/Manifest @@ -10,11 +10,7 @@ DIST go-linux-ppc64le-bootstrap-1.8.tbz 52211575 BLAKE2B 7a28ec5a381369c4e9415c8 DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 BLAKE2B 920a176b8f4fc3a816e724324bbb30a383d599e31a0d2093d24797dbcd0e799a662a3589dbb87d2f5dd16df07c4cf8f1e444e87b540ec732746bb025dc9271f8 SHA512 d429cae870d66217ab2e07c74209d3031d97baa4f899b4d70ae6283a1a5b1434b037904c4cfca0b2bc798d5ba0b358c3739e000eccbc74809baf564c5686df5a DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe5950cb65c059e2801394231e715e94145d1f918eb59b10472b2385e57ebd5cfb9eca0ad7290fb118436486b665520bb540970f971ab SHA512 52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d DIST go1.12.17.src.tar.gz 20725913 BLAKE2B 2eef7374195302656268a42409619445dfeb3ede1f9218ae4eab195916876b97f7510cc62585a0bfdd9f86dddf8a74000032a84b29bc9891d84fc69db94f0274 SHA512 069f8f445d9d2268ebb14b2446fab34843d56283c04561636d122fd8b4c1ea0b63640a84437db7a7be71039440ffe170cd3f8025b03b0acf95f2a56fa2febec6 -DIST go1.13.10.src.tar.gz 21702804 BLAKE2B 586494604455594c552d25a207634d70ae7f5ad142e18e22f5ef462c6488327cc01630c0bc99a4ede9dee0d649982802cf79f34f35ad7f810ca0701c35a7d555 SHA512 9e020dd89ab6201c4cbb893caecc0b077d5fbb2e10381e1b76a29ddc18c141d8db67a1b0f607ed915b0e9c40c4fb2c65b0319472535892534a31ad962e72fe05 -DIST go1.13.12.src.tar.gz 21703700 BLAKE2B d503b864edd753d838ab2776c00ee29d79c4dadaa8f9414291d7fd9ef420950361e676d78111db171d4d7bad9f28d23897333720d77c259691231cac81aa7b2a SHA512 85ffe18171cd131fc5bdfaa8f5e944643399ef1f270a599cdccbe0212f1d1651a87075d11877220466d18ff590bb9eadeac48851b630ab9f0e06c199c0286cc4 DIST go1.13.13.src.tar.gz 21704330 BLAKE2B 462a8c7a438c5638158645d012bcf361f5033b94209ee3b89b15b066c6a92ae7b632d9fa295be2bfd2ed20398471a3e9531eccea1c67f511901f6a7f77242557 SHA512 1bee57e6b5d7154e7d93ccf33b9bd8ccacb005d3de1f0dc2272d4d431ab171707a57fe81d65ff17f6016f5c94d5bec6618c13174d43538f7c370d923958529c3 DIST go1.13.14.src.tar.gz 21704891 BLAKE2B fff860b45b296359cb226f123279b3351f654336d267f8d60607fb0eb9f555e99d2e8250331510ddcf40de43235a864867af4b16db153b3f0827a3ccff045c19 SHA512 49dd28394333eaa7676fdf530d2fc18a645546c814fbe9247c9613e36529eb23634816b5c84574fea1cd9191fa86e684130e75dc70545344851c6b47c846558d -DIST go1.14.2.src.tar.gz 22454649 BLAKE2B edd8a1081e7da6988532b9fefe6d6f789a7d336562d61d5e585a8b881fb45d77721bee9837ae79318295471aea138e175650c2138175a587f0b7957988e8e209 SHA512 3f6804e1a60df6a7c55c294fe4147b2d6f028c619ad4ae5b1ae8793c6be637a1e6a62721cc7ce0b28918ab3441a89fa9acda72cb5450bf5af8d7872411d28015 -DIST go1.14.4.src.tar.gz 22535243 BLAKE2B 8dc44b2144587e24ef53adcffdf335ec03dbcbb1101e38ac54611eb9e6216d3a676f5a24daab24342018b549b7de2a8730e556abfda5e18199c55d266ac3a44b SHA512 b0d657ea33331062db5a4da0aff14798f292ca967a53665af1a93e04eba7a03e49a3dbc4768c4f099ec5ff25a31885750f7658f819057057093e2d7bfb085575 DIST go1.14.5.src.tar.gz 22533577 BLAKE2B 4e07fd46f977e14cf493d92a3c3e2d61c8eadf8f6e07b2de3eec7442d2ee0c736ac99f75eaaf405a48d1751144f4ae770692c3a1db9bc8e27e7c48e89fd74540 SHA512 1019b86304925fe60ebd81289349c4582e2e5932dc3ed35d9dc7b36ac293ee583ab6dcf3ae9a96f0f60274f24c295fb0662a8f4d06b717f624fa695c2b40e29c DIST go1.14.6.src.tar.gz 22534714 BLAKE2B 9dacb150108dc30fe3600c6fdc1df3cd2c36f701518f402d2ad8cd2e4ba51203176e5097adf66ac9223181197b1bea7de625933c570567d9e7dddf485bc2c204 SHA512 5c865c8272fb0dc8eab1514732b0200dbc867276512714dd30afc658a0d2afac6bd758e00c6f576d8d254e411418a52a564c895399b56cfe06c2b1785271a8fd diff --git a/dev-lang/go/go-1.13.10.ebuild b/dev-lang/go/go-1.13.10.ebuild deleted file mode 100644 index 1f323d04c2e8..000000000000 --- a/dev-lang/go/go-1.13.10.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} - -MY_PV=${PV/_/} - -inherit toolchain-funcs - -case ${PV} in -*9999*) - EGIT_REPO_URI="https://github.com/golang/go.git" - inherit git-r3 - ;; -*) - SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz " - S="${WORKDIR}"/go - case ${PV} in - *_beta*|*_rc*) ;; - *) - KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - # The upstream tests fail under portage but pass if the build is - # run according to their documentation [1]. - # I am restricting the tests on released versions until this is - # solved. - # [1] https://golang.org/issues/18442 - RESTRICT="test" - ;; - esac -esac - -DESCRIPTION="A concurrent garbage collected and typesafe programming language" -HOMEPAGE="https://golang.org" - -LICENSE="BSD" -SLOT="0/${PV}" - -BDEPEND="|| ( - dev-lang/go - dev-lang/go-bootstrap )" -RDEPEND="!/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + local -x EPYTHON=python${PYVER} + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} + fi + + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/python${PYVER}" \ + "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die + # python-config and pythonX-config + ln -s "../../../bin/python${PYVER}-config" \ + "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${scriptdir}/python-config" || die + # 2to3, pydoc, pyvenv + ln -s "../../../bin/2to3-${PYVER}" \ + "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${scriptdir}/idle" || die + fi +} + +eselect_python_update() { + if [[ -z "$(eselect python show)" || \ + ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then + eselect python update + fi + + if [[ -z "$(eselect python show --python${PV%%.*})" || \ + ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]] + then + eselect python update --python${PV%%.*} + fi +} + +pkg_postinst() { + eselect_python_update +} + +pkg_postrm() { + eselect_python_update +} diff --git a/dev-lang/python/python-3.6.11-r2.ebuild b/dev-lang/python/python-3.6.11-r2.ebuild new file mode 100644 index 000000000000..823fa8cf986f --- /dev/null +++ b/dev-lang/python/python-3.6.11-r2.ebuild @@ -0,0 +1,357 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs + +MY_P="Python-${PV}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-3.6.11-r3" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="https://www.python.org/" +SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}/${PYVER}m" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + dev-libs/libffi:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:= )" +# bluetooth requires headers from bluez +DEPEND="${RDEPEND} + bluetooth? ( net-wireless/bluez ) + test? ( app-arch/xz-utils[extra-filters(+)] ) + virtual/pkgconfig + !sys-devel/gcc[libffi(-)]" +RDEPEND+=" !build? ( app-misc/mime-types )" +PDEPEND=">=app-eselect/eselect-python-20140125-r1" + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat || die + rm -fr Modules/_ctypes/libffi* || die + rm -fr Modules/zlib || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + Lib/distutils/command/install.py \ + Lib/distutils/sysconfig.py \ + Lib/site.py \ + Lib/sysconfig.py \ + Lib/test/test_site.py \ + Makefile.pre.in \ + Modules/Setup.dist \ + Modules/getpath.c \ + configure.ac \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + eautoreconf +} + +src_configure() { + local disable + # disable automagic bluetooth headers detection + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + # https://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flagq -O3; then + is-flagq -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. + tc-export CXX + + # Set LDFLAGS so we link modules with -lpython3.2 correctly. + # Needed on FreeBSD unless Python 3.2 is already installed. + # Please query BSD team before removing this! + append-ldflags "-L." + + local dbmliborder + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + + local myeconfargs=( + # glibc-2.30 removes it; since we can't cleanly force-rebuild + # Python on glibc upgrade, remove it proactively to give + # a chance for users rebuilding python before glibc + ac_cv_header_stropts_h=no + + --with-fpectl + --enable-shared + $(use_enable ipv6) + $(use_with threads) + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --with-system-expat + --with-system-ffi + ) + + OPT="" econf "${myeconfargs[@]}" + + if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + eerror "configure has detected that the sem_open function is broken." + eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." + die "Broken sem_open function (bug 496328)" + fi +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Skip failing tests. + local skipped_tests="gdb" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # bug 660358 + local -x COLUMNS=80 + + local -x PYTHONDONTWRITEBYTECODE= + + emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local result=$? + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'" + elog "and run the tests separately." + + if [[ ${result} -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + local libdir=${ED}/usr/$(get_libdir)/python${PYVER} + + emake DESTDIR="${D}" altinstall + + # Remove static library + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die + + sed \ + -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ + -e "s/\(PY_LDFLAGS=\).*/\1/" \ + -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + + use threads || rm -r "${libdir}/multiprocessing" || die + use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + local -x EPYTHON=python${PYVER} + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} + fi + + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${scriptdir}/python-config" || die + # 2to3, pydoc, pyvenv + ln -s "../../../bin/2to3-${PYVER}" \ + "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${scriptdir}/pydoc" || die + ln -s "../../../bin/pyvenv-${PYVER}" \ + "${scriptdir}/pyvenv" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${scriptdir}/idle" || die + fi +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then + python_updater_warning="1" + fi +} + +eselect_python_update() { + if [[ -z "$(eselect python show)" || \ + ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then + eselect python update + fi + + if [[ -z "$(eselect python show --python${PV%%.*})" || \ + ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]] + then + eselect python update --python${PV%%.*} + fi +} + +pkg_postinst() { + eselect_python_update + + if [[ "${python_updater_warning}" == "1" ]]; then + ewarn "You have just upgraded from an older version of Python." + ewarn + ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." + fi +} + +pkg_postrm() { + eselect_python_update +} diff --git a/dev-lang/python/python-3.7.8-r2.ebuild b/dev-lang/python/python-3.7.8-r2.ebuild new file mode 100644 index 000000000000..938eb2e64d64 --- /dev/null +++ b/dev-lang/python/python-3.7.8-r2.ebuild @@ -0,0 +1,343 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs + +MY_P="Python-${PV}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-3.7.8-r3" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="https://www.python.org/" +SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}/${PYVER}m" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + dev-libs/libffi:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:= )" +# bluetooth requires headers from bluez +DEPEND="${RDEPEND} + bluetooth? ( net-wireless/bluez ) + test? ( app-arch/xz-utils[extra-filters(+)] ) + virtual/pkgconfig + !sys-devel/gcc[libffi(-)]" +RDEPEND+=" !build? ( app-misc/mime-types )" +PDEPEND=">=app-eselect/eselect-python-20140125-r1" + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat || die + rm -fr Modules/_ctypes/libffi* || die + rm -fr Modules/zlib || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + eautoreconf +} + +src_configure() { + local disable + # disable automagic bluetooth headers detection + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + # https://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flagq -O3; then + is-flagq -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. + tc-export CXX + + # Set LDFLAGS so we link modules with -lpython3.2 correctly. + # Needed on FreeBSD unless Python 3.2 is already installed. + # Please query BSD team before removing this! + append-ldflags "-L." + + # Fix implicit declarations on cross and prefix builds. Bug #674070. + use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + + local dbmliborder + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + + local myeconfargs=( + # glibc-2.30 removes it; since we can't cleanly force-rebuild + # Python on glibc upgrade, remove it proactively to give + # a chance for users rebuilding python before glibc + ac_cv_header_stropts_h=no + + --enable-shared + $(use_enable ipv6) + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --with-system-expat + --with-system-ffi + ) + + OPT="" econf "${myeconfargs[@]}" +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Skip failing tests. + local skipped_tests="gdb" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # bug 660358 + local -x COLUMNS=80 + + local -x PYTHONDONTWRITEBYTECODE= + + emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local result=$? + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'" + elog "and run the tests separately." + + if [[ ${result} -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + emake DESTDIR="${D}" altinstall + + # Remove static library + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die + + sed \ + -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ + -e "s/\(PY_LDFLAGS=\).*/\1/" \ + -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + + use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + local -x EPYTHON=python${PYVER} + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} + fi + + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${scriptdir}/python-config" || die + # 2to3, pydoc, pyvenv + ln -s "../../../bin/2to3-${PYVER}" \ + "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${scriptdir}/pydoc" || die + ln -s "../../../bin/pyvenv-${PYVER}" \ + "${scriptdir}/pyvenv" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${scriptdir}/idle" || die + fi +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then + python_updater_warning="1" + fi +} + +eselect_python_update() { + if [[ -z "$(eselect python show)" || \ + ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then + eselect python update + fi + + if [[ -z "$(eselect python show --python${PV%%.*})" || \ + ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]] + then + eselect python update --python${PV%%.*} + fi +} + +pkg_postinst() { + eselect_python_update + + if [[ "${python_updater_warning}" == "1" ]]; then + ewarn "You have just upgraded from an older version of Python." + ewarn + ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." + fi +} + +pkg_postrm() { + eselect_python_update +} diff --git a/dev-lang/python/python-3.8.4-r1.ebuild b/dev-lang/python/python-3.8.4-r1.ebuild new file mode 100644 index 000000000000..0a14b28132fb --- /dev/null +++ b/dev-lang/python/python-3.8.4-r1.ebuild @@ -0,0 +1,346 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs + +MY_P="Python-${PV}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-3.8.4-r2" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="https://www.python.org/" +SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + dev-libs/libffi:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:= )" +# bluetooth requires headers from bluez +DEPEND="${RDEPEND} + bluetooth? ( net-wireless/bluez ) + test? ( app-arch/xz-utils[extra-filters(+)] ) + virtual/pkgconfig + !sys-devel/gcc[libffi(-)]" +RDEPEND+=" !build? ( app-misc/mime-types )" +PDEPEND=">=app-eselect/eselect-python-20140125-r1" + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat || die + rm -fr Modules/_ctypes/libffi* || die + rm -fr Modules/zlib || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + eautoreconf +} + +src_configure() { + local disable + # disable automagic bluetooth headers detection + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + # https://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flagq -O3; then + is-flagq -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + # https://bugs.gentoo.org/700012 + if is-flagq -flto || is-flagq '-flto=*'; then + append-cflags $(test-flags-CC -ffat-lto-objects) + fi + + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. + tc-export CXX + + # Set LDFLAGS so we link modules with -lpython3.2 correctly. + # Needed on FreeBSD unless Python 3.2 is already installed. + # Please query BSD team before removing this! + append-ldflags "-L." + + # Fix implicit declarations on cross and prefix builds. Bug #674070. + use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + + local dbmliborder + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + + local myeconfargs=( + # glibc-2.30 removes it; since we can't cleanly force-rebuild + # Python on glibc upgrade, remove it proactively to give + # a chance for users rebuilding python before glibc + ac_cv_header_stropts_h=no + + --enable-shared + $(use_enable ipv6) + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --with-system-expat + --with-system-ffi + ) + + OPT="" econf "${myeconfargs[@]}" +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Skip failing tests. + local skipped_tests="gdb" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # bug 660358 + local -x COLUMNS=80 + + local -x PYTHONDONTWRITEBYTECODE= + + emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local result=$? + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'" + elog "and run the tests separately." + + if [[ ${result} -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + emake DESTDIR="${D}" altinstall + + # Remove static library + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die + + sed \ + -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ + -e "s/\(PY_LDFLAGS=\).*/\1/" \ + -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + + use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + local -x EPYTHON=python${PYVER} + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} + fi + + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${scriptdir}/python-config" || die + # 2to3, pydoc + ln -s "../../../bin/2to3-${PYVER}" \ + "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${scriptdir}/idle" || die + fi +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then + python_updater_warning="1" + fi +} + +eselect_python_update() { + if [[ -z "$(eselect python show)" || \ + ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then + eselect python update + fi + + if [[ -z "$(eselect python show --python${PV%%.*})" || \ + ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]] + then + eselect python update --python${PV%%.*} + fi +} + +pkg_postinst() { + eselect_python_update + + if [[ "${python_updater_warning}" == "1" ]]; then + ewarn "You have just upgraded from an older version of Python." + ewarn + ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." + fi +} + +pkg_postrm() { + eselect_python_update +} diff --git a/dev-lang/python/python-3.9.0_beta4-r1.ebuild b/dev-lang/python/python-3.9.0_beta4-r1.ebuild new file mode 100644 index 000000000000..1c5a83a1d9a9 --- /dev/null +++ b/dev-lang/python/python-3.9.0_beta4-r1.ebuild @@ -0,0 +1,323 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools check-reqs flag-o-matic pax-utils python-utils-r1 \ + toolchain-funcs + +MY_P="Python-${PV/_beta/b}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-3.9.0b4" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="https://www.python.org/" +SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + dev-libs/libffi:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:= )" +# bluetooth requires headers from bluez +DEPEND="${RDEPEND} + bluetooth? ( net-wireless/bluez ) + test? ( app-arch/xz-utils[extra-filters(+)] ) + virtual/pkgconfig + !sys-devel/gcc[libffi(-)]" +RDEPEND+=" !build? ( app-misc/mime-types )" +PDEPEND=">=app-eselect/eselect-python-20140125-r1" + +# large file tests involve a 2.5G file being copied (duplicated) +CHECKREQS_DISK_BUILD=5500M + +pkg_pretend() { + use test && check-reqs_pkg_pretend +} + +pkg_setup() { + use test && check-reqs_pkg_setup +} + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat || die + rm -fr Modules/_ctypes/libffi* || die + rm -fr Modules/zlib || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + eautoreconf +} + +src_configure() { + local disable + # disable automagic bluetooth headers detection + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + # https://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flagq -O3; then + is-flagq -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + # https://bugs.gentoo.org/700012 + if is-flagq -flto || is-flagq '-flto=*'; then + append-cflags $(test-flags-CC -ffat-lto-objects) + fi + + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. + tc-export CXX + + # Set LDFLAGS so we link modules with -lpython3.2 correctly. + # Needed on FreeBSD unless Python 3.2 is already installed. + # Please query BSD team before removing this! + append-ldflags "-L." + + # Fix implicit declarations on cross and prefix builds. Bug #674070. + use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + + local dbmliborder + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + + local myeconfargs=( + # glibc-2.30 removes it; since we can't cleanly force-rebuild + # Python on glibc upgrade, remove it proactively to give + # a chance for users rebuilding python before glibc + ac_cv_header_stropts_h=no + + --enable-shared + $(use_enable ipv6) + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --with-system-expat + --with-system-ffi + ) + + OPT="" econf "${myeconfargs[@]}" +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Skip failing tests. + local skipped_tests="gdb" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # bug 660358 + local -x COLUMNS=80 + + local -x PYTHONDONTWRITEBYTECODE= + + emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local result=$? + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'" + elog "and run the tests separately." + + if [[ ${result} -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + emake DESTDIR="${D}" altinstall + + # Remove static library + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die + + sed \ + -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ + -e "s/\(PY_LDFLAGS=\).*/\1/" \ + -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + local -x EPYTHON=python${PYVER} + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} + fi + + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${scriptdir}/python-config" || die + # 2to3, pydoc + ln -s "../../../bin/2to3-${PYVER}" \ + "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${scriptdir}/idle" || die + fi +} diff --git a/dev-lang/qu-prolog/qu-prolog-10.4.ebuild b/dev-lang/qu-prolog/qu-prolog-10.4.ebuild index df6dbad5dead..458fb4cb4cfb 100644 --- a/dev-lang/qu-prolog/qu-prolog-10.4.ebuild +++ b/dev-lang/qu-prolog/qu-prolog-10.4.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz" LICENSE="Apache-2.0 GPL-2+" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc ~x86" IUSE="debug doc examples pedro qt5 readline threads" RDEPEND=" diff --git a/dev-lang/rust-bin/rust-bin-1.44.1.ebuild b/dev-lang/rust-bin/rust-bin-1.44.1.ebuild index b36387480c97..0ac82e0b3a12 100644 --- a/dev-lang/rust-bin/rust-bin-1.44.1.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.44.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})" LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" SLOT="stable" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm arm64 ppc64 x86" IUSE="clippy cpu_flags_x86_sse2 doc rustfmt" DEPEND="" diff --git a/dev-lang/rust/rust-1.44.1.ebuild b/dev-lang/rust/rust-1.44.1.ebuild index b22d273aed99..3ddcdaa9ee15 100644 --- a/dev-lang/rust/rust-1.44.1.ebuild +++ b/dev-lang/rust/rust-1.44.1.ebuild @@ -18,7 +18,7 @@ else SLOT="stable/${ABI_VER}" MY_P="rustc-${PV}" SRC="${MY_P}-src.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 arm arm64 ppc64 x86" fi RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).1" diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest index 80ec94d28ba4..f261c07415bf 100644 --- a/dev-lang/swi-prolog/Manifest +++ b/dev-lang/swi-prolog/Manifest @@ -5,3 +5,4 @@ DIST swipl-8.3.0.tar.gz 10955310 BLAKE2B 74fbe2460b4b911281846ee7fffb0ca053e6c1c DIST swipl-8.3.1.tar.gz 10956733 BLAKE2B 8fab6bb759371af7bf2ed71d7588eeb0694d9f8317a8daff0b663bf883428d0b80ce75196029d87192a82760719bb07086bb11a9969f0700d6dcb232bbd13704 SHA512 8e8e1b65e5e8f7b3ac22e09c9d9700fbdf44ada1470c9a741e3ea98063e096ce859cdfdf0ab1face7c41f1c04b55583ab5a38f91d8fa1fbd26ba1dff199be116 DIST swipl-8.3.2.tar.gz 10971577 BLAKE2B d6dc5b7f4a3133d4fb97b236113c691a4aa4aecaeb9a1f9f2f417fc541a934eb3987ca3413b4d72e14849575aeb6eacd150f1b4e4290e2a62995e1554048509c SHA512 cab637aba1f11be96553bd68a4a7364d407ef600408d607f26ad2bab53f26b1399cd082dce65c1b8c7b73bc63ea16553942234f80d3024ef3ca853457769cda7 DIST swipl-8.3.3.tar.gz 10983958 BLAKE2B 41243dc83a5bdf17f6b78b18f9da00b691294fcc557c3ae828e4d1d3ac3347019162143243864ff5db78c65ada1a5a07ff0b282bac57c5882f59518a62203771 SHA512 58bb9166e2b4c83b399985bf9b79e6851b76f459e97c6a820872f66b8a211ca490d953ed5815acc939b0b295533e017f31466bacd0be2e0f8d8e2357cf2d2d42 +DIST swipl-8.3.4.tar.gz 10998331 BLAKE2B 3d290b0119a8493f57788afb16c4ee4178a9d295a7e75897f92a13caf35c8638059334984d07c993e03e6eecb8eb37002287b3066c491848fb19ffbdb8e575d1 SHA512 119bcd7229443ef574be0ab420668d1cfab9ad1f90a6b708b3b17a41d7f3af8f8c2493a6c34e7bf0061b300013a0e95a2f1519e313aad081dd5fa7ffa002859e diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.4.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.4.ebuild new file mode 100644 index 000000000000..2293c183ae1c --- /dev/null +++ b/dev-lang/swi-prolog/swi-prolog-8.3.4.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils eutils flag-o-matic multilib + +PATCHSET_VER="0" + +DESCRIPTION="versatile implementation of the Prolog programming language" +HOMEPAGE="http://www.swi-prolog.org/" +SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml" +RESTRICT="!test? ( test )" + +RDEPEND="sys-libs/ncurses:= + sys-libs/zlib + archive? ( app-arch/libarchive ) + berkdb? ( >=sys-libs/db-4:= ) + odbc? ( dev-db/unixODBC ) + pcre? ( dev-libs/libpcre ) + readline? ( sys-libs/readline:= ) + libedit? ( dev-libs/libedit ) + gmp? ( dev-libs/gmp:0 ) + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + ) + java? ( >=virtual/jdk-1.7:= ) + uuid? ( dev-libs/ossp-uuid ) + qt5? ( + dev-qt/qtwidgets:5 + dev-qt/qtgui:5 + ) + X? ( + virtual/jpeg:0 + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXinerama + x11-libs/libXpm + x11-libs/libXt + x11-libs/libICE + x11-libs/libSM ) + yaml? ( dev-libs/libyaml )" + +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) + java? ( test? ( =dev-java/junit-3.8* ) )" + +S="${WORKDIR}/swipl-${PV}" +BUILD_DIR="${S}/build" +CMAKE_USE_DIR="${S}" + +src_prepare() { + if [[ -d "${WORKDIR}"/${PV} ]] ; then + eapply "${WORKDIR}"/${PV} + fi + eapply_user + + sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die + + cmake-utils_src_prepare +} + +src_configure() { + append-flags -fno-strict-aliasing + use debug && append-flags -DO_DEBUG + + mycmakeargs=( + -DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl + -DUSE_GMP=$(usex gmp) + -DINSTALL_DOCUMENTATION=$(use doc && usex archive) + -DSWIPL_PACKAGES_BASIC=$(usex !minimal) + -DSWIPL_PACKAGES_ARCHIVE=$(usex archive) + -DSWIPL_PACKAGES_ODBC=$(usex odbc) + -DSWIPL_PACKAGES_BDB=$(usex berkdb) + -DSWIPL_PACKAGES_PCRE=$(usex pcre) + -DSWIPL_PACKAGES_YAML=$(usex yaml) + -DSWIPL_PACKAGES_SSL=$(usex ssl) + -DSWIPL_PACKAGES_JAVA=$(usex java) + -DSWIPL_PACKAGES_QT=$(usex qt5) + -DSWIPL_PACKAGES_X=$(usex X) + -DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi) + ) + + cmake-utils_src_configure +} + +src_compile() { + XDG_CONFIG_DIRS="${HOME}" \ + XDG_DATA_DIRS="${HOME}" \ + cmake-utils_src_compile +} + +src_test() { + USE_PUBLIC_NETWORK_TESTS=false \ + USE_ODBC_TESTS=false \ + cmake-utils_src_test -V +} diff --git a/dev-lang/tuprolog/files/tuprolog-3.1.0-test-suite.patch b/dev-lang/tuprolog/files/tuprolog-3.1.0-test-suite.patch new file mode 100644 index 000000000000..5be70460b6d2 --- /dev/null +++ b/dev-lang/tuprolog/files/tuprolog-3.1.0-test-suite.patch @@ -0,0 +1,13 @@ +--- tuprolog-3.1.0.orig/test/unit/alice/tuprolog/TuPrologTestSuite.java 2020-07-18 15:41:48.236891336 +0200 ++++ tuprolog-3.1.0/test/unit/alice/tuprolog/TuPrologTestSuite.java 2020-07-18 15:42:11.458890364 +0200 +@@ -22,10 +22,8 @@ + ParserTestCase.class, + SpyEventTestCase.class, + VarTestCase.class, +- TestVarIsEqual.class, + JavaDynamicClassLoaderTestCase.class, + ISOIOLibraryTestCase.class, +- SocketLibTestCase.class, + ThreadLibraryTestCase.class + }) + public class TuPrologTestSuite {} diff --git a/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild b/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild new file mode 100644 index 000000000000..c6c38fcd1e63 --- /dev/null +++ b/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils java-pkg-2 java-ant-2 + +DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures" +HOMEPAGE="http://tuprolog.unibo.it/" +SRC_URI="https://dev.gentoo.org/~keri/distfiles/tuprolog/${P}.tar.gz" + +LICENSE="LGPL-3 BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples test" +RESTRICT="!test? ( test )" + +RDEPEND=">=virtual/jdk-1.8:= + dev-java/javassist:3 + dev-java/commons-lang:3.1" + +DEPEND="${RDEPEND} + dev-java/ant-core + test? ( + dev-java/ant-junit4:0 + dev-java/junit:4 + dev-java/hamcrest-core:1.3 + )" + +S="${WORKDIR}"/${P} + +EANT_GENTOO_CLASSPATH="javassist:3,commons-lang-3.1" + +src_prepare() { + eapply "${FILESDIR}"/${P}-no-ikvm.patch + eapply "${FILESDIR}"/${P}-test-suite.patch + eapply_user + + cp "${FILESDIR}"/build-${PV}.xml "${S}"/build.xml || die +} + +src_compile() { + eant jar $(use_doc) +} + +src_test() { + cd "${S}"/dist + java-pkg_jar-from junit:4 + java-pkg_jar-from hamcrest-core:1.3 + cd "${S}" + ANT_TASKS="ant-junit4" eant test || die "eant test failed" +} + +src_install() { + java-pkg_dojar dist/${PN}.jar + java-pkg_dojar dist/2p.jar + + if use doc ; then + java-pkg_dohtml -r docs/* || die + dodoc doc/tuprolog-guide.pdf + fi + + if use examples ; then + docinto examples + dodoc doc/examples/*.pl + fi +} diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest index ad6562515d28..d7689170b6e6 100644 --- a/dev-lang/xsb/Manifest +++ b/dev-lang/xsb/Manifest @@ -1,4 +1,6 @@ DIST XSB360.tar.gz 12842882 BLAKE2B 734d17a05eb9cb79906a98a77a6562a9445603a884523689c1f2e5e5f9cd4ebfc7182e9ecde9bf9f97c18a90bc4d0d35a2344ac92193d9ee43eb733530571836 SHA512 2ac2f4d4c7501479648b7f618815d4cd996969791a617f2148ef7498cf08bacd67eab298136303b6804cb689129ae3365e1490ec693f2232f9c9f1ad515d9c6c DIST XSB370.tar.gz 12322913 BLAKE2B 64db80704ce656bfaa402d161a94c7b1cd3119a363e848b2c7768665df580b25f1fc43b49b381960d9049d947590b7eb3c846c1a2d6b8a1233d8eb2c4de04f7e SHA512 e2c11b0e5fbbffc2fb6d493e39b7dd74de43509ea1c844f1b3e5d1002c116d6fb8b245905b7b512499e40765a6603d4bef883052bdeec4a3078011c305f85a9f +DIST XSB38.tar.gz 13830570 BLAKE2B 60a6ab38435348d09e2d08bc65ca62c06b38495b72f40a6f3f10fe8d23949bfed0c580c9be0c8304d8a88a53b227bb695870b558d67f33a47543de6c1529180f SHA512 457c691450afcf3ed4e2fffc28deaef0949ef4bbf6fd69b504acc6507fbb144f2c6e427a25da2b6346b15b82e803c02d1b6962af698d16c1fcb9a3d56160ea30 DIST xsb-3.6.0-gentoo-patchset-4.tar.gz 7513 BLAKE2B cf846dc94e0f1194f5da381b888f4ce6476a4e861cb23e6dca87b0cd2c0ea24c4290ea080432d2c5440f7350cf0862c7fc34e303a8dfe824e2e3e06f29aa4815 SHA512 bb7ba7836fa2df7a54fd2837b4cb760f7ae0e9511bc0a4b2be8cba89ed4aeedda6712937a4748bd9e9ee16366d442fd962a121dbf83017e2199eb3a287efb1d5 DIST xsb-3.7.0-gentoo-patchset-3.tar.gz 5636 BLAKE2B f7b66131d3f02fd75e8b6019f8e64cb6f531155116364da432df41a8f7b3ba2b8d300f7b64bbcae7a755478c6aeb637b36457b491998c88457a96b64e5ecb46e SHA512 bee6d62b900c9ee3a373dfa0ad7362b18c748bb9e0559a878534ed517067d753e1fa79277b0588133a1eeceafcd56b4dcc9ff81892309f6c6666150baaaaf047 +DIST xsb-3.8.0-gentoo-patchset-2.tar.gz 6774 BLAKE2B d95168caaa6a11f4a4a0c88a9d6fe70d5534bf618287b79bb736a6a43043329c0a959b4b927c50d455bd0b0d312035eda79c7b0c4331d0e8f21d8b07f314c848 SHA512 8bc9781e77763b5f0ea201bdc21d634d4c233445cb8990c21b015a6fb3940358d86fd21627532780b4fbb86c17b5141dc3b5c6fe5d5536b5152b874eb0486ec2 diff --git a/dev-lang/xsb/xsb-3.8.0.ebuild b/dev-lang/xsb/xsb-3.8.0.ebuild new file mode 100644 index 000000000000..fc9a754a4192 --- /dev/null +++ b/dev-lang/xsb/xsb-3.8.0.ebuild @@ -0,0 +1,198 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PATCHSET_VER="2" + +inherit autotools java-pkg-opt-2 + +DESCRIPTION="XSB is a logic programming and deductive database system" +HOMEPAGE="http://xsb.sourceforge.net" +SRC_URI="http://xsb.sourceforge.net/downloads/XSB38.tar.gz + https://dev.gentoo.org/~keri/distfiles/xsb/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="curl debug iodbc java mysql odbc pcre threads xml" + +RDEPEND="curl? ( net-misc/curl ) + iodbc? ( dev-db/libiodbc ) + java? ( >=virtual/jdk-1.4:= ) + mysql? ( dev-db/mysql-connector-c:0= ) + odbc? ( dev-db/unixODBC ) + pcre? ( dev-libs/libpcre ) + xml? ( dev-libs/libxml2 )" + +DEPEND="${RDEPEND}" + +S="${WORKDIR}"/XSB + +PATCHES=( "${WORKDIR}/${PV}" ) + +src_prepare() { + default + cd "${S}"/build + eautoconf +} + +src_configure() { + cd "${S}"/build + + econf \ + --prefix=/usr/$(get_libdir) \ + --disable-optimization \ + --disable-ccmpl \ + --without-smodels \ + $(use_with odbc) \ + $(use_with iodbc) \ + $(use_enable threads mt) \ + $(use_enable debug) + + if use curl ; then + cd "${S}"/packages/curl + econf + fi + + if use mysql ; then + cd "${S}"/packages/dbdrivers/mysql + econf + fi + + if use odbc ; then + cd "${S}"/packages/dbdrivers/odbc + econf + fi + + if use pcre ; then + cd "${S}"/packages/pcre + econf + fi + + if use xml ; then + cd "${S}"/packages/xpath + econf + fi +} + +src_compile() { + cd "${S}"/build + + default + + # All XSB Packages are compiled using a single Prolog engine. + # Consequently they must all be compiled using a single make job. + + cd "${S}"/packages + rm -f *.xwam + emake -j1 + + if use curl ; then + emake -j1 curl + emake -j1 sgml + if use xml ; then + emake -j1 xpath + fi + fi + + if use mysql ; then + emake -j1 mysql + fi + + if use odbc ; then + emake -j1 odbc + fi + + if use pcre ; then + emake -j1 pcre + fi +} + +src_install() { + cd "${S}"/build + default + + local XSB_INSTALL_DIR=/usr/$(get_libdir)/xsb-${PV} + dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb + + cd "${S}"/packages + local PACKAGES=${XSB_INSTALL_DIR}/packages + insinto ${PACKAGES} + doins *.xwam + + insinto ${PACKAGES}/chr + doins chr/*.xwam + + insinto ${PACKAGES}/clpqr + doins clpqr/*.xwam + + insinto ${PACKAGES}/gap + doins gap/*.xwam + + insinto ${PACKAGES}/justify + doins justify/*.xwam + doins justify/*.H + + insinto ${PACKAGES}/regmatch + doins regmatch/*.xwam + insinto ${PACKAGES}/regmatch/cc + doins regmatch/cc/*.H + + insinto ${PACKAGES}/slx + doins slx/*.xwam + + insinto ${PACKAGES}/wildmatch + doins wildmatch/*.xwam + insinto ${PACKAGES}/wildmatch/cc + doins wildmatch/cc/*.H + + if use curl ; then + insinto ${PACKAGES}/curl + doins curl/*.xwam + insinto ${PACKAGES}/curl/cc + doins curl/cc/*.H + insinto ${PACKAGES}/sgml + doins sgml/*.xwam + insinto ${PACKAGES}/sgml/cc + doins sgml/cc/*.H + insinto ${PACKAGES}/sgml/cc/dtd + doins sgml/cc/dtd/* + if use xml ; then + insinto ${PACKAGES}/xpath + doins xpath/*xwam + insinto ${PACKAGES}/xpath/cc + doins xpath/cc/*.H + fi + fi + + if use mysql || use odbc ; then + insinto ${PACKAGES}/dbdrivers + doins dbdrivers/*.xwam + doins dbdrivers/*.H + insinto ${PACKAGES}/dbdrivers/cc + doins dbdrivers/cc/*.H + if use mysql ; then + insinto ${PACKAGES}/dbdrivers/mysql + doins dbdrivers/mysql/*.xwam + insinto ${PACKAGES}/dbdrivers/mysql/cc + doins dbdrivers/mysql/cc/*.H + fi + if use odbc ; then + insinto ${PACKAGES}/dbdrivers/odbc + doins dbdrivers/odbc/*.xwam + insinto ${PACKAGES}/dbdrivers/odbc/cc + doins dbdrivers/odbc/cc/*.H + fi + fi + + if use pcre ; then + insinto ${PACKAGES}/pcre + doins pcre/*.xwam + insinto ${PACKAGES}/pcre/cc + doins pcre/cc/*.H + fi + + cd "${S}" + dodoc FAQ README +} diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 18171582d958..0299e147b94e 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/elfutils/elfutils-0.180.ebuild b/dev-libs/elfutils/elfutils-0.180.ebuild index c2c047c245f1..ff8fec02915d 100644 --- a/dev-libs/elfutils/elfutils-0.180.ebuild +++ b/dev-libs/elfutils/elfutils-0.180.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2" LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind" RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] diff --git a/dev-libs/freexl/Manifest b/dev-libs/freexl/Manifest index 53dbe0deb0a1..ca6e1f510d98 100644 --- a/dev-libs/freexl/Manifest +++ b/dev-libs/freexl/Manifest @@ -1,3 +1 @@ -DIST freexl-1.0.1.tar.gz 933371 BLAKE2B ef89bc6779379ee7d8b7251faf1d965001aeaf3d9d1c69c27f4cc0c6c8c2af5e37c9291163c6f1dfee44fade0cec5db105f2f0fe45dd1804ee3a584c7f83f9d8 SHA512 a945d642a7ae9bc7c9dfc48a5bfd61da71290558bbcc73124bc09f08e8eae3bc96ab5e478a5b5205a897ad5d7783269a8232992d5068121436013c51524801c5 -DIST freexl-1.0.2.tar.gz 939064 BLAKE2B 7c1e4f089dfa499aa8966d6e8ddf1a534a8542e1a1f2108d3b13c75e809a3f710bc45a9b01b0eb584dfeba98aa0f416d99a14261c054811208ab46ec415e51f4 SHA512 554ad06905cbac3f88694e798369c1e1c4c64709eb4086b80eb3370dfd3bdc31d1b58441bcbf40b72700f177606ae900f2ab48ead873ac331c82edd718318354 DIST freexl-1.0.5.tar.gz 938994 BLAKE2B a3d2667271f6ab3de61a90f75ba8f7a645c5eddcd7f6d452fbbd59dc211c4676bdef7f7772235f60898de1e0a6d2e4951a3eadf77c4766bf938f5d8465f9de42 SHA512 86d742f58353be1f3ab683899a4d914845250b481acc078c769ef337d0a6ea24d25501a3e7c73b95904c6839ddd35f53e58ad4eee0c3b433caa84db0a8c6462b diff --git a/dev-libs/freexl/freexl-1.0.1.ebuild b/dev-libs/freexl/freexl-1.0.1.ebuild deleted file mode 100644 index 89805bc14856..000000000000 --- a/dev-libs/freexl/freexl-1.0.1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils ltprune - -DESCRIPTION="Simple XLS data extraction library" -HOMEPAGE="https://www.gaia-gis.it/fossil/freexl/index" -SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz" - -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86" -IUSE="static-libs" - -DEPEND="virtual/libiconv" -RDEPEND="${DEPEND}" - -src_configure() { - econf \ - $(use_enable static-libs static) -} - -src_install() { - default - - prune_libtool_files --all -} diff --git a/dev-libs/freexl/freexl-1.0.2.ebuild b/dev-libs/freexl/freexl-1.0.2.ebuild deleted file mode 100644 index bb3b445b6e9f..000000000000 --- a/dev-libs/freexl/freexl-1.0.2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils ltprune - -DESCRIPTION="Simple XLS data extraction library" -HOMEPAGE="https://www.gaia-gis.it/fossil/freexl/index" -SRC_URI="https://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz" - -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" -IUSE="static-libs" - -DEPEND="virtual/libiconv" -RDEPEND="${DEPEND}" - -src_configure() { - econf \ - $(use_enable static-libs static) -} - -src_install() { - default - - prune_libtool_files --all -} diff --git a/dev-libs/glib/glib-2.64.4.ebuild b/dev-libs/glib/glib-2.64.4.ebuild index 481b31a84637..00e2eea8a942 100644 --- a/dev-libs/glib/glib-2.64.4.ebuild +++ b/dev-libs/glib/glib-2.64.4.ebuild @@ -48,7 +48,7 @@ BDEPEND=" app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/gettext-0.19.8 - gtk-doc? ( >=dev-util/gtk-doc-1.20 + gtk-doc? ( >=dev-util/gtk-doc-1.32-r2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) systemtap? ( >=dev-util/systemtap-1.3 ) diff --git a/dev-libs/iniparser/iniparser-3.1-r1.ebuild b/dev-libs/iniparser/iniparser-3.1-r1.ebuild deleted file mode 100644 index 248075f03d21..000000000000 --- a/dev-libs/iniparser/iniparser-3.1-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -AUTOTOOLS_AUTORECONF=1 -inherit autotools-utils autotools-multilib - -DESCRIPTION="A free stand-alone ini file parsing library" -HOMEPAGE="http://ndevilla.free.fr/iniparser/" - -SRC_URI="http://ndevilla.free.fr/iniparser/${P}.tar.gz" -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc examples static-libs" - -DEPEND="doc? ( app-doc/doxygen ) - sys-devel/libtool" -RDEPEND="" - -# the tests are rather examples than tests, no point in running them -RESTRICT="test" - -S="${WORKDIR}/${PN}" - -DOCS=( AUTHORS README ) - -PATCHES=( - "${FILESDIR}/${PN}-3.0b-cpp.patch" - "${FILESDIR}/${PN}-3.0-autotools.patch" -) - -src_install() { - autotools-multilib_src_install - - if use doc; then - emake -C doc - dohtml -r html/* - fi - - if use examples ; then - insinto /usr/share/doc/${PF}/examples - doins test/*.{c,ini,py} - fi -} diff --git a/dev-libs/libbson/libbson-1.16.2.ebuild b/dev-libs/libbson/libbson-1.16.2.ebuild index f72e78e04682..353708b7c7c7 100644 --- a/dev-libs/libbson/libbson-1.16.2.ebuild +++ b/dev-libs/libbson/libbson-1.16.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/mongo LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~sparc x86" +KEYWORDS="amd64 ~hppa ~ppc ~sparc x86" IUSE="examples static-libs" DEPEND="dev-python/sphinx" diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest index 184370061f4c..bcd405bd6135 100644 --- a/dev-libs/libdazzle/Manifest +++ b/dev-libs/libdazzle/Manifest @@ -1 +1,2 @@ DIST libdazzle-3.34.1.tar.xz 440496 BLAKE2B 88321e82f1961ffffc46c2e484b39a80e201498c1f5aaf3beabe59f9d24c21b446485aeb1e70821868d207d222e9a4c9c06353f3add28a1c12ba84f90f79e640 SHA512 bb55c21c8d15406e4f09514c36e3e633d13c0cdb6b30b40a7da7e1cb5e307f371c905dbd8ee5e56d04e225df4c1c8eb9cd273df76814a4cec6ea1328b998d95e +DIST libdazzle-3.36.0.tar.xz 446400 BLAKE2B 027d5e5b733fdf10b5797f9e17460ea50f26827c9f23f6ba9cf76b21c1ee63cc5b724f80b75af5ee7ccbdf1b04c28b776d4d542538db3039ca2d9cb2da6994b5 SHA512 d020161a1c744192657a551f53c4a7bb61bf8e9df93401085168c75aaf1305d548bf56a39b7a9e202656f453451a6615f1950992f78e3a23cba4324999f1e37f diff --git a/dev-libs/libdazzle/libdazzle-3.36.0.ebuild b/dev-libs/libdazzle/libdazzle-3.36.0.ebuild new file mode 100644 index 000000000000..bb1360473dc1 --- /dev/null +++ b/dev-libs/libdazzle/libdazzle-3.36.0.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org meson xdg vala virtualx + +DESCRIPTION="Experimental new features for GTK+ and GLib" +HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + +IUSE="gtk-doc +introspection test +vala" +REQUIRED_USE="vala? ( introspection )" +RESTRICT="!test? ( test )" + +# We keep newer glib/gtk+ deps to avoid GtkEventControllerMotion backports gettings used +RDEPEND=" + >=dev-libs/glib-2.56.0:2 + >=x11-libs/gtk+-3.24.0:3[introspection?] + introspection? ( dev-libs/gobject-introspection:= ) +" +DEPEND="${RDEPEND}" +# libxml2 required for glib-compile-resources; glib-utils for glib-mkenums +BDEPEND=" + >=dev-util/meson-0.49.0 + vala? ( $(vala_depend) ) + dev-libs/libxml2:2 + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) +" + +src_prepare() { + use vala && vala_src_prepare + xdg_src_prepare +} + +src_configure() { + local emesonargs=( + -Denable_tracing=false # extra trace debugging that would make things slower + -Denable_profiling=false # -pg passing + # On linux it'll always use a vdso based implementation that is even faster + # than rdtscp insn, thus never build with rdtscp until we don't support non-linux + # as the rdtscp using function will never get called anyways. + -Denable_rdtscp=false + -Denable_tools=true # /usr/bin/dazzle-list-counters + $(meson_use introspection with_introspection) + $(meson_use vala with_vapi) + $(meson_use gtk-doc enable_gtk_doc) + $(meson_use test enable_tests) + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest index d4a1b0318377..b1a7187450fb 100644 --- a/dev-libs/libgweather/Manifest +++ b/dev-libs/libgweather/Manifest @@ -1 +1,2 @@ DIST libgweather-3.34.0.tar.xz 2725096 BLAKE2B af1034b905354aed433e3a5249305718b850f84dabcf3e96b9f9bcdda7dd78258ede0a9e82cab9b9d7f1b63d8e1a61bc3c83c1c18ec38790bc43c29fe98bb89d SHA512 44451837039965251d86f6f538c943a771ab1944d9190ddb2c6bdb34b3ed0e33756c537e84f24487fd5f28b107e8d3af05a6c20a68f83734ac26ff69a8bd0aba +DIST libgweather-3.36.1.tar.xz 2702144 BLAKE2B bd867461b64ef81607695ae1a3796d2b096129a9a60721c5fcb20d8c35859c0b76a985e9393c23b311f7c0fdec3e691618eab83a826b483c427287906d575251 SHA512 6c7090b0b6dfac61e73a398d34329cd706080a007694ceb3d47700b4f444982f8ca989dd6dfaefe85b79ffd5af9c423be4bf1bd8491ac0ba6bd15c150d97b26d diff --git a/dev-libs/libgweather/libgweather-3.36.1.ebuild b/dev-libs/libgweather/libgweather-3.36.1.ebuild new file mode 100644 index 000000000000..f3d82c03f4cb --- /dev/null +++ b/dev-libs/libgweather/libgweather-3.36.1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VALA_USE_DEPEND="vapigen" + +inherit gnome.org gnome2-utils meson vala xdg + +DESCRIPTION="Location and timezone database and weather-lookup library" +HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather" + +LICENSE="GPL-2+" +SLOT="2/3-16-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suffix for silent ABI break after 3.28 without soname bump as per distro-list + +IUSE="glade gtk-doc +introspection +vala" +REQUIRED_USE="vala? ( introspection )" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" + +RDEPEND=" + >=dev-libs/glib-2.44.0:2 + >=x11-libs/gtk+-3.13.5:3[introspection?] + >=net-libs/libsoup-2.44:2.4 + >=dev-libs/libxml2-2.6.0:2 + sci-geosciences/geocode-glib + >=sys-libs/timezone-data-2010k + + glade? ( >=dev-util/glade-3.16:3.10 ) + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1.11 + app-text/docbook-xml-dtd:4.3 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + $(vala_depend) +" + +PATCHES=( + "${FILESDIR}"/3.32.1-meson-tweaks.patch # Provide introspection optionality and don't build tests that aren't ran automatically +) + +src_prepare() { + xdg_src_prepare + vala_src_prepare +} + +src_configure() { + local emesonargs=( + $(meson_use glade glade_catalog) + $(meson_use vala enable_vala) + $(meson_use gtk-doc gtk_doc) + $(meson_use introspection) + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/dev-libs/libinput/libinput-1.15.6.ebuild b/dev-libs/libinput/libinput-1.15.6.ebuild index 7ae9b0b06559..e2f0f48c0ecb 100644 --- a/dev-libs/libinput/libinput-1.15.6.ebuild +++ b/dev-libs/libinput/libinput-1.15.6.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz" LICENSE="MIT" SLOT="0/10" [[ "$(ver_cut 3)" -gt 900 ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc ~x86" IUSE="doc input_devices_wacom test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libzia/libzia-4.21.ebuild b/dev-libs/libzia/libzia-4.21.ebuild index 63b54d9c6b89..8a9ae5b51768 100644 --- a/dev-libs/libzia/libzia-4.21.ebuild +++ b/dev-libs/libzia/libzia-4.21.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="ftdi" RDEPEND="dev-libs/glib:2 diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild index e82f70860420..8e3e76187349 100644 --- a/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild +++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/${P}. LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~hppa ~s390 x86" +KEYWORDS="amd64 ~hppa ~s390 x86" IUSE="debug examples icu libressl sasl ssl static-libs test" REQUIRED_USE="test? ( static-libs )" diff --git a/dev-libs/re2/re2-0.2020.06.01.ebuild b/dev-libs/re2/re2-0.2020.06.01.ebuild index e0bf7bc5a6e2..b1b73d54da92 100644 --- a/dev-libs/re2/re2-0.2020.06.01.ebuild +++ b/dev-libs/re2/re2-0.2020.06.01.ebuild @@ -18,7 +18,7 @@ LICENSE="BSD" # https://abi-laboratory.pro/tracker/timeline/re2/ SONAME="7" SLOT="0/${SONAME}" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86" IUSE="icu" BDEPEND="icu? ( virtual/pkgconfig )" diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild index 183f6c04c6d8..84470bb7f274 100644 --- a/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild +++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild @@ -17,7 +17,7 @@ LICENSE="Unlicense" # https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath SLOT="0/1" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" PATCHES=( "${FILESDIR}/${P}-makefile-fix.patch" diff --git a/dev-libs/tre/tre-0.8.0-r1.ebuild b/dev-libs/tre/tre-0.8.0-r1.ebuild deleted file mode 100644 index 63e4a0a6414f..000000000000 --- a/dev-libs/tre/tre-0.8.0-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib - -DESCRIPTION="Lightweight, robust, and efficient POSIX compliant regexp matching library" -HOMEPAGE="https://laurikari.net/tre/ https://github.com/laurikari/tre/" -SRC_URI="https://laurikari.net/tre/${P}.tar.bz2" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="nls static-libs" - -RDEPEND=" - !app-text/agrep - !dev-ruby/amatch - !app-misc/glimpse" - -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -PATCHES=( "${FILESDIR}/${PV}-pkgcfg.patch" ) - -src_prepare() { - default -} - -src_configure() { - econf \ - --enable-agrep \ - --enable-system-abi \ - $(use_enable nls) \ - $(use_enable static-libs static) -} - -src_test() { - if locale -a | grep -iq en_US.iso88591; then - emake -j1 check - else - ewarn "If you like to run the test," - ewarn "please make sure en_US.ISO-8859-1 is installed." - die "en_US.ISO-8859-1 locale is missing" - fi -} - -src_install() { - local HTML_DOCS=( doc/*.{css,html} ) - - default - - # 626480 - mv "${ED%/}"/usr/bin/agrep{,-tre}$(get_exeext) || die -} - -pkg_postinst() { - ewarn "app-misc/glimpse, app-text/agrep and this package all provide agrep." - ewarn "If this causes any unforeseen incompatibilities please file a bug" - ewarn "on https://bugs.gentoo.org." -} diff --git a/dev-libs/univalue/Manifest b/dev-libs/univalue/Manifest index e72738a09e7b..e806da3a1b86 100644 --- a/dev-libs/univalue/Manifest +++ b/dev-libs/univalue/Manifest @@ -1,4 +1 @@ -DIST univalue-1.0.2.tgz 14201 BLAKE2B 47a72a629bc3a0ff193c33d89c3a97e19abca833180473b0a37a6f5a4ba15b7886d1a605a905f7a94af2512e4d1e9f2a7879cae4c5a0af78ac9dfb23a0a581c7 SHA512 727096735dbad082741fb863c9066936a80d7337b1d7c4c289107d240b7f695756a8720f5db320f0c7521b523e299829bd49833b6a31969d8aa43267653a4f2f -DIST univalue-1.0.3.tar.gz 16820 BLAKE2B 40dd6c4e08e8f4a27731aa0fd6931162f8427a709cc3fc16c049a093d17a08f002a6eb08cf3c4fa9870805f3eed7627c8c9baa7cdc6d6fc8970a085488a955b0 SHA512 1c8358baca82b44d7a762c0cb3b7bef6f36d2f3d0ab29045224c1c39b69fbcbb66573dfb9ee4705f71aadff542cc9f02e98921b1c013748e2c0cd63c386bc1df -DIST univalue-1.0.4.tar.gz 19677 BLAKE2B 1565a8aabe9b4dfddb2a8b577077bfe50a66aca62e63cfafaaadf1429ad08c0d8aa9f69469b063b2f3c51885addd0a6ab820e06f1ae1b9850de163dd2d1065fd SHA512 cd503ad2f59ea47afbce4acd352ba2baa06b8237f9cfec669353556cff85761e85717ba16c2dc76094b9a9554e5cb27e73e726f2c2d1e6dc5c76e4a5c4cd8edc DIST univalue-1.0.5.tgz 20114 BLAKE2B 21f1432bf62325547db7a1ce0c84d80f47b160dc19de3567eea4678a0f242fb2c814daa6955f7a2b45c5b75e859b6d2ecdfcd68abe58f573752c0f037a099d10 SHA512 9c2273d82267aaecd2b017d00ae8bc40f7f40fff10ce6176bbea0df93d7c9478fc76a38101f0b55ded0a3c4fc49f00c868aad33deca4d936b85342ec6a394eab diff --git a/dev-libs/univalue/univalue-1.0.2.ebuild b/dev-libs/univalue/univalue-1.0.2.ebuild deleted file mode 100644 index 956bf8c76b31..000000000000 --- a/dev-libs/univalue/univalue-1.0.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils ltprune - -DESCRIPTION="C++ universal value object and JSON library" -HOMEPAGE="https://github.com/jgarzik/univalue" -LICENSE="MIT" - -SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tgz" -SLOT="0/0" - -KEYWORDS="amd64 arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux" - -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -src_prepare() { - ./autogen.sh || die -} - -src_configure() { - econf --disable-static -} - -src_install() { - default_src_install - prune_libtool_files -} diff --git a/dev-libs/univalue/univalue-1.0.3.ebuild b/dev-libs/univalue/univalue-1.0.3.ebuild deleted file mode 100644 index 8e6fe5bdaf55..000000000000 --- a/dev-libs/univalue/univalue-1.0.3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="C++ universal value object and JSON library" -HOMEPAGE="https://github.com/jgarzik/univalue" -SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf --disable-static -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/univalue/univalue-1.0.4.ebuild b/dev-libs/univalue/univalue-1.0.4.ebuild deleted file mode 100644 index f4acb09a1f96..000000000000 --- a/dev-libs/univalue/univalue-1.0.4.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="C++ universal value object and JSON library" -HOMEPAGE="https://github.com/jgarzik/univalue" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/jgarzik/${PN}.git" - inherit git-r3 -else - SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" - KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="MIT" -SLOT="0/0" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf --disable-static -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/xxhash/xxhash-0.7.3.ebuild b/dev-libs/xxhash/xxhash-0.7.3.ebuild index 290fe6607342..4c309bb8f6d2 100644 --- a/dev-libs/xxhash/xxhash-0.7.3.ebuild +++ b/dev-libs/xxhash/xxhash-0.7.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD-2 GPL-2+" # https://abi-laboratory.pro/tracker/timeline/xxhash SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos" IUSE="static-libs" S="${WORKDIR}/xxHash-${PV}" diff --git a/dev-perl/CGI-Ajax/CGI-Ajax-0.707.0.ebuild b/dev-perl/CGI-Ajax/CGI-Ajax-0.707.0.ebuild deleted file mode 100644 index 8e010bb61281..000000000000 --- a/dev-perl/CGI-Ajax/CGI-Ajax-0.707.0.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MODULE_VERSION=0.707 -MODULE_AUTHOR=BPEDERSE -inherit perl-module - -DESCRIPTION="a perl-specific system for writing Asynchronous web applications" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-perl/CGI - dev-perl/Class-Accessor -" -DEPEND="${RDEPEND} - test? ( virtual/perl-Test-Simple ) -" - -SRC_TEST=do diff --git a/dev-perl/CHI/CHI-0.600.0.ebuild b/dev-perl/CHI/CHI-0.600.0.ebuild deleted file mode 100644 index 4013d06d3414..000000000000 --- a/dev-perl/CHI/CHI-0.600.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MODULE_AUTHOR=JSWARTZ -MODULE_VERSION=0.60 -inherit perl-module - -DESCRIPTION="Unified cache handling interface" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-perl/Carp-Assert-0.200.0 - dev-perl/Class-Load - dev-perl/Data-UUID - dev-perl/Digest-JHash - virtual/perl-Digest-MD5 - >=virtual/perl-File-Spec-0.800.0 - dev-perl/Hash-MoreUtils - >=dev-perl/JSON-MaybeXS-1.3.3 - >=dev-perl/List-MoreUtils-0.130.0 - >=dev-perl/Log-Any-0.80.0 - >=dev-perl/Moo-1.3.0 - >=dev-perl/MooX-Types-MooseLike-0.230.0 - dev-perl/MooX-Types-MooseLike-Numeric - virtual/perl-Storable - dev-perl/String-RewritePrefix - dev-perl/Task-Weaken - >=dev-perl/Time-Duration-1.60.0 - >=dev-perl/Time-Duration-Parse-0.30.0 - virtual/perl-Time-HiRes - >=dev-perl/Try-Tiny-0.50.0 -" -DEPEND="${RDEPEND} - virtual/perl-ExtUtils-MakeMaker - test? ( - dev-perl/TimeDate - virtual/perl-Test-Simple - dev-perl/Test-Class - dev-perl/Test-Deep - dev-perl/Test-Exception - dev-perl/Test-Warn - ) -" - -SRC_TEST="do parallel" diff --git a/dev-perl/CPAN-Checksums/CPAN-Checksums-2.120.0.ebuild b/dev-perl/CPAN-Checksums/CPAN-Checksums-2.120.0.ebuild index 590669c1f3b5..5c7adb46e11f 100644 --- a/dev-perl/CPAN-Checksums/CPAN-Checksums-2.120.0.ebuild +++ b/dev-perl/CPAN-Checksums/CPAN-Checksums-2.120.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Write a CHECKSUMS file for a directory as on CPAN" SLOT="0" -KEYWORDS="amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/CQL-Parser/CQL-Parser-1.130.0.ebuild b/dev-perl/CQL-Parser/CQL-Parser-1.130.0.ebuild deleted file mode 100644 index 1fa751574129..000000000000 --- a/dev-perl/CQL-Parser/CQL-Parser-1.130.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MODULE_AUTHOR=BRICAS -MODULE_VERSION=1.13 -inherit perl-module - -DESCRIPTION="compiles CQL strings into parse trees of Node subtypes" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-perl/Class-Accessor-0.100.0 - >=dev-perl/Clone-0.150.0 - >=dev-perl/String-Tokenizer-0.50.0 -" -DEPEND="${RDEPEND} - >=virtual/perl-ExtUtils-MakeMaker-6.590.0 - test? ( - dev-perl/Test-Exception - virtual/perl-Test-Simple - ) -" - -SRC_TEST=do - -src_prepare() { - sed -i -e 's/use inc::Module::Install /use lib q[.];\nuse inc::Module::Install /' Makefile.PL || - die "Can't patch Makefile.PL for 5.26 dot-in-inc" - perl-module_src_prepare -} diff --git a/dev-perl/CSS-Minifier/CSS-Minifier-0.10.0-r1.ebuild b/dev-perl/CSS-Minifier/CSS-Minifier-0.10.0-r1.ebuild deleted file mode 100644 index 5f85cf45a90e..000000000000 --- a/dev-perl/CSS-Minifier/CSS-Minifier-0.10.0-r1.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MODULE_AUTHOR=PMICHAUX -MODULE_VERSION=0.01 -inherit perl-module - -DESCRIPTION="Perl extension for minifying CSS" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -SRC_TEST="do" diff --git a/dev-perl/CSS-Packer/CSS-Packer-2.50.0.ebuild b/dev-perl/CSS-Packer/CSS-Packer-2.50.0.ebuild deleted file mode 100644 index 574f108998ff..000000000000 --- a/dev-perl/CSS-Packer/CSS-Packer-2.50.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=6 -DIST_AUTHOR=LEEJO -DIST_VERSION=2.05 -inherit perl-module - -DESCRIPTION="Another CSS minifier" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-perl/Regexp-RegGrp-1.1.1_rc -" -DEPEND="${RDEPEND} - virtual/perl-ExtUtils-MakeMaker - test? ( - dev-perl/Test-File-Contents - virtual/perl-Test-Simple - ) -" -PERL_RM_FILES=( "t/pod.t" ) diff --git a/dev-perl/CSS-Packer/Manifest b/dev-perl/CSS-Packer/Manifest index b1685d5cf2d2..1a16338482d1 100644 --- a/dev-perl/CSS-Packer/Manifest +++ b/dev-perl/CSS-Packer/Manifest @@ -1,2 +1 @@ -DIST CSS-Packer-2.05.tar.gz 9666 BLAKE2B 9367cb025ecfc1781b213f2c002d9a51c8a5c843830cc6ad41b44ce9c51214c52e82c9eda43b0cfb9c8d3a990631f88aacf3ca989e3f2081808a3050a8a4729c SHA512 332c6d73ba23eb399df8052d318851eb5d7ce0f1f5a2972e3dd48f0da754b846e0d0e095306087393ed282ade701343c11007915f6215b3244cf8c5d456c3228 DIST CSS-Packer-2.07.tar.gz 9360 BLAKE2B e0e9233e3217d8f75a26f0a811cb71f0f8fd9c391518966737adbd91b27ef4c8e801c1ba42130825bd7233472ba0dce6bf96bf216a015a8d054b8b9814a11c5e SHA512 adeca2ec7dd28ad04eeda01b1f42ac0c586bd4c167f385950d4a297b95f1f66c938972bd3e34d6cfe323a3b24190b6ca1a90c898e77f86360ea84324eab01374 diff --git a/dev-perl/Capture-Tiny/Capture-Tiny-0.460.0.ebuild b/dev-perl/Capture-Tiny/Capture-Tiny-0.460.0.ebuild deleted file mode 100644 index 86ebcd4f511b..000000000000 --- a/dev-perl/Capture-Tiny/Capture-Tiny-0.460.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DIST_AUTHOR=DAGOLDEN -DIST_VERSION=0.46 -DIST_EXAMPLES=("examples/*") -inherit perl-module - -DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - virtual/perl-Carp - virtual/perl-Exporter - virtual/perl-File-Spec - virtual/perl-File-Temp - virtual/perl-IO - virtual/perl-Scalar-List-Utils -" -DEPEND="${RDEPEND} - virtual/perl-ExtUtils-MakeMaker - test? ( - virtual/perl-Test-Simple - ) -" diff --git a/dev-perl/Capture-Tiny/Manifest b/dev-perl/Capture-Tiny/Manifest index a5c3ee191ffe..5b552e3c7383 100644 --- a/dev-perl/Capture-Tiny/Manifest +++ b/dev-perl/Capture-Tiny/Manifest @@ -1,2 +1 @@ -DIST Capture-Tiny-0.46.tar.gz 37424 BLAKE2B cfc9a208c488072972567ccc1fc3956fad32e3061d7dec5ad953d0e6d90b5b523ee57eb9ae43c883fbf6ccd82b859327d9346f2f3e849054dde656c066f84f11 SHA512 6247bff20b95628453a1bfbfc6fb59c6a3967506ea45e01327d0978f48ae75b597c27c828ef10ae5e55be217e3bd0b63419523de6a81c97fabc8cf4e2a0e6cd1 DIST Capture-Tiny-0.48.tar.gz 37480 BLAKE2B e6de05459478131c5129dd5ffc84744e2d3440c2e31545ed101c2986b2bc970106f126286dea50350f4b5ea330ffac423693d755e29850883bdc215437bf7488 SHA512 96d140b33a5ee147804925353ec5b49b806fa9c98b4ac23ec9c9494828f52ac72fd6f69c08e14ada18e5187dc4cece3d72901ce07b12eef20595322161a98437 diff --git a/dev-perl/Chart/Chart-2.4.10.ebuild b/dev-perl/Chart/Chart-2.4.10.ebuild deleted file mode 100644 index b5fc2dc8cf62..000000000000 --- a/dev-perl/Chart/Chart-2.4.10.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DIST_AUTHOR=CHARTGRP -DIST_VERSION=2.4.10 -inherit perl-module - -DESCRIPTION="The Perl Chart Module" - -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=dev-perl/GD-2.0.36" -DEPEND="${RDEPEND} - test? ( - dev-perl/GD[png,jpeg] - ) -" diff --git a/dev-perl/Class-Adapter/Class-Adapter-1.80.0-r1.ebuild b/dev-perl/Class-Adapter/Class-Adapter-1.80.0-r1.ebuild deleted file mode 100644 index 417d7d03dfeb..000000000000 --- a/dev-perl/Class-Adapter/Class-Adapter-1.80.0-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MODULE_AUTHOR=ADAMK -MODULE_VERSION=1.08 -inherit perl-module - -DESCRIPTION='Implementation of the "Adapter" Design Pattern' - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=virtual/perl-Scalar-List-Utils-1.10" -DEPEND="${RDEPEND} - test? ( virtual/perl-Test-Simple )" - -SRC_TEST=do - -src_prepare() { - sed -i -e 's/use inc::Module::Install::DSL /use lib q[.];\nuse inc::Module::Install::DSL /' Makefile.PL || - die "Can't patch Makefile.PL for 5.26 dot-in-inc" - perl-module_src_prepare -} diff --git a/dev-perl/Class-Adapter/Manifest b/dev-perl/Class-Adapter/Manifest index 60ae7d255cd4..e14d58d52644 100644 --- a/dev-perl/Class-Adapter/Manifest +++ b/dev-perl/Class-Adapter/Manifest @@ -1,2 +1 @@ -DIST Class-Adapter-1.08.tar.gz 35843 BLAKE2B fcd7d556ea249b10a1aeb94de7c291c7d07c3144f93b726bf19c7d0f33549074bf2ea8794370ddae23889f467cae7a67362e5e58bde32a7423c2fcb3fb222bb5 SHA512 84053834561d058a38744e556d3573dfc91b5972a6329f3e7660cb422e4b680c76502c3ee3a2c80b6a135d67713502428a541a9e7b2c22991df8d7aab3de0408 DIST Class-Adapter-1.09.tar.gz 33256 BLAKE2B 894e33a673747aee6e37e48868e72faf6dd5adf0ce223ed179ebf0b7b59108fd9dffb7798fb76bb8918d40ee650c6704302663ce7e87e9dded68dae6f268d5be SHA512 e6b7bde685683fa733e3002cf815aca6e298b2200a3fedbef93345284507023cdeed0cda4232c53d4dfd89239271a871db44616606d88ff5d03ac7c3e33a992a diff --git a/dev-perl/Class-Base/Class-Base-0.80.0.ebuild b/dev-perl/Class-Base/Class-Base-0.80.0.ebuild deleted file mode 100644 index b0d9cfc83d81..000000000000 --- a/dev-perl/Class-Base/Class-Base-0.80.0.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DIST_AUTHOR=SZABGAB -DIST_VERSION=0.08 -inherit perl-module - -DESCRIPTION="Useful base class for deriving other modules" - -SLOT="0" -KEYWORDS="~amd64 ~x86 ~ppc-aix ~x86-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="" -DEPEND=" - virtual/perl-ExtUtils-MakeMaker - test? ( >=virtual/perl-Test-Simple-0.470.0 ) -" diff --git a/dev-perl/Class-Base/Manifest b/dev-perl/Class-Base/Manifest index fcbea514d079..19c8e0fe6e57 100644 --- a/dev-perl/Class-Base/Manifest +++ b/dev-perl/Class-Base/Manifest @@ -1,2 +1 @@ -DIST Class-Base-0.08.tar.gz 15890 BLAKE2B 94a27e16f0f6c4ac824c8d3e970a1d87f9953e7e1c64622042e5cd42368e0efbdb0066cc604df432bb84bb3efae3decc3387989828f70eef307f8e3cd4edd831 SHA512 8076afd05fc9e863c0ec5183dd89a310eec21b717362137e619b9181d1a66f042729b0b4898561f8ba1b77e2d1c8caef2131b9000b9f4eca5d3c38aee7cc43a1 DIST Class-Base-0.09.tar.gz 33597 BLAKE2B 4aed2f631d64e7e0bce58573e80483693bdc38ff0d71b0a75069aed5a3d5168e64109e22916190bec6c8fe7913f948135b0565b0b555043a2fac6d1d718e0b6e SHA512 c6915499861367f188d7deff0e7e3079fb3d73c7c4b8d9af7e6ff4fed6e37d60cbee242ef7e781bf014940b71478e5a05d97fc35eb8994473927cd0bcc6c7bbd diff --git a/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.120.0.ebuild b/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.120.0.ebuild index a4279d019ba6..07275f446f4f 100644 --- a/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.120.0.ebuild +++ b/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.120.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="provides Moose-like method modifiers" SLOT="0" -KEYWORDS="amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/DBD-MariaDB/DBD-MariaDB-1.210.0-r1.ebuild b/dev-perl/DBD-MariaDB/DBD-MariaDB-1.210.0-r1.ebuild index 3bc688d8707c..e74bf61f8d2a 100644 --- a/dev-perl/DBD-MariaDB/DBD-MariaDB-1.210.0-r1.ebuild +++ b/dev-perl/DBD-MariaDB/DBD-MariaDB-1.210.0-r1.ebuild @@ -60,7 +60,7 @@ src_configure() { --testuser=test \ --testpassword=test" fi - myconf+=" --${impl}_config=${EROOT%/}/usr/bin/${impl}_config" + myconf+=" --${impl}_config=${EROOT}/usr/bin/${impl}_config" perl-module_src_configure } diff --git a/dev-perl/Data-AMF/Data-AMF-0.90.0-r2.ebuild b/dev-perl/Data-AMF/Data-AMF-0.90.0-r2.ebuild index 40e0eaa95bf5..466c22645be1 100644 --- a/dev-perl/Data-AMF/Data-AMF-0.90.0-r2.ebuild +++ b/dev-perl/Data-AMF/Data-AMF-0.90.0-r2.ebuild @@ -23,6 +23,7 @@ BDEPEND="${RDEPEND} test? ( dev-perl/YAML dev-perl/Spiffy + dev-perl/Test-Base virtual/perl-Test-Simple ) " diff --git a/dev-perl/Data-Compare/Data-Compare-1.250.0.ebuild b/dev-perl/Data-Compare/Data-Compare-1.250.0.ebuild index 5286f85f4ae6..143452a9de28 100644 --- a/dev-perl/Data-Compare/Data-Compare-1.250.0.ebuild +++ b/dev-perl/Data-Compare/Data-Compare-1.250.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Compare perl data structures" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Data-Compare/Data-Compare-1.270.0.ebuild b/dev-perl/Data-Compare/Data-Compare-1.270.0.ebuild index 2c32b38a9f14..3ccf428e65e8 100644 --- a/dev-perl/Data-Compare/Data-Compare-1.270.0.ebuild +++ b/dev-perl/Data-Compare/Data-Compare-1.270.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Compare perl data structures" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Data-Perl/Data-Perl-0.2.11.ebuild b/dev-perl/Data-Perl/Data-Perl-0.2.11.ebuild index a6e0acd5d629..e32003be1794 100644 --- a/dev-perl/Data-Perl/Data-Perl-0.2.11.ebuild +++ b/dev-perl/Data-Perl/Data-Perl-0.2.11.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Base classes wrapping fundamental Perl data types" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Data-Perl/Data-Perl-0.2.9-r1.ebuild b/dev-perl/Data-Perl/Data-Perl-0.2.9-r1.ebuild index 2eb55bcc5fa4..18b8400d7e03 100644 --- a/dev-perl/Data-Perl/Data-Perl-0.2.9-r1.ebuild +++ b/dev-perl/Data-Perl/Data-Perl-0.2.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Base classes wrapping fundamental Perl data types" SLOT="0" -KEYWORDS="amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Data-ShowTable/Data-ShowTable-4.600.0-r1.ebuild b/dev-perl/Data-ShowTable/Data-ShowTable-4.600.0-r1.ebuild new file mode 100644 index 000000000000..8fde33391aaf --- /dev/null +++ b/dev-perl/Data-ShowTable/Data-ShowTable-4.600.0-r1.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=AKSTE +DIST_VERSION=4.6 +inherit perl-module + +DESCRIPTION="routines to display tabular data in several formats" + +SLOT="0" +LICENSE="GPL-2+" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" + +BDEPEND="virtual/perl-ExtUtils-MakeMaker" + +PATCHES=( + "${FILESDIR}/${P}-perl526.patch" + "${FILESDIR}/${P}-parallel.patch" +) diff --git a/dev-perl/Data-Stag/Data-Stag-0.140.0-r2.ebuild b/dev-perl/Data-Stag/Data-Stag-0.140.0-r2.ebuild new file mode 100644 index 000000000000..90d5bdef8209 --- /dev/null +++ b/dev-perl/Data-Stag/Data-Stag-0.140.0-r2.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=CMUNGALL +DIST_VERSION=0.14 +inherit perl-module + +DESCRIPTION="Structured Tags datastructures" +HOMEPAGE="http://stag.sourceforge.net/ https://metacpan.org/release/Data-Stag" + +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="dev-perl/IO-String" +BDEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker +" diff --git a/dev-perl/Data-Stream-Bulk/Data-Stream-Bulk-0.110.0-r2.ebuild b/dev-perl/Data-Stream-Bulk/Data-Stream-Bulk-0.110.0-r2.ebuild new file mode 100644 index 000000000000..b74718c9ed9f --- /dev/null +++ b/dev-perl/Data-Stream-Bulk/Data-Stream-Bulk-0.110.0-r2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=DOY +DIST_VERSION=${PV:0:4} +inherit perl-module + +DESCRIPTION="N at a time iteration API" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-perl/Moose-0.900.0 + dev-perl/Path-Class + dev-perl/Sub-Exporter + dev-perl/namespace-clean +" +BDEPEND="${RDEPEND} + >=virtual/perl-ExtUtils-MakeMaker-6.300.0 + test? ( + dev-perl/Test-Requires + >=virtual/perl-Test-Simple-0.880.0 + ) +" +PERL_RM_FILES=( + "t/release-eol.t" + "t/release-pod-coverage.t" + "t/release-pod-syntax.t" +) diff --git a/dev-perl/Data-Structure-Util/Data-Structure-Util-0.160.0-r1.ebuild b/dev-perl/Data-Structure-Util/Data-Structure-Util-0.160.0-r1.ebuild new file mode 100644 index 000000000000..7065fb8c529c --- /dev/null +++ b/dev-perl/Data-Structure-Util/Data-Structure-Util-0.160.0-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=ANDYA +DIST_VERSION=0.16 +inherit perl-module + +DESCRIPTION="Change nature of data within a structure" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + virtual/perl-Digest-MD5 + >=virtual/perl-Scalar-List-Utils-1.10.0 + virtual/perl-Storable +" +BDEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + dev-perl/Devel-CheckLib + test? ( virtual/perl-Test-Simple ) +" +PERL_RM_FILES=( + "t/00pod.t" + "t/06signature.t" + "inc/IO/CaptureOutput.pm" + "inc/IO/Devel/CheckLib.pm" +) +src_compile() { + mymake=( + "OPTIMIZE=${CFLAGS}" + ) + perl-module_src_compile +} diff --git a/dev-perl/Data-Types/Data-Types-0.170.0.ebuild b/dev-perl/Data-Types/Data-Types-0.170.0.ebuild new file mode 100644 index 000000000000..6ff51a7b80a5 --- /dev/null +++ b/dev-perl/Data-Types/Data-Types-0.170.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=MANWAR +DIST_VERSION=0.17 + +inherit perl-module + +DESCRIPTION="Validate and convert data types." +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND="dev-perl/Module-Build" +BDEPEND=" + >=dev-perl/Module-Build-0.270.100 + test? ( + >=virtual/perl-Test-Simple-0.170.0 + ) +" +PERL_RM_FILES=( + "t/zpod.t" +) diff --git a/dev-perl/Data-Types/Manifest b/dev-perl/Data-Types/Manifest index 373609b5e2c5..eb6345524a08 100644 --- a/dev-perl/Data-Types/Manifest +++ b/dev-perl/Data-Types/Manifest @@ -1 +1,2 @@ DIST Data-Types-0.09.tar.gz 8527 BLAKE2B 724dfd99d41861b5def9a83030ddaafda790492094f15304aba2374a36a4fd2a11a027db31f500ffcfca3f4a7373796ee80efdb1b030a94cf9d372fdef4baa2e SHA512 9d337457a5714b298f514f841c27a252fa5af6aa145061266b948bf6ffabab3966a2910d09b80b7ee138822ffa2661971813676a60295ad62b57aa122ec9b8a2 +DIST Data-Types-0.17.tar.gz 7942 BLAKE2B d5b3edff44e2cf511431e620b838ea0dd5dbcdfa87498e55e49f441e14edf24f6ebcc2961f88850b1fe6a8802b1d804accc104b7d600029e0fcd0bcfcbc42761 SHA512 4e496005f744251365fe43719b00ba89fe5135e04c737b166247bc0b60955b62ddc381d0e837a958aca51b0c4699c2d51a2d02901a4368fb60a31a9952deb315 diff --git a/dev-perl/Data-URIEncode/Data-URIEncode-0.110.0-r2.ebuild b/dev-perl/Data-URIEncode/Data-URIEncode-0.110.0-r2.ebuild new file mode 100644 index 000000000000..18f8a641e28b --- /dev/null +++ b/dev-perl/Data-URIEncode/Data-URIEncode-0.110.0-r2.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=RHANDOM +DIST_VERSION=0.11 +inherit perl-module + +DESCRIPTION="Allow complex data structures to be encoded using flat URIs" + +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-solaris" + +RDEPEND=" + dev-perl/CGI +" +BDEPEND="${RDEPEND}" diff --git a/dev-perl/Date-Manip/Date-Manip-6.600.0.ebuild b/dev-perl/Date-Manip/Date-Manip-6.600.0.ebuild index 341f39a422b9..4b2ca90c3458 100644 --- a/dev-perl/Date-Manip/Date-Manip-6.600.0.ebuild +++ b/dev-perl/Date-Manip/Date-Manip-6.600.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Perl date manipulation routines" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="elibc_musl test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Devel-CheckLib/Devel-CheckLib-1.130.0.ebuild b/dev-perl/Devel-CheckLib/Devel-CheckLib-1.130.0.ebuild index 3750be09c976..7aa14e6e4943 100644 --- a/dev-perl/Devel-CheckLib/Devel-CheckLib-1.130.0.ebuild +++ b/dev-perl/Devel-CheckLib/Devel-CheckLib-1.130.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="check that a library is available" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Dist-Metadata/Dist-Metadata-0.927.0.ebuild b/dev-perl/Dist-Metadata/Dist-Metadata-0.927.0.ebuild index b1865d42d7cc..659d5ba6fc1a 100644 --- a/dev-perl/Dist-Metadata/Dist-Metadata-0.927.0.ebuild +++ b/dev-perl/Dist-Metadata/Dist-Metadata-0.927.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ inherit perl-module DESCRIPTION="Information about a perl module distribution" SLOT="0" -KEYWORDS="~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.8.0.ebuild b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.8.0.ebuild index 0b76e7323923..b2e0bc663803 100644 --- a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.8.0.ebuild +++ b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.8.0.ebuild @@ -8,7 +8,7 @@ inherit perl-module DESCRIPTION="A wrapper for perl's configuration" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.11.0.ebuild b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.11.0.ebuild index 567de35eebec..c509619072e9 100644 --- a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.11.0.ebuild +++ b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.11.0.ebuild @@ -8,7 +8,7 @@ inherit perl-module DESCRIPTION="Build.PL install path logic made easy" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild b/dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild index 83d9ab6389fc..7303b8b497a8 100644 --- a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild +++ b/dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Storage of cookies" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0-r2.ebuild b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0-r2.ebuild index 2b76ad61e2a4..db02d860d2c2 100644 --- a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0-r2.ebuild +++ b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0-r2.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Base class for simple HTTP servers" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND=" diff --git a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild index 2dc80a2caa27..6aec81095ca2 100644 --- a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild +++ b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Base class for simple HTTP servers" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/HTTP-Message/HTTP-Message-6.130.0.ebuild b/dev-perl/HTTP-Message/HTTP-Message-6.130.0.ebuild index 11c86aef58c4..9f65a13f0871 100644 --- a/dev-perl/HTTP-Message/HTTP-Message-6.130.0.ebuild +++ b/dev-perl/HTTP-Message/HTTP-Message-6.130.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Base class for Request/Response" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r1.ebuild b/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r1.ebuild index 7bfd648b35b7..ee5bfaadf33b 100644 --- a/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r1.ebuild +++ b/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r1.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="HTTP content negotiation" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND=" diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.52.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.52.0.ebuild index e2cd88f23422..f952164dcff9 100644 --- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.52.0.ebuild +++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.52.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="idn" RDEPEND=" diff --git a/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild b/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild index 936f1f299a13..0ea514a74c31 100644 --- a/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild +++ b/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Does your process have access to the web" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.70.0.ebuild b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.70.0.ebuild index 02bac019684b..fadb35350754 100644 --- a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.70.0.ebuild +++ b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.70.0.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Provide https support for LWP::UserAgent" SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" app-misc/ca-certificates diff --git a/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild b/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild index a145957af44c..e0975ac57033 100644 --- a/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild +++ b/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="A virtual browser that retries errors" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="" RDEPEND="dev-perl/libwww-perl" diff --git a/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6-r1.ebuild b/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6-r1.ebuild index 29b4fc1bc08d..c634869397b8 100644 --- a/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6-r1.ebuild +++ b/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for the automatic generation of LaTeX tables" LICENSE="|| ( GPL-1+ Artistic )" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.428.0.ebuild b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.428.0.ebuild index 62a4a42e0475..611911f0aa06 100644 --- a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.428.0.ebuild +++ b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.428.0.ebuild @@ -9,7 +9,7 @@ inherit perl-module DESCRIPTION="Compiled List::MoreUtils functions" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" # See XS.pm/LICENSE diff --git a/dev-perl/Locale-Codes/Locale-Codes-3.620.0.ebuild b/dev-perl/Locale-Codes/Locale-Codes-3.620.0.ebuild index 4099105b0db5..7ef0b8ffa0d8 100644 --- a/dev-perl/Locale-Codes/Locale-Codes-3.620.0.ebuild +++ b/dev-perl/Locale-Codes/Locale-Codes-3.620.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="A distribution of Perl modules to handle locale codes" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz index ce5c7c0d84fc..99ba6555f4fa 100644 Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ diff --git a/dev-perl/Mock-Config/Mock-Config-0.30.0.ebuild b/dev-perl/Mock-Config/Mock-Config-0.30.0.ebuild index fad183a57128..8a30eb42c4ab 100644 --- a/dev-perl/Mock-Config/Mock-Config-0.30.0.ebuild +++ b/dev-perl/Mock-Config/Mock-Config-0.30.0.ebuild @@ -9,7 +9,7 @@ inherit perl-module DESCRIPTION="Temporarily set Config or XSConfig values" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" LICENSE="Artistic-2" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild index e0cefd1aa800..2300c1d4a773 100644 --- a/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild +++ b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild @@ -8,7 +8,7 @@ inherit perl-module DESCRIPTION='A tiny replacement for Module::Build' SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/MooX-HandlesVia/MooX-HandlesVia-0.1.8.ebuild b/dev-perl/MooX-HandlesVia/MooX-HandlesVia-0.1.8.ebuild index 280ad61b0fda..30ac40b27aa0 100644 --- a/dev-perl/MooX-HandlesVia/MooX-HandlesVia-0.1.8.ebuild +++ b/dev-perl/MooX-HandlesVia/MooX-HandlesVia-0.1.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="NativeTrait-like behavior for Moo" SLOT="0" -KEYWORDS="amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.160.0.ebuild b/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.160.0.ebuild index 940973998048..62342dacd608 100644 --- a/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.160.0.ebuild +++ b/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.160.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="DNSSEC extensions to Net::DNS" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.30.0.ebuild b/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.30.0.ebuild index 9469dcef7311..4b20dd9b757f 100644 --- a/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.30.0.ebuild +++ b/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.30.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="DNSSEC extensions to Net::DNS" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Net-DNS/Net-DNS-1.130.0.ebuild b/dev-perl/Net-DNS/Net-DNS-1.130.0.ebuild index 669dd0dd70bc..b9418d98ea9b 100644 --- a/dev-perl/Net-DNS/Net-DNS-1.130.0.ebuild +++ b/dev-perl/Net-DNS/Net-DNS-1.130.0.ebuild @@ -11,7 +11,7 @@ inherit toolchain-funcs perl-module DESCRIPTION="Perl Interface to the Domain Name System" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+ipv6 test minimal" RESTRICT="!test? ( test )" diff --git a/dev-perl/Net-DNS/Net-DNS-1.230.0.ebuild b/dev-perl/Net-DNS/Net-DNS-1.230.0.ebuild index a1e78136037c..f790be60d3fc 100644 --- a/dev-perl/Net-DNS/Net-DNS-1.230.0.ebuild +++ b/dev-perl/Net-DNS/Net-DNS-1.230.0.ebuild @@ -11,7 +11,7 @@ inherit toolchain-funcs perl-module DESCRIPTION="Perl Interface to the Domain Name System" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test minimal" RESTRICT="!test? ( test )" diff --git a/dev-perl/Net-HTTP/Net-HTTP-6.170.0.ebuild b/dev-perl/Net-HTTP/Net-HTTP-6.170.0.ebuild index c5fc5aa0e361..28c23a234071 100644 --- a/dev-perl/Net-HTTP/Net-HTTP-6.170.0.ebuild +++ b/dev-perl/Net-HTTP/Net-HTTP-6.170.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Low-level HTTP connection (client)" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="minimal test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r1.ebuild b/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r1.ebuild index c0a160a62397..586058a3d0b5 100644 --- a/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r1.ebuild +++ b/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r1.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Jabber Perl library" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND="dev-perl/XML-Stream diff --git a/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0.ebuild b/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0.ebuild index 4590c8841eab..55ff74912e92 100644 --- a/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0.ebuild +++ b/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="(Deprecated) SSL support for Net::SMTP" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.880.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.880.0.ebuild index 6ed4bc6772c1..6ae129bcee89 100644 --- a/dev-perl/Net-SSLeay/Net-SSLeay-1.880.0.ebuild +++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.880.0.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for using OpenSSL" LICENSE="Artistic-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="libressl test minimal examples" RESTRICT="!test? ( test )" diff --git a/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild b/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild index b1e816b78d85..272a00c93727 100644 --- a/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild +++ b/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="XMPP Perl Library" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/PPI/PPI-1.236.0.ebuild b/dev-perl/PPI/PPI-1.236.0.ebuild index 7e8777a2ab42..c5984f3b3f52 100644 --- a/dev-perl/PPI/PPI-1.236.0.ebuild +++ b/dev-perl/PPI/PPI-1.236.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Parse, Analyze and Manipulate Perl (without perl)" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.53.0.ebuild b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.53.0.ebuild index 258e36ffb373..40d1af6c19ed 100644 --- a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.53.0.ebuild +++ b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.53.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Represent a regular expression of some sort" SLOT="0" -KEYWORDS="~alpha amd64 ppc ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" IUSE="test examples" RESTRICT="!test? ( test )" diff --git a/dev-perl/Pod-Readme/Pod-Readme-1.1.2.ebuild b/dev-perl/Pod-Readme/Pod-Readme-1.1.2.ebuild index 850096b270e1..5ee693d6f309 100644 --- a/dev-perl/Pod-Readme/Pod-Readme-1.1.2.ebuild +++ b/dev-perl/Pod-Readme/Pod-Readme-1.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Intelligently generate a README file from POD" SLOT="0" -KEYWORDS="amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="minimal test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Sub-Name/Sub-Name-0.210.0.ebuild b/dev-perl/Sub-Name/Sub-Name-0.210.0.ebuild index 3eca14c520f8..fee65c89cfa9 100644 --- a/dev-perl/Sub-Name/Sub-Name-0.210.0.ebuild +++ b/dev-perl/Sub-Name/Sub-Name-0.210.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="(Re)name a sub" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test suggested" RESTRICT="!test? ( test )" diff --git a/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.120.0.ebuild b/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.120.0.ebuild index 6857ccbda16e..252e225169db 100644 --- a/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.120.0.ebuild +++ b/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.120.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ inherit perl-module eutils DESCRIPTION="LaTeX support for the Template Toolkit" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Template-Toolkit/Template-Toolkit-2.270.0-r1.ebuild b/dev-perl/Template-Toolkit/Template-Toolkit-2.270.0-r1.ebuild index 9547f4cd33be..3a9367583910 100644 --- a/dev-perl/Template-Toolkit/Template-Toolkit-2.270.0-r1.ebuild +++ b/dev-perl/Template-Toolkit/Template-Toolkit-2.270.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="The Template Toolkit" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris" IUSE="xml gd mysql postgres latex vim-syntax test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Template-XML/Template-XML-2.170.0-r1.ebuild b/dev-perl/Template-XML/Template-XML-2.170.0-r1.ebuild index 89d128817332..5025f2561d7c 100644 --- a/dev-perl/Template-XML/Template-XML-2.170.0-r1.ebuild +++ b/dev-perl/Template-XML/Template-XML-2.170.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="XML plugins for the Template Toolkit" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris" IUSE="" RDEPEND=">=dev-perl/Template-Toolkit-2.15-r1 diff --git a/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0.ebuild b/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0.ebuild index 2f74ca3a19d9..8e48726a2b2a 100644 --- a/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0.ebuild +++ b/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Easily test network connectivity" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r2.ebuild b/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r2.ebuild index 5d7d540a58c6..7de3ecceb712 100644 --- a/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r2.ebuild +++ b/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r2.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="A Perl interface to the iconv() codeset conversion function" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" IUSE="" RDEPEND="virtual/libiconv" diff --git a/dev-perl/Text-Template/Text-Template-1.510.0.ebuild b/dev-perl/Text-Template/Text-Template-1.510.0.ebuild index 35536e8a0aae..0b1a857d29db 100644 --- a/dev-perl/Text-Template/Text-Template-1.510.0.ebuild +++ b/dev-perl/Text-Template/Text-Template-1.510.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Expand template text with embedded Perl" SLOT="0" -KEYWORDS="~alpha amd64 hppa ppc x86 ~ppc-macos" +KEYWORDS="~alpha amd64 hppa ppc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild b/dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild index 7b208cc0e5b6..d8cba06cf177 100644 --- a/dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild +++ b/dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Minimal try/catch with proper localization of \$@" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test minimal" RESTRICT="!test? ( test )" diff --git a/dev-perl/URI/URI-1.710.0.ebuild b/dev-perl/URI/URI-1.710.0.ebuild index b5fa0ee01613..b21c107d981b 100644 --- a/dev-perl/URI/URI-1.710.0.ebuild +++ b/dev-perl/URI/URI-1.710.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Uniform Resource Identifiers (absolute and relative)" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/URI/URI-1.730.0.ebuild b/dev-perl/URI/URI-1.730.0.ebuild index 0f382bc3b63d..37a4661b341d 100644 --- a/dev-perl/URI/URI-1.730.0.ebuild +++ b/dev-perl/URI/URI-1.730.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Uniform Resource Identifiers (absolute and relative)" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0-r1.ebuild b/dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0-r1.ebuild index b98de6d5c263..82dad49a5264 100644 --- a/dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0-r1.ebuild +++ b/dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0-r1.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Parse /robots.txt file" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" !=dev-perl/IPC-System-Simple-1.250.0 diff --git a/dev-perl/libwww-perl/libwww-perl-6.270.0.ebuild b/dev-perl/libwww-perl/libwww-perl-6.270.0.ebuild index e275836cf7f2..5aa56cf04a58 100644 --- a/dev-perl/libwww-perl/libwww-perl-6.270.0.ebuild +++ b/dev-perl/libwww-perl/libwww-perl-6.270.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="A collection of Perl Modules for the WWW" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="ssl test" RESTRICT="!test? ( test )" diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz index 73fe95cca60f..fcd736fa1141 100644 Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.7.4.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.7.4.ebuild index cce49d84bccb..ed424ee6f5b4 100644 --- a/dev-php/pecl-mongodb/pecl-mongodb-1.7.4.ebuild +++ b/dev-php/pecl-mongodb/pecl-mongodb-1.7.4.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="MongoDB database driver for PHP" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="libressl sasl test" PHP_DEPEND=" diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index 85364d95944a..f9b462e228c6 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/autobahn/autobahn-20.4.3.ebuild b/dev-python/autobahn/autobahn-20.4.3.ebuild index e3bfba3353da..288c51aa6b59 100644 --- a/dev-python/autobahn/autobahn-20.4.3.ebuild +++ b/dev-python/autobahn/autobahn-20.4.3.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" SLOT="0" LICENSE="MIT" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="crypt test" RESTRICT="!test? ( test )" diff --git a/dev-python/cbor2/cbor2-5.1.0.ebuild b/dev-python/cbor2/cbor2-5.1.0.ebuild index 0ab2f141e004..212a52fd6ee0 100644 --- a/dev-python/cbor2/cbor2-5.1.0.ebuild +++ b/dev-python/cbor2/cbor2-5.1.0.ebuild @@ -15,7 +15,7 @@ RESTRICT="!test? ( test )" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 arm arm64 x86" DEPEND=" dev-python/setuptools_scm[${PYTHON_USEDEP}] diff --git a/dev-python/cryptography/cryptography-2.9.ebuild b/dev-python/cryptography/cryptography-2.9.ebuild index d485e533afa7..10b74ed4338e 100644 --- a/dev-python/cryptography/cryptography-2.9.ebuild +++ b/dev-python/cryptography/cryptography-2.9.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz LICENSE="|| ( Apache-2.0 BSD )" 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 ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="libressl idna test" RESTRICT="!test? ( test )" diff --git a/dev-python/css-parser/css-parser-1.0.4-r1.ebuild b/dev-python/css-parser/css-parser-1.0.4-r1.ebuild index 97f1e05ef089..25c221d65d23 100644 --- a/dev-python/css-parser/css-parser-1.0.4-r1.ebuild +++ b/dev-python/css-parser/css-parser-1.0.4-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit distutils-r1 @@ -14,7 +14,6 @@ LICENSE="LGPL-2.1+" SLOT="0" KEYWORDS="amd64 ~arm x86" -BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" # Tests fail under network-sandbox. RESTRICT+=" test" diff --git a/dev-python/flatbuffers/flatbuffers-1.12.ebuild b/dev-python/flatbuffers/flatbuffers-1.12.ebuild index 746446bbf3b3..d51ae9856aad 100644 --- a/dev-python/flatbuffers/flatbuffers-1.12.ebuild +++ b/dev-python/flatbuffers/flatbuffers-1.12.ebuild @@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 arm arm64 x86" diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest index 58fc65ffe40c..7f4316ebf716 100644 --- a/dev-python/keystoneauth/Manifest +++ b/dev-python/keystoneauth/Manifest @@ -1,2 +1 @@ -DIST keystoneauth1-4.0.0.tar.gz 256925 BLAKE2B 3ba149f9333a42c8fc2f876cf3ee4533633ed881a90f2fd944ee1c245d94dab548ea1c363f2085bc995dd588d8d355d779d9357885ecd0ee9c73115216010388 SHA512 c24d10b2ae6318c22bd62596dda952a36ec8ede8a6436aa111657a984b2b3be72e55895c009317b2ad652979701d4dca6f2c3e1764ada20d1c7b676f072f5614 DIST keystoneauth1-4.0.1.tar.gz 257456 BLAKE2B 0903e782fcd291ba4c15ddbbec684c8f5c898062fdad0b34e8da892fb501a412108affd1d3ed7b9dc4e259b67bbe90dd361ab623da07f7ab97c32c1da6f5a1ad SHA512 b20e02dd521bb45406586f7ebdcbfe48ff22f4820950bbfa280a5fc969bc9cdacaff69678958412cd5880b732642cdd2079c228c9679e372ad76bef625e85c35 diff --git a/dev-python/keystoneauth/keystoneauth-4.0.0.ebuild b/dev-python/keystoneauth/keystoneauth-4.0.0.ebuild deleted file mode 100644 index 60b0dac745a6..000000000000 --- a/dev-python/keystoneauth/keystoneauth-4.0.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_6 python3_7 ) - -inherit distutils-r1 - -DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud." -HOMEPAGE="https://github.com/openstack/keystoneauth" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz" -S="${WORKDIR}/${PN}1-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND}" -RDEPEND="${CDEPEND} - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] - >=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]" diff --git a/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild b/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild index 9af2bde54fb9..8e061d534fec 100644 --- a/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild +++ b/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}1-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="" CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] diff --git a/dev-python/lit/lit-10.0.0.ebuild b/dev-python/lit/lit-10.0.0.ebuild index 27f575a7091b..4d9cb9965bfe 100644 --- a/dev-python/lit/lit-10.0.0.ebuild +++ b/dev-python/lit/lit-10.0.0.ebuild @@ -15,7 +15,7 @@ llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" +KEYWORDS="amd64 arm arm64 ppc64 ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-python/llvmlite/llvmlite-0.33.0-r1.ebuild b/dev-python/llvmlite/llvmlite-0.33.0-r1.ebuild index 985351846cd3..6b797f9dfc26 100644 --- a/dev-python/llvmlite/llvmlite-0.33.0-r1.ebuild +++ b/dev-python/llvmlite/llvmlite-0.33.0-r1.ebuild @@ -14,7 +14,7 @@ S=${WORKDIR}/${P/_/} LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux" IUSE="examples" LLVM_MAX_SLOT=10 diff --git a/dev-python/lxml/lxml-4.5.1.ebuild b/dev-python/lxml/lxml-4.5.1.ebuild index 70e7510c5598..3759600dec7c 100644 --- a/dev-python/lxml/lxml-4.5.1.ebuild +++ b/dev-python/lxml/lxml-4.5.1.ebuild @@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P} LICENSE="BSD ElementTree GPL-2 PSF-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc examples +threads test" RESTRICT="!test? ( test )" diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest index a452e80a8c0c..b491f1e3f066 100644 --- a/dev-python/openstacksdk/Manifest +++ b/dev-python/openstacksdk/Manifest @@ -1,2 +1 @@ -DIST openstacksdk-0.36.0.tar.gz 887545 BLAKE2B 8a207e5d3a2c6989a1e7c881beaa35dca4617569eeb2efec5f917f4310a6e49549b3ddc9f8106566b7b1e620b2aab38507f92063f68e326f234166a5ea7b267b SHA512 e95cb7c626f8bdd0064ed69d767dc1d53742d9d7a0d6196058453113ddcab3bdd903a1ef7455a2f9fe4335733793c927a00fe333099ba142ef69945a287d3983 DIST openstacksdk-0.46.0.tar.gz 928650 BLAKE2B f1cf41cc63efb0824ada0c9ac5fea2c1e9b7bc32482df612ba655c6bc94c707e4472c0a5995609914c4e73531aa730a28ee9612a2058a3867d7980581244e20c SHA512 188bb2b2ae9fd3100aa64356d282bc6402c6f175371d8b514ed753f1dd2b1774e3bab22ca45df455fbb7d813236012c0c5174578a84d3f87a3390821f888d709 diff --git a/dev-python/openstacksdk/openstacksdk-0.36.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.36.0.ebuild deleted file mode 100644 index addace85d893..000000000000 --- a/dev-python/openstacksdk/openstacksdk-0.36.0.ebuild +++ /dev/null @@ -1,38 +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} ) - -inherit distutils-r1 - -DESCRIPTION="A collection of libraries for building applications to work with OpenStack." -HOMEPAGE="https://github.com/openstack/python-openstacksdk" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND}" -RDEPEND="${CDEPEND} - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] - >=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}] - >=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}] - >=dev-python/jsonpatch-1.16[${PYTHON_USEDEP}] - !~dev-python/jsonpatch-1.20[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-3.16.0[${PYTHON_USEDEP}] - >=dev-python/munch-2.1.0[${PYTHON_USEDEP}] - >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] - >=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}] - >=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}] - >=dev-python/cryptography-2.1.0[${PYTHON_USEDEP}] -" diff --git a/dev-python/openstacksdk/openstacksdk-0.46.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.46.0.ebuild index a89263bc354e..2bd3cb7f6e73 100644 --- a/dev-python/openstacksdk/openstacksdk-0.46.0.ebuild +++ b/dev-python/openstacksdk/openstacksdk-0.46.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="" CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] diff --git a/dev-python/osc-lib/Manifest b/dev-python/osc-lib/Manifest index 0e990fa1bd98..6ee4d1bf075e 100644 --- a/dev-python/osc-lib/Manifest +++ b/dev-python/osc-lib/Manifest @@ -1,2 +1 @@ -DIST osc-lib-1.12.1.tar.gz 89641 BLAKE2B 06069dc38e72c2c008c730cb7a30279762c213b2715e70786e6d293a3087d9fe7d0b3b3a04fa343337bff6721d32bf25a35920e12dfeb03368d1308fc0331f12 SHA512 0b5c2e1376ea078f0641d3e2b69508539531b2d369f2171773ad5d44ded6f25112c3b0843dec11c481afd51b2b804d4e56736ae65a24ad4c59ab142b86da678f DIST osc-lib-2.0.0.tar.gz 93445 BLAKE2B eff1ba7e87fca3e6ba080066d46b7378f902ca6fea464ea6f5189175f7eb82d65b3a2d5cc5d4efc482412001505dd3edde48404f6dd448996f25233ceab6ac46 SHA512 6947ea6ac56b644dd9be4b3052905313c42c9ec46b4031d4c77e7df43292f3b04fa288e8aaaaad748eb7dd1a88edaa8d7d9263c8c7b899ce1607a7b2174e696d diff --git a/dev-python/osc-lib/osc-lib-1.12.1.ebuild b/dev-python/osc-lib/osc-lib-1.12.1.ebuild deleted file mode 100644 index 3aa2ab043ade..000000000000 --- a/dev-python/osc-lib/osc-lib-1.12.1.ebuild +++ /dev/null @@ -1,36 +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} ) - -inherit distutils-r1 - -DESCRIPTION="A package of common support modules for writing OSC plugins." -HOMEPAGE="https://github.com/openstack/osc-lib" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" -IUSE="" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND}" -RDEPEND=" - ${CDEPEND} - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] - >=dev-python/cliff-2.8.0[${PYTHON_USEDEP}] - !~dev-python/cliff-2.9.0[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}] - >=dev-python/openstacksdk-0.15.0[${PYTHON_USEDEP}] - >=dev-python/os-client-config-1.29.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}] - >=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]" diff --git a/dev-python/osc-lib/osc-lib-2.0.0.ebuild b/dev-python/osc-lib/osc-lib-2.0.0.ebuild index ec6dd58f6bf2..3aa2ab043ade 100644 --- a/dev-python/osc-lib/osc-lib-2.0.0.ebuild +++ b/dev-python/osc-lib/osc-lib-2.0.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" IUSE="" CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest index c534f59935ca..67aa75b3792c 100644 --- a/dev-python/oslo-messaging/Manifest +++ b/dev-python/oslo-messaging/Manifest @@ -1,3 +1 @@ -DIST oslo.messaging-10.2.0.tar.gz 255431 BLAKE2B 971f24845b4d0440fb600b459b4a41c94220e387cbe2ef16a5c93d72e0582116702254c4d8106f5f3f3a3435b1c5bfaceffbb1c6ed3e671f7c269fb6d5ca3cb3 SHA512 404aed31f2808de744d7fd141257aca3d2db2b65645eebfffa7edb364e50803621af98886dc60b46042e525a7a98a12f3208ba472dcf805524cd0defdd441060 -DIST oslo.messaging-12.1.0.tar.gz 253854 BLAKE2B 6db26884f69be59cecd904b8ca0edc44a7f4e6a50ada154f28bf3a2a431896345ea7981ad7b195c12abe3f4d78d259c036e18e5544d2564e04d373c7cf2575b0 SHA512 1649f3520b6785eb5bf0f68cf174c1f60f32675ab6fa1400997704e97df7b24dcd63de751ab2313b839619b4eb250612ea32996c6c3c9956f7145010ca38cba2 DIST oslo.messaging-12.1.1.tar.gz 255540 BLAKE2B 54ab60244090d3602de9395ea4f6ffa4bfa78783642aecaf7bb37db62c1a5cb63d69c612d2d1085ef96611429a8c7b337ac1849d93ed857a2cb51bbae6265ed2 SHA512 0f55f2c21dfd5f83efbf53f8c0cfa65d8572166662a183998c896c61475a38c47ae6e2376c5a153049d2f91e3321d6a75accf4de4ef11b4ec8626b448c0637a9 diff --git a/dev-python/oslo-messaging/metadata.xml b/dev-python/oslo-messaging/metadata.xml index 5256a24f8b45..5ff552fab61b 100644 --- a/dev-python/oslo-messaging/metadata.xml +++ b/dev-python/oslo-messaging/metadata.xml @@ -9,9 +9,6 @@ python@gentoo.org Python - - The Oslo messaging API supports RPC and notifications over a number of different messaging transports. - oslo.messaging diff --git a/dev-python/oslo-messaging/oslo-messaging-10.2.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-10.2.0.ebuild deleted file mode 100644 index cef773967641..000000000000 --- a/dev-python/oslo-messaging/oslo-messaging-10.2.0.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 -PYTHON_COMPAT=( python3_{6,7} ) - -inherit distutils-r1 - -DESCRIPTION="Messaging API for RPC and notifications over different messaging transports" -HOMEPAGE="https://pypi.org/project/oslo.messaging/" -SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz" -S="${WORKDIR}/oslo.messaging-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND}" -RDEPEND=" - ${CDEPEND} - >=dev-python/futurist-1.2.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}] - !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}] - >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}] - !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] - >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] - >=dev-python/monotonic-0.6[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}] - >=dev-python/webob-1.7.1[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}] - >=dev-python/py-amqp-2.4.1[${PYTHON_USEDEP}] - >=dev-python/kombu-4.6.1[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}] -" - -python_prepare_all() { - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} diff --git a/dev-python/oslo-messaging/oslo-messaging-12.1.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-12.1.0.ebuild deleted file mode 100644 index ef31654a32a3..000000000000 --- a/dev-python/oslo-messaging/oslo-messaging-12.1.0.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 -PYTHON_COMPAT=( python3_7 ) - -inherit distutils-r1 - -DESCRIPTION="Messaging API for RPC and notifications over different messaging transports" -HOMEPAGE="https://pypi.org/project/oslo.messaging/" -SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz" -S="${WORKDIR}/oslo.messaging-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND}" -RDEPEND=" - ${CDEPEND} - >=dev-python/futurist-1.2.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.37.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}] - !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}] - >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}] - !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] - >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] - >=dev-python/monotonic-0.6[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}] - >=dev-python/webob-1.7.1[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}] - >=dev-python/py-amqp-2.5.2[${PYTHON_USEDEP}] - >=dev-python/kombu-4.6.6[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}] -" - -python_prepare_all() { - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} diff --git a/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild index 9e9105ff46e7..f3a9989e9c84 100644 --- a/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild +++ b/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_7 ) +PYTHON_COMPAT=( python3_6 python3_7 ) inherit distutils-r1 @@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.messaging-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest index 1643375e00e3..e6cec35eea31 100644 --- a/dev-python/oslo-utils/Manifest +++ b/dev-python/oslo-utils/Manifest @@ -1,3 +1 @@ -DIST oslo-utils-3.41.5.tar.gz 91662 BLAKE2B 28ab74823b68cdf427396e5e357f567be5540eaf28e56416015d41ba76ddbe0970064b672c46b53bf23c2dfaae442462fa89d1e140e5f5a271db6e72e4b3e615 SHA512 0d9f9a99a48c0d6623947df6557eca24ebb2ae21d110e1c2a37e09c89fc2749d3ae480bfb534b3a2e3a6f9e7b0db126497f3403825b1272a30f532aa57795b04 -DIST oslo-utils-4.1.1.tar.gz 92838 BLAKE2B f468f77bc72124c404d4aac2b8ca9fd7f05140e45bfcc9b19e04e5d3181532fd82f941b7a00d22f1cb656ae46dc205e7da449772666a8892b8d7ea6469bb6505 SHA512 d6388af59caa7531901eb5585e1dd9eca544dd722bb4cdafb19221c33c543508306415f504b27559366eec2a9c7102acb181d8b833ee038e46e90567208daefd DIST oslo-utils-4.1.2.tar.gz 92889 BLAKE2B 16397708abe47946c1495adf6b91ad9db6bdef8c2f475f398b3b4d390193b800ff0b1710183732b81dde89fc24aad204854d02a0e0567046e712663eaa685711 SHA512 d6784c7e1a30690ec2523514b464c95e1d6704a8c8fef5da85b76583dfb5d4b5cbfd18eb9451a90243210e50405f7541b85b39ac09d4f487119677efeef63418 diff --git a/dev-python/oslo-utils/oslo-utils-3.41.5.ebuild b/dev-python/oslo-utils/oslo-utils-3.41.5.ebuild deleted file mode 100644 index 41b6669851c7..000000000000 --- a/dev-python/oslo-utils/oslo-utils-3.41.5.ebuild +++ /dev/null @@ -1,102 +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} ) - -inherit distutils-r1 - -MY_PN=${PN/-/.} - -DESCRIPTION="Oslo Utility library" -HOMEPAGE="https://launchpad.net/oslo" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_PN}-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND} - test? ( - >=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}] - !~dev-python/eventlet-0.18.3[${PYTHON_USEDEP}] - !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}] - !~dev-python/eventlet-0.21.0[${PYTHON_USEDEP}] - !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}] - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] - >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}] - >=dev-python/ddt-1.0.1[${PYTHON_USEDEP}] - >=dev-python/stestr-2.0.0[${PYTHON_USEDEP}] - >=dev-python/coverage-4.0.0[${PYTHON_USEDEP}] - !~dev-python/coverage-4.4.0[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}] - >=dev-python/bandit-1.1.0[${PYTHON_USEDEP}] - =dev-python/sphinx-1.6.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}] - =dev-python/reno-2.5.0[${PYTHON_USEDEP}] - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - ) -" -RDEPEND=" - ${CDEPEND} - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}] - >=dev-python/monotonic-0.6[${PYTHON_USEDEP}] - >=dev-python/pytz-2013.6[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}] - >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] - >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}] -" - -python_prepare_all() { - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && esetup.py build_sphinx -} - -# Note: Tests fail due to requiring installation -# -# Installation appears to fail due to the use of namespace packages but root -# cause was never truly established. -# -# Tests fail with: -# ImportError: No module named 'oslo.utils - -#RESTRICT="test" - -python_test() { - distutils_install_for_testing - - cd "${TEST_DIR}"/lib || die - - rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}" - - testr init || die "testr init failed under ${EPYTHON}" - testr run || die "testr run failed under ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/build/html/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/oslo-utils/oslo-utils-4.1.1.ebuild b/dev-python/oslo-utils/oslo-utils-4.1.1.ebuild deleted file mode 100644 index 52ecfe5ad491..000000000000 --- a/dev-python/oslo-utils/oslo-utils-4.1.1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_7 ) - -inherit distutils-r1 - -MY_PN=${PN/-/.} - -DESCRIPTION="Oslo Utility library" -HOMEPAGE="https://launchpad.net/oslo" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_PN}-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND} - test? ( - >=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}] - !~dev-python/eventlet-0.18.3[${PYTHON_USEDEP}] - !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}] - !~dev-python/eventlet-0.21.0[${PYTHON_USEDEP}] - !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}] - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] - >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}] - >=dev-python/ddt-1.0.1[${PYTHON_USEDEP}] - >=dev-python/stestr-2.0.0[${PYTHON_USEDEP}] - >=dev-python/coverage-4.0.0[${PYTHON_USEDEP}] - !~dev-python/coverage-4.4.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}] - >=dev-python/bandit-1.1.0[${PYTHON_USEDEP}] - openstack@gentoo.org Openstack - - A client for the OpenStack Keystone API. - python-keystoneclient diff --git a/dev-python/python-keystoneclient/python-keystoneclient-3.21.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-3.21.0.ebuild deleted file mode 100644 index c9534e0be00c..000000000000 --- a/dev-python/python-keystoneclient/python-keystoneclient-3.21.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 -PYTHON_COMPAT=( python3_{6,7} ) - -inherit distutils-r1 - -DESCRIPTION="Client Library for OpenStack Identity" -HOMEPAGE="https://www.openstack.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" -IUSE="" -RESTRICT="test" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND}" -RDEPEND=" - ${CDEPEND} - >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}] - !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}] - >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] -" -#PATCHES=( -#) - -python_prepare_all() { - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} diff --git a/dev-python/python-keystoneclient/python-keystoneclient-4.0.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-4.0.0.ebuild index 623d0b7f54c1..c9534e0be00c 100644 --- a/dev-python/python-keystoneclient/python-keystoneclient-4.0.0.ebuild +++ b/dev-python/python-keystoneclient/python-keystoneclient-4.0.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" IUSE="" RESTRICT="test" diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest index 40c7e2ce961c..047eb33a4724 100644 --- a/dev-python/python-novaclient/Manifest +++ b/dev-python/python-novaclient/Manifest @@ -1,2 +1 @@ -DIST python-novaclient-13.0.2.tar.gz 312390 BLAKE2B 2a436a2f843afe466bbf3d376d16a994f25e2232dfcb67271837159c5f21d7970027ad6d946c331dd6bff5c248d6b526303205a96a18ef4872cc8b1b526ff366 SHA512 988264cb6b6034dd0c4cb3a79840f591bda9c1c0134ddf0124beea6d9992192dbaeb9ec20bbe73f5a831bf561d175fd3d312880093f58de51d326922502cd1e5 DIST python-novaclient-17.0.0.tar.gz 325548 BLAKE2B f34bb6cb2cbb7f65f81ef410828b9c3a14b67bc4558f0175b4c9b66899c192367637d281d86f5e1a7267c2288930845f22fb389244839c2dfa76fc9a58bf3480 SHA512 4f8a789364f4a6603c67236fb61ef1ca2aabbc8e18d96d5890af137cc6d2d06c250a5202aa91c95432686ce7b5ffba8e31cc38b43032ae2420c08381751d3332 diff --git a/dev-python/python-novaclient/python-novaclient-13.0.2.ebuild b/dev-python/python-novaclient/python-novaclient-13.0.2.ebuild deleted file mode 100644 index c7431df06cd2..000000000000 --- a/dev-python/python-novaclient/python-novaclient-13.0.2.ebuild +++ /dev/null @@ -1,68 +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} ) - -inherit distutils-r1 - -DESCRIPTION="A client for the OpenStack Nova API" -HOMEPAGE="https://github.com/openstack/python-novaclient" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RESTRICT="!test? ( test )" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND} - test? ( - >=dev-python/bandit-1.1.0[${PYTHON_USEDEP}] - >=dev-python/coverage-4.0[${PYTHON_USEDEP}] - !~dev-python/coverage-4.4[${PYTHON_USEDEP}] - >=dev-python/ddt-1.0.1[${PYTHON_USEDEP}] - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - >=dev-python/keyring-5.5.1[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] - >=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}] - >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}] - >=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}] - >=dev-python/requests-mock-1.1[${PYTHON_USEDEP}] - >=dev-python/openstacksdk-0.11.2[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - >=dev-python/stestr-2.0.0[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] - )" -RDEPEND=" - >=dev-python/keystoneauth-3.5.0[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}] - !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}] - >=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}] - =dev-python/requests-2.10.0[${PYTHON_USEDEP}] - !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] - >=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - >=dev-python/Babel-2.4.0[${PYTHON_USEDEP}]" - -python_prepare_all() { - # built in... - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -python_test() { - testr init - testr run --parallel || die "testsuite failed under python2.7" -} diff --git a/dev-python/python-novaclient/python-novaclient-17.0.0.ebuild b/dev-python/python-novaclient/python-novaclient-17.0.0.ebuild index b880671a1a2b..dfe527ca0d4b 100644 --- a/dev-python/python-novaclient/python-novaclient-17.0.0.ebuild +++ b/dev-python/python-novaclient/python-novaclient-17.0.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" IUSE="" CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest index cbe4a683af5f..a29d18b6b74a 100644 --- a/dev-python/python-openstackclient/Manifest +++ b/dev-python/python-openstackclient/Manifest @@ -1,2 +1 @@ -DIST python-openstackclient-3.18.1.tar.gz 721120 BLAKE2B 58394b6172f6bdbe2ebe5a1d8ea2209049887eb7cca635b9b87b558e6ffeb7130c2545aa8b3bd11d8f8b1cb6c315acecc5fdfa7dba21c2442ef049ed688af546 SHA512 2fb15e2c9d3daa9e70871ba2005d2e94be975b564e1f70690e8a5b2fc4cbfebef4870bb39d8099829968e05eae356f4f38edad154ff041d8ab20fe2ab68f2bf1 DIST python-openstackclient-5.2.1.tar.gz 722343 BLAKE2B 894424f8ce8a7d0489df4ca6c4d811f489f7ae4a0933b9e0a7ff30c0bfaba8bbf783d56376de655c6cc2fece28b032063f6cddb330353f3dd78c44584061c236 SHA512 74abb72435e95070e2d9a849def79ef56a4afbf9473cf29053af3cc65ab5d936fe0c542ae9240ffd5b801964f17c9a65af8f4770c49606c180e4eef25e73c26c diff --git a/dev-python/python-openstackclient/python-openstackclient-3.18.1.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.18.1.ebuild deleted file mode 100644 index faef905306d2..000000000000 --- a/dev-python/python-openstackclient/python-openstackclient-3.18.1.ebuild +++ /dev/null @@ -1,38 +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} ) - -inherit distutils-r1 - -DESCRIPTION="A client for the OpenStack APIs" -HOMEPAGE="https://github.com/openstack/python-openstackclient" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" -IUSE="" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND}" -RDEPEND=" - ${CDEPEND} - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] - >=dev-python/cliff-2.8.0[${PYTHON_USEDEP}] - !~dev-python/cliff-2.9.0[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-3.6.2[${PYTHON_USEDEP}] - >=dev-python/openstacksdk-0.17.0[${PYTHON_USEDEP}] - >=dev-python/osc-lib-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}] - >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-3.17.0[${PYTHON_USEDEP}] - >=dev-python/python-novaclient-10.0.0[${PYTHON_USEDEP}] - >=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}] -" diff --git a/dev-python/python-openstackclient/python-openstackclient-5.2.1.ebuild b/dev-python/python-openstackclient/python-openstackclient-5.2.1.ebuild index 9cc9b5bac881..31b4e5831f27 100644 --- a/dev-python/python-openstackclient/python-openstackclient-5.2.1.ebuild +++ b/dev-python/python-openstackclient/python-openstackclient-5.2.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" IUSE="" CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] diff --git a/dev-python/pythondialog/pythondialog-3.5.1.ebuild b/dev-python/pythondialog/pythondialog-3.5.1.ebuild index 9036f76e6a54..9e20150dce2c 100644 --- a/dev-python/pythondialog/pythondialog-3.5.1.ebuild +++ b/dev-python/pythondialog/pythondialog-3.5.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pythondialog/${PV}/python3-${P}.tar.bz2" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~ia64 ppc sparc x86" RDEPEND="dev-util/dialog" diff --git a/dev-python/pytools/pytools-9999.ebuild b/dev-python/pytools/pytools-9999.ebuild index 765b22bf080c..618ec9fc5a6d 100644 --- a/dev-python/pytools/pytools-9999.ebuild +++ b/dev-python/pytools/pytools-9999.ebuild @@ -1,37 +1,24 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{7..9} ) PYTHON_REQ_USE='sqlite' +DISTUTILS_USE_SETUPTOOLS=bdepend inherit distutils-r1 git-r3 -DESCRIPTION="A collection of tools missing from the Python standard library" +DESCRIPTION="Collection of tools missing from the Python standard library" HOMEPAGE="https://mathema.tician.de/software/pytools/" EGIT_REPO_URI="https://github.com/inducer/pytools" LICENSE="MIT" SLOT="0" -KEYWORDS="" -IUSE="test" -RESTRICT="!test? ( test )" -RDEPEND=" - >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}] +RDEPEND=">=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}] >=dev-python/decorator-3.2.0[${PYTHON_USEDEP}] >=dev-python/numpy-1.6.0[${PYTHON_USEDEP}] - >=dev-python/six-1.8.0[${PYTHON_USEDEP}] -" -DEPEND=" - >=dev-python/setuptools-0.7.2[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - dev-python/pytest[${PYTHON_USEDEP}] - ) -" + >=dev-python/six-1.8.0[${PYTHON_USEDEP}]" -python_test() { - pytest -vv || die "Tests fail with ${EPYTHON}" -} +distutils_enable_tests pytest diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.0.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.0.ebuild index b1a52c4c5edf..874070296b09 100644 --- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.0.ebuild +++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( pypy3 python3_{6..9} ) DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.10.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.10.ebuild index 48f24d33b5e5..3a66659cb021 100644 --- a/dev-python/ruamel-yaml/ruamel-yaml-0.16.10.ebuild +++ b/dev-python/ruamel-yaml/ruamel-yaml-0.16.10.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( pypy3 python3_{6..9} ) DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest index cb2c67e90b1e..5b5d22bdd285 100644 --- a/dev-python/scrypt/Manifest +++ b/dev-python/scrypt/Manifest @@ -1,2 +1 @@ -DIST scrypt-0.8.13.tar.gz 53606 BLAKE2B 924b870d2dd5d8dc6765ab2679e71a819fb08a75cfdb0e7a6cfa9c305f35a376892e78607007013d9dc7d9a6b2bc6420019f8b27fadc7f468b3b2fd685a1c3ff SHA512 a65e24b0a7dbe02e16c0b38b52c66549f36370e267aacf348a107cb980221806ca783cee0caa95ab6af978dd2b0d8efdb6b06798bb43742d4623bd8f6535e9a5 DIST scrypt-0.8.15.tar.gz 53954 BLAKE2B 9f9bfc6ead25f14b9b3194853cd64a7b2244685d15a7d257e2395b0acf3fb968487fffc5d5eb5a245de1518b0740483d3e6feed841282b40ecec86ce178de46e SHA512 db5f688b341f816935a0fd5a538d8633a1e43c69c7228d9fc127459c9673528f92405170339a5a43eca86eb5a2ea17b951ac16a203993e452e05f2589914a66f diff --git a/dev-python/scrypt/scrypt-0.8.13-r2.ebuild b/dev-python/scrypt/scrypt-0.8.13-r2.ebuild deleted file mode 100644 index 8c9bb208037b..000000000000 --- a/dev-python/scrypt/scrypt-0.8.13-r2.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Bindings for the scrypt key derivation function library" -HOMEPAGE="https://bitbucket.org/mhallin/py-scrypt/wiki/Home/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD-2" -KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86" -SLOT="0" -IUSE="libressl" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) -" -DEPEND="${RDEPEND}" - -distutils_enable_tests unittest diff --git a/dev-python/scrypt/scrypt-0.8.15.ebuild b/dev-python/scrypt/scrypt-0.8.15.ebuild index bbecfe7218ee..dbfa29411a4d 100644 --- a/dev-python/scrypt/scrypt-0.8.15.ebuild +++ b/dev-python/scrypt/scrypt-0.8.15.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/holgern/py-scrypt/" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD-2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86" SLOT="0" IUSE="libressl" diff --git a/dev-python/setuptools/setuptools-46.4.0-r1.ebuild b/dev-python/setuptools/setuptools-46.4.0-r1.ebuild index d2c62194e941..c6933e0ee478 100644 --- a/dev-python/setuptools/setuptools-46.4.0-r1.ebuild +++ b/dev-python/setuptools/setuptools-46.4.0-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-python/sphinx/sphinx-3.0.4.ebuild b/dev-python/sphinx/sphinx-3.0.4.ebuild index 33f221e60630..4f119b7f87e2 100644 --- a/dev-python/sphinx/sphinx-3.0.4.ebuild +++ b/dev-python/sphinx/sphinx-3.0.4.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" IUSE="doc latex test" RESTRICT="!test? ( test )" diff --git a/dev-python/tox/tox-3.15.2.ebuild b/dev-python/tox/tox-3.15.2.ebuild index 430c750259e9..97053e14ad05 100644 --- a/dev-python/tox/tox-3.15.2.ebuild +++ b/dev-python/tox/tox-3.15.2.ebuild @@ -14,7 +14,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86" # doc disabled because of missing deps in tree IUSE="test" diff --git a/dev-python/trustme/trustme-0.6.0.ebuild b/dev-python/trustme/trustme-0.6.0.ebuild index 36f5d8ad014d..99f5e639226f 100644 --- a/dev-python/trustme/trustme-0.6.0.ebuild +++ b/dev-python/trustme/trustme-0.6.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="|| ( Apache-2.0 MIT )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86" RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}] dev-python/idna[${PYTHON_USEDEP}] diff --git a/dev-python/typed-ast/typed-ast-1.4.1.ebuild b/dev-python/typed-ast/typed-ast-1.4.1.ebuild index d667c9b90a4e..ed2ae5db3482 100644 --- a/dev-python/typed-ast/typed-ast-1.4.1.ebuild +++ b/dev-python/typed-ast/typed-ast-1.4.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz" LICENSE="Apache-2.0 MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/urllib3/urllib3-1.25.9.ebuild b/dev-python/urllib3/urllib3-1.25.9.ebuild index 82e4aafb2013..7281a44b4413 100644 --- a/dev-python/urllib3/urllib3-1.25.9.ebuild +++ b/dev-python/urllib3/urllib3-1.25.9.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="brotli test" RESTRICT="!test? ( test )" diff --git a/dev-python/zope-interface/zope-interface-5.1.0.ebuild b/dev-python/zope-interface/zope-interface-5.1.0.ebuild index 61e32da4a8cb..89a3e41851a8 100644 --- a/dev-python/zope-interface/zope-interface-5.1.0.ebuild +++ b/dev-python/zope-interface/zope-interface-5.1.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="ZPL" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]" BDEPEND=" diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz index cd9c41667680..962c14a9e464 100644 Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild index e07e633cad29..2f9eb0abb6e8 100644 --- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild +++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild @@ -16,7 +16,7 @@ RUBY_S="$MY_P"/bindings/ruby LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" IUSE="graph test" RESTRICT="!test? ( test )" REQUIRED_USE="test? ( graph )" diff --git a/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.2.ebuild b/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.2.ebuild index 38c2ff03a977..0549cd260862 100644 --- a/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.2.ebuild +++ b/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="" LICENSE="Ruby" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~x86" IUSE="" ruby_add_rdepend " diff --git a/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.6.ebuild b/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.6.ebuild index e7a6d40efe5a..9bc3dcdc67f7 100644 --- a/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.6.ebuild +++ b/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.6.ebuild @@ -12,7 +12,7 @@ SRC_URI="" LICENSE="Ruby" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~x86" IUSE="" ruby_add_rdepend " diff --git a/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.7.ebuild b/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.7.ebuild index e7a6d40efe5a..9bc3dcdc67f7 100644 --- a/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.7.ebuild +++ b/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.7.ebuild @@ -12,7 +12,7 @@ SRC_URI="" LICENSE="Ruby" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~x86" IUSE="" ruby_add_rdepend " diff --git a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.2.ebuild b/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.2.ebuild index a3581d1d6910..b493d0f7d010 100644 --- a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.2.ebuild +++ b/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.2.ebuild @@ -7,7 +7,7 @@ USE_RUBY="ruby23 ruby24 ruby25 ruby26" inherit virtualx ruby-ng-gnome2 DESCRIPTION="Ruby WebKitGtk+ for Gtk 3.0 bindings" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~x86" IUSE="" DEPEND+=" net-libs/webkit-gtk:4" diff --git a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.6.ebuild b/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.6.ebuild index f55006950a4d..59f40a356e38 100644 --- a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.6.ebuild +++ b/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.6.ebuild @@ -7,7 +7,7 @@ USE_RUBY="ruby24 ruby25 ruby26" inherit virtualx ruby-ng-gnome2 DESCRIPTION="Ruby WebKitGtk+ for Gtk 3.0 bindings" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND+=" net-libs/webkit-gtk:4" diff --git a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.7.ebuild b/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.7.ebuild index f55006950a4d..59f40a356e38 100644 --- a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.7.ebuild +++ b/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.7.ebuild @@ -7,7 +7,7 @@ USE_RUBY="ruby24 ruby25 ruby26" inherit virtualx ruby-ng-gnome2 DESCRIPTION="Ruby WebKitGtk+ for Gtk 3.0 bindings" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND+=" net-libs/webkit-gtk:4" diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest index 6d82f2112163..de78814fc914 100644 --- a/dev-ruby/yajl-ruby/Manifest +++ b/dev-ruby/yajl-ruby/Manifest @@ -1,2 +1 @@ -DIST yajl-ruby-1.3.1.gem 550912 BLAKE2B 809608b5c767c560cf40a0a8d4160f17092762788af9c66e729762ade50fbb0cccd266f1bbd411076ef4b2dc7a4cdfcdeeb552b6d86a58a0d9a38ebf1bad638c SHA512 f18b47f1fd0b039bfec01db0ee298296199fbf91b22a00042e1220a1d8471f72424c082b696829e48ce7dee7514510dd731c2bc36fe29bd08ba7246c820621f4 DIST yajl-ruby-1.4.1.gem 557056 BLAKE2B ade1c18bff1d95a733a1981f7898f1ebaecaed6e9a0354af2a6b4d0190a37e613830f77d5e57178b622c32e2d8688aaa11a7edd543c17a30a16f9045d21ea4aa SHA512 24cd82380658d784bbf0a7a16d4048125cc5a856b0e0b4d3bdec29a550a9131d3959f9a75eba0d18d5db8d0a23158fb7ef6ea6f60d221a7bc3d8efc437d52df5 diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild deleted file mode 100644 index e0e40f5bf17a..000000000000 --- a/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.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 - -USE_RUBY="ruby22 ruby23 ruby24 ruby25" - -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -RUBY_FAKEGEM_TASK_DOC="" - -inherit multilib ruby-fakegem - -DESCRIPTION="Ruby C bindings to the Yajl JSON stream-based parser library" -HOMEPAGE="https://github.com/brianmario/yajl-ruby" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="${RDEPEND} dev-libs/yajl" -DEPEND="${DEPEND} dev-libs/yajl" - -each_ruby_prepare() { - # Make sure the right ruby interpreter is used - sed -e '/capture/ s:ruby:'${RUBY}':' -i spec/parsing/large_number_spec.rb || die -} - -each_ruby_configure() { - ${RUBY} -Cext/yajl extconf.rb || die "extconf.rb failed" -} - -each_ruby_compile() { - emake -Cext/yajl CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1 - cp ext/yajl/yajl$(get_modname) lib/yajl/ || die -} - -each_ruby_test() { - # Set RUBYLIB to pass search path on to additional interpreters that - # are started. - RUBYLIB=lib RSPEC_VERSION=3 ruby-ng_rspec || die -} diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index bfa3040d0b9a..a1d59a3f9069 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild index 95483f444700..86a31b64479b 100644 --- a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild +++ b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild @@ -100,13 +100,13 @@ src_configure() { cmake-utils_src_configure sed -i \ - -e "s:@CC@:$(tc-getCC):g" \ - -e "s:@CXX@:$(tc-getCXX):g" \ - -e "s:@CFLAGS@:${CFLAGS}:g" \ - -e "s:@CPPFLAGS@:${CPPFLAGS}:g" \ - -e "s:@CXXFLAGS@:${CXXFLAGS}:g" \ - -e "s:@LDFLAGS@:${LDFLAGS}:g" \ - -e "s:@PV@:${PV}:g" \ + -e "s|@CC@|$(tc-getCC)|g" \ + -e "s|@CXX@|$(tc-getCXX)|g" \ + -e "s|@CFLAGS@|${CFLAGS}|g" \ + -e "s|@CPPFLAGS@|${CPPFLAGS}|g" \ + -e "s|@CXXFLAGS@|${CXXFLAGS}|g" \ + -e "s|@LDFLAGS@|${LDFLAGS}|g" \ + -e "s|@PV@|${PV}|g" \ build.ninja || die } diff --git a/dev-util/colm/colm-0.13.0.5.ebuild b/dev-util/colm/colm-0.13.0.5.ebuild index 8fe253bbc435..7887c6ac4f6e 100644 --- a/dev-util/colm/colm-0.13.0.5.ebuild +++ b/dev-util/colm/colm-0.13.0.5.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~amd64 arm arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 arm arm64 ~ia64 x86 ~amd64-linux ~x86-linux" IUSE="" DEPEND="app-text/asciidoc" diff --git a/dev-util/devhelp/devhelp-3.34.0.ebuild b/dev-util/devhelp/devhelp-3.34.0.ebuild index 2a8f559e7ffd..01b5ad885657 100644 --- a/dev-util/devhelp/devhelp-3.34.0.ebuild +++ b/dev-util/devhelp/devhelp-3.34.0.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp" LICENSE="GPL-3+" SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version) -KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86" +KEYWORDS="amd64 ~arm ~ppc64 ~sparc x86" IUSE="gedit gtk-doc +introspection" REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest index b0d84dda4c33..6297d2820055 100644 --- a/dev-util/gn/Manifest +++ b/dev-util/gn/Manifest @@ -1,2 +1,2 @@ -DIST gn-0.1463.tar.gz 905571 BLAKE2B e048e642704533d478fb751748a97f60283f63868ab1ab6fa5b8e7bc0322745cf21464eaa16194f684869b50f306668d3c7d3b4f72c3985b865d8492d1ff0901 SHA512 f32861a8fa44034b932e6aae4787fd7da6e4c6c19c5b6919de7b0d0f1ba20f415c1c55db95a08958a338b7b9de740ff49a29ab894a9c4e9049a89450d8c88281 DIST gn-0.1726.tar.xz 663480 BLAKE2B 26920a1594e9cc664293efaeaa8725568b78ecc1f2ac8c9a3cd27333e5fe89f1fa5bdee9e42c408f3c4a7cfb630e79220926c5694e31131d3e7627be49b5d6b2 SHA512 3e93ba02f251386c4aa320a45b8a045c2a1fa686a8f170455f3c06bb25b1a628c44530ae2e56bcbb2ff4b2a84dd065d54dde90955a55a325a8d219acce69ec2f +DIST gn-0.1807.tar.xz 682644 BLAKE2B 5beb3c03b0ae467cb98eff2069ef6e4355cba56c57e2717139b698fa563efc404dd1cf0b3fd196f432ca3a13b0402e895b46407cb90bc16b63963710fd5be060 SHA512 82f468e389d08a46e582f816d056813af9bfc810ad0bd84f02731c17c0e2c6140a62e827b8a3c5f89eef467f9bcfc2e88dd7aed325a7955d8584e753fcd09103 diff --git a/dev-util/gn/files/gn-gen-r1.patch b/dev-util/gn/files/gn-gen-r1.patch deleted file mode 100644 index 77fdefcf222d..000000000000 --- a/dev-util/gn/files/gn-gen-r1.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/build/gen.py b/build/gen.py -index 76f88e84..5e088b2a 100755 ---- a/build/gen.py -+++ b/build/gen.py -@@ -326,9 +326,6 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot): - if options.debug: - cflags.extend(['-O0', '-g']) - else: -- cflags.append('-DNDEBUG') -- cflags.append('-O3') -- ldflags.append('-O3') - # Use -fdata-sections and -ffunction-sections to place each function - # or data item into its own section so --gc-sections can eliminate any - # unused functions and data items. -@@ -340,14 +337,6 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot): - # Garbage collection is done by default on aix. - ldflags.append('-Wl,--gc-sections') - -- # Omit all symbol information from the output file. -- if platform.is_darwin(): -- ldflags.append('-Wl,-S') -- elif platform.is_aix(): -- ldflags.append('-Wl,-s') -- else: -- ldflags.append('-Wl,-strip-all') -- - # Enable identical code-folding. - if options.use_icf: - ldflags.append('-Wl,--icf=all') -@@ -356,26 +345,17 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot): - '-D_FILE_OFFSET_BITS=64', - '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS', - '-pthread', -- '-pipe', - '-fno-exceptions', - '-fno-rtti', - ]) - cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing']) -+ ldflags.append('-pthread') - - if platform.is_linux(): - if linux_sysroot: - # Use the sid sysroot that UpdateLinuxSysroot() downloads. - cflags.append('--sysroot=' + linux_sysroot) - ldflags.append('--sysroot=' + linux_sysroot) -- ldflags.extend([ -- '-static-libstdc++', -- '-Wl,--as-needed', -- ]) -- libs.extend([ -- # These are needed by libc++. -- '-ldl', -- '-lpthread', -- ]) - elif platform.is_darwin(): - min_mac_version_flag = '-mmacosx-version-min=10.9' - cflags.append(min_mac_version_flag) diff --git a/dev-util/gn/gn-0.1463.ebuild b/dev-util/gn/gn-0.1807.ebuild similarity index 60% rename from dev-util/gn/gn-0.1463.ebuild rename to dev-util/gn/gn-0.1807.ebuild index 6ef882d71205..8386494e22c4 100644 --- a/dev-util/gn/gn-0.1463.ebuild +++ b/dev-util/gn/gn-0.1807.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 2018-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit ninja-utils python-any-r1 toolchain-funcs DESCRIPTION="GN is a meta-build system that generates build files for Ninja" HOMEPAGE="https://gn.googlesource.com/" -SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz" +SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="vim-syntax" BDEPEND=" ${PYTHON_DEPS} @@ -20,7 +21,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/gn-gen-r1.patch + "${FILESDIR}"/gn-gen-r4.patch ) pkg_setup() { @@ -30,12 +31,14 @@ pkg_setup() { src_configure() { python_setup tc-export AR CC CXX - set -- ${EPYTHON} build/gen.py --no-sysroot --no-last-commit-position - echo "$@" + unset CFLAGS + set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip --no-static-libstdc++ + echo "$@" >&2 "$@" || die cat >out/last_commit_position.h <<-EOF || die #ifndef OUT_LAST_COMMIT_POSITION_H_ #define OUT_LAST_COMMIT_POSITION_H_ + #define LAST_COMMIT_POSITION_NUM ${PV##0.} #define LAST_COMMIT_POSITION "${PV}" #endif // OUT_LAST_COMMIT_POSITION_H_ EOF @@ -53,4 +56,9 @@ src_test() { src_install() { dobin out/gn einstalldocs + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles + doins -r misc/vim/{autoload,ftdetect,ftplugin,syntax} + fi } diff --git a/dev-util/gtk-doc/files/1.32-deprecation-parse-fixes.patch b/dev-util/gtk-doc/files/1.32-deprecation-parse-fixes.patch new file mode 100644 index 000000000000..59f878cceac4 --- /dev/null +++ b/dev-util/gtk-doc/files/1.32-deprecation-parse-fixes.patch @@ -0,0 +1,180 @@ +From 2667d8cd95a2a29c35c1bb8f4629c22fd0aa98e9 Mon Sep 17 00:00:00 2001 +From: Xavier Claessens +Date: Thu, 2 Jan 2020 21:56:10 -0500 +Subject: [PATCH 1/3] Skip G_GNUC_(BEGIN|END)_IGNORE_DEPRECATIONS lines + +For some reason, glib has to put empty line before and after each of +these lines otherwise the symbol following it is undeclared. +--- + gtkdoc/scan.py | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py +index d04d4d4..7de08ad 100644 +--- a/gtkdoc/scan.py ++++ b/gtkdoc/scan.py +@@ -561,6 +561,11 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options): + logging.info('Found start of comment: %s', line.strip()) + continue + ++ # Skip begin/end deprecation macros. ++ m = re.search(r'^\s*G_GNUC_(BEGIN|END)_IGNORE_DEPRECATIONS', line) ++ if m: ++ continue ++ + logging.info('no decl: %s', line.strip()) + + cm = [m.match(line) for m in CLINE_MATCHER] +-- +2.20.1 + + +From 9e58548688c9768cf41c59ccef531d438ffb2504 Mon Sep 17 00:00:00 2001 +From: Xavier Claessens +Date: Fri, 3 Jan 2020 06:47:47 -0500 +Subject: [PATCH 2/3] typedef can be followed by decorator + +--- + gtkdoc/scan.py | 30 +++++++++++++++++------------- + 1 file changed, 17 insertions(+), 13 deletions(-) + +diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py +index 7de08ad..5a5da92 100644 +--- a/gtkdoc/scan.py ++++ b/gtkdoc/scan.py +@@ -96,19 +96,8 @@ CLINE_MATCHER = [ + (struct|union)\s* + \w*\s*{""", re.VERBOSE), + # 12-14: OTHER TYPEDEFS +- re.compile( +- r"""^\s*typedef\s+ +- (?:struct|union)\s+\w+[\s\*]+ +- (\w+) # 1: name +- \s*;""", re.VERBOSE), +- re.compile( +- r"""^\s* +- (?:G_GNUC_EXTENSION\s+)? +- typedef\s+ +- (.+[\s\*]) # 1: e.g. 'unsigned int' +- (\w+) # 2: name +- (?:\s*\[[^\]]+\])* +- \s*;""", re.VERBOSE), ++ None, # in InitScanner() ++ None, # in InitScanner() + re.compile(r'^\s*typedef\s+'), + # 15: VARIABLES (extern'ed variables) + None, # in InitScanner() +@@ -267,6 +256,21 @@ def InitScanner(options): + %s # 3: optional decorator + \s*;""" % optional_decorators_regex, re.VERBOSE) + # OTHER TYPEDEFS ++ CLINE_MATCHER[12] = re.compile( ++ r"""^\s*typedef\s+ ++ (?:struct|union)\s+\w+[\s\*]+ ++ (\w+) # 1: name ++ %s # 2: optional decorator ++ \s*;""" % optional_decorators_regex, re.VERBOSE) ++ CLINE_MATCHER[13] = re.compile( ++ r"""^\s* ++ (?:G_GNUC_EXTENSION\s+)? ++ typedef\s+ ++ (.+?[\s\*]) # 1: e.g. 'unsigned int' ++ (\w+) # 2: name ++ (?:\s*\[[^\]]+\])* ++ %s # 3: optional decorator ++ \s*;""" % optional_decorators_regex, re.VERBOSE) + CLINE_MATCHER[15] = re.compile( + r"""^\s* + (?:extern|[A-Za-z_]+VAR%s)\s+ +-- +2.20.1 + + +From 5bfe23f0257e1b4c6c9a4e3a2dbb180455f753f2 Mon Sep 17 00:00:00 2001 +From: Jason Crain +Date: Mon, 6 Jan 2020 19:05:42 -0700 +Subject: [PATCH 3/3] scan: support deprecated struct members + +gcc allows deprecating members of structs. For example: + +struct data { + int x G_GNUC_DEPRECATED_FOR(replacement); +}; + +However, this currently causes the entire struct to be marked as +deprecated and confuses mkdb because it doesn't understand the +G_GNUC_DEPRECATED_FOR symbol. + +Fix this by having the whole struct only be marked as deprecated if the +'_DEPRECATED' is after the closing bracket of the struct, similar to how +it already does for enums, and having scan automatically remove all +G_GNUC_* decorators from struct members, similar to how it already does +for functions. +--- + gtkdoc/scan.py | 12 ++++++++++-- + tests/scan.py | 17 +++++++++++++++++ + 2 files changed, 27 insertions(+), 2 deletions(-) + +diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py +index 5a5da92..6c6534a 100644 +--- a/gtkdoc/scan.py ++++ b/gtkdoc/scan.py +@@ -538,7 +538,7 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options): + # section (#endif /* XXX_DEPRECATED */ + if deprecated_conditional_nest == 0 and '_DEPRECATED' in line: + m = re.search(r'^\s*#\s*(if*|define|endif)', line) +- if not (m or in_declaration == 'enum'): ++ if not (m or in_declaration == 'enum' or in_declaration == 'struct'): + logging.info('Found deprecation annotation (decl: "%s"): "%s"', + in_declaration, line.strip()) + deprecated_conditional_nest += 0.1 +@@ -953,9 +953,17 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options): + title = '%s' % objectname + + logging.info('Store struct: "%s"', symbol) ++ # Structs could contain deprecated members and that doesn't ++ # mean the whole struct is deprecated, so they are ignored when ++ # setting deprecated_conditional_nest above. Here we can check ++ # if the _DEPRECATED is between '}' and ';' which would mean ++ # the struct as a whole is deprecated. ++ if re.search(r'\n\s*\}.*_DEPRECATED.*;\s*$', decl): ++ deprecated = '\n' + if AddSymbolToList(slist, symbol): + structsym = in_declaration.upper() +- stripped_decl = re.sub('(%s)' % optional_decorators_regex, '', decl) ++ regex = r'(?:\s+(?:G_GNUC_\w+(?:\(\w*\))?%s))' % ignore_decorators ++ stripped_decl = re.sub(regex, '', decl) + decl_list.append('<%s>\n%s\n%s%s\n' % + (structsym, symbol, deprecated, stripped_decl, structsym)) + if symbol in forward_decls: +diff --git a/tests/scan.py b/tests/scan.py +index ad63541..6d608b6 100755 +--- a/tests/scan.py ++++ b/tests/scan.py +@@ -552,6 +552,23 @@ class ScanHeaderContentStructs(ScanHeaderContentTestCase): + slist, doc_comments = self.scanHeaderContent([header]) + self.assertDecl('data', expected, slist) + ++ def test_HandleDeprecatedMemberDecorator(self): ++ """Struct with deprecated members.""" ++ header = textwrap.dedent("""\ ++ struct data { ++ int x1 G_GNUC_DEPRECATED; ++ int x2 G_GNUC_DEPRECATED_FOR(replacement); ++ };""") ++ expected = textwrap.dedent("""\ ++ struct data { ++ int x1; ++ int x2; ++ };""") ++ scan.InitScanner(self.options) ++ slist, doc_comments = self.scanHeaderContent( ++ header.splitlines(keepends=True)) ++ self.assertDecl('data', expected, slist) ++ + + class ScanHeaderContentUnions(ScanHeaderContentTestCase): + """Test parsing of union declarations.""" +-- +2.20.1 + diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild new file mode 100644 index 000000000000..ce7456739f6d --- /dev/null +++ b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{6,7} ) + +inherit eutils elisp-common gnome2 python-single-r1 readme.gentoo-r1 + +DESCRIPTION="GTK+ Documentation Generator" +HOMEPAGE="https://www.gtk.org/gtk-doc/" + +LICENSE="GPL-2 FDL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" + +IUSE="debug doc emacs" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + >=dev-libs/glib-2.6:2 + dev-libs/libxslt + >=dev-libs/libxml2-2.3.6:2 + ~app-text/docbook-xml-dtd-4.3 + app-text/docbook-xsl-stylesheets + ~app-text/docbook-sgml-dtd-3.0 + >=app-text/docbook-dsssl-stylesheets-1.40 + emacs? ( >=app-editors/emacs-23.1:* ) + $(python_gen_cond_dep ' + dev-python/pygments[${PYTHON_MULTI_USEDEP}] + ') +" +DEPEND="${RDEPEND} + ~dev-util/gtk-doc-am-${PV} + dev-util/itstool + virtual/pkgconfig +" + +# tests require unpackaged python module "anytree", and require java(fop) or tex(dblatex) +RESTRICT="test" + +pkg_setup() { + DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs. + You may set your own key bindings for \"gtk-doc-insert\" and + \"gtk-doc-insert-section\" in your ~/.emacs file." + SITEFILE=61${PN}-gentoo.el + python-single-r1_pkg_setup +} + +src_prepare() { + # Remove global Emacs keybindings, bug #184588 + eapply "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch + # Fix dev-libs/glib[gtk-doc] doc generation tests by fixing stuff surrounding deprecations + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1488 + eapply "${FILESDIR}"/${PV}-deprecation-parse-fixes.patch + + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ + $(use_enable debug) +} + +src_compile() { + gnome2_src_compile + use emacs && elisp-compile tools/gtk-doc.el +} + +src_install() { + gnome2_src_install + + python_fix_shebang "${ED}"/usr/bin/gtkdoc-depscan + + # Don't install this file, it's in gtk-doc-am now + rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4" + + if use doc; then + docinto doc + dodoc doc/* + docinto examples + dodoc examples/* + fi + + if use emacs; then + elisp-install ${PN} tools/gtk-doc.el* + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + readme.gentoo_create_doc + fi +} + +pkg_postinst() { + gnome2_pkg_postinst + if use emacs; then + elisp-site-regen + readme.gentoo_print_elog + fi +} + +pkg_postrm() { + gnome2_pkg_postrm + use emacs && elisp-site-regen +} diff --git a/dev-util/lldb/lldb-10.0.0.ebuild b/dev-util/lldb/lldb-10.0.0.ebuild index ff7a7b7a2a93..bab3bed7e14b 100644 --- a/dev-util/lldb/lldb-10.0.0.ebuild +++ b/dev-util/lldb/lldb-10.0.0.ebuild @@ -15,7 +15,7 @@ llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~x86" +KEYWORDS="amd64 arm arm64 ~x86" IUSE="libedit lzma ncurses +python test" REQUIRED_USE=${PYTHON_REQUIRED_USE} RESTRICT="!test? ( test )" diff --git a/dev-util/ply/files/ply-2.1.1-arm-build-fix.patch b/dev-util/ply/files/ply-2.1.1-arm-build-fix.patch new file mode 100644 index 000000000000..0d12f7724e70 --- /dev/null +++ b/dev-util/ply/files/ply-2.1.1-arm-build-fix.patch @@ -0,0 +1,37 @@ +From 6f870ba1f4054674024cc3d3faf18d8b1e3676f6 Mon Sep 17 00:00:00 2001 +From: Jakov Smolic +Date: Fri, 17 Jul 2020 09:10:45 +0200 +Subject: [PATCH] Fix armv7a build crash +Bug: https://bugs.gentoo.org/732902 +Upstream: https://github.com/iovisor/ply/pull/60 + +Signed-off-by: Jakov Smolic +--- + src/libply/Makefile.am | 1 + + src/libply/arch/armv7a.c | 1 + + 2 files changed, 2 insertions(+) + create mode 120000 src/libply/arch/armv7a.c + +diff --git a/src/libply/Makefile.am b/src/libply/Makefile.am +index 3c83bb4..3a7c747 100644 +--- a/src/libply/Makefile.am ++++ b/src/libply/Makefile.am +@@ -10,6 +10,7 @@ AM_LFLAGS = --header-file=lexer.h + EXTRA_DIST = grammar.c grammar.h lexer.c lexer.h \ + arch/aarch64.c \ + arch/arm.c \ ++ arch/armv7a.c \ + arch/powerpc.c \ + arch/x86_64.c + +diff --git a/src/libply/arch/armv7a.c b/src/libply/arch/armv7a.c +new file mode 120000 +index 0000000..980a6a5 +--- /dev/null ++++ b/src/libply/arch/armv7a.c +@@ -0,0 +1 @@ ++arm.c +\ No newline at end of file +-- +2.26.2 + diff --git a/dev-util/ply/ply-2.1.1.ebuild b/dev-util/ply/ply-2.1.1.ebuild index b55b489d5d4c..fa013b2f6399 100644 --- a/dev-util/ply/ply-2.1.1.ebuild +++ b/dev-util/ply/ply-2.1.1.ebuild @@ -23,6 +23,7 @@ pkg_pretend() { src_prepare() { sed -i "/^AC_INIT/c\AC_INIT(${PN}, ${PV}," configure.ac || die + eapply "${FILESDIR}/${P}-arm-build-fix.patch" eapply_user eautoreconf } diff --git a/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r2.ebuild b/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r2.ebuild index 9debed761814..0dbd37d4f29c 100644 --- a/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r2.ebuild +++ b/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r2.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 inherit desktop qmake-utils DESCRIPTION="Crossplatform log viewer for Android, iOS and text files" HOMEPAGE="https://github.com/alopatindev/qdevicemonitor" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/alopatindev/${PN}" else @@ -21,10 +21,10 @@ SLOT="0" IUSE="" RDEPEND=" + app-pda/usbmuxd dev-qt/qtcore:5 dev-qt/qtgui:5 - dev-util/android-tools - app-pda/usbmuxd" + dev-util/android-tools" DEPEND="${RDEPEND}" PATCHES=( diff --git a/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild b/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild index c055bb2fca97..0dd22c27ff48 100644 --- a/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild +++ b/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit eutils qmake-utils +inherit desktop qmake-utils DESCRIPTION="Crossplatform log viewer for Android, iOS and text files" HOMEPAGE="https://github.com/alopatindev/qdevicemonitor" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/alopatindev/${PN}" else @@ -21,10 +21,10 @@ SLOT="0" IUSE="" RDEPEND=" + app-pda/usbmuxd dev-qt/qtcore:5 dev-qt/qtgui:5 - dev-util/android-tools - app-pda/usbmuxd" + dev-util/android-tools" DEPEND="${RDEPEND}" src_configure() { diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest index 79ef6af96a9e..ab7bde52c1b3 100644 --- a/dev-util/radare2/Manifest +++ b/dev-util/radare2/Manifest @@ -1 +1,2 @@ DIST radare2-4.4.0.tar.gz 8135544 BLAKE2B 1a1a4ce97dde4b8985cbe95bb889bfdef8f9d64e2c2257030fda523b1a1aced4e6681bc0f7b14d1a3f25fbce355f2062f0edc33ab396bef98792d29d1f708a11 SHA512 6208d97f8333e72dfd04cccdb0234b60fb8979ca559b92532bf7e47d402f91e0c54678a83e6bafee65666fb7d6008b44b961600f24f9b3275cb2eec32490eaa5 +DIST radare2-4.5.0.tar.gz 8265716 BLAKE2B 5288b393eb40f0f9355ad44a102a768924775ce11d126477d89a77d4dbb885556371125ea9f54ce81216bcef25387b816ab679b99a2e6c31c7f48db13ccc4774 SHA512 84d4ffc28f499f4360f57f31ad1b1f4b2a14e7fcbde7198bfb9ec4a85ac6606ceb5b28602624d6419b14b1586afd50330ace6232a183d7bfb876fefe07ea7bf4 diff --git a/dev-util/radare2/radare2-4.5.0.ebuild b/dev-util/radare2/radare2-4.5.0.ebuild new file mode 100644 index 000000000000..302e356bc8b9 --- /dev/null +++ b/dev-util/radare2/radare2-4.5.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 eutils toolchain-funcs + +DESCRIPTION="unix-like reverse engineering framework and commandline tools" +HOMEPAGE="http://www.radare.org" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/radareorg/radare2" +else + SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="ssl libressl" + +RDEPEND=" + dev-libs/capstone:0= + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_configure() { + # Ideally these should be set by ./configure + tc-export CC AR LD OBJCOPY RANLIB + export HOST_CC=${CC} + + econf \ + --without-libuv \ + --with-syscapstone \ + $(use_with ssl openssl) +} + +src_install() { + default + + insinto /usr/share/zsh/site-functions + doins doc/zsh/_* + + newbashcomp doc/bash_autocompletion.sh "${PN}" + bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2 + + # a workaround for unstable $(INSTALL) call, bug #574866 + local d + for d in doc/*; do + if [[ -d $d ]]; then + rm -rfv "$d" || die "failed to delete '$d'" + fi + done +} diff --git a/dev-util/ragel/ragel-7.0.0.10-r2.ebuild b/dev-util/ragel/ragel-7.0.0.10-r2.ebuild index 087706d7aa9e..d7a07ab4ac11 100644 --- a/dev-util/ragel/ragel-7.0.0.10-r2.ebuild +++ b/dev-util/ragel/ragel-7.0.0.10-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 arm arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 arm arm64 ~ia64 x86 ~amd64-linux ~x86-linux" IUSE="vim-syntax" DEPEND="~dev-util/colm-0.13.0.5" diff --git a/dev-util/source-highlight/source-highlight-3.1.9.ebuild b/dev-util/source-highlight/source-highlight-3.1.9.ebuild index 205374a14a52..cbf7b16e377f 100644 --- a/dev-util/source-highlight/source-highlight-3.1.9.ebuild +++ b/dev-util/source-highlight/source-highlight-3.1.9.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document" HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html" SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz" LICENSE="GPL-3" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" SLOT="0" IUSE="doc static-libs" diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index abe0686a0e41..cb82929fa87d 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass index ab886d28faf0..982cf7b08b4d 100644 --- a/eclass/kernel-install.eclass +++ b/eclass/kernel-install.eclass @@ -49,7 +49,7 @@ SRC_URI+=" https://dev.gentoo.org/~mgorny/dist/tinycorelinux-${TCL_VER}-amd64.qcow2 ) x86? ( - https://dev.gentoo.org/~mgorny/dist/tinycorelinux-${TCL_VER}-x86.qcow2 + https://dev.gentoo.org/~mgorny/dist/tinycorelinux-${TCL_VER}-x86.qcow2 ) )" @@ -231,6 +231,7 @@ kernel-install_test() { cat > run.sh <<-EOF || die #!/bin/sh exec qemu-system-${qemu_arch} \ + -cpu max \ -m 256M \ -display none \ -no-reboot \ diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz index 1649e0c2543f..3ea900c0d67b 100644 Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest index 6b9d796adb21..08b8c1c89d4f 100644 --- a/games-action/teeworlds/Manifest +++ b/games-action/teeworlds/Manifest @@ -1,4 +1,3 @@ -DIST teeworlds-0.6.4-src.tar.gz 8771622 BLAKE2B 14493fcad458b0e1c749e40bdd6a5a858704bf971d53d11782d52fbe9b5fe2a09235dcac25340e51a3330001d46ee512f2971e8db06eb9f51eec5e6b3cd2a328 SHA512 7546ee358a2126339f6c727bb7b5f49009a8fad0b5e77a796202cba4d8fc5dfcaf79b7e65151d85fead2a70ad61ef3e1888b8c07fe0206f87575d5dd8c9f91ce DIST teeworlds-0.7.5-maps.tar.gz 151689 BLAKE2B f8ffbb6a024755bb972955a8c7d277709e17021c0554be0e2803e8c1b4848f5dca6d91b9f7f4e0731766745878c1143d27be3fa8aede01ff9cc69ac557ca70a8 SHA512 74084e169c1870cd541f5bb719c209210227055d304b3ce22fbad3d32d24b3356fbdec8d948edf3aa582270a8b0db7dec41e4924401f8398f7d5feba5ded49b3 DIST teeworlds-0.7.5-translation.tar.gz 169121 BLAKE2B 1c649392385abf8e00d8c9e64ca7eaaa5af5848878566081cda83c7d78c417652137e7285d16038f302a6fdf94eb3993c506886d4cc1359694d534c7be5ea925 SHA512 41c69cd9e9290857b44be18f89ab9f3a7ccd6804757332966b973aec3a9e6fd5a40d323696a044a724228b2bb67b097311fa8c24fdec226eecb7a27c2da559dc DIST teeworlds-0.7.5.tar.gz 8654985 BLAKE2B ebeb9aa1119950e4d78d8c0d6c7be5711894c3212755a6db3b8b8c1f1803dba1e0d2e1a0e294e1a1fffe84a28beab8fac0e55fa0e94c68ed97e8764ac3b742d3 SHA512 673410a5fb5e488229ddc4ea4a1ac9cd8143a6e9499bde9f5535d7f0be5b6c85163065da9580c3de0d240f1cad63e0bc12c10caf1d893c324edb301bc150653b diff --git a/games-action/teeworlds/files/0.6/01-use-system-wavpack.patch b/games-action/teeworlds/files/0.6/01-use-system-wavpack.patch deleted file mode 100644 index 4a11a866511d..000000000000 --- a/games-action/teeworlds/files/0.6/01-use-system-wavpack.patch +++ /dev/null @@ -1,101 +0,0 @@ -commit 7202b142891ee10771af9f1f3063664d75a38bbc -Author: hasufell -Date: Thu Sep 5 12:28:30 2013 +0200 - - Use system wavpack. Based on patch from Gentoo Bugzilla - - From: Azamat H. Hackimov - - https://bugs.gentoo.org/show_bug.cgi?id=363395 - -diff --git a/bam.lua b/bam.lua -index 11ac7b9..35c1d8d 100644 ---- a/bam.lua -+++ b/bam.lua -@@ -11,6 +11,7 @@ config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-p - config:Add(OptTestCompileC("minmacosxsdk", "int main(){return 0;}", "-mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk")) - config:Add(OptTestCompileC("macosxppc", "int main(){return 0;}", "-arch ppc")) - config:Add(OptLibrary("zlib", "zlib.h", false)) -+config:Add(OptLibrary("wavpack", "wavpack/wavpack.h", false)) - config:Add(SDL.OptFind("sdl", true)) - config:Add(FreeType.OptFind("freetype", true)) - config:Finalize("config.lua") -@@ -187,7 +188,7 @@ function build(settings) - end - - -- compile zlib if needed -- if config.zlib.value == 1 then -+ if config.zlib.value == true then - settings.link.libs:Add("z") - if config.zlib.include_path then - settings.cc.includes:Add(config.zlib.include_path) -@@ -198,8 +199,18 @@ function build(settings) - settings.cc.includes:Add("src/engine/external/zlib") - end - -+ if config.wavpack.value == true then -+ settings.link.libs:Add("wavpack") -+ if config.wavpack.include_path then -+ settings.cc.includes:Add(config.wavpack.include_path) -+ end -+ wavpack = {} -+ else -+ wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c")) -+ settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder -+ end -+ - -- build the small libraries -- wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c")) - pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c")) - - -- build game components -diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp -index 343fa2e..e32cac9 100644 ---- a/src/engine/client/sound.cpp -+++ b/src/engine/client/sound.cpp -@@ -13,7 +13,7 @@ - #include "sound.h" - - extern "C" { // wavpack -- #include -+ #include - } - #include - -@@ -351,19 +351,25 @@ int CSound::LoadWV(const char *pFilename) - if(!m_pStorage) - return -1; - -+ #ifndef WAVPACK_H - ms_File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL); - if(!ms_File) - { - dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename); - return -1; - } -+ #endif - - SampleID = AllocID(); - if(SampleID < 0) - return -1; - pSample = &m_aSamples[SampleID]; - -+ #ifndef WAVPACK_H - pContext = WavpackOpenFileInput(ReadData, aError); -+ #else -+ pContext = WavpackOpenFileInput(pFilename, aError, 0, 0); -+ #endif - if (pContext) - { - int m_aSamples = WavpackGetNumSamples(pContext); -@@ -419,8 +425,10 @@ int CSound::LoadWV(const char *pFilename) - dbg_msg("sound/wv", "failed to open %s: %s", pFilename, aError); - } - -+ #ifndef WAVPACK_H - io_close(ms_File); - ms_File = NULL; -+ #endif - - if(g_Config.m_Debug) - dbg_msg("sound/wv", "loaded %s", pFilename); diff --git a/games-action/teeworlds/files/0.6/02-fixed-wavpack-sound-loading.patch b/games-action/teeworlds/files/0.6/02-fixed-wavpack-sound-loading.patch deleted file mode 100644 index e207a4a354bf..000000000000 --- a/games-action/teeworlds/files/0.6/02-fixed-wavpack-sound-loading.patch +++ /dev/null @@ -1,109 +0,0 @@ -commit b96981f5f23b4269108afb465f29a23abbd32ae2 -Author: hasufell -Date: Thu Sep 5 12:31:19 2013 +0200 - - Fixing wavpack sound loading. Based on Gentoo Bugzilla - - From: Azamat H. Hackimov - - https://bugs.gentoo.org/show_bug.cgi?id=363395 - -diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp -index e32cac9..2a4c653 100644 ---- a/src/engine/client/sound.cpp -+++ b/src/engine/client/sound.cpp -@@ -51,6 +51,55 @@ struct CVoice - int m_X, m_Y; - } ; - -+#ifdef WAVPACK_H -+static int32_t ReadBytes(void *pFile, void *pBuffer, int32_t Size) -+{ -+ return (int32_t)io_read((IOHANDLE)pFile, pBuffer, Size); -+} -+static uint32_t GetPos(void *pFile) -+{ -+ return (uint32_t)io_tell((IOHANDLE)pFile); -+} -+static int SetPosAbs(void *pFile, uint32_t Offset) -+{ -+ return io_seek((IOHANDLE)pFile, Offset, IOSEEK_START); -+} -+static int SetPosRel(void *pFile, int32_t Offset, int Mode) -+{ -+ switch(Mode) -+ { -+ case SEEK_SET: -+ Mode = IOSEEK_START; -+ break; -+ case SEEK_CUR: -+ Mode = IOSEEK_CUR; -+ break; -+ case SEEK_END: -+ Mode = IOSEEK_END; -+ } -+ return io_seek((IOHANDLE)pFile, Offset, Mode); -+} -+ -+//TODO: Fix if 'real' functionality is needed by the wavpack header -+static int PushBackByte(void *pFile, int Char) -+{ -+ return io_seek((IOHANDLE)pFile, -1, IOSEEK_CUR); -+} -+static uint32_t GetLength(void *pFile) -+{ -+ return (uint32_t)io_length((IOHANDLE)pFile); -+} -+// Essentially assuming this to always be true, should fix if this isn't the case -+static int CanSeek(void *pFile) -+{ -+ return pFile != NULL; -+} -+static WavpackStreamReader CWavpackReader = { -+ ReadBytes, GetPos, SetPosAbs, SetPosRel, PushBackByte, GetLength, CanSeek, 0 -+}; -+#endif -+ -+ - static CSample m_aSamples[NUM_SAMPLES] = { {0} }; - static CVoice m_aVoices[NUM_VOICES] = { {0} }; - static CChannel m_aChannels[NUM_CHANNELS] = { {255, 0} }; -@@ -351,14 +400,12 @@ int CSound::LoadWV(const char *pFilename) - if(!m_pStorage) - return -1; - -- #ifndef WAVPACK_H - ms_File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL); - if(!ms_File) - { - dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename); - return -1; - } -- #endif - - SampleID = AllocID(); - if(SampleID < 0) -@@ -368,7 +415,7 @@ int CSound::LoadWV(const char *pFilename) - #ifndef WAVPACK_H - pContext = WavpackOpenFileInput(ReadData, aError); - #else -- pContext = WavpackOpenFileInput(pFilename, aError, 0, 0); -+ pContext = WavpackOpenFileInputEx(&CWavpackReader, ms_File, 0, aError, 0, 0); - #endif - if (pContext) - { -@@ -422,13 +469,11 @@ int CSound::LoadWV(const char *pFilename) - } - else - { -- dbg_msg("sound/wv", "failed to open %s: %s", pFilename, aError); -+ dbg_msg("sound/wv", "failed to open '%s': %s", pFilename, aError); - } - -- #ifndef WAVPACK_H - io_close(ms_File); - ms_File = NULL; -- #endif - - if(g_Config.m_Debug) - dbg_msg("sound/wv", "loaded %s", pFilename); diff --git a/games-action/teeworlds/files/0.6/03-use-system-pnglite.patch b/games-action/teeworlds/files/0.6/03-use-system-pnglite.patch deleted file mode 100644 index 81c3d915316b..000000000000 --- a/games-action/teeworlds/files/0.6/03-use-system-pnglite.patch +++ /dev/null @@ -1,160 +0,0 @@ -commit 291a375000ac8d9cd5548a863ea6b49c46cfb1bb -Author: hasufell -Date: Thu Sep 5 12:36:53 2013 +0200 - - Use system pnglite. Based on Gentoo Bugzilla - - From: Azamat H. Hackimov - - https://bugs.gentoo.org/show_bug.cgi?id=363395 - -diff --git a/bam.lua b/bam.lua -index 35c1d8d..7902a2c 100644 ---- a/bam.lua -+++ b/bam.lua -@@ -11,6 +11,7 @@ config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-p - config:Add(OptTestCompileC("minmacosxsdk", "int main(){return 0;}", "-mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk")) - config:Add(OptTestCompileC("macosxppc", "int main(){return 0;}", "-arch ppc")) - config:Add(OptLibrary("zlib", "zlib.h", false)) -+config:Add(OptLibrary("pnglite", "pnglite.h", false)) - config:Add(OptLibrary("wavpack", "wavpack/wavpack.h", false)) - config:Add(SDL.OptFind("sdl", true)) - config:Add(FreeType.OptFind("freetype", true)) -@@ -199,26 +200,34 @@ function build(settings) - settings.cc.includes:Add("src/engine/external/zlib") - end - -+ -- build game components -+ engine_settings = settings:Copy() -+ server_settings = engine_settings:Copy() -+ client_settings = engine_settings:Copy() -+ launcher_settings = engine_settings:Copy() -+ -+ if config.pnglite.value == true then -+ client_settings.link.libs:Add("pnglite") -+ if config.pnglite.include_path then -+ client_settings.cc.includes:Add(config.pnglite.include_path) -+ end -+ pnglite = {} -+ else -+ pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c")) -+ client_settings.cc.includes:Add("src/engine/external/pnglite") -+ end -+ - if config.wavpack.value == true then -- settings.link.libs:Add("wavpack") -+ client_settings.link.libs:Add("wavpack") - if config.wavpack.include_path then -- settings.cc.includes:Add(config.wavpack.include_path) -+ client_settings.cc.includes:Add(config.wavpack.include_path) - end - wavpack = {} - else - wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c")) -- settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder -+ client_settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder - end - -- -- build the small libraries -- pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c")) -- -- -- build game components -- engine_settings = settings:Copy() -- server_settings = engine_settings:Copy() -- client_settings = engine_settings:Copy() -- launcher_settings = engine_settings:Copy() -- - if family == "unix" then - if platform == "macosx" then - client_settings.link.frameworks:Add("OpenGL") -diff --git a/src/engine/client/graphics.cpp b/src/engine/client/graphics.cpp -index 2e8a855..97e4fd7 100644 ---- a/src/engine/client/graphics.cpp -+++ b/src/engine/client/graphics.cpp -@@ -9,7 +9,7 @@ - #include "SDL_opengl.h" - - #include --#include -+#include - - #include - #include -diff --git a/src/engine/client/graphics_threaded.cpp b/src/engine/client/graphics_threaded.cpp -index e34b725..60246d1 100644 ---- a/src/engine/client/graphics_threaded.cpp -+++ b/src/engine/client/graphics_threaded.cpp -@@ -6,7 +6,7 @@ - #include - - #include --#include -+#include - - #include - #include -diff --git a/src/tools/dilate.cpp b/src/tools/dilate.cpp -index 55094a5..42a5b83 100644 ---- a/src/tools/dilate.cpp -+++ b/src/tools/dilate.cpp -@@ -2,7 +2,7 @@ - /* If you are missing that file, acquire a complete release at teeworlds.com. */ - #include - #include --#include -+#include - - typedef struct - { -diff --git a/src/tools/tileset_borderadd.cpp b/src/tools/tileset_borderadd.cpp -index 25e2fa5..88f760a 100644 ---- a/src/tools/tileset_borderadd.cpp -+++ b/src/tools/tileset_borderadd.cpp -@@ -2,7 +2,7 @@ - /* If you are missing that file, acquire a complete release at teeworlds.com. */ - #include - #include --#include -+#include - - typedef struct - { -diff --git a/src/tools/tileset_borderfix.cpp b/src/tools/tileset_borderfix.cpp -index 0facb9a..ab36292 100644 ---- a/src/tools/tileset_borderfix.cpp -+++ b/src/tools/tileset_borderfix.cpp -@@ -1,7 +1,7 @@ - /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */ - /* If you are missing that file, acquire a complete release at teeworlds.com. */ - #include --#include -+#include - - typedef struct - { -diff --git a/src/tools/tileset_borderrem.cpp b/src/tools/tileset_borderrem.cpp -index d604ecb..8673e41 100644 ---- a/src/tools/tileset_borderrem.cpp -+++ b/src/tools/tileset_borderrem.cpp -@@ -2,7 +2,7 @@ - /* If you are missing that file, acquire a complete release at teeworlds.com. */ - #include - #include --#include -+#include - - typedef struct - { -diff --git a/src/tools/tileset_borderset.cpp b/src/tools/tileset_borderset.cpp -index 8b3e299..c762ee2 100644 ---- a/src/tools/tileset_borderset.cpp -+++ b/src/tools/tileset_borderset.cpp -@@ -2,7 +2,7 @@ - /* If you are missing that file, acquire a complete release at teeworlds.com. */ - #include - #include --#include -+#include - - typedef struct - { diff --git a/games-action/teeworlds/files/0.6/04-dedicated.patch b/games-action/teeworlds/files/0.6/04-dedicated.patch deleted file mode 100644 index fc61b71283b6..000000000000 --- a/games-action/teeworlds/files/0.6/04-dedicated.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: Julian Ospald -Date: Sun Sep 8 11:05:26 UTC 2013 -Subject: fix DATADIR detection for minimal setups - ---- a/src/engine/shared/storage.cpp -+++ b/src/engine/shared/storage.cpp -@@ -208,7 +208,7 @@ - for (i = 0; i < DirsCount; i++) - { - char aBuf[128]; -- str_format(aBuf, sizeof(aBuf), "%s/mapres", aDirs[i]); -+ str_format(aBuf, sizeof(aBuf), "%s/maps", aDirs[i]); - if(fs_is_dir(aBuf)) - { - str_copy(m_aDatadir, aDirs[i], sizeof(m_aDatadir)); diff --git a/games-action/teeworlds/files/0.6/05-cc-cflags.patch b/games-action/teeworlds/files/0.6/05-cc-cflags.patch deleted file mode 100644 index dec6b8d306fc..000000000000 --- a/games-action/teeworlds/files/0.6/05-cc-cflags.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Julian Ospald -Date: Sun Sep 8 12:25:19 UTC 2013 -Subject: respect our gentoo settings - - this has to be at this place or later - otherwise some of our settings would be overwritten - ---- a/bam.lua -+++ b/bam.lua -@@ -168,6 +168,8 @@ - -- set some platform specific settings - settings.cc.includes:Add("src") - -+ dofile("gentoo.lua") addSettings(settings) -+ - if family == "unix" then - if platform == "macosx" then - settings.link.frameworks:Add("Carbon") diff --git a/games-action/teeworlds/teeworlds-0.6.4.ebuild b/games-action/teeworlds/teeworlds-0.6.4.ebuild deleted file mode 100644 index e0a278459205..000000000000 --- a/games-action/teeworlds/teeworlds-0.6.4.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -inherit eutils multiprocessing python-any-r1 toolchain-funcs versionator - -REVISION="b177-rff25472" - -DESCRIPTION="Online multi-player platform 2D shooter" -HOMEPAGE="https://www.teeworlds.com/" -SRC_URI="https://downloads.teeworlds.com/${P}-src.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug dedicated" - -RDEPEND=" - !dedicated? ( - app-arch/bzip2 - media-libs/freetype - media-libs/libsdl[X,sound,opengl,video] - media-libs/pnglite - media-sound/wavpack - virtual/glu - virtual/opengl - x11-libs/libX11 ) - sys-libs/zlib" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - ~dev-util/bam-0.4.0" - -S=${WORKDIR}/${P}-src -MY_PV=$(get_version_component_range 1-2) - -PATCHES=( - "${FILESDIR}/${MY_PV}/01-use-system-wavpack.patch" - "${FILESDIR}/${MY_PV}/02-fixed-wavpack-sound-loading.patch" - "${FILESDIR}/${MY_PV}/03-use-system-pnglite.patch" - "${FILESDIR}/${MY_PV}/04-dedicated.patch" - "${FILESDIR}/${MY_PV}/05-cc-cflags.patch" -) - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - default - - rm -r src/engine/external/* || die - - cat <<- __EOF__ > "${S}/gentoo.lua" - function addSettings(settings) - print("Adding Gentoo settings") - settings.optimize = 0 - settings.cc.exe_c = "$(tc-getCC)" - settings.cc.exe_cxx = "$(tc-getCXX)" - settings.cc.flags_c:Add("${CFLAGS}") - settings.cc.flags_cxx:Add("${CXXFLAGS}") - settings.link.exe = "$(tc-getCXX)" - settings.link.flags:Add("${LDFLAGS}") - end - __EOF__ -} - -src_configure() { - bam -v config || die -} - -src_compile() { - local myopt - - if use debug; then - myopt=" server_debug" - else - myopt=" server_release" - fi - if ! use dedicated; then - if use debug; then - myopt+=" client_debug" - else - myopt+=" client_release" - fi - fi - - bam -v -a -j $(makeopts_jobs) ${myopt} || die -} - -src_install() { - if use debug; then - newbin ${PN}_srv_d ${PN}_srv - else - dobin ${PN}_srv - fi - if ! use dedicated; then - if use debug; then - newbin ${PN}_d ${PN} - else - dobin ${PN} - fi - - doicon "${FILESDIR}"/${PN}.xpm - make_desktop_entry ${PN} Teeworlds - - insinto /usr/share/${PN}/data - doins -r data/* - else - insinto /usr/share/${PN}/data/maps - doins -r data/maps/* - fi - newinitd "${FILESDIR}"/${PN}-init.d ${PN} - insinto "/etc/${PN}" - doins "${FILESDIR}"/teeworlds_srv.cfg - - dodoc readme.txt -} diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz index dd7d6f58366d..8faf846bf5d3 100644 Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ diff --git a/games-board/gnono/Manifest b/games-board/gnono/Manifest deleted file mode 100644 index 70ad282a20cd..000000000000 --- a/games-board/gnono/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnono-1.9.1.tar.bz2 421461 BLAKE2B a4beb3c8382266e13b650b53de11fee4954b70d7bb0180b95e9ca3ead445bb18b8b541fa2973ab6d06e0c68d7f13149c0e4eadb378ccb94e9fa01cdaf139e1be SHA512 de67453cab0177d633b674ab2cf99b606373dc01e6d821478e8aa6adf9f0f40b04538e5d564df990739a62fb47225f83eff13ab6c12af26fe05afba309632d62 diff --git a/games-board/gnono/files/gnono-1.9.1-gentoo.patch b/games-board/gnono/files/gnono-1.9.1-gentoo.patch deleted file mode 100644 index 68378b9d461c..000000000000 --- a/games-board/gnono/files/gnono-1.9.1-gentoo.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ru gnono-1.9.1.orig/pixmaps/Makefile.am gnono-1.9.1/pixmaps/Makefile.am ---- gnono-1.9.1.orig/pixmaps/Makefile.am 2006-12-15 01:18:18.000000000 -0500 -+++ gnono-1.9.1/pixmaps/Makefile.am 2009-11-03 00:21:57.186128499 -0500 -@@ -1,9 +1,9 @@ - ## Process this file with automake to produce Makefile.in - --pixmapdir = $(datadir)/pixmaps -+pixmapdir = $(pkgdatadir)/pixmaps - pixmap_DATA = gnono-about.png - --hicolordir = $(datadir)/icons/hicolor -+hicolordir = /usr/share/icons/hicolor - - install-data-local: - @for depth in 16x16 22x22 24x24 32x32 48x48 ; do \ -diff -ru gnono-1.9.1.orig/po/Makefile.in.in gnono-1.9.1/po/Makefile.in.in ---- gnono-1.9.1.orig/po/Makefile.in.in 2007-02-18 00:58:11.000000000 -0500 -+++ gnono-1.9.1/po/Makefile.in.in 2009-11-03 00:21:57.187135081 -0500 -@@ -34,7 +34,7 @@ - datarootdir = @datarootdir@ - libdir = @libdir@ - DATADIRNAME = @DATADIRNAME@ --itlocaledir = $(prefix)/$(DATADIRNAME)/locale -+itlocaledir = /usr/share/locale - subdir = po - install_sh = @install_sh@ - # Automake >= 1.8 provides @mkdir_p@. -diff -ru gnono-1.9.1.orig/src/Makefile.am gnono-1.9.1/src/Makefile.am ---- gnono-1.9.1.orig/src/Makefile.am 2007-01-02 00:42:42.000000000 -0500 -+++ gnono-1.9.1/src/Makefile.am 2009-11-03 00:22:15.086296528 -0500 -@@ -3,12 +3,10 @@ - SUBDIRS = xpm - - INCLUDES = \ -- -Wall -Werror \ -+ -Wall \ - -DG_LOG_DOMAIN=\"$(PACKAGE)\" \ -- -DG_DISABLE_DEPRECATED \ -- -DGTK_DISABLE_DEPRECATED \ -- -DLOCALEDIR="\"$(datadir)/locale\"" \ -- -DPIXMAPDIR="\"$(datadir)/pixmaps\"" \ -+ -DLOCALEDIR="\"/usr/share/locale\"" \ -+ -DPIXMAPDIR="\"$(pkgdatadir)/pixmaps\"" \ - $(LIBGNOMEUI_CFLAGS) - - bin_PROGRAMS = gnono diff --git a/games-board/gnono/files/gnono-1.9.1-glib-single-include.patch b/games-board/gnono/files/gnono-1.9.1-glib-single-include.patch deleted file mode 100644 index edf5238c1475..000000000000 --- a/games-board/gnono/files/gnono-1.9.1-glib-single-include.patch +++ /dev/null @@ -1,151 +0,0 @@ -Index: gnono-1.9.1/src/ai.c -=================================================================== ---- gnono-1.9.1.orig/src/ai.c -+++ gnono-1.9.1/src/ai.c -@@ -24,9 +24,7 @@ - #include - #endif - --#include --#include --#include -+#include - - #include "cards.h" - #include "game.h" -Index: gnono-1.9.1/src/ai.h -=================================================================== ---- gnono-1.9.1.orig/src/ai.h -+++ gnono-1.9.1/src/ai.h -@@ -23,7 +23,7 @@ - #ifndef __GN_AI_H__ - #define __GN_AI_H__ - --#include -+#include - - void computer_play (gboolean pickup); - -Index: gnono-1.9.1/src/cards.c -=================================================================== ---- gnono-1.9.1.orig/src/cards.c -+++ gnono-1.9.1/src/cards.c -@@ -25,9 +25,7 @@ - #endif - - #include /* for rand() */ --#include --#include --#include -+#include - #include - - #include "cards.h" -Index: gnono-1.9.1/src/cards.h -=================================================================== ---- gnono-1.9.1.orig/src/cards.h -+++ gnono-1.9.1/src/cards.h -@@ -23,7 +23,7 @@ - #ifndef __GN_CARDS_H__ - #define __GN_CARDS_H__ - --#include -+#include - #include - - static const gdouble GN_CARD_HEIGHT = 98.0; -Index: gnono-1.9.1/src/game.c -=================================================================== ---- gnono-1.9.1.orig/src/game.c -+++ gnono-1.9.1/src/game.c -@@ -24,9 +24,7 @@ - #include - #endif - --#include --#include --#include -+#include - #include - #include - -Index: gnono-1.9.1/src/game.h -=================================================================== ---- gnono-1.9.1.orig/src/game.h -+++ gnono-1.9.1/src/game.h -@@ -23,7 +23,7 @@ - #ifndef __GN_GAME_H__ - #define __GN_GAME_H__ - --#include -+#include - - /*#define GN_DEBUG*/ - -Index: gnono-1.9.1/src/interface.h -=================================================================== ---- gnono-1.9.1.orig/src/interface.h -+++ gnono-1.9.1/src/interface.h -@@ -23,7 +23,7 @@ - #ifndef __GN_INTERFACE_H__ - #define __GN_INTERFACE_H__ - --#include -+#include - #include - #include - -Index: gnono-1.9.1/src/main.c -=================================================================== ---- gnono-1.9.1.orig/src/main.c -+++ gnono-1.9.1/src/main.c -@@ -26,7 +26,7 @@ - - #include - #include --#include -+#include - #include - - #include "interface.h" -Index: gnono-1.9.1/src/players.c -=================================================================== ---- gnono-1.9.1.orig/src/players.c -+++ gnono-1.9.1/src/players.c -@@ -24,8 +24,7 @@ - #include - #endif - --#include --#include -+#include - #include - #include - #include -Index: gnono-1.9.1/src/players.h -=================================================================== ---- gnono-1.9.1.orig/src/players.h -+++ gnono-1.9.1/src/players.h -@@ -23,8 +23,7 @@ - #ifndef __GN_PLAYERS_H__ - #define __GN_PLAYERS_H__ - --#include --#include -+#include - - #include "cards.h" - -Index: gnono-1.9.1/src/preferences.h -=================================================================== ---- gnono-1.9.1.orig/src/preferences.h -+++ gnono-1.9.1/src/preferences.h -@@ -23,7 +23,7 @@ - #ifndef __GN_PREFERENCES_H__ - #define __GN_PREFERENCES_H__ - --#include -+#include - #include - - void dlg_preferences (GtkWidget *caller, gpointer data); diff --git a/games-board/gnono/gnono-1.9.1-r1.ebuild b/games-board/gnono/gnono-1.9.1-r1.ebuild deleted file mode 100644 index 9d5ede968dd4..000000000000 --- a/games-board/gnono/gnono-1.9.1-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils gnome2-utils - -DESCRIPTION="A rewrite for GNOME of the Windows card game WUNO" -HOMEPAGE="https://sourceforge.net/projects/gnono/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="gnome-base/libgnomeui - virtual/libintl" -DEPEND="${RDEPEND} - sys-devel/gettext" - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-glib-single-include.patch -) - -src_prepare() { - default - - eautoreconf -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-board/gnono/metadata.xml b/games-board/gnono/metadata.xml deleted file mode 100644 index 53a5689a737a..000000000000 --- a/games-board/gnono/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - - gnono - - diff --git a/games-board/mt_gtk_client/Manifest b/games-board/mt_gtk_client/Manifest deleted file mode 100644 index a79b9427e021..000000000000 --- a/games-board/mt_gtk_client/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mt_gtk_client-0.1.98.tar.bz2 181458 BLAKE2B 9ceff8a2a2b691226e28c2246500d1a93234047870ac5dfcadfb651c26c17b5aa002e0157450769ab2d5304aa3aa28793fdf4dd5d61214c2365e53086be95f7f SHA512 8d43baf29a100b37db0f4f8b3f417c8253b6c243b7ead18efefbc3706361fbc652abf808c0b104dec5573a769eaa2d84903ad0ab602c738c139c86b8c36bf401 diff --git a/games-board/mt_gtk_client/files/mt_gtk_client-0.1.98-formatsecurity.patch b/games-board/mt_gtk_client/files/mt_gtk_client-0.1.98-formatsecurity.patch deleted file mode 100644 index edf33585b810..000000000000 --- a/games-board/mt_gtk_client/files/mt_gtk_client-0.1.98-formatsecurity.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/player.c 2015-10-14 21:52:59.453971198 +0200 -+++ b/src/player.c 2015-10-14 21:53:36.375289009 +0200 -@@ -52,7 +52,7 @@ - { - player->nick[0] = g_string_new (config->gui_player_name->str); - -- g_printerr (player->nick[0]->str); -+ g_printerr ("%s", player->nick[0]->str); - - gdk_threads_enter (); - gtk_statusbar_push (GTK_STATUSBAR (gui_statusbar), 0, diff --git a/games-board/mt_gtk_client/metadata.xml b/games-board/mt_gtk_client/metadata.xml deleted file mode 100644 index 78274e0fa550..000000000000 --- a/games-board/mt_gtk_client/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - diff --git a/games-board/mt_gtk_client/mt_gtk_client-0.1.98-r1.ebuild b/games-board/mt_gtk_client/mt_gtk_client-0.1.98-r1.ebuild deleted file mode 100644 index dabed363ec41..000000000000 --- a/games-board/mt_gtk_client/mt_gtk_client-0.1.98-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="client for the french tarot game maitretarot" -HOMEPAGE="http://www.nongnu.org/maitretarot/" -SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gnome" - -DEPEND="dev-libs/glib:2 - dev-libs/libxml2 - dev-games/libmaitretarot - dev-games/libmt_client - gnome-base/libgnomeui - x11-libs/gtk+:2" -RDEPEND="${DEPEND} - dev-games/cardpics" - -PATCHES=( - "${FILESDIR}"/${P}-formatsecurity.patch -) - -src_configure() { - econf $(use_enable gnome gnome2) -} diff --git a/games-board/sirius/Manifest b/games-board/sirius/Manifest deleted file mode 100644 index a75b1b55cdda..000000000000 --- a/games-board/sirius/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sirius-0.8.0.tar.gz 1623435 BLAKE2B 34594cfb30633684f78aac349deef0316fee094c7d67b7e67db2ad1e618b72b6a9510d089474cb973f6dbcf503ec2f1177af2bb9c3a14e674d4bb6cdcf2f0548 SHA512 ffe5cb3354f30b8cb916b83b8fce1cbf7f7b37fad232ddb77a918eaf149d6b3e47488ff900301970e0d9240edfe483d57c434b1af35b87a9f50bcbd0e3aed3d8 diff --git a/games-board/sirius/files/sirius-0.8.0-fix-build-system.patch b/games-board/sirius/files/sirius-0.8.0-fix-build-system.patch deleted file mode 100644 index e799616a492a..000000000000 --- a/games-board/sirius/files/sirius-0.8.0-fix-build-system.patch +++ /dev/null @@ -1,65 +0,0 @@ -Fix configure.ac -* Remove setting CFLAGS -* Look for sqrt() in libm (bug 592414) - ---- a/configure.in -+++ b/configure.in -@@ -1,26 +1,23 @@ - AC_PREREQ(2.52) - --AC_INIT(sirius, 0.8.0) --AC_CONFIG_SRCDIR(src/sirius.c) --AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) -+AC_INIT([sirius], [0.8.0]) -+AC_CONFIG_SRCDIR([src/sirius.c]) -+AM_INIT_AUTOMAKE - --AM_CONFIG_HEADER(config.h) -- --AM_MAINTAINER_MODE -+AC_CONFIG_HEADERS([config.h]) - - AC_PROG_INTLTOOL - --AC_ISC_POSIX - AC_PROG_CC --AC_STDC_HEADERS --AM_PROG_LIBTOOL --AC_PROG_LIBTOOL -+LT_INIT - - pkg_modules="gtk+-2.0 >= 1.3.13 gconf-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libgnomeui-2.0 gdk-pixbuf-2.0" - PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) --AC_SUBST(PACKAGE_CFLAGS) --AC_SUBST(PACKAGE_LIBS) - -+dnl Look for sqrt() in libm -+AC_SEARCH_LIBS([sqrt], [m], [], [ -+ AC_MSG_ERROR([unable to find the sqrt() function]) -+]) - - GETTEXT_PACKAGE=sirius - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE") -@@ -29,22 +26,6 @@ - ALL_LINGUAS="sv fr de ru" - AM_GLIB_GNU_GETTEXT - --CFLAGS="-g -O3" -- --AC_SUBST(CFLAGS) --AC_SUBST(CPPFLAGS) --AC_SUBST(LDFLAGS) -- --dnl Use -Wall if we have gcc. --changequote(,)dnl --if test "x$GCC" = "xyes"; then -- case " $CFLAGS " in -- *[\ \ ]-Wall[\ \ ]*) ;; -- *) CFLAGS="$CFLAGS -Wall" ;; -- esac --fi --changequote([,])dnl -- - AC_OUTPUT([ - Makefile - po/Makefile.in diff --git a/games-board/sirius/files/sirius-0.8.0-fix-desktop-file.patch b/games-board/sirius/files/sirius-0.8.0-fix-desktop-file.patch deleted file mode 100644 index dfa411d5152b..000000000000 --- a/games-board/sirius/files/sirius-0.8.0-fix-desktop-file.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix QA violations in desktop file - ---- a/sirius.desktop.in -+++ b/sirius.desktop.in -@@ -3,7 +3,7 @@ - _Name=Sirius - _Comment=Sirius, a othello playing program - Exec=sirius --Icon=sirius.png -+Icon=sirius - Terminal=false - Type=Application --Categories=GNOME;Application;Game; -+Categories=GNOME;Game; diff --git a/games-board/sirius/files/sirius-0.8.0-format.patch b/games-board/sirius/files/sirius-0.8.0-format.patch deleted file mode 100644 index 4bed292434d3..000000000000 --- a/games-board/sirius/files/sirius-0.8.0-format.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/sirius.c -+++ b/src/sirius.c -@@ -180,7 +180,7 @@ - - paus = 1; - -- box = gtk_message_dialog_new (GTK_WINDOW (window), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, message); -+ box = gtk_message_dialog_new (GTK_WINDOW (window), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", message); - gtk_dialog_run (GTK_DIALOG(box)); - gtk_widget_destroy(box); - diff --git a/games-board/sirius/metadata.xml b/games-board/sirius/metadata.xml deleted file mode 100644 index 78274e0fa550..000000000000 --- a/games-board/sirius/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - diff --git a/games-board/sirius/sirius-0.8.0-r1.ebuild b/games-board/sirius/sirius-0.8.0-r1.ebuild deleted file mode 100644 index c04568e02b57..000000000000 --- a/games-board/sirius/sirius-0.8.0-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="A program for playing the game of othello/reversi" -HOMEPAGE="http://sirius.bitvis.nu/" -SRC_URI="http://sirius.bitvis.nu/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls" - -RDEPEND=" - gnome-base/gconf:2 - gnome-base/libgnomecanvas - gnome-base/libgnomeui - x11-libs/gtk+:2 - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}"/${P}-format.patch - "${FILESDIR}"/${P}-fix-desktop-file.patch - "${FILESDIR}"/${P}-fix-build-system.patch -) - -src_prepare() { - default - mv configure.{in,ac} || die - eautoreconf -} - -src_configure() { - econf $(use_enable nls) -} diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz index c58cbfdf8f8b..f77f81fc8e7b 100644 Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ diff --git a/games-engines/scummvm/scummvm-2.1.0.ebuild b/games-engines/scummvm/scummvm-2.1.0.ebuild index 06cc2f964fec..7aacd055d809 100644 --- a/games-engines/scummvm/scummvm-2.1.0.ebuild +++ b/games-engines/scummvm/scummvm-2.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz" LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" IUSE="a52 aac alsa debug flac fluidsynth jpeg lua mpeg2 mp3 net opengl png speech theora truetype unsupported vorbis zlib" RESTRICT="test" # it only looks like there's a test there #77507 diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz index 0296286c8bad..3f5a7436ebf1 100644 Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ diff --git a/games-puzzle/gtetrinet/Manifest b/games-puzzle/gtetrinet/Manifest deleted file mode 100644 index f8b9797f69d5..000000000000 --- a/games-puzzle/gtetrinet/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gtetrinet-0.7.11.tar.bz2 416744 BLAKE2B f3bb72b307066e1af41de5c1483fa5b9c88377a3f70924520bc1e36206ad7b75c233d5fb10c0398aac4ed228d8cac6f26a1acaaf97c27858f1c24e4d0aebc4aa SHA512 5de7df7647ed9f7c0b6aba4eac976c625b7632eb5ab8034b11ef09aeb4582f90b4f9fc1791dc5371e1067d59c90b792a70276c69b75ebd6dc8c74c96c47c7130 -DIST gtetrinet-gentoo-theme-0.1.tbz2 88240 BLAKE2B 60ead98512ddd812cf1f95f041479f9dad9e7e0f3a55931779382b95fc7aada11498b6517cbd425547d3d46281bb6ec982325b0ad361ef339daa321d45a6ffe8 SHA512 6834ed4d70d94d94c201c5fa76d670ed21e4451ad18b1f41292c69e8ba18f56198898bb9d0c90343e28fa05a53e2e92536aa07fad747d4321d2e67c638d7ab8d diff --git a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-desktopfile.patch b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-desktopfile.patch deleted file mode 100644 index 9bf7c2e506db..000000000000 --- a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-desktopfile.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Julian Ospald -Date: Fri Nov 30 20:02:03 UTC 2012 -Subject: desktop file - - fix desktop file according to fd.o spec - ---- gtetrinet.desktop -+++ gtetrinet.desktop -@@ -1,5 +1,4 @@ - [Desktop Entry] --Encoding=UTF-8 - Name=GTetrinet - Name[am]=GTetrinet - Name[bg]=GTetrinet -@@ -99,11 +98,11 @@ - Comment[zh_HK]=Tetrinet 的 GNOME 客戶端程式 - Comment[zh_TW]=Tetrinet 的 GNOME 客戶端程式 - Exec=gtetrinet --Icon=gtetrinet.png -+Icon=gtetrinet - StartupNotify=true - Terminal=false - Type=Application --Categories=GNOME;Application;Game;BlocksGame; -+Categories=GNOME;Game;BlocksGame; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=gtetrinet - X-GNOME-Bugzilla-Component=general diff --git a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-format-security.patch b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-format-security.patch deleted file mode 100644 index 59389a18f7c5..000000000000 --- a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-format-security.patch +++ /dev/null @@ -1,16 +0,0 @@ -Author: Jordi Mallach -Description: Fix build when using -Werror=format-security, now default - on Debian. -Status: committed-upstream - ---- gtetrinet-0.7.11.orig/src/tetrinet.c -+++ gtetrinet-0.7.11/src/tetrinet.c -@@ -232,7 +232,7 @@ - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, -- buf); -+ "%s", buf); - gtk_dialog_run (GTK_DIALOG(dialog)); - gtk_widget_destroy (dialog); - g_free (data_utf8); diff --git a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-noesd.patch b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-noesd.patch deleted file mode 100644 index b49758401298..000000000000 --- a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-noesd.patch +++ /dev/null @@ -1,130 +0,0 @@ ---- gtetrinet-0.7.11/configure.in~ 2006-11-15 17:02:36.000000000 +0000 -+++ gtetrinet-0.7.11/configure.in 2011-03-06 15:39:10.000000000 +0000 -@@ -30,7 +30,6 @@ - LIBGTK_REQUIRED=2.6.0 - LIBGNOME_REQUIRED=2.0.0 - LIBGNOMEUI_REQUIRED=2.0.0 --LIBESD_REQUIRED=0.2.36 - - dnl ***************************************** - dnl libgnome, libgnomeui needed for all utils -@@ -40,21 +39,21 @@ - AC_SUBST(GTET_CFLAGS) - AC_SUBST(GTET_LIBS) - --dnl Check for libesd --if pkg-config --exists esound ; then -- have_esound=yes -+dnl Check for libcanberra -+if pkg-config --exists libcanberra ; then -+ have_libcanberra=yes - else -- have_esound=no -+ have_libcanberra=no - fi - --if test "x$have_esound" = "xyes"; then --AC_DEFINE(HAVE_ESD, 1, [Define this to enable EsounD support.]) --PKG_CHECK_MODULES(ESOUND, esound >= $LIBESD_REQUIRED) --AC_SUBST(ESOUND_CFLAGS) --AC_SUBST(ESOUND_LIBS) -+if test "x$have_libcanberra" = "xyes"; then -+AC_DEFINE(HAVE_LIBCANBERRA, 1, [Define this to enable libcanberra support.]) -+PKG_CHECK_MODULES(LIBCANBERRA, libcanberra) -+AC_SUBST(LIBCANBERRA_CFLAGS) -+AC_SUBST(LIBCANBERRA_LIBS) - fi - --AM_CONDITIONAL(HAVE_ESOUND, test "x$have_esound" = "xyes") -+AM_CONDITIONAL(HAVE_LIBCANBERRA, test "x$have_libcanberra" = "xyes") - - AC_HEADER_STDC - AC_HEADER_SYS_WAIT ---- gtetrinet-0.7.11/config.h.in~ 2006-11-15 17:03:53.000000000 +0000 -+++ gtetrinet-0.7.11/config.h.in 2011-03-06 15:39:31.000000000 +0000 -@@ -15,8 +15,8 @@ - /* Define to 1 if you have the `dcgettext' function. */ - #undef HAVE_DCGETTEXT - --/* Define this to enable EsounD support. */ --#undef HAVE_ESD -+/* Define this to enable libcanberra support. */ -+#undef HAVE_LIBCANBERRA - - /* Define if the GNU gettext() function is already present or preinstalled. */ - #undef HAVE_GETTEXT ---- gtetrinet-0.7.11/src/dialogs.c~ 2006-11-03 12:49:49.000000000 +0000 -+++ gtetrinet-0.7.11/src/dialogs.c 2011-03-06 15:40:45.000000000 +0000 -@@ -1054,7 +1054,7 @@ - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(soundcheck), soundenable); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(midicheck), midienable); - --#ifdef HAVE_ESD -+#ifdef HAVE_LIBCANBERRA - if (midienable) prefdialog_midion (); - else prefdialog_midioff (); - if (soundenable) prefdialog_soundon (); ---- gtetrinet-0.7.11/src/sound.c~ 2005-03-18 21:19:18.000000000 +0000 -+++ gtetrinet-0.7.11/src/sound.c 2011-03-06 15:47:24.000000000 +0000 -@@ -36,33 +36,36 @@ - char midifile[1024]; - char midicmd[1024]; - --#ifdef HAVE_ESD -+#ifdef HAVE_LIBCANBERRA - --#include --#include -+#include - --static int soundsamples[S_NUM]; - static int midipid = 0; -+static ca_context *ctx = 0; - - void sound_cache (void) - { - int i; - if (!soundenable) return; -+ if (!ctx) -+ ca_context_create(&ctx); -+ if (ctx) { - for (i = 0; i < S_NUM; i ++) { -- if (soundsamples[i]) -- esd_sample_free (gnome_sound_connection_get (), soundsamples[i]); - if (soundfiles[i][0]) -- soundsamples[i] = gnome_sound_sample_load (soundfiles[i], soundfiles[i]); -- else -- soundsamples[i] = 0; -+ ca_context_cache(ctx, -+ CA_PROP_MEDIA_FILENAME, soundfiles[i], -+ NULL); -+ } - } - } - - void sound_playsound (int id) - { -- if (!soundenable) return; -- if (soundsamples[id] > 0) -- esd_sample_play (gnome_sound_connection_get (), soundsamples[id]); -+ if (!soundenable || !ctx) return; -+ if (soundfiles[id][0]) -+ ca_context_play(ctx, 0, -+ CA_PROP_MEDIA_FILENAME, soundfiles[id], -+ NULL); - } - - void sound_playmidi (char *file) ---- gtetrinet-0.7.11/src/Makefile.am~ 2006-11-03 16:20:08.000000000 +0000 -+++ gtetrinet-0.7.11/src/Makefile.am 2011-03-06 15:57:32.000000000 +0000 -@@ -7,8 +7,8 @@ - -DGTETPIXMAPSDIR=\""$(datadir)/pixmaps/gtetrinet"\" \ - $(GTET_CFLAGS) - --if HAVE_ESOUND --LDADD = $(GTET_LIBS) $(ESOUND_LIBS) -+if HAVE_LIBCANBERRA -+LDADD = $(GTET_LIBS) $(LIBCANBERRA_LIBS) - else - LDADD = $(GTET_LIBS) - endif diff --git a/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild b/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild deleted file mode 100644 index 44052954303d..000000000000 --- a/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -GCONF_DEBUG="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit autotools eutils gnome2 - -DESCRIPTION="Tetrinet Clone for GNOME" -HOMEPAGE="http://gtetrinet.sourceforge.net/" -SRC_URI="${SRC_URI} - mirror://gentoo/gtetrinet-gentoo-theme-0.1.tbz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls ipv6" - -RDEPEND=" - dev-libs/libxml2 - media-libs/libcanberra - >=gnome-base/gconf-2 - >=gnome-base/libgnome-2 - >=gnome-base/libgnomeui-2 - nls? ( virtual/libintl ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-noesd.patch - epatch "${FILESDIR}"/${P}-desktopfile.patch - epatch "${FILESDIR}"/${P}-format-security.patch - sed -i \ - -e "/^pkgdatadir =/s:=.*:= ${GAMES_DATADIR}/${PN}:" \ - src/Makefile.in themes/*/Makefile.in || die - sed -i \ - -e '/^gamesdir/s:=.*:=@bindir@:' \ - src/Makefile.am || die - - rm -rf "${WORKDIR}"/gentoo/.xvpics || die # Remove cruft - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - $(use_enable ipv6) -} - -src_install() { - gnome2_src_install - mv "${WORKDIR}"/gentoo "${ED}/usr/share/${PN}/themes/" || die -} diff --git a/games-puzzle/gtetrinet/metadata.xml b/games-puzzle/gtetrinet/metadata.xml deleted file mode 100644 index a29c0a42dfee..000000000000 --- a/games-puzzle/gtetrinet/metadata.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - - gnome@gentoo.org - Gentoo GNOME Desktop - - -GTetrinet is a client program for the popular Tetrinet game, a -multiplayer tetris game that is played over the internet. - -Gee, Tetris? Whats that? Yeah, yeah, so it's been -done 2 billion times before (give or take a few bil), -but this is different! Yes, all you tetris addicts -out there be prepared for even MORE excitement.. -internet tetris! Now you can play your five best -buddies in one of the most well known games in -existence! - - - gtetrinet - - diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz index b17478eee7c4..a2458a69d0e1 100644 Binary files a/games-simulation/Manifest.gz and b/games-simulation/Manifest.gz differ diff --git a/games-simulation/openrct2/openrct2-0.2.6.ebuild b/games-simulation/openrct2/openrct2-0.2.6.ebuild index d18f745158a3..d25a03c8c6be 100644 --- a/games-simulation/openrct2/openrct2-0.2.6.ebuild +++ b/games-simulation/openrct2/openrct2-0.2.6.ebuild @@ -24,7 +24,7 @@ SRC_URI=" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="dedicated libressl +lightfx +opengl test +truetype twitch" COMMON_DEPEND=" diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz index 8fc1ca6c9acf..880ace9b41f2 100644 Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest index c447564b0220..25a3b4e6a9a2 100644 --- a/gnome-base/dconf/Manifest +++ b/gnome-base/dconf/Manifest @@ -1,2 +1,3 @@ DIST dconf-0.32.0.tar.xz 111700 BLAKE2B 51ac54deafc44a56aa6af1bdc8a89e1002772969881870b196a12f85d5b1a090a334b3088b051e07e085b7fe736e2e51479c17ffcc38a18e682b8238d51671ee SHA512 09ae65ad365947aed24228b94978b290060264e55b443d18a743e943627703c92e16e3a5ca8a0aaf3549f7a1d5aad77bdc285d4c8519db705d3104ec22b111a0 DIST dconf-0.34.0.tar.xz 112876 BLAKE2B 6890cd82a3ba81eac8c72dda93ebf1b82f3002b735bf2e059ba07a2f0f3817978a9e4f5dd37a9efab728fc2a4e20c34c519f9eeb3915d705ff8a3c4a65f9ab41 SHA512 8b28373f31fe36ba3f21f56fca84563681c3648ff595709880cd9ac49fc6b130ac375fb89fd585f1dd62b5a2f728127292ea57d18feca1147b709a93e8c4c743 +DIST dconf-0.36.0.tar.xz 114828 BLAKE2B 033cb2e095d9dac72bd07c5fa8280a3e1012aac6c1b0657d5455c2a519617be9112acca702ec4078554a814f36d12ee8e25201cc5b8aed2d33a32ef14e2f6fa5 SHA512 fed0b4ac13dfeff3bbe428a5c25408a0f13610219e561841a3af75cf18f9c630c385989b700c081b79ab53c00bdecf43c7c94979312c047faefbda4b2653d40d diff --git a/gnome-base/dconf/dconf-0.36.0.ebuild b/gnome-base/dconf/dconf-0.36.0.ebuild new file mode 100644 index 000000000000..37e1aae85828 --- /dev/null +++ b/gnome-base/dconf/dconf-0.36.0.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit bash-completion-r1 gnome.org gnome2-utils meson virtualx xdg + +DESCRIPTION="Simple low-level configuration system" +HOMEPAGE="https://wiki.gnome.org/Projects/dconf" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux" +IUSE="gtk-doc" +RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass + +RDEPEND=" + >=dev-libs/glib-2.44.0:2 + sys-apps/dbus +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-util/gdbus-codegen + gtk-doc? ( >=dev-util/gtk-doc-1.15 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/0.30.1-bash-completion-dir.patch + "${FILESDIR}"/0.32.0-drop-vapigen-dep.patch # .vapi/.deps are pregenerated, just install them without a vala dep +) + +src_configure() { + local emesonargs=( + -Dbash_completion_dir="$(get_bashcompdir)" + -Dman=true + $(meson_use gtk-doc gtk_doc) + -Dvapi=true + ) + meson_src_configure +} + +src_install() { + meson_src_install + + # GSettings backend may be one of: memory, gconf, dconf + # Only dconf is really considered functional by upstream + # must have it enabled over gconf if both are installed + # This snippet can't be removed until gconf package is + # ensured to not install a /etc/env.d/50gconf and then + # still consider the CONFIG_PROTECT_MASK bit. + echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf + echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf + doenvd 51dconf +} + +src_test() { + virtx meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_giomodule_cache_update + + # Kill existing dconf-service processes as recommended by upstream due to + # possible changes in the dconf private dbus API. + # dconf-service will be dbus-activated on next use. + pids=$(pgrep -x dconf-service) + if [[ $? == 0 ]]; then + ebegin "Stopping dconf-service; it will automatically restart on demand" + kill ${pids} + eend $? + fi +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_giomodule_cache_update +} diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index 1fb8f0801d21..00eb5c79e2fe 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -1,3 +1,4 @@ DIST gdm-3.34.1.tar.xz 1244960 BLAKE2B c6e53b37baa75f202725b21b58e22cc84d44d241cc3fa10dd466e1a766ce4081bf436e965dcd38f0c009b5145813c95d77c76ca31ef837e8d0251c6d65d06ca9 SHA512 71b71699e8e31643080d2af5dc54381592c0c6a2f7adbb0434a9957c8e59c67a20afaf48dce57139453157572c5bae617134420f36e8da68fbc74e95746d26fb DIST gdm-3.36.2.tar.xz 1214564 BLAKE2B e456ac171dcd2918d5c93a556741e62c29ce1611c318c2220093b3359649e1cd9d18bdc592e994b0f50f0b99892658f970eba939aeaf281f6f6eb773d4a97944 SHA512 5c02f00ce20a5b7b426043ab26640dd0a54a57bbff7eb2e449195bc3d6e36ad464487424fdc5be72fc542265bff6877317e693f6221c95a987f86c7a5dc6893e +DIST gdm-3.36.3.tar.xz 1218972 BLAKE2B 8e4d3dcd1dc84de276a6426feae206d43cfcbd8c8ffa24325f0dcc1bc2b180d9dbee20849b8e3157d299017ad91b433be54a78eafc7319171806ec6c6348bb1f SHA512 21c3bba0ce5142362e3c86ccb05fc234d9356db295ed63f3c383bd7cc2b7a464bdcec08e472d31a339b5ffbfeaed4db72ebbdeae2e7a71effdeef8c52b53830b DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 diff --git a/gnome-base/gdm/gdm-3.36.3.ebuild b/gnome-base/gdm/gdm-3.36.3.ebuild new file mode 100644 index 000000000000..12a42230f315 --- /dev/null +++ b/gnome-base/gdm/gdm-3.36.3.ebuild @@ -0,0 +1,246 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +GNOME2_EAUTORECONF="yes" + +inherit eutils gnome2 pam readme.gentoo-r1 systemd udev user + +DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" +HOMEPAGE="https://wiki.gnome.org/Projects/GDM" + +SRC_URI="${SRC_URI} + branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) +" + +LICENSE=" + GPL-2+ + branding? ( CC-BY-SA-4.0 ) +" + +SLOT="0" + +IUSE="accessibility audit bluetooth-sound branding elogind fprint +introspection ipv6 plymouth selinux smartcard systemd tcpd test wayland xinerama" +RESTRICT="!test? ( test )" +REQUIRED_USE="^^ ( elogind systemd )" + +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" + +# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 +# nspr used by smartcard extension +# dconf, dbus and g-s-d are needed at install time for dconf update +# keyutils is automagic dep that makes autologin unlock login keyring when all the passwords match (disk encryption, user pw and login keyring) +# dbus-run-session used at runtime +# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 +COMMON_DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.44:2 + dev-libs/libgudev + >=x11-libs/gtk+-2.91.1:3 + >=gnome-base/dconf-0.20 + >=gnome-base/gnome-settings-daemon-3.1.4 + gnome-base/gsettings-desktop-schemas + >=media-libs/fontconfig-2.5.0:1.0 + >=media-libs/libcanberra-0.4[gtk3] + sys-apps/dbus + >=sys-apps/accountsservice-0.6.35 + + x11-base/xorg-server + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libxcb + >=x11-misc/xdg-utils-1.0.2-r3 + + sys-libs/pam + sys-apps/keyutils:= + elogind? ( >=sys-auth/elogind-239.3[pam] ) + systemd? ( >=sys-apps/systemd-186:0=[pam] ) + + sys-auth/pambase[elogind?,systemd?] + + audit? ( sys-process/audit ) + introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) + plymouth? ( sys-boot/plymouth ) + selinux? ( sys-libs/libselinux ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + xinerama? ( x11-libs/libXinerama ) +" +# XXX: These deps are from session and desktop files in data/ directory +# fprintd is used via dbus by gdm-fingerprint-extension +# gnome-session-3.6 needed to avoid freezing with orca +RDEPEND="${COMMON_DEPEND} + >=gnome-base/gnome-session-3.6 + >=gnome-base/gnome-shell-3.1.90 + x11-apps/xhost + + accessibility? ( + >=app-accessibility/orca-3.10 + gnome-extra/mousetweaks ) + fprint? ( + sys-auth/fprintd + sys-auth/pam_fprint ) +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + x11-base/xorg-proto + test? ( >=dev-libs/check-0.9.4 ) + app-text/yelp-tools +" # yelp-tools needed for eautoreconf to not lose help docs (m4_ifdeffed YELP_HELP_INIT call and setup) + +DOC_CONTENTS=" + To make GDM start at boot with systemd, run:\n + # systemctl enable gdm.service\n + \n + To make GDM start at boot with OpenRC, edit /etc/conf.d to have + DISPLAYMANAGER=\"gdm\" and enable the xdm service:\n + # rc-update add xdm + \n + For passwordless login to unlock your keyring, you need to install + sys-auth/pambase with USE=gnome-keyring and set an empty password + on your keyring. Use app-crypt/seahorse for that.\n + \n + You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 + for smartcard support +" + +pkg_setup() { + enewgroup gdm + enewgroup video # Just in case it hasn't been created yet + enewuser gdm -1 -1 /var/lib/gdm gdm,video + + # For compatibility with certain versions of nvidia-drivers, etc., need to + # ensure that gdm user is in the video group + if ! egetent group video | grep -q gdm; then + # FIXME XXX: is this at all portable, ldap-safe, etc.? + # XXX: egetent does not have a 1-argument form, so we can't use it to + # get the list of gdm's groups + local g=$(groups gdm) + elog "Adding user gdm to video group" + usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed" + fi +} + +src_prepare() { + # ssh-agent handling must be done at xinitrc.d, bug #220603 + eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" + + # Gentoo does not have a fingerprint-auth pam stack + eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch" + + # Support pam_elogind.so in gdm-launch-environment.pam + eapply "${FILESDIR}/pam-elogind.patch" + + # Wait 10 seconds for a DRM master with systemd. Workaround for gdm not waiting for CanGraphical=yes property on the seat. Bug #613222 + eapply "${FILESDIR}/gdm-CanGraphical-wait.patch" # needs eautoreconf + + # Show logo when branding is enabled + use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch" + + gnome2_src_prepare +} + +src_configure() { + # PAM is the only auth scheme supported + # even though configure lists shadow and crypt + # they don't have any corresponding code. + # --with-at-spi-registryd-directory= needs to be passed explicitly because + # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4 + # Xevie is obsolete, bug #482304 + + # --with-initial-vt=7 conflicts with plymouth, bug #453392 + # gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which + # saves on memory. However this means if we don't start on VT1, gdm doesn't start up + # before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1, + # so lets try always having it in VT1 and see if that is an issue for people before + # hacking up workarounds for the initial start case. + # ! use plymouth && myconf="${myconf} --with-initial-vt=7" + local myconf=( + --enable-gdm-xsession + --enable-user-display-server + --with-run-dir=/run/gdm + --localstatedir="${EPREFIX}"/var + --disable-static + --with-xdmcp=yes + --enable-authentication-scheme=pam + --with-default-pam-config=exherbo + --with-pam-mod-dir=$(getpam_mod_dir) + --with-udevdir=$(get_udevdir) + --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec + --without-xevie + $(use_enable systemd systemd-journal) + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_with audit libaudit) + $(use_enable ipv6) + $(use_with plymouth) + $(use_with selinux) + $(use_with tcpd tcp-wrappers) + $(use_enable wayland wayland-support) + $(use_with xinerama) + ) + + if use elogind; then + myconf+=( + --with-initial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility + SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null` + SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null` + ) + fi + + gnome2_src_configure "${myconf[@]}" +} + +src_install() { + gnome2_src_install + + if ! use accessibility ; then + rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die + fi + + exeinto /etc/X11/xinit/xinitrc.d + newexe "${FILESDIR}/49-keychain-r1" 49-keychain + newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent + + # gdm user's home directory + keepdir /var/lib/gdm + fowners gdm:gdm /var/lib/gdm + + if ! use bluetooth-sound ; then + # Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10 + # bug #679526 + insinto /var/lib/gdm/.config/pulse + doins "${FILESDIR}"/default.pa + fi + + # install XDG_DATA_DIRS gdm changes + echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm + doenvd 99xdg-gdm + + use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg + + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_pkg_postinst + local d ret + + # bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm + ret=0 + ebegin "Fixing "${EROOT}"var/lib/gdm ownership" + chown --no-dereference gdm:gdm "${EROOT}var/lib/gdm" || ret=1 + for d in "${EROOT}var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do + [[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1 + done + eend ${ret} + + systemd_reenable gdm.service + readme.gentoo_print_elog +} diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.34.4.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.34.4.ebuild index d3f10edf2128..62443e787a84 100644 --- a/gnome-base/gnome-core-apps/gnome-core-apps-3.34.4.ebuild +++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.34.4.ebuild @@ -11,7 +11,7 @@ IUSE="+bluetooth cups" # when unmasking for an arch # double check none of the deps are still masked ! -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" # gnome-color-manager min version enforced here due to control-center pulling it in RDEPEND=" diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest index 67c42484ad1c..18fce6056a63 100644 --- a/gnome-base/gnome-menus/Manifest +++ b/gnome-base/gnome-menus/Manifest @@ -1 +1,2 @@ DIST gnome-menus-3.32.0.tar.xz 499680 BLAKE2B ee43c2be29f6d3f5eaf5369c3b3809fc2728564321853a6dd23df1d81138868f9be2f57d0bcd0eb69a509e224f77dc357a8c71afe569bfb1bbdb13ce3b80636f SHA512 8a429e092b1e4a1a794473d7cae611684321e797792e1063911ddcbb496140033838b348bc209b4c0566a13233cfa1144cae7a188a483abf34c5af6feb44a884 +DIST gnome-menus-3.36.0.tar.xz 502324 BLAKE2B 8bf1b0d4ac30a1e7f4c4e1b14ad3e2f718e974ec58fe8e8ab3c0d030c1cd1841a9cceb86d8909c0d0dcf128f19aecdd64350840f0cb25ed7cacdc2c95786f118 SHA512 e830e66639c2b6aebecf572188208d33b1515270e69af3f2c6f7a640d305a7b9c2bce10e5f520b3da1dea681b194fd14c551468ea5747aa333e649b5c46774e4 diff --git a/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild b/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild new file mode 100644 index 000000000000..ad1ecffb8521 --- /dev/null +++ b/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit gnome2 + +DESCRIPTION="Library and layout configuration for the Desktop Menu fd.o specification" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-menus" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" + +IUSE="+introspection test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.29.15:2 + introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) +" +DEPEND="${RDEPEND} + >=sys-devel/gettext-0.19.4 + virtual/pkgconfig + test? ( dev-libs/gjs ) +" + +DOCS="AUTHORS ChangeLog HACKING NEWS README" + +src_configure() { + # Do NOT compile with --disable-debug/--enable-debug=no + # It disables api usage checks + gnome2_src_configure \ + $(use_enable introspection) \ + --disable-static +} diff --git a/gnome-base/gnome/gnome-3.34.4.ebuild b/gnome-base/gnome/gnome-3.34.4.ebuild index d4881080358d..4a5107192cc8 100644 --- a/gnome-base/gnome/gnome-3.34.4.ebuild +++ b/gnome-base/gnome/gnome-3.34.4.ebuild @@ -11,7 +11,7 @@ SLOT="2.0" # Cannot be installed at the same time as gnome-2 # when unmasking for an arch # double check none of the deps are still masked ! -KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm64 ~ppc64 x86" IUSE="accessibility +bluetooth +classic cups +extras" diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest index 91eb0efcb51b..43be5fd5ceb5 100644 --- a/gnome-base/gvfs/Manifest +++ b/gnome-base/gvfs/Manifest @@ -1,2 +1,3 @@ DIST gvfs-1.42.2-patchset.tar.xz 23932 BLAKE2B 6957c5a8a200ecff9c3294a7fb7304ae1be147e45dae1838121690a3a20b1d2557681b4efe5f722811d5302b8270d0058eedac7f8a95029cd872df3db14cc541 SHA512 0494fb36e093d06bb278a75ecbf3bc17460d5d20302a9c1d2c5b74a0b65c2a259141b515b3e80c57c3e1125df74b3cf6d2a91ae70c8e2e0af3bbca285417b9f0 DIST gvfs-1.42.2.tar.xz 1204972 BLAKE2B ebc1c4a4ae69a809ee7c556e65f87f968806ef057cfb7f7a7d2f18614443197c1feaad79099fd5b04640035e7ab306683018676ce109a7d718e3c8d35676be7c SHA512 b786ae2e493099a0a1ab2756efba3690f0e241a53995013e2632b2d7e01628d52d72b47298c7a2b913c8d50f135c191b2963a7ffc0e768fc5c96a89f93401e3c +DIST gvfs-1.44.1.tar.xz 1222040 BLAKE2B 5a412395cf0edbdb78aea43eabd4fc0ec68f53b9f681cd6181b1c2ee09a01f90e024f75d44302eefdd9d3888512ec4fe672125eec3c79fe691d0f66dacde7bce SHA512 d936e70e6daa6a7494e5cc333a53afe82b601e34e2e54b207d9a4aefdc35dd068997832be750a6857144a48fa37065cb7e6b25378952007b06988ad07dfc6006 diff --git a/gnome-base/gvfs/files/libplist-2.2.patch b/gnome-base/gvfs/files/libplist-2.2.patch new file mode 100644 index 000000000000..72634b58b69f --- /dev/null +++ b/gnome-base/gvfs/files/libplist-2.2.patch @@ -0,0 +1,30 @@ +From 13551f3f40d41f1357126ac5a26d0fa012cd8123 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Tue, 16 Jun 2020 13:28:35 +0200 +Subject: [PATCH] afc: Add support for libplist-2.2 + +Which changed name from libplist to libplist-2.0 to embed its API +version number in the library name. +--- + meson.build | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 1750f65c..187bfd55 100644 +--- a/meson.build ++++ b/meson.build +@@ -357,7 +357,10 @@ config_h.set('HAVE_LOGIND', enable_logind) + enable_afc = get_option('afc') + if enable_afc + libimobiledevice_dep = dependency('libimobiledevice-1.0', version: '>= 1.2') +- libplist_dep = dependency('libplist', version: '>= 0.15') ++ libplist_dep = dependency('libplist-2.0', required: false) ++ if not libplist_dep.found() ++ libplist_dep = dependency('libplist', version: '>= 0.15') ++ endif + endif + + # *** Check if we should build with GOA volume monitor *** +-- +2.20.1 + diff --git a/gnome-base/gvfs/gvfs-1.42.2.ebuild b/gnome-base/gvfs/gvfs-1.42.2.ebuild index 9d564417391f..799db1bc3d99 100644 --- a/gnome-base/gvfs/gvfs-1.42.2.ebuild +++ b/gnome-base/gvfs/gvfs-1.42.2.ebuild @@ -76,6 +76,7 @@ BDEPEND=" PATCHES=( "${WORKDIR}"/patches + "${FILESDIR}"/libplist-2.2.patch ) src_configure() { diff --git a/gnome-base/gvfs/gvfs-1.44.1.ebuild b/gnome-base/gvfs/gvfs-1.44.1.ebuild new file mode 100644 index 000000000000..b7efa067dcc3 --- /dev/null +++ b/gnome-base/gvfs/gvfs-1.44.1.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org gnome2-utils meson systemd xdg + +DESCRIPTION="Virtual filesystem implementation for GIO" +HOMEPAGE="https://wiki.gnome.org/Projects/gvfs" + +LICENSE="LGPL-2+" +SLOT="0" + +IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf" +RESTRICT="!test? ( test )" +# elogind/systemd only relevant to udisks (in v1.38.1) +REQUIRED_USE=" + ?? ( elogind systemd ) + cdda? ( udev ) + google? ( gnome-online-accounts ) + gphoto2? ( udev ) + mtp? ( udev ) + udisks? ( udev ) +" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" + +RDEPEND=" + >=dev-libs/glib-2.57.2:2 + >=gnome-base/gsettings-desktop-schemas-3.33.0 + afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) + sys-apps/dbus + app-crypt/gcr:= + policykit? ( + >=sys-auth/polkit-0.114 + sys-libs/libcap ) + http? ( + dev-libs/libxml2:2 + >=net-libs/libsoup-2.58.0:2.4 ) + zeroconf? ( >=net-dns/avahi-0.6[dbus] ) + udev? ( >=dev-libs/libgudev-147:= ) + fuse? ( >=sys-fs/fuse-3.0.0:3 ) + udisks? ( >=sys-fs/udisks-1.97:2 ) + systemd? ( >=sys-apps/systemd-206:0= ) + elogind? ( >=sys-auth/elogind-229:0= ) + ios? ( + >=app-pda/libimobiledevice-1.2:= + >=app-pda/libplist-1:= ) + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) + gnome-keyring? ( app-crypt/libsecret ) + bluray? ( media-libs/libbluray:= ) + mtp? ( + >=dev-libs/libusb-1.0.21 + >=media-libs/libmtp-1.1.15 ) + samba? ( >=net-fs/samba-4[client] ) + archive? ( app-arch/libarchive:= ) + cdda? ( + dev-libs/libcdio:0= + >=dev-libs/libcdio-paranoia-0.78.2 ) + google? ( >=dev-libs/libgdata-0.17.11:=[crypt,gnome-online-accounts] ) + gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) + nfs? ( >=net-fs/libnfs-1.9.8 ) + net-misc/openssh +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-util/meson-0.49 + dev-util/glib-utils + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.2 + dev-libs/libxslt + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + dev-util/gdbus-codegen +" + +PATCHES=( + "${FILESDIR}"/libplist-2.2.patch +) + +src_configure() { + local enable_logind="false" + if use systemd || use elogind; then + enable_logind="true" + fi + + local enable_gcrypt="false" + if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes + enable_gcrypt="true" + fi + + local enable_libusb="false" + if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes + enable_libusb="true" + fi + + local emesonargs=( + -Dsystemduserunitdir="$(systemd_get_userunitdir)" + -Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d + $(meson_use policykit admin) + $(meson_use ios afc) + $(meson_use afp) + $(meson_use archive) + $(meson_use cdda) + $(meson_use zeroconf dnssd) + $(meson_use gnome-online-accounts goa) + $(meson_use google) + $(meson_use gphoto2) + $(meson_use http) + $(meson_use mtp) + $(meson_use nfs) + -Dsftp=true + $(meson_use samba smb) + $(meson_use udisks udisks2) + $(meson_use bluray) + $(meson_use fuse) + -Dgcr=true + -Dgcrypt=${enable_gcrypt} + $(meson_use udev gudev) + $(meson_use gnome-keyring keyring) + -Dlogind=${enable_logind} + -Dlibusb=${enable_libusb} + -Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1 + -Dinstalled_tests=false + -Dman=true + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + gnome2_giomodule_cache_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update + gnome2_giomodule_cache_update +} diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz index 33be4fb658ba..997ea05e63ec 100644 Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest index 5cdc23abb1ae..6c4667712dc2 100644 --- a/gnome-extra/gnome-calendar/Manifest +++ b/gnome-extra/gnome-calendar/Manifest @@ -1 +1,2 @@ DIST gnome-calendar-3.34.2.tar.xz 588996 BLAKE2B 114ea7a7ee2a8d7cbaa1d47bcb782d16891ef1bdd87838b62ac51f6c20d2f5711cbddc12a35278c7710ee660b18538211c9eafb64a1efa3df57f721aa7b1937a SHA512 6c69a1ee46a5ccfb4d6d1b7a60932412b486ad4576a4c78c89e03270147e30828ecaca6b5f0e27a741eb9d5ed74ca474ba0ddfb6d044748877b6c9ab7ae023a5 +DIST gnome-calendar-3.36.2.tar.xz 605904 BLAKE2B 42b0337a01a5316a60d41eede91c453e3c0fa2b056e9053f8868f344a662fdf4b3de4ade1f1a59b729f2bc3e087cf6b971094cd282d75432a83acc89a21054a7 SHA512 83d0157a3958ff7f16af2f6a06c2c5fdd7ce19bb532c1cda0982ab37d78149f4c0ae252de937103baa56d105a1cf54c2e29174f6f3f969904071e187cf564c33 diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.36.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.36.2.ebuild new file mode 100644 index 000000000000..23459051d17b --- /dev/null +++ b/gnome-extra/gnome-calendar/gnome-calendar-3.36.2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit gnome.org gnome2-utils meson virtualx xdg + +DESCRIPTION="Manage your online calendars with simple and modern interface" +HOMEPAGE="https://wiki.gnome.org/Apps/Calendar" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="" + +# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244 +DEPEND=" + >=dev-libs/libical-1.0.1:0= + >=gnome-base/gsettings-desktop-schemas-3.21.2 + >=gnome-extra/evolution-data-server-3.33.2:=[gtk] + net-libs/libsoup:2.4 + >=dev-libs/libdazzle-3.33.1 + >=gui-libs/libhandy-0.0.9:0.0= + >=dev-libs/glib-2.58.0:2 + >=x11-libs/gtk+-3.22.0:3 + >=net-libs/gnome-online-accounts-3.2.0:= + >=dev-libs/libgweather-3.27.2:= + >=app-misc/geoclue-2.4:2.0 + >=sci-geosciences/geocode-glib-3.23 +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-libs/appstream-glib + dev-libs/libxml2:2 + dev-util/gdbus-codegen + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_test() { + virtx meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest index ff5461d412c4..9056abb22b93 100644 --- a/gnome-extra/gnome-color-manager/Manifest +++ b/gnome-extra/gnome-color-manager/Manifest @@ -1 +1,2 @@ DIST gnome-color-manager-3.32.0.tar.xz 2602104 BLAKE2B 6219c3b7dd31ba49c671ef1f330d8ce561b7d8716a5cf5ef393dcf827c6bbc4e82b95c082e9297a27be7652d958a92c397fbafa8bd68f2c48b32533a3fe14483 SHA512 e5b0c6a39f9202fde79af1e966be65ef3d770fe4de777a281398ee68feef6c57dee95a1fcba496512f163bf561528ece840480b3c8612b5c3af2b7f550335f38 +DIST gnome-color-manager-3.36.0.tar.xz 2175016 BLAKE2B 263bc58c2a4ebafabebeba958279e4ad607eeca986dda9093c3e9d1a0870f44eefec7248aab11e6b408b063c5d5a28a3cdb88c96a58e3a0a5064055c44989143 SHA512 217c00696d7d0e99ee4cc65ee343c09682387d909feabdd6e4a52f9fd0586dda553b4796fbcb11392b880aa5c5bbaebde27906afb4e3ffd692ee3187023bfaac diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.36.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.36.0.ebuild new file mode 100644 index 000000000000..65eb91b7db57 --- /dev/null +++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.36.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit gnome.org meson virtualx xdg + +DESCRIPTION="GNOME color profile tools" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-color-manager/" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331 +RDEPEND=" + >=dev-libs/glib-2.31.10:2 + >=x11-libs/gtk+-3.3.8:3 + >=x11-misc/colord-1.3.1:0= + >=media-libs/lcms-2.2:2 +" +DEPEND="${RDEPEND}" +# docbook-sgml-{utils,dtd:4.1} needed to generate man pages +BDEPEND=" + app-text/docbook-sgml-dtd:4.1 + app-text/docbook-sgml-utils + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_configure() { + # Always enable tests since they are check_PROGRAMS anyway + local emesonargs=( + $(meson_use test tests) + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.30.2.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.30.2.ebuild index dd9c437ba343..c360efb766ca 100644 --- a/gnome-extra/gnome-contacts/gnome-contacts-3.30.2.ebuild +++ b/gnome-extra/gnome-contacts/gnome-contacts-3.30.2.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts" LICENSE="GPL-2+" SLOT="0" IUSE="telepathy v4l" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86" VALA_DEPEND=" $(vala_depend) diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild index 1173e5363b76..daf0636576af 100644 --- a/gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild +++ b/gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts" LICENSE="GPL-2+" SLOT="0" IUSE="telepathy v4l" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86" VALA_DEPEND=" $(vala_depend) diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild index f60c41444e55..27cb89e1c61c 100644 --- a/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild +++ b/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts" LICENSE="GPL-2+" SLOT="0" IUSE="telepathy v4l" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86" VALA_DEPEND=" $(vala_depend) diff --git a/gnome-extra/gnome-logs/Manifest b/gnome-extra/gnome-logs/Manifest index 4ba84cdc5a7b..0a687cb5de96 100644 --- a/gnome-extra/gnome-logs/Manifest +++ b/gnome-extra/gnome-logs/Manifest @@ -1 +1,2 @@ DIST gnome-logs-3.34.0.tar.xz 755704 BLAKE2B 2f9c494f062adce6f325baf5eb29bd6b9ad8144bf1e5ca5ee5672922ed6086f3ddf5be9dcd0d33c74b9c8ffacd1f2de060b2d62f3ae4b9d2206c1f74d7e88260 SHA512 4c93f85539c0cf51de9fb27212800466ee36bc1e105906456db3854b663bee68024eb10b288327893ba27bf1f5c10feeaf0101baba6a34cf18171a3ba5c8c48a +DIST gnome-logs-3.36.0.tar.xz 744104 BLAKE2B 585c39577ff1eba6b3af638d0cd5d452cbb20ce0444386fcd8fbbbc0192e59a7cc9139263ecbfb7ada85f71f044a998c51172cae1a7ba481c14c0a1650817cb5 SHA512 3a4a1f6af63f97a8814fcdbcf6e23e6a89dd150f2a5c5ebce21d8b9b74f6a8985ae5b3789aa37857b1631b33108d5048d7cfe32ebb7c7413d8ce27f25c8a58b8 diff --git a/gnome-extra/gnome-logs/gnome-logs-3.36.0.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.36.0.ebuild new file mode 100644 index 000000000000..0b0cd46dfb9f --- /dev/null +++ b/gnome-extra/gnome-logs/gnome-logs-3.36.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="Log viewer for the systemd journal" +HOMEPAGE="https://wiki.gnome.org/Apps/Logs" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + gnome-base/gsettings-desktop-schemas + >=dev-libs/glib-2.43.90:2 + >=x11-libs/gtk+-3.22:3 + sys-apps/systemd:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + app-text/docbook-xml-dtd:4.3 + dev-libs/libxml2:2 + dev-libs/libxslt + dev-util/itstool + virtual/pkgconfig +" + +src_configure() { + meson_src_configure -Dman=true +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/gnome-extra/sushi/sushi-3.34.0.ebuild b/gnome-extra/sushi/sushi-3.34.0.ebuild index 0a4774a4221d..ba0e05776c49 100644 --- a/gnome-extra/sushi/sushi-3.34.0.ebuild +++ b/gnome-extra/sushi/sushi-3.34.0.ebuild @@ -10,7 +10,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86" IUSE="office wayland +X" REQUIRED_USE="|| ( wayland X )" diff --git a/gnome-extra/yelp/yelp-3.34.0.ebuild b/gnome-extra/yelp/yelp-3.34.0.ebuild index bf631a4f8e09..ed004a1603d1 100644 --- a/gnome-extra/yelp/yelp-3.34.0.ebuild +++ b/gnome-extra/yelp/yelp-3.34.0.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp" LICENSE="GPL-2+" SLOT="0" IUSE="" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" RDEPEND=" app-arch/bzip2:= diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz index e837abded5f6..e209b10bb044 100644 Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ diff --git a/gui-libs/amtk/amtk-5.0.2.ebuild b/gui-libs/amtk/amtk-5.0.2.ebuild index 3617d3db91f7..29ddf52b6fcc 100644 --- a/gui-libs/amtk/amtk-5.0.2.ebuild +++ b/gui-libs/amtk/amtk-5.0.2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Amtk" LICENSE="LGPL-2.1+" SLOT="5" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" IUSE="+introspection" RDEPEND=" diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz index 885c518cb12e..e9efc2c953f3 100644 Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ diff --git a/kde-misc/krename/files/krename-5.0.0-kf-5.72-findtaglib.patch b/kde-misc/krename/files/krename-5.0.0-kf-5.72-findtaglib.patch new file mode 100644 index 000000000000..672d0c106818 --- /dev/null +++ b/kde-misc/krename/files/krename-5.0.0-kf-5.72-findtaglib.patch @@ -0,0 +1,36 @@ +From c1e0259445f32516785a6cb6e82e7cb401b6df37 Mon Sep 17 00:00:00 2001 +From: Jonathan Riddell +Date: Fri, 19 Jun 2020 16:44:47 +0100 +Subject: [PATCH] use local cmake modules first, fixes build failure + +--- + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 602129b..4550621 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,7 +3,7 @@ project(krename) + cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) + # search packages used by KDE + find_package(ECM 0.0.11 REQUIRED NO_MODULE) +-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) ++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) + + include(KDEInstallDirs) + include(ECMInstallIcons) +@@ -28,8 +28,8 @@ find_package(KF5 REQUIRED COMPONENTS + XmlGui + ) + # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked +-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} +- ${CMAKE_SOURCE_DIR}/cmake/modules) ++set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ++ ${CMAKE_MODULE_PATH}) + + add_definitions( + -DQT_DEPRECATED_WARNINGS +-- +GitLab + diff --git a/kde-misc/krename/krename-5.0.0-r1.ebuild b/kde-misc/krename/krename-5.0.0-r1.ebuild index 3884d54fa106..b650df235fa7 100644 --- a/kde-misc/krename/krename-5.0.0-r1.ebuild +++ b/kde-misc/krename/krename-5.0.0-r1.ebuild @@ -45,7 +45,10 @@ RDEPEND="${DEPEND} !kde-misc/krename:4 " -PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) +PATCHES=( + "${FILESDIR}/${P}-exiv2-0.27.patch" + "${FILESDIR}/${P}-kf-5.72-findtaglib.patch" +) src_configure() { local mycmakeargs=( diff --git a/kde-misc/tellico/files/tellico-3.3.1-kf-5.72-findtaglib.patch b/kde-misc/tellico/files/tellico-3.3.1-kf-5.72-findtaglib.patch new file mode 100644 index 000000000000..5d77a9816ba0 --- /dev/null +++ b/kde-misc/tellico/files/tellico-3.3.1-kf-5.72-findtaglib.patch @@ -0,0 +1,28 @@ +From 1051b34db65a45a4fd5f12cad0eebc27325a2be3 Mon Sep 17 00:00:00 2001 +From: Jonathan Riddell +Date: Fri, 19 Jun 2020 15:35:08 +0100 +Subject: [PATCH] switch order of cmake modules so it gives priority to the + local copy which will be the one it expects. fixes build failure on KDE neon + +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 00ee0035..5b96f25b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,8 +20,8 @@ endif(POLICY CMP0063) + set(CMAKE_INCLUDE_CURRENT_DIR TRUE) + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} +- ${ECM_MODULE_PATH} +- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) ++ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ++ ${ECM_MODULE_PATH}) + + #include(ECMAddTests) + #include(ECMMarkNonGuiExecutable) +-- +GitLab + diff --git a/kde-misc/tellico/tellico-3.3.1.ebuild b/kde-misc/tellico/tellico-3.3.1.ebuild index f39a4200a144..28dc136aec56 100644 --- a/kde-misc/tellico/tellico-3.3.1.ebuild +++ b/kde-misc/tellico/tellico-3.3.1.ebuild @@ -71,6 +71,8 @@ DEPEND="${RDEPEND}" # tests need network access RESTRICT+=" test" +PATCHES=( "${FILESDIR}/${P}-kf-5.72-findtaglib.patch" ) + src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz index 17460d85968a..592c9a35eef4 100644 Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ diff --git a/mail-client/evolution/evolution-3.36.3.ebuild b/mail-client/evolution/evolution-3.36.3.ebuild index 346822bfe965..96216bd78f26 100644 --- a/mail-client/evolution/evolution-3.36.3.ebuild +++ b/mail-client/evolution/evolution-3.36.3.ebuild @@ -14,7 +14,7 @@ SLOT="2.0" IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" # glade-3 support is for maintainers only per configure.ac # pst is not mature enough and changes API/ABI frequently diff --git a/mail-client/evolution/evolution-3.36.4.ebuild b/mail-client/evolution/evolution-3.36.4.ebuild index 346822bfe965..96216bd78f26 100644 --- a/mail-client/evolution/evolution-3.36.4.ebuild +++ b/mail-client/evolution/evolution-3.36.4.ebuild @@ -14,7 +14,7 @@ SLOT="2.0" IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" # glade-3 support is for maintainers only per configure.ac # pst is not mature enough and changes API/ABI frequently diff --git a/mail-client/roundcube/roundcube-1.3.11.ebuild b/mail-client/roundcube/roundcube-1.3.11.ebuild index aae2f208e408..6e1cc03ddf52 100644 --- a/mail-client/roundcube/roundcube-1.3.11.ebuild +++ b/mail-client/roundcube/roundcube-1.3.11.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${PV}/${MY_P}-compl # roundcube is GPL-licensed, the rest of the licenses here are # for bundled PEAR components, googiespell and utf8.class.php LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain" -KEYWORDS="~amd64 arm ~hppa ppc ppc64 sparc x86" +KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86" IUSE="change-password enigma ldap managesieve mysql postgres sqlite ssl spell" REQUIRED_USE="|| ( mysql postgres sqlite )" diff --git a/mail-client/thunderbird/thunderbird-68.10.0.ebuild b/mail-client/thunderbird/thunderbird-68.10.0.ebuild index 5a073e4dc807..5da743f127c7 100644 --- a/mail-client/thunderbird/thunderbird-68.10.0.ebuild +++ b/mail-client/thunderbird/thunderbird-68.10.0.ebuild @@ -48,7 +48,7 @@ inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \ DESCRIPTION="Thunderbird Mail Client" HOMEPAGE="https://www.mozilla.org/thunderbird" -KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" SLOT="0" LICENSE="MPL-2.0 GPL-2 LGPL-2.1" @@ -132,6 +132,9 @@ DEPEND="${CDEPEND} >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils + virtual/pkgconfig + >=virtual/rust-1.34.0 + doc/cmd.txt.tmp || die - mv -f doc/cmd.txt.tmp doc/cmd.txt || die - - cmake_src_prepare - - sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die -} - -multilib_src_configure() { - local mycmakeargs=( - -DEXIV2_BUILD_SAMPLES=NO - -DEXIV2_BUILD_PO=$(usex nls) - -DEXIV2_ENABLE_NLS=$(usex nls) - -DEXIV2_ENABLE_PNG=$(usex png) - -DEXIV2_ENABLE_CURL=$(usex webready) - -DEXIV2_ENABLE_SSH=$(usex webready) - -DEXIV2_ENABLE_WEBREADY=$(usex webready) - -DEXIV2_ENABLE_XMP=$(usex xmp) - $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO) - $(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc)) - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html - ) - - cmake_src_configure -} - -multilib_src_compile() { - cmake_src_compile - - if multilib_is_native_abi; then - use doc && eninja doc - fi -} - -multilib_src_install_all() { - use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} ) - - einstalldocs - find "${D}" -name '*.la' -delete || die - - if use examples; then - docinto examples - dodoc samples/*.cpp - fi -} diff --git a/media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch b/media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch deleted file mode 100644 index abf165b83f47..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch +++ /dev/null @@ -1,56 +0,0 @@ -From c59eb810728572fde84492d43a932dcac89746d6 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Thu, 14 Nov 2019 15:06:38 +0100 -Subject: [PATCH] EXIV2_ENABLE_SSH: Fix compatibility with >=libssh-0.9.2 - -0.9.1 remains broken regardless and is beyond fixing in this place. - -Build-tested with both libssh 0.9.0 and 0.9.2. - -Solution copied from KDE's kio-extras commit 24506c2af8d1904a99538543804306c6c2b81ca2 ---- - cmake/findDependencies.cmake | 13 +++++++++++-- - src/CMakeLists.txt | 3 +-- - 2 files changed, 12 insertions(+), 4 deletions(-) - -diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake -index a458a0c9..ec3a43f5 100644 ---- a/cmake/findDependencies.cmake -+++ b/cmake/findDependencies.cmake -@@ -26,8 +26,17 @@ if( EXIV2_ENABLE_WEBREADY ) - - if( EXIV2_ENABLE_SSH ) - find_package(libssh CONFIG REQUIRED) -- endif( ) --endif( ) -+ # Define an imported target to have compatibility with <=libssh-0.9.0 -+ # libssh-0.9.1 is broken regardless. -+ if(NOT TARGET ssh) -+ add_library(ssh SHARED IMPORTED) -+ set_target_properties(ssh PROPERTIES -+ IMPORTED_LOCATION "${LIBSSH_LIBRARIES}" -+ INTERFACE_INCLUDE_DIRECTORIES "${LIBSSH_INCLUDE_DIR}" -+ ) -+ endif() -+ endif() -+endif() - - if (EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP) - message(FATAL_ERROR "EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP are mutually exclusive. You can only choose one of them") -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 27f8dbb1..bdd83fa0 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -173,8 +173,7 @@ target_include_directories(exiv2lib_int PUBLIC - if (EXIV2_ENABLE_WEBREADY) - - if( EXIV2_ENABLE_SSH ) -- target_include_directories(exiv2lib SYSTEM PUBLIC ${LIBSSH_INCLUDE_DIR}) -- target_link_libraries(exiv2lib PUBLIC ${LIBSSH_LIBRARIES}) -+ target_link_libraries(exiv2lib PUBLIC ssh) - endif() - - if( EXIV2_ENABLE_CURL ) --- -2.24.0 - diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest index b7e39a2c5ebf..644f69642996 100644 --- a/media-gfx/gnome-photos/Manifest +++ b/media-gfx/gnome-photos/Manifest @@ -1 +1,2 @@ DIST gnome-photos-3.34.1.tar.xz 636916 BLAKE2B 3d041f3a8349164e12b8788b028edf23c0db1e671c5da4356dbdc01f5129e8dfabd3ee9df3af82b2794e22c1d8d894b7726068d69a605b0d598ec1dc21754470 SHA512 9ee1bf299f82b4a55d2642e34cfa82e0a3a362cd5e415acd5421d54430da5ea5a9f831ecf5ccf6966eea056c851fde57385f9224441be3d06e086be108d53227 +DIST gnome-photos-3.34.2.tar.xz 639992 BLAKE2B f189e7e1a831f4d19416b689733ef6a55822d57b5f1ea29a4dcb4fc06d5f9a450e45aaf53f65e392ac78e9959f7359f3df17827a326cfd6dbf8cc7d77cc0a367 SHA512 6315fb8e7623de48a42f1b47a2935c80f8f9f6db1ab724d1857697f673c4ca0d5ca1afa5c0d147455c3c0ad0224b85b52a220b1dd39a1409804bb75794d0a04b diff --git a/media-gfx/gnome-photos/gnome-photos-3.34.2.ebuild b/media-gfx/gnome-photos/gnome-photos-3.34.2.ebuild new file mode 100644 index 000000000000..33c329f5adce --- /dev/null +++ b/media-gfx/gnome-photos/gnome-photos-3.34.2.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7} ) + +inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg + +DESCRIPTION="Access, organize and share your photos on GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Photos" + +LICENSE="GPL-3+ LGPL-2+ CC0-1.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="flickr test upnp-av" +RESTRICT="!test? ( test )" + +DEPEND=" + media-libs/babl + >=x11-libs/cairo-1.14.0 + >=x11-libs/gdk-pixbuf-2.36.8:2 + >=media-libs/gegl-0.4.0:0.4[cairo,raw] + sci-geosciences/geocode-glib + >=media-libs/gexiv2-0.10.8 + >=dev-libs/glib-2.57.2:2 + >=net-libs/gnome-online-accounts-3.8.0:= + >=media-libs/grilo-0.3.5:0.3= + gnome-base/gsettings-desktop-schemas + >=x11-libs/gtk+-3.22.16:3 + >=dev-libs/libdazzle-3.26.0 + >=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts] + >=net-libs/libgfbgraph-0.2.1:0.2 + virtual/jpeg:0 + >=media-libs/libpng-1.6:0= + >=app-misc/tracker-2.0:0/2.0 + sys-apps/dbus +" +# gnome-online-miners is also used for google, facebook, DLNA - not only flickr +# but out of all the grilo-plugins, only upnp-av and flickr get used, which have USE flags here, +# so don't pull it always, but only if either USE flag is enabled. +# tracker-miners gschema used at runtime. +RDEPEND="${DEPEND} + net-misc/gnome-online-miners[flickr?] + upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] ) + flickr? ( media-plugins/grilo-plugins:0.3[flickr] ) + >=app-misc/tracker-miners-2 +" +BDEPEND=" + dev-libs/appstream-glib + dev-util/desktop-file-utils + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') ) +" + +DOCS=() # meson installs docs itself + +python_check_deps() { + use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + xdg_src_prepare + sed -i -e "/photos_docdir.*=.*join_paths/s/meson.project_name()/'${PF}'/" meson.build +} + +src_configure() { + local emesonargs=( + $(meson_use test dogtail) + -Dinstalled_tests=false + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/media-gfx/jhead/jhead-3.04.ebuild b/media-gfx/jhead/jhead-3.04.ebuild index 054679e94296..4cddaa652eab 100644 --- a/media-gfx/jhead/jhead-3.04.ebuild +++ b/media-gfx/jhead/jhead-3.04.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86" PATCHES=( "${FILESDIR}/${P}-mkstemp-fix-makefile.patch" ) diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest index 8b3319018dbc..b35cedb5a0a9 100644 --- a/media-gfx/nomacs/Manifest +++ b/media-gfx/nomacs/Manifest @@ -1,3 +1,2 @@ -DIST nomacs-3.12.tar.gz 1736648 BLAKE2B 533e18dec4be5d945213ccd629262a2cbae1eba93599f43be0a98d32d0b54d9caad7d963809f2fc9bb5c1ba682a39f44763b5d04e50c6e86658f6cd84324f3d2 SHA512 4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119 DIST nomacs-3.14.2.tar.gz 2169504 BLAKE2B 6050ddba3ddbdeb7d1fbd29831d5dfbee066b61398ef46be4145a287d565eb2d55d59f47bc9e9e34a10379f8e0e676ca1f5373389a0d35c27fe85cff5da3fded SHA512 58104c85078bdbff7f65625658bb01b152631470eea93a43494eed55ae5e2441b7bcf3ed6c8f1aef07831bc99c80af94467fcc0e15dc1d282ef313bfcb3c81e9 DIST nomacs-plugins-3.14.tar.gz 514472 BLAKE2B fe8e1608c0a0ed502ea82efe80a9cfab3a9aff3ca7e8cbecfcb199377d137f5c19ad176940ef1f1109938634af3548008da1311339e6da78b8b5b983102bebb6 SHA512 c0bca87e50b7b91d80a9d6afd95eeb1d6730b17b9a28ad4109514b36c42781b3f67b25f68f48c0953110d1e02bb03762e813af9c1ec2851c072b4aea74969cbd diff --git a/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch b/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch deleted file mode 100644 index ccf6ea31d9d5..000000000000 --- a/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 37805e3bc8753970127db101f4aa0c061bc5a70d Mon Sep 17 00:00:00 2001 -From: Michael Palimaka -Date: Sun, 9 Jun 2019 19:15:28 +1000 -Subject: [PATCH] Fix build with GCC9 - ---- - ImageLounge/src/DkCore/DkMetaData.cpp | 2 ++ - ImageLounge/src/DkGui/DkNoMacs.cpp | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/ImageLounge/src/DkCore/DkMetaData.cpp b/ImageLounge/src/DkCore/DkMetaData.cpp -index 7540f7b9..fe2bc7ec 100644 ---- a/src/DkCore/DkMetaData.cpp -+++ b/src/DkCore/DkMetaData.cpp -@@ -42,6 +42,8 @@ - #include - #pragma warning(pop) // no warnings from includes - end - -+#include -+ - namespace nmc { - - // DkMetaDataT -------------------------------------------------------------------- -diff --git a/ImageLounge/src/DkGui/DkNoMacs.cpp b/ImageLounge/src/DkGui/DkNoMacs.cpp -index edda14cd..8fcdb59c 100644 ---- a/src/DkGui/DkNoMacs.cpp -+++ b/src/DkGui/DkNoMacs.cpp -@@ -99,6 +99,8 @@ - - #include - -+#include -+ - namespace nmc { - - DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) { --- -2.21.0 - diff --git a/media-gfx/nomacs/nomacs-3.12.ebuild b/media-gfx/nomacs/nomacs-3.12.ebuild deleted file mode 100644 index a527bc46b3e8..000000000000 --- a/media-gfx/nomacs/nomacs-3.12.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg-utils - -DESCRIPTION="Qt-based image viewer" -HOMEPAGE="https://nomacs.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux" -IUSE="+jpeg +opencv raw tiff zip" - -REQUIRED_USE=" - raw? ( opencv ) - tiff? ( opencv ) -" - -RDEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5[jpeg?] - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - media-gfx/exiv2:= - opencv? ( >=media-libs/opencv-3.4:= ) - raw? ( media-libs/libraw:= ) - tiff? ( - dev-qt/qtimageformats:5 - media-libs/tiff:0 - ) - zip? ( dev-libs/quazip[qt5(+)] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -S="${WORKDIR}/${P}/ImageLounge" - -DOCS=( src/changelog.txt ) -PATCHES=( "${FILESDIR}/${P}-gcc9.patch" ) - -src_configure() { - local mycmakeargs=( - -DENABLE_CODE_COV=OFF - -DUSE_SYSTEM_QUAZIP=ON - -DENABLE_TRANSLATIONS=ON - -DENABLE_OPENCV=$(usex opencv) - -DENABLE_RAW=$(usex raw) - -DENABLE_TIFF=$(usex tiff) - -DENABLE_QUAZIP=$(usex zip) - ) - cmake_src_configure -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/media-gfx/nomacs/nomacs-3.14.2.ebuild b/media-gfx/nomacs/nomacs-3.14.2.ebuild index ff12e28b2c9e..399cf622d2d9 100644 --- a/media-gfx/nomacs/nomacs-3.14.2.ebuild +++ b/media-gfx/nomacs/nomacs-3.14.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux" +KEYWORDS="amd64 x86 ~amd64-linux" IUSE="+jpeg +opencv plugins raw tiff zip" REQUIRED_USE=" diff --git a/media-gfx/shotwell/shotwell-0.30.9.ebuild b/media-gfx/shotwell/shotwell-0.30.9.ebuild index 13b00763e4b1..37d81390d3f9 100644 --- a/media-gfx/shotwell/shotwell-0.30.9.ebuild +++ b/media-gfx/shotwell/shotwell-0.30.9.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86" IUSE="opencv udev" DEPEND=" diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest index f21314a075ae..a43c9c7858a6 100644 --- a/media-gfx/simple-scan/Manifest +++ b/media-gfx/simple-scan/Manifest @@ -1 +1,2 @@ DIST simple-scan-3.34.6.tar.xz 801064 BLAKE2B 94c6bc386c2d7701bd13067e384eb294ce145d2e02d66e366e76a2c85fb5e3ac4e9bae0efa37fe13d3fc857b57c1730bf01961f7968d6744a4ea4dc47308cb23 SHA512 7b2d0eab13f08d4110d2143c4572e249297891e3868e6eb178a7a765b2d56960820931fbda538ede318014c578871657aa0e27518d184f861efc18ad4fdd900c +DIST simple-scan-3.36.4.tar.xz 914688 BLAKE2B ae972cf6b5085d0e79fdfa9250aed655051b97239988b410e175b3058dda3ed5dc19b6574c015dd9a7afcbefd4d05cce6120b3648c061ff1e52043f866769a62 SHA512 780eeabd9593f14b2b04b9474bb1faebe3a32a7fd7e6b067c144fe44ad9b880f307bf80a8a925fb2549ca0b8172357c9a393146dfabd4b68bfc4396c32de4fa8 diff --git a/media-gfx/simple-scan/simple-scan-3.36.4.ebuild b/media-gfx/simple-scan/simple-scan-3.36.4.ebuild new file mode 100644 index 000000000000..a7a3d720bbeb --- /dev/null +++ b/media-gfx/simple-scan/simple-scan-3.36.4.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VALA_MIN_API_VERSION="0.34" +inherit gnome.org gnome2-utils meson vala xdg + +DESCRIPTION="Simple document scanning utility" +HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +IUSE="colord webp" + +DEPEND=" + >=dev-libs/glib-2.38:2 + >=x11-libs/gtk+-3.22:3 + >=sys-libs/zlib-1.2.3.1:= + x11-libs/cairo:= + x11-libs/gdk-pixbuf:2 + >=dev-libs/libgusb-0.2.7 + colord? ( >=x11-misc/colord-0.1.24:=[udev] ) + webp? ( media-libs/libwebp ) + >=media-gfx/sane-backends-1.0.20:= + + virtual/jpeg:0= +" +# packagekit? ( >=app-admin/packagekit-base-1.1.5 ) +RDEPEND="${DEPEND} + x11-misc/xdg-utils +" +BDEPEND=" + $(vala_depend) + dev-libs/libxml2:2 + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + dev-libs/libgusb[vala] + colord? ( x11-misc/colord[vala] ) +" + +PATCHES=( + # Add control for optional dependencies + "${FILESDIR}"/3.26-add-control-optional-deps.patch +) + +src_prepare() { + vala_src_prepare + xdg_src_prepare +} + +src_configure() { + local emesonargs=( + $(meson_use colord) + -Dpackagekit=false + $(meson_use webp) + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/media-gfx/xdot/xdot-1.1.ebuild b/media-gfx/xdot/xdot-1.1.ebuild index 56d384cda20b..1feb05b5fa48 100644 --- a/media-gfx/xdot/xdot-1.1.ebuild +++ b/media-gfx/xdot/xdot-1.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) MY_PN=xdot.py EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}" diff --git a/media-gfx/xdot/xdot-9999.ebuild b/media-gfx/xdot/xdot-9999.ebuild index 8eb74e58ccb6..6c4786522753 100644 --- a/media-gfx/xdot/xdot-9999.ebuild +++ b/media-gfx/xdot/xdot-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) MY_PN=xdot.py EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}" @@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" SRC_URI="" else - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" MY_P="${MY_PN}-${PV}" S="${WORKDIR}/${MY_P}" SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index f90270684d45..e3adf64bdba3 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/ganv/Manifest b/media-libs/ganv/Manifest index 4c2028e8ae3f..191d098b544c 100644 --- a/media-libs/ganv/Manifest +++ b/media-libs/ganv/Manifest @@ -1,2 +1 @@ -DIST ganv-1.4.2.tar.bz2 175510 BLAKE2B 4e6d7e411c78a516ea6603245ae13787607591b061d3856f305bcc4731f27ef46897d032a9b8a1f672776b41351823f89a2ddfeac40b47f584dbf638af79d466 SHA512 0609dea81cceb0c560286ad2f132f318c2d583af5163dcea4511155e78a022248dcb7ae535233493bdf906fb036422ebd4368d688123f3e1676c4e0398cbc6c2 DIST ganv-1.6.0.tar.bz2 377068 BLAKE2B f78c4783f0188fd163b087c789d50eb67a54a77d26d261d3557fba46a7bee09fc3326204273ad496d6b2ae262368015c3f186c290f2b85e6d5297eeed7596677 SHA512 05900aa63e65646e75f805dfe6ae5901efb19ae31a3f0a6730a713bfaffc47bb93f683879ce2a75093ea09e84a9d3137966b68b4ad307707753dead1df439a09 diff --git a/media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch b/media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch deleted file mode 100644 index 3fb29a7f0b54..000000000000 --- a/media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/Canvas.cpp b/src/Canvas.cpp -index c01021c..1c66a6c 100644 ---- a/src/Canvas.cpp -+++ b/src/Canvas.cpp -@@ -760,6 +760,18 @@ GanvCanvasImpl::layout_dot(const std::string& filename) - } - #endif - -+inline uint64_t -+get_monotonic_time() -+{ -+#if GLIB_CHECK_VERSION(2, 28, 0) -+ return g_get_monotonic_time(); -+#else -+ GTimeVal time; -+ g_get_current_time(&time); -+ return time.tv_sec + time.tv_usec; -+#endif -+} -+ - #ifdef GANV_FDGL - - inline Region -@@ -788,18 +800,6 @@ apply_force(GanvNode* a, GanvNode* b, const Vector& f) - b->impl->force = vec_sub(b->impl->force, f); - } - --inline uint64_t --get_monotonic_time() --{ --#if GLIB_CHECK_VERSION(2, 28, 0) -- return g_get_monotonic_time(); --#else -- GTimeVal time; -- g_get_current_time(&time); -- return time.tv_sec + time.tv_usec; --#endif --} -- - gboolean - GanvCanvasImpl::layout_iteration() - { diff --git a/media-libs/ganv/ganv-1.4.2-r1.ebuild b/media-libs/ganv/ganv-1.4.2-r1.ebuild deleted file mode 100644 index 1928d7753de0..000000000000 --- a/media-libs/ganv/ganv-1.4.2-r1.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 -# oes not work with python3 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+)' -inherit eutils flag-o-matic waf-utils python-any-r1 - -DESCRIPTION="A GTK+ widget for interactive graph-like environments" -HOMEPAGE="http://drobilla.net/software/ganv/" -SRC_URI="http://download.drobilla.net/${P}.tar.bz2" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+fdgl +graphviz introspection nls" - -RDEPEND=" - dev-cpp/glibmm:2 - dev-cpp/gtkmm:2.4 - x11-libs/gtk+:2 - graphviz? ( media-gfx/graphviz[gtk] ) - introspection? ( - app-text/yelp-tools - dev-libs/gobject-introspection:=[doctool] ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-util/glib-utils - nls? ( virtual/libintl ) -" - -PATCHES=( - "${FILESDIR}"/${P}-no-fdgl.patch -) - -src_configure() { - append-cxxflags -std=c++11 - waf-utils_src_configure \ - $(use graphviz || echo "--no-graphviz") \ - $(use fdgl || echo "--no-fdgl") \ - $(use nls || echo "--no-nls") \ - $(use introspection && echo "--gir") -} diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest index f5484decc33d..9b4983dc4f63 100644 --- a/media-libs/gexiv2/Manifest +++ b/media-libs/gexiv2/Manifest @@ -1,2 +1,3 @@ DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7 DIST gexiv2-0.12.0.tar.xz 370816 BLAKE2B 7768cffafedf41948ca6ddd22614f0eb3b44a317a23ade3c8d39d5ec5ff77c0d8c61dd8dcca5108b3403e0e3ec8be6659c16445de27163e8689c6c40f5313566 SHA512 c89e7d307359c718dff1f3991acb4ece66bce985a3d8bee1c8fccf4ce39187af62684c87eaae9b0425a6fdbf147b7330902041d9588e52a4bad1da4255d245e9 +DIST gexiv2-0.12.1.tar.xz 372104 BLAKE2B e712bc8056e0e02d66ee831425776c26b65275db8f4cb4a526dbe9f00bddc473312f6c4c8e011906ca02ff256c00c7fe8d602acd64c787b05e13ad582ff8ebee SHA512 cbf83ea79eead9aab15ba760217fd6a1b55a5c60059f14f243327ad7d3c09d6a0528dbdb33a8ee235c76dac5aab0afa8b7d2ab4367fe9128a096dce5da19a68d diff --git a/media-libs/gexiv2/gexiv2-0.12.1.ebuild b/media-libs/gexiv2/gexiv2-0.12.1.ebuild new file mode 100644 index 000000000000..f563da04ff2c --- /dev/null +++ b/media-libs/gexiv2/gexiv2-0.12.1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) + +inherit meson python-r1 vala + +DESCRIPTION="GObject-based wrapper around the Exiv2 library" +HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git" + inherit git-r3 +else + SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +fi + +LICENSE="LGPL-2.1+ GPL-2" +SLOT="0" +IUSE="gtk-doc +introspection python static-libs test +vala" +REQUIRED_USE=" + python? ( introspection ${PYTHON_REQUIRED_USE} ) + test? ( python introspection ) + vala? ( introspection ) +" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=media-gfx/exiv2-0.26:= + >=dev-libs/glib-2.46.0:2 + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) + python? ( ${PYTHON_DEPS} + dev-python/pygobject:3[${PYTHON_USEDEP}] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + gtk-doc? ( dev-util/gtk-doc + app-text/docbook-xml-dtd:4.3 ) + test? ( media-gfx/exiv2[xmp] ) + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +src_prepare() { + default + use vala && vala_src_prepare +} + +src_configure() { + local emesonargs=( + $(meson_use gtk-doc gtk_doc) + $(meson_use introspection) + $(meson_use vala vapi) + -Dtools=false # requires vala, freshly promoted tool that some other distros don't ship yet either + # Prevents installation of python modules (uses install_data from meson + # which does not optimize the modules) + -Dpython2_girdir=no + -Dpython3_girdir=no + ) + meson_src_configure +} + +src_install() { + meson_src_install + + if use python ; then + python_moduleinto gi/overrides/ + python_foreach_impl python_domodule GExiv2.py + fi +} diff --git a/media-libs/libglvnd/libglvnd-1.3.2.ebuild b/media-libs/libglvnd/libglvnd-1.3.2.ebuild index 4c976349c6d9..8fdda1d937f1 100644 --- a/media-libs/libglvnd/libglvnd-1.3.2.ebuild +++ b/media-libs/libglvnd/libglvnd-1.3.2.ebuild @@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd" if [[ ${PV} = 9999* ]]; then SRC_URI="" else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86" SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2" S=${WORKDIR}/${PN}-v${PV} fi diff --git a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild index 30981d2829ea..33043e6c0ca8 100644 --- a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild +++ b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://modplug-xmms.sourceforge.net/" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="static-libs" RDEPEND="" diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest index bcce992d6067..e55717b0fb51 100644 --- a/media-libs/libtgvoip/Manifest +++ b/media-libs/libtgvoip/Manifest @@ -1,3 +1 @@ -DIST libtgvoip-2.4.4_p20200430.tar.gz 1481816 BLAKE2B 82bf6b880f28c9b63f547e473547298e25ea3b7e35b3a832a7375b0ae3a745ea3b5d55f5e635ec678e388a608532a14de85f50828da1dbc9ed77dc23be64b9e0 SHA512 f3130c50dfa7d3f710809bb72fb71d1b246bc91e9f8f413e704499011c8ff01f87a7226315f7cfd6edf2d2b8b6c875508185f516792ff5db74556aface33cdb4 -DIST libtgvoip-2.4.4_p20200525.tar.gz 1482357 BLAKE2B 9324165a2818f3d6907fb80403c8df83e196e7566161d781f5608c2bc4fc0f34a4b69883202ac1a9d20d783d363534c11436cedcd24fa93c092eaca97369734e SHA512 5c9fbbccde8fb7dbe8076cda53a3ec80f633493c9b3016627307463dca3426623703cd28ea7ad360bd9ff7c062edecd04787b9f8a32c439cc6622d8680d624c0 DIST libtgvoip-2.4.4_p20200704.tar.gz 1090620 BLAKE2B 27880d296eef108613cb9330344bfc133efcd7b3fc82b7e793cf623187ff491f44021d1a47703949a0b830ae50106ed2d5b41e26cb6f5849b69b836a592112ff SHA512 ffff8ce9b991e03a2b0fb9b71e04311151081b7c682f728ae7d50a88a87470249d9f6841b24df3264245c5027a06da004d9022bf3652c4f11d03b2058e00d895 diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200430.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200430.ebuild deleted file mode 100644 index 3438d6218474..000000000000 --- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200430.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -EGIT_COMMIT="a045c9eea47b371c0c514c72c76172a211c894cb" - -DESCRIPTION="VoIP library for Telegram clients" -HOMEPAGE="https://github.com/telegramdesktop/libtgvoip" -SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="Unlicense" -SLOT="0" -KEYWORDS="amd64 ~ppc64" -IUSE="+alsa +dsp libressl pulseaudio" - -DEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - media-libs/opus:= - alsa? ( media-libs/alsa-lib ) - pulseaudio? ( media-sound/pulseaudio ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -REQUIRED_USE="|| ( alsa pulseaudio )" - -S="${WORKDIR}/${PN}-${EGIT_COMMIT}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf=( - --disable-static - $(use_enable dsp) - $(use_with alsa) - $(use_with pulseaudio pulse) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200525.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200525.ebuild deleted file mode 100644 index 89791a76dd27..000000000000 --- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200525.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -EGIT_COMMIT="d2e63429ec94ee178a62b55be01f1cca98e9de83" - -DESCRIPTION="VoIP library for Telegram clients" -HOMEPAGE="https://github.com/telegramdesktop/libtgvoip" -SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="Unlicense" -SLOT="0" -KEYWORDS="~amd64 ~ppc64" -IUSE="+alsa +dsp libressl pulseaudio" - -DEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - media-libs/opus:= - alsa? ( media-libs/alsa-lib ) - pulseaudio? ( media-sound/pulseaudio ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -REQUIRED_USE="|| ( alsa pulseaudio )" - -S="${WORKDIR}/${PN}-${EGIT_COMMIT}" - -src_prepare() { - default - sed -i 's/-std=gnu++0x/-std=gnu++17/' Makefile.am || die - eautoreconf -} - -src_configure() { - local myconf=( - --disable-static - $(use_enable dsp) - $(use_with alsa) - $(use_with pulseaudio pulse) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200704.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200704.ebuild index 23d709725b3d..cd168857e579 100644 --- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200704.ebuild +++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200704.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${EGIT_COMMIT}.tar LICENSE="Unlicense" SLOT="0" -KEYWORDS="~amd64 ~ppc64" +KEYWORDS="amd64 ~ppc64" IUSE="+alsa +dsp libressl pulseaudio" DEPEND=" diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest index 672643538928..86c0983182a9 100644 --- a/media-libs/lv2/Manifest +++ b/media-libs/lv2/Manifest @@ -1,2 +1 @@ -DIST lv2-1.16.0.tar.bz2 502116 BLAKE2B 00b364311f61b1a9f251d8eb3e27b66d4a59e313006df549dbb80fc6a1106b588bc59c7766910037ee093254d96e508f8538615666833b0c00c8282301bfe0e4 SHA512 ead6d590cded5dd7a548d6ffe0f2f9f8efadfa7bb9e8b4fa0aea6664ccdfbb3ca697514bddebe695a9442fba5b62714b5cd45c1bf7d0aaef12ffe50972c2d88c DIST lv2-1.18.0.tar.bz2 530172 BLAKE2B 2d9c7fe6e4de1d68762445061907873ff98871277fe0e423c34b0e9586cc8bfc7674787c020f3c01731204e80262a52902676f6cec8c8a6c18a97953cc626d3e SHA512 9e8dd9c1f30371260d21efc105b1d4d4ad03d9e332d4d3877d873f20b9527bcd0e917ff23fc6e0a9cc4337bda85882c742f225f7cf4fbc8a8a0964565c91f9d9 diff --git a/media-libs/lv2/files/lv2-1.16.0-python3.patch b/media-libs/lv2/files/lv2-1.16.0-python3.patch deleted file mode 100644 index 330fc4cfcac7..000000000000 --- a/media-libs/lv2/files/lv2-1.16.0-python3.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lv2specgen/lv2specgen.py b/lv2specgen/lv2specgen.py -index ddd0ba5..224ace8 100755 ---- a/lv2specgen/lv2specgen.py -+++ b/lv2specgen/lv2specgen.py -@@ -329,7 +329,7 @@ def getComment(m, urinode, classlist, proplist, instalist): - if have_lxml: - try: - # Parse and validate documentation as XHTML Basic 1.1 -- doc = """ -+ doc = """ - - -@@ -340,7 +340,7 @@ def getComment(m, urinode, classlist, proplist, instalist): - %s - - --""" % str(markup.decode()) -+""" % str(markup) - - oldcwd = os.getcwd() - os.chdir(specgendir) diff --git a/media-libs/lv2/lv2-1.16.0-r1.ebuild b/media-libs/lv2/lv2-1.16.0-r1.ebuild deleted file mode 100644 index d7b0d73f20b1..000000000000 --- a/media-libs/lv2/lv2-1.16.0-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{6,7} ) -PYTHON_REQ_USE='threads(+)' - -inherit python-single-r1 waf-utils multilib-build multilib-minimal - -DESCRIPTION="A simple but extensible successor of LADSPA" -HOMEPAGE="https://lv2plug.in/" -SRC_URI="https://lv2plug.in/spec/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86" -IUSE="doc plugins" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - plugins? ( virtual/pkgconfig ) - doc? ( app-doc/doxygen dev-python/rdflib ) -" -CDEPEND=" - ${PYTHON_DEPS} - plugins? ( x11-libs/gtk+:2 media-libs/libsndfile ) -" -DEPEND="${CDEPEND}" -RDEPEND=" - ${CDEPEND} - $(python_gen_cond_dep ' - dev-python/lxml[${PYTHON_MULTI_USEDEP}] - dev-python/pygments[${PYTHON_MULTI_USEDEP}] - dev-python/rdflib[${PYTHON_MULTI_USEDEP}] - ') -" -DOCS=( "README.md" "NEWS" ) - -PATCHES=( - "${FILESDIR}/${P}-python3.patch" -) - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_configure() { - waf-utils_src_configure \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --lv2dir="${EPREFIX}"/usr/$(get_libdir)/lv2 \ - $(use plugins || echo " --no-plugins") \ - $(multilib_native_usex doc --docs "") -} - -multilib_src_install() { - waf-utils_src_install -} - -multilib_src_install_all() { - python_fix_shebang "${D}" -} diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml index 94e2b3de135a..dae5f6d74dd8 100644 --- a/media-libs/mlt/metadata.xml +++ b/media-libs/mlt/metadata.xml @@ -17,7 +17,6 @@ Build motion tracking module using media-libs/opencv Build SWIG bindings for Python Builds rtaudio consumer for native audio support on multiple platforms. - Build SWIG bindings for Ruby Enabled video stabilization with media-libs/vidstab. ServiceWorkerVersion - --([2] std::unique_ptr)--> ServiceWorkerProviderHost - --([3] std::unique_ptr)--> ServiceWorkerContainerHost - --([4] std::unique_ptr)--> ServiceWorkerObjectHost - -Note that ServiceWorkerContainerHost manages ServiceWorkerObjectHost in -map>. - -When ServiceWorkerObjectHost::OnConnectionError() is called, the -function removes the reference [4] from the map, and destroys -ServiceWorkerObjectHost. If the object host has the last reference [1] -to ServiceWorkerVersion, the destruction also cuts off the references -[2] and [3], and destroys ServiceWorkerProviderHost and -ServiceWorkerContainerHost. - -This seems to work well on the Chromium's default toolchain, but not -work on the GCC toolchain. According to the report, destruction of -ServiceWorkerContainerHost happens while the map owned by the container -host is erasing the ServiceWorkerObjectHost, and this results in crash -due to double destruction of the object host. - -I don't know the reason why this happens only on the GCC toolchain, but -I suspect the order of object destruction on std::map::erase() could be -different depending on the toolchains. - -> How does this CL fix this? - -The ideal fix is to redesign the ownership model of -ServiceWorkerVersion, but it's not feasible in the short term. - -Instead, this CL avoids destruction of ServiceWorkerObjectHost on -std::map::erase(). The new code takes the ownership of the object host -from the map first, and then erases the entry from the map. This -separates timings to erase the map entry and to destroy the object host, -so the crash should no longer happen. - -Bug: 1056598 -Change-Id: Id30654cb575bc557c42044d6f0c6f1f9bfaed613 ---- - -diff --git a/content/browser/service_worker/service_worker_container_host.cc b/content/browser/service_worker/service_worker_container_host.cc -index c631bcd..ff917f8 100644 ---- a/content/browser/service_worker/service_worker_container_host.cc -+++ b/content/browser/service_worker/service_worker_container_host.cc -@@ -717,6 +717,16 @@ - int64_t version_id) { - DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); - DCHECK(base::Contains(service_worker_object_hosts_, version_id)); -+ -+ // ServiceWorkerObjectHost to be deleted may have the last reference to -+ // ServiceWorkerVersion that indirectly owns this ServiceWorkerContainerHost. -+ // If we erase the object host directly from the map, |this| could be deleted -+ // during the map operation and may crash. To avoid the case, we take the -+ // ownership of the object host from the map first, and then erase the entry -+ // from the map. See https://crbug.com/1056598 for details. -+ std::unique_ptr to_be_deleted = -+ std::move(service_worker_object_hosts_[version_id]); -+ DCHECK(to_be_deleted); - service_worker_object_hosts_.erase(version_id); - } - -diff --git a/content/browser/service_worker/service_worker_object_host_unittest.cc b/content/browser/service_worker/service_worker_object_host_unittest.cc -index 238cb8b..f60c7a2 100644 ---- a/content/browser/service_worker/service_worker_object_host_unittest.cc -+++ b/content/browser/service_worker/service_worker_object_host_unittest.cc -@@ -200,6 +200,19 @@ - return registration_info; - } - -+ void CallOnConnectionError(ServiceWorkerContainerHost* container_host, -+ int64_t version_id) { -+ // ServiceWorkerObjectHost has the last reference to the version. -+ ServiceWorkerObjectHost* object_host = -+ GetServiceWorkerObjectHost(container_host, version_id); -+ EXPECT_TRUE(object_host->version_->HasOneRef()); -+ -+ // Make sure that OnConnectionError induces destruction of the version and -+ // the object host. -+ object_host->receivers_.Clear(); -+ object_host->OnConnectionError(); -+ } -+ - BrowserTaskEnvironment task_environment_; - std::unique_ptr helper_; - scoped_refptr registration_; -@@ -409,5 +422,30 @@ - events[0]->source_info_for_client->client_type); - } - -+// This is a regression test for https://crbug.com/1056598. -+TEST_F(ServiceWorkerObjectHostTest, OnConnectionError) { -+ const GURL scope("https://www.example.com/"); -+ const GURL script_url("https://www.example.com/service_worker.js"); -+ Initialize(std::make_unique(base::FilePath())); -+ SetUpRegistration(scope, script_url); -+ -+ // Create the provider host. -+ ASSERT_EQ(blink::ServiceWorkerStatusCode::kOk, -+ StartServiceWorker(version_.get())); -+ -+ // Set up the case where the last reference to the version is owned by the -+ // service worker object host. -+ ServiceWorkerContainerHost* container_host = -+ version_->provider_host()->container_host(); -+ ServiceWorkerVersion* version_rawptr = version_.get(); -+ version_ = nullptr; -+ ASSERT_TRUE(version_rawptr->HasOneRef()); -+ -+ // Simulate the connection error that induces the object host destruction. -+ // This shouldn't crash. -+ CallOnConnectionError(container_host, version_rawptr->version_id()); -+ base::RunLoop().RunUntilIdle(); -+} -+ - } // namespace service_worker_object_host_unittest - } // namespace content diff --git a/www-client/chromium/files/chromium-83-gcc-template.patch b/www-client/chromium/files/chromium-83-gcc-template.patch deleted file mode 100644 index 27365220b031..000000000000 --- a/www-client/chromium/files/chromium-83-gcc-template.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 8d115ddda495d0d2e1e1447392db6e9e6a8a1b32 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Tue, 07 Apr 2020 00:23:57 +0000 -Subject: [PATCH] GCC: fix template specialization in WTF::VectorMover - -GCC complains that explicit specialization in non-namespace scope -is happening for MoveOverlappingImpl. However, secialization is -not really necessary here with templates and can be moved -into MoveOverlappingImpl method without changing generated code. - -Bug: 819294 -Change-Id: I90b893b9701748302f7b900fbcc2c341685fe0d3 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2126290 -Reviewed-by: Kent Tamura -Commit-Queue: Kent Tamura -Cr-Commit-Position: refs/heads/master@{#756880} ---- - -diff --git a/third_party/blink/renderer/platform/wtf/vector.h b/third_party/blink/renderer/platform/wtf/vector.h -index 632d308..82aaf96 100644 ---- a/third_party/blink/renderer/platform/wtf/vector.h -+++ b/third_party/blink/renderer/platform/wtf/vector.h -@@ -205,30 +205,23 @@ - } - } - -- template -- static void MoveOverlappingImpl(const T* src, const T* src_end, T* dst); -- template <> -- static void MoveOverlappingImpl(const T* src, -- const T* src_end, -- T* dst) { -- memmove(dst, src, -- reinterpret_cast(src_end) - -- reinterpret_cast(src)); -- } -- template <> -- static void MoveOverlappingImpl(const T* src, -- const T* src_end, -- T* dst) { -- if (src == dst) -- return; -- if (dst < src) { -- for (; src < src_end; ++src, ++dst) -- AtomicWriteMemcpy(dst, src); -+ static void MoveOverlappingImpl(const T* src, const T* src_end, T* dst) { -+ if (Allocator::kIsGarbageCollected) { -+ if (src == dst) -+ return; -+ if (dst < src) { -+ for (; src < src_end; ++src, ++dst) -+ AtomicWriteMemcpy(dst, src); -+ } else { -+ --src_end; -+ T* dst_end = dst + (src_end - src); -+ for (; src_end >= src; --src_end, --dst_end) -+ AtomicWriteMemcpy(dst_end, src_end); -+ } - } else { -- --src_end; -- T* dst_end = dst + (src_end - src); -- for (; src_end >= src; --src_end, --dst_end) -- AtomicWriteMemcpy(dst_end, src_end); -+ memmove(dst, src, -+ reinterpret_cast(src_end) - -+ reinterpret_cast(src)); - } - } - diff --git a/www-client/chromium/files/chromium-83-icu67.patch b/www-client/chromium/files/chromium-83-icu67.patch deleted file mode 100644 index d45d9e810a4e..000000000000 --- a/www-client/chromium/files/chromium-83-icu67.patch +++ /dev/null @@ -1,170 +0,0 @@ -From 3f8dc4b2e5baf77b463334c769af85b79d8c1463 Mon Sep 17 00:00:00 2001 -From: Frank Tang -Date: Fri, 03 Apr 2020 23:13:54 -0700 -Subject: [PATCH] [intl] Remove soon-to-be removed getAllFieldPositions - -Needed to land ICU67.1 soon. - -Bug: v8:10393 -Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618 -Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489 -Reviewed-by: Jakob Kummerow -Commit-Queue: Frank Tang -Cr-Commit-Position: refs/heads/master@{#67027} ---- - -diff --git a/v8/src/objects/js-number-format.cc b/v8/src/objects/js-number-format.cc -index ad831c5..bcd4403 100644 ---- a/v8/src/objects/js-number-format.cc -+++ b/v8/src/objects/js-number-format.cc -@@ -1241,44 +1241,33 @@ - } - - namespace { --Maybe IcuFormatNumber( -+Maybe IcuFormatNumber( - Isolate* isolate, - const icu::number::LocalizedNumberFormatter& number_format, -- Handle numeric_obj, icu::FieldPositionIterator* fp_iter) { -+ Handle numeric_obj, icu::number::FormattedNumber* formatted) { - // If it is BigInt, handle it differently. - UErrorCode status = U_ZERO_ERROR; -- icu::number::FormattedNumber formatted; - if (numeric_obj->IsBigInt()) { - Handle big_int = Handle::cast(numeric_obj); - Handle big_int_string; - ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string, - BigInt::ToString(isolate, big_int), -- Nothing()); -- formatted = number_format.formatDecimal( -+ Nothing()); -+ *formatted = number_format.formatDecimal( - {big_int_string->ToCString().get(), big_int_string->length()}, status); - } else { - double number = numeric_obj->IsNaN() - ? std::numeric_limits::quiet_NaN() - : numeric_obj->Number(); -- formatted = number_format.formatDouble(number, status); -+ *formatted = number_format.formatDouble(number, status); - } - if (U_FAILURE(status)) { - // This happen because of icu data trimming trim out "unit". - // See https://bugs.chromium.org/p/v8/issues/detail?id=8641 -- THROW_NEW_ERROR_RETURN_VALUE(isolate, -- NewTypeError(MessageTemplate::kIcuError), -- Nothing()); -+ THROW_NEW_ERROR_RETURN_VALUE( -+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing()); - } -- if (fp_iter) { -- formatted.getAllFieldPositions(*fp_iter, status); -- } -- icu::UnicodeString result = formatted.toString(status); -- if (U_FAILURE(status)) { -- THROW_NEW_ERROR_RETURN_VALUE(isolate, -- NewTypeError(MessageTemplate::kIcuError), -- Nothing()); -- } -- return Just(result); -+ return Just(true); - } - - } // namespace -@@ -1289,10 +1278,16 @@ - Handle numeric_obj) { - DCHECK(numeric_obj->IsNumeric()); - -- Maybe maybe_format = -- IcuFormatNumber(isolate, number_format, numeric_obj, nullptr); -+ icu::number::FormattedNumber formatted; -+ Maybe maybe_format = -+ IcuFormatNumber(isolate, number_format, numeric_obj, &formatted); - MAYBE_RETURN(maybe_format, Handle()); -- return Intl::ToString(isolate, maybe_format.FromJust()); -+ UErrorCode status = U_ZERO_ERROR; -+ icu::UnicodeString result = formatted.toString(status); -+ if (U_FAILURE(status)) { -+ THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String); -+ } -+ return Intl::ToString(isolate, result); - } - - namespace { -@@ -1405,12 +1400,18 @@ - } - - namespace { --Maybe ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, -- icu::FieldPositionIterator* fp_iter, -+Maybe ConstructParts(Isolate* isolate, -+ icu::number::FormattedNumber* formatted, - Handle result, int start_index, - Handle numeric_obj, bool style_is_unit) { -+ UErrorCode status = U_ZERO_ERROR; -+ icu::UnicodeString formatted_text = formatted->toString(status); -+ if (U_FAILURE(status)) { -+ THROW_NEW_ERROR_RETURN_VALUE( -+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing()); -+ } - DCHECK(numeric_obj->IsNumeric()); -- int32_t length = formatted.length(); -+ int32_t length = formatted_text.length(); - int index = start_index; - if (length == 0) return Just(index); - -@@ -1419,13 +1420,14 @@ - // other region covers some part of the formatted string. It's possible - // there's another field with exactly the same begin and end as this backdrop, - // in which case the backdrop's field_id of -1 will give it lower priority. -- regions.push_back(NumberFormatSpan(-1, 0, formatted.length())); -+ regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length())); - - { -- icu::FieldPosition fp; -- while (fp_iter->next(fp)) { -- regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(), -- fp.getEndIndex())); -+ icu::ConstrainedFieldPosition cfp; -+ cfp.constrainCategory(UFIELD_CATEGORY_NUMBER); -+ while (formatted->nextPosition(cfp, status)) { -+ regions.push_back( -+ NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit())); - } - } - -@@ -1447,7 +1449,7 @@ - Handle substring; - ASSIGN_RETURN_ON_EXCEPTION_VALUE( - isolate, substring, -- Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos), -+ Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos), - Nothing()); - Intl::AddElement(isolate, result, index, field_type_string, substring); - ++index; -@@ -1467,20 +1469,19 @@ - number_format->icu_number_formatter().raw(); - CHECK_NOT_NULL(fmt); - -- icu::FieldPositionIterator fp_iter; -- Maybe maybe_format = -- IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter); -+ icu::number::FormattedNumber formatted; -+ Maybe maybe_format = -+ IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted); - MAYBE_RETURN(maybe_format, Handle()); -- - UErrorCode status = U_ZERO_ERROR; -+ - bool style_is_unit = - Style::UNIT == StyleFromSkeleton(fmt->toSkeleton(status)); - CHECK(U_SUCCESS(status)); - - Handle result = factory->NewJSArray(0); -- Maybe maybe_format_to_parts = -- ConstructParts(isolate, maybe_format.FromJust(), &fp_iter, result, 0, -- numeric_obj, style_is_unit); -+ Maybe maybe_format_to_parts = ConstructParts( -+ isolate, &formatted, result, 0, numeric_obj, style_is_unit); - MAYBE_RETURN(maybe_format_to_parts, Handle()); - - return result; diff --git a/www-client/chromium/files/chromium-blink-style_format.patch b/www-client/chromium/files/chromium-blink-style_format.patch deleted file mode 100644 index 7c9bc9e46046..000000000000 --- a/www-client/chromium/files/chromium-blink-style_format.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py b/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py -index d50a6c1..e0ff436 100644 ---- a/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py -+++ b/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py -@@ -149,12 +149,4 @@ def write_code_node_to_file(code_node, filepath): - - rendered_text = render_code_node(code_node) - -- format_result = style_format.auto_format(rendered_text, filename=filepath) -- if not format_result.did_succeed: -- raise RuntimeError("Style-formatting failed: filename = {filename}\n" -- "---- stderr ----\n" -- "{stderr}:".format( -- filename=format_result.filename, -- stderr=format_result.error_message)) -- -- web_idl.file_io.write_to_file_if_changed(filepath, format_result.contents) -+ web_idl.file_io.write_to_file_if_changed(filepath, rendered_text) diff --git a/www-client/chromium/files/chromium-compiler-r12.patch b/www-client/chromium/files/chromium-compiler-r12.patch deleted file mode 100644 index a17cc4b52c8d..000000000000 --- a/www-client/chromium/files/chromium-compiler-r12.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 907b74447f4a35d5a8e851c73c15cc951a2e446b Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Fri, 20 Mar 2020 09:14:25 +0000 -Subject: [PATCH] Disable various compiler configs - ---- - build/config/compiler/BUILD.gn | 61 +++++++++++++--------------------- - 1 file changed, 23 insertions(+), 38 deletions(-) - -diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 9573394..d35e736 100644 ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -261,8 +261,6 @@ config("compiler") { - - configs += [ - # See the definitions below. -- ":clang_revision", -- ":compiler_cpu_abi", - ":compiler_codegen", - ":compiler_deterministic", - ] -@@ -487,20 +485,6 @@ config("compiler") { - } - } - -- if (is_clang && !is_nacl && !use_xcode_clang) { -- cflags += [ "-fcrash-diagnostics-dir=" + -- rebase_path("//tools/clang/crashreports", root_build_dir) ] -- -- cflags += [ -- # TODO(hans): Remove this once Clang generates better optimized debug info -- # by default. https://crbug.com/765793 -- "-Xclang", -- "-mllvm", -- "-Xclang", -- "-instcombine-lower-dbg-declare=0", -- ] -- } -- - # C11/C++11 compiler flags setup. - # --------------------------- - if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") { -@@ -1431,6 +1415,12 @@ config("default_warnings") { - cflags_cc += [ "-Wno-class-memaccess" ] - } - -+ # -Wno-class-memaccess warns about hash table and vector in blink. -+ # But the violation is intentional. -+ if (!is_nacl) { -+ cflags_cc += [ "-Wno-class-memaccess" ] -+ } -+ - # -Wunused-local-typedefs is broken in gcc, - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63872 - cflags += [ "-Wno-unused-local-typedefs" ] -@@ -1559,7 +1549,7 @@ config("chromium_code") { - defines = [ "_HAS_NODISCARD" ] - } - } else { -- cflags = [ "-Wall" ] -+ cflags = [] - if (treat_warnings_as_errors) { - cflags += [ "-Werror" ] - -@@ -1568,10 +1558,6 @@ config("chromium_code") { - # well. - ldflags = [ "-Werror" ] - } -- if (is_clang) { -- # Enable extra warnings for chromium_code when we control the compiler. -- cflags += [ "-Wextra" ] -- } - - # In Chromium code, we define __STDC_foo_MACROS in order to get the - # C99 macros on Mac and Linux. -@@ -1580,15 +1566,6 @@ config("chromium_code") { - "__STDC_FORMAT_MACROS", - ] - -- if (!is_debug && !using_sanitizer && current_cpu != "s390x" && -- current_cpu != "s390" && current_cpu != "ppc64" && -- current_cpu != "mips" && current_cpu != "mips64") { -- # Non-chromium code is not guaranteed to compile cleanly with -- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are -- # disabled, so only do that for Release build. -- defines += [ "_FORTIFY_SOURCE=2" ] -- } -- - if (is_mac) { - cflags_objc = [ "-Wobjc-missing-property-synthesis" ] - cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] -@@ -1980,7 +1957,8 @@ config("default_stack_frames") { - } - - # Default "optimization on" config. --config("optimize") { -+config("optimize") { } -+config("xoptimize") { - if (is_win) { - # Favor size over speed, /O1 must be before the common flags. - # /O1 implies /Os and /GF. -@@ -2001,7 +1979,8 @@ config("optimize") { - } - - # Turn off optimizations. --config("no_optimize") { -+config("no_optimize") { } -+config("xno_optimize") { - if (is_win) { - cflags = [ - "/Od", # Disable optimization. -@@ -2035,7 +2014,8 @@ config("no_optimize") { - # Turns up the optimization level. On Windows, this implies whole program - # optimization and link-time code generation which is very expensive and should - # be used sparingly. --config("optimize_max") { -+config("optimize_max") { } -+config("xoptimize_max") { - if (is_nacl && is_nacl_irt) { - # The NaCl IRT is a special case and always wants its own config. - # Various components do: -@@ -2067,7 +2047,8 @@ config("optimize_max") { - # - # TODO(crbug.com/621335) - rework how all of these configs are related - # so that we don't need this disclaimer. --config("optimize_speed") { -+config("optimize_speed") { } -+config("xoptimize_speed") { - if (is_nacl && is_nacl_irt) { - # The NaCl IRT is a special case and always wants its own config. - # Various components do: -@@ -2092,7 +2073,8 @@ config("optimize_speed") { - } - } - --config("optimize_fuzzing") { -+config("optimize_fuzzing") { } -+config("xoptimize_fuzzing") { - cflags = [ "-O1" ] + common_optimize_on_cflags - ldflags = common_optimize_on_ldflags - visibility = [ ":default_optimization" ] -@@ -2208,7 +2190,8 @@ config("win_pdbaltpath") { - } - - # Full symbols. --config("symbols") { -+config("symbols") { } -+config("xsymbols") { - if (is_win) { - if (is_clang) { - cflags = [ "/Z7" ] # Debug information in the .obj files. -@@ -2314,7 +2297,8 @@ config("symbols") { - # Minimal symbols. - # This config guarantees to hold symbol for stack trace which are shown to user - # when crash happens in unittests running on buildbot. --config("minimal_symbols") { -+config("minimal_symbols") { } -+config("xminimal_symbols") { - if (is_win) { - # Functions, files, and line tables only. - cflags = [] -@@ -2371,7 +2355,8 @@ config("minimal_symbols") { - # This configuration contains function names only. That is, the compiler is - # told to not generate debug information and the linker then just puts function - # names in the final debug information. --config("no_symbols") { -+config("no_symbols") { } -+config("xno_symbols") { - if (is_win) { - ldflags = [ "/DEBUG" ] - --- -2.24.1 - diff --git a/www-client/chromium/files/chromium-fix-char_traits.patch b/www-client/chromium/files/chromium-fix-char_traits.patch deleted file mode 100644 index 4cb9503a93f4..000000000000 --- a/www-client/chromium/files/chromium-fix-char_traits.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/base/strings/char_traits.h -+++ b/base/strings/char_traits.h -@@ -67,9 +67,9 @@ - return __builtin_memcmp(s1, s2, n); - #else - for (; n; --n, ++s1, ++s2) { -- if (*s1 < *s2) -+ if ((unsigned char)*s1 < (unsigned char)*s2) - return -1; -- if (*s1 > *s2) -+ if ((unsigned char)*s1 > (unsigned char)*s2) - return 1; - } - return 0; diff --git a/www-client/chromium/files/chromium-launcher-r3.sh b/www-client/chromium/files/chromium-launcher-r3.sh deleted file mode 100644 index a4fc1a95394a..000000000000 --- a/www-client/chromium/files/chromium-launcher-r3.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -# Allow the user to override command-line flags, bug #357629. -# This is based on Debian's chromium-browser package, and is intended -# to be consistent with Debian. -for f in /etc/chromium/*; do - [[ -f ${f} ]] && source "${f}" -done - -# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system -# default CHROMIUM_FLAGS (from /etc/chromium/default). -CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"} - -# Let the wrapped binary know that it has been run through the wrapper -export CHROME_WRAPPER=$(readlink -f "$0") - -PROGDIR=${CHROME_WRAPPER%/*} - -case ":$PATH:" in - *:$PROGDIR:*) - # $PATH already contains $PROGDIR - ;; - *) - # Append $PROGDIR to $PATH - export PATH="$PATH:$PROGDIR" - ;; -esac - -if [[ ${EUID} == 0 && -O ${XDG_CONFIG_HOME:-${HOME}} ]]; then - # Running as root with HOME owned by root. - # Pass --user-data-dir to work around upstream failsafe. - CHROMIUM_FLAGS="--user-data-dir=${XDG_CONFIG_HOME:-${HOME}/.config}/chromium - ${CHROMIUM_FLAGS}" -fi - -# Set the .desktop file name -export CHROME_DESKTOP="chromium-browser-chromium.desktop" - -exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@" diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest index 4627f7cdc3a6..6161c26502f2 100644 --- a/www-client/epiphany/Manifest +++ b/www-client/epiphany/Manifest @@ -1,3 +1,4 @@ DIST epiphany-3.30.5.tar.xz 4532136 BLAKE2B 7c42e7ff5624bd85c380da97b2ca057b59d4dc77bec85f33bab755032b519db10ee52aa93c503e5b1f57c5acfce5a9b3decc7dddfacc3d68ea620eb884ec2da3 SHA512 1d31022e91a5ac79a032ebf988d4f8828cfa38a2b67e06b9432e479d7ebc93d3a08338261b92dfe3f37b6f745aeb5286b4acc65c537d935c1ace61ad9a494b7d DIST epiphany-3.32.6.tar.xz 5469624 BLAKE2B 96e35001482c4062917d160d4b3e851ebf83850cc6d9d449e8c62c5d5c44d3fbab4ff0121c265ed363fa1e686d2ff9797a7dff8fe100a138aa72217fb8ba4183 SHA512 2d2fc57deb798c7666e2b7f9859318c1e9ae5477a79ccc3bb4f6de79edfc34c6096493306047ad2134a466da932e825d59881e896136ea7a0586fbd36177b0c4 DIST epiphany-3.34.4.tar.xz 5295624 BLAKE2B c1867f62f1a0675466e2679d7f9e568abac6a4f3f56c498abfdc3d4ca4510696c4e9cbcab99a8be90bb50c77b04bcb86456a82dbefa76a2a7ec2c6b373ce9c39 SHA512 d9700196e0397032dd84d1fbf14d193f4212dd8dc054320267b4dfc8a59246de9c93fb786ba76463f0c09e7997b26efa17288cc06eddd0fb4aad2e4bdd4276ce +DIST epiphany-3.36.3.tar.xz 5812928 BLAKE2B 95107ba0c8124ef93fa3557b02e5d5f0a15a93dc393c195b1881157087336d675b0f91eb88b8ba9a249a51b22b62bd0b483bddf1291c69fc4594d29a85296907 SHA512 2125ea688456daea9d75d0e44c52470b44f36b0650255fd316b08cf97d214ccb2a71f3215b64891b0c4bd8b645fe1593c88923fb61e25f4cb6630b6ceb050d12 diff --git a/www-client/epiphany/epiphany-3.30.5.ebuild b/www-client/epiphany/epiphany-3.30.5.ebuild index ec8f7ca7476d..3d3d9d9b9c00 100644 --- a/www-client/epiphany/epiphany-3.30.5.ebuild +++ b/www-client/epiphany/epiphany-3.30.5.ebuild @@ -12,7 +12,7 @@ LICENSE="GPL-3+" SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86" COMMON_DEPEND=" >=dev-libs/glib-2.52.0:2 diff --git a/www-client/epiphany/epiphany-3.32.6.ebuild b/www-client/epiphany/epiphany-3.32.6.ebuild index 8ddceca44c5d..ea862f8274ea 100644 --- a/www-client/epiphany/epiphany-3.32.6.ebuild +++ b/www-client/epiphany/epiphany-3.32.6.ebuild @@ -12,7 +12,7 @@ LICENSE="GPL-3+" SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" DEPEND=" >=dev-libs/glib-2.56.0:2 diff --git a/www-client/epiphany/epiphany-3.36.3.ebuild b/www-client/epiphany/epiphany-3.36.3.ebuild new file mode 100644 index 000000000000..cb71443d35d5 --- /dev/null +++ b/www-client/epiphany/epiphany-3.36.3.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org gnome2-utils meson xdg virtualx + +DESCRIPTION="GNOME webbrowser based on Webkit" +HOMEPAGE="https://wiki.gnome.org/Apps/Web" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=" + >=dev-libs/glib-2.61.2:2 + >=x11-libs/gtk+-3.24.0:3 + >=dev-libs/nettle-3.4:= + >=net-libs/webkit-gtk-2.27.4:4= + >=x11-libs/cairo-1.2 + >=app-crypt/gcr-3.5.5:=[gtk] + >=x11-libs/gdk-pixbuf-2.36.5:2 + gnome-base/gsettings-desktop-schemas + >=app-text/iso-codes-0.35 + >=dev-libs/json-glib-1.2.4 + >=dev-libs/libdazzle-3.35.3 + >=gui-libs/libhandy-0.0.10:0.0= + >=x11-libs/libnotify-0.5.1 + >=app-crypt/libsecret-0.19 + >=net-libs/libsoup-2.48.0:2.4 + >=dev-libs/libxml2-2.6.12:2 + dev-db/sqlite:3 + dev-libs/gmp:0= +" +RDEPEND="${DEPEND} + x11-themes/adwaita-icon-theme +" +# appstream-glib needed for appdata.xml gettext translation +BDEPEND=" + dev-libs/appstream-glib + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + # Allow /var/tmp prefixed recursive delete (due to package manager setting TMPDIR) + "${FILESDIR}"/var-tmp-tests.patch +) + +src_configure() { + local emesonargs=( + -Ddeveloper_mode=false + # maybe enable later if network-sandbox is off, but in 3.32.4 the network test + # is commented out upstream anyway + -Dnetwork_tests=disabled + -Dtech_preview=false + $(meson_feature test unit_tests) + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + + if ! has_version net-libs/webkit-gtk[jpeg2k]; then + ewarn "Your net-libs/webkit-gtk is built without USE=jpeg2k." + ewarn "Various image galleries/managers may be broken." + fi +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/www-client/firefox/firefox-68.10.0.ebuild b/www-client/firefox/firefox-68.10.0.ebuild index d89f2d5dca3e..3aeb9504f10d 100644 --- a/www-client/firefox/firefox-68.10.0.ebuild +++ b/www-client/firefox/firefox-68.10.0.ebuild @@ -146,6 +146,7 @@ DEPEND="${CDEPEND} sys-apps/findutils virtual/pkgconfig >=virtual/rust-1.34.0 + =virtual/rust-1.45.0" ; then + einfo "Unbreak build with >=rust-1.45.0, bmo#1640982 ..." + sed -i \ + -e 's/\(^cargo_rustc_flags +=.* \)-Clto\( \|$\)/\1/' \ + "${S}/config/makefiles/rust.mk" || die + fi + # Autotools configure is now called old-configure.in # This works because there is still a configure.in that happens to be for the # shell wrapper configure script diff --git a/www-client/seamonkey/files/seamonkey-2.53.3-rust-1.45.0.patch b/www-client/seamonkey/files/seamonkey-2.53.3-rust-1.45.0.patch new file mode 100644 index 000000000000..e2c6aa20161b --- /dev/null +++ b/www-client/seamonkey/files/seamonkey-2.53.3-rust-1.45.0.patch @@ -0,0 +1,15 @@ +--- seamonkey-2.53.3/mozilla/config/rules.mk ++++ seamonkey-2.53.3/mozilla/config/rules.mk +@@ -871,12 +871,6 @@ + # These flags are passed via `cargo rustc` and only apply to the final rustc + # invocation (i.e., only the top-level crate, not its dependencies). + cargo_rustc_flags = $(CARGO_RUSTCFLAGS) +-ifndef DEVELOPER_OPTIONS +-ifndef MOZ_DEBUG_RUST +-# Enable link-time optimization for release builds. +-cargo_rustc_flags += -C lto +-endif +-endif + + rustflags_override = RUSTFLAGS='$(MOZ_RUST_DEFAULT_FLAGS) $(RUSTFLAGS)' + diff --git a/www-client/seamonkey/seamonkey-2.53.3.ebuild b/www-client/seamonkey/seamonkey-2.53.3.ebuild index 8d4b46d1b783..c81cbe49b6a7 100644 --- a/www-client/seamonkey/seamonkey-2.53.3.ebuild +++ b/www-client/seamonkey/seamonkey-2.53.3.ebuild @@ -189,6 +189,11 @@ src_prepare() { edos2unix "${file}" done + if has_version ">=virtual/rust-1.45.0" ; then + einfo "Unbreak build with >=rust-1.45.0, bmo#1640982 ..." + eapply "${FILESDIR}/${PN}-2.53.3-rust-1.45.0.patch" + fi + # Allow user to apply any additional patches without modifing ebuild eapply_user diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz index 77e1e1021bc6..7b74276fd8e5 100644 Binary files a/www-misc/Manifest.gz and b/www-misc/Manifest.gz differ diff --git a/www-misc/awstats/Manifest b/www-misc/awstats/Manifest index 51ca4d9053b0..5c76406655ee 100644 --- a/www-misc/awstats/Manifest +++ b/www-misc/awstats/Manifest @@ -1,2 +1 @@ -DIST awstats-7.4.tar.gz 2936102 BLAKE2B 2bc7f9619e4d6b13d3909869d642c347d6b9cddbbb3b49d58494ce108c8fe25d59b27198d5a42f8b81c06fdaf1a2e135c82883ec8604e53c6c5adbac07223b66 SHA512 5bce97c71aabeab35e4ff5e5168531e4955d7c1474322c7b4a47d1d06e06ebd0e74d1def73826498e6253f24aeca99309777617b7a914685c927bb6e1c020e1a DIST awstats-7.8.tar.gz 2938739 BLAKE2B 57c692aa935a4191d1cc1f3b34dd1a70a40eef880a3672dcd17472fe6bf447dd7b85a7752d94666d6f1a8dbdcc2eac4959a7f6a83a8bd538d0909ffcaedfd385 SHA512 2fd78e8c7eefb5c9ed39d8ee830ee8ad00b622b812ae40a84cb01c4fa653b9ab7822d1592313d7a8c4b8503d04dcba48b1775d33a629f1ac1278d2300eef931d diff --git a/www-misc/awstats/awstats-7.4.ebuild b/www-misc/awstats/awstats-7.4.ebuild deleted file mode 100644 index 30a6da43390e..000000000000 --- a/www-misc/awstats/awstats-7.4.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils - -MY_P=${PN}-${PV%_p*} - -DESCRIPTION="AWStats is short for Advanced Web Statistics" -HOMEPAGE="http://www.awstats.org/" - -if [ ${MY_P} != ${P} ]; then - SRC_URI="https://dev.gentoo.org/~flameeyes/awstats/${P}.tar.gz" - # The following SRC_URI is useful only when fetching for the first time - # after bump; upstream does not bump the version when they change it, so - # we rename it to include the date and upload to our mirrors instead. - #SRC_URI="http://www.awstats.org/files/${MY_P}.tar.gz -> ${P}.tar.gz" -else - SRC_URI="http://www.awstats.org/files/${P}.tar.gz" -fi - -S=${WORKDIR}/${MY_P} - -LICENSE="GPL-3" -KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86" -IUSE="geoip ipv6" - -SLOT="0" - -RDEPEND=">=dev-lang/perl-5.6.1 - virtual/perl-Time-Local - dev-perl/URI - geoip? ( dev-perl/Geo-IP ) - ipv6? ( dev-perl/Net-IP dev-perl/Net-DNS )" -DEPEND="" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-7.1-gentoo.diff - epatch "${FILESDIR}"/${PN}-perl-5.22.patch - - # change default installation directory - find . -type f -exec sed \ - -e "s#/usr/local/awstats/wwwroot#/usr/share/awstats/wwwroot#g" \ - -e '/PossibleLibDir/s:(.*):("/usr/share/awstats/wwwroot/cgi-bin/lib"):' \ - -i {} + || die "find/sed failed" - - # set default values for directories; use apache log as an example - sed \ - -e "s|^\(LogFile=\).*$|\1\"/var/log/apache2/access_log\"|" \ - -e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \ - -e "s|^\(DirIcons=\).*$|\1\"/awstats/icon\"|" \ - -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed" - - # enable plugins - - if use ipv6; then - sed -e "s|^#\(LoadPlugin=\"ipv6\"\)$|\1|" \ - -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed" - fi - - if use geoip; then - sed -e '/LoadPlugin="geoip /aLoadPlugin="geoip GEOIP_STANDARD /usr/share/GeoIP/GeoIP.dat"' \ - -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed" - fi - - find "${S}" '(' -type f -not -name '*.pl' ')' -exec chmod -x {} + || die -} - -src_install() { - dohtml -r docs/* - dodoc README.md - newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm - dodoc -r tools/xslt - - keepdir /var/lib/awstats - - insinto /etc/awstats - doins "${S}"/wwwroot/cgi-bin/awstats.model.conf - - # remove extra content that we don't want to install - rm -r "${S}"/wwwroot/cgi-bin/awstats.model.conf \ - "${S}"/wwwroot/classes/src || die - - insinto /usr/share/awstats - doins -r wwwroot - chmod +x "${D}"/usr/share/awstats/wwwroot/cgi-bin/*.pl - - cd "${S}"/tools - dobin awstats_buildstaticpages.pl awstats_exportlib.pl \ - awstats_updateall.pl - newbin logresolvemerge.pl awstats_logresolvemerge.pl - newbin maillogconvert.pl awstats_maillogconvert.pl - newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl - - dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl -} - -pkg_postinst() { - elog "The AWStats-Manual is available either inside" - elog "the /usr/share/doc/${PF} - folder, or at" - elog "http://awstats.sourceforge.net/docs/index.html ." - elog - elog "Copy the /etc/awstats/awstats.model.conf to" - elog "/etc/awstats/awstats..conf and edit it." - elog "" - ewarn "This ebuild does no longer use webapp-config to install" - ewarn "instead you should point your configuration to the stable" - ewarn "directory tree in the following path:" - ewarn " /usr/share/awstats" -} diff --git a/www-misc/awstats/awstats-7.8.ebuild b/www-misc/awstats/awstats-7.8.ebuild deleted file mode 100644 index c73348d6087b..000000000000 --- a/www-misc/awstats/awstats-7.8.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils - -MY_P=${PN}-${PV%_p*} - -DESCRIPTION="AWStats is short for Advanced Web Statistics" -HOMEPAGE="https://www.awstats.org/" -SRC_URI="https://www.awstats.org/files/${P}.tar.gz" -S=${WORKDIR}/${MY_P} -LICENSE="GPL-3" -KEYWORDS="~alpha ~amd64 ~hppa ppc ~sparc x86" -IUSE="geoip ipv6" - -SLOT="0" - -RDEPEND=" - >=dev-lang/perl-5.6.1 - dev-perl/URI - virtual/perl-Time-Local - geoip? ( - dev-perl/Geo-IP - ) - ipv6? ( - dev-perl/Net-DNS - dev-perl/Net-IP - ) -" -DEPEND="" - -src_prepare() { - eapply "${FILESDIR}"/${PN}-7.1-gentoo.diff - - # change default installation directory - find . -type f -exec sed \ - -e "s#/usr/local/awstats/wwwroot#/usr/share/awstats/wwwroot#g" \ - -e '/PossibleLibDir/s:(.*):("/usr/share/awstats/wwwroot/cgi-bin/lib"):' \ - -i {} + || die "find/sed failed" - - # set default values for directories; use apache log as an example - sed \ - -e "s|^\(LogFile=\).*$|\1\"/var/log/apache2/access_log\"|" \ - -e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \ - -e "s|^\(DirIcons=\).*$|\1\"/awstats/icon\"|" \ - -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed" - - # enable plugins - - if use ipv6; then - sed -e "s|^#\(LoadPlugin=\"ipv6\"\)$|\1|" \ - -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed" - fi - - if use geoip; then - sed -e '/LoadPlugin="geoip /aLoadPlugin="geoip GEOIP_STANDARD /usr/share/GeoIP/GeoIP.dat"' \ - -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed" - fi - - find "${S}" '(' -type f -not -name '*.pl' ')' -exec chmod -x {} + || die - - eapply_user -} - -HTML_DOCS="docs/" -DOCS="README.md" - -src_install() { - einstalldocs - - newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm - dodoc -r tools/xslt - - keepdir /var/lib/awstats - - insinto /etc/awstats - doins "${S}"/wwwroot/cgi-bin/awstats.model.conf - - # remove extra content that we don't want to install - rm -r "${S}"/wwwroot/cgi-bin/awstats.model.conf \ - "${S}"/wwwroot/classes/src || die - - insinto /usr/share/awstats - doins -r wwwroot - chmod +x "${D}"/usr/share/awstats/wwwroot/cgi-bin/*.pl - - cd "${S}"/tools - dobin awstats_buildstaticpages.pl awstats_exportlib.pl \ - awstats_updateall.pl - newbin logresolvemerge.pl awstats_logresolvemerge.pl - newbin maillogconvert.pl awstats_maillogconvert.pl - newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl - - dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl -} - -pkg_postinst() { - elog "The AWStats-Manual is available either inside" - elog "the /usr/share/doc/${PF} - folder, or at" - elog "https://awstats.sourceforge.net/docs/index.html ." - elog - elog "Copy the /etc/awstats/awstats.model.conf to" - elog "/etc/awstats/awstats..conf and edit it." - elog "" - ewarn "This ebuild does no longer use webapp-config to install" - ewarn "instead you should point your configuration to the stable" - ewarn "directory tree in the following path:" - ewarn " /usr/share/awstats" -} diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz index 80bf998ba2ec..38f6be735fdc 100644 Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index 457c4ee8c679..6a412fad2ccb 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -1,3 +1,2 @@ DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1eb4b0e732fa6140f55d136e317714591327bde3f85bab7780424e6eef04b7a4518cbdcfdddcbc094409f4ca19ffea1ce967bdf7cf1 SHA512 bc0ffa20cffd9a89c2ea64420fa2243d77e97d7922bcd0b387a7fcfcc3c6908a056972b499a81344f7c3e3e19b55ffc300fd034c54b287f4f32d8931bd50cde4 -DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335 DIST httpd-2.4.43.tar.bz2 7155865 BLAKE2B cd85c7e25500f8f1b4bd6ac5f715718a61bf548dfaf36408a970d27bacbfce256e4dda255ba5b62f89e117c335d0568d6207c93e5fb0d2b1ee84dba4ce0d4bd7 SHA512 16cfeecc8f6fab6eca478065a384bdf1872f7ac42206b0bc2bcac6c0d9c576f392c07107201f39e0601dec1bbafcb33d66153544de4d87d79b9a52094d334b64 diff --git a/www-servers/apache/apache-2.4.41.ebuild b/www-servers/apache/apache-2.4.41.ebuild deleted file mode 100644 index ac4fa3b9f318..000000000000 --- a/www-servers/apache/apache-2.4.41.ebuild +++ /dev/null @@ -1,272 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# latest gentoo apache files -GENTOO_PATCHSTAMP="20190402" -GENTOO_DEVELOPER="polynomial-c" -GENTOO_PATCHNAME="gentoo-apache-2.4.39" - -# IUSE/USE_EXPAND magic -IUSE_MPMS_FORK="prefork" -IUSE_MPMS_THREAD="event worker" - -# << obsolete modules: -# authn_default authz_default mem_cache -# mem_cache is replaced by cache_disk -# ?? buggy modules -# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found -# >> added modules for reason: -# compat: compatibility with 2.2 access control -# authz_host: new module for access control -# authn_core: functionality provided by authn_alias in previous versions -# authz_core: new module, provides core authorization capabilities -# cache_disk: replacement for mem_cache -# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3 -# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3 -# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3 -# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3 -# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests). -# socache_shmcb: shared object cache provider. Default config with ssl needs it -# unixd: fixes startup error: Invalid command 'User' -IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest auth_form -authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core -authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex -brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock -dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2 -ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness -lbmethod_heartbeat log_config log_forensic logio macro md mime mime_magic negotiation -proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi -proxy_http2 proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout -session session_cookie session_crypto session_dbd setenvif slotmem_shm speling -socache_shmcb status substitute unique_id userdir usertrack unixd version vhost_alias -watchdog xml2enc" -# The following are also in the source as of this version, but are not available -# for user selection: -# bucketeer case_filter case_filter_in echo http isapi optional_fn_export -# optional_fn_import optional_hook_export optional_hook_import - -# inter-module dependencies -# TODO: this may still be incomplete -MODULE_DEPENDS=" - auth_form:session - brotli:filter - dav_fs:dav - dav_lock:dav - deflate:filter - cache_disk:cache - ext_filter:filter - file_cache:cache - lbmethod_byrequests:proxy_balancer - lbmethod_byrequests:slotmem_shm - lbmethod_bytraffic:proxy_balancer - lbmethod_bybusyness:proxy_balancer - lbmethod_heartbeat:proxy_balancer - log_forensic:log_config - logio:log_config - cache_disk:cache - cache_socache:cache - md:watchdog - mime_magic:mime - proxy_ajp:proxy - proxy_balancer:proxy - proxy_balancer:slotmem_shm - proxy_connect:proxy - proxy_ftp:proxy - proxy_html:proxy - proxy_html:xml2enc - proxy_http:proxy - proxy_http2:proxy - proxy_scgi:proxy - proxy_fcgi:proxy - proxy_wstunnel:proxy - session_cookie:session - session_dbd:dbd - session_dbd:session - substitute:filter -" - -# module<->define mappings -MODULE_DEFINES=" - auth_digest:AUTH_DIGEST - authnz_ldap:AUTHNZ_LDAP - cache:CACHE - cache_disk:CACHE - cache_socache:CACHE - dav:DAV - dav_fs:DAV - dav_lock:DAV - file_cache:CACHE - http2:HTTP2 - info:INFO - ldap:LDAP - md:SSL - proxy:PROXY - proxy_ajp:PROXY - proxy_balancer:PROXY - proxy_connect:PROXY - proxy_ftp:PROXY - proxy_html:PROXY - proxy_http:PROXY - proxy_fcgi:PROXY - proxy_scgi:PROXY - proxy_wstunnel:PROXY - socache_shmcb:SSL - ssl:SSL - status:STATUS - suexec:SUEXEC - userdir:USERDIR -" - -# critical modules for the default config -MODULE_CRITICAL=" - authn_core - authz_core - authz_host - dir - mime - unixd -" -inherit apache-2 systemd tmpfiles toolchain-funcs - -DESCRIPTION="The Apache Web Server" -HOMEPAGE="https://httpd.apache.org/" - -# some helper scripts are Apache-1.1, thus both are here -LICENSE="Apache-2.0 Apache-1.1" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris" - -# Enable http2 by default (bug #563452) -# FIXME: Move to apache-2.eclass once this has reached stable. -IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}" -# New suexec options (since 2.4.34) -IUSE="${IUSE} +suexec-caps suexec-syslog split-usr" - -CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) - apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) - apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 ) - apache2_modules_md? ( >=dev-libs/jansson-2.10 ) - apache2_modules_session_crypto? ( - libressl? ( dev-libs/apr-util[libressl] ) - !libressl? ( dev-libs/apr-util[openssl] ) - )" - -DEPEND+="${CDEPEND} - suexec? ( suexec-caps? ( sys-libs/libcap ) )" -RDEPEND+="${CDEPEND}" - -REQUIRED_USE="apache2_modules_http2? ( ssl ) - apache2_modules_md? ( ssl )" - -PATCHES=( - "${FILESDIR}/${PN}-2.4.41-libressl.patch" #668060 -) - -pkg_setup() { - # dependend critical modules which are not allowed in global scope due - # to USE flag conditionals (bug #499260) - use ssl && MODULE_CRITICAL+=" socache_shmcb" - use doc && MODULE_CRITICAL+=" alias negotiation setenvif" - apache-2_pkg_setup -} - -src_configure() { - # Brain dead check. - tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" - - apache-2_src_configure -} - -src_compile() { - if tc-is-cross-compiler; then - # This header is the same across targets, so use the build compiler. - pushd server >/dev/null - emake gen_test_char - tc-export_build_env BUILD_CC - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ - gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die - popd >/dev/null - fi - - default -} - -src_install() { - apache-2_src_install - local i - local apache_tools_prune_list=( - /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm} - /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs} - /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1} - /usr/share/man/man8/{rotatelogs.8,htcacheclean.8} - ) - for i in ${apache_tools_prune_list[@]} ; do - rm "${ED%/}"/${i} || die "Failed to prune apache-tools bits" - done - - # install apxs in /usr/bin (bug #502384) and put a symlink into the - # old location until all ebuilds and eclasses have been modified to - # use the new location. - dobin support/apxs - use split-usr && dosym ../bin/apxs /usr/sbin/apxs - - # Note: wait for mod_systemd to be included in some forthcoming release, - # Then apache2.4.service can be used and systemd support controlled - # through --enable-systemd - systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service" - systemd_dotmpfilesd "${FILESDIR}/apache.conf" - #insinto /etc/apache2/modules.d - #doins "${FILESDIR}/00_systemd.conf" - - # Install http2 module config - insinto /etc/apache2/modules.d - doins "${FILESDIR}"/41_mod_http2.conf - - # Fix path to apache libdir - sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED%/}"/usr/sbin/apache2ctl || die -} - -pkg_postinst() { - apache-2_pkg_postinst || die "apache-2_pkg_postinst failed" - - tmpfiles_process apache.conf #662544 - - # warnings that default config might not work out of the box - local mod cmod - for mod in ${MODULE_CRITICAL} ; do - if ! use "apache2_modules_${mod}"; then - echo - ewarn "Warning: Critical module not installed!" - ewarn "Modules 'authn_core', 'authz_core' and 'unixd'" - ewarn "are highly recomended but might not be in the base profile yet." - ewarn "Default config for ssl needs module 'socache_shmcb'." - ewarn "Enabling the following flags is highly recommended:" - for cmod in ${MODULE_CRITICAL} ; do - use "apache2_modules_${cmod}" || \ - ewarn "+ apache2_modules_${cmod}" - done - echo - break - fi - done - # warning for proxy_balancer and missing load balancing scheduler - if use apache2_modules_proxy_balancer; then - local lbset= - for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do - if use "apache2_modules_${mod}"; then - lbset=1 && break - fi - done - if [ ! ${lbset} ] ; then - echo - ewarn "Info: Missing load balancing scheduler algorithm module" - ewarn "(They were split off from proxy_balancer in 2.3)" - ewarn "In order to get the ability of load balancing, at least" - ewarn "one of these modules has to be present:" - ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat" - echo - fi - fi -} diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz index bceee064352e..b72dc35b246e 100644 Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest index c082b70a6a25..d73745a71238 100644 --- a/x11-apps/xev/Manifest +++ b/x11-apps/xev/Manifest @@ -1 +1,2 @@ DIST xev-1.2.3.tar.bz2 134866 BLAKE2B 9ff8bdb1e75754a5390115d10dd5851f71b2319ad7ff02299ff28284aa23c14cd1ad3ee9eea81718ed355fc31983e4f7ec0312b31e3f86d3691bb52ebbe0cc4e SHA512 47cc7ac096e77cfa4e687914d767263cf3e1dca5bffd0f68c7ba0fe751b248c8a16525bd2da4d6efa0ea8d637831c893d41c9687cace4aaa9c0909a45ef1943e +DIST xev-1.2.4.tar.bz2 136792 BLAKE2B 46b38d7295f8a11509598758ece9d880f9c3d303064de5cb6ef12aa9d0b066e78aefd3aa5e0c94ea4af7633936209474be362f9e38c0994eefe798662c2e4c6c SHA512 383472ddbfad639ba46a69080ecdd11a514a0578fd32c463fae18da02e0265c944589eebf12a858994f5fd601c02a0d51517e9b3ff61c6afe740d374f02781ca diff --git a/x11-apps/xev/xev-1.2.4.ebuild b/x11-apps/xev/xev-1.2.4.ebuild new file mode 100644 index 000000000000..da4f5f642ee7 --- /dev/null +++ b/x11-apps/xev/xev-1.2.4.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit xorg-3 + +DESCRIPTION="Print contents of X events" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-winnt" +IUSE="" + +RDEPEND="x11-libs/libX11 + x11-libs/libXrandr" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz index bf4b14808bff..35c1c45894d9 100644 Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ diff --git a/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild index bb60f9d71495..9ec9832b0eab 100644 --- a/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild @@ -10,7 +10,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" DESCRIPTION="X.Org X servers" SLOT="0/${PV}" if [[ ${PV} != 9999* ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux" fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz index 1f05eefdf478..7a763cbeb988 100644 Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild b/x11-libs/cairo/cairo-1.16.0-r4.ebuild index d9108285f736..098ecc6d78ee 100644 --- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild +++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="A vector graphics library with cross-device output support" diff --git a/x11-libs/libdrm/libdrm-2.4.102.ebuild b/x11-libs/libdrm/libdrm-2.4.102.ebuild index 46ea35c8a426..d776fa5c6453 100644 --- a/x11-libs/libdrm/libdrm-2.4.102.ebuild +++ b/x11-libs/libdrm/libdrm-2.4.102.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then SRC_URI="" else SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux" fi VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware" diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild index 15fdecd2c429..da622d6fce93 100644 --- a/x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild +++ b/x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild @@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/xkbcommon/${PN}" else SRC_URI="https://xkbcommon.org/download/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86" fi inherit meson multilib-minimal ${GIT_ECLASS} diff --git a/x11-libs/tslib/tslib-1.21.ebuild b/x11-libs/tslib/tslib-1.21.ebuild index 85369585a3b0..785d56f95cdc 100644 --- a/x11-libs/tslib/tslib-1.21.ebuild +++ b/x11-libs/tslib/tslib-1.21.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libts/tslib/releases/download/${PV}/${P}.tar.xz" LICENSE="LGPL-2 uinput? ( GPL-2+ )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" IUSE="evdev sdl uinput" BDEPEND=" diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz index a5641ce21a2d..3d27acac6ed8 100644 Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ diff --git a/x11-misc/arandr/arandr-0.1.10.ebuild b/x11-misc/arandr/arandr-0.1.10.ebuild index dc86e38022b2..a10346404f0b 100644 --- a/x11-misc/arandr/arandr-0.1.10.ebuild +++ b/x11-misc/arandr/arandr-0.1.10.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://christian.amsuess.com/tools/arandr/files/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" RDEPEND=" dev-python/pygobject:3=[${PYTHON_USEDEP}] diff --git a/x11-misc/kdocker/kdocker-5.3.ebuild b/x11-misc/kdocker/kdocker-5.3.ebuild index 30bfc104e846..82d27817c1f9 100644 --- a/x11-misc/kdocker/kdocker-5.3.ebuild +++ b/x11-misc/kdocker/kdocker-5.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/user-none/KDocker/archive/${PV}.tar.gz -> ${MY_P}.ta LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="" DEPEND=" diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild index 66e3276b4ab7..a96f3c6af4f4 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then LIVE_DEPEND=">=x11-misc/util-macros-1.18" else SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" fi LICENSE="MIT" diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz index fad17d26c115..ab9fa47f0a01 100644 Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ diff --git a/x11-terms/alacritty/alacritty-0.4.3.ebuild b/x11-terms/alacritty/alacritty-0.4.3.ebuild index 58542f3d08d3..b286dafe15f2 100644 --- a/x11-terms/alacritty/alacritty-0.4.3.ebuild +++ b/x11-terms/alacritty/alacritty-0.4.3.ebuild @@ -281,7 +281,7 @@ if [ ${PV} == "9999" ] ; then else SRC_URI="https://github.com/alacritty/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz $(cargo_crate_uris ${CRATES})" - KEYWORDS="amd64 ppc64" + KEYWORDS="amd64 ~arm64 ppc64" fi LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB" diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz index fdd332eb4cb7..1f6667b3a4f0 100644 Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ diff --git a/x11-wm/icewm/icewm-1.6.6.ebuild b/x11-wm/icewm/icewm-1.6.6.ebuild index 505dbe192a46..e6e028efea55 100644 --- a/x11-wm/icewm/icewm-1.6.6.ebuild +++ b/x11-wm/icewm/icewm-1.6.6.ebuild @@ -11,7 +11,7 @@ LICENSE="GPL-2" SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz" SLOT="0" -KEYWORDS="~amd64 ppc ~sparc ~x86" +KEYWORDS="~amd64 ppc sparc x86" IUSE="+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama" # Tests broken in all versions, patches welcome, bug #323907, #389533 diff --git a/x11-wm/twm/twm-1.0.11.ebuild b/x11-wm/twm/twm-1.0.11.ebuild index 051480ae348d..992b4b546f10 100644 --- a/x11-wm/twm/twm-1.0.11.ebuild +++ b/x11-wm/twm/twm-1.0.11.ebuild @@ -9,7 +9,7 @@ inherit xorg-3 DESCRIPTION="X.Org Tab Window Manager" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux" IUSE="" COMMON_DEPEND="