From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- app-admin/salt/Manifest | 36 +--- .../files/salt-2017.7.0-dont-realpath-tmpdir.patch | 19 -- .../files/salt-2019.2.8-ansible-roster-fix.patch | 13 -- app-admin/salt/files/salt-3000.1-tests.patch | 58 ------ app-admin/salt/files/salt-3000.2-py38-abc.patch | 79 -------- .../salt/files/salt-3000.2-py38-logwarn.patch | 116 ------------ app-admin/salt/files/salt-3000.2-py38.patch | 60 ------ app-admin/salt/files/salt-3000.2-tests.patch | 18 -- app-admin/salt/files/salt-3000.9-tests.patch | 12 -- app-admin/salt/files/salt-3001.1-tests.patch | 151 --------------- app-admin/salt/files/salt-3001.6-tests.patch | 18 -- app-admin/salt/files/salt-3004.2-importlib.patch | 11 ++ app-admin/salt/files/salt-3004.2-jinja-3.patch | 14 ++ app-admin/salt/salt-3000.8-r1.ebuild | 202 -------------------- app-admin/salt/salt-3000.9-r1.ebuild | 203 -------------------- app-admin/salt/salt-3001.8.ebuild | 188 ------------------- app-admin/salt/salt-3002.7.ebuild | 196 ------------------- app-admin/salt/salt-3002.8.ebuild | 200 -------------------- app-admin/salt/salt-3002.9.ebuild | 200 ++++++++++++++++++++ app-admin/salt/salt-3003-r1.ebuild | 195 ------------------- app-admin/salt/salt-3003.3-r1.ebuild | 203 -------------------- app-admin/salt/salt-3003.3.ebuild | 202 -------------------- app-admin/salt/salt-3003.5.ebuild | 208 +++++++++++++++++++++ app-admin/salt/salt-3004.1-r4.ebuild | 2 +- app-admin/salt/salt-3004.2.ebuild | 208 +++++++++++++++++++++ 25 files changed, 651 insertions(+), 2161 deletions(-) delete mode 100644 app-admin/salt/files/salt-2017.7.0-dont-realpath-tmpdir.patch delete mode 100644 app-admin/salt/files/salt-2019.2.8-ansible-roster-fix.patch delete mode 100644 app-admin/salt/files/salt-3000.1-tests.patch delete mode 100644 app-admin/salt/files/salt-3000.2-py38-abc.patch delete mode 100644 app-admin/salt/files/salt-3000.2-py38-logwarn.patch delete mode 100644 app-admin/salt/files/salt-3000.2-py38.patch delete mode 100644 app-admin/salt/files/salt-3000.2-tests.patch delete mode 100644 app-admin/salt/files/salt-3000.9-tests.patch delete mode 100644 app-admin/salt/files/salt-3001.1-tests.patch delete mode 100644 app-admin/salt/files/salt-3001.6-tests.patch create mode 100644 app-admin/salt/files/salt-3004.2-importlib.patch create mode 100644 app-admin/salt/files/salt-3004.2-jinja-3.patch delete mode 100644 app-admin/salt/salt-3000.8-r1.ebuild delete mode 100644 app-admin/salt/salt-3000.9-r1.ebuild delete mode 100644 app-admin/salt/salt-3001.8.ebuild delete mode 100644 app-admin/salt/salt-3002.7.ebuild delete mode 100644 app-admin/salt/salt-3002.8.ebuild create mode 100644 app-admin/salt/salt-3002.9.ebuild delete mode 100644 app-admin/salt/salt-3003-r1.ebuild delete mode 100644 app-admin/salt/salt-3003.3-r1.ebuild delete mode 100644 app-admin/salt/salt-3003.3.ebuild create mode 100644 app-admin/salt/salt-3003.5.ebuild create mode 100644 app-admin/salt/salt-3004.2.ebuild (limited to 'app-admin/salt') diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index b2f5e3e211b7..0c2609cbb970 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -4,17 +4,7 @@ AUX master-confd-1 188 BLAKE2B 8ac416a7ff64c73556f07a08268ea7d91547e242becd345ac AUX master-initd-5 558 BLAKE2B 09a1485449b239b4f0d7e0514572084769c73b28053fc6ff9b4cbeb239358e7311784c15e883ddf5ca8310794e3d2bb851f2a765bb3aa17f8081ee008bfd130a SHA512 36b2d601d4dd3bd7b1758e77029b70916adbf8919c3ef04fd867ca25b143666d0c2f5834adddf05e7c2b013f04939f57e3396c888514e08f1679e6459a6ce7bb AUX minion-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed AUX minion-initd-5 564 BLAKE2B 19f2d909b1a91b5cf22c932b04b794ef536c3a84fbd36676d4bf136c6af66ae4ea94abcf9657919cb4cf85ee88cc6e93df0e7373e0410823550cc45ebc8f5673 SHA512 c92165fe73157c9c3898f7c8c90e3b1626f704d4a8432237bd264463c66ba00e89a1d66e44b049703fd32ce48f771248b902e7183c4e31ee6611f938704b2583 -AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd29dbdee6ccbe0a07f139903360312db247926867a78513cd9022f492ce370eeafcc81bc4db545359036f8f5b0d2d64d3c5bb8aefc0 SHA512 33b69954e8112c0f76654d507df74a4cdd37e8227848f2ce0652b3ecee8b847253ccad33cada0e3dd1471c54c780dcc12d5e546c4ec43868511b95b0c7f71e17 AUX salt-2019.2.0-skip-tests-that-oom-machine.patch 739 BLAKE2B c0e1b18c528ddcdc19e93061112d2c42aeca96f9091218e7ad6b4eadf11255079cecd6b9b9def576c663b4ba794d151db8fc32336b1c29c3da8e9c18c09582f3 SHA512 0bd8fc2ab73be8ffc9fdda65a60c7306dbfa9f76d874994ba09db7ef71678fca80c8fde5963d22b5bbbe3b933140a56f2173f4c109b47dd9e9c3c9a70062b0e3 -AUX salt-2019.2.8-ansible-roster-fix.patch 572 BLAKE2B c11106be76626673a0e6365dea7ac8593f420ffa2bc0ca02c24520240d863d69a7f0449f10b5d53f6292c247f434636a0f188338ffa3d81a27abc8db18059c92 SHA512 86a2fc107882855ef60b2722e7282de8e6ad57c5fe6809ff99843f934a193445da599d57d1cbc3d7d3443f93d52a7ba5922c6bd76579f85648f6256ce7a81c66 -AUX salt-3000.1-tests.patch 2390 BLAKE2B f46b8a4aa2c57307385d6e56b54b54ebeb18bfa298b66804a64c7e64608fb07a8fea8eabeebb8ba1772936cf50541d6bea81eefcf9617ccb8074b534ac0ec1af SHA512 5e3a212995f8f4fae4e3c4c51519fd2e7bfa20b39492485e10788b3cf72ff9344681fdff4a2d6364e7e4b9c9554fd3efffb9d197aad445423950ce72c6455b2b -AUX salt-3000.2-py38-abc.patch 2641 BLAKE2B 054fae62aee23528beaad9e4c9c8ac72c1f9a208e2b5d2d17af08ef0e810e7b2ba93522c110bf052a4d3d8831aa772eb3ab7fcb378034634a4b46f10af5c5c20 SHA512 b4feaa17cdbbb9cdf4ec7759b9fa201d731680939e199edd2e683ca6dc5b2cf99aa6fa8f87517dfbd5b6af2ccafbdb50cf9744345149131941f1bd107145cf69 -AUX salt-3000.2-py38-logwarn.patch 4875 BLAKE2B f0ced7bad98983296561d223405d512077c0b70de12a8af613d4069842d3cb6167dd0da49c30fc881e985594f755ce0b063df311bbe84ae9cfc37896670aca52 SHA512 94ca1f73cbeb9d3ab93cb1c7afd4abce5318022a267342e4b348066c5508016891a3c05bd0ea867ae868794684bdc1bfd3e7779c4ea2a9cd60626d6513f8ba4e -AUX salt-3000.2-py38.patch 1739 BLAKE2B 49591845a247f3e9fc092229950518b6ccb10035bc961a6193358a4be5b84b1e3d6fae69a5763b85966b1e115e8cf38378e2e88c66c3e10699ef47587aa3e7d7 SHA512 4a537c0e45c3287ddc71b91637b4b7f1d54e0dd4e524e91f39cabad08dda14ce5d2467c1f87bc81a098c36f0da1312b8e627189e0574d0ccecab064cba19acb9 -AUX salt-3000.2-tests.patch 587 BLAKE2B 5eb647ffd159bc56ce823c80fb384e7cd33e79c46baa3e607a772c6de1e8019c53908a2eb5111dd770b638c8088b76bee6c17f8cea9e17f3f7b8d3ab93568839 SHA512 ef6c1cd995a03d49ac2aaf65b516f0dc1ac9764e32392c67febdfd31d23ca178bb4f29a903b4d67f8792fe0fb903c03596cbfd1c1223e993189de890aa41b0c3 -AUX salt-3000.9-tests.patch 542 BLAKE2B 9e7d04564c89549799ca92c1e8f9790e0a0f800fff1ebe02ad3fb54cb7f88075fa870b655caca2fa657cac5db02817fb23d4be55b42216e585cb3df5f7ccd320 SHA512 edd4676ff1fbf7cf72fde72cd0ba9317d4976a78b8cf58cbaeeb5c0ce18654356c6e1acdb3b34735822174098c910dfaee2dfea35647ef6e56e0ab56ebd35efa -AUX salt-3001.1-tests.patch 7149 BLAKE2B 3e5de0decdec9bc2ed1a6fcf2dd04c0c554f2b11a8bda45a797e811a332782eec9303ee8c81aca4f2fe646c392c63f151c0af6a3ef18db370914a2aa06afc485 SHA512 661f2ef797b1b338e43c33af80fbad0e2af9b22439b3bdf0ad6fda0b632961426a787dbf8e592c5a9b73c84af3a466c128eff15a519b83af2e9a74e0216ea014 -AUX salt-3001.6-tests.patch 766 BLAKE2B 979c29a00fe1d67529b204c1ce74ef8a94ed070bb17bca5404e1b8324c7e792493007056741b6fb7f519b4363c0c2191dae40eec97621457aaedac60990a9455 SHA512 b1fedcffdec0b3ee2e1195445944cad605c1558a4023f7836e23dc97b9b6adf105b6ad0ea526b93ae07a6b1917a0a355dd8d826ad87f95f0427de4a2a2153ee6 AUX salt-3002-dont-realpath-on-tmpdir.patch 1808 BLAKE2B 2ce464fef827cb98490b8a2c4aecbdaaa8bd53b3aef1acc96496bde162a0102064a400dff768c2cd5faddfe33a433922c5295b30dfef38e68841ebfe1a119644 SHA512 ce002f4fdf0d1e75cfbe9c2d3a6c98e08c21b0c436c500b70a0405c4ee10a1b1849446fab47dd681c71c9a847587fe97537de095768ecf650df9b53f3778ca62 AUX salt-3002-tests.patch 1125 BLAKE2B 345c094c38a1b62190587062a86da4e0a516988fb2bbf98c295da87f0abd456cfc8f25c11fe10a1c4571d4eb25390c6d89b0e300bd2ae6d82212d1685af8ed30 SHA512 7f9d6f8c4a5d34381c516c72d77de6613ed646fb88f89b7c4180afebb0bf0ee34a99ed02a7e8d7a6836a61c01653fe97a13c8caa18898a507a03091cff8e9d30 AUX salt-3002.5-tests.patch 1437 BLAKE2B 7c0ddc9ab12c7ed3d07e18a22623f5f9e24f47bf7e871ad7b71f0d1c482790f1ac994b628bbaa0692344deacf57526496c79f1aa7fc1a68092dea67392c0ce45 SHA512 1551757f01348d64de94b8b5830ad45333a06e1cd54d457702a33031b1f741ce12c23c9452e25d3498a0fa6a8c80ec425b0618809af7c3860ce1064946491cbb @@ -33,30 +23,22 @@ AUX salt-3004.1-jinja-3.patch 1638 BLAKE2B 3270b3547fe526dc178330e637aa16a363d48 AUX salt-3004.1-py310.patch 2071 BLAKE2B 23f8db2e2bc7307fd58e535bf642e9c76172d03d49b3e86333ee82434adbaa5f437330fa951221f233bba9e09b514611180d19f1db2856ba7d0a3a231a4b385f SHA512 6eec860778ceab15f5ea4260b648cd96df52daaec900dd093257af97e873e8a5be1296d4181767846eb63277a0b903e92ab6550772046acd7a8dea72eb0447f8 AUX salt-3004.1-relax-pyzmq-dep.patch 348 BLAKE2B 75a5947cf6f92fd08da25d50b9064d82c13eaf9f2f2f4ed627f8690ba8893b58de7ef2f0a976879ce94f8f542b9198c637021ba08bc067f3eb56aa40e9598c75 SHA512 7c48d3f86cd81d11077c80ca9536a85c9825299dd9c2a81fd43fc2c2781211d9bb72e4dd79381343851c3292210eab41de049006e608ceb340af31a84cd244bb AUX salt-3004.1-tests.patch 13025 BLAKE2B fd86808b3d43a25abb88f5d454dd2618d896aa8c8ff843d4f9b46ff32d98d07d245d308599d0a93814d80ff9b1cb120da4296b6f06f64825da4ce603ec37d4fb SHA512 4634fe96479c481fdb9daf8decd3632e9ed8daa9ab62942d71bd6c11e603ae5ac96acfdb68e4e91ec2c829efd33689fa122bc53979b7b5ce02ea63189bebe349 +AUX salt-3004.2-importlib.patch 584 BLAKE2B f9ccf7a6205228dc12847d9c86b7d9e539fdbccc1e27a77fccf05622b53f58504226f2eb4aecb2a5bf95789cf72c43e86ab22cb190d62aca903b0d14373a3df0 SHA512 61b966f010445c8a594a5c618441b33e9f7feb9481972aa4c7246d977003c5605c152459eeebc0922c2d9d7e28436243f891e738856a86a88a82a7489825f52a +AUX salt-3004.2-jinja-3.patch 589 BLAKE2B 249e81ea2760cbe75ff66bfd86cbfaab58ea673fea240bb9e787896b89645ef523c0d98305214bcce545a7372e8bc545b6ae385ca3311d71cf7bd6fd66f52c7c SHA512 6615f5824c5b53a426395bf7def9c8f54f3c753f28f3e3b23119849900f10686968cec0787d4ffa16bbbd763a19072348617165e1af6a0f87bb81e9fd8be20e6 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8e8e0b2a0e3d17f71e1bb53f71f6168446aaf3765692cd540217c4cdf5ab8dd9cb7032801aa798d8a9bc3 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0 AUX syndic-confd-1 188 BLAKE2B 98f13eb627963d65df26140f348c04eb8c253d444d36ecd1f5ef344ad89901b0a5ed62c64364e90595c2d2ee2766f30802a4a86a2555bbea343ab410292359af SHA512 35fe9bf4732c8a53b47099ffe5f9468d884ec3e2671451a6d52821dde6c70c63176b29ade0d700b99aaf47557f58179f780422843346bd3aa6513d9465ec9f58 AUX syndic-initd-5 558 BLAKE2B 5e1ea25b57f56ad7bfb8be0c845e7da9f99af03c50c31ca2031e604267c680555d0d8a3ef6299ec588770f26dad19d262c8b9403391b60fb17c6811d7946107a SHA512 6e927925cf1e4d0f901bec10499a8ecf1193b99742cfda5f94f70d0ec743902b1b89728cb2e447b8b4879a9417d0d482b813161968dc9c2b2c7944b3af14df14 -DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec SHA512 6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f -DIST salt-3000.8.tar.gz 15249139 BLAKE2B df306669ba11dd650621222ff9c69f5a6e16b6f431e9d93e6712ee95da43091bfe28416fe0d71988ed9ee70cb347755b779a356c50fa59c63c67a874ed1906f4 SHA512 a18d5bea3b3835f83d5b1e5315990d83f6c58c36df5589d5de0f8cc3a46db4c960b58032e29d56841a160b9b170cdbb81bca38dbbd72ccb5866ccc8a7da6e800 -DIST salt-3000.9.tar.gz 15250432 BLAKE2B b76c166363b0b0fd3e3aa4b5306ba8280a2c99fbc7fd9866d957406bba8e6fcc03b769b53dbb80b115f9fa9f1fdc93e1eb257f4bf04283e414a309c16e4f078f SHA512 94214f20a8a080ebdcbb7e3351f60a466c3a92cc85d177c2ea677192a63e58b0f9cacfb1af04e14022a7ac570ebd0b931722d1d001a7655dcd7502813c29a092 -DIST salt-3001.8.tar.gz 15740488 BLAKE2B 77875a670b81438280becd1f29b64fbc766379192a9ca041568cd9360a3c4213bb3018063e88a297e9d1f637fb7ca3ef049a73a258022ec07e42f01a40bdf09a SHA512 8e90b2a1f82f951ab40a53a8af2ab421758ed8244f1881cc7aa71a8d9c2e2e6d892166ec8f8f6182966e56eb28c9aee6a060ee54b559b1d073fba97ad0afb013 -DIST salt-3002.7.tar.gz 15792124 BLAKE2B b4cb4a6d73c45f3c2183a7adfe8196bbc5788dce1995bd5c640cd9957bdfdba2e96deebaba927d6103fc50f4eaab86d51f4dd4594d25b7357db79ed67b39258e SHA512 c1e7bbcd39b5c2bef351bd74026346bf729839c4161f6eff8162620e9cb08a63073abeeb8af6bab635070386a883df494ef08cc07a84efa9aa7f2160b357a938 -DIST salt-3002.8.tar.gz 15798643 BLAKE2B 12280dfd29f46f9bb8b2df6fcef474c2c2237d6f9c71e1474caae58893605dd6f9fb4c4573f52765cb950cd15e31fc0fda2fa8dd1c87d48c1951d2812c1a3a81 SHA512 a88a6f77d2af2cff5d5244f38b16a1904da05bdfd45b2087691e41b07f21785b1838151314d7c80d3a33eebefe480c8f3678fa161e9ceaaa50c997022463c472 -DIST salt-3003.3.tar.gz 16017984 BLAKE2B 9cd1e33a7b6dff4d3c6c5a87e1204f7f113b6190da8301061e26fcec178aba597a9e17ab60a54a67b52a895a9a8aef58bec70e9fdd8d8edc5a42945f6de21a58 SHA512 4fe50922833fce48fcc679adb16a0e1fe893531b2feb08b235a1461c58b8d9a72af2acd89fc0f712207fb0cd215d6b446e31a40001b46c43d0cc4ac827ce29e3 +DIST salt-3002.9.tar.gz 15817470 BLAKE2B 31fb6dbb61a9f0ab22ca761810a934792e9fa9c78628f925e63d3d54d00fa4ea0b4aa806ba3ea92f7397ba3291281bf8989d9a288fb3114c7911cdebfc9acd6a SHA512 f34fd05960a68cba51f34cf8b7c737bd84d00472cec80628f082d16e54cf70705e191ac4b6690bf406a8a11e26c8155e4bdbdec34ede5f0721fd9b5e637a0ed1 DIST salt-3003.4.tar.gz 16031515 BLAKE2B 34902aba7ab64f4ddbacbad1b776b9b2218caf22fb843879a80bd5c30b6c28f4c22a050bbaf0e9735507a78c887f52bcae7d1833ffeb51a543ec22fda79252e6 SHA512 35419fbb3f9a0f3e87579f740b717d6902cab0d85397b16d1e94d9516bf5f5d269b4f8bca370fd376abd9b7c8a6ad7ef4c8e8a8fdd31655fd17c810989e79693 -DIST salt-3003.tar.gz 15830910 BLAKE2B ea4f02eece951c3fb4fcc480d00f7b531ac549b2e23ff9a210b73f749f9ba83e0402e02a59028f41f94958d17512e417b7c1b7015e8ee3aeac55be9b1374fe6f SHA512 7f631466372f303c03f2852a5cfba1ee5c6ba1636a6fe1e1622e90d0b1376ef9f670aa1b4754f3d9c8c7fe1b99fe1b4c49e140dc86d90d157a1ec1e73ba43c38 +DIST salt-3003.5.tar.gz 16056545 BLAKE2B ede3f0c63175f093dca07bee1bfb659cc608336ae92f532fc45868bd7eca659498c42e5d44324492744b802ade088adac869277679989550e217c1a135d6566d SHA512 ebda2056b4d6d216a0689b919d00aa78f615c355d21703d1939dbb6b00e9ad9347be4ee5b861282521f2d337bf7bf2fdc85e6942016358088a094d854fb33be9 DIST salt-3004.1.tar.gz 17685649 BLAKE2B 64950cdc8420228f935d4a21fc20872da9ecf7c51b866ec3c59b46486b84a739b002acc44fa909eed93ce3dc6bedc9804df05d3d9ee5a9a13cd9d041ba70f876 SHA512 9353a8dc2a1c6e272318c6f35059236c5d78b6c8930f715275b701c12fca3be1fe930eb533f3f0c22933ba60967b0980300b922fe486cee9a62e6cdb568bdf91 -EBUILD salt-3000.8-r1.ebuild 6621 BLAKE2B 07886dd10693134d3e01db34e6847f96272d3510854e1b8130c999ae1fd026bce5024cd6d311a8a69eb60ee8a0cc39284aba640162ecb0ca22058e1e21810a7f SHA512 d044a41745e400cfc7d9d976ff78b736ef3c630e9df89502eef78867e57a628d78f032366e0e4d68d63856d453cf13e034597c1f6b3a30279f5edc89dc781d37 -EBUILD salt-3000.9-r1.ebuild 6663 BLAKE2B 257266c6734f4c859234e73e654bb2ce8c685c4509b1d49e4e60b4f6e0cc3b08be0aa9be70746f1f114d498e00d25111753e5297a63e71d3b39bfe7c7173f1b1 SHA512 b892b57e2aecbd6e521c3f6973c0e75e037b1a310ddfb1c1c107512adbdb108c4e9e47a1d8542734883fe74e6e951aed051abe35e7401d6ed70e6abd23f9f11f -EBUILD salt-3001.8.ebuild 6233 BLAKE2B eda71511e995977e91fdd0a1b323a47fad5a6ab9b2969ca696f410066d859db205c12ca7ce00154a562b83e8542c5445cb27e8ac72f33bf4615b2fb234899496 SHA512 790c10e9770a8b859cb6e721e962d0e992f2bf3d0d11db2fbe2811b7f4c122218b317f64172d3a65175d62511db5906f1d3873a98336d726d089493796defef0 -EBUILD salt-3002.7.ebuild 6506 BLAKE2B 225e4b18c276e26f7d9dffb06920f6ad7990b9b7de7c3e838325c8582e6408ce483e284e03b549dd62b87beb778c2742c12e14e6f65e89c890cdab912e138525 SHA512 0b06ca50fe3f0b943a7270f617e61eb4d73fb0a3187068d37495987ee267f53e499abd638a88c098bbcf07ea51ff46f2ed9ba7c0717069239b81cfbfa82ac92e -EBUILD salt-3002.8.ebuild 6672 BLAKE2B 81dd96a7806afdaa396d39658697573c1a902d27d4b6adc5dd1ff0a73b88b18ef61e2845b965128003cc2161c490748b0e37a5e0fad9479c2da69069043d3985 SHA512 c7300e77e23fb0c30780733b5c98ed7f239db2cdc2b757dc0980077407c21b6183f391ed5f7c4699aea0044757fb0b13adbb01ee9d9eba5f5467d20c96c29fe1 -EBUILD salt-3003-r1.ebuild 6580 BLAKE2B ba2d5c5a2461694213918dc4d7cb88600235b1b1428ffe77282e24aa21f69b95194085e785e59ad2d51f0319b1da29ea21181d55ff5be7ac9314cc8da5cd8196 SHA512 45f17a2d32ea81bbf01552d9efb2804093b5cd567cc17b23e591a89a692b2ed719676c7d5ecaeee6d723e0d1443f2873d02b4f35e945c5270c8709f0c106c4c2 -EBUILD salt-3003.3-r1.ebuild 6842 BLAKE2B d273b5b3a717022a75cc83563f9d0f8412c5250f062312be30c36560faf1250ca64382b4cc4f4e180196217b97158090dd7593a4f4e450904840f5a7d4c88104 SHA512 46aa981c49279c984d622bd38782099919845fa47597eb343a8a40bdcbf76ac29e1377c09ee4c33b6d6930e789c34bafeef308094adc873646be5805b7710f6f -EBUILD salt-3003.3.ebuild 6801 BLAKE2B 5146a9a20ca1de9ef167f896df8cafea100a1b5245d747aea685a6811151c3909040c3cf53d80ed5eb7359e76914a5fdf94ad8af8d643995d46c727d9163cc66 SHA512 95a055ce3a69a358bfdd221f139b86964a7ce5ea18d3f12b9270bcb03f4873cdab55b738338165b785d039f869096928758a8ccb1c0c6a87c3e1897da0a89ae6 +DIST salt-3004.2.tar.gz 17685127 BLAKE2B a42e31d8a006488b3a6f341f817cde21ff86248d2b548d9914c429c62d7570cdf46cf2b41311cbb08ced7f9518e68156c6df3eb78e55cacfd4d40a4e7a54f52b SHA512 b2fa434f1d25eabac51d65d75bb020943eb71aff113d683e6f436a0f205bd3c7682b1b7acd4d9a62bf37a47eb0561293d263f3174d5e266f0998a1652fcae2ef +EBUILD salt-3002.9.ebuild 6672 BLAKE2B 01d02dd2411a676649d24af08a24d32426c98c1a6f8e3f0ebb96244bd55183e57f3a713fe9e65ea96093f0121374ba8dc933653b625be393c9a67620e06e2d55 SHA512 fbf0cfcde4fcb77614784a251d349a6d79e206fba8e673cc62419d23c8b2672d88a6b8adaa0b3840cb5771fbea3700b6f4bb57d8bbbb417d144f7fc5310f8554 EBUILD salt-3003.4-r1.ebuild 6933 BLAKE2B c99f429003c7992c9b9271413ce4929c2e4a3fb49d3dae818a37a7e9253165cce99625a4c298cd6065781564eb1b838edc5cfca437dbc7103878131bc5de1671 SHA512 52719d14b8bbdd55c4f4aff007733cf5a889339d6187caeb5c57a5a2bd53b999b910dda0213db50fc5224f0e01f9380ada63c1e8f344530ea60d6f6cbb9498d0 -EBUILD salt-3004.1-r4.ebuild 7037 BLAKE2B b7403a697abe6d6c327e3df54723f7604504adca6b9411b5a9ae16a354d55c7360040dec12475fbdcef18a50d4bf29f0d48575b766459ffe4cefd8da65bc50d4 SHA512 d6f6b0583edb0c85de6315a7a679010b7409a594eeb709c61c17d579c1b4c0d9921059dc2f99f2bc92092266945ad24c83817615b84a36cd033ea4143268d522 +EBUILD salt-3003.5.ebuild 6977 BLAKE2B 351fab851936ea48deeb04f7906a517c17ba8afe01e2e5de577f38f53c6dae2f44b472a8e48762cae87d400b6d2cb1f6f1a0ca5a9c03bb9cd2b54c9f4fd902b4 SHA512 e3369d27258116f6f49d3d182654899f8be044b1210140af73a39d020d2cb3dd4f44245ff70ab0d8d0c303c89ae0a22d5a2efb87a600e13d1fc8895f62e0aefc +EBUILD salt-3004.1-r4.ebuild 7044 BLAKE2B fd253f8e588516e95519f0c503993887305952541dcbc3a62577a47909bd8160c6f2f46043843a3c473817f85bb8e2fd4eac6aea50e299a11a12f0ba7eb76084 SHA512 45d34cf7e65102f1f3c70a922b07cd419ad9fea8af9407cd6c2a84308cf9823bb31e7cb39ab0b4bb4b572025bd83a8e2a916353722e16b5bbacdb4d2d225d75a +EBUILD salt-3004.2.ebuild 7089 BLAKE2B d157190c3455e865038f79c4c2c4058a48df4490858b06c18d799dd7fcdbc74b57e873404065e4c1de90c6196d14932b421d7ef17200f03160eb7b1c26f92166 SHA512 2398b3360f90992027d9dd49c524a315638e6399adfd865b06f78148be4332e1d57cafb3d9a969501fae47d6e64b4a193d34436be00b6e0aba0f5aec69aae3e0 MISC metadata.xml 2362 BLAKE2B 60fd7a02823e610b4d12b1d4c6a066cf16f8ef4094397553381d62bc027715164f02ccad4c86e431a30822d5c4c25e4eebd814f99e43b7a45bc08a3fd885cfee SHA512 4aa7549a76e69233949c68841bfcdba6630eeb78a507f20119469f7835a6532b737f41d117c09b1e4c7574f95dec759deacf5d5482be961755d63a19b9eee9a7 diff --git a/app-admin/salt/files/salt-2017.7.0-dont-realpath-tmpdir.patch b/app-admin/salt/files/salt-2017.7.0-dont-realpath-tmpdir.patch deleted file mode 100644 index 90a48a662998..000000000000 --- a/app-admin/salt/files/salt-2017.7.0-dont-realpath-tmpdir.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/tests/support/paths.py b/tests/support/paths.py -index da93c8e1e3..895c636fef 100644 ---- a/tests/support/paths.py -+++ b/tests/support/paths.py -@@ -40,12 +40,12 @@ if CODE_DIR not in sys.path: - if TESTS_DIR not in sys.path: - sys.path.insert(1, TESTS_DIR) - --SYS_TMP_DIR = os.path.abspath(os.path.realpath( -+SYS_TMP_DIR = os.path.abspath( - # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long - # for unix sockets: ``error: AF_UNIX path too long`` - # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR} - os.environ.get('TMPDIR', tempfile.gettempdir()) if not sys.platform.startswith('darwin') else '/tmp' --)) -+) - TMP = os.path.join(SYS_TMP_DIR, 'salt-tests-tmpdir') - FILES = os.path.join(INTEGRATION_TEST_DIR, 'files') - PYEXEC = 'python{0}.{1}'.format(*sys.version_info) diff --git a/app-admin/salt/files/salt-2019.2.8-ansible-roster-fix.patch b/app-admin/salt/files/salt-2019.2.8-ansible-roster-fix.patch deleted file mode 100644 index 597c97e87774..000000000000 --- a/app-admin/salt/files/salt-2019.2.8-ansible-roster-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/salt/roster/ansible.py b/salt/roster/ansible.py -index f4a2a23e0b..e6b9e80247 100644 ---- a/salt/roster/ansible.py -+++ b/salt/roster/ansible.py -@@ -129,7 +129,7 @@ def targets(tgt, tgt_type='glob', **kwargs): - - def _get_hosts_from_group(group): - inventory = __context__['inventory'] -- hosts = [host for host in inventory[group].get('hosts', [])] -+ hosts = [host for host in inventory.setdefault(group, {}).get('hosts', [])] - for child in inventory[group].get('children', []): - hosts.extend(_get_hosts_from_group(child)) - return hosts diff --git a/app-admin/salt/files/salt-3000.1-tests.patch b/app-admin/salt/files/salt-3000.1-tests.patch deleted file mode 100644 index 12a2e7822b94..000000000000 --- a/app-admin/salt/files/salt-3000.1-tests.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/tests/unit/fileserver/test_roots.py b/tests/unit/fileserver/test_roots.py -index e0d939a086..33a9b6dc35 100644 ---- a/tests/unit/fileserver/test_roots.py -+++ b/tests/unit/fileserver/test_roots.py -@@ -11,7 +11,7 @@ import tempfile - - # Import Salt Testing libs - from tests.support.mixins import AdaptedConfigurationTestCaseMixin, LoaderModuleMockMixin --from tests.support.unit import TestCase -+from tests.support.unit import TestCase, skipIf - from tests.support.mock import patch - from tests.support.runtests import RUNTIME_VARS - -@@ -165,6 +165,7 @@ class RootsTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMix - self.assertIn('empty_dir', ret) - self.assertIn(UNICODE_DIRNAME, ret) - -+ @skipIf(True, "doesn't like sandbox") - def test_symlink_list(self): - orig_file_roots = self.opts['file_roots'] - try: -diff --git a/tests/unit/modules/test_dockermod.py b/tests/unit/modules/test_dockermod.py -index 191bfc123f..1956127f0b 100644 ---- a/tests/unit/modules/test_dockermod.py -+++ b/tests/unit/modules/test_dockermod.py -@@ -793,6 +793,7 @@ class DockerTestCase(TestCase, LoaderModuleMockMixin): - }, - ret) - -+ @skipIf(True, "Doesn't work with sandbox") - def test_call_success(self): - ''' - test module calling inside containers -diff --git a/tests/unit/states/test_pip_state.py b/tests/unit/states/test_pip_state.py -index 13c158b309..27e10e6161 100644 ---- a/tests/unit/states/test_pip_state.py -+++ b/tests/unit/states/test_pip_state.py -@@ -384,6 +384,7 @@ class PipStateUtilsTest(TestCase): - - - @skipIf(salt.utils.path.which_bin(KNOWN_BINARY_NAMES) is None, 'virtualenv not installed') -+@skipIf(True, "Needs network access") - class PipStateInstallationErrorTest(TestCase): - - def test_importable_installation_error(self): -diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py -index f48fa9d42c..bb57929cfa 100644 ---- a/tests/unit/utils/test_jinja.py -+++ b/tests/unit/utils/test_jinja.py -@@ -1268,7 +1268,7 @@ class TestCustomExtensions(TestCase): - dict(opts=self.local_opts, saltenv='test', salt=self.local_salt)) - self.assertEqual(rendered, '16777216') - -- @flaky -+ @skipIf("True", "Needs network access") - def test_http_query(self): - ''' - Test the `http_query` Jinja filter. diff --git a/app-admin/salt/files/salt-3000.2-py38-abc.patch b/app-admin/salt/files/salt-3000.2-py38-abc.patch deleted file mode 100644 index e9f64b664178..000000000000 --- a/app-admin/salt/files/salt-3000.2-py38-abc.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 11c23a526ae926ca082ee7ad92246e085c51b8e6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=A9bastien=20Blaisot?= -Date: Fri, 17 Jan 2020 17:06:42 +0100 -Subject: [PATCH] Import abstract base classes from collection.abc in python - 3.3+ - ---- - salt/modules/file.py | 6 +++++- - salt/modules/win_file.py | 5 ++++- - salt/states/file.py | 6 +++++- - salt/utils/dictdiffer.py | 5 ++++- - 4 files changed, 18 insertions(+), 4 deletions(-) - -diff --git a/salt/modules/file.py b/salt/modules/file.py -index 771b204d63fe..d1ec5e4c295d 100644 ---- a/salt/modules/file.py -+++ b/salt/modules/file.py -@@ -29,7 +29,11 @@ - import glob - import hashlib - import mmap --from collections import Iterable, Mapping, namedtuple -+try: -+ from collections.abc import Iterable, Mapping -+except ImportError: -+ from collections import Iterable, Mapping -+from collections import namedtuple - from functools import reduce # pylint: disable=redefined-builtin - - # pylint: disable=import-error,no-name-in-module,redefined-builtin -diff --git a/salt/modules/win_file.py b/salt/modules/win_file.py -index 4fd3eebcdd81..5bc983786a98 100644 ---- a/salt/modules/win_file.py -+++ b/salt/modules/win_file.py -@@ -17,7 +17,10 @@ - import logging - # pylint: disable=W0611 - import operator # do not remove --from collections import Iterable, Mapping # do not remove -+try: -+ from collections.abc import Iterable, Mapping # do not remove -+except ImportError: -+ from collections import Iterable, Mapping # do not remove - from functools import reduce # do not remove - import datetime # do not remove. - import tempfile # do not remove. Used in salt.modules.file.__clean_tmp -diff --git a/salt/states/file.py b/salt/states/file.py -index 23c3d3c53955..36231c69cff6 100644 ---- a/salt/states/file.py -+++ b/salt/states/file.py -@@ -291,7 +291,11 @@ def run(): - import sys - import time - import traceback --from collections import Iterable, Mapping, defaultdict -+try: -+ from collections.abc import Iterable, Mapping -+except ImportError: -+ from collections import Iterable, Mapping -+from collections import defaultdict - from datetime import datetime, date # python3 problem in the making? - - # Import salt libs -diff --git a/salt/utils/dictdiffer.py b/salt/utils/dictdiffer.py -index 30e87e885436..da6bd5ed944c 100644 ---- a/salt/utils/dictdiffer.py -+++ b/salt/utils/dictdiffer.py -@@ -13,7 +13,10 @@ - ''' - from __future__ import absolute_import, print_function, unicode_literals - import copy --from collections import Mapping -+try: -+ from collections.abc import Mapping -+except ImportError: -+ from collections import Mapping - from salt.ext import six - - diff --git a/app-admin/salt/files/salt-3000.2-py38-logwarn.patch b/app-admin/salt/files/salt-3000.2-py38-logwarn.patch deleted file mode 100644 index e77d2376ce1b..000000000000 --- a/app-admin/salt/files/salt-3000.2-py38-logwarn.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff --git a/salt/cloud/clouds/ec2.py b/salt/cloud/clouds/ec2.py -index 68f752cb2d..fa2b96499d 100644 ---- a/salt/cloud/clouds/ec2.py -+++ b/salt/cloud/clouds/ec2.py -@@ -4901,7 +4901,7 @@ def get_password_data( - - if not HAS_M2 and not HAS_PYCRYPTO: - if 'key' in kwargs or 'key_file' in kwargs: -- log.warn("No crypto library is installed, can not decrypt password") -+ log.warning("No crypto library is installed, can not decrypt password") - return ret - - if 'key' not in kwargs: -diff --git a/salt/modules/gpg.py b/salt/modules/gpg.py -index 9dd1007c1b..47c82a7141 100644 ---- a/salt/modules/gpg.py -+++ b/salt/modules/gpg.py -@@ -1083,7 +1083,7 @@ def verify(text=None, - - if trustmodel and trustmodel not in trustmodels: - msg = 'Invalid trustmodel defined: {}. Use one of: {}'.format(trustmodel, ', '.join(trustmodels)) -- log.warn(msg) -+ log.warning(msg) - return {'res': False, 'message': msg} - - extra_args = [] -diff --git a/salt/modules/network.py b/salt/modules/network.py -index 38e2bc326e..f3a8a714cd 100644 ---- a/salt/modules/network.py -+++ b/salt/modules/network.py -@@ -958,7 +958,7 @@ def traceroute(host): - - ret.append(result) - if not result: -- log.warn('Cannot parse traceroute output line: %s', line) -+ log.warning('Cannot parse traceroute output line: %s', line) - return ret - - -diff --git a/salt/modules/saltutil.py b/salt/modules/saltutil.py -index 138a0fcf51..5f026b0f36 100644 ---- a/salt/modules/saltutil.py -+++ b/salt/modules/saltutil.py -@@ -1096,7 +1096,7 @@ def refresh_pillar(wait=False, timeout=30): - tag='/salt/minion/minion_pillar_refresh_complete', - wait=timeout) - if not event_ret or event_ret['complete'] is False: -- log.warn("Pillar refresh did not complete within timeout %s", timeout) -+ log.warning("Pillar refresh did not complete within timeout %s", timeout) - return ret - - -diff --git a/salt/transport/tcp.py b/salt/transport/tcp.py -index 12ef24e86f..e83d1c927f 100644 ---- a/salt/transport/tcp.py -+++ b/salt/transport/tcp.py -@@ -1073,7 +1073,7 @@ class SaltMessageClient(object): - self._connecting_future.set_result(True) - break - except Exception as exc: # pylint: disable=broad-except -- log.warn('TCP Message Client encountered an exception %r', exc) -+ log.warning('TCP Message Client encountered an exception %r', exc) - yield salt.ext.tornado.gen.sleep(1) # TODO: backoff - #self._connecting_future.set_exception(e) - -diff --git a/salt/utils/process.py b/salt/utils/process.py -index 9626ac0cb2..18697ccf7c 100644 ---- a/salt/utils/process.py -+++ b/salt/utils/process.py -@@ -124,7 +124,7 @@ def dup2(file1, file2): - try: - fno1 = file1.fileno() - except io.UnsupportedOperation: -- log.warn('Unsupported operation on file: %r', file1) -+ log.warning('Unsupported operation on file: %r', file1) - return - if isinstance(file2, int): - fno2 = file2 -@@ -132,7 +132,7 @@ def dup2(file1, file2): - try: - fno2 = file2.fileno() - except io.UnsupportedOperation: -- log.warn('Unsupported operation on file: %r', file2) -+ log.warning('Unsupported operation on file: %r', file2) - return - os.dup2(fno1, fno2) - -@@ -829,13 +829,13 @@ class SignalHandlingProcess(Process): - if child.is_running(): - child.terminate() - except psutil.NoSuchProcess: -- log.warn( -+ log.warning( - 'Unable to kill child of process %d, it does ' - 'not exist. My pid is %d', - self.pid, os.getpid() - ) - except psutil.NoSuchProcess: -- log.warn( -+ log.warning( - 'Unable to kill children of process %d, it does not exist.' - 'My pid is %d', - self.pid, os.getpid() -diff --git a/tests/integration/modules/test_state.py b/tests/integration/modules/test_state.py -index 81b3b677b9..2f3bcaa613 100644 ---- a/tests/integration/modules/test_state.py -+++ b/tests/integration/modules/test_state.py -@@ -2282,7 +2282,7 @@ class StateModuleTest(ModuleCase, SaltReturnAssertsMixin): - try: - os.remove(path) - except OSError: -- log.warn("Path not found: %s", path) -+ log.warning("Path not found: %s", path) - - with salt.utils.files.fopen(module_path, 'w') as fp: - fp.write('raise ImportError("No module named pip")') diff --git a/app-admin/salt/files/salt-3000.2-py38.patch b/app-admin/salt/files/salt-3000.2-py38.patch deleted file mode 100644 index 1c543a085b10..000000000000 --- a/app-admin/salt/files/salt-3000.2-py38.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5259ba8ef6e5949815641edc563deab67ba68582 Mon Sep 17 00:00:00 2001 -From: Mathias Fussenegger -Date: Fri, 22 Nov 2019 17:05:27 +0100 -Subject: [PATCH] Remove _supported_dists import for python-3.8 support - -`_supported_dists` has been removed from platform in Python 3.8: - - https://github.com/python/cpython/commit/8b94b41ab7b12f745dea744e8940631318816935#diff-47c8e5750258a08a6dd9de3e9c3774acL267-L271 - -This instead inlines all the values that have been there. - -Without this change running `salt-ssh` with Python 3.8 run into an -import error. ---- - salt/grains/core.py | 31 +++++++++++++++++++++++++++---- - 1 file changed, 27 insertions(+), 4 deletions(-) - -diff --git a/salt/grains/core.py b/salt/grains/core.py -index 04c1ae91b5f5..77694abe84f9 100644 ---- a/salt/grains/core.py -+++ b/salt/grains/core.py -@@ -35,11 +35,34 @@ - __proxyenabled__ = ['*'] - __FQDN__ = None - --# Extend the default list of supported distros. This will be used for the -+# Default list of supported distros. This will be used for the - # /etc/DISTRO-release checking that is part of linux_distribution() --from platform import _supported_dists --_supported_dists += ('arch', 'mageia', 'meego', 'vmware', 'bluewhite64', -- 'slamd64', 'ovs', 'system', 'mint', 'oracle', 'void') -+_supported_dists = ( -+ 'SuSE', -+ 'UnitedLinux', -+ 'arch', -+ 'bluewhite64', -+ 'centos', -+ 'debian', -+ 'fedora', -+ 'gentoo', -+ 'mageia', -+ 'mandrake', -+ 'mandriva', -+ 'meego', -+ 'mint', -+ 'oracle', -+ 'ovs', -+ 'redhat', -+ 'rocks', -+ 'slackware', -+ 'slamd64', -+ 'system', -+ 'turbolinux', -+ 'vmware', -+ 'void', -+ 'yellowdog', -+) - - # linux_distribution deprecated in py3.7 - try: diff --git a/app-admin/salt/files/salt-3000.2-tests.patch b/app-admin/salt/files/salt-3000.2-tests.patch deleted file mode 100644 index a562dee5bf94..000000000000 --- a/app-admin/salt/files/salt-3000.2-tests.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- salt-3000.2.orig/tests/unit/utils/test_verify.py 2020-04-29 16:57:02.775635698 -0700 -+++ salt-3000.2/tests/unit/utils/test_verify.py 2020-04-29 16:57:58.042282147 -0700 -@@ -324,6 +324,7 @@ - self.assertTrue(os.path.exists(path)) - - -+@skipIf(True, "breaks under sandbox") - class TestCleanPath(TestCase): - ''' - salt.utils.clean_path works as expected -@@ -366,6 +367,7 @@ - raise ctypes.WinError() - - -+@skipIf(True, "breaks under sandbox") - @skipIf(six.PY2 and salt.utils.platform.is_windows(), 'Skipped on windows py2') - class TestCleanPathLink(TestCase): - ''' diff --git a/app-admin/salt/files/salt-3000.9-tests.patch b/app-admin/salt/files/salt-3000.9-tests.patch deleted file mode 100644 index 9b7a1786e72a..000000000000 --- a/app-admin/salt/files/salt-3000.9-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tests/unit/modules/test_cmdmod.py b/tests/unit/modules/test_cmdmod.py -index 2d88706b49..ec8b623f5b 100644 ---- a/tests/unit/modules/test_cmdmod.py -+++ b/tests/unit/modules/test_cmdmod.py -@@ -509,6 +509,7 @@ class CMDMODTestCase(TestCase, LoaderModuleMockMixin): - self.assertEqual(ret['stdout'], - salt.utils.stringutils.to_unicode(stdout)) - -+ @skipIf(True, "Not happy in sandbox") - def test_run_all_output_loglevel_debug(self): - ''' - Test that specifying debug for loglevel diff --git a/app-admin/salt/files/salt-3001.1-tests.patch b/app-admin/salt/files/salt-3001.1-tests.patch deleted file mode 100644 index ad32b611dfe2..000000000000 --- a/app-admin/salt/files/salt-3001.1-tests.patch +++ /dev/null @@ -1,151 +0,0 @@ -diff --git a/tests/integration/master/test_event_return.py b/tests/integration/master/test_event_return.py -index 1a97be0e5f..93c57f08ff 100644 ---- a/tests/integration/master/test_event_return.py -+++ b/tests/integration/master/test_event_return.py -@@ -18,7 +18,7 @@ import time - import salt.ext.six as six - from salt.utils.nb_popen import NonBlockingPopen - from saltfactories.utils.ports import get_unused_localhost_port --from saltfactories.utils.processes.helpers import terminate_process -+from saltfactories.utils.processes import terminate_process - from tests.support.cli_scripts import ScriptPathMixin - from tests.support.mixins import AdaptedConfigurationTestCaseMixin - from tests.support.runtests import RUNTIME_VARS -diff --git a/tests/integration/utils/testprogram.py b/tests/integration/utils/testprogram.py -index 74bbc1cd90..be651591d1 100644 ---- a/tests/integration/utils/testprogram.py -+++ b/tests/integration/utils/testprogram.py -@@ -30,7 +30,7 @@ import salt.utils.psutil_compat as psutils - import salt.utils.yaml - from salt.ext import six - from salt.ext.six.moves import range --from saltfactories.utils.processes.helpers import ( -+from saltfactories.utils.processes import ( - terminate_process, - terminate_process_list, - ) -diff --git a/tests/support/case.py b/tests/support/case.py -index 9017027ae3..517cefb64a 100644 ---- a/tests/support/case.py -+++ b/tests/support/case.py -@@ -25,7 +25,7 @@ import time - from datetime import datetime, timedelta - - import salt.utils.files --from saltfactories.utils.processes.helpers import terminate_process -+from saltfactories.utils.processes import terminate_process - from tests.support.cli_scripts import ScriptPathMixin - from tests.support.helpers import RedirectStdStreams, requires_sshd_server - from tests.support.mixins import ( # pylint: disable=unused-import -diff --git a/tests/support/helpers.py b/tests/support/helpers.py -index bae2dceff4..93fbb66742 100644 ---- a/tests/support/helpers.py -+++ b/tests/support/helpers.py -@@ -42,7 +42,7 @@ import salt.utils.versions - from salt.ext import six - from salt.ext.six.moves import builtins, range - from saltfactories.utils.ports import get_unused_localhost_port --from saltfactories.utils.processes.bases import ProcessResult -+from saltfactories.utils.processes import ProcessResult - from tests.support.mock import patch - from tests.support.runtests import RUNTIME_VARS - from tests.support.sminion import create_sminion -@@ -1674,7 +1674,7 @@ class VirtualEnv(object): - kwargs.setdefault("stderr", subprocess.PIPE) - kwargs.setdefault("universal_newlines", True) - proc = subprocess.run(args, check=False, **kwargs) -- ret = ProcessResult(proc.returncode, proc.stdout, proc.stderr, proc.args) -+ ret = ProcessResult(proc.returncode, proc.stdout, proc.stderr, cmdline=proc.args) - log.debug(ret) - if check is True: - proc.check_returncode() -diff --git a/tests/support/paths.py b/tests/support/paths.py -index 1e1e081dc4..981aa54eb7 100644 ---- a/tests/support/paths.py -+++ b/tests/support/paths.py -@@ -49,14 +49,12 @@ if TESTS_DIR not in sys.path: - sys.path.insert(1, TESTS_DIR) - - SYS_TMP_DIR = os.path.abspath( -- os.path.realpath( -- # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long -- # for unix sockets: ``error: AF_UNIX path too long`` -- # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR} -- os.environ.get("TMPDIR", tempfile.gettempdir()) -- if not sys.platform.startswith("darwin") -- else "/tmp" -- ) -+ # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long -+ # for unix sockets: ``error: AF_UNIX path too long`` -+ # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR} -+ os.environ.get("TMPDIR", tempfile.gettempdir()) -+ if not sys.platform.startswith("darwin") -+ else "/tmp" - ) - TMP = os.path.join(SYS_TMP_DIR, "salt-tests-tmpdir") - TMP_ROOT_DIR = os.path.join(TMP, "rootdir") -diff --git a/tests/support/processes.py b/tests/support/processes.py -index 4f264862a4..7c93e48368 100644 ---- a/tests/support/processes.py -+++ b/tests/support/processes.py -@@ -14,7 +14,7 @@ from __future__ import absolute_import - - import logging - --from saltfactories.utils.processes.helpers import ( # pylint: disable=unused-import -+from saltfactories.utils.processes import ( # pylint: disable=unused-import - collect_child_processes, - terminate_process, - terminate_process_list, -diff --git a/tests/unit/utils/scheduler/base.py b/tests/unit/utils/scheduler/base.py -index 5d7f161eb5..286e047e40 100644 ---- a/tests/unit/utils/scheduler/base.py -+++ b/tests/unit/utils/scheduler/base.py -@@ -14,7 +14,7 @@ import salt.utils.platform - import salt.utils.schedule - from salt.modules.test import ping - from salt.utils.process import SubprocessList --from saltfactories.utils.processes.helpers import terminate_process -+from saltfactories.utils.processes import terminate_process - from tests.support.mixins import SaltReturnAssertsMixin - from tests.support.mock import MagicMock, patch - from tests.support.runtests import RUNTIME_VARS -diff --git a/tests/unit/utils/test_event.py b/tests/unit/utils/test_event.py -index 9a3b1c428d..dfcf1c5275 100644 ---- a/tests/unit/utils/test_event.py -+++ b/tests/unit/utils/test_event.py -@@ -21,7 +21,7 @@ import zmq - import zmq.eventloop.ioloop - from salt.ext.six.moves import range - from salt.ext.tornado.testing import AsyncTestCase --from saltfactories.utils.processes.helpers import terminate_process -+from saltfactories.utils.processes import terminate_process - from tests.support.events import eventpublisher_process, eventsender_process - from tests.support.helpers import slowTest - from tests.support.runtests import RUNTIME_VARS -diff --git a/tests/unit/utils/test_verify.py b/tests/unit/utils/test_verify.py -index 5662cf621b..0339c353dc 100644 ---- a/tests/unit/utils/test_verify.py -+++ b/tests/unit/utils/test_verify.py -@@ -343,7 +343,7 @@ class TestCleanPath(TestCase): - def test_clean_path_valid(self): - path_a = os.path.join(self.tmpdir, "foo") - path_b = os.path.join(self.tmpdir, "foo", "bar") -- assert clean_path(path_a, path_b) == path_b -+ assert clean_path(path_a, path_b) == os.path.realpath(path_b) - - def test_clean_path_invalid(self): - path_a = os.path.join(self.tmpdir, "foo") -@@ -398,10 +398,10 @@ class TestCleanPathLink(TestCase): - test_path = os.path.join(self.from_path, "test") - expect_path = os.path.join(self.to_path, "test") - ret = clean_path(self.from_path, test_path) -- assert ret == expect_path, "{} is not {}".format(ret, expect_path) -+ assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path) - - def test_clean_path_symlinked_tgt(self): - test_path = os.path.join(self.to_path, "test") - expect_path = os.path.join(self.to_path, "test") - ret = clean_path(self.from_path, test_path) -- assert ret == expect_path, "{} is not {}".format(ret, expect_path) -+ assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path) diff --git a/app-admin/salt/files/salt-3001.6-tests.patch b/app-admin/salt/files/salt-3001.6-tests.patch deleted file mode 100644 index d32977e4694b..000000000000 --- a/app-admin/salt/files/salt-3001.6-tests.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- salt-3001.6-python3_7/tests/unit/modules/test_cmdmod.py 2021-02-26 16:13:26.386553301 -0800 -+++ salt-3001.6/tests/unit/modules/test_cmdmod.py 2021-02-26 16:14:25.858150910 -0800 -@@ -437,6 +437,7 @@ - else: - raise RuntimeError - -+ @skipIf(True, "does not work with sandbox") - @skipIf(salt.utils.platform.is_windows(), "Do not run on Windows") - @skipIf(salt.utils.platform.is_darwin(), "Do not run on MacOS") - def test_run_cwd_in_combination_with_runas(self): -@@ -560,6 +561,7 @@ - - self.assertEqual(ret["stdout"], salt.utils.stringutils.to_unicode(stdout)) - -+ @skipIf(True, "does not work with sandbox") - def test_run_all_output_loglevel_debug(self): - """ - Test that specifying debug for loglevel diff --git a/app-admin/salt/files/salt-3004.2-importlib.patch b/app-admin/salt/files/salt-3004.2-importlib.patch new file mode 100644 index 000000000000..599b17290d5b --- /dev/null +++ b/app-admin/salt/files/salt-3004.2-importlib.patch @@ -0,0 +1,11 @@ +--- a/salt/_compat.py 2022-06-28 01:50:45.630746476 -0000 ++++ b/salt/_compat.py 2022-06-28 01:51:52.970217848 -0000 +@@ -14,7 +14,7 @@ + if sys.version_info >= (3, 10): + # Python 3.10 will include a fix in importlib.metadata which allows us to + # get the distribution of a loaded entry-point +- import importlib.metadata # pylint: disable=no-member,no-name-in-module ++ import importlib.metadata as importlib_metadata # pylint: disable=no-member,no-name-in-module + else: + # importlib_metadata before version 3.3.0 does not include the functionality we need. + try: diff --git a/app-admin/salt/files/salt-3004.2-jinja-3.patch b/app-admin/salt/files/salt-3004.2-jinja-3.patch new file mode 100644 index 000000000000..271921fd4564 --- /dev/null +++ b/app-admin/salt/files/salt-3004.2-jinja-3.patch @@ -0,0 +1,14 @@ +diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py +index 6502831aff..dec847364a 100644 +--- a/tests/unit/utils/test_jinja.py ++++ b/tests/unit/utils/test_jinja.py +@@ -22,7 +22,8 @@ import salt.utils.files + import salt.utils.json + import salt.utils.stringutils + import salt.utils.yaml +-from jinja2 import DictLoader, Environment, Markup, exceptions ++from jinja2 import DictLoader, Environment, exceptions ++from markupsafe import Markup + from salt.exceptions import SaltRenderError + from salt.utils.decorators.jinja import JinjaFilter + from salt.utils.jinja import ( diff --git a/app-admin/salt/salt-3000.8-r1.ebuild b/app-admin/salt/salt-3000.8-r1.ebuild deleted file mode 100644 index a7beec09126f..000000000000 --- a/app-admin/salt/salt-3000.8-r1.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..8} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://www.saltstack.com/resources/community/ - https://github.com/saltstack" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz" - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako - mongodb neutron nova openssl portage profile redis selinux test raet - +zeromq vim-syntax" - -RDEPEND=" - sys-apps/pciutils - dev-python/distro[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/libnacl[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.5[${PYTHON_USEDEP}] - =dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( - $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) - ) - openssl? ( - dev-libs/openssl:0=[-bindist(-)] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - nova? ( - $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) - ) - neutron? ( - $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) - ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim ) - zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) -" -BDEPEND=" - test? ( - ${RDEPEND} - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] - >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - >=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}] - dev-python/pytest-tempdir[${PYTHON_USEDEP}] - >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq ) - test? ( cheetah genshi )" -RESTRICT="!test? ( test ) x86? ( test )" - -# tests failing with newer versions of deps -RESTRICT+=" test" - -PATCHES=( - "${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch" - "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" - "${FILESDIR}/salt-3000.1-tests.patch" - "${FILESDIR}/salt-3000.2-tests.patch" - - # https://github.com/saltstack/salt/pull/55410 - "${FILESDIR}/salt-3000.2-py38.patch" - - # https://github.com/saltstack/salt/pull/55900 - "${FILESDIR}/salt-3000.2-py38-abc.patch" - - # misc py38 fixups - "${WORKDIR}/salt-3000.2-py38-misc.patch" - "${FILESDIR}/salt-3000.2-py38-logwarn.patch" - "${FILESDIR}/salt-2019.2.8-ansible-roster-fix.patch" -) - -python_prepare_all() { - # remove tests with external dependencies that may not be available, and - # tests that don't work in sandbox - rm tests/unit/{test_zypp_plugins,utils/test_{extend,cache}}.py || die - rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die - rm tests/unit/states/test_boto_vpc.py || die - - # tests that require network access - rm tests/unit/{states,modules}/test_zcbuildout.py || die - rm tests/unit/transport/test_zeromq.py || die - - # make sure pkg_resources doesn't bomb because pycrypto isn't installed - find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die - distutils-r1_python_prepare_all -} - -python_prepare() { - einfo "Fixing collections.abc warnings for ${EPYTHON}" - local abc - abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die - find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die - - # allow the use of the renamed msgpack - sed -i '/^msgpack/d' requirements/base.txt || die -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - local tempdir - # testsuite likes lots of files - ulimit -n 3072 || die - - # ${T} is too long a path for the tests to work - tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" - mkdir "${T}/$(basename "${tempdir}")" - - ( - cleanup() { rm -f "${tempdir}" || die; } - - trap cleanup EXIT - - addwrite "${tempdir}" - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die - - USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ - TMPDIR="${tempdir}" \ - ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose \ - || die "testing failed with ${EPYTHON}" - ) -} - -pkg_postinst() { - if use python_targets_python3_8; then - if use nova; then - ewarn "Salt's nova functionality will not work with python3.8 since" - ewarn "dev-python/python-novaclient does not support it yet" - fi - if use neutron; then - ewarn "Salt's neutron functionality will not work with python3.8 since" - ewarn "dev-python/python-neutronclient does not support it yet" - fi - if use libvirt; then - ewarn "Salt's libvirt functionality will not work with python3.8 since" - ewarn "dev-python/libvirt-python does not support it yet" - fi - fi -} diff --git a/app-admin/salt/salt-3000.9-r1.ebuild b/app-admin/salt/salt-3000.9-r1.ebuild deleted file mode 100644 index 5a4ddb137b9a..000000000000 --- a/app-admin/salt/salt-3000.9-r1.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..8} ) - -inherit systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://www.saltstack.com/resources/community/ - https://github.com/saltstack" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako - mongodb neutron nova openssl portage profile redis selinux test raet - +zeromq vim-syntax" - -RDEPEND=" - sys-apps/pciutils - dev-python/distro[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/libnacl[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.5[${PYTHON_USEDEP}] - =dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( - $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) - ) - openssl? ( - dev-libs/openssl:0=[-bindist(-)] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - nova? ( - $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) - ) - neutron? ( - $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) - ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim ) - zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) -" -BDEPEND=" - test? ( - ${RDEPEND} - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] - >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - >=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}] - dev-python/pytest-tempdir[${PYTHON_USEDEP}] - >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq ) - test? ( cheetah genshi )" -RESTRICT="!test? ( test ) x86? ( test )" - -# tests failing with newer versions of deps -#RESTRICT+=" test" - -PATCHES=( - "${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch" - "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" - "${FILESDIR}/salt-3000.1-tests.patch" - "${FILESDIR}/salt-3000.2-tests.patch" - "${FILESDIR}/salt-3000.9-tests.patch" - - # https://github.com/saltstack/salt/pull/55410 - "${FILESDIR}/salt-3000.2-py38.patch" - - # https://github.com/saltstack/salt/pull/55900 - "${FILESDIR}/salt-3000.2-py38-abc.patch" - - # misc py38 fixups - "${WORKDIR}/salt-3000.2-py38-misc.patch" - "${FILESDIR}/salt-3000.2-py38-logwarn.patch" - "${FILESDIR}/salt-2019.2.8-ansible-roster-fix.patch" -) - -python_prepare_all() { - # remove tests with external dependencies that may not be available, and - # tests that don't work in sandbox - rm tests/unit/{test_zypp_plugins,utils/test_{extend,cache}}.py || die - rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die - rm tests/unit/states/test_boto_vpc.py tests/unit/test_module_names.py || die - - # tests that require network access - rm tests/unit/{states,modules}/test_zcbuildout.py || die - rm tests/unit/transport/test_zeromq.py || die - - # make sure pkg_resources doesn't bomb because pycrypto isn't installed - find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die - distutils-r1_python_prepare_all -} - -python_prepare() { - einfo "Fixing collections.abc warnings for ${EPYTHON}" - local abc - abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die - find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die - - # allow the use of the renamed msgpack - sed -i '/^msgpack/d' requirements/base.txt || die -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - local tempdir - # testsuite likes lots of files - ulimit -n 3072 || die - - # ${T} is too long a path for the tests to work - tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" - mkdir "${T}/$(basename "${tempdir}")" - - ( - cleanup() { rm -f "${tempdir}" || die; } - - trap cleanup EXIT - - addwrite "${tempdir}" - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die - - USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ - TMPDIR="${tempdir}" \ - ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose \ - || die "testing failed with ${EPYTHON}" - ) -} - -pkg_postinst() { - if use python_targets_python3_8; then - if use nova; then - ewarn "Salt's nova functionality will not work with python3.8 since" - ewarn "dev-python/python-novaclient does not support it yet" - fi - if use neutron; then - ewarn "Salt's neutron functionality will not work with python3.8 since" - ewarn "dev-python/python-neutronclient does not support it yet" - fi - if use libvirt; then - ewarn "Salt's libvirt functionality will not work with python3.8 since" - ewarn "dev-python/libvirt-python does not support it yet" - fi - fi -} diff --git a/app-admin/salt/salt-3001.8.ebuild b/app-admin/salt/salt-3001.8.ebuild deleted file mode 100644 index f5be15b9f74c..000000000000 --- a/app-admin/salt/salt-3001.8.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..8} ) - -inherit systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://www.saltstack.com/resources/community/ - https://github.com/saltstack" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako - mongodb neutron nova openssl portage profile redis selinux test raet - +zeromq vim-syntax" - -RDEPEND=" - sys-apps/pciutils - dev-python/distro[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/libnacl[${PYTHON_USEDEP}] - >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] - >=dev-python/pycryptodome-3.9.7[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/toml[${PYTHON_USEDEP}] - dev-python/watchdog[${PYTHON_USEDEP}] - libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( - $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) - ) - openssl? ( - dev-libs/openssl:0=[-bindist(-)] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - nova? ( - $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) - ) - neutron? ( - $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) - ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim ) - zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) -" -BDEPEND=" - test? ( - ${RDEPEND} - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] - >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - >=dev-python/pytest-salt-2020.1.27[${PYTHON_USEDEP}] - dev-python/pytest-salt-factories[${PYTHON_USEDEP}] - dev-python/pytest-tempdir[${PYTHON_USEDEP}] - >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] - >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] - net-dns/bind-tools - !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq ) - test? ( cheetah genshi )" -RESTRICT="!test? ( test ) x86? ( test )" - -PATCHES=( - "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" - "${FILESDIR}/salt-3001.1-tests.patch" - "${FILESDIR}/salt-3001.6-tests.patch" -) - -python_prepare_all() { - # remove tests with external dependencies that may not be available, and - # tests that don't work in sandbox - rm tests/unit/{test_{zypp_plugins,module_names},utils/test_{extend,cache}}.py || die - rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die - rm tests/unit/states/test_boto_vpc.py || die - rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die - - # tests that require network access - rm tests/unit/{states,modules}/test_zcbuildout.py || die - - # make sure pkg_resources doesn't bomb because pycrypto isn't installed - find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die - # pycryptodome rather than pycryptodomex - find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die - - distutils-r1_python_prepare_all -} - -python_prepare() { - einfo "Fixing collections.abc warnings for ${EPYTHON}" - local abc - abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die - find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - local tempdir - # testsuite likes lots of files - ulimit -n 3072 || die - - # ${T} is too long a path for the tests to work - tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" - mkdir "${T}/$(basename "${tempdir}")" - - ( - cleanup() { rm -f "${tempdir}" || die; } - - trap cleanup EXIT - - addwrite "${tempdir}" - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die - - USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ - TMPDIR="${tempdir}" \ - ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose \ - || die "testing failed with ${EPYTHON}" - ) -} - -pkg_postinst() { - if use python_targets_python3_8; then - if use nova; then - ewarn "Salt's nova functionality will not work with python3.8 since" - ewarn "dev-python/python-novaclient does not support it yet" - fi - if use neutron; then - ewarn "Salt's neutron functionality will not work with python3.8 since" - ewarn "dev-python/python-neutronclient does not support it yet" - fi - if use libvirt; then - ewarn "Salt's libvirt functionality will not work with python3.8 since" - ewarn "dev-python/libvirt-python does not support it yet" - fi - fi -} diff --git a/app-admin/salt/salt-3002.7.ebuild b/app-admin/salt/salt-3002.7.ebuild deleted file mode 100644 index ef104ec4d6b4..000000000000 --- a/app-admin/salt/salt-3002.7.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) - -inherit systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://www.saltstack.com/resources/community/ - https://github.com/saltstack" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako - mongodb neutron nova openssl portage profile redis selinux test raet - +zeromq vim-syntax" - -RDEPEND=" - sys-apps/pciutils - >=dev-python/distro-1.5[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/libnacl[${PYTHON_USEDEP}] - >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] - >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/toml[${PYTHON_USEDEP}] - dev-python/watchdog[${PYTHON_USEDEP}] - libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( - $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) - ) - openssl? ( - dev-libs/openssl:0=[-bindist(-)] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) - genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - nova? ( - $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) - ) - neutron? ( - $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) - ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim ) - zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) -" -BDEPEND=" - test? ( - ${RDEPEND} - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] - >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - >=dev-python/pytest-salt-factories-0.93.0[${PYTHON_USEDEP}] - dev-python/pytest-tempdir[${PYTHON_USEDEP}] - >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] - net-dns/bind-tools - !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE=" - || ( raet zeromq ) - test? ( cheetah genshi ) -" -RESTRICT="!test? ( test ) x86? ( test )" - -PATCHES=( - "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" - "${FILESDIR}/salt-3002-dont-realpath-on-tmpdir.patch" - "${FILESDIR}/salt-3002-tests.patch" - "${FILESDIR}/salt-3002.5-tests.patch" - "${FILESDIR}/salt-3002.7-tests.patch" -) - -python_prepare_all() { - # remove tests with external dependencies that may not be available, and - # tests that don't work in sandbox - rm tests/unit/{test_{zypp_plugins,module_names},utils/test_{extend,cache}}.py || die - rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die - rm tests/unit/states/test_boto_vpc.py || die - rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die - - # tests that require network access - rm tests/unit/{states,modules}/test_zcbuildout.py || die - - sed -i 's:log.trace(:log.debug(:' \ - salt/fileserver/roots.py salt/grains/core.py salt/states/saltmod.py || die - - # make sure pkg_resources doesn't bomb because pycrypto isn't installed - # make sure pkg_resources doesn't bomb because pycrypto isn't installed - find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die - # pycryptodome rather than pycryptodomex - find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die - - distutils-r1_python_prepare_all -} - -python_prepare() { - einfo "Fixing collections.abc warnings for ${EPYTHON}" - local abc - abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die - find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - local tempdir - # testsuite likes lots of files - ulimit -n 3072 || die - - # ${T} is too long a path for the tests to work - tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" - mkdir "${T}/$(basename "${tempdir}")" - - ( - cleanup() { rm -f "${tempdir}" || die; } - - trap cleanup EXIT - - addwrite "${tempdir}" - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die - - USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ - TMPDIR="${tempdir}" \ - ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose \ - || die "testing failed with ${EPYTHON}" - ) -} - -pkg_postinst() { - if use python_targets_python3_8; then - if use nova; then - ewarn "Salt's nova functionality will not work with python3.8 since" - ewarn "dev-python/python-novaclient does not support it yet" - fi - if use neutron; then - ewarn "Salt's neutron functionality will not work with python3.8 since" - ewarn "dev-python/python-neutronclient does not support it yet" - fi - if use libvirt; then - ewarn "Salt's libvirt functionality will not work with python3.8 since" - ewarn "dev-python/libvirt-python does not support it yet" - fi - fi -} diff --git a/app-admin/salt/salt-3002.8.ebuild b/app-admin/salt/salt-3002.8.ebuild deleted file mode 100644 index 023fe6aa7470..000000000000 --- a/app-admin/salt/salt-3002.8.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) - -inherit systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://www.saltstack.com/resources/community/ - https://github.com/saltstack" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako - mongodb neutron nova openssl portage profile redis selinux test raet - +zeromq vim-syntax" - -RDEPEND=" - sys-apps/pciutils - >=dev-python/distro-1.5[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/libnacl[${PYTHON_USEDEP}] - >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] - >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/toml[${PYTHON_USEDEP}] - dev-python/watchdog[${PYTHON_USEDEP}] - libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( - $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) - ) - openssl? ( - dev-libs/openssl:0=[-bindist(-)] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) - genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - nova? ( - $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) - ) - neutron? ( - $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) - ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim ) - zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] ) -" -BDEPEND=" - test? ( - ${RDEPEND} - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] - >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - >=dev-python/pytest-salt-factories-0.93.0[${PYTHON_USEDEP}] - dev-python/pytest-tempdir[${PYTHON_USEDEP}] - >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] - net-dns/bind-tools - !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE=" - || ( raet zeromq ) - test? ( cheetah genshi ) -" -RESTRICT="!test? ( test ) x86? ( test )" - -PATCHES=( - "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" - "${FILESDIR}/salt-3002-dont-realpath-on-tmpdir.patch" - "${FILESDIR}/salt-3002-tests.patch" - "${FILESDIR}/salt-3002.5-tests.patch" - "${FILESDIR}/salt-3002.7-tests.patch" - "${FILESDIR}/salt-3004.1-jinja-3.patch" - "${FILESDIR}/salt-3002.8-tests.patch" - "${FILESDIR}/salt-3002.8-relax-pyzmq-dep.patch" -) - -python_prepare_all() { - # remove tests with external dependencies that may not be available, and - # tests that don't work in sandbox - rm tests/unit/{test_{zypp_plugins,module_names},utils/test_{extend,cache}}.py || die - rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die - rm tests/unit/states/test_boto_vpc.py || die - rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die - rm salt/utils/virtualbox.py || die - - # tests that require network access - rm tests/unit/{states,modules}/test_zcbuildout.py || die - - sed -i 's:log.trace(:log.debug(:' \ - salt/fileserver/roots.py salt/grains/core.py salt/states/saltmod.py || die - - # make sure pkg_resources doesn't bomb because pycrypto isn't installed - # make sure pkg_resources doesn't bomb because pycrypto isn't installed - find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die - # pycryptodome rather than pycryptodomex - find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die - - distutils-r1_python_prepare_all -} - -python_prepare() { - einfo "Fixing collections.abc warnings for ${EPYTHON}" - local abc - abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die - find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - local tempdir - # testsuite likes lots of files - ulimit -n 3072 || die - - # ${T} is too long a path for the tests to work - tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" - mkdir "${T}/$(basename "${tempdir}")" - - ( - cleanup() { rm -f "${tempdir}" || die; } - - trap cleanup EXIT - - addwrite "${tempdir}" - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die - - USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ - TMPDIR="${tempdir}" \ - ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose \ - || die "testing failed with ${EPYTHON}" - ) -} - -pkg_postinst() { - if use python_targets_python3_8; then - if use nova; then - ewarn "Salt's nova functionality will not work with python3.8 since" - ewarn "dev-python/python-novaclient does not support it yet" - fi - if use neutron; then - ewarn "Salt's neutron functionality will not work with python3.8 since" - ewarn "dev-python/python-neutronclient does not support it yet" - fi - if use libvirt; then - ewarn "Salt's libvirt functionality will not work with python3.8 since" - ewarn "dev-python/libvirt-python does not support it yet" - fi - fi -} diff --git a/app-admin/salt/salt-3002.9.ebuild b/app-admin/salt/salt-3002.9.ebuild new file mode 100644 index 000000000000..e3287689891c --- /dev/null +++ b/app-admin/salt/salt-3002.9.ebuild @@ -0,0 +1,200 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..9} ) + +inherit systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="https://www.saltstack.com/resources/community/ + https://github.com/saltstack" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" + SRC_URI="" +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako + mongodb neutron nova openssl portage profile redis selinux test raet + +zeromq vim-syntax" + +RDEPEND=" + sys-apps/pciutils + >=dev-python/distro-1.5[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/libnacl[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/toml[${PYTHON_USEDEP}] + dev-python/watchdog[${PYTHON_USEDEP}] + libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( + $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) + ) + openssl? ( + dev-libs/openssl:0=[-bindist(-)] + dev-python/pyopenssl[${PYTHON_USEDEP}] + ) + raet? ( + >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] + >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] + >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] + ) + cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) + cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) + genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + nova? ( + $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) + ) + neutron? ( + $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) + ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim ) + zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] ) +" +BDEPEND=" + test? ( + ${RDEPEND} + >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] + >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] + >=dev-python/pytest-salt-factories-0.93.0[${PYTHON_USEDEP}] + dev-python/pytest-tempdir[${PYTHON_USEDEP}] + >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] + net-dns/bind-tools + !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) + )" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE=" + || ( raet zeromq ) + test? ( cheetah genshi ) +" +RESTRICT="!test? ( test ) x86? ( test )" + +PATCHES=( + "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" + "${FILESDIR}/salt-3002-dont-realpath-on-tmpdir.patch" + "${FILESDIR}/salt-3002-tests.patch" + "${FILESDIR}/salt-3002.5-tests.patch" + "${FILESDIR}/salt-3002.7-tests.patch" + "${FILESDIR}/salt-3004.2-jinja-3.patch" + "${FILESDIR}/salt-3002.8-tests.patch" + "${FILESDIR}/salt-3002.8-relax-pyzmq-dep.patch" +) + +python_prepare_all() { + # remove tests with external dependencies that may not be available, and + # tests that don't work in sandbox + rm tests/unit/{test_{zypp_plugins,module_names},utils/test_{extend,cache}}.py || die + rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die + rm tests/unit/states/test_boto_vpc.py || die + rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die + rm salt/utils/virtualbox.py || die + + # tests that require network access + rm tests/unit/{states,modules}/test_zcbuildout.py || die + + sed -i 's:log.trace(:log.debug(:' \ + salt/fileserver/roots.py salt/grains/core.py salt/states/saltmod.py || die + + # make sure pkg_resources doesn't bomb because pycrypto isn't installed + # make sure pkg_resources doesn't bomb because pycrypto isn't installed + find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die + # pycryptodome rather than pycryptodomex + find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die + + distutils-r1_python_prepare_all +} + +python_prepare() { + einfo "Fixing collections.abc warnings for ${EPYTHON}" + local abc + abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die + find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die +} + +python_install_all() { + local svc + USE_SETUPTOOLS=1 distutils-r1_python_install_all + + for svc in minion master syndic api; do + newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + local tempdir + # testsuite likes lots of files + ulimit -n 3072 || die + + # ${T} is too long a path for the tests to work + tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" + mkdir "${T}/$(basename "${tempdir}")" + + ( + cleanup() { rm -f "${tempdir}" || die; } + + trap cleanup EXIT + + addwrite "${tempdir}" + ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die + + USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ + TMPDIR="${tempdir}" \ + ${EPYTHON} tests/runtests.py \ + --unit-tests --no-report --verbose \ + || die "testing failed with ${EPYTHON}" + ) +} + +pkg_postinst() { + if use python_targets_python3_8; then + if use nova; then + ewarn "Salt's nova functionality will not work with python3.8 since" + ewarn "dev-python/python-novaclient does not support it yet" + fi + if use neutron; then + ewarn "Salt's neutron functionality will not work with python3.8 since" + ewarn "dev-python/python-neutronclient does not support it yet" + fi + if use libvirt; then + ewarn "Salt's libvirt functionality will not work with python3.8 since" + ewarn "dev-python/libvirt-python does not support it yet" + fi + fi +} diff --git a/app-admin/salt/salt-3003-r1.ebuild b/app-admin/salt/salt-3003-r1.ebuild deleted file mode 100644 index a41257f8685b..000000000000 --- a/app-admin/salt/salt-3003-r1.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://www.saltstack.com/resources/community/ - https://github.com/saltstack" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako - mongodb neutron nova openssl portage profile redis selinux test raet - +zeromq vim-syntax" - -RDEPEND=" - sys-apps/pciutils - >=dev-python/distro-1.5[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/libnacl[${PYTHON_USEDEP}] - >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] - >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/toml-0.10.2[${PYTHON_USEDEP}] - dev-python/watchdog[${PYTHON_USEDEP}] - libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( - $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) - ) - openssl? ( - dev-libs/openssl:0=[-bindist(-)] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) - genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - nova? ( - $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) - ) - neutron? ( - $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) - ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim ) - zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) -" -BDEPEND=" - test? ( - ${RDEPEND} - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - >=dev-python/pytest-salt-factories-0.121.1[${PYTHON_USEDEP}] - dev-python/pytest-tempdir[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - dev-python/pytest-subtests[${PYTHON_USEDEP}] - dev-python/flaky[${PYTHON_USEDEP}] - dev-python/libcloud[${PYTHON_USEDEP}] - >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] - !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq ) - test? ( cheetah genshi )" -RESTRICT="!test? ( test ) x86? ( test )" - -PATCHES=( - "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch" - "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" - "${FILESDIR}/salt-3002-tests.patch" - "${FILESDIR}/salt-3003-tests.patch" -) - -python_prepare_all() { - # remove tests with external dependencies that may not be available, and - # tests that don't work in sandbox - rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die - rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die - rm tests/unit/states/test_boto_vpc.py || die - rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die - rm tests/pytests/functional/transport/server/test_req_channel.py || die - - # tests that require network access - rm tests/unit/{states,modules}/test_zcbuildout.py || die - rm -r tests/integration/cloud || die - rm -r tests/kitchen/tests/wordpress/tests || die - rm tests/kitchen/test_kitchen.py || die - rm tests/unit/modules/test_network.py || die - - # tests require root access - rm tests/integration/pillar/test_git_pillar.py || die - rm tests/integration/states/test_supervisord.py || die - rm tests/pytests/unit/client/test_ssh.py || die - - # make sure pkg_resources doesn't bomb because pycrypto isn't installed - find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die - # pycryptodome rather than pycryptodomex - find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die - - distutils-r1_python_prepare_all -} - -python_prepare() { - einfo "Fixing collections.abc warnings for ${EPYTHON}" - local abc - abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die - find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - # testsuite likes lots of files - ulimit -n 4096 || die - - # ${T} is too long a path for the tests to work - local TMPDIR - TMPDIR="$(mktemp --directory --tmpdir=/tmp ${P}-tests-XXXXX)" - ( - export TMPDIR - cleanup() { rm -rf "${TMPDIR}" || die; } - - trap cleanup EXIT - - addwrite "${TMPDIR}" - - USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ - "${EPYTHON}" -m pytest -vv \ - || die "testing failed with ${EPYTHON}" - ) -} - -pkg_postinst() { - if use python_targets_python3_8; then - if use nova; then - ewarn "Salt's nova functionality will not work with python3.8 since" - ewarn "dev-python/python-novaclient does not support it yet" - fi - if use neutron; then - ewarn "Salt's neutron functionality will not work with python3.8 since" - ewarn "dev-python/python-neutronclient does not support it yet" - fi - if use libvirt; then - ewarn "Salt's libvirt functionality will not work with python3.8 since" - ewarn "dev-python/libvirt-python does not support it yet" - fi - fi -} diff --git a/app-admin/salt/salt-3003.3-r1.ebuild b/app-admin/salt/salt-3003.3-r1.ebuild deleted file mode 100644 index fbccb4248798..000000000000 --- a/app-admin/salt/salt-3003.3-r1.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) - -inherit systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://www.saltstack.com/resources/community/ - https://github.com/saltstack" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako - mongodb neutron nova openssl portage profile redis selinux test raet - +zeromq vim-syntax" - -RDEPEND=" - sys-apps/pciutils - >=dev-python/distro-1.5[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/libnacl[${PYTHON_USEDEP}] - >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] - >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/toml-0.10.2[${PYTHON_USEDEP}] - dev-python/watchdog[${PYTHON_USEDEP}] - libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( - $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) - ) - openssl? ( - dev-libs/openssl:0=[-bindist(-)] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) - genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - nova? ( - $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) - ) - neutron? ( - $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) - ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim ) - zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) -" -BDEPEND=" - test? ( - ${RDEPEND} - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - >=dev-python/pytest-salt-factories-0.121.1[${PYTHON_USEDEP}] - dev-python/pytest-tempdir[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - dev-python/pytest-subtests[${PYTHON_USEDEP}] - dev-python/flaky[${PYTHON_USEDEP}] - dev-python/libcloud[${PYTHON_USEDEP}] - net-dns/bind-tools - >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] - !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq ) - test? ( cheetah genshi )" -RESTRICT="!test? ( test ) x86? ( test )" - -PATCHES=( - "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch" - "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" - "${FILESDIR}/salt-3002-tests.patch" - "${FILESDIR}/salt-3003.3-tests.patch" - "${FILESDIR}/salt-3003.1-tests.patch" - "${FILESDIR}/salt-3003.3-jinja.patch" -) - -python_prepare_all() { - # remove tests with external dependencies that may not be available, and - # tests that don't work in sandbox - rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die - rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die - rm tests/unit/states/test_boto_vpc.py || die - rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die - rm tests/pytests/functional/transport/server/test_req_channel.py || die - - # tests that require network access - rm tests/unit/{states,modules}/test_zcbuildout.py || die - rm -r tests/integration/cloud || die - rm -r tests/kitchen/tests/wordpress/tests || die - rm tests/kitchen/test_kitchen.py || die - rm tests/unit/modules/test_network.py || die - - # tests require root access - rm tests/integration/pillar/test_git_pillar.py || die - rm tests/integration/states/test_supervisord.py || die - rm tests/pytests/unit/client/test_ssh.py || die - - # make sure pkg_resources doesn't bomb because pycrypto isn't installed - find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die - # pycryptodome rather than pycryptodomex - find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die - - distutils-r1_python_prepare_all -} - -python_prepare() { - einfo "Fixing collections.abc warnings for ${EPYTHON}" - local abc - abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die - find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die - - # removes contextvars, see bug: https://bugs.gentoo.org/799431 - sed -i '/^contextvars/d' requirements/base.txt || die -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - # testsuite likes lots of files - ulimit -n 4096 || die - - # ${T} is too long a path for the tests to work - local TMPDIR - TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" - ( - export TMPDIR - cleanup() { rm -rf "${TMPDIR}" || die; } - - trap cleanup EXIT - - addwrite "${TMPDIR}" - - USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ - "${EPYTHON}" -m pytest -vv \ - || die "testing failed with ${EPYTHON}" - ) -} - -pkg_postinst() { - if use python_targets_python3_8; then - if use nova; then - ewarn "Salt's nova functionality will not work with python3.8 since" - ewarn "dev-python/python-novaclient does not support it yet" - fi - if use neutron; then - ewarn "Salt's neutron functionality will not work with python3.8 since" - ewarn "dev-python/python-neutronclient does not support it yet" - fi - if use libvirt; then - ewarn "Salt's libvirt functionality will not work with python3.8 since" - ewarn "dev-python/libvirt-python does not support it yet" - fi - fi -} diff --git a/app-admin/salt/salt-3003.3.ebuild b/app-admin/salt/salt-3003.3.ebuild deleted file mode 100644 index ee153576a050..000000000000 --- a/app-admin/salt/salt-3003.3.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) - -inherit systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://www.saltstack.com/resources/community/ - https://github.com/saltstack" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako - mongodb neutron nova openssl portage profile redis selinux test raet - +zeromq vim-syntax" - -RDEPEND=" - sys-apps/pciutils - >=dev-python/distro-1.5[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/libnacl[${PYTHON_USEDEP}] - >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] - >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/toml-0.10.2[${PYTHON_USEDEP}] - dev-python/watchdog[${PYTHON_USEDEP}] - libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( - $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) - ) - openssl? ( - dev-libs/openssl:0=[-bindist(-)] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) - genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - nova? ( - $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) - ) - neutron? ( - $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) - ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim ) - zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) -" -BDEPEND=" - test? ( - ${RDEPEND} - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - >=dev-python/pytest-salt-factories-0.121.1[${PYTHON_USEDEP}] - dev-python/pytest-tempdir[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - dev-python/pytest-subtests[${PYTHON_USEDEP}] - dev-python/flaky[${PYTHON_USEDEP}] - dev-python/libcloud[${PYTHON_USEDEP}] - net-dns/bind-tools - >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] - !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq ) - test? ( cheetah genshi )" -RESTRICT="!test? ( test ) x86? ( test )" - -PATCHES=( - "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch" - "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" - "${FILESDIR}/salt-3002-tests.patch" - "${FILESDIR}/salt-3003.3-tests.patch" - "${FILESDIR}/salt-3003.1-tests.patch" -) - -python_prepare_all() { - # remove tests with external dependencies that may not be available, and - # tests that don't work in sandbox - rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die - rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die - rm tests/unit/states/test_boto_vpc.py || die - rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die - rm tests/pytests/functional/transport/server/test_req_channel.py || die - - # tests that require network access - rm tests/unit/{states,modules}/test_zcbuildout.py || die - rm -r tests/integration/cloud || die - rm -r tests/kitchen/tests/wordpress/tests || die - rm tests/kitchen/test_kitchen.py || die - rm tests/unit/modules/test_network.py || die - - # tests require root access - rm tests/integration/pillar/test_git_pillar.py || die - rm tests/integration/states/test_supervisord.py || die - rm tests/pytests/unit/client/test_ssh.py || die - - # make sure pkg_resources doesn't bomb because pycrypto isn't installed - find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die - # pycryptodome rather than pycryptodomex - find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die - - distutils-r1_python_prepare_all -} - -python_prepare() { - einfo "Fixing collections.abc warnings for ${EPYTHON}" - local abc - abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die - find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die - - # removes contextvars, see bug: https://bugs.gentoo.org/799431 - sed -i '/^contextvars/d' requirements/base.txt || die -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - # testsuite likes lots of files - ulimit -n 4096 || die - - # ${T} is too long a path for the tests to work - local TMPDIR - TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" - ( - export TMPDIR - cleanup() { rm -rf "${TMPDIR}" || die; } - - trap cleanup EXIT - - addwrite "${TMPDIR}" - - USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ - "${EPYTHON}" -m pytest -vv \ - || die "testing failed with ${EPYTHON}" - ) -} - -pkg_postinst() { - if use python_targets_python3_8; then - if use nova; then - ewarn "Salt's nova functionality will not work with python3.8 since" - ewarn "dev-python/python-novaclient does not support it yet" - fi - if use neutron; then - ewarn "Salt's neutron functionality will not work with python3.8 since" - ewarn "dev-python/python-neutronclient does not support it yet" - fi - if use libvirt; then - ewarn "Salt's libvirt functionality will not work with python3.8 since" - ewarn "dev-python/libvirt-python does not support it yet" - fi - fi -} diff --git a/app-admin/salt/salt-3003.5.ebuild b/app-admin/salt/salt-3003.5.ebuild new file mode 100644 index 000000000000..c3ba4ac9a49e --- /dev/null +++ b/app-admin/salt/salt-3003.5.ebuild @@ -0,0 +1,208 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..9} ) + +inherit systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="https://www.saltstack.com/resources/community/ + https://github.com/saltstack" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" + SRC_URI="" +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako + mongodb neutron nova openssl portage profile redis selinux test raet + +zeromq vim-syntax" + +RDEPEND=" + sys-apps/pciutils + >=dev-python/distro-1.5[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/libnacl[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/toml-0.10.2[${PYTHON_USEDEP}] + dev-python/watchdog[${PYTHON_USEDEP}] + libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( + $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) + ) + openssl? ( + dev-libs/openssl:0=[-bindist(-)] + dev-python/pyopenssl[${PYTHON_USEDEP}] + ) + raet? ( + >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] + >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] + >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] + ) + cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) + cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) + genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + nova? ( + $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) + ) + neutron? ( + $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) + ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim ) + zeromq? ( >=dev-python/pyzmq-19.1.0[${PYTHON_USEDEP}] ) +" +BDEPEND=" + test? ( + ${RDEPEND} + >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/moto-1.3.14[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + =dev-python/pytest-salt-factories-0.121*[${PYTHON_USEDEP}] + dev-python/pytest-tempdir[${PYTHON_USEDEP}] + dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] + dev-python/pytest-subtests[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + dev-python/libcloud[${PYTHON_USEDEP}] + net-dns/bind-tools + >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] + !x86? ( >=dev-python/boto3-1.19.63[${PYTHON_USEDEP}] ) + )" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE="|| ( raet zeromq ) + test? ( cheetah genshi )" +RESTRICT="!test? ( test ) x86? ( test )" + +# tests currently broken +RESTRICT+=" test" + +PATCHES=( + "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch" + "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" + "${FILESDIR}/salt-3002-tests.patch" + "${FILESDIR}/salt-3003.3-tests.patch" + "${FILESDIR}/salt-3003.1-tests.patch" + "${FILESDIR}/salt-3004.2-jinja-3.patch" + "${FILESDIR}/salt-3003.4-tests.patch" + "${FILESDIR}/salt-3003.4-relax-pyzmq-dep.patch" +) + +python_prepare_all() { + # remove tests with external dependencies that may not be available, and + # tests that don't work in sandbox + rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die + rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die + rm tests/unit/states/test_boto_vpc.py || die + rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die + rm tests/pytests/functional/transport/server/test_req_channel.py || die + + # tests that require network access + rm tests/unit/{states,modules}/test_zcbuildout.py || die + rm -r tests/integration/cloud || die + rm -r tests/kitchen/tests/wordpress/tests || die + rm tests/kitchen/test_kitchen.py || die + rm tests/unit/modules/test_network.py || die + + # tests require root access + rm tests/integration/pillar/test_git_pillar.py || die + rm tests/integration/states/test_supervisord.py || die + rm tests/pytests/unit/client/test_ssh.py || die + + # make sure pkg_resources doesn't bomb because pycrypto isn't installed + find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die + # pycryptodome rather than pycryptodomex + find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die + + distutils-r1_python_prepare_all +} + +python_prepare() { + einfo "Fixing collections.abc warnings for ${EPYTHON}" + local abc + abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die + find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die + + # removes contextvars, see bug: https://bugs.gentoo.org/799431 + sed -i '/^contextvars/d' requirements/base.txt || die +} + +python_install_all() { + local svc + USE_SETUPTOOLS=1 distutils-r1_python_install_all + + for svc in minion master syndic api; do + newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + # testsuite likes lots of files + ulimit -n 4096 || die + + # ${T} is too long a path for the tests to work + local TMPDIR + TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" + ( + export TMPDIR + cleanup() { rm -rf "${TMPDIR}" || die; } + + trap cleanup EXIT + + addwrite "${TMPDIR}" + + USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ + "${EPYTHON}" -m pytest -vv \ + || die "testing failed with ${EPYTHON}" + ) +} + +pkg_postinst() { + if use python_targets_python3_8; then + if use nova; then + ewarn "Salt's nova functionality will not work with python3.8 since" + ewarn "dev-python/python-novaclient does not support it yet" + fi + if use neutron; then + ewarn "Salt's neutron functionality will not work with python3.8 since" + ewarn "dev-python/python-neutronclient does not support it yet" + fi + if use libvirt; then + ewarn "Salt's libvirt functionality will not work with python3.8 since" + ewarn "dev-python/libvirt-python does not support it yet" + fi + fi +} diff --git a/app-admin/salt/salt-3004.1-r4.ebuild b/app-admin/salt/salt-3004.1-r4.ebuild index e33415b59625..5352a20caf11 100644 --- a/app-admin/salt/salt-3004.1-r4.ebuild +++ b/app-admin/salt/salt-3004.1-r4.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then SRC_URI="" else SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 x86" + KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" fi LICENSE="Apache-2.0" diff --git a/app-admin/salt/salt-3004.2.ebuild b/app-admin/salt/salt-3004.2.ebuild new file mode 100644 index 000000000000..dcc6f23bd8b9 --- /dev/null +++ b/app-admin/salt/salt-3004.2.ebuild @@ -0,0 +1,208 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..10} ) + +inherit systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="https://www.saltstack.com/resources/community/ + https://github.com/saltstack" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" + SRC_URI="" +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako + mongodb neutron nova openssl portage profile redis selinux test raet + +zeromq vim-syntax" + +RDEPEND=" + sys-apps/pciutils + >=dev-python/distro-1.5[${PYTHON_USEDEP}] + >=dev-python/jinja-3.0[${PYTHON_USEDEP}] + dev-python/libnacl[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] + >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/toml-0.10.2[${PYTHON_USEDEP}] + dev-python/watchdog[${PYTHON_USEDEP}] + libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( + $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) + ) + openssl? ( + dev-libs/openssl:0=[-bindist(-)] + dev-python/pyopenssl[${PYTHON_USEDEP}] + ) + raet? ( + >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] + >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] + >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] + ) + cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) + cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] ) + genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + nova? ( + $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) + ) + neutron? ( + $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) + ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim ) + zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] ) +" +BDEPEND=" + test? ( + ${RDEPEND} + >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] + dev-python/passlib + dev-python/pip[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + >=dev-python/pytest-salt-factories-1.0.0_rc13[${PYTHON_USEDEP}] + dev-python/pytest-tempdir[${PYTHON_USEDEP}] + dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] + dev-python/pytest-subtests[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + dev-python/libcloud[${PYTHON_USEDEP}] + net-dns/bind-tools + >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}] + !x86? ( >=dev-python/boto3-1.17.67[${PYTHON_USEDEP}] ) + )" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE="|| ( raet zeromq ) + test? ( cheetah genshi )" +RESTRICT="!test? ( test ) x86? ( test )" + +PATCHES=( + "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch" + "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" + "${FILESDIR}/salt-3002-tests.patch" + "${FILESDIR}/salt-3003.1-tests.patch" + "${FILESDIR}/salt-3004.2-jinja-3.patch" + "${FILESDIR}/salt-3004.1-tests.patch" + "${FILESDIR}/salt-3004.1-relax-pyzmq-dep.patch" + "${FILESDIR}/salt-3004.1-py310.patch" + "${FILESDIR}/salt-3004.2-importlib.patch" +) + +python_prepare_all() { + # remove tests with external dependencies that may not be available, and + # tests that don't work in sandbox + rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die + rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die + rm tests/unit/states/test_boto_vpc.py || die + rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die + rm tests/pytests/functional/transport/server/test_req_channel.py || die + + # tests that require network access + rm tests/unit/{states,modules}/test_zcbuildout.py || die + rm -r tests/integration/cloud || die + rm -r tests/kitchen/tests/wordpress/tests || die + rm tests/kitchen/test_kitchen.py || die + rm tests/unit/modules/test_network.py || die + rm tests/pytests/functional/modules/test_pip.py || die + rm tests/pytests/unit/client/ssh/test_ssh.py || die + + # tests require root access + rm tests/integration/pillar/test_git_pillar.py || die + rm tests/integration/states/test_supervisord.py || die + + # make sure pkg_resources doesn't bomb because pycrypto isn't installed + find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die + # pycryptodome rather than pycryptodomex + find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die + + distutils-r1_python_prepare_all +} + +python_prepare() { + einfo "Fixing collections.abc warnings for ${EPYTHON}" + local abc + abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die + find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die + + # removes contextvars, see bug: https://bugs.gentoo.org/799431 + sed -i '/^contextvars/d' requirements/base.txt || die +} + +python_install_all() { + local svc + USE_SETUPTOOLS=1 distutils-r1_python_install_all + + for svc in minion master syndic api; do + newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + # testsuite likes lots of files + ulimit -n 4096 || die + + # ${T} is too long a path for the tests to work + local TMPDIR + TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" + ( + export TMPDIR + cleanup() { rm -rf "${TMPDIR}" || die; } + + trap cleanup EXIT + + addwrite "${TMPDIR}" + + USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ + "${EPYTHON}" -m pytest -vv \ + || die "testing failed with ${EPYTHON}" + ) +} + +pkg_postinst() { + if use python_targets_python3_8; then + if use nova; then + ewarn "Salt's nova functionality will not work with python3.8 since" + ewarn "dev-python/python-novaclient does not support it yet" + fi + if use neutron; then + ewarn "Salt's neutron functionality will not work with python3.8 since" + ewarn "dev-python/python-neutronclient does not support it yet" + fi + if use libvirt; then + ewarn "Salt's libvirt functionality will not work with python3.8 since" + ewarn "dev-python/libvirt-python does not support it yet" + fi + fi +} -- cgit v1.2.3